6.14.5-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 6.14.5-rc1 review
This is the start of the stable review cycle for the 6.14.5 release. There are 311 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 Thu, 01 May 2025 16:10:15 +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.14.5-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.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.14.5-rc1
Herbert Xu <[email protected]>
crypto: Kconfig - Select LIB generic option
Josh Poimboeuf <[email protected]>
objtool: Silence more KCOV warnings, part 2
Josh Poimboeuf <[email protected]>
objtool: Ignore end-of-section jumps for KCOV/GCOV
Michal Pecio <[email protected]>
usb: xhci: Fix Short Packet handling rework ignoring errors
Hannes Reinecke <[email protected]>
nvme: fixup scan failure for non-ANA multipath controllers
Ming Lei <[email protected]>
ublk: don't fail request for recovery & reissue in case of ubq->canceling
Miguel Ojeda <[email protected]>
rust: kbuild: skip --remap-path-prefix for rustdoc
Dimitri Fedrau <[email protected]>
net: phy: dp83822: fix transmit amplitude if CONFIG_OF_MDIO not defined
Thomas Bogendoerfer <[email protected]>
MIPS: cm: Fix warning if MIPS_CM is disabled
Dan Carpenter <[email protected]>
media: i2c: imx214: Fix uninitialized variable in imx214_set_ctrl()
Herbert Xu <[email protected]>
crypto: lib/Kconfig - Hide arch options from user
Ian Abbott <[email protected]>
comedi: jr3_pci: Fix synchronous deletion of timer
Daniel Borkmann <[email protected]>
vmxnet3: Fix malformed packet sizing in vmxnet3_process_xdp
Dmitry Torokhov <[email protected]>
driver core: fix potential NULL pointer dereference in dev_uevent()
Dmitry Torokhov <[email protected]>
driver core: introduce device_set_driver() helper
Dmitry Torokhov <[email protected]>
Revert "drivers: core: synchronize really_probe() and dev_uevent()"
Tamura Dai <[email protected]>
spi: spi-imx: Add check for spi_imx_setupxfer()
Ming Lei <[email protected]>
ublk: rely on ->canceling for dealing with ublk_nosrv_dev_should_queue_io
Ming Lei <[email protected]>
ublk: add ublk_force_abort_dev()
Lijo Lazar <[email protected]>
drm/amdgpu: Use the right function for hdp flush
Mario Limonciello <[email protected]>
drm/amd: Forbid suspending into non-default suspend states
Christian König <[email protected]>
drm/amdgpu: use a dummy owner for sysfs triggered cleaner shaders v4
Meir Elisha <[email protected]>
md/raid1: Add check for missing source disk in process_checks()
Pi Xiange <[email protected]>
x86/cpu: Add CPU model number for Bartlett Lake CPUs with Raptor Cove cores
Damien Le Moal <[email protected]>
nvmet: pci-epf: cleanup link state management
Mostafa Saleh <[email protected]>
ubsan: Fix panic from test_ubsan_out_of_bounds
Breno Leitao <[email protected]>
spi: tegra210-quad: add rate limiting and simplify timeout error message
Breno Leitao <[email protected]>
spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts
Namjae Jeon <[email protected]>
ksmbd: fix WARNING "do not call blocking ops when !TASK_RUNNING"
Andrew Jones <[email protected]>
riscv: Provide all alternative macros all the time
Gou Hao <[email protected]>
iomap: skip unnecessary ifs_block_is_uptodate check
Song Liu <[email protected]>
netfs: Only create /proc/fs/netfs with CONFIG_PROC_FS
Hans de Goede <[email protected]>
platform/x86: x86-android-tablets: Add Vexia Edu Atla 10 tablet 5V data
Hans de Goede <[email protected]>
platform/x86: x86-android-tablets: Add "9v" to Vexia EDU ATLA 10 tablet symbols
Fernando Fernandez Mancera <[email protected]>
x86/i8253: Call clockevent_i8253_disable() with interrupts disabled
Weidong Wang <[email protected]>
ASoC: codecs: Add of_match_table for aw888081 driver
Shengjiu Wang <[email protected]>
ASoC: fsl_asrc_dma: get codec or cpu dai from backend
Igor Pylypiv <[email protected]>
scsi: pm80xx: Set phy_attached to zero when device is gone
Peter Griffin <[email protected]>
scsi: ufs: exynos: gs101: Put UFS device in reset on .suspend()
Peter Griffin <[email protected]>
scsi: ufs: exynos: Move phy calls to .exit() callback
Peter Griffin <[email protected]>
scsi: ufs: exynos: Enable PRDT pre-fetching with UFSHCD_CAP_CRYPTO
Peter Griffin <[email protected]>
scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init()
Xingui Yang <[email protected]>
scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes
Ojaswin Mujoo <[email protected]>
ext4: make block validity check resistent to sb bh corruption
Robin Murphy <[email protected]>
iommu: Clear iommu-dma ops on cleanup
Pali Rohár <[email protected]>
cifs: Fix querying of WSL CHR and BLK reparse points over SMB1
Sebastian Andrzej Siewior <[email protected]>
timekeeping: Add a lockdep override in tick_freeze()
Pali Rohár <[email protected]>
cifs: Fix encoding of SMB1 Session Setup Kerberos Request in non-UNICODE mode
Daniel Wagner <[email protected]>
nvmet-fc: put ref when assoc->del_work is already scheduled
Daniel Wagner <[email protected]>
nvmet-fc: take tgtport reference only once
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on context switch with eIBRS
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline
Josh Poimboeuf <[email protected]>
x86/bugs: Use SBPB in write_ibpb() if applicable
Qiuxu Zhuo <[email protected]>
selftests/mincore: Allow read-ahead pages to reach the end of the file
Roger Pau Monne <[email protected]>
x86/xen: disable CPU idle and frequency drivers for PVH dom0
Andy Shevchenko <[email protected]>
gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment
Josh Poimboeuf <[email protected]>
objtool: Stop UNRET validation on UD2
Uday Shankar <[email protected]>
nvme: multipath: fix return value of nvme_available_path
Hannes Reinecke <[email protected]>
nvme: re-read ANA log page after ns scan completes
Julia Filipchuk <[email protected]>
drm/xe/xe3lpg: Apply Wa_14022293748, Wa_22019794406
Jay Cornwall <[email protected]>
drm/amdgpu: Increase KIQ invalidate_tlbs timeout
Emily Deng <[email protected]>
drm/amdkfd: sriov doesn't support per queue reset
Jean-Marc Eurin <[email protected]>
ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls
Mario Limonciello <[email protected]>
ACPI: EC: Set ec_no_wakeup for Lenovo Go S
Hannes Reinecke <[email protected]>
nvme: requeue namespace scan on missed AENs
Uwe Kleine-König <[email protected]>
pwm: axi-pwmgen: Let .round_waveform_tohw() signal when request was rounded up
Uwe Kleine-König <[email protected]>
pwm: Let pwm_set_waveform() succeed even if lowlevel driver rounded up
Jason Andryuk <[email protected]>
xen: Change xen-acpi-processor dom0 dependency
Gabriel Shahrouzi <[email protected]>
perf/core: Fix WARN_ON(!ctx) in __free_event() for partial init
Ming Lei <[email protected]>
selftests: ublk: fix test_stripe_04
Waiman Long <[email protected]>
cgroup/cpuset: Don't allow creation of local partition over a remote one
Xiaogang Chen <[email protected]>
udmabuf: fix a buf size overflow issue during udmabuf creation
Thomas Weißschuh <[email protected]>
KVM: s390: Don't use %pK through debug printing
Thomas Weißschuh <[email protected]>
KVM: s390: Don't use %pK through tracepoints
Oleg Nesterov <[email protected]>
sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP
Xi Ruoyao <[email protected]>
kbuild: add dependency from vmlinux to sorttable
Thomas Weißschuh <[email protected]>
kbuild, rust: use -fremap-path-prefix to make paths relative
Pavel Begunkov <[email protected]>
io_uring: always do atomic put from iowq
Steven Rostedt <[email protected]>
tracing: Enforce the persistent ring buffer to be page aligned
Lukas Stockmann <[email protected]>
rtc: pcf85063: do a SW reset if POR failed
Ignacio Encinas <[email protected]>
9p/trans_fd: mark concurrent read and writes to p9_conn->err
Dominique Martinet <[email protected]>
9p/net: fix improper handling of bogus negative read/write replies
Basavaraj Natikar <[email protected]>
ntb_hw_amd: Add NTB PCI ID for new gen CPU
Arnd Bergmann <[email protected]>
ntb: reduce stack usage in idt_scan_mws
Charlie Jenkins <[email protected]>
riscv: tracing: Fix __write_overflow_field in ftrace_partial_regs()
Al Viro <[email protected]>
qibfs: fix _another_ leak
Josh Poimboeuf <[email protected]>
objtool, lkdtm: Obfuscate the do_nothing() pointer
Josh Poimboeuf <[email protected]>
objtool, regulator: rk808: Remove potential undefined behavior in rk806_set_mode_dcdc()
Josh Poimboeuf <[email protected]>
objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler()
Josh Poimboeuf <[email protected]>
objtool, panic: Disable SMAP in __stack_chk_fail()
Josh Poimboeuf <[email protected]>
objtool: Silence more KCOV warnings
Nicolin Chen <[email protected]>
iommu/arm-smmu-v3: Set MEV bit in nested STE for DoS mitigations
Benjamin Berg <[email protected]>
um: work around sched_yield not yielding in time-travel mode
Mika Westerberg <[email protected]>
thunderbolt: Scan retimers after device router has been enumerated
Théo Lebrun <[email protected]>
usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func
Chenyuan Yang <[email protected]>
usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev()
Andy Yan <[email protected]>
phy: rockchip: usbdp: Avoid call hpd_event_trigger in dp_phy_init
Michal Pecio <[email protected]>
usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running
Vinicius Costa Gomes <[email protected]>
dmaengine: dmatest: Fix dmatest waiting less when interrupted
Stanley Chu <[email protected]>
i3c: master: svc: Add support for Nuvoton npcm845 i3c
Mathias Nyman <[email protected]>
xhci: Handle spurious events on Etron host isoc enpoints
Michal Pecio <[email protected]>
usb: xhci: Fix isochronous Ring Underrun/Overrun event handling
Michal Pecio <[email protected]>
usb: xhci: Complete 'error mid TD' transfers when handling Missed Service
Stefan Wahren <[email protected]>
dmaengine: bcm2835-dma: fix warning when CONFIG_PM=n
John Stultz <[email protected]>
sound/virtio: Fix cancel_sync warnings on uninitialized work_structs
Andy Shevchenko <[email protected]>
usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield
Andy Shevchenko <[email protected]>
usb: dwc3: gadget: Refactor loop to avoid NULL endpoints
Edward Adam Davis <[email protected]>
fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size
Lizhi Xu <[email protected]>
fs/ntfs3: Keep write operations atomic
Trevor Gamblin <[email protected]>
iio: adc: ad4695: make ad4695_exit_conversion_mode() more robust
Dmitry Baryshkov <[email protected]>
usb: typec: ucsi: ccg: move command quirks to ucsi_ccg_sync_control()
Dmitry Baryshkov <[email protected]>
usb: typec: ucsi: return CCI and message from sync_control callback
Alexander Stein <[email protected]>
usb: host: max3421-hcd: Add missing spi_device_id table
Dave Penkler <[email protected]>
staging: gpib: Use min for calculating transfer length
Sudeep Holla <[email protected]>
mailbox: pcc: Always clear the platform ack interrupt first
Huisong Li <[email protected]>
mailbox: pcc: Fix the possible race in updation of chan_in_use flag
Yafang Shao <[email protected]>
bpf: Reject attaching fexit/fmod_ret to __noreturn functions
Martin KaFai Lau <[email protected]>
bpf: Only fails the busy counter check in bpf_cgrp_storage_get if it creates storage
Sewon Nam <[email protected]>
bpf: bpftool: Setting error code in do_loader()
Feng Yang <[email protected]>
selftests/bpf: Fix cap_enable_effective() return code
Biju Das <[email protected]>
clk: renesas: rzv2h: Adjust for CPG_BUS_m_MSTOP starting from m = 1
Haoxiang Li <[email protected]>
s390/tty: Fix a potential memory leak bug
Haoxiang Li <[email protected]>
s390/sclp: Add check for get_zeroed_page()
Yu-Chun Lin <[email protected]>
parisc: PDT: Fix missing prototype warning
Heiko Stuebner <[email protected]>
clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec()
Alexei Starovoitov <[email protected]>
bpf: Fix deadlock between rcu_tasks_trace and event_mutex.
Yonghong Song <[email protected]>
bpf: Fix kmemleak warning for percpu hashmap
Herbert Xu <[email protected]>
crypto: null - Use spin lock instead of mutex
Herbert Xu <[email protected]>
crypto: lib/Kconfig - Fix lib built-in failure when arch is modular
Devaraj Rangasamy <[email protected]>
crypto: ccp - Add support for PCI device 0x1134
Gregory CLEMENT <[email protected]>
MIPS: cm: Detect CM quirks from device tree
Dmitry Mastykin <[email protected]>
pinctrl: mcp23s08: Get rid of spurious level interrupts
Chenyuan Yang <[email protected]>
pinctrl: renesas: rza2: Fix potential NULL pointer dereference
Amery Hung <[email protected]>
selftests/bpf: Fix stdout race condition in traffic monitor
Lukas Wunner <[email protected]>
crypto: ecdsa - Harden against integer overflows in DIV_ROUND_UP()
Oliver Neukum <[email protected]>
USB: wdm: add annotation
Oliver Neukum <[email protected]>
USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context
Oliver Neukum <[email protected]>
USB: wdm: close race between wdm_open and wdm_wwan_port_stop
Oliver Neukum <[email protected]>
USB: wdm: handle IO errors in wdm_wwan_port_start
Dan Carpenter <[email protected]>
usb: typec: class: Unlocked on error in typec_register_partner()
Andrei Kuchynski <[email protected]>
usb: typec: class: Invalidate USB device pointers on partner unregistration
Andrei Kuchynski <[email protected]>
usb: typec: class: Fix NULL pointer access
Oliver Neukum <[email protected]>
USB: VLI disk crashes if LPM is used
Miao Li <[email protected]>
usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive
Miao Li <[email protected]>
usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive
Mike Looijmans <[email protected]>
usb: dwc3: xilinx: Prevent spike in reset signal
Frode Isaksen <[email protected]>
usb: dwc3: gadget: check that event count does not exceed event buffer length
Huacai Chen <[email protected]>
USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02)
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix usbmisc handling
Ralph Siemsen <[email protected]>
usb: cdns3: Fix deadlock when using NCM gadget
Michal Pecio <[email protected]>
usb: xhci: Fix invalid pointer dereference in Etron workaround
Mathias Nyman <[email protected]>
xhci: Limit time spent with xHC interrupts disabled during bus resume
Craig Hesling <[email protected]>
USB: serial: simple: add OWON HDS200 series oscilloscope support
Adam Xue <[email protected]>
USB: serial: option: add Sierra Wireless EM9291
Michael Ehrenreich <[email protected]>
USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe
Ryo Takakura <[email protected]>
serial: sifive: lock port in startup()/shutdown() callbacks
Stephan Gerhold <[email protected]>
serial: msm: Configure correct working mode before starting earlycon
Günther Noack <[email protected]>
tty: Require CAP_SYS_ADMIN for all usages of TIOCL_SELMOUSEREPORT
Mahesh Rao <[email protected]>
firmware: stratix10-svc: Add of_platform_default_populate()
Rengarajan S <[email protected]>
misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack
Rengarajan S <[email protected]>
misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration
Thadeu Lima de Souza Cascardo <[email protected]>
char: misc: register chrdev region with all possible minors
Sean Christopherson <[email protected]>
KVM: x86: Take irqfds.lock when adding/deleting IRQ bypass producer
Sean Christopherson <[email protected]>
KVM: x86: Reset IRTE to host control if *new* route isn't postable
Sean Christopherson <[email protected]>
KVM: x86: Explicitly treat routing entry type changes as changes
Hans de Goede <[email protected]>
mei: vsc: Fix fortify-panic caused by invalid counted_by() use
Alexander Usyskin <[email protected]>
mei: me: add panther lake H DID
Damien Le Moal <[email protected]>
scsi: Improve CDL control
Oliver Neukum <[email protected]>
USB: storage: quirk for ADATA Portable HDD CH94
Damien Le Moal <[email protected]>
ata: libata-scsi: Fix ata_msense_control_ata_feature()
Damien Le Moal <[email protected]>
ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type
Damien Le Moal <[email protected]>
ata: libata-scsi: Improve CDL control
Haoxiang Li <[email protected]>
mcb: fix a double free bug in chameleon_parse_gdd()
Smita Koralahalli <[email protected]>
cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports
Sean Christopherson <[email protected]>
KVM: SVM: Allocate IR data using atomic allocation
Jens Axboe <[email protected]>
io_uring: fix 'sync' handling of io_fallback_tw()
Bibo Mao <[email protected]>
LoongArch: KVM: Fix PMU pass-through issue if VM exits to host finally
Bibo Mao <[email protected]>
LoongArch: KVM: Fully clear some CSRs when VM reboot
Yulong Han <[email protected]>
LoongArch: KVM: Fix multiple typos of KVM code
Petr Tesarik <[email protected]>
LoongArch: Remove a bogus reference to ZONE_DMA
Ming Wang <[email protected]>
LoongArch: Return NULL from huge_pte_offset() for invalid PMD
Tiezhu Yang <[email protected]>
LoongArch: Handle fp, lsx, lasx and lbt assembly symbols
Carlos Llamas <[email protected]>
binder: fix offset calculation in debug log
Suzuki K Poulose <[email protected]>
irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
Ilpo Järvinen <[email protected]>
selftests/pcie_bwctrl: Fix test progs list
Juergen Gross <[email protected]>
x86/mm: Fix _pgd_alloc() for Xen PV mode
Kirill A. Shutemov <[email protected]>
x86/insn: Fix CTEST instruction decoding
Mario Limonciello <[email protected]>
drm/amd/display: Fix ACPI edid parsing on some Lenovo systems
Roman Li <[email protected]>
drm/amd/display: Force full update in gpu reset
Roman Li <[email protected]>
drm/amd/display: Fix gpu reset in multidisplay config
Hugo Villeneuve <[email protected]>
drm: panel: jd9365da: fix reset signal polarity in unprepare
Christian Schrefl <[email protected]>
rust: firmware: Use ffi::c_char type in FwFunc
Ranjan Kumar <[email protected]>
scsi: mpi3mr: Fix pending I/O counter
Mat Martineau <[email protected]>
mptcp: pm: Defer freeing of MPTCP userspace path manager entries
Fiona Klute <[email protected]>
net: phy: microchip: force IRQ polling mode for lan88xx
Oleksij Rempel <[email protected]>
net: selftests: initialize TCP header and skb payload with zero
Alexey Nepomnyashih <[email protected]>
xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
Marek Behún <[email protected]>
crypto: atmel-sha204a - Set hwrng quality to lowest possible
Breno Leitao <[email protected]>
sched_ext: Use kvzalloc for large exit_dump allocation
Halil Pasic <[email protected]>
virtio_console: fix missing byte order handling for cols and rows
Florian Westphal <[email protected]>
netfilter: fib: avoid lookup if socket is available
Russell King (Oracle) <[email protected]>
net: stmmac: block PHY RXC clock-stop
Russell King (Oracle) <[email protected]>
net: phylink: add functions to block/unblock rx clock stop
Russell King (Oracle) <[email protected]>
net: stmmac: socfpga: remove phy_resume() call
Russell King (Oracle) <[email protected]>
net: stmmac: address non-LPI resume failures properly
Russell King (Oracle) <[email protected]>
net: phylink: add phylink_prepare_resume()
Russell King (Oracle) <[email protected]>
net: stmmac: simplify phylink_suspend() and phylink_resume() calls
Omar Sandoval <[email protected]>
sched/eevdf: Fix se->slice being set to U64_MAX and resulting crash
Tiezhu Yang <[email protected]>
LoongArch: Make do_xyz() exception handlers more robust
Tiezhu Yang <[email protected]>
LoongArch: Make regs_irqs_disabled() more clear
Yuli Wang <[email protected]>
LoongArch: Select ARCH_USE_MEMTEST
Luo Gengkun <[email protected]>
perf/x86: Fix non-sampling (counting) events on certain x86 platforms
Martin Blumenstingl <[email protected]>
drm/meson: use unsigned long long / Hz for frequency types
Christian Hewitt <[email protected]>
Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates"
Alexei Starovoitov <[email protected]>
bpf: Add namespace to BPF internal symbols
Jan Kara <[email protected]>
fs/xattr: Fix handling of AT_FDCWD in setxattrat(2) and getxattrat(2)
T.J. Mercier <[email protected]>
splice: remove duplicate noinline from pipe_clear_nowait
Ming Lei <[email protected]>
ublk: call ublk_dispatch_req() for handling UBLK_U_IO_NEED_GET_DATA
Caleb Sander Mateos <[email protected]>
ublk: remove unused cmd argument to ublk_dispatch_req()
Ming Lei <[email protected]>
ublk: implement ->queue_rqs()
Ming Lei <[email protected]>
ublk: comment on ubq->canceling handling in ublk_queue_rq()
Uday Shankar <[email protected]>
ublk: remove io_cmds list in ublk_queue
Björn Töpel <[email protected]>
riscv: uprobes: Add missing fence.i after building the XOL buffer
Björn Töpel <[email protected]>
riscv: Replace function-like macro by static inline function
Sean Christopherson <[email protected]>
iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE
Christoph Hellwig <[email protected]>
block: don't autoload drivers on stat
Christoph Hellwig <[email protected]>
block: remove the backing_inode variable in bdev_statx
Christoph Hellwig <[email protected]>
block: move blkdev_{get,put} _no_open prototypes out of blkdev.h
Luis Chamberlain <[email protected]>
bdev: use bdev_io_min() for statx block size
Christoph Hellwig <[email protected]>
block: never reduce ra_pages in blk_apply_bdi_limits
Alexis Lothoré <[email protected]>
net: stmmac: fix multiplication overflow when reading timestamp
Alexis Lothore <[email protected]>
net: stmmac: fix dwmac1000 ptp timestamp status offset
Johannes Schneider <[email protected]>
net: dp83822: Fix OF_MDIO config check
Dimitri Fedrau <[email protected]>
net: phy: dp83822: Add support for changing the transmit amplitude voltage
Dimitri Fedrau <[email protected]>
net: phy: Add helper for getting tx amplitude gain
Shannon Nelson <[email protected]>
pds_core: make wait_context part of q_info
Brett Creeley <[email protected]>
pds_core: Remove unnecessary check in pds_client_adminq_cmd()
Brett Creeley <[email protected]>
pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result
Brett Creeley <[email protected]>
pds_core: Prevent possible adminq overflow/stuck condition
Daniel Golle <[email protected]>
net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
Cong Wang <[email protected]>
net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
Cong Wang <[email protected]>
net_sched: hfsc: Fix a UAF vulnerability in class handling
Al Viro <[email protected]>
fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount()
Bo-Cun Chen <[email protected]>
net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration
Tung Nguyen <[email protected]>
tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
Bui Quang Minh <[email protected]>
virtio-net: disable delayed refill when pausing rx
Joe Damato <[email protected]>
virtio-net: Refactor napi_disable paths
Joe Damato <[email protected]>
virtio-net: Refactor napi_enable paths
Qingfang Deng <[email protected]>
net: phy: leds: fix memory leak
Russell King (Oracle) <[email protected]>
net: phylink: fix suspend/resume with WoL enabled and link down
Russell King (Oracle) <[email protected]>
net: phylink: force link down on major_config failure
Justin Iurman <[email protected]>
net: lwtunnel: disable BHs when required
Richard Weinberger <[email protected]>
nvmet: fix out-of-bounds access in nvmet_enable_port
Vladimir Oltean <[email protected]>
net: enetc: fix frame corruption on bpf_xdp_adjust_head/tail() and XDP_PASS
Vladimir Oltean <[email protected]>
net: enetc: refactor bulk flipping of RX buffers to separate function
Vladimir Oltean <[email protected]>
net: enetc: register XDP RX queues with frag_size
Chenyuan Yang <[email protected]>
scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()
Anastasia Kovaleva <[email protected]>
scsi: core: Clear flags for scsi_cmnd that did not complete
Henry Martin <[email protected]>
net/mlx5: Move ttc allocation after switch case to prevent leaks
Henry Martin <[email protected]>
net/mlx5: Fix null-ptr-deref in mlx5_create_{inner_,}ttc_table()
Dongli Zhang <[email protected]>
vhost-scsi: Fix vhost_scsi_send_status()
Dongli Zhang <[email protected]>
vhost-scsi: Fix vhost_scsi_send_bad_target()
Mike Christie <[email protected]>
vhost-scsi: Add better resource allocation failure handling
T.J. Mercier <[email protected]>
cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
Johannes Thumshirn <[email protected]>
btrfs: zoned: return EIO on RAID1 block group write pointer mismatch
Qu Wenruo <[email protected]>
btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range()
Johan Hovold <[email protected]>
cpufreq: fix compile-test defaults
Krzysztof Kozlowski <[email protected]>
cpufreq: Do not enable by default during compile testing
Marc Zyngier <[email protected]>
cpufreq: cppc: Fix invalid return value in .get() callback
Daniel Jurgens <[email protected]>
virtio_pci: Use self group type for cap commands
Chenyuan Yang <[email protected]>
scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
Henry Martin <[email protected]>
cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
Henry Martin <[email protected]>
cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate()
Henry Martin <[email protected]>
cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate()
Arnd Bergmann <[email protected]>
dma/contiguous: avoid warning about unused size_bytes
Andre Przywara <[email protected]>
cpufreq: sun50i: prevent out-of-bounds access
David Howells <[email protected]>
ceph: Fix incorrect flush end position calculation
Nathan Chancellor <[email protected]>
lib/Kconfig.ubsan: Remove 'default UBSAN' from UBSAN_INTEGER_WRAP
Niranjana Vishwanathapura <[email protected]>
drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change
Lucas De Marchi <[email protected]>
drm/xe/rtp: Drop sentinels from arg to xe_rtp_process_to_sr()
Tvrtko Ursulin <[email protected]>
drm/xe: Add performance tunings to debugfs
Tejas Upadhyay <[email protected]>
drm/xe/xe3lpg: Add Wa_13012615864
Nirmoy Das <[email protected]>
drm/xe/ptl: Apply Wa_14023061436
Jonathan Currier <[email protected]>
net/niu: Niu requires MSIX ENTRY_DATA fields touch before entry reads
Biju Das <[email protected]>
irqchip/renesas-rzv2h: Prevent TINT spurious interrupt
Biju Das <[email protected]>
irqchip/renesas-rzv2h: Add struct rzv2h_hw_info with t_offs variable
Biju Das <[email protected]>
irqchip/renesas-rzv2h: Simplify rzv2h_icu_init()
Jonathan Currier <[email protected]>
PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads
Thomas Gleixner <[email protected]>
PCI/MSI: Handle the NOMASK flag correctly for all PCI/MSI backends
Roger Pau Monne <[email protected]>
PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag
Niklas Schnelle <[email protected]>
s390/pci: Support mmap() of PCI resources except for ISM devices
Tudor Ambarus <[email protected]>
scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get
Zijun Hu <[email protected]>
of: resolver: Fix device node refcount leakage in of_resolve_phandles()
Rob Herring (Arm) <[email protected]>
of: resolver: Simplify of_resolve_phandles() using __free()
Sergiu Cuciurean <[email protected]>
iio: adc: ad7768-1: Fix conversion result sign
Jonathan Cameron <[email protected]>
iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check
Hans de Goede <[email protected]>
media: ov08x40: Add missing ov08x40_identify_module() call on stream-start
Hans de Goede <[email protected]>
media: ov08x40: Move ov08x40_identify_module() function up
André Apitzsch <[email protected]>
media: i2c: imx214: Fix link frequency validation
André Apitzsch <[email protected]>
media: i2c: imx214: Check number of lanes from device tree
André Apitzsch <[email protected]>
media: i2c: imx214: Replace register addresses with macros
André Apitzsch <[email protected]>
media: i2c: imx214: Convert to CCI register access helpers
André Apitzsch <[email protected]>
media: i2c: imx214: Simplify with dev_err_probe()
André Apitzsch <[email protected]>
media: i2c: imx214: Use subdev active state
Rafael J. Wysocki <[email protected]>
PM: EM: Address RCU-related sparse warnings
Li RongQing <[email protected]>
PM: EM: use kfree_rcu() to simplify the code
Tudor Ambarus <[email protected]>
mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
Tudor Ambarus <[email protected]>
soc: qcom: ice: introduce devm_of_qcom_ice_get
Jinjiang Tu <[email protected]>
mm/vmscan: don't try to reclaim hwpoison folio
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 2 + Documentation/bpf/bpf_devel_QA.rst | 8 + Documentation/trace/debugging.rst | 2 + Makefile | 5 +- arch/arm/crypto/Kconfig | 10 +- arch/arm64/crypto/Kconfig | 6 +- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/fpu.h | 33 +- arch/loongarch/include/asm/lbt.h | 10 +- arch/loongarch/include/asm/ptrace.h | 4 +- arch/loongarch/kernel/fpu.S | 6 + arch/loongarch/kernel/lbt.S | 4 + arch/loongarch/kernel/signal.c | 21 - arch/loongarch/kernel/traps.c | 20 +- arch/loongarch/kvm/intc/ipi.c | 4 +- arch/loongarch/kvm/main.c | 4 +- arch/loongarch/kvm/vcpu.c | 8 + arch/loongarch/mm/hugetlbpage.c | 2 +- arch/loongarch/mm/init.c | 3 - arch/mips/crypto/Kconfig | 7 +- arch/mips/include/asm/mips-cm.h | 22 + arch/mips/kernel/mips-cm.c | 14 + arch/parisc/kernel/pdt.c | 2 + arch/powerpc/crypto/Kconfig | 7 +- arch/riscv/crypto/Kconfig | 1 - arch/riscv/include/asm/alternative-macros.h | 21 +- arch/riscv/include/asm/cacheflush.h | 15 +- arch/riscv/include/asm/ftrace.h | 2 +- arch/riscv/include/asm/ptrace.h | 18 +- arch/riscv/kernel/probes/uprobes.c | 10 +- arch/s390/Kconfig | 4 +- arch/s390/crypto/Kconfig | 3 +- arch/s390/include/asm/pci.h | 3 + arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 8 +- arch/s390/kvm/kvm-s390.c | 10 +- arch/s390/kvm/trace-s390.h | 4 +- arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_fixup.c | 23 + arch/um/include/linux/time-internal.h | 2 + arch/um/kernel/skas/syscall.c | 11 + arch/x86/crypto/Kconfig | 11 +- arch/x86/entry/entry.S | 2 +- arch/x86/events/core.c | 2 +- arch/x86/include/asm/intel-family.h | 2 + arch/x86/include/asm/pgalloc.h | 19 +- arch/x86/kernel/cpu/bugs.c | 36 +- arch/x86/kernel/i8253.c | 3 +- arch/x86/kernel/machine_kexec_32.c | 4 +- arch/x86/kvm/svm/avic.c | 60 +- arch/x86/kvm/vmx/posted_intr.c | 28 +- arch/x86/kvm/x86.c | 20 +- arch/x86/lib/x86-opcode-map.txt | 4 +- arch/x86/mm/pgtable.c | 4 +- arch/x86/mm/tlb.c | 6 +- arch/x86/pci/xen.c | 8 +- arch/x86/platform/efi/efi_64.c | 4 +- arch/x86/xen/enlighten_pvh.c | 19 +- block/bdev.c | 22 +- block/blk-cgroup.c | 2 +- block/blk-settings.c | 8 +- block/blk.h | 3 + block/fops.c | 2 +- crypto/Kconfig | 3 + crypto/crypto_null.c | 37 +- crypto/ecc.c | 2 +- crypto/ecdsa-p1363.c | 2 +- crypto/ecdsa-x962.c | 4 +- drivers/acpi/ec.c | 28 + drivers/acpi/pptt.c | 4 +- drivers/android/binder.c | 2 +- drivers/ata/libata-scsi.c | 25 +- drivers/base/base.h | 17 + drivers/base/bus.c | 2 +- drivers/base/core.c | 38 +- drivers/base/dd.c | 7 +- drivers/block/ublk_drv.c | 214 +++-- drivers/char/misc.c | 2 +- drivers/char/virtio_console.c | 7 +- drivers/clk/clk.c | 4 + drivers/clk/renesas/rzv2h-cpg.c | 12 +- drivers/comedi/drivers/jr3_pci.c | 2 +- drivers/cpufreq/Kconfig.arm | 20 +- drivers/cpufreq/apple-soc-cpufreq.c | 10 +- drivers/cpufreq/cppc_cpufreq.c | 2 +- drivers/cpufreq/scmi-cpufreq.c | 10 +- drivers/cpufreq/scpi-cpufreq.c | 13 +- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 18 +- drivers/crypto/atmel-sha204a.c | 6 + drivers/crypto/ccp/sp-pci.c | 1 + drivers/cxl/core/regs.c | 4 - drivers/dma-buf/udmabuf.c | 2 +- drivers/dma/bcm2835-dma.c | 2 +- drivers/dma/dmatest.c | 6 +- drivers/firmware/stratix10-svc.c | 14 +- drivers/gpio/gpiolib-of.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 19 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.h | 2 +- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 29 +- drivers/gpu/drm/meson/meson_vclk.c | 195 ++--- drivers/gpu/drm/meson/meson_vclk.h | 13 +- drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 4 +- drivers/gpu/drm/xe/regs/xe_gt_regs.h | 4 + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 2 +- drivers/gpu/drm/xe/xe_gt.c | 4 + drivers/gpu/drm/xe/xe_gt_debugfs.c | 11 + drivers/gpu/drm/xe/xe_gt_types.h | 10 + drivers/gpu/drm/xe/xe_hw_engine.c | 18 +- drivers/gpu/drm/xe/xe_reg_whitelist.c | 4 +- drivers/gpu/drm/xe/xe_rtp.c | 6 +- drivers/gpu/drm/xe/xe_rtp.h | 2 +- drivers/gpu/drm/xe/xe_tuning.c | 71 +- drivers/gpu/drm/xe/xe_tuning.h | 3 + drivers/gpu/drm/xe/xe_wa.c | 22 +- drivers/gpu/drm/xe/xe_wa_oob.rules | 2 + drivers/i3c/master/svc-i3c-master.c | 17 +- drivers/iio/adc/ad4695.c | 34 +- drivers/iio/adc/ad7768-1.c | 5 +- drivers/infiniband/hw/qib/qib_fs.c | 1 + drivers/iommu/amd/iommu.c | 2 +- .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 2 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 + drivers/iommu/iommu.c | 3 + drivers/irqchip/irq-gic-v2m.c | 2 +- drivers/irqchip/irq-renesas-rzv2h.c | 91 +- drivers/mailbox/pcc.c | 15 +- drivers/mcb/mcb-parse.c | 2 +- drivers/md/raid1.c | 26 +- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/imx214.c | 934 ++++++++++----------- drivers/media/i2c/ov08x40.c | 78 +- drivers/misc/lkdtm/perms.c | 14 +- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 8 +- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + drivers/misc/mei/vsc-tp.c | 26 +- drivers/mmc/host/sdhci-msm.c | 2 +- drivers/net/dsa/mt7530.c | 6 +- drivers/net/ethernet/amd/pds_core/adminq.c | 36 +- drivers/net/ethernet/amd/pds_core/auxbus.c | 3 - drivers/net/ethernet/amd/pds_core/core.c | 9 +- drivers/net/ethernet/amd/pds_core/core.h | 4 +- drivers/net/ethernet/amd/pds_core/devlink.c | 4 +- drivers/net/ethernet/freescale/enetc/enetc.c | 45 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 +- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 +- .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 26 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 18 - drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 4 +- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 62 +- drivers/net/ethernet/sun/niu.c | 2 + drivers/net/phy/dp83822.c | 40 +- drivers/net/phy/microchip.c | 46 +- drivers/net/phy/phy_device.c | 53 +- drivers/net/phy/phy_led_triggers.c | 23 +- drivers/net/phy/phylink.c | 164 +++- drivers/net/virtio_net.c | 133 ++- drivers/net/vmxnet3/vmxnet3_xdp.c | 2 +- drivers/net/xen-netfront.c | 19 +- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + drivers/ntb/hw/idt/ntb_hw_idt.c | 18 +- drivers/nvme/host/core.c | 9 + drivers/nvme/host/multipath.c | 2 +- drivers/nvme/target/core.c | 3 + drivers/nvme/target/fc.c | 25 +- drivers/nvme/target/pci-epf.c | 14 +- drivers/of/resolver.c | 37 +- drivers/pci/msi/msi.c | 38 +- drivers/phy/rockchip/phy-rockchip-usbdp.c | 1 - drivers/pinctrl/pinctrl-mcp23s08.c | 23 +- drivers/pinctrl/renesas/pinctrl-rza2.c | 3 + drivers/platform/x86/x86-android-tablets/dmi.c | 14 +- drivers/platform/x86/x86-android-tablets/other.c | 160 ++-- .../x86/x86-android-tablets/x86-android-tablets.h | 3 +- drivers/pwm/core.c | 13 +- drivers/pwm/pwm-axi-pwmgen.c | 10 +- drivers/regulator/rk808-regulator.c | 4 +- drivers/rtc/rtc-pcf85063.c | 19 +- drivers/s390/char/sclp_con.c | 17 + drivers/s390/char/sclp_tty.c | 12 + drivers/s390/net/ism_drv.c | 1 - drivers/scsi/hisi_sas/hisi_sas_main.c | 20 + drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- drivers/scsi/pm8001/pm8001_sas.c | 1 + drivers/scsi/scsi.c | 36 +- drivers/scsi/scsi_lib.c | 6 +- drivers/soc/qcom/ice.c | 48 ++ drivers/spi/spi-imx.c | 5 +- drivers/spi/spi-tegra210-quad.c | 6 +- .../staging/gpib/agilent_82350b/agilent_82350b.c | 10 +- drivers/thunderbolt/tb.c | 16 +- drivers/tty/serial/msm_serial.c | 6 + drivers/tty/serial/sifive.c | 6 + drivers/tty/vt/selection.c | 5 +- drivers/ufs/core/ufs-mcq.c | 12 +- drivers/ufs/core/ufshcd.c | 2 + drivers/ufs/host/ufs-exynos.c | 44 +- drivers/ufs/host/ufs-exynos.h | 1 + drivers/ufs/host/ufs-qcom.c | 2 +- drivers/usb/cdns3/cdns3-gadget.c | 2 + drivers/usb/chipidea/ci_hdrc_imx.c | 44 +- drivers/usb/class/cdc-wdm.c | 21 +- drivers/usb/core/quirks.c | 9 + drivers/usb/dwc3/dwc3-pci.c | 10 + drivers/usb/dwc3/dwc3-xilinx.c | 4 +- drivers/usb/dwc3/gadget.c | 28 +- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 3 + drivers/usb/host/max3421-hcd.c | 7 + drivers/usb/host/ohci-pci.c | 23 + drivers/usb/host/xhci-hub.c | 30 +- drivers/usb/host/xhci-mvebu.c | 10 - drivers/usb/host/xhci-mvebu.h | 6 - drivers/usb/host/xhci-plat.c | 2 +- drivers/usb/host/xhci-ring.c | 75 +- drivers/usb/host/xhci.c | 4 +- drivers/usb/host/xhci.h | 4 +- drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 5 + drivers/usb/serial/option.c | 3 + drivers/usb/serial/usb-serial-simple.c | 7 + drivers/usb/storage/unusual_uas.h | 7 + drivers/usb/typec/class.c | 24 +- drivers/usb/typec/class.h | 1 + drivers/usb/typec/ucsi/cros_ec_ucsi.c | 5 +- drivers/usb/typec/ucsi/ucsi.c | 19 +- drivers/usb/typec/ucsi/ucsi.h | 6 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 5 +- drivers/usb/typec/ucsi/ucsi_ccg.c | 67 +- drivers/vhost/scsi.c | 80 +- drivers/virtio/virtio_pci_modern.c | 4 +- drivers/xen/Kconfig | 2 +- fs/btrfs/file.c | 9 +- fs/btrfs/zoned.c | 1 - fs/ceph/inode.c | 2 +- fs/ext4/block_validity.c | 5 +- fs/ext4/inode.c | 7 +- fs/iomap/buffered-io.c | 2 +- fs/namespace.c | 69 +- fs/netfs/main.c | 4 + fs/ntfs3/file.c | 20 +- fs/smb/client/sess.c | 60 +- fs/smb/client/smb1ops.c | 36 + fs/smb/server/vfs_cache.c | 8 +- fs/splice.c | 2 +- fs/xattr.c | 4 +- include/linux/blkdev.h | 4 - include/linux/energy_model.h | 12 +- include/linux/math.h | 12 + include/linux/msi.h | 3 +- include/linux/pci.h | 2 + include/linux/pci_ids.h | 1 + include/linux/phy.h | 4 + include/linux/phylink.h | 4 + include/net/netfilter/nft_fib.h | 21 + include/soc/qcom/ice.h | 2 + include/uapi/linux/virtio_pci.h | 1 + init/Kconfig | 2 +- io_uring/io_uring.c | 15 +- io_uring/refs.h | 7 + kernel/bpf/bpf_cgrp_storage.c | 11 +- kernel/bpf/hashtab.c | 6 +- kernel/bpf/preload/bpf_preload_kern.c | 1 + kernel/bpf/syscall.c | 6 +- kernel/bpf/verifier.c | 32 + kernel/cgroup/cgroup.c | 29 + kernel/cgroup/cpuset-internal.h | 1 + kernel/cgroup/cpuset.c | 14 + kernel/dma/contiguous.c | 3 +- kernel/events/core.c | 6 +- kernel/irq/msi.c | 2 +- kernel/panic.c | 6 + kernel/power/energy_model.c | 47 +- kernel/sched/ext.c | 4 +- kernel/sched/fair.c | 4 +- kernel/time/tick-common.c | 22 + kernel/trace/bpf_trace.c | 7 +- kernel/trace/trace.c | 10 + lib/Kconfig.ubsan | 1 - lib/crypto/Kconfig | 37 +- lib/test_ubsan.c | 18 +- mm/vmscan.c | 7 + net/9p/client.c | 30 +- net/9p/trans_fd.c | 17 +- net/core/lwtunnel.c | 26 +- net/core/selftests.c | 18 +- net/ipv4/netfilter/nft_fib_ipv4.c | 11 +- net/ipv6/netfilter/nft_fib_ipv6.c | 19 +- net/mptcp/pm_userspace.c | 6 +- net/sched/sch_hfsc.c | 23 +- net/tipc/monitor.c | 3 +- rust/Makefile | 8 +- rust/kernel/firmware.rs | 8 +- scripts/Makefile.lib | 2 +- scripts/Makefile.vmlinux | 4 + sound/soc/codecs/aw88081.c | 10 + sound/soc/codecs/wcd934x.c | 2 +- sound/soc/fsl/fsl_asrc_dma.c | 15 +- sound/virtio/virtio_pcm.c | 21 +- tools/arch/x86/lib/x86-opcode-map.txt | 4 +- tools/bpf/bpftool/prog.c | 1 + tools/objtool/check.c | 36 +- tools/testing/selftests/bpf/cap_helpers.c | 8 +- tools/testing/selftests/bpf/cap_helpers.h | 1 + tools/testing/selftests/bpf/network_helpers.c | 33 +- tools/testing/selftests/bpf/prog_tests/verifier.c | 4 +- tools/testing/selftests/bpf/test_loader.c | 6 +- tools/testing/selftests/mincore/mincore_selftest.c | 3 - tools/testing/selftests/pcie_bwctrl/Makefile | 3 +- tools/testing/selftests/ublk/test_stripe_04.sh | 24 + 329 files changed, 3712 insertions(+), 2060 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 2/311 soc: qcom: ice: introduce devm_of_qcom_ice_get
6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit 1c13d6060d612601a61423f2e8fbf9e48126acca ]
Callers of of_qcom_ice_get() leak the device reference taken by of_find_device_by_node(). Introduce devm variant for of_qcom_ice_get(). Existing consumers need the ICE instance for the entire life of their device, thus exporting qcom_ice_put() is not required.
Stable-dep-of: cbef7442fba5 ("mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get")
--- drivers/soc/qcom/ice.c | 48 ++++++++++++++++++++++++++++++++++++++++++ include/soc/qcom/ice.h | 2 ++ 2 files changed, 50 insertions(+)
drivers/soc/qcom/ice.c +48 -0
@@ -11,6 +11,7 @@#include <linux/cleanup.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/device.h> #include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_platform.h>
@@ -324,6 +325,53 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) }EXPORT_SYMBOL_GPL (of_qcom_ice_get); +static void qcom_ice_put (const struct qcom_ice *ice) +{ +struct platform_device *pdev =to_platform_device (ice->dev); + +if (!platform_get_resource_byname (pdev,IORESOURCE_MEM ,"ice" )) +platform_device_put (pdev); +} + +static void devm_of_qcom_ice_put (struct device *dev,void *res) +{ +qcom_ice_put (*(struct qcom_ice **)res); +} + +/** +* devm_of_qcom_ice_get() - Devres managed helper to get an ICE instance from +* a DT node. +* @dev: device pointer for the consumer device. +* +* This function will provide an ICE instance either by creating one for the +* consumer device if its DT node provides the 'ice' reg range and the 'ice' +* clock (for legacy DT style). On the other hand, if consumer provides a +* phandle via 'qcom,ice' property to an ICE DT, the ICE instance will already +* be created and so this function will return that instead. +* +* Return: ICE pointer on success, NULL if there is no ICE data provided by the +* consumer or ERR_PTR() on error. +*/ +struct qcom_ice *devm_of_qcom_ice_get (struct device *dev) +{ +struct qcom_ice *ice, **dr; + + dr =devres_alloc (devm_of_qcom_ice_put,sizeof (*dr),GFP_KERNEL ); +if (!dr) +return ERR_PTR (-ENOMEM ); + + ice =of_qcom_ice_get (dev); +if (!IS_ERR_OR_NULL (ice)) { + *dr = ice; +devres_add (dev, dr); + }else { +devres_free (dr); + } + +return ice; +} +EXPORT_SYMBOL_GPL (devm_of_qcom_ice_get); +static int qcom_ice_probe (struct platform_device *pdev) {struct qcom_ice *engine;
include/soc/qcom/ice.h +2 -0
@@ -34,4 +34,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, int slot);int qcom_ice_evict_key (struct qcom_ice *ice,int slot);struct qcom_ice *of_qcom_ice_get (struct device *dev); +struct qcom_ice *devm_of_qcom_ice_get (struct device *dev); +#endif /* __QCOM_ICE_H__ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 11/311 media: i2c: imx214: Fix link frequency validation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit acc294519f1749041e1b8c74d46bbf6c57d8b061 ]
The driver defines IMX214_DEFAULT_LINK_FREQ 480000000, and then IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10), which works out as 384MPix/s. (The 8 is 4 lanes and DDR.)
Parsing the PLL registers with the defined 24MHz input. We're in single PLL mode, so MIPI frequency is directly linked to pixel rate. VTCK ends up being 1200MHz, and VTPXCK and OPPXCK both are 120MHz. Section 5.3 "Frame rate calculation formula" says "Pixel rate
[pixels/s] = VTPXCK [MHz] * 4", so 120 * 4 = 480MPix/s, which basically agrees with my number above.
3.1.4. MIPI global timing setting says "Output bitrate = OPPXCK * reg 0x113[7:0]", so 120MHz * 10, or 1200Mbit/s. That would be a link frequency of 600MHz due to DDR.
That also matches to 480MPix/s * 10bpp / 4 lanes / 2 for DDR.
Keep the previous link frequency for backward compatibility.
--- drivers/media/i2c/imx214.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/media/i2c/imx214.c +19 -9
@@ -27,7 +27,9 @@#define IMX214_REG_FAST_STANDBY_CTRL CCI_REG8(0x0106)#define IMX214_DEFAULT_CLK_FREQ 24000000 -#define IMX214_DEFAULT_LINK_FREQ 480000000 +#define IMX214_DEFAULT_LINK_FREQ 600000000 +/* Keep wrong link frequency for backward compatibility */ +#define IMX214_DEFAULT_LINK_FREQ_LEGACY 480000000#define IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10)#define IMX214_FPS 30#define IMX214_MBUS_CODE MEDIA_BUS_FMT_SRGGB10_1X10
@@ -965,18 +967,26 @@ static int imx214_parse_fwnode(struct device *dev) goto done; } -for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) +if (bus_cfg.nr_of_link_frequencies !=1 ) +dev_warn (dev,"Only one link-frequency supported, please review your DT. Continuing anyway\n" ); + +for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) {if (bus_cfg.link_frequencies[i] ==IMX214_DEFAULT_LINK_FREQ )break ; - -if (i == bus_cfg.nr_of_link_frequencies) { -dev_err_probe (dev, -EINVAL , -"link-frequencies %d not supported, Please review your DT\n" , -IMX214_DEFAULT_LINK_FREQ ); - ret = -EINVAL ; - goto done; +if (bus_cfg.link_frequencies[i] == +IMX214_DEFAULT_LINK_FREQ_LEGACY ) { +dev_warn (dev, +"link-frequencies %d not supported, please review your DT. Continuing anyway\n" , +IMX214_DEFAULT_LINK_FREQ ); +break ; + } } +if (i == bus_cfg.nr_of_link_frequencies) + ret =dev_err_probe (dev, -EINVAL , +"link-frequencies %d not supported, please review your DT\n" , +IMX214_DEFAULT_LINK_FREQ ); + done:v4l2_fwnode_endpoint_free (&bus_cfg);fwnode_handle_put (endpoint);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 12/311 media: ov08x40: Move ov08x40_identify_module() function up
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 7a39639e448f070cbe37317ac922886b6080ff43 ]
Move the ov08x40_identify_module() function to above ov08x40_set_stream() this is a preparation patch for adding a missing ov08x40_identify_module() call to ov08x40_set_stream().
No functional changes, just moving code around.
Stable-dep-of: ebf185efadb7 ("media: ov08x40: Add missing ov08x40_identify_module() call on stream-start")
--- drivers/media/i2c/ov08x40.c | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/media/i2c/ov08x40.c +26 -26
@@ -1937,6 +1937,32 @@ static int ov08x40_stop_streaming(struct ov08x40 *ov08x) OV08X40_REG_VALUE_08BIT, OV08X40_MODE_STANDBY); } +/* Verify chip ID */ +static int ov08x40_identify_module (struct ov08x40 *ov08x) +{ +struct i2c_client *client =v4l2_get_subdevdata (&ov08x->sd); +int ret; +u32 val; + +if (ov08x->identified) +return 0 ; + + ret =ov08x40_read_reg (ov08x,OV08X40_REG_CHIP_ID , +OV08X40_REG_VALUE_24BIT , &val); +if (ret) +return ret; + +if (val !=OV08X40_CHIP_ID ) { +dev_err (&client->dev,"chip id mismatch: %x!=%x\n" , +OV08X40_CHIP_ID , val); +return -ENXIO ; + } + + ov08x->identified = true; + +return 0 ; +} +static int ov08x40_set_stream (struct v4l2_subdev *sd,int enable) {struct ov08x40 *ov08x =to_ov08x40 (sd);
@@ -1974,32 +2000,6 @@ static int ov08x40_set_stream(struct v4l2_subdev *sd, int enable)return ret; } -/* Verify chip ID */ -static int ov08x40_identify_module (struct ov08x40 *ov08x) -{ -struct i2c_client *client =v4l2_get_subdevdata (&ov08x->sd); -int ret; -u32 val; - -if (ov08x->identified) -return 0 ; - - ret =ov08x40_read_reg (ov08x,OV08X40_REG_CHIP_ID , -OV08X40_REG_VALUE_24BIT , &val); -if (ret) -return ret; - -if (val !=OV08X40_CHIP_ID ) { -dev_err (&client->dev,"chip id mismatch: %x!=%x\n" , -OV08X40_CHIP_ID , val); -return -ENXIO ; - } - - ov08x->identified = true; - -return 0 ; -} -static const struct v4l2_subdev_video_ops ov08x40_video_ops = { .s_stream = ov08x40_set_stream, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 13/311 media: ov08x40: Add missing ov08x40_identify_module() call on stream-start
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit ebf185efadb71bd5344877be683895b6b18d7edf ]
The driver might skip the ov08x40_identify_module() on probe() based on the acpi_dev_state_d0() check done in probe().
If the ov08x40_identify_module() call is skipped on probe() it should be done on the first stream start. Add the missing call.
Note ov08x40_identify_module() will only do something on its first call, subsequent calls are no-ops.
--- drivers/media/i2c/ov08x40.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/ov08x40.c +4 -0
@@ -1976,6 +1976,10 @@ static int ov08x40_set_stream(struct v4l2_subdev *sd, int enable)if (ret <0 ) goto err_unlock; + ret =ov08x40_identify_module (ov08x); +if (ret) + goto err_rpm_put; +/* * Apply default & customized values * and then start streaming.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 14/311 iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Cameron <[email protected]>
[ Upstream commit 0af1c801a15225304a6328258efbf2bee245c654 ]
The data used is all in local variables so there is no advantage in setting *val = ret with the direct mode claim held. Move it later to after error check.
Stable-dep-of: 8236644f5ecb ("iio: adc: ad7768-1: Fix conversion result sign")
--- drivers/iio/adc/ad7768-1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +1 -2
@@ -370,12 +370,11 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,return ret; ret =ad7768_scan_direct (indio_dev); -if (ret >=0 ) - *val = ret;iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; + *val = ret;return IIO_VAL_INT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 15/311 iio: adc: ad7768-1: Fix conversion result sign
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergiu Cuciurean <[email protected]>
[ Upstream commit 8236644f5ecb180e80ad92d691c22bc509b747bb ]
The ad7768-1 ADC output code is two's complement, meaning that the voltage conversion result is a signed value.. Since the value is a 24 bit one, stored in a 32 bit variable, the sign should be extended in order to get the correct representation.
Also the channel description has been updated to signed representation, to match the ADC specifications.
--- drivers/iio/adc/ad7768-1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +2 -2
@@ -142,7 +142,7 @@ static const struct iio_chan_spec ad7768_channels[] = { .channel = 0, .scan_index = 0, .scan_type = { - .sign = 'u', + .sign = 's', .realbits = 24, .storagebits = 32, .shift = 8,
@@ -374,7 +374,7 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; - *val = ret; + *val =sign_extend32 (ret, chan->scan_type.realbits -1 );return IIO_VAL_INT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 16/311 of: resolver: Simplify of_resolve_phandles() using __free()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring (Arm) <[email protected]>
[ Upstream commit 5275e8b5293f65cc82a5ee5eab02dd573b911d6e ]
Use the __free() cleanup to simplify of_resolve_phandles() and remove all the goto's.
Stable-dep-of: a46a0805635d ("of: resolver: Fix device node refcount leakage in of_resolve_phandles()")
--- drivers/of/resolver.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-)
drivers/of/resolver.c +11 -23
@@ -250,24 +250,20 @@ static int adjust_local_phandle_references(const struct device_node *local_fixupint of_resolve_phandles (struct device_node *overlay) {struct device_node *child, *local_fixups, *refnode; -struct device_node *tree_symbols, *overlay_fixups; +struct device_node *overlay_fixups;struct property *prop;const char *refpath;phandle phandle, phandle_delta;int err; - tree_symbols =NULL ; -if (!overlay) {pr_err ("null overlay\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; }if (!of_node_check_flag (overlay,OF_DETACHED )) {pr_err ("overlay not detached\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; } phandle_delta =live_tree_max_phandle () +1 ;
@@ -279,7 +275,7 @@ int of_resolve_phandles(struct device_node *overlay) err =adjust_local_phandle_references (local_fixups, overlay, phandle_delta);if (err) - goto out; +return err; overlay_fixups =NULL ;
@@ -288,16 +284,13 @@ int of_resolve_phandles(struct device_node *overlay) overlay_fixups = child; } -if (!overlay_fixups) { - err =0 ; - goto out; - } +if (!overlay_fixups) +return 0 ; - tree_symbols =of_find_node_by_path ("/__symbols__" ); + struct device_node __free(device_node) *tree_symbols = of_find_node_by_path("/__symbols__");if (!tree_symbols) {pr_err ("no symbols in root of device tree.\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; }for_each_property_of_node (overlay_fixups, prop) {
@@ -311,14 +304,12 @@ int of_resolve_phandles(struct device_node *overlay)if (err) {pr_err ("node label '%s' not found in live devicetree symbols table\n" , prop->name); - goto out; +return err; } refnode =of_find_node_by_path (refpath); -if (!refnode) { - err = -ENOENT ; - goto out; - } +if (!refnode) +return -ENOENT ; phandle = refnode->phandle;of_node_put (refnode);
@@ -328,11 +319,8 @@ int of_resolve_phandles(struct device_node *overlay)break ; } -out:if (err)pr_err ("overlay phandle fixup failed: %d\n" , err); -of_node_put (tree_symbols); -return err; }EXPORT_SYMBOL_GPL (of_resolve_phandles);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 17/311 of: resolver: Fix device node refcount leakage in of_resolve_phandles()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit a46a0805635d07de50c2ac71588345323c13b2f9 ]
In of_resolve_phandles(), refcount of device node @local_fixups will be increased if the for_each_child_of_node() exits early, but nowhere to decrease the refcount, so cause refcount leakage for the node.
Fix by using __free() on @local_fixups.
--- drivers/of/resolver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/of/resolver.c +2 -1
@@ -249,8 +249,9 @@ static int adjust_local_phandle_references(const struct device_node *local_fixup*/ int of_resolve_phandles (struct device_node *overlay) { -struct device_node *child, *local_fixups, *refnode; +struct device_node *child, *refnode;struct device_node *overlay_fixups; + struct device_node __free(device_node) *local_fixups = NULL;struct property *prop;const char *refpath;phandle phandle, phandle_delta;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 3/311 mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit cbef7442fba510b7eb229dcc9f39d3dde4a159a4 ]
The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
--- drivers/mmc/host/sdhci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-msm.c +1 -1
@@ -1873,7 +1873,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host,if (!(cqhci_readl (cq_host,CQHCI_CAP ) &CQHCI_CAP_CS ))return 0 ; - ice =of_qcom_ice_get (dev); + ice =devm_of_qcom_ice_get (dev);if (ice ==ERR_PTR (-EOPNOTSUPP )) {dev_warn (dev,"Disabling inline encryption support\n" ); ice =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 4/311 PM: EM: use kfree_rcu() to simplify the code
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit 1618f635bdf56f3ac158171114e9bf18db234cbf ]
The callback function of call_rcu() just calls kfree(), so use kfree_rcu() instead of call_rcu() + callback function.
Stable-dep-of: 3ee7be9e10dd ("PM: EM: Address RCU-related sparse warnings")
--- kernel/power/energy_model.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
kernel/power/energy_model.c +1 -9
@@ -161,14 +161,6 @@ static void em_debug_create_pd(struct device *dev) {}static void em_debug_remove_pd (struct device *dev) {}#endif -static void em_destroy_table_rcu (struct rcu_head *rp) -{ -struct em_perf_table __rcu *table; - - table = container_of(rp, struct em_perf_table, rcu); -kfree (table); -} -static void em_release_table_kref (struct kref *kref) {struct em_perf_table __rcu *table;
@@ -176,7 +168,7 @@ static void em_release_table_kref(struct kref *kref)/* It was the last owner of this table so we can free */ table = container_of(kref, struct em_perf_table, kref); -call_rcu (&table->rcu, em_destroy_table_rcu); +kfree_rcu (table, rcu); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 5/311 PM: EM: Address RCU-related sparse warnings
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 3ee7be9e10dd5f79448788b899591d4bd2bf0c19 ]
The usage of __rcu in the Energy Model code is quite inconsistent which causes the following sparse warnings to trigger:
kernel/power/energy_model.c:169:15: warning: incorrect type in assignment (different address spaces)kernel/power/energy_model.c:169:15: expected struct em_perf_table [noderef] __rcu *tablekernel/power/energy_model.c:169:15: got struct em_perf_table *kernel/power/energy_model.c:171:9: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:171:9: expected struct callback_head *headkernel/power/energy_model.c:171:9: got struct callback_head [noderef] __rcu *kernel/power/energy_model.c:171:9: warning: cast removes address space '__rcu' of expression kernel/power/energy_model.c:182:19: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:182:19: expected struct kref *krefkernel/power/energy_model.c:182:19: got struct kref [noderef] __rcu *kernel/power/energy_model.c:200:15: warning: incorrect type in assignment (different address spaces)kernel/power/energy_model.c:200:15: expected struct em_perf_table [noderef] __rcu *tablekernel/power/energy_model.c:200:15: got void *[assigned] _reskernel/power/energy_model.c:204:20: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:204:20: expected struct kref *krefkernel/power/energy_model.c:204:20: got struct kref [noderef] __rcu *kernel/power/energy_model.c:320:19: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:320:19: expected struct kref *krefkernel/power/energy_model.c:320:19: got struct kref [noderef] __rcu *kernel/power/energy_model.c:325:45: warning: incorrect type in argument 2 (different address spaces)kernel/power/energy_model.c:325:45: expected struct em_perf_state *tablekernel/power/energy_model.c:325:45: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:425:45: warning: incorrect type in argument 3 (different address spaces)kernel/power/energy_model.c:425:45: expected struct em_perf_state *tablekernel/power/energy_model.c:425:45: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:442:15: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:442:15: expected void const *objpkernel/power/energy_model.c:442:15: got struct em_perf_table [noderef] __rcu *[assigned] em_tablekernel/power/energy_model.c:626:55: warning: incorrect type in argument 2 (different address spaces)kernel/power/energy_model.c:626:55: expected struct em_perf_state *tablekernel/power/energy_model.c:626:55: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:681:16: warning: incorrect type in assignment (different address spaces)kernel/power/energy_model.c:681:16: expected struct em_perf_state *new_pskernel/power/energy_model.c:681:16: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:699:37: warning: incorrect type in argument 2 (different address spaces)kernel/power/energy_model.c:699:37: expected struct em_perf_state *tablekernel/power/energy_model.c:699:37: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:733:38: warning: incorrect type in argument 3 (different address spaces)kernel/power/energy_model.c:733:38: expected struct em_perf_state *tablekernel/power/energy_model.c:733:38: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:855:53: warning: dereference of noderef expression kernel/power/energy_model.c:864:32: warning: dereference of noderef expression
This is because the __rcu annotation for sparse is only applicable to pointers that need rcu_dereference() or equivalent for protection, which basically means pointers assigned with rcu_assign_pointer().
Make all of the above sparse warnings go away by cleaning up the usage of __rcu and using rcu_dereference_protected() where applicable.
--- include/linux/energy_model.h | 12 +++++------ kernel/power/energy_model.c | 39 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 25 deletions(-)
include/linux/energy_model.h +6 -6
@@ -167,13 +167,13 @@ struct em_data_callback {struct em_perf_domain *em_cpu_get (int cpu);struct em_perf_domain *em_pd_get (struct device *dev);int em_dev_update_perf_domain (struct device *dev, -struct em_perf_table __rcu *new_table); +struct em_perf_table *new_table);int em_dev_register_perf_domain (struct device *dev,unsigned int nr_states,struct em_data_callback *cb,cpumask_t *span,bool microwatts);void em_dev_unregister_perf_domain (struct device *dev); -struct em_perf_table __rcu *em_table_alloc (struct em_perf_domain *pd); -void em_table_free (struct em_perf_table __rcu *table); +struct em_perf_table *em_table_alloc (struct em_perf_domain *pd); +void em_table_free (struct em_perf_table *table);int em_dev_compute_costs (struct device *dev,struct em_perf_state *table,int nr_states);int em_dev_update_chip_binning (struct device *dev);
@@ -373,14 +373,14 @@ static inline int em_pd_nr_perf_states(struct em_perf_domain *pd)return 0 ; }static inline -struct em_perf_table __rcu *em_table_alloc (struct em_perf_domain *pd) +struct em_perf_table *em_table_alloc (struct em_perf_domain *pd) {return NULL ; } -static inline void em_table_free (struct em_perf_table __rcu *table) {} +static inline void em_table_free (struct em_perf_table *table) {}static inline int em_dev_update_perf_domain (struct device *dev, -struct em_perf_table __rcu *new_table) +struct em_perf_table *new_table) {return -EINVAL ; }
kernel/power/energy_model.c +20 -19
@@ -163,12 +163,8 @@ static void em_debug_remove_pd(struct device *dev) {}static void em_release_table_kref (struct kref *kref) { -struct em_perf_table __rcu *table; -/* It was the last owner of this table so we can free */ - table = container_of(kref, struct em_perf_table, kref); - -kfree_rcu (table, rcu); + kfree_rcu(container_of(kref, struct em_perf_table, kref), rcu); }/**
@@ -177,7 +173,7 @@ static void em_release_table_kref(struct kref *kref)* * No return values. */ -void em_table_free (struct em_perf_table __rcu *table) +void em_table_free (struct em_perf_table *table) {kref_put (&table->kref, em_release_table_kref); }
@@ -190,9 +186,9 @@ void em_table_free(struct em_perf_table __rcu *table)* has a user. * Returns allocated table or NULL. */ -struct em_perf_table __rcu *em_table_alloc (struct em_perf_domain *pd) +struct em_perf_table *em_table_alloc (struct em_perf_domain *pd) { -struct em_perf_table __rcu *table; +struct em_perf_table *table;int table_size; table_size =sizeof (struct em_perf_state ) * pd->nr_perf_states;
@@ -300,9 +296,9 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,* Return 0 on success or an error code on failure. */ int em_dev_update_perf_domain (struct device *dev, -struct em_perf_table __rcu *new_table) +struct em_perf_table *new_table) { -struct em_perf_table __rcu *old_table; +struct em_perf_table *old_table;struct em_perf_domain *pd;if (!dev)
@@ -319,7 +315,8 @@ int em_dev_update_perf_domain(struct device *dev,kref_get (&new_table->kref); - old_table = pd->em_table; + old_table =rcu_dereference_protected (pd->em_table, +lockdep_is_held (&em_pd_mutex));rcu_assign_pointer (pd->em_table, new_table);em_cpufreq_update_efficiencies (dev, new_table->state);
@@ -391,7 +388,7 @@ static int em_create_pd(struct device *dev, int nr_states, struct em_data_callback *cb, cpumask_t *cpus, unsigned long flags) { - struct em_perf_table __rcu *em_table; + struct em_perf_table *em_table;struct em_perf_domain *pd;struct device *cpu_dev;int cpu, ret, num_cpus;
@@ -551,6 +548,7 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states, struct em_data_callback *cb, cpumask_t *cpus, bool microwatts) { + struct em_perf_table *em_table;unsigned long cap, prev_cap =0 ;unsigned long flags =0 ;int cpu, ret;
@@ -623,7 +621,9 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states, dev->em_pd->min_perf_state =0 ; dev->em_pd->max_perf_state = nr_states -1 ; -em_cpufreq_update_efficiencies (dev, dev->em_pd->em_table->state); + em_table =rcu_dereference_protected (dev->em_pd->em_table, +lockdep_is_held (&em_pd_mutex)); +em_cpufreq_update_efficiencies (dev, em_table->state);em_debug_create_pd (dev);dev_info (dev,"EM: created perf domain\n" );
@@ -660,7 +660,8 @@ void em_dev_unregister_perf_domain(struct device *dev)mutex_lock (&em_pd_mutex);em_debug_remove_pd (dev); -em_table_free (dev->em_pd->em_table); +em_table_free (rcu_dereference_protected (dev->em_pd->em_table, +lockdep_is_held (&em_pd_mutex)));kfree (dev->em_pd); dev->em_pd =NULL ;
@@ -668,9 +669,9 @@ void em_dev_unregister_perf_domain(struct device *dev) }EXPORT_SYMBOL_GPL (em_dev_unregister_perf_domain); -static struct em_perf_table __rcu *em_table_dup (struct em_perf_domain *pd) +static struct em_perf_table *em_table_dup (struct em_perf_domain *pd) { -struct em_perf_table __rcu *em_table; +struct em_perf_table *em_table;struct em_perf_state *ps, *new_ps;int ps_size;
@@ -692,7 +693,7 @@ static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd) }static int em_recalc_and_update (struct device *dev,struct em_perf_domain *pd, -struct em_perf_table __rcu *em_table) +struct em_perf_table *em_table) {int ret;
@@ -723,7 +724,7 @@ static void em_adjust_new_capacity(struct device *dev, struct em_perf_domain *pd, u64 max_cap) { -struct em_perf_table __rcu *em_table; +struct em_perf_table *em_table; em_table =em_table_dup (pd);if (!em_table) {
@@ -814,7 +815,7 @@ static void em_update_workfn(struct work_struct *work)*/ int em_dev_update_chip_binning (struct device *dev) { -struct em_perf_table __rcu *em_table; +struct em_perf_table *em_table;struct em_perf_domain *pd;int i, ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 6/311 media: i2c: imx214: Use subdev active state
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit b6832ff659f55f86198bb8de40f278a20bda0920 ]
Port the imx214 sensor driver to use the subdev active state.
Move all the format configuration to the subdevice state and simplify the format handling, locking and initialization.
While at it, simplify imx214_start_streaming() by removing unneeded goto statements and the corresponding error label.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 155 ++++++++++++------------------------- 1 file changed, 50 insertions(+), 105 deletions(-)
drivers/media/i2c/imx214.c +50 -105
@@ -59,8 +59,6 @@ struct imx214 {struct v4l2_subdev sd;struct media_pad pad; -struct v4l2_mbus_framefmt fmt; -struct v4l2_rect crop;struct v4l2_ctrl_handler ctrls;struct v4l2_ctrl *pixel_rate;
@@ -71,12 +69,6 @@ struct imx214 {struct regulator_bulk_data supplies[IMX214_NUM_SUPPLIES ];struct gpio_desc *enable_gpio; - -/* -* Serialize control access, get/set format, get selection -* and start streaming. -*/ -struct mutex mutex; };struct reg_8 {
@@ -490,6 +482,22 @@ static int __maybe_unused imx214_power_off(struct device *dev)return 0 ; } +static void imx214_update_pad_format (struct imx214 *imx214, +const struct imx214_mode *mode, +struct v4l2_mbus_framefmt *fmt,u32 code) +{ + fmt->code =IMX214_MBUS_CODE ; + fmt->width = mode->width; + fmt->height = mode->height; + fmt->field =V4L2_FIELD_NONE ; + fmt->colorspace =V4L2_COLORSPACE_SRGB ; + fmt->ycbcr_enc =V4L2_MAP_YCBCR_ENC_DEFAULT (fmt->colorspace); + fmt->quantization =V4L2_MAP_QUANTIZATION_DEFAULT (true, + fmt->colorspace, + fmt->ycbcr_enc); + fmt->xfer_func =V4L2_MAP_XFER_FUNC_DEFAULT (fmt->colorspace); +} +static int imx214_enum_mbus_code (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state,struct v4l2_subdev_mbus_code_enum *code)
@@ -549,52 +557,6 @@ static const struct v4l2_subdev_core_ops imx214_core_ops = {#endif }; -static struct v4l2_mbus_framefmt * -__imx214_get_pad_format (struct imx214 *imx214, -struct v4l2_subdev_state *sd_state, -unsigned int pad, -enum v4l2_subdev_format_whence which) -{ -switch (which) { -case V4L2_SUBDEV_FORMAT_TRY : -return v4l2_subdev_state_get_format (sd_state, pad); -case V4L2_SUBDEV_FORMAT_ACTIVE : -return &imx214->fmt; -default : -return NULL ; - } -} - -static int imx214_get_format (struct v4l2_subdev *sd, -struct v4l2_subdev_state *sd_state, -struct v4l2_subdev_format *format) -{ -struct imx214 *imx214 =to_imx214 (sd); - -mutex_lock (&imx214->mutex); - format->format = *__imx214_get_pad_format (imx214, sd_state, - format->pad, - format->which); -mutex_unlock (&imx214->mutex); - -return 0 ; -} - -static struct v4l2_rect * -__imx214_get_pad_crop (struct imx214 *imx214, -struct v4l2_subdev_state *sd_state, -unsigned int pad,enum v4l2_subdev_format_whence which) -{ -switch (which) { -case V4L2_SUBDEV_FORMAT_TRY : -return v4l2_subdev_state_get_crop (sd_state, pad); -case V4L2_SUBDEV_FORMAT_ACTIVE : -return &imx214->crop; -default : -return NULL ; - } -} -static int imx214_set_format (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state,struct v4l2_subdev_format *format)
@@ -604,34 +566,20 @@ static int imx214_set_format(struct v4l2_subdev *sd,struct v4l2_rect *__crop;const struct imx214_mode *mode; -mutex_lock (&imx214->mutex); - - __crop =__imx214_get_pad_crop (imx214, sd_state, format->pad, - format->which); - mode =v4l2_find_nearest_size (imx214_modes,ARRAY_SIZE (imx214_modes), width, height, format->format.width, format->format.height); - __crop->width = mode->width; - __crop->height = mode->height; - - __format =__imx214_get_pad_format (imx214, sd_state, format->pad, - format->which); - __format->width = __crop->width; - __format->height = __crop->height; - __format->code =IMX214_MBUS_CODE ; - __format->field =V4L2_FIELD_NONE ; - __format->colorspace =V4L2_COLORSPACE_SRGB ; - __format->ycbcr_enc =V4L2_MAP_YCBCR_ENC_DEFAULT (__format->colorspace); - __format->quantization =V4L2_MAP_QUANTIZATION_DEFAULT (true, - __format->colorspace, __format->ycbcr_enc); - __format->xfer_func =V4L2_MAP_XFER_FUNC_DEFAULT (__format->colorspace); +imx214_update_pad_format (imx214, mode, &format->format, + format->format.code); + __format =v4l2_subdev_state_get_format (sd_state,0 ); - format->format = *__format; + *__format = format->format; -mutex_unlock (&imx214->mutex); + __crop =v4l2_subdev_state_get_crop (sd_state,0 ); + __crop->width = mode->width; + __crop->height = mode->height;return 0 ; }
@@ -640,14 +588,9 @@ static int imx214_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_selection *sel) { - struct imx214 *imx214 = to_imx214(sd); -switch (sel->target) {case V4L2_SEL_TGT_CROP : -mutex_lock (&imx214->mutex); - sel->r = *__imx214_get_pad_crop (imx214, sd_state, sel->pad, - sel->which); -mutex_unlock (&imx214->mutex); + sel->r = *v4l2_subdev_state_get_crop (sd_state,0 );return 0 ;case V4L2_SEL_TGT_NATIVE_SIZE :
@@ -826,40 +769,35 @@ static int imx214_write_table(struct imx214 *imx214,static int imx214_start_streaming (struct imx214 *imx214) { +const struct v4l2_mbus_framefmt *fmt; +struct v4l2_subdev_state *state;const struct imx214_mode *mode;int ret; -mutex_lock (&imx214->mutex); ret =imx214_write_table (imx214, mode_table_common);if (ret <0 ) {dev_err (imx214->dev,"could not sent common table %d\n" , ret); - goto error; +return ret; } - mode =v4l2_find_nearest_size (imx214_modes, -ARRAY_SIZE (imx214_modes), width, height, - imx214->fmt.width, imx214->fmt.height); + state =v4l2_subdev_get_locked_active_state (&imx214->sd); + fmt =v4l2_subdev_state_get_format (state,0 ); + mode =v4l2_find_nearest_size (imx214_modes,ARRAY_SIZE (imx214_modes), + width, height, fmt->width, fmt->height); ret =imx214_write_table (imx214, mode->reg_table);if (ret <0 ) {dev_err (imx214->dev,"could not sent mode table %d\n" , ret); - goto error; +return ret; } ret =__v4l2_ctrl_handler_setup (&imx214->ctrls);if (ret <0 ) {dev_err (imx214->dev,"could not sync v4l2 controls\n" ); - goto error; +return ret; } ret =regmap_write (imx214->regmap,IMX214_REG_MODE_SELECT ,IMX214_MODE_STREAMING ); -if (ret <0 ) { +if (ret <0 )dev_err (imx214->dev,"could not sent start table %d\n" , ret); - goto error; - } -mutex_unlock (&imx214->mutex); -return 0 ; - -error: -mutex_unlock (&imx214->mutex);return ret; }
@@ -877,6 +815,7 @@ static int imx214_stop_streaming(struct imx214 *imx214)static int imx214_s_stream (struct v4l2_subdev *subdev,int enable) {struct imx214 *imx214 =to_imx214 (subdev); +struct v4l2_subdev_state *state;int ret;if (enable) {
@@ -884,7 +823,9 @@ static int imx214_s_stream(struct v4l2_subdev *subdev, int enable)if (ret <0 )return ret; + state =v4l2_subdev_lock_and_get_active_state (subdev); ret =imx214_start_streaming (imx214); +v4l2_subdev_unlock_state (state);if (ret <0 ) goto err_rpm_put; }else {
@@ -948,7 +889,7 @@ static const struct v4l2_subdev_pad_ops imx214_subdev_pad_ops = { .enum_mbus_code = imx214_enum_mbus_code, .enum_frame_size = imx214_enum_frame_size, .enum_frame_interval = imx214_enum_frame_interval, - .get_fmt = imx214_get_format, + .get_fmt = v4l2_subdev_get_fmt, .set_fmt = imx214_set_format, .get_selection = imx214_get_selection, .get_frame_interval = imx214_get_frame_interval,
@@ -1079,9 +1020,6 @@ static int imx214_probe(struct i2c_client *client)if (ret <0 ) goto error_power_off; -mutex_init (&imx214->mutex); - imx214->ctrls.lock = &imx214->mutex; - imx214->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; imx214->pad.flags =MEDIA_PAD_FL_SOURCE ; imx214->sd.dev = &client->dev;
@@ -1093,7 +1031,12 @@ static int imx214_probe(struct i2c_client *client) goto free_ctrl; } -imx214_entity_init_state (&imx214->sd,NULL ); + imx214->sd.state_lock = imx214->ctrls.lock; + ret =v4l2_subdev_init_finalize (&imx214->sd); +if (ret <0 ) { +dev_err (dev,"subdev init error: %d\n" , ret); + goto free_entity; + }pm_runtime_set_active (imx214->dev);pm_runtime_enable (imx214->dev);
@@ -1101,20 +1044,22 @@ static int imx214_probe(struct i2c_client *client) ret =v4l2_async_register_subdev_sensor (&imx214->sd);if (ret <0 ) {dev_err (dev,"could not register v4l2 device\n" ); - goto free_entity; + goto error_subdev_cleanup; }pm_runtime_idle (imx214->dev);return 0 ; -free_entity: +error_subdev_cleanup:pm_runtime_disable (imx214->dev);pm_runtime_set_suspended (&client->dev); +v4l2_subdev_cleanup (&imx214->sd); + +free_entity:media_entity_cleanup (&imx214->sd.entity); free_ctrl: -mutex_destroy (&imx214->mutex);v4l2_ctrl_handler_free (&imx214->ctrls); error_power_off:
@@ -1129,9 +1074,9 @@ static void imx214_remove(struct i2c_client *client)struct imx214 *imx214 =to_imx214 (sd);v4l2_async_unregister_subdev (&imx214->sd); +v4l2_subdev_cleanup (sd);media_entity_cleanup (&imx214->sd.entity);v4l2_ctrl_handler_free (&imx214->ctrls); -mutex_destroy (&imx214->mutex);pm_runtime_disable (&client->dev);if (!pm_runtime_status_suspended (&client->dev)) {imx214_power_off (imx214->dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 7/311 media: i2c: imx214: Simplify with dev_err_probe()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 5d6dc133e6e4053b4b92a15a2e1b99d54b3f8adb ]
Error handling in probe() can be a bit simpler with dev_err_probe().
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 54 +++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 30 deletions(-)
drivers/media/i2c/imx214.c +24 -30
@@ -933,14 +933,12 @@ static int imx214_parse_fwnode(struct device *dev)int ret; endpoint =fwnode_graph_get_next_endpoint (dev_fwnode (dev),NULL ); -if (!endpoint) { -dev_err (dev,"endpoint node not found\n" ); -return -EINVAL ; - } +if (!endpoint) +return dev_err_probe (dev, -EINVAL ,"endpoint node not found\n" ); ret =v4l2_fwnode_endpoint_alloc_parse (endpoint, &bus_cfg);if (ret) { -dev_err (dev,"parsing endpoint node failed\n" ); +dev_err_probe (dev, ret,"parsing endpoint node failed\n" ); goto done; }
@@ -949,8 +947,9 @@ static int imx214_parse_fwnode(struct device *dev)break ;if (i == bus_cfg.nr_of_link_frequencies) { -dev_err (dev,"link-frequencies %d not supported, Please review your DT\n" , -IMX214_DEFAULT_LINK_FREQ ); +dev_err_probe (dev, -EINVAL , +"link-frequencies %d not supported, Please review your DT\n" , +IMX214_DEFAULT_LINK_FREQ ); ret = -EINVAL ; goto done; }
@@ -978,34 +977,28 @@ static int imx214_probe(struct i2c_client *client) imx214->dev = dev; imx214->xclk =devm_clk_get (dev,NULL ); -if (IS_ERR (imx214->xclk)) { -dev_err (dev,"could not get xclk" ); -return PTR_ERR (imx214->xclk); - } +if (IS_ERR (imx214->xclk)) +return dev_err_probe (dev,PTR_ERR (imx214->xclk), +"failed to get xclk\n" ); ret =clk_set_rate (imx214->xclk,IMX214_DEFAULT_CLK_FREQ ); -if (ret) { -dev_err (dev,"could not set xclk frequency\n" ); -return ret; - } +if (ret) +return dev_err_probe (dev, ret, +"failed to set xclk frequency\n" ); ret =imx214_get_regulators (dev, imx214); -if (ret <0 ) { -dev_err (dev,"cannot get regulators\n" ); -return ret; - } +if (ret <0 ) +return dev_err_probe (dev, ret,"failed to get regulators\n" ); imx214->enable_gpio =devm_gpiod_get (dev,"enable" ,GPIOD_OUT_LOW ); -if (IS_ERR (imx214->enable_gpio)) { -dev_err (dev,"cannot get enable gpio\n" ); -return PTR_ERR (imx214->enable_gpio); - } +if (IS_ERR (imx214->enable_gpio)) +return dev_err_probe (dev,PTR_ERR (imx214->enable_gpio), +"failed to get enable gpio\n" ); imx214->regmap =devm_regmap_init_i2c (client, &sensor_regmap_config); -if (IS_ERR (imx214->regmap)) { -dev_err (dev,"regmap init failed\n" ); -return PTR_ERR (imx214->regmap); - } +if (IS_ERR (imx214->regmap)) +return dev_err_probe (dev,PTR_ERR (imx214->regmap), +"regmap init failed\n" );v4l2_i2c_subdev_init (&imx214->sd, client, &imx214_subdev_ops); imx214->sd.internal_ops = &imx214_internal_ops;
@@ -1027,14 +1020,14 @@ static int imx214_probe(struct i2c_client *client) ret =media_entity_pads_init (&imx214->sd.entity,1 , &imx214->pad);if (ret <0 ) { -dev_err (dev,"could not register media entity\n" ); +dev_err_probe (dev, ret,"failed to init entity pads\n" ); goto free_ctrl; } imx214->sd.state_lock = imx214->ctrls.lock; ret =v4l2_subdev_init_finalize (&imx214->sd);if (ret <0 ) { -dev_err (dev,"subdev init error: %d\n" , ret); +dev_err_probe (dev, ret,"subdev init error\n" ); goto free_entity; }
@@ -1043,7 +1036,8 @@ static int imx214_probe(struct i2c_client *client) ret =v4l2_async_register_subdev_sensor (&imx214->sd);if (ret <0 ) { -dev_err (dev,"could not register v4l2 device\n" ); +dev_err_probe (dev, ret, +"failed to register sensor sub-device\n" ); goto error_subdev_cleanup; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 8/311 media: i2c: imx214: Convert to CCI register access helpers
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 4f0aeba4f1556f829f09073bf267093c5b6f1821 ]
Use the new common CCI register access helpers to replace the private register access helpers in the imx214 driver. This simplifies the driver by reducing the amount of code.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/imx214.c | 672 +++++++++++++++++-------------------- 2 files changed, 310 insertions(+), 363 deletions(-)
drivers/media/i2c/Kconfig +1 -0
@@ -140,6 +140,7 @@ config VIDEO_IMX214 tristate "Sony IMX214 sensor support" depends on GPIOLIB select REGMAP_I2C + select V4L2_CCI_I2C help This is a Video4Linux2 sensor driver for the Sony IMX214 camera.
drivers/media/i2c/imx214.c +309 -363
800 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 9/311 media: i2c: imx214: Replace register addresses with macros
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 341a133beb43f9009ebdde9eff276dfacbac114a ]
Define macros for all the known registers used in the register arrays, and use them to replace the numerical addresses. This improves readability.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 407 +++++++++++++++++++++---------------- 1 file changed, 236 insertions(+), 171 deletions(-)
drivers/media/i2c/imx214.c +236 -171
@@ -24,18 +24,141 @@#define IMX214_MODE_STANDBY 0x00#define IMX214_MODE_STREAMING 0x01 +#define IMX214_REG_FAST_STANDBY_CTRL CCI_REG8(0x0106) +#define IMX214_DEFAULT_CLK_FREQ 24000000#define IMX214_DEFAULT_LINK_FREQ 480000000#define IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10)#define IMX214_FPS 30#define IMX214_MBUS_CODE MEDIA_BUS_FMT_SRGGB10_1X10 +/* V-TIMING internal */ +#define IMX214_REG_FRM_LENGTH_LINES CCI_REG16(0x0340) +/* Exposure control */ #define IMX214_REG_EXPOSURE CCI_REG16(0x0202)#define IMX214_EXPOSURE_MIN 0#define IMX214_EXPOSURE_MAX 3184#define IMX214_EXPOSURE_STEP 1#define IMX214_EXPOSURE_DEFAULT 3184 +#define IMX214_REG_EXPOSURE_RATIO CCI_REG8(0x0222) +#define IMX214_REG_SHORT_EXPOSURE CCI_REG16(0x0224) + +/* Analog gain control */ +#define IMX214_REG_ANALOG_GAIN CCI_REG16(0x0204) +#define IMX214_REG_SHORT_ANALOG_GAIN CCI_REG16(0x0216) + +/* Digital gain control */ +#define IMX214_REG_DIG_GAIN_GREENR CCI_REG16(0x020e) +#define IMX214_REG_DIG_GAIN_RED CCI_REG16(0x0210) +#define IMX214_REG_DIG_GAIN_BLUE CCI_REG16(0x0212) +#define IMX214_REG_DIG_GAIN_GREENB CCI_REG16(0x0214) + +#define IMX214_REG_ORIENTATION CCI_REG8(0x0101) + +#define IMX214_REG_MASK_CORR_FRAMES CCI_REG8(0x0105) +#define IMX214_CORR_FRAMES_TRANSMIT 0 +#define IMX214_CORR_FRAMES_MASK 1 + +#define IMX214_REG_CSI_DATA_FORMAT CCI_REG16(0x0112) +#define IMX214_CSI_DATA_FORMAT_RAW8 0x0808 +#define IMX214_CSI_DATA_FORMAT_RAW10 0x0A0A +#define IMX214_CSI_DATA_FORMAT_COMP6 0x0A06 +#define IMX214_CSI_DATA_FORMAT_COMP8 0x0A08 + +#define IMX214_REG_CSI_LANE_MODE CCI_REG8(0x0114) +#define IMX214_CSI_2_LANE_MODE 1 +#define IMX214_CSI_4_LANE_MODE 3 + +#define IMX214_REG_EXCK_FREQ CCI_REG16(0x0136) +#define IMX214_EXCK_FREQ (n) ((n) * 256)/* n expressed in MHz */ + +#define IMX214_REG_TEMP_SENSOR_CONTROL CCI_REG8(0x0138) + +#define IMX214_REG_HDR_MODE CCI_REG8(0x0220) +#define IMX214_HDR_MODE_OFF 0 +#define IMX214_HDR_MODE_ON 1 + +#define IMX214_REG_HDR_RES_REDUCTION CCI_REG8(0x0221) +#define IMX214_HDR_RES_REDU_THROUGH 0x11 +#define IMX214_HDR_RES_REDU_2_BINNING 0x22 + +/* PLL settings */ +#define IMX214_REG_VTPXCK_DIV CCI_REG8(0x0301) +#define IMX214_REG_VTSYCK_DIV CCI_REG8(0x0303) +#define IMX214_REG_PREPLLCK_VT_DIV CCI_REG8(0x0305) +#define IMX214_REG_PLL_VT_MPY CCI_REG16(0x0306) +#define IMX214_REG_OPPXCK_DIV CCI_REG8(0x0309) +#define IMX214_REG_OPSYCK_DIV CCI_REG8(0x030b) +#define IMX214_REG_PLL_MULT_DRIV CCI_REG8(0x0310) +#define IMX214_PLL_SINGLE 0 +#define IMX214_PLL_DUAL 1 + +#define IMX214_REG_LINE_LENGTH_PCK CCI_REG16(0x0342) +#define IMX214_REG_X_ADD_STA CCI_REG16(0x0344) +#define IMX214_REG_Y_ADD_STA CCI_REG16(0x0346) +#define IMX214_REG_X_ADD_END CCI_REG16(0x0348) +#define IMX214_REG_Y_ADD_END CCI_REG16(0x034a) +#define IMX214_REG_X_OUTPUT_SIZE CCI_REG16(0x034c) +#define IMX214_REG_Y_OUTPUT_SIZE CCI_REG16(0x034e) +#define IMX214_REG_X_EVEN_INC CCI_REG8(0x0381) +#define IMX214_REG_X_ODD_INC CCI_REG8(0x0383) +#define IMX214_REG_Y_EVEN_INC CCI_REG8(0x0385) +#define IMX214_REG_Y_ODD_INC CCI_REG8(0x0387) + +#define IMX214_REG_SCALE_MODE CCI_REG8(0x0401) +#define IMX214_SCALE_NONE 0 +#define IMX214_SCALE_HORIZONTAL 1 +#define IMX214_SCALE_FULL 2 +#define IMX214_REG_SCALE_M CCI_REG16(0x0404) + +#define IMX214_REG_DIG_CROP_X_OFFSET CCI_REG16(0x0408) +#define IMX214_REG_DIG_CROP_Y_OFFSET CCI_REG16(0x040a) +#define IMX214_REG_DIG_CROP_WIDTH CCI_REG16(0x040c) +#define IMX214_REG_DIG_CROP_HEIGHT CCI_REG16(0x040e) + +#define IMX214_REG_REQ_LINK_BIT_RATE CCI_REG32(0x0820) +#define IMX214_LINK_BIT_RATE_MBPS (n) ((n) << 16) + +/* Binning mode */ +#define IMX214_REG_BINNING_MODE CCI_REG8(0x0900) +#define IMX214_BINNING_NONE 0 +#define IMX214_BINNING_ENABLE 1 +#define IMX214_REG_BINNING_TYPE CCI_REG8(0x0901) +#define IMX214_REG_BINNING_WEIGHTING CCI_REG8(0x0902) +#define IMX214_BINNING_AVERAGE 0x00 +#define IMX214_BINNING_SUMMED 0x01 +#define IMX214_BINNING_BAYER 0x02 + +#define IMX214_REG_SING_DEF_CORR_EN CCI_REG8(0x0b06) +#define IMX214_SING_DEF_CORR_OFF 0 +#define IMX214_SING_DEF_CORR_ON 1 + +/* AWB control */ +#define IMX214_REG_ABS_GAIN_GREENR CCI_REG16(0x0b8e) +#define IMX214_REG_ABS_GAIN_RED CCI_REG16(0x0b90) +#define IMX214_REG_ABS_GAIN_BLUE CCI_REG16(0x0b92) +#define IMX214_REG_ABS_GAIN_GREENB CCI_REG16(0x0b94) + +#define IMX214_REG_RMSC_NR_MODE CCI_REG8(0x3001) +#define IMX214_REG_STATS_OUT_EN CCI_REG8(0x3013) +#define IMX214_STATS_OUT_OFF 0 +#define IMX214_STATS_OUT_ON 1 + +/* Chroma noise reduction */ +#define IMX214_REG_NML_NR_EN CCI_REG8(0x30a2) +#define IMX214_NML_NR_OFF 0 +#define IMX214_NML_NR_ON 1 + +#define IMX214_REG_EBD_SIZE_V CCI_REG8(0x5041) +#define IMX214_EBD_NO 0 +#define IMX214_EBD_4_LINE 4 + +#define IMX214_REG_RG_STATS_LMT CCI_REG16(0x6d12) +#define IMX214_RG_STATS_LMT_10_BIT 0x03FF +#define IMX214_RG_STATS_LMT_14_BIT 0x3FFF + +#define IMX214_REG_ATR_FAST_MOVE CCI_REG8(0x9300)/* IMX214 native and active pixel array size */ #define IMX214_NATIVE_WIDTH 4224U
@@ -74,96 +197,70 @@ struct imx214 {/*From imx214_mode_tbls.h*/ static const struct cci_reg_sequence mode_4096x2304[] = { - {CCI_REG8 (0x0114 ),0x03 }, - {CCI_REG8 (0x0220 ),0x00 }, - {CCI_REG8 (0x0221 ),0x11 }, - {CCI_REG8 (0x0222 ),0x01 }, - {CCI_REG8 (0x0340 ),0x0C }, - {CCI_REG8 (0x0341 ),0x7A }, - {CCI_REG8 (0x0342 ),0x13 }, - {CCI_REG8 (0x0343 ),0x90 }, - {CCI_REG8 (0x0344 ),0x00 }, - {CCI_REG8 (0x0345 ),0x38 }, - {CCI_REG8 (0x0346 ),0x01 }, - {CCI_REG8 (0x0347 ),0x98 }, - {CCI_REG8 (0x0348 ),0x10 }, - {CCI_REG8 (0x0349 ),0x37 }, - {CCI_REG8 (0x034A ),0x0A }, - {CCI_REG8 (0x034B ),0x97 }, - {CCI_REG8 (0x0381 ),0x01 }, - {CCI_REG8 (0x0383 ),0x01 }, - {CCI_REG8 (0x0385 ),0x01 }, - {CCI_REG8 (0x0387 ),0x01 }, - {CCI_REG8 (0x0900 ),0x00 }, - {CCI_REG8 (0x0901 ),0x00 }, - {CCI_REG8 (0x0902 ),0x00 }, + {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, + {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, + {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, + {IMX214_REG_EXPOSURE_RATIO ,1 }, + {IMX214_REG_FRM_LENGTH_LINES ,3194 }, + {IMX214_REG_LINE_LENGTH_PCK ,5008 }, + {IMX214_REG_X_ADD_STA ,56 }, + {IMX214_REG_Y_ADD_STA ,408 }, + {IMX214_REG_X_ADD_END ,4151 }, + {IMX214_REG_Y_ADD_END ,2711 }, + {IMX214_REG_X_EVEN_INC ,1 }, + {IMX214_REG_X_ODD_INC ,1 }, + {IMX214_REG_Y_EVEN_INC ,1 }, + {IMX214_REG_Y_ODD_INC ,1 }, + {IMX214_REG_BINNING_MODE ,IMX214_BINNING_NONE }, + {IMX214_REG_BINNING_TYPE ,0 }, + {IMX214_REG_BINNING_WEIGHTING ,IMX214_BINNING_AVERAGE }, {CCI_REG8 (0x3000 ),0x35 }, {CCI_REG8 (0x3054 ),0x01 }, {CCI_REG8 (0x305C ),0x11 }, - {CCI_REG8 (0x0112 ),0x0A }, - {CCI_REG8 (0x0113 ),0x0A }, - {CCI_REG8 (0x034C ),0x10 }, - {CCI_REG8 (0x034D ),0x00 }, - {CCI_REG8 (0x034E ),0x09 }, - {CCI_REG8 (0x034F ),0x00 }, - {CCI_REG8 (0x0401 ),0x00 }, - {CCI_REG8 (0x0404 ),0x00 }, - {CCI_REG8 (0x0405 ),0x10 }, - {CCI_REG8 (0x0408 ),0x00 }, - {CCI_REG8 (0x0409 ),0x00 }, - {CCI_REG8 (0x040A ),0x00 }, - {CCI_REG8 (0x040B ),0x00 }, - {CCI_REG8 (0x040C ),0x10 }, - {CCI_REG8 (0x040D ),0x00 }, - {CCI_REG8 (0x040E ),0x09 }, - {CCI_REG8 (0x040F ),0x00 }, - - {CCI_REG8 (0x0301 ),0x05 }, - {CCI_REG8 (0x0303 ),0x02 }, - {CCI_REG8 (0x0305 ),0x03 }, - {CCI_REG8 (0x0306 ),0x00 }, - {CCI_REG8 (0x0307 ),0x96 }, - {CCI_REG8 (0x0309 ),0x0A }, - {CCI_REG8 (0x030B ),0x01 }, - {CCI_REG8 (0x0310 ),0x00 }, - - {CCI_REG8 (0x0820 ),0x12 }, - {CCI_REG8 (0x0821 ),0xC0 }, - {CCI_REG8 (0x0822 ),0x00 }, - {CCI_REG8 (0x0823 ),0x00 }, + {IMX214_REG_CSI_DATA_FORMAT ,IMX214_CSI_DATA_FORMAT_RAW10 }, + {IMX214_REG_X_OUTPUT_SIZE ,4096 }, + {IMX214_REG_Y_OUTPUT_SIZE ,2304 }, + {IMX214_REG_SCALE_MODE ,IMX214_SCALE_NONE }, + {IMX214_REG_SCALE_M ,2 }, + {IMX214_REG_DIG_CROP_X_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_Y_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_WIDTH ,4096 }, + {IMX214_REG_DIG_CROP_HEIGHT ,2304 }, + + {IMX214_REG_VTPXCK_DIV ,5 }, + {IMX214_REG_VTSYCK_DIV ,2 }, + {IMX214_REG_PREPLLCK_VT_DIV ,3 }, + {IMX214_REG_PLL_VT_MPY ,150 }, + {IMX214_REG_OPPXCK_DIV ,10 }, + {IMX214_REG_OPSYCK_DIV ,1 }, + {IMX214_REG_PLL_MULT_DRIV ,IMX214_PLL_SINGLE }, + + {IMX214_REG_REQ_LINK_BIT_RATE ,IMX214_LINK_BIT_RATE_MBPS (4800 ) }, {CCI_REG8 (0x3A03 ),0x09 }, {CCI_REG8 (0x3A04 ),0x50 }, {CCI_REG8 (0x3A05 ),0x01 }, - {CCI_REG8 (0x0B06 ),0x01 }, - {CCI_REG8 (0x30A2 ),0x00 }, + {IMX214_REG_SING_DEF_CORR_EN ,IMX214_SING_DEF_CORR_ON }, + {IMX214_REG_NML_NR_EN ,IMX214_NML_NR_OFF }, {CCI_REG8 (0x30B4 ),0x00 }, {CCI_REG8 (0x3A02 ),0xFF }, {CCI_REG8 (0x3011 ),0x00 }, - {CCI_REG8 (0x3013 ),0x01 }, - - {CCI_REG8 (0x0202 ),0x0C }, - {CCI_REG8 (0x0203 ),0x70 }, - {CCI_REG8 (0x0224 ),0x01 }, - {CCI_REG8 (0x0225 ),0xF4 }, - - {CCI_REG8 (0x0204 ),0x00 }, - {CCI_REG8 (0x0205 ),0x00 }, - {CCI_REG8 (0x020E ),0x01 }, - {CCI_REG8 (0x020F ),0x00 }, - {CCI_REG8 (0x0210 ),0x01 }, - {CCI_REG8 (0x0211 ),0x00 }, - {CCI_REG8 (0x0212 ),0x01 }, - {CCI_REG8 (0x0213 ),0x00 }, - {CCI_REG8 (0x0214 ),0x01 }, - {CCI_REG8 (0x0215 ),0x00 }, - {CCI_REG8 (0x0216 ),0x00 }, - {CCI_REG8 (0x0217 ),0x00 }, + {IMX214_REG_STATS_OUT_EN ,IMX214_STATS_OUT_ON }, + + {IMX214_REG_EXPOSURE ,IMX214_EXPOSURE_DEFAULT }, + {IMX214_REG_SHORT_EXPOSURE ,500 }, + + {IMX214_REG_ANALOG_GAIN ,0 }, + {IMX214_REG_DIG_GAIN_GREENR ,256 }, + {IMX214_REG_DIG_GAIN_RED ,256 }, + {IMX214_REG_DIG_GAIN_BLUE ,256 }, + {IMX214_REG_DIG_GAIN_GREENB ,256 }, + {IMX214_REG_SHORT_ANALOG_GAIN ,0 }, {CCI_REG8 (0x4170 ),0x00 }, {CCI_REG8 (0x4171 ),0x10 },
@@ -174,96 +271,70 @@ static const struct cci_reg_sequence mode_4096x2304[] = { };static const struct cci_reg_sequence mode_1920x1080[] = { - {CCI_REG8 (0x0114 ),0x03 }, - {CCI_REG8 (0x0220 ),0x00 }, - {CCI_REG8 (0x0221 ),0x11 }, - {CCI_REG8 (0x0222 ),0x01 }, - {CCI_REG8 (0x0340 ),0x0C }, - {CCI_REG8 (0x0341 ),0x7A }, - {CCI_REG8 (0x0342 ),0x13 }, - {CCI_REG8 (0x0343 ),0x90 }, - {CCI_REG8 (0x0344 ),0x04 }, - {CCI_REG8 (0x0345 ),0x78 }, - {CCI_REG8 (0x0346 ),0x03 }, - {CCI_REG8 (0x0347 ),0xFC }, - {CCI_REG8 (0x0348 ),0x0B }, - {CCI_REG8 (0x0349 ),0xF7 }, - {CCI_REG8 (0x034A ),0x08 }, - {CCI_REG8 (0x034B ),0x33 }, - {CCI_REG8 (0x0381 ),0x01 }, - {CCI_REG8 (0x0383 ),0x01 }, - {CCI_REG8 (0x0385 ),0x01 }, - {CCI_REG8 (0x0387 ),0x01 }, - {CCI_REG8 (0x0900 ),0x00 }, - {CCI_REG8 (0x0901 ),0x00 }, - {CCI_REG8 (0x0902 ),0x00 }, + {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, + {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, + {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, + {IMX214_REG_EXPOSURE_RATIO ,1 }, + {IMX214_REG_FRM_LENGTH_LINES ,3194 }, + {IMX214_REG_LINE_LENGTH_PCK ,5008 }, + {IMX214_REG_X_ADD_STA ,1144 }, + {IMX214_REG_Y_ADD_STA ,1020 }, + {IMX214_REG_X_ADD_END ,3063 }, + {IMX214_REG_Y_ADD_END ,2099 }, + {IMX214_REG_X_EVEN_INC ,1 }, + {IMX214_REG_X_ODD_INC ,1 }, + {IMX214_REG_Y_EVEN_INC ,1 }, + {IMX214_REG_Y_ODD_INC ,1 }, + {IMX214_REG_BINNING_MODE ,IMX214_BINNING_NONE }, + {IMX214_REG_BINNING_TYPE ,0 }, + {IMX214_REG_BINNING_WEIGHTING ,IMX214_BINNING_AVERAGE }, {CCI_REG8 (0x3000 ),0x35 }, {CCI_REG8 (0x3054 ),0x01 }, {CCI_REG8 (0x305C ),0x11 }, - {CCI_REG8 (0x0112 ),0x0A }, - {CCI_REG8 (0x0113 ),0x0A }, - {CCI_REG8 (0x034C ),0x07 }, - {CCI_REG8 (0x034D ),0x80 }, - {CCI_REG8 (0x034E ),0x04 }, - {CCI_REG8 (0x034F ),0x38 }, - {CCI_REG8 (0x0401 ),0x00 }, - {CCI_REG8 (0x0404 ),0x00 }, - {CCI_REG8 (0x0405 ),0x10 }, - {CCI_REG8 (0x0408 ),0x00 }, - {CCI_REG8 (0x0409 ),0x00 }, - {CCI_REG8 (0x040A ),0x00 }, - {CCI_REG8 (0x040B ),0x00 }, - {CCI_REG8 (0x040C ),0x07 }, - {CCI_REG8 (0x040D ),0x80 }, - {CCI_REG8 (0x040E ),0x04 }, - {CCI_REG8 (0x040F ),0x38 }, - - {CCI_REG8 (0x0301 ),0x05 }, - {CCI_REG8 (0x0303 ),0x02 }, - {CCI_REG8 (0x0305 ),0x03 }, - {CCI_REG8 (0x0306 ),0x00 }, - {CCI_REG8 (0x0307 ),0x96 }, - {CCI_REG8 (0x0309 ),0x0A }, - {CCI_REG8 (0x030B ),0x01 }, - {CCI_REG8 (0x0310 ),0x00 }, - - {CCI_REG8 (0x0820 ),0x12 }, - {CCI_REG8 (0x0821 ),0xC0 }, - {CCI_REG8 (0x0822 ),0x00 }, - {CCI_REG8 (0x0823 ),0x00 }, + {IMX214_REG_CSI_DATA_FORMAT ,IMX214_CSI_DATA_FORMAT_RAW10 }, + {IMX214_REG_X_OUTPUT_SIZE ,1920 }, + {IMX214_REG_Y_OUTPUT_SIZE ,1080 }, + {IMX214_REG_SCALE_MODE ,IMX214_SCALE_NONE }, + {IMX214_REG_SCALE_M ,2 }, + {IMX214_REG_DIG_CROP_X_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_Y_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_WIDTH ,1920 }, + {IMX214_REG_DIG_CROP_HEIGHT ,1080 }, + + {IMX214_REG_VTPXCK_DIV ,5 }, + {IMX214_REG_VTSYCK_DIV ,2 }, + {IMX214_REG_PREPLLCK_VT_DIV ,3 }, + {IMX214_REG_PLL_VT_MPY ,150 }, + {IMX214_REG_OPPXCK_DIV ,10 }, + {IMX214_REG_OPSYCK_DIV ,1 }, + {IMX214_REG_PLL_MULT_DRIV ,IMX214_PLL_SINGLE }, + + {IMX214_REG_REQ_LINK_BIT_RATE ,IMX214_LINK_BIT_RATE_MBPS (4800 ) }, {CCI_REG8 (0x3A03 ),0x04 }, {CCI_REG8 (0x3A04 ),0xF8 }, {CCI_REG8 (0x3A05 ),0x02 }, - {CCI_REG8 (0x0B06 ),0x01 }, - {CCI_REG8 (0x30A2 ),0x00 }, + {IMX214_REG_SING_DEF_CORR_EN ,IMX214_SING_DEF_CORR_ON }, + {IMX214_REG_NML_NR_EN ,IMX214_NML_NR_OFF }, {CCI_REG8 (0x30B4 ),0x00 }, {CCI_REG8 (0x3A02 ),0xFF }, {CCI_REG8 (0x3011 ),0x00 }, - {CCI_REG8 (0x3013 ),0x01 }, - - {CCI_REG8 (0x0202 ),0x0C }, - {CCI_REG8 (0x0203 ),0x70 }, - {CCI_REG8 (0x0224 ),0x01 }, - {CCI_REG8 (0x0225 ),0xF4 }, - - {CCI_REG8 (0x0204 ),0x00 }, - {CCI_REG8 (0x0205 ),0x00 }, - {CCI_REG8 (0x020E ),0x01 }, - {CCI_REG8 (0x020F ),0x00 }, - {CCI_REG8 (0x0210 ),0x01 }, - {CCI_REG8 (0x0211 ),0x00 }, - {CCI_REG8 (0x0212 ),0x01 }, - {CCI_REG8 (0x0213 ),0x00 }, - {CCI_REG8 (0x0214 ),0x01 }, - {CCI_REG8 (0x0215 ),0x00 }, - {CCI_REG8 (0x0216 ),0x00 }, - {CCI_REG8 (0x0217 ),0x00 }, + {IMX214_REG_STATS_OUT_EN ,IMX214_STATS_OUT_ON }, + + {IMX214_REG_EXPOSURE ,IMX214_EXPOSURE_DEFAULT }, + {IMX214_REG_SHORT_EXPOSURE ,500 }, + + {IMX214_REG_ANALOG_GAIN ,0 }, + {IMX214_REG_DIG_GAIN_GREENR ,256 }, + {IMX214_REG_DIG_GAIN_RED ,256 }, + {IMX214_REG_DIG_GAIN_BLUE ,256 }, + {IMX214_REG_DIG_GAIN_GREENB ,256 }, + {IMX214_REG_SHORT_ANALOG_GAIN ,0 }, {CCI_REG8 (0x4170 ),0x00 }, {CCI_REG8 (0x4171 ),0x10 },
@@ -277,20 +348,19 @@ static const struct cci_reg_sequence mode_table_common[] = {/* software reset */ /* software standby settings */ - { CCI_REG8(0x0100), 0x00 }, + { IMX214_REG_MODE_SELECT, IMX214_MODE_STANDBY },/* ATR setting */ - { CCI_REG8(0x9300), 0x02 }, + { IMX214_REG_ATR_FAST_MOVE, 2 },/* external clock setting */ - { CCI_REG8(0x0136), 0x18 }, - { CCI_REG8(0x0137), 0x00 }, + { IMX214_REG_EXCK_FREQ, IMX214_EXCK_FREQ(IMX214_DEFAULT_CLK_FREQ / 1000000) },/* global setting */ /* basic config */ - { CCI_REG8(0x0101), 0x00 }, - { CCI_REG8(0x0105), 0x01 }, - { CCI_REG8(0x0106), 0x01 }, + { IMX214_REG_ORIENTATION, 0 }, + { IMX214_REG_MASK_CORR_FRAMES, IMX214_CORR_FRAMES_MASK }, + { IMX214_REG_FAST_STANDBY_CTRL, 1 }, { CCI_REG8(0x4550), 0x02 }, { CCI_REG8(0x4601), 0x00 }, { CCI_REG8(0x4642), 0x05 },
@@ -335,18 +405,17 @@ static const struct cci_reg_sequence mode_table_common[] = { { CCI_REG8(0x4A87), 0xFF },/* embedded data */ - { CCI_REG8(0x5041), 0x04 }, + { IMX214_REG_EBD_SIZE_V, IMX214_EBD_4_LINE }, { CCI_REG8(0x583C), 0x04 }, { CCI_REG8(0x620E), 0x04 }, { CCI_REG8(0x6EB2), 0x01 }, { CCI_REG8(0x6EB3), 0x00 }, - { CCI_REG8(0x9300), 0x02 }, + { IMX214_REG_ATR_FAST_MOVE, 2 },/* imagequality */ /* HDR setting */ - { CCI_REG8(0x3001), 0x07 }, - { CCI_REG8(0x6D12), 0x3F }, - { CCI_REG8(0x6D13), 0xFF }, + { IMX214_REG_RMSC_NR_MODE, 0x07 }, + { IMX214_REG_RG_STATS_LMT, IMX214_RG_STATS_LMT_14_BIT }, { CCI_REG8(0x9344), 0x03 }, { CCI_REG8(0x9706), 0x10 }, { CCI_REG8(0x9707), 0x03 },
@@ -374,14 +443,10 @@ static const struct cci_reg_sequence mode_table_common[] = { { CCI_REG8(0x698B), 0x03 },/* white balanace */ - { CCI_REG8(0x0B8E), 0x01 }, - { CCI_REG8(0x0B8F), 0x00 }, - { CCI_REG8(0x0B90), 0x01 }, - { CCI_REG8(0x0B91), 0x00 }, - { CCI_REG8(0x0B92), 0x01 }, - { CCI_REG8(0x0B93), 0x00 }, - { CCI_REG8(0x0B94), 0x01 }, - { CCI_REG8(0x0B95), 0x00 }, + { IMX214_REG_ABS_GAIN_GREENR, 0x0100 }, + { IMX214_REG_ABS_GAIN_RED, 0x0100 }, + { IMX214_REG_ABS_GAIN_BLUE, 0x0100 }, + { IMX214_REG_ABS_GAIN_GREENB, 0x0100 },/* ATR setting */ { CCI_REG8(0x6E50), 0x00 },
@@ -737,7 +802,7 @@ static int imx214_start_streaming(struct imx214 *imx214)usleep_range (10000 ,10500 ); -cci_write (imx214->regmap,CCI_REG8 (0x0138 ),0x01 ,NULL ); +cci_write (imx214->regmap,IMX214_REG_TEMP_SENSOR_CONTROL ,0x01 ,NULL ); ret =__v4l2_ctrl_handler_setup (&imx214->ctrls);if (ret <0 ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 10/311 media: i2c: imx214: Check number of lanes from device tree
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 3d55f4eb03fce69f3a72615fe9c5ca171f7b846b ]
The imx214 camera is capable of either two-lane or four-lane operation.
Currently only the four-lane mode is supported, as proper pixel rates and link frequences for the two-lane mode are unknown.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/media/i2c/imx214.c +14 -2
@@ -197,7 +197,6 @@ struct imx214 {/*From imx214_mode_tbls.h*/ static const struct cci_reg_sequence mode_4096x2304[] = { - {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, {IMX214_REG_EXPOSURE_RATIO ,1 },
@@ -271,7 +270,6 @@ static const struct cci_reg_sequence mode_4096x2304[] = { };static const struct cci_reg_sequence mode_1920x1080[] = { - {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, {IMX214_REG_EXPOSURE_RATIO ,1 },
@@ -789,6 +787,13 @@ static int imx214_start_streaming(struct imx214 *imx214)return ret; } + ret =cci_write (imx214->regmap,IMX214_REG_CSI_LANE_MODE , +IMX214_CSI_4_LANE_MODE ,NULL ); +if (ret) { +dev_err (imx214->dev,"failed to configure lanes\n" ); +return ret; + } + state =v4l2_subdev_get_locked_active_state (&imx214->sd); fmt =v4l2_subdev_state_get_format (state,0 ); mode = v4l2_find_nearest_size(imx214_modes, ARRAY_SIZE(imx214_modes),
@@ -953,6 +958,13 @@ static int imx214_parse_fwnode(struct device *dev) goto done; } +/* Check the number of MIPI CSI2 data lanes */ +if (bus_cfg.bus.mipi_csi2.num_data_lanes !=4 ) { + ret =dev_err_probe (dev, -EINVAL , +"only 4 data lanes are currently supported\n" ); + goto done; + } +for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++)if (bus_cfg.link_frequencies[i] ==IMX214_DEFAULT_LINK_FREQ )break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 1/311 mm/vmscan: dont try to reclaim hwpoison folio
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinjiang Tu <[email protected]>
[ Upstream commit 1b0449544c6482179ac84530b61fc192a6527bfd ]
Syzkaller reports a bug as follows:
Injecting memory failure for pfn 0x18b00e at process virtual address 0x20ffd000 Memory failure: 0x18b00e: dirty swapcache page still referenced by 2 users Memory failure: 0x18b00e: recovery action for dirty swapcache page: Failed
page: refcount:2 mapcount:0 mapping:0000000000000000 index:0x20ffd pfn:0x18b00e memcg:ffff0000dd6d9000 anon flags: 0x5ffffe00482011(locked|dirty|arch_1|swapbacked|hwpoison|node=0|zone=2|lastcpupid=0xfffff) raw: 005ffffe00482011 dead000000000100 dead000000000122 ffff0000e232a7c9 raw: 0000000000020ffd 0000000000000000 00000002ffffffff ffff0000dd6d9000 page dumped because: VM_BUG_ON_FOLIO(!folio_test_uptodate(folio)) ------------[ cut here ]------------ kernel BUG at mm/swap_state.c:184! Internal error: Oops - BUG: 00000000f2000800 [#1] SMP Modules linked in: CPU: 0 PID: 60 Comm: kswapd0 Not tainted 6.6.0-gcb097e7de84e #3 Hardware name: linux,dummy-virt (DT) pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : add_to_swap+0xbc/0x158 lr : add_to_swap+0xbc/0x158
sp : ffff800087f37340
x29: ffff800087f37340 x28: fffffc00052c0380 x27: ffff800087f37780
x26: ffff800087f37490 x25: ffff800087f37c78 x24: ffff800087f377a0
x23: ffff800087f37c50 x22: 0000000000000000 x21: fffffc00052c03b4
x20: 0000000000000000 x19: fffffc00052c0380 x18: 0000000000000000
x17: 296f696c6f662865 x16: 7461646f7470755f x15: 747365745f6f696c
x14: 6f6621284f494c4f x13: 0000000000000001 x12: ffff600036d8b97b
x11: 1fffe00036d8b97a x10: ffff600036d8b97a x9 : dfff800000000000 x8 : 00009fffc9274686 x7 : ffff0001b6c5cbd3 x6 : 0000000000000001 x5 : ffff0000c25896c0 x4 : 0000000000000000 x3 : 0000000000000000 x2 : 0000000000000000 x1 : ffff0000c25896c0 x0 : 0000000000000000
Call trace: add_to_swap+0xbc/0x158 shrink_folio_list+0x12ac/0x2648 shrink_inactive_list+0x318/0x948 shrink_lruvec+0x450/0x720 shrink_node_memcgs+0x280/0x4a8 shrink_node+0x128/0x978 balance_pgdat+0x4f0/0xb20 kswapd+0x228/0x438 kthread+0x214/0x230 ret_from_fork+0x10/0x20
I can reproduce this issue with the following steps:
1) When a dirty swapcache page is isolated by reclaim process and the page isn't locked, inject memory failure for the page. me_swapcache_dirty() clears uptodate flag and tries to delete from lru, but fails. Reclaim process will put the hwpoisoned page back to lru.
2) The process that maps the hwpoisoned page exits, the page is deleted the page will never be freed and will be in the lru forever.
3) If we trigger a reclaim again and tries to reclaim the page, add_to_swap() will trigger VM_BUG_ON_FOLIO due to the uptodate flag is cleared.
To fix it, skip the hwpoisoned page in shrink_folio_list(). Besides, the hwpoison folio may not be unmapped by hwpoison_user_mappings() yet, unmap it in shrink_folio_list(), otherwise the folio will fail to be unmaped by hwpoison_user_mappings() since the folio isn't in lru list.
--- mm/vmscan.c | 7 +++++++ 1 file changed, 7 insertions(+)
mm/vmscan.c +7 -0
@@ -1112,6 +1112,13 @@ static unsigned int shrink_folio_list(struct list_head *folio_list,if (!folio_trylock (folio)) goto keep; +if (folio_contain_hwpoisoned_page (folio)) { +unmap_poisoned_folio (folio,folio_pfn (folio), false); +folio_unlock (folio); +folio_put (folio); +continue ; + } +VM_BUG_ON_FOLIO (folio_test_active (folio), folio); nr_pages =folio_nr_pages (folio);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 19/311 s390/pci: Support mmap() of PCI resources except for ISM devices
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit aa9f168d55dc47c0de564f7dfe0e90467c9fee71 ]
So far s390 does not allow mmap() of PCI resources to user-space via the usual mechanisms, though it does use it for RDMA. For the PCI sysfs resource files and /proc/bus/pci it defines neither HAVE_PCI_MMAP nor ARCH_GENERIC_PCI_MMAP_RESOURCE. For vfio-pci s390 previously relied on disabled VFIO_PCI_MMAP and now relies on setting pdev->non_mappable_bars for all devices.
This is partly because access to mapped PCI resources from user-space requires special PCI load/store memory-I/O (MIO) instructions, or the special MMIO syscalls when these are not available. Still, such access is possible and useful not just for RDMA, in fact not being able to mmap() PCI resources has previously caused extra work when testing devices.
One thing that doesn't work with PCI resources mapped to user-space though is the s390 specific virtual ISM device. Not only because the BAR size of 256 TiB prevents mapping the whole BAR but also because access requires use of the legacy PCI instructions which are not accessible to user-space on systems with the newer MIO PCI instructions.
Now with the pdev->non_mappable_bars flag ISM can be excluded from mapping its resources while making this functionality available for all other PCI devices. To this end introduce a minimal implementation of PCI_QUIRKS and use that to set pdev->non_mappable_bars for ISM devices only. Then also set ARCH_GENERIC_PCI_MMAP_RESOURCE to take advantage of the generic implementation of pci_mmap_resource_range() enabling only the newer sysfs mmap() interface. This follows the recommendation in Documentation/PCI/sysfs-pci.rst.
--- arch/s390/Kconfig | 4 +--- arch/s390/include/asm/pci.h | 3 +++ arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_fixup.c | 23 +++++++++++++++++++++++ drivers/s390/net/ism_drv.c | 1 - include/linux/pci_ids.h | 1 + 6 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 arch/s390/pci/pci_fixup.c
arch/s390/Kconfig +1 -3
@@ -41,9 +41,6 @@ config AUDIT_ARCH config NO_IOPORT_MAP def_bool y -config PCI_QUIRKS - def_bool n - config ARCH_SUPPORTS_UPROBES def_bool y
@@ -258,6 +255,7 @@ config S390 select PCI_DOMAINS if PCI select PCI_MSI if PCI select PCI_MSI_ARCH_FALLBACKS if PCI_MSI + select PCI_QUIRKS if PCI select SPARSE_IRQ select SWIOTLB select SYSCTL_EXCEPTION_TRACE
arch/s390/include/asm/pci.h +3 -0
@@ -11,6 +11,9 @@#include <asm/pci_insn.h> #include <asm/sclp.h> +#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 +#define arch_can_pci_mmap_wc () 1 +#define PCIBIOS_MIN_IO 0x1000#define PCIBIOS_MIN_MEM 0x10000000
arch/s390/pci/Makefile +1 -1
@@ -5,6 +5,6 @@ obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_clp.o \ pci_event.o pci_debug.o pci_insn.o pci_mmio.o \ - pci_bus.o pci_kvm_hook.o pci_report.o + pci_bus.o pci_kvm_hook.o pci_report.o pci_fixup.o obj-$(CONFIG_PCI_IOV) += pci_iov.o obj-$(CONFIG_SYSFS) += pci_sysfs.o
arch/s390/pci/pci_fixup.c new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Exceptions for specific devices, +* +* Copyright IBM Corp. 2025 +* +* Author(s): +* Niklas Schnelle <[email protected]> +*/ +#include <linux/pci.h> + +static void zpci_ism_bar_no_mmap (struct pci_dev *pdev) +{ +/* +* ISM's BAR is special. Drivers written for ISM know +* how to handle this but others need to be aware of their +* special nature e.g. to prevent attempts to mmap() it. +*/ + pdev->non_mappable_bars =1 ; +} +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_IBM , +PCI_DEVICE_ID_IBM_ISM , + zpci_ism_bar_no_mmap);
drivers/s390/net/ism_drv.c +0 -1
@@ -20,7 +20,6 @@MODULE_DESCRIPTION ("ISM driver for s390" );MODULE_LICENSE ("GPL" ); -#define PCI_DEVICE_ID_IBM_ISM 0x04ED#define DRV_NAME "ism"static const struct pci_device_id ism_device_table[] = {
include/linux/pci_ids.h +1 -0
@@ -518,6 +518,7 @@#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM 0x0251#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361#define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252 +#define PCI_DEVICE_ID_IBM_ISM 0x04ed#define PCI_SUBVENDOR_ID_IBM 0x1014#define PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT 0x03d4
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 28/311 drm/xe/xe3lpg: Add Wa_13012615864
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejas Upadhyay <[email protected]>
[ Upstream commit 2399bcc07c01189737858e0a88ac4ffdd1d4b03d ]
Wa_13012615864 applies to xe3lpg
Stable-dep-of: 262de94a3a7e ("drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change")
--- drivers/gpu/drm/xe/regs/xe_gt_regs.h | 1 + drivers/gpu/drm/xe/xe_wa.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/xe/regs/xe_gt_regs.h +1 -0
@@ -475,6 +475,7 @@#define TDL_TSL_CHICKEN XE_REG_MCR(0xe4c4, XE_REG_OPTION_MASKED)#define STK_ID_RESTRICT REG_BIT(12)#define SLM_WMTP_RESTORE REG_BIT(11) +#define RES_CHK_SPR_DIS REG_BIT(6)#define ROW_CHICKEN XE_REG_MCR(0xe4f0, XE_REG_OPTION_MASKED)#define UGM_BACKUP_MODE REG_BIT(13)
drivers/gpu/drm/xe/xe_wa.c +5 -0
@@ -618,6 +618,11 @@ static const struct xe_rtp_entry_sr engine_was[] = { FUNC(xe_rtp_match_first_render_or_compute)), XE_RTP_ACTIONS(SET(TDL_CHICKEN, QID_WAIT_FOR_THREAD_NOT_RUN_DISABLE)) }, + {XE_RTP_NAME ("13012615864" ), +XE_RTP_RULES (GRAPHICS_VERSION_RANGE (3000 ,3001 ), +FUNC (xe_rtp_match_first_render_or_compute)), +XE_RTP_ACTIONS (SET (TDL_TSL_CHICKEN ,RES_CHK_SPR_DIS )) + }, {} };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 29/311 drm/xe: Add performance tunings to debugfs
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tvrtko Ursulin <[email protected]>
[ Upstream commit 067a974fd8a9ea43f97ca184e2768b583f2f8c44 ]
Add a list of active tunings to debugfs, analogous to the existing list of workarounds.
Rationale being that it seems to make sense to either have both or none.
Stable-dep-of: 262de94a3a7e ("drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change")
--- drivers/gpu/drm/xe/xe_gt.c | 4 ++ drivers/gpu/drm/xe/xe_gt_debugfs.c | 11 ++++++ drivers/gpu/drm/xe/xe_gt_types.h | 10 +++++ drivers/gpu/drm/xe/xe_tuning.c | 59 ++++++++++++++++++++++++++++++ drivers/gpu/drm/xe/xe_tuning.h | 3 ++ 5 files changed, 87 insertions(+)
drivers/gpu/drm/xe/xe_gt.c +4 -0
@@ -381,6 +381,10 @@ int xe_gt_init_early(struct xe_gt *gt)if (err)return err; + err =xe_tuning_init (gt); +if (err) +return err; +xe_wa_process_oob (gt);xe_force_wake_init_gt (gt,gt_to_fw (gt));
drivers/gpu/drm/xe/xe_gt_debugfs.c +11 -0
@@ -30,6 +30,7 @@#include "xe_reg_sr.h" #include "xe_reg_whitelist.h" #include "xe_sriov.h" +#include "xe_tuning.h" #include "xe_uc_debugfs.h" #include "xe_wa.h"
@@ -217,6 +218,15 @@ static int workarounds(struct xe_gt *gt, struct drm_printer *p)return 0 ; } +static int tunings (struct xe_gt *gt,struct drm_printer *p) +{ +xe_pm_runtime_get (gt_to_xe (gt)); +xe_tuning_dump (gt, p); +xe_pm_runtime_put (gt_to_xe (gt)); + +return 0 ; +} +static int pat (struct xe_gt *gt,struct drm_printer *p) {xe_pm_runtime_get (gt_to_xe (gt));
@@ -300,6 +310,7 @@ static const struct drm_info_list debugfs_list[] = { {"powergate_info", .show = xe_gt_debugfs_simple_show, .data = powergate_info}, {"register-save-restore", .show = xe_gt_debugfs_simple_show, .data = register_save_restore}, {"workarounds", .show = xe_gt_debugfs_simple_show, .data = workarounds}, + {"tunings", .show = xe_gt_debugfs_simple_show, .data = tunings}, {"pat", .show = xe_gt_debugfs_simple_show, .data = pat}, {"mocs", .show = xe_gt_debugfs_simple_show, .data = mocs}, {"default_lrc_rcs", .show = xe_gt_debugfs_simple_show, .data = rcs_default_lrc},
drivers/gpu/drm/xe/xe_gt_types.h +10 -0
@@ -413,6 +413,16 @@ struct xe_gt {bool oob_initialized; } wa_active; +/** @tuning_active: keep track of active tunings */ +struct { +/** @tuning_active.gt: bitmap with active GT tunings */ +unsigned long *gt; +/** @tuning_active.engine: bitmap with active engine tunings */ +unsigned long *engine; +/** @tuning_active.lrc: bitmap with active LRC tunings */ +unsigned long *lrc; + } tuning_active; +/** @user_engines: engines present in GT and available to userspace */ struct {/**
drivers/gpu/drm/xe/xe_tuning.c +59 -0
86 lines not on this page · raw message
drivers/gpu/drm/xe/xe_tuning.h +3 -0
@@ -6,11 +6,14 @@#ifndef _XE_TUNING_#define _XE_TUNING_ +struct drm_printer ;struct xe_gt ;struct xe_hw_engine ; +int xe_tuning_init (struct xe_gt *gt);void xe_tuning_process_gt (struct xe_gt *gt);void xe_tuning_process_engine (struct xe_hw_engine *hwe);void xe_tuning_process_lrc (struct xe_hw_engine *hwe); +void xe_tuning_dump (struct xe_gt *gt,struct drm_printer *p);#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 30/311 drm/xe/rtp: Drop sentinels from arg to xe_rtp_process_to_sr()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas De Marchi <[email protected]>
[ Upstream commit cedf23842d7433eb32cb782a637bb870fb096a3b ]
There's a mismatch on API: while xe_rtp_process_to_sr() processes entries until an entry without name, the active tracking with xe_rtp_process_ctx_enable_active_tracking() needs to use the number of elements. The number of elements is taken everywhere using ARRAY_SIZE(), but that will have one entry too many. This leads to the following warning, as reported by lkp:
drivers/gpu/drm/xe/xe_tuning.c: In function 'xe_tuning_dump':
Quoted 1 line
Quoted 1 line
include/drm/drm_print.h:228:31: warning: '%s' directive argument is null [-Wformat-overflow=]
228 | drm_printf((printer), "%.*s" fmt, (indent), "\t\t\t\t\tX", ##__VA_ARGS__)
| ^~~~~~
drivers/gpu/drm/xe/xe_tuning.c:226:17: note: in expansion of macro 'drm_printf_indent'
226 | drm_printf_indent(p, 1, "%s\n", engine_tunings[idx].name);
| ^~~~~~~~~~~~~~~~~That's because it will still process the last entry when tracking the active tunings. The same issue exists in the WAs. Change xe_rtp_process_to_sr() to also take the number of elements so the empty entry can be removed and the warning should go away. Fixing on the active-tracking side would more fragile as the it would need a - 1 everywhere and continue to use a different approach for number of elements.
Aside from the warning, it's a non-issue as there would always be enough bits allocated and the last entry would never be active since xe_rtp_process_to_sr() stops on the sentinel.
Stable-dep-of: 262de94a3a7e ("drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change")
--- drivers/gpu/drm/xe/tests/xe_rtp_test.c | 2 +- drivers/gpu/drm/xe/xe_hw_engine.c | 6 ++---- drivers/gpu/drm/xe/xe_reg_whitelist.c | 4 ++-- drivers/gpu/drm/xe/xe_rtp.c | 6 +++++- drivers/gpu/drm/xe/xe_rtp.h | 2 +- drivers/gpu/drm/xe/xe_tuning.c | 12 ++++-------- drivers/gpu/drm/xe/xe_wa.c | 12 +++--------- 7 files changed, 18 insertions(+), 26 deletions(-)
drivers/gpu/drm/xe/tests/xe_rtp_test.c +1 -1
@@ -320,7 +320,7 @@ static void xe_rtp_process_to_sr_tests(struct kunit *test) count_rtp_entries++;xe_rtp_process_ctx_enable_active_tracking (&ctx, &active, count_rtp_entries); -xe_rtp_process_to_sr (&ctx, param->entries, reg_sr); +xe_rtp_process_to_sr (&ctx, param->entries, count_rtp_entries, reg_sr);xa_for_each (®_sr->xa, idx, sre) {if (idx == param->expected_reg.addr)
drivers/gpu/drm/xe/xe_hw_engine.c +2 -4
@@ -400,10 +400,9 @@ xe_hw_engine_setup_default_lrc_state(struct xe_hw_engine *hwe) PREEMPT_GPGPU_THREAD_GROUP_LEVEL)), XE_RTP_ENTRY_FLAG(FOREACH_ENGINE) }, - {} }; - xe_rtp_process_to_sr(&ctx, lrc_setup, &hwe->reg_lrc); + xe_rtp_process_to_sr(&ctx, lrc_setup, ARRAY_SIZE(lrc_setup), &hwe->reg_lrc); } static void
@@ -459,10 +458,9 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe)XE_RTP_ACTIONS (SET (CSFE_CHICKEN1 (0 ),CS_PRIORITY_MEM_READ ,XE_RTP_ACTION_FLAG (ENGINE_BASE ))) }, - {} }; -xe_rtp_process_to_sr (&ctx, engine_entries, &hwe->reg_sr); +xe_rtp_process_to_sr (&ctx, engine_entries,ARRAY_SIZE (engine_entries), &hwe->reg_sr); }static const struct engine_info *find_engine_info (enum xe_engine_class class,int instance)
drivers/gpu/drm/xe/xe_reg_whitelist.c +2 -2
@@ -88,7 +88,6 @@ static const struct xe_rtp_entry_sr register_whitelist[] = { RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4)) }, - {} };static void whitelist_apply_to_hwe (struct xe_hw_engine *hwe)
@@ -137,7 +136,8 @@ void xe_reg_whitelist_process_engine(struct xe_hw_engine *hwe) {struct xe_rtp_process_ctx ctx =XE_RTP_PROCESS_CTX_INITIALIZER (hwe); -xe_rtp_process_to_sr (&ctx, register_whitelist, &hwe->reg_whitelist); +xe_rtp_process_to_sr (&ctx, register_whitelist,ARRAY_SIZE (register_whitelist), + &hwe->reg_whitelist);whitelist_apply_to_hwe (hwe); }
drivers/gpu/drm/xe/xe_rtp.c +5 -1
@@ -237,6 +237,7 @@ static void rtp_mark_active(struct xe_device *xe,* the save-restore argument. * @ctx: The context for processing the table, with one of device, gt or hwe * @entries: Table with RTP definitions +* @n_entries: Number of entries to process, usually ARRAY_SIZE(entries) * @sr: Save-restore struct where matching rules execute the action. This can be * viewed as the "coalesced view" of multiple the tables. The bits for each * register set are expected not to collide with previously added entries
@@ -247,6 +248,7 @@ static void rtp_mark_active(struct xe_device *xe,*/ void xe_rtp_process_to_sr (struct xe_rtp_process_ctx *ctx,const struct xe_rtp_entry_sr *entries, +size_t n_entries,struct xe_reg_sr *sr) {const struct xe_rtp_entry_sr *entry;
@@ -259,7 +261,9 @@ void xe_rtp_process_to_sr(struct xe_rtp_process_ctx *ctx,if (IS_SRIOV_VF (xe))return ; -for (entry = entries; entry && entry->name; entry++) { +xe_assert (xe, entries); + +for (entry = entries; entry - entries < n_entries; entry++) {bool match = false;if (entry->flags &XE_RTP_ENTRY_FLAG_FOREACH_ENGINE ) {
drivers/gpu/drm/xe/xe_rtp.h +1 -1
@@ -430,7 +430,7 @@ void xe_rtp_process_ctx_enable_active_tracking(struct xe_rtp_process_ctx *ctx,void xe_rtp_process_to_sr (struct xe_rtp_process_ctx *ctx,const struct xe_rtp_entry_sr *entries, -struct xe_reg_sr *sr); +size_t n_entries,struct xe_reg_sr *sr);void xe_rtp_process (struct xe_rtp_process_ctx *ctx,const struct xe_rtp_entry *entries);
drivers/gpu/drm/xe/xe_tuning.c +4 -8
@@ -85,8 +85,6 @@ static const struct xe_rtp_entry_sr gt_tunings[] = {XE_RTP_RULES (MEDIA_VERSION (2000 )),XE_RTP_ACTIONS (SET (XE2LPM_SCRATCH3_LBCF ,RWFLUSHALLEN )) }, - - {} }; static const struct xe_rtp_entry_sr engine_tunings[] = {
@@ -95,7 +93,6 @@ static const struct xe_rtp_entry_sr engine_tunings[] = { ENGINE_CLASS(RENDER)),XE_RTP_ACTIONS (SET (SAMPLER_MODE ,INDIRECT_STATE_BASE_ADDR_OVERRIDE )) }, - {} };static const struct xe_rtp_entry_sr lrc_tunings[] = {
@@ -133,8 +130,6 @@ static const struct xe_rtp_entry_sr lrc_tunings[] = {XE_RTP_ACTIONS (FIELD_SET (FF_MODE ,VS_HIT_MAX_VALUE_MASK ,REG_FIELD_PREP (VS_HIT_MAX_VALUE_MASK ,0x3f ))) }, - - {} };/**
@@ -175,7 +170,7 @@ void xe_tuning_process_gt(struct xe_gt *gt)xe_rtp_process_ctx_enable_active_tracking (&ctx, gt->tuning_active.gt,ARRAY_SIZE (gt_tunings)); -xe_rtp_process_to_sr (&ctx, gt_tunings, >->reg_sr); +xe_rtp_process_to_sr (&ctx, gt_tunings,ARRAY_SIZE (gt_tunings), >->reg_sr); }EXPORT_SYMBOL_IF_KUNIT (xe_tuning_process_gt);
@@ -186,7 +181,8 @@ void xe_tuning_process_engine(struct xe_hw_engine *hwe)xe_rtp_process_ctx_enable_active_tracking (&ctx, hwe->gt->tuning_active.engine,ARRAY_SIZE (engine_tunings)); -xe_rtp_process_to_sr (&ctx, engine_tunings, &hwe->reg_sr); +xe_rtp_process_to_sr (&ctx, engine_tunings,ARRAY_SIZE (engine_tunings), + &hwe->reg_sr); }EXPORT_SYMBOL_IF_KUNIT (xe_tuning_process_engine);
@@ -205,7 +201,7 @@ void xe_tuning_process_lrc(struct xe_hw_engine *hwe)xe_rtp_process_ctx_enable_active_tracking (&ctx, hwe->gt->tuning_active.lrc,ARRAY_SIZE (lrc_tunings)); -xe_rtp_process_to_sr (&ctx, lrc_tunings, &hwe->reg_lrc); +xe_rtp_process_to_sr (&ctx, lrc_tunings,ARRAY_SIZE (lrc_tunings), &hwe->reg_lrc); }void xe_tuning_dump (struct xe_gt *gt,struct drm_printer *p)
drivers/gpu/drm/xe/xe_wa.c +3 -9
@@ -279,8 +279,6 @@ static const struct xe_rtp_entry_sr gt_was[] = {XE_RTP_ACTIONS (SET (VDBOX_CGCTL3F10 (0 ),RAMDFTUNIT_CLKGATE_DIS )), XE_RTP_ENTRY_FLAG(FOREACH_ENGINE), }, - - {} }; static const struct xe_rtp_entry_sr engine_was[] = {
@@ -623,8 +621,6 @@ static const struct xe_rtp_entry_sr engine_was[] = { FUNC(xe_rtp_match_first_render_or_compute)),XE_RTP_ACTIONS (SET (TDL_TSL_CHICKEN ,RES_CHK_SPR_DIS )) }, - - {} };static const struct xe_rtp_entry_sr lrc_was[] = {
@@ -817,8 +813,6 @@ static const struct xe_rtp_entry_sr lrc_was[] = {DIS_PARTIAL_AUTOSTRIP | DIS_AUTOSTRIP)) }, - - {} }; static __maybe_unused const struct xe_rtp_entry oob_was[] = {
@@ -860,7 +854,7 @@ void xe_wa_process_gt(struct xe_gt *gt)xe_rtp_process_ctx_enable_active_tracking (&ctx, gt->wa_active.gt,ARRAY_SIZE (gt_was)); -xe_rtp_process_to_sr (&ctx, gt_was, >->reg_sr); +xe_rtp_process_to_sr (&ctx, gt_was,ARRAY_SIZE (gt_was), >->reg_sr); }EXPORT_SYMBOL_IF_KUNIT (xe_wa_process_gt);
@@ -878,7 +872,7 @@ void xe_wa_process_engine(struct xe_hw_engine *hwe)xe_rtp_process_ctx_enable_active_tracking (&ctx, hwe->gt->wa_active.engine,ARRAY_SIZE (engine_was)); -xe_rtp_process_to_sr (&ctx, engine_was, &hwe->reg_sr); +xe_rtp_process_to_sr (&ctx, engine_was,ARRAY_SIZE (engine_was), &hwe->reg_sr); }/**
@@ -895,7 +889,7 @@ void xe_wa_process_lrc(struct xe_hw_engine *hwe)xe_rtp_process_ctx_enable_active_tracking (&ctx, hwe->gt->wa_active.lrc,ARRAY_SIZE (lrc_was)); -xe_rtp_process_to_sr (&ctx, lrc_was, &hwe->reg_lrc); +xe_rtp_process_to_sr (&ctx, lrc_was,ARRAY_SIZE (lrc_was), &hwe->reg_lrc); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 31/311 drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niranjana Vishwanathapura <[email protected]>
[ Upstream commit 262de94a3a7ef23c326534b3d9483602b7af841e ]
The RCU_MODE_FIXED_SLICE_CCS_MODE setting is not getting invoked in the gt reset path after the ccs_mode setting by the user. Add it to engine register update list (in hw_engine_setup_default_state()) which ensures it gets set in the gt reset and engine reset paths.
v2: Add register update to engine list to ensure it gets updated after engine reset also.
--- drivers/gpu/drm/xe/xe_hw_engine.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/xe/xe_hw_engine.c +6 -6
@@ -386,12 +386,6 @@ xe_hw_engine_setup_default_lrc_state(struct xe_hw_engine *hwe) blit_cctl_val, XE_RTP_ACTION_FLAG(ENGINE_BASE))) }, -/* Use Fixed slice CCS mode */ - {XE_RTP_NAME ("RCU_MODE_FIXED_SLICE_CCS_MODE" ), -XE_RTP_RULES (FUNC (xe_hw_engine_match_fixed_cslice_mode)), -XE_RTP_ACTIONS (FIELD_SET (RCU_MODE ,RCU_MODE_FIXED_SLICE_CCS_MODE , -RCU_MODE_FIXED_SLICE_CCS_MODE )) - },/* Disable WMTP if HW doesn't support it */ {XE_RTP_NAME ("DISABLE_WMTP_ON_UNSUPPORTED_HW" ), XE_RTP_RULES(FUNC(xe_rtp_cfeg_wmtp_disabled)),
@@ -458,6 +452,12 @@ hw_engine_setup_default_state(struct xe_hw_engine *hwe) XE_RTP_ACTIONS(SET(CSFE_CHICKEN1(0), CS_PRIORITY_MEM_READ, XE_RTP_ACTION_FLAG(ENGINE_BASE))) }, +/* Use Fixed slice CCS mode */ + {XE_RTP_NAME ("RCU_MODE_FIXED_SLICE_CCS_MODE" ), +XE_RTP_RULES (FUNC (xe_hw_engine_match_fixed_cslice_mode)), +XE_RTP_ACTIONS (FIELD_SET (RCU_MODE ,RCU_MODE_FIXED_SLICE_CCS_MODE , +RCU_MODE_FIXED_SLICE_CCS_MODE )) + }, };xe_rtp_process_to_sr (&ctx, engine_entries,ARRAY_SIZE (engine_entries), &hwe->reg_sr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 32/311 lib/Kconfig.ubsan: Remove default UBSAN from UBSAN_INTEGER_WRAP
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit cdc2e1d9d929d7f7009b3a5edca52388a2b0891f upstream.
CONFIG_UBSAN_INTEGER_WRAP is 'default UBSAN', which is problematic for a couple of reasons.
The first is that this sanitizer is under active development on the compiler side to come up with a solution that is maintainable on the compiler side and usable on the kernel side. As a result of this, there are many warnings when the sanitizer is enabled that have no clear path to resolution yet but users may see them and report them in the meantime.
The second is that this option was renamed from CONFIG_UBSAN_SIGNED_WRAP, meaning that if a configuration has CONFIG_UBSAN=y but CONFIG_UBSAN_SIGNED_WRAP=n and it is upgraded via olddefconfig (common in non-interactive scenarios such as CI), CONFIG_UBSAN_INTEGER_WRAP will be silently enabled again.
Remove 'default UBSAN' from CONFIG_UBSAN_INTEGER_WRAP until it is ready for regular usage and testing from a broader community than the folks actively working on the feature.
--- lib/Kconfig.ubsan | 1 - 1 file changed, 1 deletion(-)
lib/Kconfig.ubsan +0 -1
@@ -118,7 +118,6 @@ config UBSAN_UNREACHABLE config UBSAN_SIGNED_WRAP bool "Perform checking for signed arithmetic wrap-around" - default UBSAN depends on !COMPILE_TEST # The no_sanitize attribute was introduced in GCC with version 8. depends on !CC_IS_GCC || GCC_VERSION >= 80000
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 33/311 ceph: Fix incorrect flush end position calculation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit f452a2204614fc10e2c3b85904c4bd300c2789dc ]
In ceph, in fill_fscrypt_truncate(), the end flush position is calculated by:
loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;
but that's using the block shift not the block size.
Fix this to use the block size instead.
--- fs/ceph/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/inode.c +1 -1
@@ -2362,7 +2362,7 @@ static int fill_fscrypt_truncate(struct inode *inode,/* Try to writeback the dirty pagecaches */ if (issued & (CEPH_CAP_FILE_BUFFER )) { -loff_t lend = orig_pos +CEPH_FSCRYPT_BLOCK_SHIFT -1 ; +loff_t lend = orig_pos +CEPH_FSCRYPT_BLOCK_SIZE -1 ; ret =filemap_write_and_wait_range (inode->i_mapping, orig_pos, lend);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 34/311 cpufreq: sun50i: prevent out-of-bounds access
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andre Przywara <[email protected]>
[ Upstream commit 14c8a418159e541d70dbf8fc71225d1623beaf0f ]
A KASAN enabled kernel reports an out-of-bounds access when handling the nvmem cell in the sun50i cpufreq driver:
==================================================================
BUG: KASAN: slab-out-of-bounds in sun50i_cpufreq_nvmem_probe+0x180/0x3d4 Read of size 4 at addr ffff000006bf31e0 by task kworker/u16:1/38
This is because the DT specifies the nvmem cell as covering only two bytes, but we use a u32 pointer to read the value. DTs for other SoCs indeed specify 4 bytes, so we cannot just shorten the variable to a u16.
Fortunately nvmem_cell_read() allows to return the length of the nvmem cell, in bytes, so we can use that information to only access the valid portion of the data.
To cover multiple cell sizes, use memcpy() to copy the information into a zeroed u32 buffer, then also make sure we always read the data in little endian fashion, as this is how the data is stored in the SID efuses.
--- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/cpufreq/sun50i-cpufreq-nvmem.c +12 -6
@@ -194,7 +194,9 @@ static int sun50i_cpufreq_get_efuse(void)struct nvmem_cell *speedbin_nvmem;const struct of_device_id *match;struct device *cpu_dev; -u32 *speedbin; +void *speedbin_ptr; +u32 speedbin =0 ; +size_t len;int ret; cpu_dev =get_cpu_device (0 );
@@ -217,14 +219,18 @@ static int sun50i_cpufreq_get_efuse(void)return dev_err_probe (cpu_dev,PTR_ERR (speedbin_nvmem),"Could not get nvmem cell\n" ); - speedbin =nvmem_cell_read (speedbin_nvmem,NULL ); + speedbin_ptr =nvmem_cell_read (speedbin_nvmem, &len);nvmem_cell_put (speedbin_nvmem); -if (IS_ERR (speedbin)) -return PTR_ERR (speedbin); +if (IS_ERR (speedbin_ptr)) +return PTR_ERR (speedbin_ptr); - ret = opp_data->efuse_xlate (*speedbin); +if (len <=4 ) +memcpy (&speedbin, speedbin_ptr, len); + speedbin =le32_to_cpu (speedbin); -kfree (speedbin); + ret = opp_data->efuse_xlate (speedbin); + +kfree (speedbin_ptr);return ret; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 35/311 dma/contiguous: avoid warning about unused size_bytes
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit d7b98ae5221007d3f202746903d4c21c7caf7ea9 ]
When building with W=1, this variable is unused for configs with CONFIG_CMA_SIZE_SEL_PERCENTAGE=y:
kernel/dma/contiguous.c:67:26: error: 'size_bytes' defined but not used [-Werror=unused-const-variable=]
Change this to a macro to avoid the warning.
--- kernel/dma/contiguous.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/dma/contiguous.c +1 -2
@@ -64,8 +64,7 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes__initconst = - (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; +#define size_bytes ((phys_addr_t)CMA_SIZE_MBYTES * SZ_1M)static phys_addr_t size_cmdline__initdata =-1 ;static phys_addr_t base_cmdline__initdata ;static phys_addr_t limit_cmdline__initdata ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 36/311 cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 9992649f6786921873a9b89dafa5e04d8c5fef2b ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. apple_soc_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
--- drivers/cpufreq/apple-soc-cpufreq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/cpufreq/apple-soc-cpufreq.c +8 -2
@@ -134,11 +134,17 @@ static const struct of_device_id apple_soc_cpufreq_of_match[] __maybe_unused = {static unsigned int apple_soc_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct apple_cpu_priv *priv = policy->driver_data; +struct cpufreq_policy *policy; +struct apple_cpu_priv *priv;struct cpufreq_frequency_table *p;unsigned int pstate; + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; +if (priv->info->cur_pstate_mask) {u32 reg =readl_relaxed (priv->reg_base +APPLE_DVFS_STATUS );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 37/311 cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 484d3f15cc6cbaa52541d6259778e715b2c83c54 ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. scmi_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after cpufreq_cpu_get_raw() to prevent this issue.
--- drivers/cpufreq/scmi-cpufreq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/cpufreq/scmi-cpufreq.c +8 -2
@@ -37,11 +37,17 @@ static struct cpufreq_driver scmi_cpufreq_driver;static unsigned int scmi_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct scmi_data *priv = policy->driver_data; +struct cpufreq_policy *policy; +struct scmi_data *priv;unsigned long rate;int ret; + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; + ret = perf_ops->freq_get (ph, priv->domain_id, &rate, false);if (ret)return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 20/311 PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Pau Monne <[email protected]>
[ Upstream commit c3164d2e0d181027da8fc94f8179d8607c3d440f ]
Setting pci_msi_ignore_mask inhibits the toggling of the mask bit for both MSI and MSI-X entries globally, regardless of the IRQ chip they are using. Only Xen sets the pci_msi_ignore_mask when routing physical interrupts over event channels, to prevent PCI code from attempting to toggle the maskbit, as it's Xen that controls the bit.
However, the pci_msi_ignore_mask being global will affect devices that use MSI interrupts but are not routing those interrupts over event channels (not using the Xen pIRQ chip). One example is devices behind a VMD PCI bridge. In that scenario the VMD bridge configures MSI(-X) using the normal IRQ chip (the pIRQ one in the Xen case), and devices behind the bridge configure the MSI entries using indexes into the VMD bridge MSI table. The VMD bridge then demultiplexes such interrupts and delivers to the destination device(s). Having pci_msi_ignore_mask set in that scenario prevents (un)masking of MSI entries for devices behind the VMD bridge.
Move the signaling of no entry masking into the MSI domain flags, as that allows setting it on a per-domain basis. Set it for the Xen MSI domain that uses the pIRQ chip, while leaving it unset for the rest of the cases.
Remove pci_msi_ignore_mask at once, since it was only used by Xen code, and with Xen dropping usage the variable is unneeded.
This fixes using devices behind a VMD bridge on Xen PV hardware domains.
Albeit Devices behind a VMD bridge are not known to Xen, that doesn't mean Linux cannot use them. By inhibiting the usage of VMD_FEAT_CAN_BYPASS_MSI_REMAP and the removal of the pci_msi_ignore_mask bodge devices behind a VMD bridge do work fine when use from a Linux Xen hardware domain. That's the whole point of the series.
Message-ID: <[email protected]>
Stable-dep-of: cf761e3dacc6 ("PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads")
--- arch/x86/pci/xen.c | 8 ++------ drivers/pci/msi/msi.c | 37 +++++++++++++++++++++---------------- include/linux/msi.h | 3 ++- kernel/irq/msi.c | 2 +- 4 files changed, 26 insertions(+), 24 deletions(-)
arch/x86/pci/xen.c +2 -6
@@ -436,7 +436,8 @@ static struct msi_domain_ops xen_pci_msi_domain_ops = { };static struct msi_domain_info xen_pci_msi_domain_info = { - .flags =MSI_FLAG_PCI_MSIX |MSI_FLAG_FREE_MSI_DESCS |MSI_FLAG_DEV_SYSFS , + .flags =MSI_FLAG_PCI_MSIX |MSI_FLAG_FREE_MSI_DESCS | +MSI_FLAG_DEV_SYSFS |MSI_FLAG_NO_MASK , .ops = &xen_pci_msi_domain_ops, };
@@ -484,11 +485,6 @@ static __init void xen_setup_pci_msi(void)* in allocating the native domain and never use it. */ x86_init.irqs.create_pci_msi_domain = xen_create_pci_msi_domain; -/* -* With XEN PIRQ/Eventchannels in use PCI/MSI[-X] masking is solely -* controlled by the hypervisor. -*/ - pci_msi_ignore_mask = 1; }#else /* CONFIG_PCI_MSI */
drivers/pci/msi/msi.c +21 -16
@@ -10,12 +10,12 @@#include <linux/err.h> #include <linux/export.h> #include <linux/irq.h> +#include <linux/irqdomain.h> #include "../pci.h" #include "msi.h" int pci_msi_enable =1 ; -int pci_msi_ignore_mask;/** * pci_msi_supported - check whether MSI may be enabled on a device
@@ -285,6 +285,8 @@ static void pci_msi_set_enable(struct pci_dev *dev, int enable)static int msi_setup_msi_desc (struct pci_dev *dev,int nvec,struct irq_affinity_desc *masks) { +const struct irq_domain *d =dev_get_msi_domain (&dev->dev); +const struct msi_domain_info *info = d->host_data;struct msi_desc desc;u16 control;
@@ -295,8 +297,7 @@ static int msi_setup_msi_desc(struct pci_dev *dev, int nvec,/* Lies, damned lies, and MSIs */ if (dev->dev_flags &PCI_DEV_FLAGS_HAS_MSI_MASKING ) control |=PCI_MSI_FLAGS_MASKBIT ; -/* Respect XEN's mask disabling */ -if (pci_msi_ignore_mask) +if (info->flags &MSI_FLAG_NO_MASK ) control &= ~PCI_MSI_FLAGS_MASKBIT ; desc.nvec_used = nvec;
@@ -604,12 +605,15 @@ static void __iomem *msix_map_region(struct pci_dev *dev,*/ void msix_prepare_msi_desc (struct pci_dev *dev,struct msi_desc *desc) { +const struct irq_domain *d =dev_get_msi_domain (&dev->dev); +const struct msi_domain_info *info = d->host_data; + desc->nvec_used =1 ; desc->pci.msi_attrib.is_msix =1 ; desc->pci.msi_attrib.is_64 =1 ; desc->pci.msi_attrib.default_irq = dev->irq; desc->pci.mask_base = dev->msix_base; - desc->pci.msi_attrib.can_mask = !pci_msi_ignore_mask && + desc->pci.msi_attrib.can_mask = !(info->flags &MSI_FLAG_NO_MASK ) && !desc->pci.msi_attrib.is_virtual;if (desc->pci.msi_attrib.can_mask) {
@@ -659,9 +663,6 @@ static void msix_mask_all(void __iomem *base, int tsize)u32 ctrl =PCI_MSIX_ENTRY_CTRL_MASKBIT ;int i; -if (pci_msi_ignore_mask) -return ; -for (i =0 ; i < tsize; i++, base +=PCI_MSIX_ENTRY_SIZE )writel (ctrl, base +PCI_MSIX_ENTRY_VECTOR_CTRL ); }
@@ -714,6 +715,8 @@ static int msix_setup_interrupts(struct pci_dev *dev, struct msix_entry *entriesstatic int msix_capability_init (struct pci_dev *dev,struct msix_entry *entries,int nvec,struct irq_affinity *affd) { +const struct irq_domain *d =dev_get_msi_domain (&dev->dev); +const struct msi_domain_info *info = d->host_data;int ret, tsize;u16 control;
@@ -744,15 +747,17 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,/* Disable INTX */ pci_intx_for_msi (dev,0 ); -/* -* Ensure that all table entries are masked to prevent -* stale entries from firing in a crash kernel. -* -* Done late to deal with a broken Marvell NVME device -* which takes the MSI-X mask bits into account even -* when MSI-X is disabled, which prevents MSI delivery. -*/ -msix_mask_all (dev->msix_base, tsize); +if (!(info->flags &MSI_FLAG_NO_MASK )) { +/* +* Ensure that all table entries are masked to prevent +* stale entries from firing in a crash kernel. +* +* Done late to deal with a broken Marvell NVME device +* which takes the MSI-X mask bits into account even +* when MSI-X is disabled, which prevents MSI delivery. +*/ +msix_mask_all (dev->msix_base, tsize); + }pci_msix_clear_and_set_ctrl (dev,PCI_MSIX_FLAGS_MASKALL ,0 );pcibios_free_irq (dev);
include/linux/msi.h +2 -1
@@ -73,7 +73,6 @@ struct msi_msg { }; }; -extern int pci_msi_ignore_mask;/* Helper functions */ struct msi_desc ;struct pci_dev ;
@@ -556,6 +555,8 @@ enum {MSI_FLAG_PCI_MSIX_ALLOC_DYN = (1 <<20 ),/* PCI MSIs cannot be steered separately to CPU cores */ MSI_FLAG_NO_AFFINITY = (1 <<21 ), +/* Inhibit usage of entry masking */ + MSI_FLAG_NO_MASK = (1 << 22), };/**
kernel/irq/msi.c +1 -1
@@ -1143,7 +1143,7 @@ static bool msi_check_reservation_mode(struct irq_domain *domain,if (!(info->flags &MSI_FLAG_MUST_REACTIVATE ))return false; -if (IS_ENABLED (CONFIG_PCI_MSI ) && pci_msi_ignore_mask) +if (info->flags &MSI_FLAG_NO_MASK )return false;/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 38/311 cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 73b24dc731731edf762f9454552cb3a5b7224949 ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. scpi_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
--- drivers/cpufreq/scpi-cpufreq.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/cpufreq/scpi-cpufreq.c +10 -3
@@ -29,9 +29,16 @@ static struct scpi_ops *scpi_ops;static unsigned int scpi_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct scpi_data *priv = policy->driver_data; -unsigned long rate =clk_get_rate (priv->clk); +struct cpufreq_policy *policy; +struct scpi_data *priv; +unsigned long rate; + + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; + rate =clk_get_rate (priv->clk);return rate /1000 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 39/311 scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 4c324085062919d4e21c69e5e78456dcec0052fe ]
A race can occur between the MCQ completion path and the abort handler:
once a request completes, __blk_mq_free_request() sets rq->mq_hctx to NULL, meaning the subsequent ufshcd_mcq_req_to_hwq() call in ufshcd_mcq_abort() can return a NULL pointer. If this NULL pointer is dereferenced, the kernel will crash.
Add a NULL check for the returned hwq pointer. If hwq is NULL, log an error and return FAILED, preventing a potential NULL-pointer dereference. As suggested by Bart, the ufshcd_cmd_inflight() check is removed.
This is similar to the fix in commit 74736103fb41 ("scsi: ufs: core: Fix ufshcd_abort_one racing issue").
This is found by our static analysis tool KNighter.
--- drivers/ufs/core/ufs-mcq.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/ufs/core/ufs-mcq.c +5 -7
@@ -677,13 +677,6 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd)unsigned long flags;int err; -if (!ufshcd_cmd_inflight (lrbp->cmd)) { -dev_err (hba->dev, -"%s: skip abort. cmd at tag %d already completed.\n" , - __func__, tag); -return FAILED ; - } -/* Skip task abort in case previous aborts failed and report failure */ if (lrbp->req_abort_skip) { dev_err(hba->dev, "%s: skip abort. tag %d failed earlier\n",
@@ -692,6 +685,11 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) } hwq =ufshcd_mcq_req_to_hwq (hba,scsi_cmd_to_rq (cmd)); +if (!hwq) { +dev_err (hba->dev,"%s: skip abort. cmd at tag %d already completed.\n" , + __func__, tag); +return FAILED ; + }if (ufshcd_mcq_sqe_search (hba, hwq, tag)) {/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 40/311 virtio_pci: Use self group type for cap commands
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Jurgens <[email protected]>
[ Upstream commit 16c22c56d4282584742022a37d4f79a46ca6094a ]
Section 2.12.1.2 of v1.4 of the VirtIO spec states:
The device and driver capabilities commands are currently defined for self group type.
1. VIRTIO_ADMIN_CMD_CAP_ID_LIST_QUERY
2. VIRTIO_ADMIN_CMD_DEVICE_CAP_GET
3. VIRTIO_ADMIN_CMD_DRIVER_CAP_SET
Message-Id: <[email protected]>
--- drivers/virtio/virtio_pci_modern.c | 4 ++-- include/uapi/linux/virtio_pci.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/virtio/virtio_pci_modern.c +2 -2
@@ -247,7 +247,7 @@ virtio_pci_admin_cmd_dev_parts_objects_enable(struct virtio_device *virtio_dev)sg_init_one (&data_sg, get_data,sizeof (*get_data));sg_init_one (&result_sg, result,sizeof (*result)); cmd.opcode =cpu_to_le16 (VIRTIO_ADMIN_CMD_DEVICE_CAP_GET ); - cmd.group_type =cpu_to_le16 (VIRTIO_ADMIN_GROUP_TYPE_SRIOV ); + cmd.group_type =cpu_to_le16 (VIRTIO_ADMIN_GROUP_TYPE_SELF ); cmd.data_sg = &data_sg; cmd.result_sg = &result_sg; ret =vp_modern_admin_cmd_exec (virtio_dev, &cmd);
@@ -305,7 +305,7 @@ static void virtio_pci_admin_cmd_cap_init(struct virtio_device *virtio_dev)sg_init_one (&result_sg, data,sizeof (*data)); cmd.opcode =cpu_to_le16 (VIRTIO_ADMIN_CMD_CAP_ID_LIST_QUERY ); - cmd.group_type =cpu_to_le16 (VIRTIO_ADMIN_GROUP_TYPE_SRIOV ); + cmd.group_type =cpu_to_le16 (VIRTIO_ADMIN_GROUP_TYPE_SELF ); cmd.result_sg = &result_sg; ret =vp_modern_admin_cmd_exec (virtio_dev, &cmd);
include/uapi/linux/virtio_pci.h +1 -0
@@ -246,6 +246,7 @@ struct virtio_pci_cfg_cap {#define VIRTIO_ADMIN_CMD_LIST_USE 0x1/* Admin command group type. */ +#define VIRTIO_ADMIN_GROUP_TYPE_SELF 0x0#define VIRTIO_ADMIN_GROUP_TYPE_SRIOV 0x1/* Transitional device admin command. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 41/311 cpufreq: cppc: Fix invalid return value in .get() callback
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit 2b8e6b58889c672e1ae3601d9b2b070be4dc2fbc ]
Returning a negative error code in a function with an unsigned return type is a pretty bad idea. It is probably worse when the justification for the change is "our static analisys tool found it".
--- drivers/cpufreq/cppc_cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cppc_cpufreq.c +1 -1
@@ -749,7 +749,7 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu)int ret;if (!policy) -return -ENODEV ; +return 0 ; cpu_data = policy->driver_data;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 42/311 cpufreq: Do not enable by default during compile testing
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit d4f610a9bafdec8e3210789aa19335367da696ea ]
Enabling the compile test should not cause automatic enabling of all drivers.
Stable-dep-of: a374f28700ab ("cpufreq: fix compile-test defaults")
--- drivers/cpufreq/Kconfig.arm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/cpufreq/Kconfig.arm +8 -8
@@ -76,7 +76,7 @@ config ARM_VEXPRESS_SPC_CPUFREQ config ARM_BRCMSTB_AVS_CPUFREQ tristate "Broadcom STB AVS CPUfreq driver" depends on (ARCH_BRCMSTB && !ARM_SCMI_CPUFREQ) || COMPILE_TEST - default y + default ARCH_BRCMSTB help Some Broadcom STB SoCs use a co-processor running proprietary firmware ("AVS") to handle voltage and frequency scaling. This driver provides
@@ -181,7 +181,7 @@ config ARM_RASPBERRYPI_CPUFREQ config ARM_S3C64XX_CPUFREQ bool "Samsung S3C64XX" depends on CPU_S3C6410 || COMPILE_TEST - default y + default CPU_S3C6410 help This adds the CPUFreq driver for Samsung S3C6410 SoC.
@@ -190,7 +190,7 @@ config ARM_S3C64XX_CPUFREQ config ARM_S5PV210_CPUFREQ bool "Samsung S5PV210 and S5PC110" depends on CPU_S5PV210 || COMPILE_TEST - default y + default CPU_S5PV210 help This adds the CPUFreq driver for Samsung S5PV210 and S5PC110 SoCs.
@@ -214,7 +214,7 @@ config ARM_SCMI_CPUFREQ config ARM_SPEAR_CPUFREQ bool "SPEAr CPUFreq support" depends on PLAT_SPEAR || COMPILE_TEST - default y + default PLAT_SPEAR help This adds the CPUFreq driver support for SPEAr SOCs.
@@ -233,7 +233,7 @@ config ARM_TEGRA20_CPUFREQ tristate "Tegra20/30 CPUFreq support" depends on ARCH_TEGRA || COMPILE_TEST depends on CPUFREQ_DT - default y + default ARCH_TEGRA help This adds the CPUFreq driver support for Tegra20/30 SOCs.
@@ -241,7 +241,7 @@ config ARM_TEGRA124_CPUFREQ bool "Tegra124 CPUFreq support" depends on ARCH_TEGRA || COMPILE_TEST depends on CPUFREQ_DT - default y + default ARCH_TEGRA help This adds the CPUFreq driver support for Tegra124 SOCs.
@@ -256,14 +256,14 @@ config ARM_TEGRA194_CPUFREQ tristate "Tegra194 CPUFreq support" depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC || (64BIT && COMPILE_TEST) depends on TEGRA_BPMP - default y + default ARCH_TEGRA help This adds CPU frequency driver support for Tegra194 SOCs. config ARM_TI_CPUFREQ bool "Texas Instruments CPUFreq support" depends on ARCH_OMAP2PLUS || ARCH_K3 || COMPILE_TEST - default y + default ARCH_OMAP2PLUS || ARCH_K3 help This driver enables valid OPPs on the running platform based on values contained within the SoC in use. Enable this in order to
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 43/311 cpufreq: fix compile-test defaults
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit a374f28700abd20e8a7d026f89aa26f759445918 ]
Commit 3f66425a4fc8 ("cpufreq: Enable COMPILE_TEST on Arm drivers") enabled compile testing of most Arm CPUFreq drivers but left the existing default values unchanged so that many drivers are enabled by default whenever COMPILE_TEST is selected.
This specifically results in the S3C64XX CPUFreq driver being enabled and initialised during boot of non-S3C64XX platforms with the following error logged:
cpufreq: Unable to obtain ARMCLK: -2
Commit d4f610a9bafd ("cpufreq: Do not enable by default during compile testing") recently fixed most of the default values, but two entries were missed and two could use a more specific default condition.
Fix the default values for drivers that can be compile tested and that should be enabled by default when not compile testing.
--- drivers/cpufreq/Kconfig.arm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/cpufreq/Kconfig.arm +4 -4
@@ -76,7 +76,7 @@ config ARM_VEXPRESS_SPC_CPUFREQ config ARM_BRCMSTB_AVS_CPUFREQ tristate "Broadcom STB AVS CPUfreq driver" depends on (ARCH_BRCMSTB && !ARM_SCMI_CPUFREQ) || COMPILE_TEST - default ARCH_BRCMSTB + default y if ARCH_BRCMSTB && !ARM_SCMI_CPUFREQ help Some Broadcom STB SoCs use a co-processor running proprietary firmware ("AVS") to handle voltage and frequency scaling. This driver provides
@@ -88,7 +88,7 @@ config ARM_HIGHBANK_CPUFREQ tristate "Calxeda Highbank-based" depends on ARCH_HIGHBANK || COMPILE_TEST depends on CPUFREQ_DT && REGULATOR && PL320_MBOX - default m + default m if ARCH_HIGHBANK help This adds the CPUFreq driver for Calxeda Highbank SoC based boards.
@@ -133,7 +133,7 @@ config ARM_MEDIATEK_CPUFREQ config ARM_MEDIATEK_CPUFREQ_HW tristate "MediaTek CPUFreq HW driver" depends on ARCH_MEDIATEK || COMPILE_TEST - default m + default m if ARCH_MEDIATEK help Support for the CPUFreq HW driver. Some MediaTek chipsets have a HW engine to offload the steps
@@ -256,7 +256,7 @@ config ARM_TEGRA194_CPUFREQ tristate "Tegra194 CPUFreq support" depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC || (64BIT && COMPILE_TEST) depends on TEGRA_BPMP - default ARCH_TEGRA + default ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC help This adds CPU frequency driver support for Tegra194 SOCs.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 44/311 btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit bc2dbc4983afedd198490cca043798f57c93e9bf ]
[BUG]
When running btrfs/004 with 4K fs block size and 64K page size, sometimes fsstress workload can take 100% CPU for a while, but not long enough to trigger a 120s hang warning.
[CAUSE]
When such 100% CPU usage happens, btrfs_punch_hole_lock_range() is always in the call trace.
One example when this problem happens, the function btrfs_punch_hole_lock_range() got the following parameters:
lock_start = 4096, lockend = 20469
Then we calculate @page_lockstart by rounding up lock_start to page boundary, which is 64K (page size is 64K).
For @page_lockend, we round down the value towards page boundary, which result 0. Then since we need to pass an inclusive end to filemap_range_has_page(), we subtract 1 from the rounded down value, resulting in (u64)-1.
In the above case, the range is inside the same page, and we do not even need to call filemap_range_has_page(), not to mention to call it with (u64)-1 at the end.
This behavior will cause btrfs_punch_hole_lock_range() to busy loop waiting for irrelevant range to have its pages dropped.
[FIX]
Calculate @page_lockend by just rounding down @lockend, without decreasing the value by one. So @page_lockend will no longer overflow.
Then exit early if @page_lockend is no larger than @page_lockstart. As it means either the range is inside the same page, or the two pages are adjacent already.
Finally only decrease @page_lockend when calling filemap_range_has_page().
--- fs/btrfs/file.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/btrfs/file.c +7 -2
@@ -2104,15 +2104,20 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,* will always return true. * So here we need to do extra page alignment for * filemap_range_has_page(). +* +* And do not decrease page_lockend right now, as it can be 0. */ const u64 page_lockstart =round_up (lockstart,PAGE_SIZE ); -const u64 page_lockend =round_down (lockend +1 ,PAGE_SIZE ) -1 ; +const u64 page_lockend =round_down (lockend +1 ,PAGE_SIZE );while (1 ) {truncate_pagecache_range (inode, lockstart, lockend);lock_extent (&BTRFS_I (inode)->io_tree, lockstart, lockend, cached_state); +/* The same page or adjacent pages. */ +if (page_lockend <= page_lockstart) +break ;/* * We can't have ordered extents in the range, nor dirty/writeback * pages, because we have locked the inode's VFS lock in exclusive
@@ -2124,7 +2129,7 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,* we do, unlock the range and retry. */ if (!filemap_range_has_page (inode->i_mapping, page_lockstart, - page_lockend)) + page_lockend -1 ))break ; unlock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 45/311 btrfs: zoned: return EIO on RAID1 block group write pointer mismatch
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Thumshirn <[email protected]>
[ Upstream commit b0c26f47992672661340dd6ea931240213016609 ]
There was a bug report about a NULL pointer dereference in __btrfs_add_free_space_zoned() that ultimately happens because a conversion from the default metadata profile DUP to a RAID1 profile on two disks.
The stack trace has the following signature:
BTRFS error (device sdc): zoned: write pointer offset mismatch of zones in raid1 profile
BUG: kernel NULL pointer dereference, address: 0000000000000058 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: Oops: 0000 [#1] PREEMPT SMP NOPTI RIP: 0010:__btrfs_add_free_space_zoned.isra.0+0x61/0x1a0 RSP: 0018:ffffa236b6f3f6d0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff96c8132f3400 RCX: 0000000000000001 RDX: 0000000010000000 RSI: 0000000000000000 RDI: ffff96c8132f3410 RBP: 0000000010000000 R08: 0000000000000003 R09: 0000000000000000 R10: 0000000000000000 R11: 00000000ffffffff R12: 0000000000000000 R13: ffff96c758f65a40 R14: 0000000000000001 R15: 000011aac0000000 FS: 00007fdab1cb2900(0000) GS:ffff96e60ca00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000058 CR3: 00000001a05ae000 CR4: 0000000000350ef0 Call Trace: <TASK> ? __die_body.cold+0x19/0x27 ? page_fault_oops+0x15c/0x2f0 ? exc_page_fault+0x7e/0x180 ? asm_exc_page_fault+0x26/0x30 ? __btrfs_add_free_space_zoned.isra.0+0x61/0x1a0 btrfs_add_free_space_async_trimmed+0x34/0x40 btrfs_add_new_free_space+0x107/0x120 btrfs_make_block_group+0x104/0x2b0 btrfs_create_chunk+0x977/0xf20 btrfs_chunk_alloc+0x174/0x510 ? srso_return_thunk+0x5/0x5f btrfs_inc_block_group_ro+0x1b1/0x230 btrfs_relocate_block_group+0x9e/0x410 btrfs_relocate_chunk+0x3f/0x130 btrfs_balance+0x8ac/0x12b0 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? __kmalloc_cache_noprof+0x14c/0x3e0 btrfs_ioctl+0x2686/0x2a80 ? srso_return_thunk+0x5/0x5f ? ioctl_has_perm.constprop.0.isra.0+0xd2/0x120 __x64_sys_ioctl+0x97/0xc0 do_syscall_64+0x82/0x160 ? srso_return_thunk+0x5/0x5f ? __memcg_slab_free_hook+0x11a/0x170 ? srso_return_thunk+0x5/0x5f ? kmem_cache_free+0x3f0/0x450 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? syscall_exit_to_user_mode+0x10/0x210 ? srso_return_thunk+0x5/0x5f ? do_syscall_64+0x8e/0x160 ? sysfs_emit+0xaf/0xc0 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? seq_read_iter+0x207/0x460 ? srso_return_thunk+0x5/0x5f ? vfs_read+0x29c/0x370 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? syscall_exit_to_user_mode+0x10/0x210 ? srso_return_thunk+0x5/0x5f ? do_syscall_64+0x8e/0x160 ? srso_return_thunk+0x5/0x5f ? exc_page_fault+0x7e/0x180 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7fdab1e0ca6d RSP: 002b:00007ffeb2b60c80 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007fdab1e0ca6d RDX: 00007ffeb2b60d80 RSI: 00000000c4009420 RDI: 0000000000000003 RBP: 00007ffeb2b60cd0 R08: 0000000000000000 R09: 0000000000000013 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffeb2b6343b R14: 00007ffeb2b60d80 R15: 0000000000000001 </TASK> CR2: 0000000000000058 ---[ end trace 0000000000000000 ]---
The 1st line is the most interesting here:
BTRFS error (device sdc): zoned: write pointer offset mismatch of zones in raid1 profile
When a RAID1 block-group is created and a write pointer mismatch between the disks in the RAID set is detected, btrfs sets the alloc_offset to the length of the block group marking it as full. Afterwards the code expects that a balance operation will evacuate the data in this block-group and repair the problems.
But before this is possible, the new space of this block-group will be accounted in the free space cache. But in __btrfs_add_free_space_zoned() it is being checked if it is a initial creation of a block group and if not a reclaim decision will be made. But the decision if a block-group's free space accounting is done for an initial creation depends on if the size of the added free space is the whole length of the block-group and the allocation offset is 0.
But as btrfs_load_block_group_zone_info() sets the allocation offset to the zone capacity (i.e. marking the block-group as full) this initial decision is not met, and the space_info pointer in the 'struct btrfs_block_group' has not yet been assigned.
Fail creation of the block group and rely on manual user intervention to re-balance the filesystem.
Afterwards the filesystem can be unmounted, mounted in degraded mode and the missing device can be removed after a full balance of the filesystem.
--- fs/btrfs/zoned.c | 1 - 1 file changed, 1 deletion(-)
fs/btrfs/zoned.c +0 -1
@@ -1659,7 +1659,6 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)* stripe. */ cache->alloc_offset = cache->zone_capacity; - ret =0 ; } out:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 46/311 cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: T.J. Mercier <[email protected]>
[ Upstream commit 1bf67c8fdbda21fadd564a12dbe2b13c1ea5eda7 ]
Android has mounted the v1 cpuset controller using filesystem type "cpuset" (not "cgroup") since 2015 [1], and depends on the resulting behavior where the controller name is not added as a prefix for cgroupfs files. [2]
Later, a problem was discovered where cpu hotplug onlining did not affect the cpuset/cpus files, which Android carried an out-of-tree patch to address for a while. An attempt was made to upstream this patch, but the recommendation was to use the "cpuset_v2_mode" mount option instead. [3]
An effort was made to do so, but this fails with "cgroup: Unknown parameter 'cpuset_v2_mode'" because commit e1cba4b85daa ("cgroup: Add mount flag to enable cpuset to use v2 behavior in v1 cgroup") did not update the special cased cpuset_mount(), and only the cgroup (v1) filesystem type was updated.
Add parameter parsing to the cpuset filesystem type so that cpuset_v2_mode works like the cgroup filesystem type:
$ mkdir /dev/cpuset $ mount -t cpuset -ocpuset_v2_mode none /dev/cpuset $ mount|grep cpuset none on /dev/cpuset type cgroup (rw,relatime,cpuset,noprefix,cpuset_v2_mode,release_agent=/sbin/cpuset_release_agent)
[1] https://cs.android.com/android/_/android/platform/system/core/+/b769c8d24fd7be96f8968aa4c80b669525b930d3
[2] https://cs.android.com/android/platform/superproject/main/+/main:system/core/libprocessgroup/setup/cgroup_map_write.cpp;drc=2dac5d89a0f024a2d0cc46a80ba4ee13472f1681;l=192
[3] https://lore.kernel.org/lkml/[email protected]/T/
--- kernel/cgroup/cgroup.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
kernel/cgroup/cgroup.c +29 -0
@@ -2339,9 +2339,37 @@ static struct file_system_type cgroup2_fs_type = { };#ifdef CONFIG_CPUSETS_V1 +enum cpuset_param { + Opt_cpuset_v2_mode, +}; + +static const struct fs_parameter_spec cpuset_fs_parameters[] = { +fsparam_flag ("cpuset_v2_mode" , Opt_cpuset_v2_mode), + {} +}; + +static int cpuset_parse_param (struct fs_context *fc,struct fs_parameter *param) +{ +struct cgroup_fs_context *ctx =cgroup_fc2context (fc); +struct fs_parse_result result; +int opt; + + opt =fs_parse (fc, cpuset_fs_parameters, param, &result); +if (opt <0 ) +return opt; + +switch (opt) { +case Opt_cpuset_v2_mode: + ctx->flags |=CGRP_ROOT_CPUSET_V2_MODE ; +return 0 ; + } +return -EINVAL ; +} +static const struct fs_context_operations cpuset_fs_context_ops = { .get_tree = cgroup1_get_tree, .free = cgroup_fs_context_free, + .parse_param = cpuset_parse_param, };/*
@@ -2378,6 +2406,7 @@ static int cpuset_init_fs_context(struct fs_context *fc)static struct file_system_type cpuset_fs_type = { .name ="cpuset" , .init_fs_context = cpuset_init_fs_context, + .parameters = cpuset_fs_parameters, .fs_flags =FS_USERNS_MOUNT , };#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 47/311 vhost-scsi: Add better resource allocation failure handling
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Christie <[email protected]>
[ Upstream commit 3ca51662f8186b569b8fb282242c20ccbb3993c2 ]
If we can't allocate mem to map in data for a request or can't find a tag for a command, we currently drop the command. This leads to the error handler running to clean it up. Instead of dropping the command this has us return an error telling the initiator that it queued more commands than we can handle. The initiator will then reduce how many commands it will send us and retry later.
Message-Id: <[email protected]>
Stable-dep-of: b18268713547 ("vhost-scsi: Fix vhost_scsi_send_bad_target()")
--- drivers/vhost/scsi.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/vhost/scsi.c +25 -3
@@ -630,7 +630,7 @@ vhost_scsi_get_cmd(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg, tag =sbitmap_get (&svq->scsi_tags);if (tag <0 ) { -pr_err ("Unable to obtain tag for vhost_scsi_cmd\n" ); +pr_warn_once ("Guest sent too many cmds. Returning TASK_SET_FULL.\n" );return ERR_PTR (-ENOMEM ); }
@@ -929,6 +929,24 @@ static void vhost_scsi_target_queue_cmd(struct vhost_scsi_cmd *cmd)target_submit (se_cmd); } +static void +vhost_scsi_send_status (struct vhost_scsi *vs,struct vhost_virtqueue *vq, +int head,unsigned int out,u8 status) +{ +struct virtio_scsi_cmd_resp __user *resp; +struct virtio_scsi_cmd_resp rsp; +int ret; + +memset (&rsp,0 ,sizeof (rsp)); + rsp.status = status; + resp = vq->iov[out].iov_base; + ret =__copy_to_user (resp, &rsp,sizeof (rsp)); +if (!ret) +vhost_add_used_and_signal (&vs->dev, vq, head,0 ); +else +pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); +} + static void vhost_scsi_send_bad_target(struct vhost_scsi *vs, struct vhost_virtqueue *vq,
@@ -1216,8 +1234,8 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) exp_data_len + prot_bytes, data_direction);if (IS_ERR (cmd)) { -vq_err (vq,"vhost_scsi_get_cmd failed %ld\n" , -PTR_ERR (cmd)); + ret =PTR_ERR (cmd); +vq_err (vq,"vhost_scsi_get_tag failed %dd\n" , ret); goto err; } cmd->tvc_vhost = vs;
@@ -1254,11 +1272,15 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)* EINVAL: Invalid response buffer, drop the request * EIO: Respond with bad target * EAGAIN: Pending request +* ENOMEM: Could not allocate resources for request */ if (ret == -ENXIO )break ;else if (ret == -EIO )vhost_scsi_send_bad_target (vs, vq, vc.head, vc.out); +else if (ret == -ENOMEM ) +vhost_scsi_send_status (vs, vq, vc.head, vc.out, +SAM_STAT_TASK_SET_FULL ); }while (likely (!vhost_exceeds_weight (vq, ++c,0 ))); out:mutex_unlock (&vq->mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 21/311 PCI/MSI: Handle the NOMASK flag correctly for all PCI/MSI backends
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 3ece3e8e5976c49c3f887e5923f998eabd54ff40 ]
The conversion of the XEN specific global variable pci_msi_ignore_mask to a MSI domain flag, missed the facts that:
1) Legacy architectures do not provide a interrupt domain
2) Parent MSI domains do not necessarily have a domain info attached
Both cases result in an unconditional NULL pointer dereference. This was unfortunatly missed in review and testing revealed it late.
Cure this by using the existing pci_msi_domain_supports() helper, which handles all possible cases correctly.
Stable-dep-of: cf761e3dacc6 ("PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads")
--- drivers/pci/msi/msi.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/pci/msi/msi.c +6 -12
@@ -285,8 +285,6 @@ static void pci_msi_set_enable(struct pci_dev *dev, int enable)static int msi_setup_msi_desc (struct pci_dev *dev,int nvec,struct irq_affinity_desc *masks) { -const struct irq_domain *d =dev_get_msi_domain (&dev->dev); -const struct msi_domain_info *info = d->host_data;struct msi_desc desc;u16 control;
@@ -297,7 +295,7 @@ static int msi_setup_msi_desc(struct pci_dev *dev, int nvec,/* Lies, damned lies, and MSIs */ if (dev->dev_flags &PCI_DEV_FLAGS_HAS_MSI_MASKING ) control |=PCI_MSI_FLAGS_MASKBIT ; -if (info->flags &MSI_FLAG_NO_MASK ) +if (pci_msi_domain_supports (dev,MSI_FLAG_NO_MASK ,DENY_LEGACY )) control &= ~PCI_MSI_FLAGS_MASKBIT ; desc.nvec_used = nvec;
@@ -605,20 +603,18 @@ static void __iomem *msix_map_region(struct pci_dev *dev,*/ void msix_prepare_msi_desc (struct pci_dev *dev,struct msi_desc *desc) { -const struct irq_domain *d =dev_get_msi_domain (&dev->dev); -const struct msi_domain_info *info = d->host_data; - desc->nvec_used =1 ; desc->pci.msi_attrib.is_msix =1 ; desc->pci.msi_attrib.is_64 =1 ; desc->pci.msi_attrib.default_irq = dev->irq; desc->pci.mask_base = dev->msix_base; - desc->pci.msi_attrib.can_mask = !(info->flags &MSI_FLAG_NO_MASK ) && - !desc->pci.msi_attrib.is_virtual; -if (desc->pci.msi_attrib.can_mask) { + +if (!pci_msi_domain_supports (dev,MSI_FLAG_NO_MASK ,DENY_LEGACY ) && + !desc->pci.msi_attrib.is_virtual) {void __iomem *addr =pci_msix_desc_addr (desc); + desc->pci.msi_attrib.can_mask =1 ; desc->pci.msix_ctrl =readl (addr +PCI_MSIX_ENTRY_VECTOR_CTRL ); } }
@@ -715,8 +711,6 @@ static int msix_setup_interrupts(struct pci_dev *dev, struct msix_entry *entriesstatic int msix_capability_init (struct pci_dev *dev,struct msix_entry *entries,int nvec,struct irq_affinity *affd) { -const struct irq_domain *d =dev_get_msi_domain (&dev->dev); -const struct msi_domain_info *info = d->host_data;int ret, tsize;u16 control;
@@ -747,7 +741,7 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,/* Disable INTX */ pci_intx_for_msi (dev,0 ); -if (!(info->flags &MSI_FLAG_NO_MASK )) { +if (!pci_msi_domain_supports (dev,MSI_FLAG_NO_MASK ,DENY_LEGACY )) {/* * Ensure that all table entries are masked to prevent * stale entries from firing in a crash kernel.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 48/311 vhost-scsi: Fix vhost_scsi_send_bad_target()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongli Zhang <[email protected]>
[ Upstream commit b182687135474d7ed905a07cc6cb2734b359e13e ]
Although the support of VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 was signaled by the commit 664ed90e621c ("vhost/scsi: Set VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 feature bits"), vhost_scsi_send_bad_target() still assumes the response in a single descriptor.
In addition, although vhost_scsi_send_bad_target() is used by both I/O queue and control queue, the response header is always virtio_scsi_cmd_resp. It is required to use virtio_scsi_ctrl_tmf_resp or virtio_scsi_ctrl_an_resp for control queue.
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 48 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-)
drivers/vhost/scsi.c +37 -11
@@ -947,23 +947,46 @@ vhost_scsi_send_status(struct vhost_scsi *vs, struct vhost_virtqueue *vq,pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); } +#define TYPE_IO_CMD 0 +#define TYPE_CTRL_TMF 1 +#define TYPE_CTRL_AN 2 +static void vhost_scsi_send_bad_target (struct vhost_scsi *vs,struct vhost_virtqueue *vq, -int head,unsigned out) +struct vhost_scsi_ctx *vc,int type) { -struct virtio_scsi_cmd_resp __user *resp; -struct virtio_scsi_cmd_resp rsp; +union { +struct virtio_scsi_cmd_resp cmd; +struct virtio_scsi_ctrl_tmf_resp tmf; +struct virtio_scsi_ctrl_an_resp an; + } rsp; +struct iov_iter iov_iter; +size_t rsp_size;int ret;memset (&rsp,0 ,sizeof (rsp)); - rsp.response =VIRTIO_SCSI_S_BAD_TARGET ; - resp = vq->iov[out].iov_base; - ret =__copy_to_user (resp, &rsp,sizeof (rsp)); -if (!ret) -vhost_add_used_and_signal (&vs->dev, vq, head,0 ); + +if (type ==TYPE_IO_CMD ) { + rsp_size =sizeof (struct virtio_scsi_cmd_resp ); + rsp.cmd.response =VIRTIO_SCSI_S_BAD_TARGET ; + }else if (type ==TYPE_CTRL_TMF ) { + rsp_size =sizeof (struct virtio_scsi_ctrl_tmf_resp ); + rsp.tmf.response =VIRTIO_SCSI_S_BAD_TARGET ; + }else { + rsp_size =sizeof (struct virtio_scsi_ctrl_an_resp ); + rsp.an.response =VIRTIO_SCSI_S_BAD_TARGET ; + } + +iov_iter_init (&iov_iter,ITER_DEST , &vq->iov[vc->out], vc->in, + rsp_size); + + ret =copy_to_iter (&rsp, rsp_size, &iov_iter); + +if (likely (ret == rsp_size)) +vhost_add_used_and_signal (&vs->dev, vq, vc->head,0 );else -pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); +pr_err ("Faulted on virtio scsi type=%d\n" , type); } static int
@@ -1277,7 +1300,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)if (ret == -ENXIO )break ;else if (ret == -EIO ) -vhost_scsi_send_bad_target (vs, vq, vc.head, vc.out); +vhost_scsi_send_bad_target (vs, vq, &vc,TYPE_IO_CMD );else if (ret == -ENOMEM )vhost_scsi_send_status (vs, vq, vc.head, vc.out,SAM_STAT_TASK_SET_FULL );
@@ -1510,7 +1533,10 @@ vhost_scsi_ctl_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)if (ret == -ENXIO )break ;else if (ret == -EIO ) -vhost_scsi_send_bad_target (vs, vq, vc.head, vc.out); +vhost_scsi_send_bad_target (vs, vq, &vc, + v_req.type ==VIRTIO_SCSI_T_TMF ? +TYPE_CTRL_TMF : +TYPE_CTRL_AN ); }while (likely (!vhost_exceeds_weight (vq, ++c,0 ))); out:mutex_unlock (&vq->mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 49/311 vhost-scsi: Fix vhost_scsi_send_status()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongli Zhang <[email protected]>
[ Upstream commit 58465d86071b61415e25fb054201f61e83d21465 ]
Although the support of VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 was signaled by the commit 664ed90e621c ("vhost/scsi: Set VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 feature bits"), vhost_scsi_send_bad_target() still assumes the response in a single descriptor.
Similar issue in vhost_scsi_send_bad_target() has been fixed in previous commit. In addition, similar issue for vhost_scsi_complete_cmd_work() has been fixed by the commit 6dd88fd59da8 ("vhost-scsi: unbreak any layout for response").
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/vhost/scsi.c +11 -7
@@ -931,18 +931,22 @@ static void vhost_scsi_target_queue_cmd(struct vhost_scsi_cmd *cmd)static void vhost_scsi_send_status (struct vhost_scsi *vs,struct vhost_virtqueue *vq, -int head,unsigned int out,u8 status) +struct vhost_scsi_ctx *vc,u8 status) { -struct virtio_scsi_cmd_resp __user *resp;struct virtio_scsi_cmd_resp rsp; +struct iov_iter iov_iter;int ret;memset (&rsp,0 ,sizeof (rsp)); rsp.status = status; - resp = vq->iov[out].iov_base; - ret =__copy_to_user (resp, &rsp,sizeof (rsp)); -if (!ret) -vhost_add_used_and_signal (&vs->dev, vq, head,0 ); + +iov_iter_init (&iov_iter,ITER_DEST , &vq->iov[vc->out], vc->in, +sizeof (rsp)); + + ret =copy_to_iter (&rsp,sizeof (rsp), &iov_iter); + +if (likely (ret ==sizeof (rsp))) +vhost_add_used_and_signal (&vs->dev, vq, vc->head,0 );else pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); }
@@ -1302,7 +1306,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)else if (ret == -EIO )vhost_scsi_send_bad_target (vs, vq, &vc,TYPE_IO_CMD );else if (ret == -ENOMEM ) -vhost_scsi_send_status (vs, vq, vc.head, vc.out, +vhost_scsi_send_status (vs, vq, &vc,SAM_STAT_TASK_SET_FULL ); }while (likely (!vhost_exceeds_weight (vq, ++c,0 ))); out:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 22/311 PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Currier <[email protected]>
[ Upstream commit cf761e3dacc6ad5f65a4886d00da1f9681e6805a ]
Commit 7d5ec3d36123 ("PCI/MSI: Mask all unused MSI-X entries") introduced a readl() from ENTRY_VECTOR_CTRL before the writel() to ENTRY_DATA.
This is correct, however some hardware, like the Sun Neptune chips, the NIU module, will cause an error and/or fatal trap if any MSIX table entry is read before the corresponding ENTRY_DATA field is written to.
Add an optional early writel() in msix_prepare_msi_desc().
--- drivers/pci/msi/msi.c | 3 +++ include/linux/pci.h | 2 ++ 2 files changed, 5 insertions(+)
drivers/pci/msi/msi.c +3 -0
@@ -615,6 +615,9 @@ void msix_prepare_msi_desc(struct pci_dev *dev, struct msi_desc *desc)void __iomem *addr =pci_msix_desc_addr (desc); desc->pci.msi_attrib.can_mask =1 ; +/* Workaround for SUN NIU insanity, which requires write before read */ +if (dev->dev_flags &PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST ) +writel (0 , addr +PCI_MSIX_ENTRY_DATA ); desc->pci.msix_ctrl =readl (addr +PCI_MSIX_ENTRY_VECTOR_CTRL ); } }
include/linux/pci.h +2 -0
@@ -245,6 +245,8 @@ enum pci_dev_flags {PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 <<11 ),/* Device does honor MSI masking despite saying otherwise */ PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 <<12 ), +/* Device requires write to PCI_MSIX_ENTRY_DATA before any MSIX reads */ + PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST = (__force pci_dev_flags_t) (1 << 13), }; enum pci_irq_reroute_variant {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 23/311 irqchip/renesas-rzv2h: Simplify rzv2h_icu_init()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit f5de95438834a3bc3ad747f67c9da93cd08e5008 ]
Use devm_add_action_or_reset() for calling put_device in error path of rzv2h_icu_init() to simplify the code by using the recently added devm_* helpers.
Stable-dep-of: 28e89cdac648 ("irqchip/renesas-rzv2h: Prevent TINT spurious interrupt")
--- drivers/irqchip/irq-renesas-rzv2h.c | 37 +++++++++++++++-------------- 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/irqchip/irq-renesas-rzv2h.c +19 -18
@@ -421,6 +421,11 @@ static int rzv2h_icu_parse_interrupts(struct rzv2h_icu_priv *priv, struct devicereturn 0 ; } +static void rzv2h_icu_put_device (void *data) +{ +put_device (data); +} +static int rzv2h_icu_init (struct device_node *node,struct device_node *parent) {struct irq_domain *irq_domain, *parent_domain;
@@ -433,43 +438,41 @@ static int rzv2h_icu_init(struct device_node *node, struct device_node *parent)if (!pdev)return -ENODEV ; + ret =devm_add_action_or_reset (&pdev->dev, rzv2h_icu_put_device, + &pdev->dev); +if (ret <0 ) +return ret; + parent_domain =irq_find_host (parent);if (!parent_domain) {dev_err (&pdev->dev,"cannot find parent domain\n" ); - ret = -ENODEV ; - goto put_dev; +return -ENODEV ; } rzv2h_icu_data =devm_kzalloc (&pdev->dev,sizeof (*rzv2h_icu_data),GFP_KERNEL ); -if (!rzv2h_icu_data) { - ret = -ENOMEM ; - goto put_dev; - } +if (!rzv2h_icu_data) +return -ENOMEM ; rzv2h_icu_data->irqchip = &rzv2h_icu_chip; rzv2h_icu_data->base =devm_of_iomap (&pdev->dev, pdev->dev.of_node,0 ,NULL ); -if (IS_ERR (rzv2h_icu_data->base)) { - ret =PTR_ERR (rzv2h_icu_data->base); - goto put_dev; - } +if (IS_ERR (rzv2h_icu_data->base)) +return PTR_ERR (rzv2h_icu_data->base); ret =rzv2h_icu_parse_interrupts (rzv2h_icu_data, node);if (ret) {dev_err (&pdev->dev,"cannot parse interrupts: %d\n" , ret); - goto put_dev; +return ret; } resetn =devm_reset_control_get_exclusive (&pdev->dev,NULL ); -if (IS_ERR (resetn)) { - ret =PTR_ERR (resetn); - goto put_dev; - } +if (IS_ERR (resetn)) +return PTR_ERR (resetn); ret =reset_control_deassert (resetn);if (ret) {dev_err (&pdev->dev,"failed to deassert resetn pin, %d\n" , ret); - goto put_dev; +return ret; }pm_runtime_enable (&pdev->dev);
@@ -500,8 +503,6 @@ static int rzv2h_icu_init(struct device_node *node, struct device_node *parent) pm_disable:pm_runtime_disable (&pdev->dev);reset_control_assert (resetn); -put_dev: -put_device (&pdev->dev);return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 24/311 irqchip/renesas-rzv2h: Add struct rzv2h_hw_info with t_offs variable
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit 0a9d6ef64e5e917f93db98935cd09bac38507ebf ]
The ICU block on the RZ/G3E SoC is almost identical to the one found on the RZ/V2H SoC, with the following differences:
- The TINT register base offset is 0x800 instead of zero.
- The number of GPIO interrupts for TINT selection is 141 instead of 86.
- The pin index and TINT selection index are not in the 1:1 map
- The number of TSSR registers is 16 instead of 8
- Each TSSR register can program 2 TINTs instead of 4 TINTs
Introduce struct rzv2h_hw_info to describe the SoC properties and refactor the code by moving rzv2h_icu_init() into rzv2h_icu_init_common() and pass the variable containing hw difference to support both these SoCs.
As a first step add t_offs to the new struct and replace the hardcoded constants in the code.
Stable-dep-of: 28e89cdac648 ("irqchip/renesas-rzv2h: Prevent TINT spurious interrupt")
--- drivers/irqchip/irq-renesas-rzv2h.c | 46 +++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 12 deletions(-)
drivers/irqchip/irq-renesas-rzv2h.c +34 -12
@@ -80,18 +80,28 @@#define ICU_TINT_EXTRACT_GPIOINT (x) FIELD_GET(GENMASK(31, 16), (x))#define ICU_PB5_TINT 0x55 +/** +* struct rzv2h_hw_info - Interrupt Control Unit controller hardware info structure. +* @t_offs: TINT offset +*/ +struct rzv2h_hw_info { +u16 t_offs; +}; +/** * struct rzv2h_icu_priv - Interrupt Control Unit controller private data structure. * @base: Controller's base address * @irqchip: Pointer to struct irq_chip * @fwspec: IRQ firmware specific data * @lock: Lock to serialize access to hardware registers +* @info: Pointer to struct rzv2h_hw_info */ struct rzv2h_icu_priv {void __iomem *base;const struct irq_chip *irqchip;struct irq_fwspec fwspec[ICU_NUM_IRQ ];raw_spinlock_t lock; +const struct rzv2h_hw_info *info; };static inline struct rzv2h_icu_priv *irq_data_to_priv (struct irq_data *data)
@@ -111,7 +121,7 @@ static void rzv2h_icu_eoi(struct irq_data *d) tintirq_nr = hw_irq -ICU_TINT_START ; bit =BIT (tintirq_nr);if (!irqd_is_level_type (d)) -writel_relaxed (bit, priv->base +ICU_TSCLR ); +writel_relaxed (bit, priv->base + priv->info->t_offs +ICU_TSCLR ); }else if (hw_irq >=ICU_IRQ_START ) { tintirq_nr = hw_irq -ICU_IRQ_START ; bit =BIT (tintirq_nr);
@@ -139,12 +149,12 @@ static void rzv2h_tint_irq_endisable(struct irq_data *d, bool enable) tssel_n =ICU_TSSR_TSSEL_N (tint_nr);guard (raw_spinlock)(&priv->lock); - tssr =readl_relaxed (priv->base +ICU_TSSR (k)); + tssr =readl_relaxed (priv->base + priv->info->t_offs +ICU_TSSR (k));if (enable) tssr |=ICU_TSSR_TIEN (tssel_n);else tssr &= ~ICU_TSSR_TIEN (tssel_n); -writel_relaxed (tssr, priv->base +ICU_TSSR (k)); +writel_relaxed (tssr, priv->base + priv->info->t_offs +ICU_TSSR (k)); }static void rzv2h_icu_irq_disable (struct irq_data *d)
@@ -247,8 +257,8 @@ static void rzv2h_clear_tint_int(struct rzv2h_icu_priv *priv, unsigned int hwirqu32 bit =BIT (tint_nr);int k = tint_nr /16 ; - tsctr =readl_relaxed (priv->base +ICU_TSCTR ); - titsr =readl_relaxed (priv->base +ICU_TITSR (k)); + tsctr =readl_relaxed (priv->base + priv->info->t_offs +ICU_TSCTR ); + titsr =readl_relaxed (priv->base + priv->info->t_offs +ICU_TITSR (k)); titsel =ICU_TITSR_TITSEL_GET (titsr, titsel_n);/*
@@ -257,7 +267,7 @@ static void rzv2h_clear_tint_int(struct rzv2h_icu_priv *priv, unsigned int hwirq*/ if ((tsctr & bit) && ((titsel ==ICU_TINT_EDGE_RISING ) || (titsel ==ICU_TINT_EDGE_FALLING ))) -writel_relaxed (bit, priv->base +ICU_TSCLR ); +writel_relaxed (bit, priv->base + priv->info->t_offs +ICU_TSCLR ); }static int rzv2h_tint_set_type (struct irq_data *d,unsigned int type)
@@ -308,21 +318,21 @@ static int rzv2h_tint_set_type(struct irq_data *d, unsigned int type)guard (raw_spinlock)(&priv->lock); - tssr =readl_relaxed (priv->base +ICU_TSSR (tssr_k)); + tssr =readl_relaxed (priv->base + priv->info->t_offs +ICU_TSSR (tssr_k)); tssr &= ~(ICU_TSSR_TSSEL_MASK (tssel_n) | tien); tssr |=ICU_TSSR_TSSEL_PREP (tint, tssel_n); -writel_relaxed (tssr, priv->base +ICU_TSSR (tssr_k)); +writel_relaxed (tssr, priv->base + priv->info->t_offs +ICU_TSSR (tssr_k)); - titsr =readl_relaxed (priv->base +ICU_TITSR (titsr_k)); + titsr =readl_relaxed (priv->base + priv->info->t_offs +ICU_TITSR (titsr_k)); titsr &= ~ICU_TITSR_TITSEL_MASK (titsel_n); titsr |=ICU_TITSR_TITSEL_PREP (sense, titsel_n); -writel_relaxed (titsr, priv->base +ICU_TITSR (titsr_k)); +writel_relaxed (titsr, priv->base + priv->info->t_offs +ICU_TITSR (titsr_k));rzv2h_clear_tint_int (priv, hwirq); -writel_relaxed (tssr | tien, priv->base +ICU_TSSR (tssr_k)); +writel_relaxed (tssr | tien, priv->base + priv->info->t_offs +ICU_TSSR (tssr_k));return 0 ; }
@@ -426,7 +436,8 @@ static void rzv2h_icu_put_device(void *data)put_device (data); } -static int rzv2h_icu_init (struct device_node *node,struct device_node *parent) +static int rzv2h_icu_init_common (struct device_node *node,struct device_node *parent, +const struct rzv2h_hw_info *hw_info) {struct irq_domain *irq_domain, *parent_domain;struct rzv2h_icu_priv *rzv2h_icu_data;
@@ -492,6 +503,8 @@ static int rzv2h_icu_init(struct device_node *node, struct device_node *parent) goto pm_put; } + rzv2h_icu_data->info = hw_info; +/* * coccicheck complains about a missing put_device call before returning, but it's a false * positive. We still need &pdev->dev after successfully returning from this function.
@@ -507,6 +520,15 @@ static int rzv2h_icu_init(struct device_node *node, struct device_node *parent)return ret; } +static const struct rzv2h_hw_info rzv2h_hw_params = { + .t_offs =0 , +}; + +static int rzv2h_icu_init (struct device_node *node,struct device_node *parent) +{ +return rzv2h_icu_init_common (node, parent, &rzv2h_hw_params); +} + IRQCHIP_PLATFORM_DRIVER_BEGIN(rzv2h_icu) IRQCHIP_MATCH("renesas,r9a09g057-icu", rzv2h_icu_init)IRQCHIP_PLATFORM_DRIVER_END (rzv2h_icu)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 25/311 irqchip/renesas-rzv2h: Prevent TINT spurious interrupt
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit 28e89cdac6482f3c980df3e2e245db7366269124 ]
A spurious TINT interrupt is seen during boot on RZ/G3E SMARC EVK.
A glitch in the edge detection circuit can cause a spurious interrupt.
Clear the status flag after setting the ICU_TSSRk registers, which is recommended in the hardware manual as a countermeasure.
--- drivers/irqchip/irq-renesas-rzv2h.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/irqchip/irq-renesas-rzv2h.c +8 -0
@@ -155,6 +155,14 @@ static void rzv2h_tint_irq_endisable(struct irq_data *d, bool enable)else tssr &= ~ICU_TSSR_TIEN (tssel_n);writel_relaxed (tssr, priv->base + priv->info->t_offs +ICU_TSSR (k)); + +/* +* A glitch in the edge detection circuit can cause a spurious +* interrupt. Clear the status flag after setting the ICU_TSSRk +* registers, which is recommended by the hardware manual as a +* countermeasure. +*/ +writel_relaxed (BIT (tint_nr), priv->base + priv->info->t_offs +ICU_TSCLR ); }static void rzv2h_icu_irq_disable (struct irq_data *d)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 26/311 net/niu: Niu requires MSIX ENTRY_DATA fields touch before entry reads
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Currier <[email protected]>
[ Upstream commit fbb429ddff5c8e479edcc7dde5a542c9295944e6 ]
Fix niu_try_msix() to not cause a fatal trap on sparc systems.
Set PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST on the struct pci_dev to work around a bug in the hardware or firmware.
For each vector entry in the msix table, niu chips will cause a fatal trap if any registers in that entry are read before that entries' ENTRY_DATA register is written to. Testing indicates writes to other registers are not sufficient to prevent the fatal trap, however the value does not appear to matter. This only needs to happen once after power up, so simply rebooting into a kernel lacking this fix will NOT cause the trap.
NON-RESUMABLE ERROR: Reporting on cpu 64
NON-RESUMABLE ERROR: TPC [0x00000000005f6900] <msix_prepare_msi_desc+0x90/0xa0> NON-RESUMABLE ERROR: RAW [4010000000000016:00000e37f93e32ff:0000000202000080:ffffffffffffffff
NON-RESUMABLE ERROR: 0000000800000000:0000000000000000:0000000000000000:0000000000000000]
NON-RESUMABLE ERROR: handle [0x4010000000000016] stick [0x00000e37f93e32ff] NON-RESUMABLE ERROR: type [precise nonresumable]
NON-RESUMABLE ERROR: attrs [0x02000080] < ASI sp-faulted priv >
NON-RESUMABLE ERROR: raddr [0xffffffffffffffff]
NON-RESUMABLE ERROR: insn effective address [0x000000c50020000c]
NON-RESUMABLE ERROR: size [0x8]
NON-RESUMABLE ERROR: asi [0x00]
CPU: 64 UID: 0 PID: 745 Comm: kworker/64:1 Not tainted 6.11.5 #63 Workqueue: events work_for_cpu_fn TSTATE: 0000000011001602 TPC: 00000000005f6900 TNPC: 00000000005f6904 Y: 00000000 Not tainted TPC: <msix_prepare_msi_desc+0x90/0xa0> g0: 00000000000002e9 g1: 000000000000000c g2: 000000c50020000c g3: 0000000000000100 g4: ffff8000470307c0 g5: ffff800fec5be000 g6: ffff800047a08000 g7: 0000000000000000 o0: ffff800014feb000 o1: ffff800047a0b620 o2: 0000000000000011 o3: ffff800047a0b620 o4: 0000000000000080 o5: 0000000000000011 sp: ffff800047a0ad51 ret_pc: 00000000005f7128 RPC: <__pci_enable_msix_range+0x3cc/0x460> l0: 000000000000000d l1: 000000000000c01f l2: ffff800014feb0a8 l3: 0000000000000020 l4: 000000000000c000 l5: 0000000000000001 l6: 0000000020000000 l7: ffff800047a0b734 i0: ffff800014feb000 i1: ffff800047a0b730 i2: 0000000000000001 i3: 000000000000000d i4: 0000000000000000 i5: 0000000000000000 i6: ffff800047a0ae81 i7: 00000000101888b0 I7: <niu_try_msix.constprop.0+0xc0/0x130 [niu]> Call Trace: [<00000000101888b0>] niu_try_msix.constprop.0+0xc0/0x130 [niu] [<000000001018f840>] niu_get_invariants+0x183c/0x207c [niu] [<00000000101902fc>] niu_pci_init_one+0x27c/0x2fc [niu] [<00000000005ef3e4>] local_pci_probe+0x28/0x74 [<0000000000469240>] work_for_cpu_fn+0x8/0x1c [<000000000046b008>] process_scheduled_works+0x144/0x210 [<000000000046b518>] worker_thread+0x13c/0x1c0 [<00000000004710e0>] kthread+0xb8/0xc8 [<00000000004060c8>] ret_from_fork+0x1c/0x2c [<0000000000000000>] 0x0 Kernel panic - not syncing: Non-resumable error.
--- drivers/net/ethernet/sun/niu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/sun/niu.c +2 -0
@@ -9064,6 +9064,8 @@ static void niu_try_msix(struct niu *np, u8 *ldg_num_map) msi_vec[i].entry = i; } + pdev->dev_flags |=PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST ; + num_irqs =pci_enable_msix_range (pdev, msi_vec,1 , num_irqs);if (num_irqs <0 ) { np->flags &= ~NIU_FLAGS_MSIX ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 27/311 drm/xe/ptl: Apply Wa_14023061436
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nirmoy Das <[email protected]>
[ Upstream commit 92029e0baa5313ba208103f90086f59070bbf93b ]
Enable WMTP for the BTD kernel to address Wa14023061436 by setting the proper TDL Chicken Bit.
v2: Apply it on engine_was[] as this register is not part of LRC(Matt)
Apply it for first_render_or_compute in case this gets extended to compute only platforms(Matt).
Stable-dep-of: 262de94a3a7e ("drm/xe: Ensure fixed_slice_mode gets set after ccs_mode change")
--- drivers/gpu/drm/xe/regs/xe_gt_regs.h | 3 +++ drivers/gpu/drm/xe/xe_wa.c | 5 +++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/xe/regs/xe_gt_regs.h +3 -0
@@ -500,6 +500,9 @@#define LSC_L1_FLUSH_CTL_3D_DATAPORT_FLUSH_EVENTS_MASK REG_GENMASK(13, 11)#define DIS_ATOMIC_CHAINING_TYPED_WRITES REG_BIT(3) +#define TDL_CHICKEN XE_REG_MCR(0xe5f4, XE_REG_OPTION_MASKED) +#define QID_WAIT_FOR_THREAD_NOT_RUN_DISABLE REG_BIT(12) +#define LSC_CHICKEN_BIT_0 XE_REG_MCR(0xe7c8)#define DISABLE_D8_D16_COASLESCE REG_BIT(30)#define WR_REQ_CHAINING_DIS REG_BIT(26)
drivers/gpu/drm/xe/xe_wa.c +5 -0
@@ -613,6 +613,11 @@ static const struct xe_rtp_entry_sr engine_was[] = { XE_RTP_ACTIONS(FIELD_SET(SAMPLER_MODE, SMP_WAIT_FETCH_MERGING_COUNTER, SMP_FORCE_128B_OVERFETCH)) }, + {XE_RTP_NAME ("14023061436" ), +XE_RTP_RULES (GRAPHICS_VERSION_RANGE (3000 ,3001 ), +FUNC (xe_rtp_match_first_render_or_compute)), +XE_RTP_ACTIONS (SET (TDL_CHICKEN ,QID_WAIT_FOR_THREAD_NOT_RUN_DISABLE )) + }, {} };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 18/311 scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 ]
The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -125,7 +125,7 @@ static int ufs_qcom_ice_init(struct ufs_qcom_host *host)int err;int i; - ice =of_qcom_ice_get (dev); + ice =devm_of_qcom_ice_get (dev);if (ice ==ERR_PTR (-EOPNOTSUPP )) {dev_warn (dev,"Disabling inline encryption support\n" ); ice =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 51/311 net/mlx5: Move ttc allocation after switch case to prevent leaks
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit fa8fd315127ca48c65e7e6692a84ffcf3d07168e ]
Relocate the memory allocation for ttc table after the switch statement that validates params->ns_type in both mlx5_create_inner_ttc_table() and mlx5_create_ttc_table(). This ensures memory is only allocated after confirming valid input, eliminating potential memory leaks when invalid ns_type cases occur.
--- .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +8 -8
@@ -618,10 +618,6 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev,bool use_l4_type;int err; - ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); -if (!ttc) -return ERR_PTR (-ENOMEM ); -switch (params->ns_type) {case MLX5_FLOW_NAMESPACE_PORT_SEL : use_l4_type = MLX5_CAP_GEN_2(dev, pcc_ifa2) &&
@@ -635,6 +631,10 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev,return ERR_PTR (-EINVAL ); } + ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); +if (!ttc) +return ERR_PTR (-ENOMEM ); + ns =mlx5_get_flow_namespace (dev, params->ns_type);if (!ns) {kvfree (ttc);
@@ -696,10 +696,6 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,bool use_l4_type;int err; - ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); -if (!ttc) -return ERR_PTR (-ENOMEM ); -switch (params->ns_type) {case MLX5_FLOW_NAMESPACE_PORT_SEL : use_l4_type = MLX5_CAP_GEN_2(dev, pcc_ifa2) &&
@@ -713,6 +709,10 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,return ERR_PTR (-EINVAL ); } + ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); +if (!ttc) +return ERR_PTR (-ENOMEM ); + ns =mlx5_get_flow_namespace (dev, params->ns_type);if (!ns) {kvfree (ttc);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 60/311 net: phylink: fix suspend/resume with WoL enabled and link down
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
[ Upstream commit 4c8925cb9db158c812e1e11f3e74b945df7c9801 ]
When WoL is enabled, we update the software state in phylink to indicate that the link is down, and disable the resolver from bringing the link back up.
On resume, we attempt to bring the overall state into consistency by calling the .mac_link_down() method, but this is wrong if the link was already down, as phylink strictly orders the .mac_link_up() and .mac_link_down() methods - and this would break that ordering.
--- drivers/net/phy/phylink.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/net/phy/phylink.c +22 -16
@@ -82,6 +82,7 @@ struct phylink {unsigned int pcs_state;bool link_failed; +bool suspend_link_up;bool major_config_failed;bool mac_supports_eee_ops;bool mac_supports_eee;
@@ -2645,14 +2646,16 @@ void phylink_suspend(struct phylink *pl, bool mac_wol)/* Stop the resolver bringing the link up */ __set_bit (PHYLINK_DISABLE_MAC_WOL , &pl->phylink_disable_state); -/* Disable the carrier, to prevent transmit timeouts, -* but one would hope all packets have been sent. This -* also means phylink_resolve() will do nothing. -*/ -if (pl->netdev) -netif_carrier_off (pl->netdev); -else + pl->suspend_link_up =phylink_link_is_up (pl); +if (pl->suspend_link_up) { +/* Disable the carrier, to prevent transmit timeouts, +* but one would hope all packets have been sent. This +* also means phylink_resolve() will do nothing. +*/ +if (pl->netdev) +netif_carrier_off (pl->netdev); pl->old_link_state = false; + }/* We do not call mac_link_down() here as we want the * link to remain up to receive the WoL packets.
@@ -2678,15 +2681,18 @@ void phylink_resume(struct phylink *pl)if (test_bit (PHYLINK_DISABLE_MAC_WOL , &pl->phylink_disable_state)) {/* Wake-on-Lan enabled, MAC handling */ -/* Call mac_link_down() so we keep the overall state balanced. -* Do this under the state_mutex lock for consistency. This -* will cause a "Link Down" message to be printed during -* resume, which is harmless - the true link state will be -* printed when we run a resolve. -*/ -mutex_lock (&pl->state_mutex); -phylink_link_down (pl); -mutex_unlock (&pl->state_mutex); +if (pl->suspend_link_up) { +/* Call mac_link_down() so we keep the overall state +* balanced. Do this under the state_mutex lock for +* consistency. This will cause a "Link Down" message +* to be printed during resume, which is harmless - +* the true link state will be printed when we run a +* resolve. +*/ +mutex_lock (&pl->state_mutex); +phylink_link_down (pl); +mutex_unlock (&pl->state_mutex); + }/* Re-apply the link parameters so that all the settings get * restored to the MAC.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 61/311 net: phy: leds: fix memory leak
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qingfang Deng <[email protected]>
[ Upstream commit b7f0ee992adf601aa00c252418266177eb7ac2bc ]
A network restart test on a router led to an out-of-memory condition, which was traced to a memory leak in the PHY LED trigger code.
The root cause is misuse of the devm API. The registration function (phy_led_triggers_register) is called from phy_attach_direct, not phy_probe, and the unregister function (phy_led_triggers_unregister) is called from phy_detach, not phy_remove. This means the register and unregister functions can be called multiple times for the same PHY device, but devm-allocated memory is not freed until the driver is unbound.
This also prevents kmemleak from detecting the leak, as the devm API internally stores the allocated pointer.
Fix this by replacing devm_kzalloc/devm_kcalloc with standard kzalloc/kcalloc, and add the corresponding kfree calls in the unregister path.
--- drivers/net/phy/phy_led_triggers.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/net/phy/phy_led_triggers.c +13 -10
@@ -91,9 +91,8 @@ int phy_led_triggers_register(struct phy_device *phy)if (!phy->phy_num_led_triggers)return 0 ; - phy->led_link_trigger =devm_kzalloc (&phy->mdio.dev, -sizeof (*phy->led_link_trigger), -GFP_KERNEL ); + phy->led_link_trigger =kzalloc (sizeof (*phy->led_link_trigger), +GFP_KERNEL );if (!phy->led_link_trigger) { err = -ENOMEM ; goto out_clear;
@@ -103,10 +102,9 @@ int phy_led_triggers_register(struct phy_device *phy)if (err) goto out_free_link; - phy->phy_led_triggers =devm_kcalloc (&phy->mdio.dev, - phy->phy_num_led_triggers, -sizeof (struct phy_led_trigger ), -GFP_KERNEL ); + phy->phy_led_triggers =kcalloc (phy->phy_num_led_triggers, +sizeof (struct phy_led_trigger ), +GFP_KERNEL );if (!phy->phy_led_triggers) { err = -ENOMEM ; goto out_unreg_link;
@@ -127,11 +125,11 @@ int phy_led_triggers_register(struct phy_device *phy) out_unreg:while (i--)phy_led_trigger_unregister (&phy->phy_led_triggers[i]); -devm_kfree (&phy->mdio.dev, phy->phy_led_triggers); +kfree (phy->phy_led_triggers); out_unreg_link:phy_led_trigger_unregister (phy->led_link_trigger); out_free_link: -devm_kfree (&phy->mdio.dev, phy->led_link_trigger); +kfree (phy->led_link_trigger); phy->led_link_trigger =NULL ; out_clear: phy->phy_num_led_triggers =0 ;
@@ -145,8 +143,13 @@ void phy_led_triggers_unregister(struct phy_device *phy)for (i =0 ; i < phy->phy_num_led_triggers; i++)phy_led_trigger_unregister (&phy->phy_led_triggers[i]); +kfree (phy->phy_led_triggers); + phy->phy_led_triggers =NULL ; -if (phy->led_link_trigger) +if (phy->led_link_trigger) {phy_led_trigger_unregister (phy->led_link_trigger); +kfree (phy->led_link_trigger); + phy->led_link_trigger =NULL ; + } }EXPORT_SYMBOL_GPL (phy_led_triggers_unregister);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 62/311 virtio-net: Refactor napi_enable paths
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Damato <[email protected]>
[ Upstream commit 2af5adf962d4611a576061501faa8fb39590407e ]
Refactor virtnet_napi_enable and virtnet_napi_tx_enable to take a struct receive_queue. Create a helper, virtnet_napi_do_enable, which contains the logic to enable a NAPI.
Stable-dep-of: 4bc12818b363 ("virtio-net: disable delayed refill when pausing rx")
--- drivers/net/virtio_net.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
drivers/net/virtio_net.c +21 -16
@@ -2789,7 +2789,8 @@ static void skb_recv_done(struct virtqueue *rvq)virtqueue_napi_schedule (&rq->napi, rvq); } -static void virtnet_napi_enable (struct virtqueue *vq,struct napi_struct *napi) +static void virtnet_napi_do_enable (struct virtqueue *vq, +struct napi_struct *napi) {napi_enable (napi);
@@ -2802,10 +2803,16 @@ static void virtnet_napi_enable(struct virtqueue *vq, struct napi_struct *napi)local_bh_enable (); } -static void virtnet_napi_tx_enable (struct virtnet_info *vi, -struct virtqueue *vq, -struct napi_struct *napi) +static void virtnet_napi_enable (struct receive_queue *rq) { +virtnet_napi_do_enable (rq->vq, &rq->napi); +} + +static void virtnet_napi_tx_enable (struct send_queue *sq) +{ +struct virtnet_info *vi = sq->vq->vdev->priv; +struct napi_struct *napi = &sq->napi; +if (!napi->weight)return ;
@@ -2817,7 +2824,7 @@ static void virtnet_napi_tx_enable(struct virtnet_info *vi,return ; } -return virtnet_napi_enable (vq, napi); +virtnet_napi_do_enable (sq->vq, napi); }static void virtnet_napi_tx_disable (struct napi_struct *napi)
@@ -2838,7 +2845,7 @@ static void refill_work(struct work_struct *work)napi_disable (&rq->napi); still_empty = !try_fill_recv (vi, rq,GFP_KERNEL ); -virtnet_napi_enable (rq->vq, &rq->napi); +virtnet_napi_enable (rq);/* In theory, this can happen: if we don't get any buffers in * we will *never* try to fill again.
@@ -3055,8 +3062,8 @@ static int virtnet_enable_queue_pair(struct virtnet_info *vi, int qp_index)if (err <0 ) goto err_xdp_reg_mem_model; -virtnet_napi_enable (vi->rq[qp_index].vq, &vi->rq[qp_index].napi); -virtnet_napi_tx_enable (vi, vi->sq[qp_index].vq, &vi->sq[qp_index].napi); +virtnet_napi_enable (&vi->rq[qp_index]); +virtnet_napi_tx_enable (&vi->sq[qp_index]);return 0 ;
@@ -3320,7 +3327,7 @@ static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queue *rq)schedule_delayed_work (&vi->refill,0 );if (running) -virtnet_napi_enable (rq->vq, &rq->napi); +virtnet_napi_enable (rq); } static int virtnet_rx_resize(struct virtnet_info *vi,
@@ -3383,7 +3390,7 @@ static void virtnet_tx_resume(struct virtnet_info *vi, struct send_queue *sq)__netif_tx_unlock_bh (txq);if (running) -virtnet_napi_tx_enable (vi, sq->vq, &sq->napi); +virtnet_napi_tx_enable (sq); } static int virtnet_tx_resize(struct virtnet_info *vi, struct send_queue *sq,
@@ -5964,9 +5971,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,if (old_prog)bpf_prog_put (old_prog);if (netif_running (dev)) { -virtnet_napi_enable (vi->rq[i].vq, &vi->rq[i].napi); -virtnet_napi_tx_enable (vi, vi->sq[i].vq, - &vi->sq[i].napi); +virtnet_napi_enable (&vi->rq[i]); +virtnet_napi_tx_enable (&vi->sq[i]); } }
@@ -5981,9 +5987,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,if (netif_running (dev)) {for (i =0 ; i < vi->max_queue_pairs; i++) { -virtnet_napi_enable (vi->rq[i].vq, &vi->rq[i].napi); -virtnet_napi_tx_enable (vi, vi->sq[i].vq, - &vi->sq[i].napi); +virtnet_napi_enable (&vi->rq[i]); +virtnet_napi_tx_enable (&vi->sq[i]); } }if (prog)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 63/311 virtio-net: Refactor napi_disable paths
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Damato <[email protected]>
[ Upstream commit 986a93045183ae2f13e6d99d990ae8be36f6d6b0 ]
Create virtnet_napi_disable helper and refactor virtnet_napi_tx_disable to take a struct send_queue.
Stable-dep-of: 4bc12818b363 ("virtio-net: disable delayed refill when pausing rx")
--- drivers/net/virtio_net.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/net/virtio_net.c +17 -8
@@ -2827,12 +2827,21 @@ static void virtnet_napi_tx_enable(struct send_queue *sq)virtnet_napi_do_enable (sq->vq, napi); } -static void virtnet_napi_tx_disable (struct napi_struct *napi) +static void virtnet_napi_tx_disable (struct send_queue *sq) { +struct napi_struct *napi = &sq->napi; +if (napi->weight)napi_disable (napi); } +static void virtnet_napi_disable (struct receive_queue *rq) +{ +struct napi_struct *napi = &rq->napi; + +napi_disable (napi); +} +static void refill_work (struct work_struct *work) { struct virtnet_info *vi =
@@ -2843,7 +2852,7 @@ static void refill_work(struct work_struct *work)for (i =0 ; i < vi->curr_queue_pairs; i++) {struct receive_queue *rq = &vi->rq[i]; -napi_disable (&rq->napi); +virtnet_napi_disable (rq); still_empty = !try_fill_recv (vi, rq,GFP_KERNEL );virtnet_napi_enable (rq);
@@ -3042,8 +3051,8 @@ static int virtnet_poll(struct napi_struct *napi, int budget)static void virtnet_disable_queue_pair (struct virtnet_info *vi,int qp_index) { -virtnet_napi_tx_disable (&vi->sq[qp_index].napi); -napi_disable (&vi->rq[qp_index].napi); +virtnet_napi_tx_disable (&vi->sq[qp_index]); +virtnet_napi_disable (&vi->rq[qp_index]);xdp_rxq_info_unreg (&vi->rq[qp_index].xdp_rxq); }
@@ -3314,7 +3323,7 @@ static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq)bool running =netif_running (vi->dev);if (running) { -napi_disable (&rq->napi); +virtnet_napi_disable (rq);virtnet_cancel_dim (vi, &rq->dim); } }
@@ -3356,7 +3365,7 @@ static void virtnet_tx_pause(struct virtnet_info *vi, struct send_queue *sq) qindex = sq - vi->sq;if (running) -virtnet_napi_tx_disable (&sq->napi); +virtnet_napi_tx_disable (sq); txq =netdev_get_tx_queue (vi->dev, qindex);
@@ -5933,8 +5942,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,/* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running (dev)) {for (i =0 ; i < vi->max_queue_pairs; i++) { -napi_disable (&vi->rq[i].napi); -virtnet_napi_tx_disable (&vi->sq[i].napi); +virtnet_napi_disable (&vi->rq[i]); +virtnet_napi_tx_disable (&vi->sq[i]); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 64/311 virtio-net: disable delayed refill when pausing rx
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bui Quang Minh <[email protected]>
[ Upstream commit 4bc12818b363bd30f0f7348dd9ab077290a637ae ]
When pausing rx (e.g. set up xdp, xsk pool, rx resize), we call napi_disable() on the receive queue's napi. In delayed refill_work, it also calls napi_disable() on the receive queue's napi. When napi_disable() is called on an already disabled napi, it will sleep in napi_disable_locked while still holding the netdev_lock. As a result, later napi_enable gets stuck too as it cannot acquire the netdev_lock. This leads to refill_work and the pause-then-resume tx are stuck altogether.
This scenario can be reproducible by binding a XDP socket to virtio-net interface without setting up the fill ring. As a result, try_fill_recv will fail until the fill ring is set up and refill_work is scheduled.
This commit adds virtnet_rx_(pause/resume)_all helpers and fixes up the virtnet_rx_resume to disable future and cancel all inflights delayed refill_work before calling napi_disable() to pause the rx.
--- drivers/net/virtio_net.c | 69 +++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 12 deletions(-)
drivers/net/virtio_net.c +57 -12
@@ -3318,7 +3318,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void virtnet_rx_pause (struct virtnet_info *vi,struct receive_queue *rq) +static void __virtnet_rx_pause (struct virtnet_info *vi, +struct receive_queue *rq) {bool running =netif_running (vi->dev);
@@ -3328,17 +3329,63 @@ static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq) } } -static void virtnet_rx_resume (struct virtnet_info *vi,struct receive_queue *rq) +static void virtnet_rx_pause_all (struct virtnet_info *vi) +{ +int i; + +/* +* Make sure refill_work does not run concurrently to +* avoid napi_disable race which leads to deadlock. +*/ +disable_delayed_refill (vi); +cancel_delayed_work_sync (&vi->refill); +for (i =0 ; i < vi->max_queue_pairs; i++) +__virtnet_rx_pause (vi, &vi->rq[i]); +} + +static void virtnet_rx_pause (struct virtnet_info *vi,struct receive_queue *rq) +{ +/* +* Make sure refill_work does not run concurrently to +* avoid napi_disable race which leads to deadlock. +*/ +disable_delayed_refill (vi); +cancel_delayed_work_sync (&vi->refill); +__virtnet_rx_pause (vi, rq); +} + +static void __virtnet_rx_resume (struct virtnet_info *vi, +struct receive_queue *rq, +bool refill) {bool running =netif_running (vi->dev); -if (!try_fill_recv (vi, rq,GFP_KERNEL )) +if (refill && !try_fill_recv (vi, rq,GFP_KERNEL ))schedule_delayed_work (&vi->refill,0 );if (running)virtnet_napi_enable (rq); } +static void virtnet_rx_resume_all (struct virtnet_info *vi) +{ +int i; + +enable_delayed_refill (vi); +for (i =0 ; i < vi->max_queue_pairs; i++) { +if (i < vi->curr_queue_pairs) +__virtnet_rx_resume (vi, &vi->rq[i], true); +else +__virtnet_rx_resume (vi, &vi->rq[i], false); + } +} + +static void virtnet_rx_resume (struct virtnet_info *vi,struct receive_queue *rq) +{ +enable_delayed_refill (vi); +__virtnet_rx_resume (vi, rq, true); +} +static int virtnet_rx_resize (struct virtnet_info *vi,struct receive_queue *rq,u32 ring_num) {
@@ -5939,12 +5986,12 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,if (prog)bpf_prog_add (prog, vi->max_queue_pairs -1 ); +virtnet_rx_pause_all (vi); +/* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running (dev)) { -for (i =0 ; i < vi->max_queue_pairs; i++) { -virtnet_napi_disable (&vi->rq[i]); +for (i =0 ; i < vi->max_queue_pairs; i++)virtnet_napi_tx_disable (&vi->sq[i]); - } }if (!prog) {
@@ -5976,13 +6023,12 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, vi->xdp_enabled = false; } +virtnet_rx_resume_all (vi);for (i =0 ; i < vi->max_queue_pairs; i++) {if (old_prog)bpf_prog_put (old_prog); -if (netif_running (dev)) { -virtnet_napi_enable (&vi->rq[i]); +if (netif_running (dev))virtnet_napi_tx_enable (&vi->sq[i]); - } }return 0 ;
@@ -5994,11 +6040,10 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog,rcu_assign_pointer (vi->rq[i].xdp_prog, old_prog); } +virtnet_rx_resume_all (vi);if (netif_running (dev)) { -for (i =0 ; i < vi->max_queue_pairs; i++) { -virtnet_napi_enable (&vi->rq[i]); +for (i =0 ; i < vi->max_queue_pairs; i++)virtnet_napi_tx_enable (&vi->sq[i]); - } }if (prog)bpf_prog_sub (prog, vi->max_queue_pairs -1 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 65/311 tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tung Nguyen <[email protected]>
[ Upstream commit d63527e109e811ef11abb1c2985048fdb528b4cb ]
syzbot reported:
tipc: Node number set to 1055423674
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 3 UID: 0 PID: 6017 Comm: kworker/3:5 Not tainted 6.15.0-rc1-syzkaller-00246-g900241a5cc15 #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Workqueue: events tipc_net_finalize_work RIP: 0010:tipc_mon_reinit_self+0x11c/0x210 net/tipc/monitor.c:719 ... RSP: 0018:ffffc9000356fb68 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 000000003ee87cba RDX: 0000000000000000 RSI: ffffffff8dbc56a7 RDI: ffff88804c2cc010 RBP: dffffc0000000000 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000007 R13: fffffbfff2111097 R14: ffff88804ead8000 R15: ffff88804ead9010 FS: 0000000000000000(0000) GS:ffff888097ab9000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000f720eb00 CR3: 000000000e182000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> tipc_net_finalize+0x10b/0x180 net/tipc/net.c:140 process_one_work+0x9cc/0x1b70 kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3319 [inline] worker_thread+0x6c8/0xf10 kernel/workqueue.c:3400 kthread+0x3c2/0x780 kernel/kthread.c:464 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:153 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 </TASK> ... RIP: 0010:tipc_mon_reinit_self+0x11c/0x210 net/tipc/monitor.c:719 ... RSP: 0018:ffffc9000356fb68 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 000000003ee87cba RDX: 0000000000000000 RSI: ffffffff8dbc56a7 RDI: ffff88804c2cc010 RBP: dffffc0000000000 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000007 R13: fffffbfff2111097 R14: ffff88804ead8000 R15: ffff88804ead9010 FS: 0000000000000000(0000) GS:ffff888097ab9000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000f720eb00 CR3: 000000000e182000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
There is a racing condition between workqueue created when enabling bearer and another thread created when disabling bearer right after that as follow:
enabling_bearer | disabling_bearer
--------------- | ----------------
tipc_disc_timeout() |
{ | bearer_disable()
... | {
schedule_work(&tn->work); | tipc_mon_delete()
... | {
} | ...
| write_lock_bh(&mon->lock);
| mon->self = NULL;
| write_unlock_bh(&mon->lock);
| ...
| }
tipc_net_finalize_work() | }
{ |
... |
tipc_net_finalize() |
{ |
... |
tipc_mon_reinit_self() |
{ |
... |
write_lock_bh(&mon->lock); |
mon->self->addr = tipc_own_addr(net); |
write_unlock_bh(&mon->lock); |
... |
} |
... |
} |
... |
} |'mon->self' is set to NULL in disabling_bearer thread and dereferenced later in enabling_bearer thread.
This commit fixes this issue by validating 'mon->self' before assigning node address to it.
--- net/tipc/monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/tipc/monitor.c +2 -1
@@ -716,7 +716,8 @@ void tipc_mon_reinit_self(struct net *net)if (!mon)continue ;write_lock_bh (&mon->lock); - mon->self->addr =tipc_own_addr (net); +if (mon->self) + mon->self->addr =tipc_own_addr (net);write_unlock_bh (&mon->lock); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 66/311 net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bo-Cun Chen <[email protected]>
[ Upstream commit 491ef1117c56476f199b481f8c68820fe4c3a7c2 ]
Change hardware configuration for the NETSYSv3.
- Enable PSE dummy page mechanism for the GDM1/2/3
- Enable PSE drop mechanism when the WDMA Rx ring full
- Enable PSE no-drop mechanism for packets from the WDMA Tx
- Correct PSE free drop threshold
- Correct PSE CDMA high threshold
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 ++++++++- 2 files changed, 29 insertions(+), 5 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +20 -4
@@ -3997,11 +3997,27 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset)mtk_w32 (eth,0x21021000 ,MTK_FE_INT_GRP );if (mtk_is_netsys_v3_or_greater (eth)) { -/* PSE should not drop port1, port8 and port9 packets */ -mtk_w32 (eth,0x00000302 ,PSE_DROP_CFG ); +/* PSE dummy page mechanism */ +mtk_w32 (eth,PSE_DUMMY_WORK_GDM (1 ) |PSE_DUMMY_WORK_GDM (2 ) | +PSE_DUMMY_WORK_GDM (3 ) |DUMMY_PAGE_THR ,PSE_DUMY_REQ ); + +/* PSE free buffer drop threshold */ +mtk_w32 (eth,0x00600009 ,PSE_IQ_REV (8 )); + +/* PSE should not drop port8, port9 and port13 packets from +* WDMA Tx +*/ +mtk_w32 (eth,0x00002300 ,PSE_DROP_CFG ); + +/* PSE should drop packets to port8, port9 and port13 on WDMA Rx +* ring full +*/ +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (0 )); +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (1 )); +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (2 ));/* GDM and CDM Threshold */ -mtk_w32 (eth,0x00000707 ,MTK_CDMW0_THRES ); +mtk_w32 (eth,0x08000707 ,MTK_CDMW0_THRES );mtk_w32 (eth,0x00000077 ,MTK_CDMW1_THRES );/* Disable GDM1 RX CRC stripping */
@@ -4018,7 +4034,7 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset)mtk_w32 (eth,0x00000300 ,PSE_DROP_CFG );/* PSE should drop packets to port 8/9 on WDMA Rx ring full */ -mtk_w32 (eth,0x00000300 ,PSE_PPE0_DROP ); +mtk_w32 (eth,0x00000300 ,PSE_PPE_DROP (0 ));/* PSE Free Queue Flow Control */ mtk_w32 (eth,0x01fa01f4 ,PSE_FQFC_CFG2 );
drivers/net/ethernet/mediatek/mtk_eth_soc.h +9 -1
@@ -151,7 +151,15 @@#define PSE_FQFC_CFG1 0x100#define PSE_FQFC_CFG2 0x104#define PSE_DROP_CFG 0x108 -#define PSE_PPE0_DROP 0x110 +#define PSE_PPE_DROP (x) (0x110 + ((x) * 0x4)) + +/* PSE Last FreeQ Page Request Control */ +#define PSE_DUMY_REQ 0x10C +/* PSE_DUMY_REQ is not a typo but actually called like that also in +* MediaTek's datasheet +*/ +#define PSE_DUMMY_WORK_GDM (x) BIT(16 + (x)) +#define DUMMY_PAGE_THR 0x1/* PSE Input Queue Reservation Register*/ #define PSE_IQ_REV (x) (0x140 + (((x) - 1) << 2))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 67/311 fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 0d039eac6e5950f9d1ecc9e410c2fd1feaeab3b6 ]
Normally do_lock_mount(path, _) is locking a mountpoint pinned by *path and at the time when matching unlock_mount() unlocks that location it is still pinned by the same thing.
Unfortunately, for 'beneath' case it's no longer that simple - the object being locked is not the one *path points to. It's the mountpoint of path->mnt. The thing is, without sufficient locking ->mnt_parent may change under us and none of the locks are held at that point. The rules are
* mount_lock stabilizes m->mnt_parent for any mount m.
* namespace_sem stabilizes m->mnt_parent, provided that
m is mounted.
* if either of the above holds and refcount of m is positive,
we are guaranteed the same for refcount of m->mnt_parent.
namespace_sem nests inside inode_lock(), so do_lock_mount() has to take inode_lock() before grabbing namespace_sem. It does recheck that path->mnt is still mounted in the same place after getting namespace_sem, and it does take care to pin the dentry. It is needed, since otherwise we might end up with racing mount --move (or umount) happening while we were getting locks; in that case dentry would no longer be a mountpoint and could've been evicted on memory pressure along with its inode - not something you want when grabbing lock on that inode.
However, pinning a dentry is not enough - the matching mount is also pinned only by the fact that path->mnt is mounted on top it and at that point we are not holding any locks whatsoever, so the same kind of races could end up with all references to that mount gone just as we are about to enter inode_lock(). If that happens, we are left with filesystem being shut down while we are holding a dentry reference on it; results are not pretty.
What we need to do is grab both dentry and mount at the same time; that makes inode_lock() safe *and* avoids the problem with fs getting shut down under us. After taking namespace_sem we verify that path->mnt is still mounted (which stabilizes its ->mnt_parent) and check that it's still mounted at the same place. From that point on to the matching namespace_unlock() we are guaranteed that mount/dentry pair we'd grabbed are also pinned by being the mountpoint of path->mnt, so we can quietly drop both the dentry reference (as the current code does) and mnt one - it's OK to do under namespace_sem, since we are not dropping the final refs.
That solves the problem on do_lock_mount() side; unlock_mount() also has one, since dentry is guaranteed to stay pinned only until the namespace_unlock(). That's easy to fix - just have inode_unlock() done earlier, while it's still pinned by mp->m_dentry.
--- fs/namespace.c | 69 ++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 33 deletions(-)
fs/namespace.c +36 -33
@@ -2640,56 +2640,62 @@ static struct mountpoint *do_lock_mount(struct path *path, bool beneath)struct vfsmount *mnt = path->mnt;struct dentry *dentry;struct mountpoint *mp =ERR_PTR (-ENOENT ); +struct path under = {};for (;;) { -struct mount *m; +struct mount *m =real_mount (mnt);if (beneath) { - m =real_mount (mnt); +path_put (&under);read_seqlock_excl (&mount_lock); - dentry =dget (m->mnt_mountpoint); + under.mnt =mntget (&m->mnt_parent->mnt); + under.dentry =dget (m->mnt_mountpoint);read_sequnlock_excl (&mount_lock); + dentry = under.dentry; }else { dentry = path->dentry; }inode_lock (dentry->d_inode); -if (unlikely (cant_mount (dentry))) { -inode_unlock (dentry->d_inode); - goto out; - } -namespace_lock (); -if (beneath && (!is_mounted (mnt) || m->mnt_mountpoint != dentry)) { +if (unlikely (cant_mount (dentry) || !is_mounted (mnt))) +break ;// not to be mounted on + +if (beneath &&unlikely (m->mnt_mountpoint != dentry || + &m->mnt_parent->mnt != under.mnt)) {namespace_unlock ();inode_unlock (dentry->d_inode); - goto out; +continue ;// got moved } mnt =lookup_mnt (path); -if (likely (!mnt)) +if (unlikely (mnt)) { +namespace_unlock (); +inode_unlock (dentry->d_inode); +path_put (path); + path->mnt = mnt; + path->dentry =dget (mnt->mnt_root); +continue ;// got overmounted + } + mp =get_mountpoint (dentry); +if (IS_ERR (mp))break ; - -namespace_unlock (); -inode_unlock (dentry->d_inode); -if (beneath) -dput (dentry); -path_put (path); - path->mnt = mnt; - path->dentry =dget (mnt->mnt_root); - } - - mp =get_mountpoint (dentry); -if (IS_ERR (mp)) { -namespace_unlock (); -inode_unlock (dentry->d_inode); +if (beneath) { +/* +* @under duplicates the references that will stay +* at least until namespace_unlock(), so the path_put() +* below is safe (and OK to do under namespace_lock - +* we are not dropping the final references here). +*/ +path_put (&under); + } +return mp; } - -out: +namespace_unlock (); +inode_unlock (dentry->d_inode);if (beneath) -dput (dentry); - +path_put (&under);return mp; }
@@ -2700,14 +2706,11 @@ static inline struct mountpoint *lock_mount(struct path *path)static void unlock_mount (struct mountpoint *where) { -struct dentry *dentry = where->m_dentry; - +inode_unlock (where->m_dentry->d_inode);read_seqlock_excl (&mount_lock);put_mountpoint (where);read_sequnlock_excl (&mount_lock); -namespace_unlock (); -inode_unlock (dentry->d_inode); }static int graft_tree (struct mount *mnt,struct mount *p,struct mountpoint *mp)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 68/311 net_sched: hfsc: Fix a UAF vulnerability in class handling
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 3df275ef0a6ae181e8428a6589ef5d5231e58b5c ]
This patch fixes a Use-After-Free vulnerability in the HFSC qdisc class handling. The issue occurs due to a time-of-check/time-of-use condition in hfsc_change_class() when working with certain child qdiscs like netem or codel.
The vulnerability works as follows:
1. hfsc_change_class() checks if a class has packets (q.qlen != 0)
2. It then calls qdisc_peek_len(), which for certain qdiscs (e.g., codel, netem) might drop packets and empty the queue
3. The code continues assuming the queue is still non-empty, adding the class to vttree
4. This breaks HFSC scheduler assumptions that only non-empty classes are in vttree
5. Later, when the class is destroyed, this can lead to a Use-After-Free
The fix adds a second queue length check after qdisc_peek_len() to verify the queue wasn't emptied.
--- net/sched/sch_hfsc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/sched/sch_hfsc.c +7 -2
@@ -958,6 +958,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (cl !=NULL ) {int old_flags; +int len =0 ;if (parentid) { if (cl->cl_parent &&
@@ -988,9 +989,13 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (usc !=NULL )hfsc_change_usc (cl, usc, cur_time); +if (cl->qdisc->q.qlen !=0 ) + len =qdisc_peek_len (cl->qdisc); +/* Check queue length again since some qdisc implementations +* (e.g., netem/codel) might empty the queue during the peek +* operation. +*/ if (cl->qdisc->q.qlen !=0 ) { -int len =qdisc_peek_len (cl->qdisc); -if (cl->cl_flags &HFSC_RSC ) {if (old_flags &HFSC_RSC )update_ed (cl, len);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 69/311 net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 6ccbda44e2cc3d26fd22af54c650d6d5d801addf ]
Similarly to the previous patch, we need to safe guard hfsc_dequeue() too. But for this one, we don't have a reliable reproducer.
--- net/sched/sch_hfsc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/sched/sch_hfsc.c +10 -4
@@ -1637,10 +1637,16 @@ hfsc_dequeue(struct Qdisc *sch)if (cl->qdisc->q.qlen !=0 ) {/* update ed */ next_len =qdisc_peek_len (cl->qdisc); -if (realtime) -update_ed (cl, next_len); -else -update_d (cl, next_len); +/* Check queue length again since some qdisc implementations +* (e.g., netem/codel) might empty the queue during the peek +* operation. +*/ +if (cl->qdisc->q.qlen !=0 ) { +if (realtime) +update_ed (cl, next_len); +else +update_d (cl, next_len); + } }else {/* the class becomes passive */ eltree_remove (cl);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 52/311 scsi: core: Clear flags for scsi_cmnd that did not complete
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anastasia Kovaleva <[email protected]>
[ Upstream commit 54bebe46871d4e56e05fcf55c1a37e7efa24e0a8 ]
Commands that have not been completed with scsi_done() do not clear the SCMD_INITIALIZED flag and therefore will not be properly reinitialized. Thus, the next time the scsi_cmnd structure is used, the command may fail in scsi_cmd_runtime_exceeded() due to the old jiffies_at_alloc value:
kernel: sd 16:0:1:84: [sdts] tag#405 timing out command, waited 720s
kernel: sd 16:0:1:84: [sdts] tag#405 FAILED Result: hostbyte=DID_OK driverbyte=DRIVER_OK cmd_age=66636s
Clear flags for commands that have not been completed by SCSI.
--- drivers/scsi/scsi_lib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/scsi_lib.c +5 -1
@@ -1253,8 +1253,12 @@ EXPORT_SYMBOL_GPL(scsi_alloc_request);*/ static void scsi_cleanup_rq (struct request *rq) { +struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq); + + cmd->flags =0 ; +if (rq->rq_flags &RQF_DONTPREP ) { -scsi_mq_uninit_cmd (blk_mq_rq_to_pdu (rq)); +scsi_mq_uninit_cmd (cmd); rq->rq_flags &= ~RQF_DONTPREP ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 70/311 net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Golle <[email protected]>
[ Upstream commit 497041d763016c2e8314d2f6a329a9b77c3797ca ]
MT7531 standalone and MMIO variants found in MT7988 and EN7581 share most basic properties. Despite that, assisted_learning_on_cpu_port and mtu_enforcement_ingress were only applied for MT7531 but not for MT7988 or EN7581, causing the expected issues on MMIO devices.
Apply both settings equally also for MT7988 and EN7581 by moving both assignments form mt7531_setup() to mt7531_setup_common().
This fixes unwanted flooding of packets due to unknown unicast during DA lookup, as well as issues with heterogenous MTU settings.
--- drivers/net/dsa/mt7530.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/mt7530.c +3 -3
@@ -2541,6 +2541,9 @@ mt7531_setup_common(struct dsa_switch *ds)struct mt7530_priv *priv = ds->priv;int ret, i; + ds->assisted_learning_on_cpu_port = true; + ds->mtu_enforcement_ingress = true; +mt753x_trap_frames (priv);/* Enable and reset MIB counters */
@@ -2688,9 +2691,6 @@ mt7531_setup(struct dsa_switch *ds)if (ret)return ret; - ds->assisted_learning_on_cpu_port = true; - ds->mtu_enforcement_ingress = true; -return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 71/311 pds_core: Prevent possible adminq overflow/stuck condition
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit d9e2f070d8af60f2c8c02b2ddf0a9e90b4e9220c ]
The pds_core's adminq is protected by the adminq_lock, which prevents more than 1 command to be posted onto it at any one time. This makes it so the client drivers cannot simultaneously post adminq commands. However, the completions happen in a different context, which means multiple adminq commands can be posted sequentially and all waiting on completion.
On the FW side, the backing adminq request queue is only 16 entries long and the retry mechanism and/or overflow/stuck prevention is lacking. This can cause the adminq to get stuck, so commands are no longer processed and completions are no longer sent by the FW.
As an initial fix, prevent more than 16 outstanding adminq commands so there's no way to cause the adminq from getting stuck. This works because the backing adminq request queue will never have more than 16 pending adminq commands, so it will never overflow. This is done by reducing the adminq depth to 16.
--- drivers/net/ethernet/amd/pds_core/core.c | 5 +---- drivers/net/ethernet/amd/pds_core/core.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/amd/pds_core/core.c +1 -4
@@ -325,10 +325,7 @@ static int pdsc_core_init(struct pdsc *pdsc)size_t sz;int err; -/* Scale the descriptor ring length based on number of CPUs and VFs */ - numdescs =max_t (int,PDSC_ADMINQ_MIN_LENGTH ,num_online_cpus ()); - numdescs +=2 *pci_sriov_get_totalvfs (pdsc->pdev); - numdescs =roundup_pow_of_two (numdescs); + numdescs =PDSC_ADMINQ_MAX_LENGTH ; err = pdsc_qcq_alloc(pdsc, PDS_CORE_QTYPE_ADMINQ, 0, "adminq", PDS_CORE_QCQ_F_CORE | PDS_CORE_QCQ_F_INTR, numdescs,
drivers/net/ethernet/amd/pds_core/core.h +1 -1
@@ -16,7 +16,7 @@#define PDSC_WATCHDOG_SECS 5#define PDSC_QUEUE_NAME_MAX_SZ 16 -#define PDSC_ADMINQ_MIN_LENGTH 16/* must be a power of two */ +#define PDSC_ADMINQ_MAX_LENGTH 16/* must be a power of two */ #define PDSC_NOTIFYQ_LENGTH 64/* must be a power of two */ #define PDSC_TEARDOWN_RECOVERY false#define PDSC_TEARDOWN_REMOVING true
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 72/311 pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit 2567daad69cd1107fc0ec29b1615f110d7cf7385 ]
If the FW doesn't support the PDS_CORE_CMD_FW_CONTROL command the driver might at the least print garbage and at the worst crash when the user runs the "devlink dev info" devlink command.
This happens because the stack variable fw_list is not 0 initialized which results in fw_list.num_fw_slots being a garbage value from the stack. Then the driver tries to access fw_list.fw_names[i] with i >= ARRAY_SIZE and runs off the end of the array.
Fix this by initializing the fw_list and by not failing completely if the devcmd fails because other useful information is printed via devlink dev info even if the devcmd fails.
--- drivers/net/ethernet/amd/pds_core/devlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/amd/pds_core/devlink.c +1 -3
@@ -102,7 +102,7 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, .fw_control.opcode = PDS_CORE_CMD_FW_CONTROL, .fw_control.oper = PDS_CORE_FW_GET_LIST, }; -struct pds_core_fw_list_info fw_list; +struct pds_core_fw_list_info fw_list = {};struct pdsc *pdsc =devlink_priv (dl);union pds_core_dev_comp comp;char buf[32 ];
@@ -115,8 +115,6 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,if (!err)memcpy_fromio (&fw_list, pdsc->cmd_regs->data,sizeof (fw_list));mutex_unlock (&pdsc->devcmd_lock); -if (err && err != -EIO ) -return err; listlen =min (fw_list.num_fw_slots,ARRAY_SIZE (fw_list.fw_names));for (i =0 ; i < listlen; i++) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 73/311 pds_core: Remove unnecessary check in pds_client_adminq_cmd()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit f9559d818205a4a0b9cd87181ef46e101ea11157 ]
When the pds_core driver was first created there were some race conditions around using the adminq, especially for client drivers. To reduce the possibility of a race condition there's a check against pf->state in pds_client_adminq_cmd(). This is problematic for a couple of reasons:
1. The PDSC_S_INITING_DRIVER bit is set during probe, but not cleared until after everything in probe is complete, which includes creating the auxiliary devices. For pds_fwctl this means it can't make any adminq commands until after pds_core's probe is complete even though the adminq is fully up by the time pds_fwctl's auxiliary device is created.
2. The race conditions around using the adminq have been fixed and this path is already protected against client drivers calling pds_client_adminq_cmd() if the adminq isn't ready, i.e. see pdsc_adminq_post() -> pdsc_adminq_inc_if_up().
Fix this by removing the pf->state check in pds_client_adminq_cmd() because invalid accesses to pds_core's adminq is already handled by pdsc_adminq_post()->pdsc_adminq_inc_if_up().
--- drivers/net/ethernet/amd/pds_core/auxbus.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/amd/pds_core/auxbus.c +0 -3
@@ -107,9 +107,6 @@ int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev,dev_dbg (pf->dev,"%s: %s opcode %d\n" , __func__,dev_name (&padev->aux_dev.dev), req->opcode); -if (pf->state) -return -ENXIO ; -/* Wrap the client's request */ cmd.client_request.opcode =PDS_AQ_CMD_CLIENT_CMD ; cmd.client_request.client_id =cpu_to_le16 (padev->client_id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 74/311 pds_core: make wait_context part of q_info
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit 3f77c3dfffc7063428b100c4945ca2a7a8680380 ]
Make the wait_context a full part of the q_info struct rather than a stack variable that goes away after pdsc_adminq_post() is done so that the context is still available after the wait loop has given up.
There was a case where a slow development firmware caused the adminq request to time out, but then later the FW finally finished the request and sent the interrupt. The handler tried to complete_all() the completion context that had been created on the stack in pdsc_adminq_post() but no longer existed. This caused bad pointer usage, kernel crashes, and much wailing and gnashing of teeth.
--- drivers/net/ethernet/amd/pds_core/adminq.c | 36 +++++++++------------- drivers/net/ethernet/amd/pds_core/core.c | 4 ++- drivers/net/ethernet/amd/pds_core/core.h | 2 +- 3 files changed, 18 insertions(+), 24 deletions(-)
drivers/net/ethernet/amd/pds_core/adminq.c +14 -22
@@ -5,11 +5,6 @@#include "core.h" -struct pdsc_wait_context { -struct pdsc_qcq *qcq; -struct completion wait_completion; -}; -static int pdsc_process_notifyq (struct pdsc_qcq *qcq) {union pds_core_notifyq_comp *comp;
@@ -109,10 +104,10 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq) q_info = &q->info[q->tail_idx]; q->tail_idx = (q->tail_idx +1 ) & (q->num_descs -1 ); -/* Copy out the completion data */ -memcpy (q_info->dest, comp,sizeof (*comp)); - -complete_all (&q_info->wc->wait_completion); +if (!completion_done (&q_info->completion)) { +memcpy (q_info->dest, comp,sizeof (*comp)); +complete (&q_info->completion); + }if (cq->tail_idx == cq->num_descs -1 ) cq->done_color = !cq->done_color;
@@ -162,8 +157,7 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data)static int __pdsc_adminq_post (struct pdsc *pdsc,struct pdsc_qcq *qcq,union pds_core_adminq_cmd *cmd, -union pds_core_adminq_comp *comp, -struct pdsc_wait_context *wc) +union pds_core_adminq_comp *comp) {struct pdsc_queue *q = &qcq->q;struct pdsc_q_info *q_info;
@@ -205,9 +199,9 @@ static int __pdsc_adminq_post(struct pdsc *pdsc,/* Post the request */ index = q->head_idx; q_info = &q->info[index]; - q_info->wc = wc; q_info->dest = comp;memcpy (q_info->desc, cmd,sizeof (*cmd)); +reinit_completion (&q_info->completion);dev_dbg (pdsc->dev,"head_idx %d tail_idx %d\n" , q->head_idx, q->tail_idx);
@@ -231,16 +225,13 @@ int pdsc_adminq_post(struct pdsc *pdsc, union pds_core_adminq_comp *comp, bool fast_poll) { -struct pdsc_wait_context wc = { - .wait_completion = -COMPLETION_INITIALIZER_ONSTACK (wc.wait_completion), - };unsigned long poll_interval =1 ;unsigned long poll_jiffies;unsigned long time_limit;unsigned long time_start;unsigned long time_done;unsigned long remaining; +struct completion *wc;int err =0 ;int index;
@@ -250,20 +241,19 @@ int pdsc_adminq_post(struct pdsc *pdsc,return -ENXIO ; } - wc.qcq = &pdsc->adminqcq; - index =__pdsc_adminq_post (pdsc, &pdsc->adminqcq, cmd, comp, &wc); + index =__pdsc_adminq_post (pdsc, &pdsc->adminqcq, cmd, comp);if (index <0 ) { err = index; goto err_out; } + wc = &pdsc->adminqcq.q.info[index].completion; time_start = jiffies; time_limit = time_start +HZ * pdsc->devcmd_timeout; do { /* Timeslice the actual wait to catch IO errors etc early */ poll_jiffies = msecs_to_jiffies(poll_interval); - remaining = wait_for_completion_timeout(&wc.wait_completion, - poll_jiffies); + remaining = wait_for_completion_timeout(wc, poll_jiffies); if (remaining) break;
@@ -292,9 +282,11 @@ int pdsc_adminq_post(struct pdsc *pdsc,dev_dbg (pdsc->dev,"%s: elapsed %d msecs\n" , __func__,jiffies_to_msecs (time_done - time_start)); -/* Check the results */ -if (time_after_eq (time_done, time_limit)) +/* Check the results and clear an un-completed timeout */ +if (time_after_eq (time_done, time_limit) && !completion_done (wc)) { err = -ETIMEDOUT ; +complete (wc); + }dev_dbg (pdsc->dev,"read admin queue completion idx %d:\n" , index); dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1,
drivers/net/ethernet/amd/pds_core/core.c +3 -1
@@ -167,8 +167,10 @@ static void pdsc_q_map(struct pdsc_queue *q, void *base, dma_addr_t base_pa) q->base = base; q->base_pa = base_pa; -for (i =0 , cur = q->info; i < q->num_descs; i++, cur++) +for (i =0 , cur = q->info; i < q->num_descs; i++, cur++) { cur->desc = base + (i * q->desc_size); +init_completion (&cur->completion); + } }static void pdsc_cq_map (struct pdsc_cq *cq,void *base,dma_addr_t base_pa)
drivers/net/ethernet/amd/pds_core/core.h +1 -1
@@ -96,7 +96,7 @@ struct pdsc_q_info {unsigned int bytes;unsigned int nbufs;struct pdsc_buf_info bufs[PDS_CORE_MAX_FRAGS ]; -struct pdsc_wait_context *wc; +struct completion completion;void *dest; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 75/311 net: phy: Add helper for getting tx amplitude gain
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dimitri Fedrau <[email protected]>
[ Upstream commit 961ee5aeea048aa292f28d61f3a96a48554e91af ]
Add helper which returns the tx amplitude gain defined in device tree. Modifying it can be necessary to compensate losses on the PCB and connector, so the voltages measured on the RJ45 pins are conforming.
Stable-dep-of: 607b310ada5e ("net: dp83822: Fix OF_MDIO config check")
--- drivers/net/phy/phy_device.c | 53 ++++++++++++++++++++++++------------ include/linux/phy.h | 4 +++ 2 files changed, 39 insertions(+), 18 deletions(-)
drivers/net/phy/phy_device.c +35 -18
@@ -3123,19 +3123,12 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause)EXPORT_SYMBOL (phy_get_pause);#if IS_ENABLED (CONFIG_OF_MDIO ) -static int phy_get_int_delay_property (struct device *dev,const char *name) +static int phy_get_u32_property (struct device *dev,const char *name,u32 *val) { -s32 int_delay; -int ret; - - ret =device_property_read_u32 (dev, name, &int_delay); -if (ret) -return ret; - -return int_delay; +return device_property_read_u32 (dev, name, val); }#else -static int phy_get_int_delay_property (struct device *dev,const char *name) +static int phy_get_u32_property (struct device *dev,const char *name,u32 *val) {return -EINVAL ; }
@@ -3160,12 +3153,12 @@ static int phy_get_int_delay_property(struct device *dev, const char *name)s32 phy_get_internal_delay (struct phy_device *phydev,struct device *dev,const int *delay_values,int size,bool is_rx) { -s32 delay; -int i; +int i, ret; +u32 delay;if (is_rx) { - delay =phy_get_int_delay_property (dev,"rx-internal-delay-ps" ); -if (delay <0 && size ==0 ) { + ret =phy_get_u32_property (dev,"rx-internal-delay-ps" , &delay); +if (ret <0 && size ==0 ) {if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID || phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID )return 1 ;
@@ -3174,8 +3167,8 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, } }else { - delay =phy_get_int_delay_property (dev,"tx-internal-delay-ps" ); -if (delay <0 && size ==0 ) { + ret =phy_get_u32_property (dev,"tx-internal-delay-ps" , &delay); +if (ret <0 && size ==0 ) {if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID || phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID )return 1 ;
@@ -3184,8 +3177,8 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, } } -if (delay <0 ) -return delay; +if (ret <0 ) +return ret;if (size ==0 )return delay;
@@ -3220,6 +3213,30 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, }EXPORT_SYMBOL (phy_get_internal_delay); +/** +* phy_get_tx_amplitude_gain - stores tx amplitude gain in @val +* @phydev: phy_device struct +* @dev: pointer to the devices device struct +* @linkmode: linkmode for which the tx amplitude gain should be retrieved +* @val: tx amplitude gain +* +* Returns: 0 on success, < 0 on failure +*/ +int phy_get_tx_amplitude_gain (struct phy_device *phydev,struct device *dev, +enum ethtool_link_mode_bit_indices linkmode, +u32 *val) +{ +switch (linkmode) { +case ETHTOOL_LINK_MODE_100baseT_Full_BIT: +return phy_get_u32_property (dev, +"tx-amplitude-100base-tx-percent" , + val); +default : +return -EINVAL ; + } +} +EXPORT_SYMBOL_GPL (phy_get_tx_amplitude_gain); +static int phy_led_set_brightness (struct led_classdev *led_cdev,enum led_brightness value) {
include/linux/phy.h +4 -0
@@ -2114,6 +2114,10 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause);s32 phy_get_internal_delay (struct phy_device *phydev,struct device *dev,const int *delay_values,int size,bool is_rx); +int phy_get_tx_amplitude_gain (struct phy_device *phydev,struct device *dev, +enum ethtool_link_mode_bit_indices linkmode, +u32 *val); +void phy_resolve_pause (unsigned long *local_adv,unsigned long *partner_adv,bool *tx_pause,bool *rx_pause);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 76/311 net: phy: dp83822: Add support for changing the transmit amplitude voltage
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dimitri Fedrau <[email protected]>
[ Upstream commit 4f3735e82d8a2e80ee39731832536b1e34697c71 ]
Add support for changing the transmit amplitude voltage in 100BASE-TX mode. Modifying it can be necessary to compensate losses on the PCB and connector, so the voltages measured on the RJ45 pins are conforming.
Stable-dep-of: 607b310ada5e ("net: dp83822: Fix OF_MDIO config check")
--- drivers/net/phy/dp83822.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
drivers/net/phy/dp83822.c +38 -0
@@ -31,6 +31,7 @@#define MII_DP83822_RCSR 0x17#define MII_DP83822_RESET_CTRL 0x1f#define MII_DP83822_MLEDCR 0x25 +#define MII_DP83822_LDCTRL 0x403#define MII_DP83822_LEDCFG1 0x460#define MII_DP83822_IOCTRL1 0x462#define MII_DP83822_IOCTRL2 0x463
@@ -123,6 +124,9 @@#define DP83822_IOCTRL1_GPIO1_CTRL GENMASK(2, 0)#define DP83822_IOCTRL1_GPIO1_CTRL_LED_1 BIT(0) +/* LDCTRL bits */ +#define DP83822_100BASE_TX_LINE_DRIVER_SWING GENMASK(7, 4) +/* IOCTRL2 bits */ #define DP83822_IOCTRL2_GPIO2_CLK_SRC GENMASK(6, 4)#define DP83822_IOCTRL2_GPIO2_CTRL GENMASK(2, 0)
@@ -197,6 +201,7 @@ struct dp83822_private {bool set_gpio2_clk_out;u32 gpio2_clk_out;bool led_pin_enable[DP83822_MAX_LED_PINS ]; +int tx_amplitude_100base_tx_index; }; static int dp83822_config_wol(struct phy_device *phydev,
@@ -522,6 +527,12 @@ static int dp83822_config_init(struct phy_device *phydev)FIELD_PREP (DP83822_IOCTRL2_GPIO2_CLK_SRC , dp83822->gpio2_clk_out)); +if (dp83822->tx_amplitude_100base_tx_index >=0 ) +phy_modify_mmd (phydev,MDIO_MMD_VEND2 ,MII_DP83822_LDCTRL , +DP83822_100BASE_TX_LINE_DRIVER_SWING , +FIELD_PREP (DP83822_100BASE_TX_LINE_DRIVER_SWING , + dp83822->tx_amplitude_100base_tx_index)); + err =dp83822_config_init_leds (phydev);if (err)return err;
@@ -720,6 +731,11 @@ static int dp83822_phy_reset(struct phy_device *phydev) }#ifdef CONFIG_OF_MDIO +static const u32 tx_amplitude_100base_tx_gain[] = { +80 ,82 ,83 ,85 ,87 ,88 ,90 ,92 , +93 ,95 ,97 ,98 ,100 ,102 ,103 ,105 , +}; +static int dp83822_of_init_leds (struct phy_device *phydev) {struct device_node *node = phydev->mdio.dev.of_node;
@@ -780,6 +796,8 @@ static int dp83822_of_init(struct phy_device *phydev)struct dp83822_private *dp83822 = phydev->priv;struct device *dev = &phydev->mdio.dev;const char *of_val; +int i, ret; +u32 val;/* Signal detection for the PHY is only enabled if the FX_EN and the * SD_EN pins are strapped. Signal detection can only enabled if FX_EN
@@ -815,6 +833,26 @@ static int dp83822_of_init(struct phy_device *phydev) dp83822->set_gpio2_clk_out = true; } + dp83822->tx_amplitude_100base_tx_index =-1 ; + ret =phy_get_tx_amplitude_gain (phydev, dev, + ETHTOOL_LINK_MODE_100baseT_Full_BIT, + &val); +if (!ret) { +for (i =0 ; i <ARRAY_SIZE (tx_amplitude_100base_tx_gain); i++) { +if (tx_amplitude_100base_tx_gain[i] == val) { + dp83822->tx_amplitude_100base_tx_index = i; +break ; + } + } + +if (dp83822->tx_amplitude_100base_tx_index <0 ) { +phydev_err (phydev, +"Invalid value for tx-amplitude-100base-tx-percent property (%u)\n" , + val); +return -EINVAL ; + } + } +return dp83822_of_init_leds (phydev); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 77/311 net: dp83822: Fix OF_MDIO config check
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Schneider <[email protected]>
[ Upstream commit 607b310ada5ef4c738f9dffc758a62a9d309b084 ]
When CONFIG_OF_MDIO is set to be a module the code block is not compiled. Use the IS_ENABLED macro that checks for both built in as well as module.
--- drivers/net/phy/dp83822.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/dp83822.c +1 -1
@@ -730,7 +730,7 @@ static int dp83822_phy_reset(struct phy_device *phydev)return phydev->drv->config_init (phydev); } -#ifdef CONFIG_OF_MDIO +#if IS_ENABLED (CONFIG_OF_MDIO )static const u32 tx_amplitude_100base_tx_gain[] = {80 ,82 ,83 ,85 ,87 ,88 ,90 ,92 , 93, 95, 97, 98, 100, 102, 103, 105,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 78/311 net: stmmac: fix dwmac1000 ptp timestamp status offset
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Lothore <[email protected]>
[ Upstream commit 73fa4597bdc035437fbcd84d6be32bd39f1f2149 ]
When a PTP interrupt occurs, the driver accesses the wrong offset to learn about the number of available snapshots in the FIFO for dwmac1000:
it should be accessing bits 29..25, while it is currently reading bits 19..16 (those are bits about the auxiliary triggers which have generated the timestamps). As a consequence, it does not compute correctly the number of available snapshots, and so possibly do not generate the corresponding clock events if the bogus value ends up being 0.
Fix clock events generation by reading the correct bits in the timestamp register for dwmac1000.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +2 -2
@@ -331,8 +331,8 @@ enum rtc_control {/* PTP and timestamping registers */ -#define GMAC3_X_ATSNS GENMASK(19, 16) -#define GMAC3_X_ATSNS_SHIFT 16 +#define GMAC3_X_ATSNS GENMASK(29, 25) +#define GMAC3_X_ATSNS_SHIFT 25#define GMAC_PTP_TCR_ATSFC BIT(24)#define GMAC_PTP_TCR_ATSEN0 BIT(25)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 79/311 net: stmmac: fix multiplication overflow when reading timestamp
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexis Lothoré <[email protected]>
[ Upstream commit 7b7491372f8ec2d8c08da18e5d629e55f41dda89 ]
The current way of reading a timestamp snapshot in stmmac can lead to integer overflow, as the computation is done on 32 bits. The issue has been observed on a dwmac-socfpga platform returning chaotic timestamp values due to this overflow. The corresponding multiplication is done with a MUL instruction, which returns 32 bit values. Explicitly casting the value to 64 bits replaced the MUL with a UMLAL, which computes and returns the result on 64 bits, and so returns correctly the timestamps.
Prevent this overflow by explicitly casting the intermediate value to u64 to make sure that the whole computation is made on u64. While at it, apply the same cast on the other dwmac variant (GMAC4) method for snapshot retrieval.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +1 -1
@@ -560,7 +560,7 @@ void dwmac1000_get_ptptime(void __iomem *ptpaddr, u64 *ptp_time)u64 ns; ns =readl (ptpaddr +GMAC_PTP_ATNR ); - ns +=readl (ptpaddr +GMAC_PTP_ATSR ) *NSEC_PER_SEC ; + ns += (u64 )readl (ptpaddr +GMAC_PTP_ATSR ) *NSEC_PER_SEC ; *ptp_time = ns; }
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +1 -1
@@ -222,7 +222,7 @@ static void get_ptptime(void __iomem *ptpaddr, u64 *ptp_time)u64 ns; ns =readl (ptpaddr +PTP_ATNR ); - ns +=readl (ptpaddr +PTP_ATSR ) *NSEC_PER_SEC ; + ns += (u64 )readl (ptpaddr +PTP_ATSR ) *NSEC_PER_SEC ; *ptp_time = ns; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 53/311 scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 08a966a917fe3d92150fa3cc15793ad5e57051eb ]
Add a NULL check for the returned hwq pointer by ufshcd_mcq_req_to_hwq().
This is similar to the fix in commit 74736103fb41 ("scsi: ufs: core: Fix ufshcd_abort_one racing issue").
--- drivers/ufs/core/ufshcd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ufs/core/ufshcd.c +2 -0
@@ -5658,6 +5658,8 @@ static void ufshcd_mcq_compl_pending_transfer(struct ufs_hba *hba,continue ; hwq =ufshcd_mcq_req_to_hwq (hba,scsi_cmd_to_rq (cmd)); +if (!hwq) +continue ;if (force_compl) {ufshcd_mcq_compl_all_cqes_lock (hba, hwq);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 80/311 block: never reduce ra_pages in blk_apply_bdi_limits
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 7b720c720253e2070459420b2628a7b9ee6733b3 ]
When the user increased the read-ahead size through sysfs this value currently get lost if the device is reprobe, including on a resume from suspend.
As there is no hardware limitation for the read-ahead size there is no real need to reset it or track a separate hardware limitation like for max_sectors.
This restores the pre-atomic queue limit behavior in the sd driver as sd did not use blk_queue_io_opt and thus never updated the read ahead size to the value based of the optimal I/O, but changes behavior for all other drivers. As the new behavior seems useful and sd is the driver for which the readahead size tweaks are most useful that seems like a worthwhile trade off.
--- block/blk-settings.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
block/blk-settings.c +7 -1
@@ -61,8 +61,14 @@ void blk_apply_bdi_limits(struct backing_dev_info *bdi,/* * For read-ahead of large files to be effective, we need to read ahead * at least twice the optimal I/O size. +* +* There is no hardware limitation for the read-ahead size and the user +* might have increased the read-ahead size through sysfs, so don't ever +* decrease it. */ - bdi->ra_pages =max (lim->io_opt *2 /PAGE_SIZE ,VM_READAHEAD_PAGES ); + bdi->ra_pages =max3 (bdi->ra_pages, + lim->io_opt *2 /PAGE_SIZE , +VM_READAHEAD_PAGES ); bdi->io_pages = lim->max_sectors >>PAGE_SECTORS_SHIFT ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 81/311 bdev: use bdev_io_min() for statx block size
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luis Chamberlain <[email protected]>
[ Upstream commit 425fbcd62d2e1330e64d8d3bf89e554830ba997f ]
You can use lsblk to query for a block device block device block size:
lsblk -o MIN-IO /dev/nvme0n1
MIN-IO
4096
The min-io is the minimum IO the block device prefers for optimal performance. In turn we map this to the block device block size. The current block size exposed even for block devices with an LBA format of 16k is 4k. Likewise devices which support 4k LBA format but have a larger Indirection Unit of 16k have an exposed block size of 4k.
This incurs read-modify-writes on direct IO against devices with a min-io larger than the page size. To fix this, use the block device min io, which is the minimal optimal IO the device prefers.
With this we now get:
lsblk -o MIN-IO /dev/nvme0n1
MIN-IO
16384
And so userspace gets the appropriate information it needs for optimal performance. This is verified with blkalgn against mkfs against a device with LBA format of 4k but an NPWG of 16k (min io size)
mkfs.xfs -f -b size=16k /dev/nvme3n1
blkalgn -d nvme3n1 --ops Write
Block size : count distribution
0 -> 1 : 0 | |
2 -> 3 : 0 | |
4 -> 7 : 0 | |
8 -> 15 : 0 | |
16 -> 31 : 0 | |
32 -> 63 : 0 | |
64 -> 127 : 0 | |
128 -> 255 : 0 | |
256 -> 511 : 0 | |
512 -> 1023 : 0 | |
1024 -> 2047 : 0 | |
2048 -> 4095 : 0 | |
4096 -> 8191 : 0 | |
8192 -> 16383 : 0 | |
16384 -> 32767 : 66 |****************************************|
32768 -> 65535 : 0 | |
65536 -> 131071 : 0 | |
131072 -> 262143 : 2 |* |Block size: 14 - 66
Block size: 17 - 2
Algn size : count distribution
0 -> 1 : 0 | |
2 -> 3 : 0 | |
4 -> 7 : 0 | |
8 -> 15 : 0 | |
16 -> 31 : 0 | |
32 -> 63 : 0 | |
64 -> 127 : 0 | |
128 -> 255 : 0 | |
256 -> 511 : 0 | |
512 -> 1023 : 0 | |
1024 -> 2047 : 0 | |
2048 -> 4095 : 0 | |
4096 -> 8191 : 0 | |
8192 -> 16383 : 0 | |
16384 -> 32767 : 66 |****************************************|
32768 -> 65535 : 0 | |
65536 -> 131071 : 0 | |
131072 -> 262143 : 2 |* |Algn size: 14 - 66
Algn size: 17 - 2
Stable-dep-of: 5f33b5226c9d ("block: don't autoload drivers on stat")
--- block/bdev.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
block/bdev.c +2 -3
@@ -1274,9 +1274,6 @@ void bdev_statx(struct path *path, struct kstat *stat,struct inode *backing_inode;struct block_device *bdev; -if (!(request_mask & (STATX_DIOALIGN |STATX_WRITE_ATOMIC ))) -return ; - backing_inode =d_backing_inode (path->dentry);/*
@@ -1303,6 +1300,8 @@ void bdev_statx(struct path *path, struct kstat *stat, queue_atomic_write_unit_max_bytes(bd_queue)); } + stat->blksize =bdev_io_min (bdev); +blkdev_put_no_open (bdev); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 54/311 net: enetc: register XDP RX queues with frag_size
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 2768b2e2f7d25ae8984ebdcde8ec1014b6fdcd89 ]
At the time when bpf_xdp_adjust_tail() gained support for non-linear buffers, ENETC was already generating this kind of geometry on RX, due to its use of 2K half page buffers. Frames larger than 1472 bytes (without FCS) are stored as multi-buffer, presenting a need for multi buffer support to work properly even in standard MTU circumstances.
Allow bpf_xdp_frags_increase_tail() to know the allocation size of paged data, so it can safely permit growing the tailroom of the buffer from XDP programs.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc.c +2 -1
@@ -3362,7 +3362,8 @@ static int enetc_int_vector_init(struct enetc_ndev_priv *priv, int i, bdr->buffer_offset =ENETC_RXB_PAD ; priv->rx_ring[i] = bdr; - err =xdp_rxq_info_reg (&bdr->xdp.rxq, priv->ndev, i,0 ); + err =__xdp_rxq_info_reg (&bdr->xdp.rxq, priv->ndev, i,0 , +ENETC_RXB_DMA_SIZE_XDP );if (err) goto free_vector;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 55/311 net: enetc: refactor bulk flipping of RX buffers to separate function
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 1d587faa5be7e9785b682cc5f58ba8f4100c13ea ]
This small snippet of code ensures that we do something with the array of RX software buffer descriptor elements after passing the skb to the stack. In this case, we see if the other half of the page is reusable, and if so, we "turn around" the buffers, making them directly usable by enetc_refill_rx_ring() without going to enetc_new_page().
We will need to perform this kind of buffer flipping from a new code path, i.e. from XDP_PASS. Currently, enetc_build_skb() does it there buffer by buffer, but in a subsequent change we will stop using enetc_build_skb() for XDP_PASS.
Stable-dep-of: 020f0c8b3d39 ("net: enetc: fix frame corruption on bpf_xdp_adjust_head/tail() and XDP_PASS")
--- drivers/net/ethernet/freescale/enetc/enetc.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +11 -5
@@ -1850,6 +1850,16 @@ static void enetc_xdp_drop(struct enetc_bdr *rx_ring, int rx_ring_first, } } +static void enetc_bulk_flip_buff (struct enetc_bdr *rx_ring,int rx_ring_first, +int rx_ring_last) +{ +while (rx_ring_first != rx_ring_last) { +enetc_flip_rx_buff (rx_ring, + &rx_ring->rx_swbd[rx_ring_first]); +enetc_bdr_idx_inc (rx_ring, &rx_ring_first); + } +} +static int enetc_clean_rx_ring_xdp (struct enetc_bdr *rx_ring,struct napi_struct *napi,int work_limit,struct bpf_prog *prog)
@@ -1965,11 +1975,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,enetc_xdp_drop (rx_ring, orig_i, i); rx_ring->stats.xdp_redirect_failures++; }else { -while (orig_i != i) { -enetc_flip_rx_buff (rx_ring, - &rx_ring->rx_swbd[orig_i]); -enetc_bdr_idx_inc (rx_ring, &orig_i); - } +enetc_bulk_flip_buff (rx_ring, orig_i, i); xdp_redirect_frm_cnt++; rx_ring->stats.xdp_redirect++; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 56/311 net: enetc: fix frame corruption on bpf_xdp_adjust_head/tail() and XDP_PASS
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 020f0c8b3d396ec8190948f86063e1c45133f839 ]
Vlatko Markovikj reported that XDP programs attached to ENETC do not work well if they use bpf_xdp_adjust_head() or bpf_xdp_adjust_tail(), combined with the XDP_PASS verdict. A typical use case is to add or remove a VLAN tag.
The resulting sk_buff passed to the stack is corrupted, because the algorithm used by the driver for XDP_PASS is to unwind the current buffer pointer in the RX ring and to re-process the current frame with enetc_build_skb() as if XDP hadn't run. That is incorrect because XDP may have modified the geometry of the buffer, which we then are completely unaware of. We are looking at a modified buffer with the original geometry.
The initial reaction, both from me and from Vlatko, was to shop around the kernel for code to steal that would calculate a delta between the old and the new XDP buffer geometry, and apply that to the sk_buff too. We noticed that veth and generic xdp have such code.
The headroom adjustment is pretty uncontroversial, but what turned out severely problematic is the tailroom.
veth has this snippet:
__skb_put(skb, off); /* positive on grow, negative on shrink */
which on first sight looks decent enough, except __skb_put() takes an "unsigned int" for the second argument, and the arithmetic seems to only work correctly by coincidence. Second issue, __skb_put() contains a SKB_LINEAR_ASSERT(). It's not a great pattern to make more widespread. The skb may still be nonlinear at that point - it only becomes linear later when resetting skb->data_len to zero.
To avoid the above, bpf_prog_run_generic_xdp() does this instead:
skb_set_tail_pointer(skb, xdp->data_end - xdp->data); skb->len += off; /* positive on grow, negative on shrink */
which is more open-coded, uses lower-level functions and is in general a bit too much to spread around in driver code.
Then there is the snippet:
if (xdp_buff_has_frags(xdp)) skb->data_len = skb_shinfo(skb)->xdp_frags_size; else skb->data_len = 0;
One would have expected __pskb_trim() to be the function of choice for this task. But it's not used in veth/xdpgeneric because the extraneous fragments were _already_ freed by bpf_xdp_adjust_tail() -> bpf_xdp_frags_shrink_tail() -> ... -> __xdp_return() - the backing memory for the skb frags and the xdp frags is the same, but they don't keep individual references.
In fact, that is the biggest reason why this snippet cannot be reused as-is, because ENETC temporarily constructs an skb with the original len and the original number of frags. Because the extraneous frags are already freed by bpf_xdp_adjust_tail() and returned to the page allocator, it means the entire approach of using enetc_build_skb() is questionable for XDP_PASS. To avoid that, one would need to elevate the page refcount of all frags before calling bpf_prog_run_xdp() and drop it after XDP_PASS.
There are other things that are missing in ENETC's handling of XDP_PASS, like for example updating skb_shinfo(skb)->meta_len.
These are all handled correctly and cleanly in commit 539c1fba1ac7 ("xdp: add generic xdp_build_skb_from_buff()"), added to net-next in Dec 2024, and in addition might even be quicker that way. I have a very strong preference towards backporting that commit for "stable", and that is what is used to fix the handling bugs. It is way too messy to go this deep into the guts of an sk_buff from the code of a device driver.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 26 +++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +15 -11
@@ -1878,11 +1878,10 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,while (likely (rx_frm_cnt < work_limit)) {union enetc_rx_bd *rxbd, *orig_rxbd; -int orig_i, orig_cleaned_cnt;struct xdp_buff xdp_buff;struct sk_buff *skb; +int orig_i, err;u32 bd_status; -int err; rxbd =enetc_rxbd (rx_ring, i); bd_status =le32_to_cpu (rxbd->r.lstatus);
@@ -1897,7 +1896,6 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring,break ; orig_rxbd = rxbd; - orig_cleaned_cnt = cleaned_cnt; orig_i = i; enetc_build_xdp_buff(rx_ring, bd_status, &rxbd, &i,
@@ -1925,15 +1923,21 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring, rx_ring->stats.xdp_drops++;break ;case XDP_PASS : - rxbd = orig_rxbd; - cleaned_cnt = orig_cleaned_cnt; - i = orig_i; - - skb =enetc_build_skb (rx_ring, bd_status, &rxbd, - &i, &cleaned_cnt, -ENETC_RXB_DMA_SIZE_XDP ); -if (unlikely (!skb)) + skb =xdp_build_skb_from_buff (&xdp_buff); +/* Probably under memory pressure, stop NAPI */ +if (unlikely (!skb)) { +enetc_xdp_drop (rx_ring, orig_i, i); + rx_ring->stats.xdp_drops++; goto out; + } + +enetc_get_offloads (rx_ring, orig_rxbd, skb); + +/* These buffers are about to be owned by the stack. +* Update our buffer cache (the rx_swbd array elements) +* with their other page halves. +*/ +enetc_bulk_flip_buff (rx_ring, orig_i, i);napi_gro_receive (napi, skb);break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 57/311 nvmet: fix out-of-bounds access in nvmet_enable_port
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
[ Upstream commit 3d7aa0c7b4e96cd460826d932e44710cdeb3378b ]
When trying to enable a port that has no transport configured yet, nvmet_enable_port() uses NVMF_TRTYPE_MAX (255) to query the transports array, causing an out-of-bounds access:
[ 106.058694] BUG: KASAN: global-out-of-bounds in nvmet_enable_port+0x42/0x1da [ 106.058719] Read of size 8 at addr ffffffff89dafa58 by task ln/632 [...] [ 106.076026] nvmet: transport type 255 not supported
Since commit 200adac75888, NVMF_TRTYPE_MAX is the default state as configured by nvmet_ports_make().
Avoid this by checking for NVMF_TRTYPE_MAX before proceeding.
--- drivers/nvme/target/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/target/core.c +3 -0
@@ -324,6 +324,9 @@ int nvmet_enable_port(struct nvmet_port *port)lockdep_assert_held (&nvmet_config_sem); +if (port->disc_addr.trtype ==NVMF_TRTYPE_MAX ) +return -EINVAL ; + ops = nvmet_transports[port->disc_addr.trtype];if (!ops) {up_write (&nvmet_config_sem);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 58/311 net: lwtunnel: disable BHs when required
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit c03a49f3093a4903c8a93c8b5c9a297b5343b169 ]
In lwtunnel_{output|xmit}(), dev_xmit_recursion() may be called in preemptible scope for PREEMPT kernels. This patch disables BHs before calling dev_xmit_recursion(). BHs are re-enabled only at the end, since we must ensure the same CPU is used for both dev_xmit_recursion_inc() and dev_xmit_recursion_dec() (and any other recursion levels in some cases) in order to maintain valid per-cpu counters.
--- net/core/lwtunnel.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
net/core/lwtunnel.c +20 -6
@@ -332,6 +332,8 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)struct dst_entry *dst;int ret; +local_bh_disable (); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
@@ -347,8 +349,10 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb) lwtstate = dst->lwtstate;if (lwtstate->type ==LWTUNNEL_ENCAP_NONE || - lwtstate->type >LWTUNNEL_ENCAP_MAX ) -return 0 ; + lwtstate->type >LWTUNNEL_ENCAP_MAX ) { + ret =0 ; + goto out; + } ret = -EOPNOTSUPP ;rcu_read_lock ();
@@ -363,11 +367,13 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)if (ret == -EOPNOTSUPP ) goto drop; -return ret; + goto out; drop:kfree_skb (skb); +out: +local_bh_enable ();return ret; }EXPORT_SYMBOL_GPL (lwtunnel_output);
@@ -379,6 +385,8 @@ int lwtunnel_xmit(struct sk_buff *skb)struct dst_entry *dst;int ret; +local_bh_disable (); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
@@ -395,8 +403,10 @@ int lwtunnel_xmit(struct sk_buff *skb) lwtstate = dst->lwtstate;if (lwtstate->type ==LWTUNNEL_ENCAP_NONE || - lwtstate->type >LWTUNNEL_ENCAP_MAX ) -return 0 ; + lwtstate->type >LWTUNNEL_ENCAP_MAX ) { + ret =0 ; + goto out; + } ret = -EOPNOTSUPP ;rcu_read_lock ();
@@ -411,11 +421,13 @@ int lwtunnel_xmit(struct sk_buff *skb)if (ret == -EOPNOTSUPP ) goto drop; -return ret; + goto out; drop:kfree_skb (skb); +out: +local_bh_enable ();return ret; }EXPORT_SYMBOL_GPL (lwtunnel_xmit);
@@ -427,6 +439,8 @@ int lwtunnel_input(struct sk_buff *skb)struct dst_entry *dst;int ret; +DEBUG_NET_WARN_ON_ONCE (!in_softirq ()); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 59/311 net: phylink: force link down on major_config failure
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
[ Upstream commit f1ae32a709e0b525d7963207eb3a4747626f4818 ]
If we fail to configure the MAC or PCS according to the desired mode, do not allow the network link to come up until we have successfully configured the MAC and PCS. This improves phylink's behaviour when an error occurs.
Stable-dep-of: 4c8925cb9db1 ("net: phylink: fix suspend/resume with WoL enabled and link down")
--- drivers/net/phy/phylink.c | 42 +++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-)
drivers/net/phy/phylink.c +34 -8
@@ -82,6 +82,7 @@ struct phylink {unsigned int pcs_state;bool link_failed; +bool major_config_failed;bool mac_supports_eee_ops;bool mac_supports_eee;bool phy_enable_tx_lpi;
@@ -1360,12 +1361,16 @@ static void phylink_major_config(struct phylink *pl, bool restart,phylink_an_mode_str (pl->req_link_an_mode), phy_modes(state->interface)); + pl->major_config_failed = false; +if (pl->mac_ops->mac_select_pcs) { pcs = pl->mac_ops->mac_select_pcs (pl->config, state->interface);if (IS_ERR (pcs)) {phylink_err (pl,"mac_select_pcs unexpectedly failed: %pe\n" , pcs); + + pl->major_config_failed = true;return ; }
@@ -1387,6 +1392,7 @@ static void phylink_major_config(struct phylink *pl, bool restart,if (err <0 ) {phylink_err (pl,"mac_prepare failed: %pe\n" ,ERR_PTR (err)); + pl->major_config_failed = true;return ; } }
@@ -1410,8 +1416,15 @@ static void phylink_major_config(struct phylink *pl, bool restart,phylink_mac_config (pl, state); -if (pl->pcs) -phylink_pcs_post_config (pl->pcs, state->interface); +if (pl->pcs) { + err =phylink_pcs_post_config (pl->pcs, state->interface); +if (err <0 ) { +phylink_err (pl,"pcs_post_config failed: %pe\n" , +ERR_PTR (err)); + + pl->major_config_failed = true; + } + }if (pl->pcs_state ==PCS_STATE_STARTING || pcs_changed)phylink_pcs_enable (pl->pcs);
@@ -1422,11 +1435,12 @@ static void phylink_major_config(struct phylink *pl, bool restart, err =phylink_pcs_config (pl->pcs, neg_mode, state, !!(pl->link_config.pause &MLO_PAUSE_AN )); -if (err <0 ) -phylink_err (pl,"pcs_config failed: %pe\n" , -ERR_PTR (err)); -else if (err >0 ) +if (err <0 ) { +phylink_err (pl,"pcs_config failed: %pe\n" ,ERR_PTR (err)); + pl->major_config_failed = true; + }else if (err >0 ) { restart = true; + }if (restart)phylink_pcs_an_restart (pl);
@@ -1434,16 +1448,22 @@ static void phylink_major_config(struct phylink *pl, bool restart,if (pl->mac_ops->mac_finish) { err = pl->mac_ops->mac_finish (pl->config, pl->act_link_an_mode, state->interface); -if (err <0 ) +if (err <0 ) {phylink_err (pl,"mac_finish failed: %pe\n" ,ERR_PTR (err)); + + pl->major_config_failed = true; + } }if (pl->phydev && pl->phy_ib_mode) { err =phy_config_inband (pl->phydev, pl->phy_ib_mode); -if (err <0 ) +if (err <0 ) {phylink_err (pl,"phy_config_inband: %pe\n" ,ERR_PTR (err)); + + pl->major_config_failed = true; + } }if (pl->sfp_bus) {
@@ -1795,6 +1815,12 @@ static void phylink_resolve(struct work_struct *w) } } +/* If configuration of the interface failed, force the link down +* until we get a successful configuration. +*/ +if (pl->major_config_failed) + link_state.link = false; +if (link_state.link != cur_link_state) { pl->old_link_state = link_state.link;if (!link_state.link)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 50/311 net/mlx5: Fix null-ptr-deref in mlx5_create_{inner_,}ttc_table()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 91037037ee3d611ce17f39d75f79c7de394b122a ]
Add NULL check for mlx5_get_flow_namespace() returns in mlx5_create_inner_ttc_table() and mlx5_create_ttc_table() to prevent NULL pointer dereference.
--- drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +10 -0
@@ -636,6 +636,11 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev, } ns =mlx5_get_flow_namespace (dev, params->ns_type); +if (!ns) { +kvfree (ttc); +return ERR_PTR (-EOPNOTSUPP ); + } + groups = use_l4_type ? &inner_ttc_groups[TTC_GROUPS_USE_L4_TYPE ] : &inner_ttc_groups[TTC_GROUPS_DEFAULT ];
@@ -709,6 +714,11 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev, } ns =mlx5_get_flow_namespace (dev, params->ns_type); +if (!ns) { +kvfree (ttc); +return ERR_PTR (-EOPNOTSUPP ); + } + groups = use_l4_type ? &ttc_groups[TTC_GROUPS_USE_L4_TYPE ] : &ttc_groups[TTC_GROUPS_DEFAULT ];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 83/311 block: remove the backing_inode variable in bdev_statx
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit d13b7090b2510abaa83a25717466decca23e8226 ]
backing_inode is only used once, so remove it and update the comment describing the bdev lookup to be a bit more clear.
Stable-dep-of: 5f33b5226c9d ("block: don't autoload drivers on stat")
--- block/bdev.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
block/bdev.c +4 -7
@@ -1271,18 +1271,15 @@ void sync_bdevs(bool wait)void bdev_statx (struct path *path,struct kstat *stat,u32 request_mask) { -struct inode *backing_inode;struct block_device *bdev; - backing_inode =d_backing_inode (path->dentry); -/* -* Note that backing_inode is the inode of a block device node file, -* not the block device's internal inode. Therefore it is *not* valid -* to use I_BDEV() here; the block device has to be looked up by i_rdev +* Note that d_backing_inode() returns the block device node inode, not +* the block device's internal inode. Therefore it is *not* valid to +* use I_BDEV() here; the block device has to be looked up by i_rdev * instead. */ - bdev =blkdev_get_no_open (backing_inode->i_rdev); + bdev =blkdev_get_no_open (d_backing_inode (path->dentry)->i_rdev);if (!bdev)return ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 92/311 ublk: call ublk_dispatch_req() for handling UBLK_U_IO_NEED_GET_DATA
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit d6aa0c178bf81f30ae4a780b2bca653daa2eb633 ]
We call io_uring_cmd_complete_in_task() to schedule task_work for handling UBLK_U_IO_NEED_GET_DATA.
This way is really not necessary because the current context is exactly the ublk queue context, so call ublk_dispatch_req() directly for handling UBLK_U_IO_NEED_GET_DATA.
--- drivers/block/ublk_drv.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/block/ublk_drv.c +3 -11
@@ -1812,15 +1812,6 @@ static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq)mutex_unlock (&ub->mutex); } -static void ublk_handle_need_get_data (struct ublk_device *ub,int q_id, -int tag) -{ -struct ublk_queue *ubq =ublk_get_queue (ub, q_id); -struct request *req =blk_mq_tag_to_rq (ub->tag_set.tags[q_id], tag); - -ublk_queue_cmd (ubq, req); -} -static inline int ublk_check_cmd_op (u32 cmd_op) {u32 ioc_type =_IOC_TYPE (cmd_op);
@@ -1967,8 +1958,9 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,if (!(io->flags &UBLK_IO_FLAG_OWNED_BY_SRV )) goto out;ublk_fill_io_cmd (io, cmd, ub_cmd->addr); -ublk_handle_need_get_data (ub, ub_cmd->q_id, ub_cmd->tag); -break ; + req =blk_mq_tag_to_rq (ub->tag_set.tags[ub_cmd->q_id], tag); +ublk_dispatch_req (ubq, req, issue_flags); +return -EIOCBQUEUED ;default : goto out; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 93/311 splice: remove duplicate noinline from pipe_clear_nowait
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: T.J. Mercier <[email protected]>
[ Upstream commit e6f141b332ddd9007756751b6afd24f799488fd8 ]
pipe_clear_nowait has two noinline macros, but we only need one.
I checked the whole tree, and this is the only occurrence:
$ grep -r "noinline .* noinline" fs/splice.c:static noinline void noinline pipe_clear_nowait(struct file *file) $
--- fs/splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/splice.c +1 -1
@@ -45,7 +45,7 @@* here if set to avoid blocking other users of this pipe if splice is * being done on it. */ -static noinline void noinline pipe_clear_nowait(struct file *file) +static noinline void pipe_clear_nowait(struct file *file) {fmode_t fmode =READ_ONCE (file->f_mode);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 94/311 fs/xattr: Fix handling of AT_FDCWD in setxattrat(2) and getxattrat(2)
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
[ Upstream commit f520bed25d17bb31c2d2d72b0a785b593a4e3179 ]
Currently, setxattrat(2) and getxattrat(2) are wrongly handling the calls of the from setxattrat(AF_FDCWD, NULL, AT_EMPTY_PATH, ...) and fail with -EBADF error instead of operating on CWD. Fix it.
--- fs/xattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/xattr.c +2 -2
@@ -703,7 +703,7 @@ static int path_setxattrat(int dfd, const char __user *pathname,return error; filename =getname_maybe_null (pathname, at_flags); -if (!filename) { +if (!filename && dfd >=0 ) {CLASS (fd, f)(dfd);if (fd_empty (f)) error = -EBADF ;
@@ -847,7 +847,7 @@ static ssize_t path_getxattrat(int dfd, const char __user *pathname,return error; filename =getname_maybe_null (pathname, at_flags); -if (!filename) { +if (!filename && dfd >=0 ) {CLASS (fd, f)(dfd);if (fd_empty (f))return -EBADF ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 95/311 bpf: Add namespace to BPF internal symbols
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit f88886de0927a2adf4c1b4c5c1f1d31d2023ef74 ]
Add namespace to BPF internal symbols used by light skeleton to prevent abuse and document with the code their allowed usage.
--- Documentation/bpf/bpf_devel_QA.rst | 8 ++++++++ kernel/bpf/preload/bpf_preload_kern.c | 1 + kernel/bpf/syscall.c | 6 +++--- 3 files changed, 12 insertions(+), 3 deletions(-)
Documentation/bpf/bpf_devel_QA.rst +8 -0
@@ -382,6 +382,14 @@ In case of new BPF instructions, once the changes have been accepted into the Linux kernel, please implement support into LLVM's BPF back end. See LLVM_ section below for further information. +Q: What "BPF_INTERNAL" symbol namespace is for? +----------------------------------------------- +A: Symbols exported as BPF_INTERNAL can only be used by BPF infrastructure +like preload kernel modules with light skeleton. Most symbols outside +of BPF_INTERNAL are not expected to be used by code outside of BPF either. +Symbols may lack the designation because they predate the namespaces, +or due to an oversight. + Stable submission =================
kernel/bpf/preload/bpf_preload_kern.c +1 -0
@@ -89,4 +89,5 @@ static void __exit fini(void) }late_initcall (load);module_exit (fini); +MODULE_IMPORT_NS ("BPF_INTERNAL" );MODULE_LICENSE ("GPL" );
kernel/bpf/syscall.c +3 -3
@@ -1562,7 +1562,7 @@ struct bpf_map *bpf_map_get(u32 ufd)return map; } -EXPORT_SYMBOL (bpf_map_get); +EXPORT_SYMBOL_NS (bpf_map_get,"BPF_INTERNAL" );struct bpf_map *bpf_map_get_with_uref (u32 ufd) {
@@ -3345,7 +3345,7 @@ struct bpf_link *bpf_link_get_from_fd(u32 ufd)bpf_link_inc (link);return link; } -EXPORT_SYMBOL (bpf_link_get_from_fd); +EXPORT_SYMBOL_NS (bpf_link_get_from_fd,"BPF_INTERNAL" );static void bpf_tracing_link_release (struct bpf_link *link) {
@@ -5981,7 +5981,7 @@ int kern_sys_bpf(int cmd, union bpf_attr *attr, unsigned int size)return ____bpf_sys_bpf (cmd, attr, size); } } -EXPORT_SYMBOL (kern_sys_bpf); +EXPORT_SYMBOL_NS (kern_sys_bpf,"BPF_INTERNAL" );static const struct bpf_func_proto bpf_sys_bpf_proto = { .func = bpf_sys_bpf,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 96/311 Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates"
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Hewitt <[email protected]>
[ Upstream commit f37bb5486ea536c1d61df89feeaeff3f84f0b560 ]
This reverts commit bfbc68e.
The patch does permit the offending YUV420 @ 59.94 phy_freq and vclk_freq mode to match in calculations. It also results in all fractional rates being unavailable for use. This was unintended and requires the patch to be reverted.
Stable-dep-of: 1017560164b6 ("drm/meson: use unsigned long long / Hz for frequency types")
--- drivers/gpu/drm/meson/meson_vclk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/meson/meson_vclk.c +3 -3
@@ -790,13 +790,13 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, FREQ_1000_1001(params[i].pixel_freq));DRM_DEBUG_DRIVER ("i = %d phy_freq = %d alt = %d\n" , i, params[i].phy_freq, -FREQ_1000_1001 (params[i].phy_freq/1000 )*1000 ); +FREQ_1000_1001 (params[i].phy_freq/10 )*10 );/* Match strict frequency */ if (phy_freq == params[i].phy_freq && vclk_freq == params[i].vclk_freq)return MODE_OK ;/* Match 1000/1001 variant */ -if (phy_freq == (FREQ_1000_1001 (params[i].phy_freq/1000 )*1000 ) && +if (phy_freq == (FREQ_1000_1001 (params[i].phy_freq/10 )*10 ) && vclk_freq ==FREQ_1000_1001 (params[i].vclk_freq))return MODE_OK ; }
@@ -1070,7 +1070,7 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target,for (freq =0 ; params[freq].pixel_freq ; ++freq) {if ((phy_freq == params[freq].phy_freq || - phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/1000 )*1000 ) && + phy_freq ==FREQ_1000_1001 (params[freq].phy_freq/10 )*10 ) && (vclk_freq == params[freq].vclk_freq || vclk_freq ==FREQ_1000_1001 (params[freq].vclk_freq))) {if (vclk_freq != params[freq].vclk_freq)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 97/311 drm/meson: use unsigned long long / Hz for frequency types
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Blumenstingl <[email protected]>
[ Upstream commit 1017560164b6bbcbc93579266926e6e96675262a ]
Christian reports that 4K output using YUV420 encoding fails with the following error:
Fatal Error, invalid HDMI vclk freq 593406
Modetest shows the following:
3840x2160 59.94 3840 4016 4104 4400 2160 2168 2178 2250 593407 flags: xxxx, xxxx, drm calculated value -------------------------------------^
This indicates that there's a (1kHz) mismatch between the clock calculated by the drm framework and the meson driver.
Relevant function call stack:
(drm framework)
-> meson_encoder_hdmi_atomic_enable()
-> meson_encoder_hdmi_set_vclk()
-> meson_vclk_setup()The video clock requested by the drm framework is 593407kHz. This is passed by meson_encoder_hdmi_atomic_enable() to meson_encoder_hdmi_set_vclk() and the following formula is applied:
- the frequency is halved (which would be 296703.5kHz) and rounded down to the next full integer, which is 296703kHz
- TMDS clock is calculated (296703kHz * 10)
- video encoder clock is calculated - this needs to match a table from meson_vclk.c and so it doubles the previously halved value again (resulting in 593406kHz)
- meson_vclk_setup() can't find (either directly, or by deriving it from 594000kHz * 1000 / 1001 and rounding to the closest integer value - which is 593407kHz as originally requested by the drm framework) a matching clock in it's internal table and errors out with "invalid HDMI vclk freq"
Fix the division precision by switching the whole meson driver to use unsigned long long (64-bit) Hz values for clock frequencies instead of unsigned int (32-bit) kHz to fix the rouding error.
--- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.h | 2 +- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 29 +-- drivers/gpu/drm/meson/meson_vclk.c | 195 +++++++++++---------- drivers/gpu/drm/meson/meson_vclk.h | 13 +- 5 files changed, 126 insertions(+), 115 deletions(-)
drivers/gpu/drm/meson/meson_drv.c +1 -1
@@ -169,7 +169,7 @@ static const struct meson_drm_soc_attr meson_drm_soc_attrs[] = {/* S805X/S805Y HDMI PLL won't lock for HDMI PHY freq > 1,65GHz */ { .limits = { - .max_hdmi_phy_freq = 1650000, + .max_hdmi_phy_freq = 1650000000, }, .attrs = (const struct soc_device_attribute []) { { .soc_id = "GXL (S805*)", },
drivers/gpu/drm/meson/meson_drv.h +1 -1
@@ -37,7 +37,7 @@ struct meson_drm_match_data { };struct meson_drm_soc_limits { -unsigned int max_hdmi_phy_freq; +unsigned long long max_hdmi_phy_freq; };struct meson_drm {
drivers/gpu/drm/meson/meson_encoder_hdmi.c +16 -13
@@ -70,12 +70,12 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi, {struct meson_drm *priv = encoder_hdmi->priv;int vic =drm_match_cea_mode (mode); -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long phy_freq; +unsigned long long vclk_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq; - vclk_freq = mode->clock; + vclk_freq = mode->clock *1000 ;/* For 420, pixel clock is half unlike venc clock */ if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 )
@@ -107,7 +107,8 @@ static void meson_encoder_hdmi_set_vclk(struct meson_encoder_hdmi *encoder_hdmi,if (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (priv->dev,"vclk:%d phy=%d venc=%d hdmi=%d enci=%d\n" , +dev_dbg (priv->dev, +"vclk:%lluHz phy=%lluHz venc=%lluHz hdmi=%lluHz enci=%d\n" , phy_freq, vclk_freq, venc_freq, hdmi_freq, priv->venc.hdmi_use_enci);
@@ -122,10 +123,11 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *bristruct meson_encoder_hdmi *encoder_hdmi =bridge_to_meson_encoder_hdmi (bridge);struct meson_drm *priv = encoder_hdmi->priv;bool is_hdmi2_sink = display_info->hdmi.scdc.supported; -unsigned int phy_freq; -unsigned int vclk_freq; -unsigned int venc_freq; -unsigned int hdmi_freq; +unsigned long long clock = mode->clock *1000 ; +unsigned long long phy_freq; +unsigned long long vclk_freq; +unsigned long long venc_freq; +unsigned long long hdmi_freq;int vic =drm_match_cea_mode (mode);enum drm_mode_status status;
@@ -144,12 +146,12 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *briif (status !=MODE_OK )return status; -return meson_vclk_dmt_supported_freq (priv, mode->clock); +return meson_vclk_dmt_supported_freq (priv, clock);/* Check against supported VIC modes */ }else if (!meson_venc_hdmi_supported_vic (vic))return MODE_BAD ; - vclk_freq = mode->clock; + vclk_freq = clock;/* For 420, pixel clock is half unlike venc clock */ if (drm_mode_is_420_only(display_info, mode) ||
@@ -179,7 +181,8 @@ static enum drm_mode_status meson_encoder_hdmi_mode_valid(struct drm_bridge *briif (mode->flags &DRM_MODE_FLAG_DBLCLK ) venc_freq /=2 ; -dev_dbg (priv->dev,"%s: vclk:%d phy=%d venc=%d hdmi=%d\n" , +dev_dbg (priv->dev, +"%s: vclk:%lluHz phy=%lluHz venc=%lluHz hdmi=%lluHz\n" , __func__, phy_freq, vclk_freq, venc_freq, hdmi_freq);return meson_vclk_vic_supported_freq (priv, phy_freq, vclk_freq);
drivers/gpu/drm/meson/meson_vclk.c +101 -94
425 lines not on this page · raw message
drivers/gpu/drm/meson/meson_vclk.h +7 -6
@@ -20,17 +20,18 @@ enum { };/* 27MHz is the CVBS Pixel Clock */ -#define MESON_VCLK_CVBS 27000 +#define MESON_VCLK_CVBS (27 * 1000 * 1000)enum drm_mode_status -meson_vclk_dmt_supported_freq (struct meson_drm *priv,unsigned int freq); +meson_vclk_dmt_supported_freq (struct meson_drm *priv,unsigned long long freq);enum drm_mode_status -meson_vclk_vic_supported_freq (struct meson_drm *priv,unsigned int phy_freq, -unsigned int vclk_freq); +meson_vclk_vic_supported_freq (struct meson_drm *priv, +unsigned long long phy_freq, +unsigned long long vclk_freq);void meson_vclk_setup (struct meson_drm *priv,unsigned int target, -unsigned int phy_freq,unsigned int vclk_freq, -unsigned int venc_freq,unsigned int dac_freq, +unsigned long long phy_freq,unsigned long long vclk_freq, +unsigned long long venc_freq,unsigned long long dac_freq,bool hdmi_use_enci);#endif /* __MESON_VCLK_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 98/311 perf/x86: Fix non-sampling (counting) events on certain x86 platforms
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luo Gengkun <[email protected]>
[ Upstream commit 1a97fea9db9e9b9c4839d4232dde9f505ff5b4cc ]
Perf doesn't work at perf stat for hardware events on certain x86 platforms:
$perf stat -- sleep 1
Performance counter stats for 'sleep 1':
16.44 msec task-clock # 0.016 CPUs utilized
2 context-switches # 121.691 /sec
0 cpu-migrations # 0.000 /sec
54 page-faults # 3.286 K/sec <not supported> cycles
<not supported> instructions
<not supported> branches
<not supported> branch-misses
The reason is that the check in x86_pmu_hw_config() for sampling events is unexpectedly applied to counting events as well.
It should only impact x86 platforms with limit_period used for non-PEBS events. For Intel platforms, it should only impact some older platforms, e.g., HSW, BDW and NHM.
--- arch/x86/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/core.c +1 -1
@@ -628,7 +628,7 @@ int x86_pmu_hw_config(struct perf_event *event)if (event->attr.type == event->pmu->type) event->hw.config |=x86_pmu_get_event_config (event); -if (!event->attr.freq && x86_pmu.limit_period) { +if (is_sampling_event (event) && !event->attr.freq && x86_pmu.limit_period) {s64 left = event->attr.sample_period; x86_pmu.limit_period (event, &left);if (left > event->attr.sample_period)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 99/311 LoongArch: Select ARCH_USE_MEMTEST
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuli Wang <[email protected]>
[ Upstream commit fb8e9f59d6f292c3d9fea6c155c22ea5fc3053ab ]
As of commit dce44566192e ("mm/memtest: add ARCH_USE_MEMTEST"), architectures must select ARCH_USE_MEMTESET to enable CONFIG_MEMTEST.
Commit 628c3bb40e9a ("LoongArch: Add boot and setup routines") added support for early_memtest but did not select ARCH_USE_MEMTESET.
--- arch/loongarch/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/loongarch/Kconfig +1 -0
@@ -71,6 +71,7 @@ config LOONGARCH select ARCH_SUPPORTS_RT select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_DEFAULT_BPF_JIT
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 100/311 LoongArch: Make regs_irqs_disabled() more clear
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit bb0511d59db9b3e40c8d51f0d151ccd0fd44071d ]
In the current code, the definition of regs_irqs_disabled() is actually "!(regs->csr_prmd & CSR_CRMD_IE)" because arch_irqs_disabled_flags() is defined as "!(flags & CSR_CRMD_IE)", it looks a little strange.
Define regs_irqs_disabled() as !(regs->csr_prmd & CSR_PRMD_PIE) directly to make it more clear, no functional change.
While at it, the return value of regs_irqs_disabled() is true or false, so change its type to reflect that and also make it always inline.
--- arch/loongarch/include/asm/ptrace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/loongarch/include/asm/ptrace.h +2 -2
@@ -33,9 +33,9 @@ struct pt_regs {unsigned long __last[]; }__aligned(8) ; -static inline int regs_irqs_disabled (struct pt_regs *regs) +static __always_inline bool regs_irqs_disabled(struct pt_regs *regs) { -return arch_irqs_disabled_flags (regs->csr_prmd); +return !(regs->csr_prmd &CSR_PRMD_PIE ); }static inline unsigned long kernel_stack_pointer (struct pt_regs *regs)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 101/311 LoongArch: Make do_xyz() exception handlers more robust
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit cc73cc6bcdb5f959670e3ff9abdc62461452ddff ]
Currently, interrupts need to be disabled before single-step mode is set, it requires that CSR_PRMD_PIE be cleared in save_local_irqflag() which is called by setup_singlestep(), this is reasonable.
But in the first kprobe breakpoint exception, if the irq is enabled at the beginning of do_bp(), it will not be disabled at the end of do_bp() due to the CSR_PRMD_PIE has been cleared in save_local_irqflag(). So for this case, it may corrupt exception context when restoring the exception after do_bp() in handle_bp(), this is not reasonable.
In order to restore exception safely in handle_bp(), it needs to ensure the irq is disabled at the end of do_bp(), so just add a local variable to record the original interrupt status in the parent context, then use it as the check condition to enable and disable irq in do_bp().
While at it, do the similar thing for other do_xyz() exception handlers to make them more robust.
--- arch/loongarch/kernel/traps.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/loongarch/kernel/traps.c +12 -8
@@ -553,9 +553,10 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)die_if_kernel ("Kernel ale access" , regs);force_sig_fault (SIGBUS ,BUS_ADRALN , (void __user *)regs->csr_badvaddr);#else +bool pie =regs_irqs_disabled (regs);unsigned int *pc; -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();perf_sw_event (PERF_COUNT_SW_ALIGNMENT_FAULTS ,1 , regs, regs->csr_badvaddr);
@@ -582,7 +583,7 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)die_if_kernel ("Kernel ale access" , regs);force_sig_fault (SIGBUS ,BUS_ADRALN , (void __user *)regs->csr_badvaddr); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();#endif irqentry_exit (regs, state);
@@ -621,12 +622,13 @@ static void bug_handler(struct pt_regs *regs) asmlinkage void noinstr do_bce(struct pt_regs *regs) {bool user =user_mode (regs); +bool pie =regs_irqs_disabled (regs);unsigned long era =exception_era (regs);u64 badv =0 , lower =0 , upper =ULONG_MAX ;union loongarch_instruction insn;irqentry_state_t state =irqentry_enter (regs); -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable (); current->thread.trap_nr =read_csr_excode ();
@@ -692,7 +694,7 @@ asmlinkage void noinstr do_bce(struct pt_regs *regs)force_sig_bnderr ((void __user *)badv, (void __user *)lower, (void __user *)upper); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
@@ -710,11 +712,12 @@ asmlinkage void noinstr do_bce(struct pt_regs *regs) asmlinkage void noinstr do_bp(struct pt_regs *regs) {bool user =user_mode (regs); +bool pie =regs_irqs_disabled (regs);unsigned int opcode, bcode;unsigned long era =exception_era (regs);irqentry_state_t state =irqentry_enter (regs); -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();if (__get_inst (&opcode, (u32 *)era, user))
@@ -780,7 +783,7 @@ asmlinkage void noinstr do_bp(struct pt_regs *regs) } out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
@@ -1015,6 +1018,7 @@ static void init_restore_lbt(void) asmlinkage void noinstr do_lbt(struct pt_regs *regs) { +bool pie =regs_irqs_disabled (regs);irqentry_state_t state =irqentry_enter (regs);/*
@@ -1024,7 +1028,7 @@ asmlinkage void noinstr do_lbt(struct pt_regs *regs)* (including the user using 'MOVGR2GCSR' to turn on TM, which * will not trigger the BTE), we need to check PRMD first. */ -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();if (!cpu_has_lbt) {
@@ -1038,7 +1042,7 @@ asmlinkage void noinstr do_lbt(struct pt_regs *regs)preempt_enable (); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 84/311 block: dont autoload drivers on stat
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 5f33b5226c9d92359e58e91ad0bf0c1791da36a1 ]
blkdev_get_no_open can trigger the legacy autoload of block drivers. A simple stat of a block device has not historically done that, so disable this behavior again.
--- block/bdev.c | 8 ++++---- block/blk-cgroup.c | 2 +- block/blk.h | 2 +- block/fops.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
block/bdev.c +4 -4
@@ -773,13 +773,13 @@ static void blkdev_put_part(struct block_device *part)blkdev_put_whole (whole); } -struct block_device *blkdev_get_no_open (dev_t dev) +struct block_device *blkdev_get_no_open (dev_t dev,bool autoload) {struct block_device *bdev;struct inode *inode; inode =ilookup (blockdev_superblock, dev); -if (!inode &&IS_ENABLED (CONFIG_BLOCK_LEGACY_AUTOLOAD )) { +if (!inode && autoload &&IS_ENABLED (CONFIG_BLOCK_LEGACY_AUTOLOAD )) {blk_request_module (dev); inode =ilookup (blockdev_superblock, dev);if (inode)
@@ -1001,7 +1001,7 @@ struct file *bdev_file_open_by_dev(dev_t dev, blk_mode_t mode, void *holder,if (ret)return ERR_PTR (ret); - bdev =blkdev_get_no_open (dev); + bdev =blkdev_get_no_open (dev, true);if (!bdev)return ERR_PTR (-ENXIO );
@@ -1279,7 +1279,7 @@ void bdev_statx(struct path *path, struct kstat *stat,* use I_BDEV() here; the block device has to be looked up by i_rdev * instead. */ - bdev =blkdev_get_no_open (d_backing_inode (path->dentry)->i_rdev); + bdev =blkdev_get_no_open (d_backing_inode (path->dentry)->i_rdev, false);if (!bdev)return ;
block/blk-cgroup.c +1 -1
@@ -796,7 +796,7 @@ int blkg_conf_open_bdev(struct blkg_conf_ctx *ctx)return -EINVAL ; input =skip_spaces (input); - bdev =blkdev_get_no_open (MKDEV (major, minor)); + bdev =blkdev_get_no_open (MKDEV (major, minor), true);if (!bdev)return -ENODEV ;if (bdev_is_partition (bdev)) {
block/blk.h +1 -1
@@ -94,7 +94,7 @@ static inline void blk_wait_io(struct completion *done)wait_for_completion_io (done); } -struct block_device *blkdev_get_no_open (dev_t dev); +struct block_device *blkdev_get_no_open (dev_t dev,bool autoload);void blkdev_put_no_open (struct block_device *bdev);#define BIO_INLINE_VECS 4
block/fops.c +1 -1
@@ -642,7 +642,7 @@ static int blkdev_open(struct inode *inode, struct file *filp)if (ret)return ret; - bdev =blkdev_get_no_open (inode->i_rdev); + bdev =blkdev_get_no_open (inode->i_rdev, true);if (!bdev)return -ENXIO ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 102/311 sched/eevdf: Fix se->slice being set to U64_MAX and resulting crash
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Omar Sandoval <[email protected]>
[ Upstream commit bbce3de72be56e4b5f68924b7da9630cc89aa1a8 ]
There is a code path in dequeue_entities() that can set the slice of a sched_entity to U64_MAX, which sometimes results in a crash.
The offending case is when dequeue_entities() is called to dequeue a delayed group entity, and then the entity's parent's dequeue is delayed. In that case:
1. In the if (entity_is_task(se)) else block at the beginning of dequeue_entities(), slice is set to cfs_rq_min_slice(group_cfs_rq(se)). If the entity was delayed, then it has no queued tasks, so cfs_rq_min_slice() returns U64_MAX.
2. The first for_each_sched_entity() loop dequeues the entity.
3. If the entity was its parent's only child, then the next iteration tries to dequeue the parent.
4. If the parent's dequeue needs to be delayed, then it breaks from the first for_each_sched_entity() loop _without updating slice_.
5. The second for_each_sched_entity() loop sets the parent's ->slice to the saved slice, which is still U64_MAX.
This throws off subsequent calculations with potentially catastrophic results. A manifestation we saw in production was:
6. In update_entity_lag(), se->slice is used to calculate limit, which ends up as a huge negative number.
7. limit is used in se->vlag = clamp(vlag, -limit, limit). Because limit is negative, vlag > limit, so se->vlag is set to the same huge negative number.
8. In place_entity(), se->vlag is scaled, which overflows and results in another huge (positive or negative) number.
9. The adjusted lag is subtracted from se->vruntime, which increases or decreases se->vruntime by a huge number.
10. pick_eevdf() calls entity_eligible()/vruntime_eligible(), which incorrectly returns false because the vruntime is so far from the other vruntimes on the queue, causing the
(vruntime - cfs_rq->min_vruntime) * load calulation to overflow.
11. Nothing appears to be eligible, so pick_eevdf() returns NULL.
12. pick_next_entity() tries to dereference the return value of pick_eevdf() and crashes.
Dumping the cfs_rq states from the core dumps with drgn showed tell-tale huge vruntime ranges and bogus vlag values, and I also traced se->slice being set to U64_MAX on live systems (which was usually "benign" since the rest of the runqueue needed to be in a particular state to crash).
Fix it in dequeue_entities() by always setting slice from the first non-empty cfs_rq.
--- kernel/sched/fair.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
kernel/sched/fair.c +1 -3
@@ -7083,9 +7083,6 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags) h_nr_idle =task_has_idle_policy (p);if (task_sleep || task_delayed || !se->sched_delayed) h_nr_runnable =1 ; - }else { - cfs_rq =group_cfs_rq (se); - slice =cfs_rq_min_slice (cfs_rq); }for_each_sched_entity (se) {
@@ -7095,6 +7092,7 @@ static int dequeue_entities(struct rq *rq, struct sched_entity *se, int flags)if (p && &p->se == se)return -1 ; + slice =cfs_rq_min_slice (cfs_rq);break ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 103/311 net: stmmac: simplify phylink_suspend() and phylink_resume() calls
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit f732549eb303d7e382f5101b82bb6852ad4ad642 upstream.
Currently, the calls to phylink's suspend and resume functions are inside overly complex tests, and boil down to:
if (device_may_wakeup(priv->device) && priv->plat->pmt) {
call phylink
} else {
call phylink and
if (device_may_wakeup(priv->device))
do something else
}This results in phylink always being called, possibly with differing arguments for phylink_suspend().
Simplify this code, noting that each site is slightly different due to the order in which phylink is called and the "something else".
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +8 -14
@@ -7813,13 +7813,11 @@ int stmmac_suspend(struct device *dev)mutex_unlock (&priv->lock);rtnl_lock (); -if (device_may_wakeup (priv->device) && priv->plat->pmt) { -phylink_suspend (priv->phylink, true); - }else { -if (device_may_wakeup (priv->device)) -phylink_speed_down (priv->phylink, false); -phylink_suspend (priv->phylink, false); - } +if (device_may_wakeup (priv->device) && !priv->plat->pmt) +phylink_speed_down (priv->phylink, false); + +phylink_suspend (priv->phylink, +device_may_wakeup (priv->device) && priv->plat->pmt);rtnl_unlock ();if (stmmac_fpe_supported (priv))
@@ -7909,13 +7907,9 @@ int stmmac_resume(struct device *dev) }rtnl_lock (); -if (device_may_wakeup (priv->device) && priv->plat->pmt) { -phylink_resume (priv->phylink); - }else { -phylink_resume (priv->phylink); -if (device_may_wakeup (priv->device)) -phylink_speed_up (priv->phylink); - } +phylink_resume (priv->phylink); +if (device_may_wakeup (priv->device) && !priv->plat->pmt) +phylink_speed_up (priv->phylink);rtnl_unlock ();rtnl_lock ();
Greg Kroah-Hartman
maintainerPATCH 104/311 net: phylink: add phylink_prepare_resume()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit 367f1854d442b33c4a0305b068ae40d67ccd7d6a upstream.
When the system is suspended, the PHY may be placed in low-power mode by setting the BMCR 0.11 Power down bit. IEEE 802.3 states that the behaviour of the PHY in this state is implementation specific, and the PHY is not required to meet the RX_CLK and TX_CLK requirements. Essentially, this means that a PHY may stop the clocks that it is generating while in power down state.
However, MACs exist which require the clocks from the PHY to be running in order to properly resume. phylink_prepare_resume() provides them with a way to clear the Power down bit early.
Note, however, that IEEE 802.3 gives PHYs up to 500ms grace before the transmit and receive clocks meet the requirements after clearing the power down bit.
Add a resume preparation function, which will ensure that the receive clock from the PHY is appropriately configured while resuming.
--- drivers/net/phy/phylink.c | 25 +++++++++++++++++++++++++ include/linux/phylink.h | 1 + 2 files changed, 26 insertions(+)
drivers/net/phy/phylink.c +25 -0
@@ -2668,6 +2668,31 @@ void phylink_suspend(struct phylink *pl,EXPORT_SYMBOL_GPL (phylink_suspend);/** +* phylink_prepare_resume() - prepare to resume a network device +* @pl: a pointer to a &struct phylink returned from phylink_create() +* +* Optional, but if called must be called prior to phylink_resume(). +* +* Prepare to resume a network device, preparing the PHY as necessary. +*/ +void phylink_prepare_resume (struct phylink *pl) +{ +struct phy_device *phydev = pl->phydev; + +ASSERT_RTNL (); + +/* IEEE 802.3 22.2.4.1.5 allows PHYs to stop their receive clock +* when PDOWN is set. However, some MACs require RXC to be running +* in order to resume. If the MAC requires RXC, and we have a PHY, +* then resume the PHY. Note that 802.3 allows PHYs 500ms before +* the clock meets requirements. We do not implement this delay. +*/ +if (pl->config->mac_requires_rxc && phydev && phydev->suspended) +phy_resume (phydev); +} +EXPORT_SYMBOL_GPL (phylink_prepare_resume); + +/** * phylink_resume() - handle a network device resume event * @pl: a pointer to a &struct phylink returned from phylink_create() *
include/linux/phylink.h +1 -0
@@ -679,6 +679,7 @@ void phylink_start(struct phylink *);void phylink_stop (struct phylink *);void phylink_suspend (struct phylink *pl,bool mac_wol); +void phylink_prepare_resume (struct phylink *pl);void phylink_resume (struct phylink *pl);void phylink_ethtool_get_wol (struct phylink *,struct ethtool_wolinfo *);
Greg Kroah-Hartman
maintainerPATCH 105/311 net: stmmac: address non-LPI resume failures properly
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit ef43e5132895ad59b45e38855d32e966bb7434d9 upstream.
The Synopsys Designware GMAC core databook requires all clocks to be active in order to complete software reset, which we perform during resume.
However, IEEE 802.3 allows a PHY to stop its clocks when placed in low-power mode, which happens when the system is suspended and WoL is not enabled.
As an attempt to work around this, commit 36d18b5664ef ("net: stmmac:
start phylink instance before stmmac_hw_setup()") started phylink early, but this has the side effect that the mac_link_up() method may be called before or during the initialisation of GMAC hardware.
We also have the socfpga glue driver directly calling phy_resume() also as an attempt to work around this.
In a previous commit, phylink_prepare_resume() has been introduced to give MAC drivers a way to ensure that the PHY is resumed prior to their initialisation of their MAC hardware. This commit adds the call, and moves the phylink_resume() call back to where it should be before the aforementioned commit.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +14 -5
@@ -7907,12 +7907,12 @@ int stmmac_resume(struct device *dev) }rtnl_lock (); -phylink_resume (priv->phylink); -if (device_may_wakeup (priv->device) && !priv->plat->pmt) -phylink_speed_up (priv->phylink); -rtnl_unlock (); -rtnl_lock (); +/* Prepare the PHY to resume, ensuring that its clocks which are +* necessary for the MAC DMA reset to complete are running +*/ +phylink_prepare_resume (priv->phylink); +mutex_lock (&priv->lock);stmmac_reset_queues_param (priv);
@@ -7930,6 +7930,15 @@ int stmmac_resume(struct device *dev)stmmac_enable_all_dma_irq (priv);mutex_unlock (&priv->lock); + +/* phylink_resume() must be called after the hardware has been +* initialised because it may bring the link up immediately in a +* workqueue thread, which will race with initialisation. +*/ +phylink_resume (priv->phylink); +if (device_may_wakeup (priv->device) && !priv->plat->pmt) +phylink_speed_up (priv->phylink); +rtnl_unlock ();netif_device_attach (ndev);
Greg Kroah-Hartman
maintainerPATCH 106/311 net: stmmac: socfpga: remove phy_resume() call
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit 366aeeba79088003307f0f12bb3575fb083cc72a upstream.
As the previous commit addressed DWGMAC resuming with a PHY in suspended state, there is now no need for socfpga to work around this. Remove this code.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 18 ------------------ 1 file changed, 18 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +0 -18
@@ -523,24 +523,6 @@ static int socfpga_dwmac_resume(struct d dwmac_priv->ops->set_phy_mode (priv->plat->bsp_priv); -/* Before the enet controller is suspended, the phy is suspended. -* This causes the phy clock to be gated. The enet controller is -* resumed before the phy, so the clock is still gated "off" when -* the enet controller is resumed. This code makes sure the phy -* is "resumed" before reinitializing the enet controller since -* the enet controller depends on an active phy clock to complete -* a DMA reset. A DMA reset will "time out" if executed -* with no phy clock input on the Synopsys enet controller. -* Verified through Synopsys Case #8000711656. -* -* Note that the phy clock is also gated when the phy is isolated. -* Phy "suspend" and "isolate" controls are located in phy basic -* control register 0, and can be modified by the phy driver -* framework. -*/ -if (ndev->phydev) -phy_resume (ndev->phydev); - return stmmac_resume(dev); }#endif /* CONFIG_PM_SLEEP */
Greg Kroah-Hartman
maintainerPATCH 107/311 net: phylink: add functions to block/unblock rx clock stop
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit ddf4bd3f738485c84edb98ff96a5759904498e70 upstream.
Some MACs require the PHY receive clock to be running to complete setup actions. This may fail if the PHY has negotiated EEE, the MAC supports receive clock stop, and the link has entered LPI state. Provide a pair of APIs that MAC drivers can use to temporarily block the PHY disabling the receive clock.
--- drivers/net/phy/phylink.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/phylink.h | 3 ++ 2 files changed, 62 insertions(+)
drivers/net/phy/phylink.c +59 -0
@@ -90,6 +90,7 @@ struct phylink {bool mac_enable_tx_lpi;bool mac_tx_clk_stop;u32 mac_tx_lpi_timer; +u8 mac_rx_clk_stop_blocked;struct sfp_bus *sfp_bus;bool sfp_may_have_phy;
@@ -2622,6 +2623,64 @@ void phylink_stop(struct phylink *pl)EXPORT_SYMBOL_GPL (phylink_stop);/** +* phylink_rx_clk_stop_block() - block PHY ability to stop receive clock in LPI +* @pl: a pointer to a &struct phylink returned from phylink_create() +* +* Disable the PHY's ability to stop the receive clock while the receive path +* is in EEE LPI state, until the number of calls to phylink_rx_clk_stop_block() +* are balanced by calls to phylink_rx_clk_stop_unblock(). +*/ +void phylink_rx_clk_stop_block (struct phylink *pl) +{ +ASSERT_RTNL (); + +if (pl->mac_rx_clk_stop_blocked ==U8_MAX ) { +phylink_warn (pl,"%s called too many times - ignoring\n" , + __func__); +dump_stack (); +return ; + } + +/* Disable PHY receive clock stop if this is the first time this +* function has been called and clock-stop was previously enabled. +*/ +if (pl->mac_rx_clk_stop_blocked++ ==0 && + pl->mac_supports_eee_ops && pl->phydev && + pl->config->eee_rx_clk_stop_enable) +phy_eee_rx_clock_stop (pl->phydev, false); +} +EXPORT_SYMBOL_GPL (phylink_rx_clk_stop_block); + +/** +* phylink_rx_clk_stop_unblock() - unblock PHY ability to stop receive clock +* @pl: a pointer to a &struct phylink returned from phylink_create() +* +* All calls to phylink_rx_clk_stop_block() must be balanced with a +* corresponding call to phylink_rx_clk_stop_unblock() to restore the PHYs +* ability to stop the receive clock when the receive path is in EEE LPI mode. +*/ +void phylink_rx_clk_stop_unblock (struct phylink *pl) +{ +ASSERT_RTNL (); + +if (pl->mac_rx_clk_stop_blocked ==0 ) { +phylink_warn (pl,"%s called too many times - ignoring\n" , + __func__); +dump_stack (); +return ; + } + +/* Re-enable PHY receive clock stop if the number of unblocks matches +* the number of calls to the block function above. +*/ +if (--pl->mac_rx_clk_stop_blocked ==0 && + pl->mac_supports_eee_ops && pl->phydev && + pl->config->eee_rx_clk_stop_enable) +phy_eee_rx_clock_stop (pl->phydev, true); +} +EXPORT_SYMBOL_GPL (phylink_rx_clk_stop_unblock); + +/** * phylink_suspend() - handle a network device suspend event * @pl: a pointer to a &struct phylink returned from phylink_create() * @mac_wol: true if the MAC needs to receive packets for Wake-on-Lan
include/linux/phylink.h +3 -0
@@ -678,6 +678,9 @@ int phylink_pcs_pre_init(struct phylinkvoid phylink_start (struct phylink *);void phylink_stop (struct phylink *); +void phylink_rx_clk_stop_block (struct phylink *); +void phylink_rx_clk_stop_unblock (struct phylink *); +void phylink_suspend (struct phylink *pl,bool mac_wol);void phylink_prepare_resume (struct phylink *pl);void phylink_resume (struct phylink *pl);
Greg Kroah-Hartman
maintainerPATCH 108/311 net: stmmac: block PHY RXC clock-stop
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Russell King (Oracle) <[email protected]>
commit dd557266cf5fb01a8cd85482dd258c1e172301d1 upstream.
The DesignWare core requires the receive clock to be running during certain operations. Ensure that we block PHY RXC clock-stop during these operations.
This is a best-efforts change - not everywhere can be covered by this because of net's core locking, which means we can't access the MDIO bus to configure the PHY to disable RXC clock-stop in certain areas. These are marked with FIXME comments.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +27 -0
@@ -3448,9 +3448,18 @@ static int stmmac_hw_setup(struct net_deif (priv->hw->phylink_pcs)phylink_pcs_pre_init (priv->phylink, priv->hw->phylink_pcs); +/* Note that clk_rx_i must be running for reset to complete. This +* clock may also be required when setting the MAC address. +* +* Block the receive clock stop for LPI mode at the PHY in case +* the link is established with EEE mode active. +*/ +phylink_rx_clk_stop_block (priv->phylink); +/* DMA initialization and SW reset */ ret =stmmac_init_dma_engine (priv);if (ret <0 ) { +phylink_rx_clk_stop_unblock (priv->phylink);netdev_err (priv->dev,"%s: DMA engine initialization failed\n" , __func__);return ret;
@@ -3458,6 +3467,7 @@ static int stmmac_hw_setup(struct net_de/* Copy the MAC addr into the HW */ stmmac_set_umac_addr (priv, priv->hw, dev->dev_addr,0 ); +phylink_rx_clk_stop_unblock (priv->phylink);/* PS and related bits will be programmed according to the speed */ if (priv->hw->pcs) {
@@ -3568,7 +3578,9 @@ static int stmmac_hw_setup(struct net_de/* Start the ball rolling... */ stmmac_start_all_dma (priv); +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_hw_vlan_mode (priv, priv->hw); +phylink_rx_clk_stop_unblock (priv->phylink);return 0 ; }
@@ -5853,6 +5865,9 @@ static void stmmac_tx_timeout(struct net* whenever multicast addresses must be enabled/disabled. * Return value: * void. +* +* FIXME: This may need RXC to be running, but it may be called with BH +* disabled, which means we can't call phylink_rx_clk_stop*(). */ static void stmmac_set_rx_mode (struct net_device *dev) {
@@ -5985,7 +6000,9 @@ static int stmmac_set_features(struct neelse priv->hw->hw_vlan_en = false; +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_hw_vlan_mode (priv, priv->hw); +phylink_rx_clk_stop_unblock (priv->phylink);return 0 ; }
@@ -6269,7 +6286,9 @@ static int stmmac_set_mac_address(structif (ret) goto set_mac_error; +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_umac_addr (priv, priv->hw, ndev->dev_addr,0 ); +phylink_rx_clk_stop_unblock (priv->phylink); set_mac_error:pm_runtime_put (priv->device);
@@ -6625,6 +6644,9 @@ static int stmmac_vlan_update(struct stmreturn stmmac_update_vlan_hash (priv, priv->hw, hash, pmatch, is_double); } +/* FIXME: This may need RXC to be running, but it may be called with BH +* disabled, which means we can't call phylink_rx_clk_stop*(). +*/ static int stmmac_vlan_rx_add_vid (struct net_device *ndev,__be16 proto,u16 vid) {struct stmmac_priv *priv =netdev_priv (ndev);
@@ -6656,6 +6678,9 @@ err_pm_put:return ret; } +/* FIXME: This may need RXC to be running, but it may be called with BH +* disabled, which means we can't call phylink_rx_clk_stop*(). +*/ static int stmmac_vlan_rx_kill_vid (struct net_device *ndev,__be16 proto,u16 vid) {struct stmmac_priv *priv =netdev_priv (ndev);
@@ -7922,9 +7947,11 @@ int stmmac_resume(struct device *dev)stmmac_hw_setup (ndev, false);stmmac_init_coalesce (priv); +phylink_rx_clk_stop_block (priv->phylink);stmmac_set_rx_mode (ndev);stmmac_restore_hw_vlan_rx_fltr (priv, ndev, priv->hw); +phylink_rx_clk_stop_unblock (priv->phylink);stmmac_enable_all_queues (priv);stmmac_enable_all_dma_irq (priv);
Greg Kroah-Hartman
maintainerPATCH 109/311 netfilter: fib: avoid lookup if socket is available
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit eaaff9b6702e99be5d79135f2afa9fc48a0d59e0 upstream.
In case the fib match is used from the input hook we can avoid the fib lookup if early demux assigned a socket for us: check that the input interface matches sk-cached one.
Rework the existing 'lo bypass' logic to first check sk, then for loopback interface type to elide the fib lookup.
This speeds up fib matching a little, before:
93.08 GBit/s (no rules at all)
75.1 GBit/s ("fib saddr . iif oif missing drop" in prerouting) 75.62 GBit/s ("fib saddr . iif oif missing drop" in input)
After:
92.48 GBit/s (no rules at all)
75.62 GBit/s (fib rule in prerouting)
90.37 GBit/s (fib rule in input).
Numbers for the 'no rules' and 'prerouting' are expected to closely match in-between runs, the 3rd/input test case exercises the the 'avoid lookup if cached ifindex in sk matches' case.
Test used iperf3 via veth interface, lo can't be used due to existing loopback test.
--- include/net/netfilter/nft_fib.h | 21 +++++++++++++++++++++ net/ipv4/netfilter/nft_fib_ipv4.c | 11 +++++------ net/ipv6/netfilter/nft_fib_ipv6.c | 19 ++++++++++--------- 3 files changed, 36 insertions(+), 15 deletions(-)
include/net/netfilter/nft_fib.h +21 -0
@@ -18,6 +18,27 @@ nft_fib_is_loopback(const struct sk_buffreturn skb->pkt_type ==PACKET_LOOPBACK || in->flags &IFF_LOOPBACK ; } +static inline bool nft_fib_can_skip (const struct nft_pktinfo *pkt) +{ +const struct net_device *indev =nft_in (pkt); +const struct sock *sk; + +switch (nft_hook (pkt)) { +case NF_INET_PRE_ROUTING : +case NF_INET_INGRESS : +case NF_INET_LOCAL_IN : +break ; +default : +return false; + } + + sk = pkt->skb->sk; +if (sk &&sk_fullsock (sk)) +return sk->sk_rx_dst_ifindex == indev->ifindex; + +return nft_fib_is_loopback (pkt->skb, indev); +} +int nft_fib_dump (struct sk_buff *skb,const struct nft_expr *expr,bool reset);int nft_fib_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[]);
net/ipv4/netfilter/nft_fib_ipv4.c +5 -6
@@ -71,6 +71,11 @@ void nft_fib4_eval(const struct nft_exprconst struct net_device *oif;const struct net_device *found; +if (nft_fib_can_skip (pkt)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; + } +/* * Do not set flowi4_oif, it restricts results (for example, asking * for oif 3 will get RTN_UNICAST result even if the daddr exits
@@ -85,12 +90,6 @@ void nft_fib4_eval(const struct nft_exprelse oif =NULL ; -if (nft_hook (pkt) ==NF_INET_PRE_ROUTING && -nft_fib_is_loopback (pkt->skb,nft_in (pkt))) { -nft_fib_store_result (dest, priv,nft_in (pkt)); -return ; - } - iph =skb_header_pointer (pkt->skb, noff,sizeof (_iph), &_iph);if (!iph) { regs->verdict.code =NFT_BREAK ;
net/ipv6/netfilter/nft_fib_ipv6.c +10 -9
@@ -170,6 +170,11 @@ void nft_fib6_eval(const struct nft_exprstruct rt6_info *rt;int lookup_flags; +if (nft_fib_can_skip (pkt)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; + } +if (priv->flags &NFTA_FIB_F_IIF ) oif =nft_in (pkt);else if (priv->flags &NFTA_FIB_F_OIF )
@@ -181,17 +186,13 @@ void nft_fib6_eval(const struct nft_exprreturn ; } - lookup_flags =nft_fib6_flowi_init (&fl6, priv, pkt, oif, iph); - -if (nft_hook (pkt) ==NF_INET_PRE_ROUTING || -nft_hook (pkt) ==NF_INET_INGRESS ) { -if (nft_fib_is_loopback (pkt->skb,nft_in (pkt)) || -nft_fib_v6_skip_icmpv6 (pkt->skb, pkt->tprot, iph)) { -nft_fib_store_result (dest, priv,nft_in (pkt)); -return ; - } +if (nft_fib_v6_skip_icmpv6 (pkt->skb, pkt->tprot, iph)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; } + lookup_flags =nft_fib6_flowi_init (&fl6, priv, pkt, oif, iph); + *dest =0 ; rt = (void *)ip6_route_lookup (nft_net (pkt), &fl6, pkt->skb, lookup_flags);
Greg Kroah-Hartman
maintainerPATCH 110/311 virtio_console: fix missing byte order handling for cols and rows
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Halil Pasic <[email protected]>
commit fbd3039a64b01b769040677c4fc68badeca8e3b2 upstream.
As per virtio spec the fields cols and rows are specified as little endian. Although there is no legacy interface requirement that would state that cols and rows need to be handled as native endian when legacy interface is used, unlike for the fields of the adjacent struct virtio_console_control, I decided to err on the side of caution based on some non-conclusive virtio spec repo archaeology and opt for using virtio16_to_cpu() much like for virtio_console_control.event. Strictly by the letter of the spec virtio_le_to_cpu() would have been sufficient. But when the legacy interface is not used, it boils down to the same.
And when using the legacy interface, the device formatting these as little endian when the guest is big endian would surprise me more than it using guest native byte order (which would make it compatible with the current implementation). Nevertheless somebody trying to implement the spec following it to the letter could end up forcing little endian byte order when the legacy interface is in use. So IMHO this ultimately needs a judgement call by the maintainers.
Message-Id: <[email protected]>
--- drivers/char/virtio_console.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/char/virtio_console.c +4 -3
@@ -1579,8 +1579,8 @@ static void handle_control_message(strucbreak ;case VIRTIO_CONSOLE_RESIZE : {struct { -__u16 rows; -__u16 cols; +__virtio16 rows; +__virtio16 cols; } size;if (!is_console_port (port))
@@ -1588,7 +1588,8 @@ static void handle_control_message(strucmemcpy (&size, buf->buf + buf->offset +sizeof (*cpkt),sizeof (size)); -set_console_size (port, size.rows, size.cols); +set_console_size (port,virtio16_to_cpu (vdev, size.rows), +virtio16_to_cpu (vdev, size.cols)); port->cons.hvc->irq_requested =1 ;resize_console (port);
Greg Kroah-Hartman
maintainerPATCH 111/311 sched_ext: Use kvzalloc for large exit_dump allocation
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
commit 47068309b5777313b6ac84a77d8d10dc7312260a upstream.
Replace kzalloc with kvzalloc for the exit_dump buffer allocation, which can require large contiguous memory depending on the implementation. This change prevents allocation failures by allowing the system to fall back to vmalloc when contiguous memory allocation fails.
Since this buffer is only used for debugging purposes, physical memory contiguity is not required, making vmalloc a suitable alternative.
--- kernel/sched/ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/ext.c +2 -2
@@ -4944,7 +4944,7 @@ unlock:static void free_exit_info (struct scx_exit_info *ei) { -kfree (ei->dump); +kvfree (ei->dump);kfree (ei->msg);kfree (ei->bt);kfree (ei);
@@ -4960,7 +4960,7 @@ static struct scx_exit_info *alloc_exit_ ei->bt =kcalloc (SCX_EXIT_BT_LEN ,sizeof (ei->bt[0 ]),GFP_KERNEL ); ei->msg =kzalloc (SCX_EXIT_MSG_LEN ,GFP_KERNEL ); - ei->dump =kzalloc (exit_dump_len,GFP_KERNEL ); + ei->dump =kvzalloc (exit_dump_len,GFP_KERNEL );if (!ei->bt || !ei->msg || !ei->dump) {free_exit_info (ei);
Greg Kroah-Hartman
maintainerPATCH 85/311 iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 07172206a26dcf3f0bf7c3ecaadd4242b008ea54 ]
Return -EINVAL instead of success if amd_ir_set_vcpu_affinity() is invoked without use_vapic; lying to KVM about whether or not the IRTE was configured to post IRQs is all kinds of bad.
Message-ID: <[email protected]>
--- drivers/iommu/amd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd/iommu.c +1 -1
@@ -3850,7 +3850,7 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)* we should not modify the IRTE */ if (!dev_data || !dev_data->use_vapic) -return 0 ; +return -EINVAL ; ir_data->cfg =irqd_cfg (data); pi_data->ir_data = ir_data;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 112/311 crypto: atmel-sha204a - Set hwrng quality to lowest possible
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream.
According to the review by Bill Cox [1], the Atmel SHA204A random number generator produces random numbers with very low entropy.
Set the lowest possible entropy for this chip just to be safe.
[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
--- drivers/crypto/atmel-sha204a.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/crypto/atmel-sha204a.c +6 -0
@@ -163,6 +163,12 @@ static int atmel_sha204a_probe(struct i2 i2c_priv->hwrng.name =dev_name (&client->dev); i2c_priv->hwrng.read = atmel_sha204a_rng_read; +/* +* According to review by Bill Cox [1], this HWRNG has very low entropy. +* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html +*/ + i2c_priv->hwrng.quality =1 ; + ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng);if (ret)dev_warn (&client->dev,"failed to register RNG (%d)\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 113/311 xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Nepomnyashih <[email protected]>
commit cc3628dcd851ddd8d418bf0c897024b4621ddc92 upstream.
The function xdp_convert_buff_to_frame() may return NULL if it fails to correctly convert the XDP buffer into an XDP frame due to memory constraints, internal errors, or invalid data. Failing to check for NULL may lead to a NULL pointer dereference if the result is used later in processing, potentially causing crashes, data corruption, or undefined behavior.
On XDP redirect failure, the associated page must be released explicitly if it was previously retained via get_page(). Failing to do so may result in a memory leak, as the pages reference count is not decremented.
--- drivers/net/xen-netfront.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/xen-netfront.c +12 -5
@@ -985,20 +985,27 @@ static u32 xennet_run_xdp(struct netfron act =bpf_prog_run_xdp (prog, xdp);switch (act) {case XDP_TX : -get_page (pdata); xdpf =xdp_convert_buff_to_frame (xdp); +if (unlikely (!xdpf)) { +trace_xdp_exception (queue->info->netdev, prog, act); +break ; + } +get_page (pdata); err =xennet_xdp_xmit (queue->info->netdev,1 , &xdpf,0 ); -if (unlikely (!err)) +if (unlikely (err <=0 )) { +if (err <0 ) +trace_xdp_exception (queue->info->netdev, prog, act);xdp_return_frame_rx_napi (xdpf); -else if (unlikely (err <0 )) -trace_xdp_exception (queue->info->netdev, prog, act); + }break ;case XDP_REDIRECT :get_page (pdata); err =xdp_do_redirect (queue->info->netdev, xdp, prog); *need_xdp_flush = true; -if (unlikely (err)) +if (unlikely (err)) {trace_xdp_exception (queue->info->netdev, prog, act); +xdp_return_buff (xdp); + }break ;case XDP_PASS :case XDP_DROP :
Greg Kroah-Hartman
maintainerPATCH 114/311 net: selftests: initialize TCP header and skb payload with zero
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit 9e8d1013b0c38910cbc9e60de74dbe883878469d upstream.
Zero-initialize TCP header via memset() to avoid garbage values that may affect checksum or behavior during test transmission.
Also zero-fill allocated payload and padding regions using memset() after skb_put(), ensuring deterministic content for all outgoing test packets.
--- net/core/selftests.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
net/core/selftests.c +13 -5
@@ -100,10 +100,10 @@ static struct sk_buff *net_test_get_skb( ehdr->h_proto =htons (ETH_P_IP );if (attr->tcp) { +memset (thdr,0 ,sizeof (*thdr)); thdr->source =htons (attr->sport); thdr->dest =htons (attr->dport); thdr->doff =sizeof (struct tcphdr ) /4 ; - thdr->check =0 ; }else { uhdr->source =htons (attr->sport); uhdr->dest =htons (attr->dport);
@@ -144,10 +144,18 @@ static struct sk_buff *net_test_get_skb( attr->id = net_test_next_id; shdr->id = net_test_next_id++; -if (attr->size) -skb_put (skb, attr->size); -if (attr->max_size && attr->max_size > skb->len) -skb_put (skb, attr->max_size - skb->len); +if (attr->size) { +void *payload =skb_put (skb, attr->size); + +memset (payload,0 , attr->size); + } + +if (attr->max_size && attr->max_size > skb->len) { +size_t pad_len = attr->max_size - skb->len; +void *pad =skb_put (skb, pad_len); + +memset (pad,0 , pad_len); + } skb->csum =0 ; skb->ip_summed =CHECKSUM_PARTIAL ;
Greg Kroah-Hartman
maintainerPATCH 86/311 riscv: Replace function-like macro by static inline function
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Björn Töpel <[email protected]>
[ Upstream commit 121f34341d396b666d8a90b24768b40e08ca0d61 ]
The flush_icache_range() function is implemented as a "function-like macro with unused parameters", which can result in "unused variables" warnings.
Replace the macro with a static inline function, as advised by Documentation/process/coding-style.rst.
--- arch/riscv/include/asm/cacheflush.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
arch/riscv/include/asm/cacheflush.h +10 -5
@@ -34,11 +34,6 @@ static inline void flush_dcache_page(struct page *page)flush_dcache_folio (page_folio (page)); } -/* -* RISC-V doesn't have an instruction to flush parts of the instruction cache, -* so instead we just flush the whole thing. -*/ -#define flush_icache_range (start, end) flush_icache_all()#define flush_icache_user_page (vma, pg, addr, len) \ do { \ if (vma->vm_flags & VM_EXEC) \
@@ -78,6 +73,16 @@ void flush_icache_mm(struct mm_struct *mm, bool local);#endif /* CONFIG_SMP */ +/* +* RISC-V doesn't have an instruction to flush parts of the instruction cache, +* so instead we just flush the whole thing. +*/ +#define flush_icache_range flush_icache_range +static inline void flush_icache_range (unsigned long start,unsigned long end) +{ +flush_icache_all (); +} +extern unsigned int riscv_cbom_block_size;extern unsigned int riscv_cboz_block_size;void riscv_init_cbo_blocksizes (void );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 87/311 riscv: uprobes: Add missing fence.i after building the XOL buffer
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Björn Töpel <[email protected]>
[ Upstream commit 7d1d19a11cfbfd8bae1d89cc010b2cc397cd0c48 ]
The XOL (execute out-of-line) buffer is used to single-step the replaced instruction(s) for uprobes. The RISC-V port was missing a proper fence.i (i$ flushing) after constructing the XOL buffer, which can result in incorrect execution of stale/broken instructions.
This was found running the BPF selftests "test_progs:uprobe_autoattach, attach_probe" on the Spacemit K1/X60, where the uprobes tests randomly blew up.
--- arch/riscv/kernel/probes/uprobes.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
arch/riscv/kernel/probes/uprobes.c +2 -8
@@ -167,6 +167,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,/* Initialize the slot */ void *kaddr =kmap_atomic (page);void *dst = kaddr + (vaddr & ~PAGE_MASK ); +unsigned long start = (unsigned long )dst;memcpy (dst, src, len);
@@ -176,13 +177,6 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, *(uprobe_opcode_t *)dst = __BUG_INSN_32; } +flush_icache_range (start, start + len);kunmap_atomic (kaddr); - -/* -* We probably need flush_icache_user_page() but it needs vma. -* This should work on most of architectures by default. If -* architecture needs to do something different it can define -* its own version of the function. -*/ -flush_dcache_page (page); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 88/311 ublk: remove io_cmds list in ublk_queue
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uday Shankar <[email protected]>
[ Upstream commit 989bcd623a8b0c32b76d9258767d8b37e53419e6 ]
The current I/O dispatch mechanism - queueing I/O by adding it to the io_cmds list (and poking task_work as needed), then dispatching it in ublk server task context by reversing io_cmds and completing the io_uring command associated to each one - was introduced by commit 7d4a93176e014 ("ublk_drv: don't forward io commands in reserve order") to ensure that the ublk server received I/O in the same order that the block layer submitted it to ublk_drv. This mechanism was only needed for the "raw" task_work submission mechanism, since the io_uring task work wrapper maintains FIFO ordering (using quite a similar mechanism in fact). The "raw" task_work submission mechanism is no longer supported in ublk_drv as of commit 29dc5d06613f2 ("ublk: kill queuing request by task_work_add"), so the explicit llist/reversal is no longer needed - it just duplicates logic already present in the underlying io_uring APIs. Remove it.
Stable-dep-of: d6aa0c178bf8 ("ublk: call ublk_dispatch_req() for handling UBLK_U_IO_NEED_GET_DATA")
--- drivers/block/ublk_drv.c | 46 ++++++++++------------------------------ 1 file changed, 11 insertions(+), 35 deletions(-)
drivers/block/ublk_drv.c +11 -35
@@ -73,8 +73,6 @@ UBLK_PARAM_TYPE_DEVT | UBLK_PARAM_TYPE_ZONED)struct ublk_rq_data { -struct llist_node node; -struct kref ref; };
@@ -141,8 +139,6 @@ struct ublk_queue {struct task_struct *ubq_daemon;char *io_cmd_buf; -struct llist_head io_cmds; -unsigned long io_addr;/* mapped vm address */ unsigned int max_io_sz;bool force_abort;
@@ -1114,7 +1110,7 @@ static void ublk_fail_rq_fn(struct kref *ref) }/* -* Since __ublk_rq_task_work always fails requests immediately during +* Since ublk_rq_task_work_cb always fails requests immediately during * exiting, __ublk_fail_req() is only called from abort context during * exiting. So lock is unnecessary. *
@@ -1163,11 +1159,14 @@ static inline void __ublk_abort_rq(struct ublk_queue *ubq,blk_mq_end_request (rq,BLK_STS_IOERR ); } -static inline void __ublk_rq_task_work (struct request *req, -unsigned issue_flags) +static void ublk_rq_task_work_cb (struct io_uring_cmd *cmd, +unsigned int issue_flags) { -struct ublk_queue *ubq = req->mq_hctx->driver_data; -int tag = req->tag; +struct ublk_uring_cmd_pdu *pdu =ublk_get_uring_cmd_pdu (cmd); +struct ublk_queue *ubq = pdu->ubq; +int tag = pdu->tag; +struct request *req =blk_mq_tag_to_rq ( + ubq->dev->tag_set.tags[ubq->q_id], tag);struct ublk_io *io = &ubq->ios[tag];unsigned int mapped_bytes;
@@ -1242,34 +1241,11 @@ static inline void __ublk_rq_task_work(struct request *req,ubq_complete_io_cmd (io,UBLK_IO_RES_OK , issue_flags); } -static inline void ublk_forward_io_cmds (struct ublk_queue *ubq, -unsigned issue_flags) -{ -struct llist_node *io_cmds =llist_del_all (&ubq->io_cmds); -struct ublk_rq_data *data, *tmp; - - io_cmds =llist_reverse_order (io_cmds); -llist_for_each_entry_safe (data, tmp, io_cmds, node) -__ublk_rq_task_work (blk_mq_rq_from_pdu (data), issue_flags); -} - -static void ublk_rq_task_work_cb (struct io_uring_cmd *cmd,unsigned issue_flags) -{ -struct ublk_uring_cmd_pdu *pdu =ublk_get_uring_cmd_pdu (cmd); -struct ublk_queue *ubq = pdu->ubq; - -ublk_forward_io_cmds (ubq, issue_flags); -} -static void ublk_queue_cmd (struct ublk_queue *ubq,struct request *rq) { -struct ublk_rq_data *data =blk_mq_rq_to_pdu (rq); +struct ublk_io *io = &ubq->ios[rq->tag]; -if (llist_add (&data->node, &ubq->io_cmds)) { -struct ublk_io *io = &ubq->ios[rq->tag]; - -io_uring_cmd_complete_in_task (io->cmd, ublk_rq_task_work_cb); - } +io_uring_cmd_complete_in_task (io->cmd, ublk_rq_task_work_cb); }static enum blk_eh_timer_return ublk_timeout (struct request *rq)
@@ -1462,7 +1438,7 @@ static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq)struct request *rq;/* -* Either we fail the request or ublk_rq_task_work_fn +* Either we fail the request or ublk_rq_task_work_cb * will do it */ rq =blk_mq_tag_to_rq (ub->tag_set.tags[ubq->q_id], i);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 89/311 ublk: comment on ubq->canceling handling in ublk_queue_rq()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit 7e2fe01a69f6be3e284b38cfd2e4e0598a3b0a8f ]
In ublk_queue_rq(), ubq->canceling has to be handled after ->fail_io and ->force_abort are dealt with, otherwise the request may not be failed when deleting disk.
Add comment on this usage.
Stable-dep-of: d6aa0c178bf8 ("ublk: call ublk_dispatch_req() for handling UBLK_U_IO_NEED_GET_DATA")
--- drivers/block/ublk_drv.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/ublk_drv.c +5 -0
@@ -1314,6 +1314,11 @@ static blk_status_t ublk_queue_rq(struct blk_mq_hw_ctx *hctx,if (ublk_nosrv_should_queue_io (ubq) &&unlikely (ubq->force_abort))return BLK_STS_IOERR ; +/* +* ->canceling has to be handled after ->force_abort and ->fail_io +* is dealt with, otherwise this request may not be failed in case +* of recovery, and cause hang when deleting disk +*/ if (unlikely (ubq->canceling)) {__ublk_abort_rq (ubq, rq);return BLK_STS_OK ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 90/311 ublk: implement ->queue_rqs()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit d796cea7b9f33b6315362f504b15fcc26d678493 ]
Implement ->queue_rqs() for improving perf in case of MQ.
In this way, we just need to call io_uring_cmd_complete_in_task() once for whole IO batch, then both io_uring and ublk server can get exact batch from ublk frontend.
Follows IOPS improvement:
- tests
tools/testing/selftests/ublk/kublk add -t null -q 2 [-z] fio/t/io_uring -p0 /dev/ublkb0
- results:
more than 10% IOPS boost observed
Pass all ublk selftests, especially the io dispatch order test.
Stable-dep-of: d6aa0c178bf8 ("ublk: call ublk_dispatch_req() for handling UBLK_U_IO_NEED_GET_DATA")
--- drivers/block/ublk_drv.c | 131 +++++++++++++++++++++++++++++++++------ 1 file changed, 111 insertions(+), 20 deletions(-)
drivers/block/ublk_drv.c +111 -20
@@ -77,6 +77,20 @@ struct ublk_rq_data { };struct ublk_uring_cmd_pdu { +/* +* Store requests in same batch temporarily for queuing them to +* daemon context. +* +* It should have been stored to request payload, but we do want +* to avoid extra pre-allocation, and uring_cmd payload is always +* free for us +*/ +struct request *req_list; + +/* +* The following two are valid in this cmd whole lifetime, and +* setup in ublk uring_cmd handler +*/ struct ublk_queue *ubq;u16 tag; };
@@ -1159,14 +1173,12 @@ static inline void __ublk_abort_rq(struct ublk_queue *ubq,blk_mq_end_request (rq,BLK_STS_IOERR ); } -static void ublk_rq_task_work_cb (struct io_uring_cmd *cmd, -unsigned int issue_flags) +static void ublk_dispatch_req (struct ublk_queue *ubq, +struct io_uring_cmd *cmd, +struct request *req, +unsigned int issue_flags) { -struct ublk_uring_cmd_pdu *pdu =ublk_get_uring_cmd_pdu (cmd); -struct ublk_queue *ubq = pdu->ubq; -int tag = pdu->tag; -struct request *req =blk_mq_tag_to_rq ( - ubq->dev->tag_set.tags[ubq->q_id], tag); +int tag = req->tag;struct ublk_io *io = &ubq->ios[tag];unsigned int mapped_bytes;
@@ -1241,6 +1253,18 @@ static void ublk_rq_task_work_cb(struct io_uring_cmd *cmd,ubq_complete_io_cmd (io,UBLK_IO_RES_OK , issue_flags); } +static void ublk_rq_task_work_cb (struct io_uring_cmd *cmd, +unsigned int issue_flags) +{ +struct ublk_uring_cmd_pdu *pdu =ublk_get_uring_cmd_pdu (cmd); +struct ublk_queue *ubq = pdu->ubq; +int tag = pdu->tag; +struct request *req =blk_mq_tag_to_rq ( + ubq->dev->tag_set.tags[ubq->q_id], tag); + +ublk_dispatch_req (ubq, cmd, req, issue_flags); +} +static void ublk_queue_cmd (struct ublk_queue *ubq,struct request *rq) {struct ublk_io *io = &ubq->ios[rq->tag];
@@ -1248,6 +1272,35 @@ static void ublk_queue_cmd(struct ublk_queue *ubq, struct request *rq)io_uring_cmd_complete_in_task (io->cmd, ublk_rq_task_work_cb); } +static void ublk_cmd_list_tw_cb (struct io_uring_cmd *cmd, +unsigned int issue_flags) +{ +struct ublk_uring_cmd_pdu *pdu =ublk_get_uring_cmd_pdu (cmd); +struct request *rq = pdu->req_list; +struct ublk_queue *ubq = rq->mq_hctx->driver_data; +struct request *next; + +while (rq) { +struct ublk_io *io = &ubq->ios[rq->tag]; + + next = rq->rq_next; + rq->rq_next =NULL ; +ublk_dispatch_req (ubq, io->cmd, rq, issue_flags); + rq = next; + } +} + +static void ublk_queue_cmd_list (struct ublk_queue *ubq,struct rq_list *l) +{ +struct request *rq =rq_list_peek (l); +struct ublk_io *io = &ubq->ios[rq->tag]; +struct ublk_uring_cmd_pdu *pdu =ublk_get_uring_cmd_pdu (io->cmd); + + pdu->req_list = rq; +rq_list_init (l); +io_uring_cmd_complete_in_task (io->cmd, ublk_cmd_list_tw_cb); +} +static enum blk_eh_timer_return ublk_timeout (struct request *rq) {struct ublk_queue *ubq = rq->mq_hctx->driver_data;
@@ -1286,21 +1339,12 @@ static enum blk_eh_timer_return ublk_timeout(struct request *rq)return BLK_EH_RESET_TIMER ; } -static blk_status_t ublk_queue_rq (struct blk_mq_hw_ctx *hctx, -const struct blk_mq_queue_data *bd) +static blk_status_t ublk_prep_req (struct ublk_queue *ubq,struct request *rq) { -struct ublk_queue *ubq = hctx->driver_data; -struct request *rq = bd->rq;blk_status_t res; -if (unlikely (ubq->fail_io)) { +if (unlikely (ubq->fail_io))return BLK_STS_TARGET ; - } - -/* fill iod to slot in io cmd buffer */ - res =ublk_setup_iod (ubq, rq); -if (unlikely (res !=BLK_STS_OK )) -return BLK_STS_IOERR ;/* With recovery feature enabled, force_abort is set in * ublk_stop_dev() before calling del_gendisk(). We have to
@@ -1314,6 +1358,29 @@ static blk_status_t ublk_queue_rq(struct blk_mq_hw_ctx *hctx,if (ublk_nosrv_should_queue_io (ubq) &&unlikely (ubq->force_abort))return BLK_STS_IOERR ; +if (unlikely (ubq->canceling)) +return BLK_STS_IOERR ; + +/* fill iod to slot in io cmd buffer */ + res =ublk_setup_iod (ubq, rq); +if (unlikely (res !=BLK_STS_OK )) +return BLK_STS_IOERR ; + +blk_mq_start_request (rq); +return BLK_STS_OK ; +} + +static blk_status_t ublk_queue_rq (struct blk_mq_hw_ctx *hctx, +const struct blk_mq_queue_data *bd) +{ +struct ublk_queue *ubq = hctx->driver_data; +struct request *rq = bd->rq; +blk_status_t res; + + res =ublk_prep_req (ubq, rq); +if (res !=BLK_STS_OK ) +return res; +/* * ->canceling has to be handled after ->force_abort and ->fail_io * is dealt with, otherwise this request may not be failed in case
@@ -1324,12 +1391,35 @@ static blk_status_t ublk_queue_rq(struct blk_mq_hw_ctx *hctx,return BLK_STS_OK ; } -blk_mq_start_request (bd->rq);ublk_queue_cmd (ubq, rq); -return BLK_STS_OK ; } +static void ublk_queue_rqs (struct rq_list *rqlist) +{ +struct rq_list requeue_list = { }; +struct rq_list submit_list = { }; +struct ublk_queue *ubq =NULL ; +struct request *req; + +while ((req =rq_list_pop (rqlist))) { +struct ublk_queue *this_q = req->mq_hctx->driver_data; + +if (ubq && ubq != this_q && !rq_list_empty (&submit_list)) +ublk_queue_cmd_list (ubq, &submit_list); + ubq = this_q; + +if (ublk_prep_req (ubq, req) ==BLK_STS_OK ) +rq_list_add_tail (&submit_list, req); +else +rq_list_add_tail (&requeue_list, req); + } + +if (ubq && !rq_list_empty (&submit_list)) +ublk_queue_cmd_list (ubq, &submit_list); + *rqlist = requeue_list; +} +static int ublk_init_hctx (struct blk_mq_hw_ctx *hctx,void *driver_data,unsigned int hctx_idx) {
@@ -1342,6 +1432,7 @@ static int ublk_init_hctx(struct blk_mq_hw_ctx *hctx, void *driver_data,static const struct blk_mq_ops ublk_mq_ops = { .queue_rq = ublk_queue_rq, + .queue_rqs = ublk_queue_rqs, .init_hctx = ublk_init_hctx, .timeout = ublk_timeout, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 91/311 ublk: remove unused cmd argument to ublk_dispatch_req()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Caleb Sander Mateos <[email protected]>
[ Upstream commit dfbce8b798fb848a42706e2e544b78b3db22aaae ]
ublk_dispatch_req() never uses its struct io_uring_cmd *cmd argument. Drop it so callers don't have to pass a value.
Stable-dep-of: d6aa0c178bf8 ("ublk: call ublk_dispatch_req() for handling UBLK_U_IO_NEED_GET_DATA")
--- drivers/block/ublk_drv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/block/ublk_drv.c +2 -5
@@ -1174,7 +1174,6 @@ static inline void __ublk_abort_rq(struct ublk_queue *ubq, }static void ublk_dispatch_req (struct ublk_queue *ubq, -struct io_uring_cmd *cmd,struct request *req,unsigned int issue_flags) {
@@ -1262,7 +1261,7 @@ static void ublk_rq_task_work_cb(struct io_uring_cmd *cmd,struct request *req =blk_mq_tag_to_rq ( ubq->dev->tag_set.tags[ubq->q_id], tag); -ublk_dispatch_req (ubq, cmd, req, issue_flags); +ublk_dispatch_req (ubq, req, issue_flags); }static void ublk_queue_cmd (struct ublk_queue *ubq,struct request *rq)
@@ -1281,11 +1280,9 @@ static void ublk_cmd_list_tw_cb(struct io_uring_cmd *cmd,struct request *next;while (rq) { -struct ublk_io *io = &ubq->ios[rq->tag]; - next = rq->rq_next; rq->rq_next =NULL ; -ublk_dispatch_req (ubq, io->cmd, rq, issue_flags); +ublk_dispatch_req (ubq, rq, issue_flags); rq = next; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 82/311 block: move blkdev_{get,put} _no_open prototypes out of blkdev.h
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit c63202140d4b411d27380805c4d68eb11407b7f2 ]
These are only to be used by block internal code. Remove the comment as we grew more users due to reworking block device node opening.
Stable-dep-of: 5f33b5226c9d ("block: don't autoload drivers on stat")
--- block/blk.h | 3 +++ include/linux/blkdev.h | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-)
block/blk.h +3 -0
@@ -94,6 +94,9 @@ static inline void blk_wait_io(struct completion *done)wait_for_completion_io (done); } +struct block_device *blkdev_get_no_open (dev_t dev); +void blkdev_put_no_open (struct block_device *bdev); +#define BIO_INLINE_VECS 4struct bio_vec *bvec_alloc (mempool_t *pool,unsigned short *nr_vecs,gfp_t gfp_mask);
include/linux/blkdev.h +0 -4
@@ -1649,10 +1649,6 @@ int bd_prepare_to_claim(struct block_device *bdev, void *holder, const struct blk_holder_ops *hops);void bd_abort_claiming (struct block_device *bdev,void *holder); -/* just for blk-cgroup, don't use elsewhere */ -struct block_device *blkdev_get_no_open (dev_t dev); -void blkdev_put_no_open (struct block_device *bdev); -struct block_device *I_BDEV (struct inode *inode);struct block_device *file_bdev (struct file *bdev_file);bool disk_live (struct gendisk *disk);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 116/311 mptcp: pm: Defer freeing of MPTCP userspace path manager entries
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mat Martineau <[email protected]>
commit 13b4ece33cf9def67966bb8716783c42cec20617 upstream.
When path manager entries are deleted from the local address list, they are first unlinked from the address list using list_del_rcu(). The entries must not be freed until after the RCU grace period, but the existing code immediately frees the entry.
Use kfree_rcu_mightsleep() and adjust sk_omem_alloc in open code instead of using the sock_kfree_s() helper. This code path is only called in a netlink handler, so the "might sleep" function is preferable to adding a rarely-used rcu_head member to struct mptcp_pm_addr_entry.
--- net/mptcp/pm_userspace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/mptcp/pm_userspace.c +5 -1
@@ -352,7 +352,11 @@ int mptcp_pm_nl_remove_doit(struct sk_burelease_sock (sk); -sock_kfree_s (sk, match,sizeof (*match)); +kfree_rcu_mightsleep (match); +/* Adjust sk_omem_alloc like sock_kfree_s() does, to match +* with allocation of this memory by sock_kmemdup() +*/ +atomic_sub (sizeof (*match), &sk->sk_omem_alloc); err =0 ; out:
Greg Kroah-Hartman
maintainerPATCH 125/311 selftests/pcie_bwctrl: Fix test progs list
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilpo Järvinen <[email protected]>
commit 39e703ed3b48c4262be141072d4f42a8b89a10cc upstream.
Commit df6f8c4d72ae ("selftests/pcie_bwctrl: Add 'set_pcie_speed.sh' to TEST_PROGS") added set_pcie_speed.sh into TEST_PROGS but that script is a helper that is only being called by set_pcie_cooling_state.sh, not a test case itself. When set_pcie_speed.sh is in TEST_PROGS, selftest harness will execute also it leading to bwctrl selftest errors:
# selftests: pcie_bwctrl: set_pcie_speed.sh
# cat: /cur_state: No such file or directory
not ok 2 selftests: pcie_bwctrl: set_pcie_speed.sh # exit=1
Place set_pcie_speed.sh into TEST_FILES instead to have it included into installed test files but not execute it from the test harness.
--- tools/testing/selftests/pcie_bwctrl/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/pcie_bwctrl/Makefile +2 -1
@@ -1,2 +1,3 @@ -TEST_PROGS = set_pcie_cooling_state.sh set_pcie_speed.sh +TEST_PROGS = set_pcie_cooling_state.sh +TEST_FILES = set_pcie_speed.sh include ../lib.mk
Greg Kroah-Hartman
maintainerPATCH 126/311 irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suzuki K Poulose <[email protected]>
commit 3318dc299b072a0511d6dfd8367f3304fb6d9827 upstream.
With ACPI in place, gicv2m_get_fwnode() is registered with the pci subsystem as pci_msi_get_fwnode_cb(), which may get invoked at runtime during a PCI host bridge probe. But, the call back is wrongly marked as __init, causing it to be freed, while being registered with the PCI subsystem and could trigger:
Unable to handle kernel paging request at virtual address ffff8000816c0400 gicv2m_get_fwnode+0x0/0x58 (P) pci_set_bus_msi_domain+0x74/0x88 pci_register_host_bridge+0x194/0x548
This is easily reproducible on a Juno board with ACPI boot.
Retain the function for later use.
--- drivers/irqchip/irq-gic-v2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v2m.c +1 -1
@@ -423,7 +423,7 @@ static int __init gicv2m_of_init(struct#ifdef CONFIG_ACPI static int acpi_num_msi; -static __init struct fwnode_handle *gicv2m_get_fwnode (struct device *dev) +static struct fwnode_handle *gicv2m_get_fwnode (struct device *dev) {struct v2m_data *data;
Greg Kroah-Hartman
maintainerPATCH 127/311 binder: fix offset calculation in debug log
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Carlos Llamas <[email protected]>
commit 170d1a3738908eef6a0dbf378ea77fb4ae8e294d upstream.
The vma start address should be substracted from the buffer's user data address and not the other way around.
--- drivers/android/binder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/android/binder.c +1 -1
@@ -6373,7 +6373,7 @@ static void print_binder_transaction_iloseq_printf (m," node %d" , buffer->target_node->debug_id);seq_printf (m," size %zd:%zd offset %lx\n" , buffer->data_size, buffer->offsets_size, - proc->alloc.vm_start - buffer->user_data); + buffer->user_data - proc->alloc.vm_start); } static void print_binder_work_ilocked(struct seq_file *m,
Greg Kroah-Hartman
maintainerPATCH 128/311 LoongArch: Handle fp, lsx, lasx and lbt assembly symbols
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
commit 2ef174b13344b3b4554d3d28e6f9e2a2c1d3138f upstream.
Like the other relevant symbols, export some fp, lsx, lasx and lbt assembly symbols and put the function declarations in header files rather than source files.
While at it, use "asmlinkage" for the other existing C prototypes of assembly functions and also do not use the "extern" keyword with function declarations according to the document coding-style.rst.
--- arch/loongarch/include/asm/fpu.h | 37 ++++++++++++++++++++++--------------- arch/loongarch/include/asm/lbt.h | 10 +++++++--- arch/loongarch/kernel/fpu.S | 6 ++++++ arch/loongarch/kernel/lbt.S | 4 ++++ arch/loongarch/kernel/signal.c | 21 --------------------- 5 files changed, 39 insertions(+), 39 deletions(-)
arch/loongarch/include/asm/fpu.h +22 -15
@@ -22,22 +22,29 @@struct sigcontext ;#define kernel_fpu_available () cpu_has_fpu -extern void kernel_fpu_begin (void ); -extern void kernel_fpu_end (void ); -extern void _init_fpu (unsigned int ); -extern void _save_fp (struct loongarch_fpu *); -extern void _restore_fp (struct loongarch_fpu *); - -extern void _save_lsx (struct loongarch_fpu *fpu); -extern void _restore_lsx (struct loongarch_fpu *fpu); -extern void _init_lsx_upper (void ); -extern void _restore_lsx_upper (struct loongarch_fpu *fpu); - -extern void _save_lasx (struct loongarch_fpu *fpu); -extern void _restore_lasx (struct loongarch_fpu *fpu); -extern void _init_lasx_upper (void ); -extern void _restore_lasx_upper (struct loongarch_fpu *fpu); +void kernel_fpu_begin (void ); +void kernel_fpu_end (void ); + +asmlinkage void _init_fpu(unsigned int); +asmlinkage void _save_fp(struct loongarch_fpu *); +asmlinkage void _restore_fp(struct loongarch_fpu *); +asmlinkage int _save_fp_context(void __user *fpregs, void __user *fcc, void __user *csr); +asmlinkage int _restore_fp_context(void __user *fpregs, void __user *fcc, void __user *csr); + +asmlinkage void _save_lsx(struct loongarch_fpu *fpu); +asmlinkage void _restore_lsx(struct loongarch_fpu *fpu); +asmlinkage void _init_lsx_upper(void); +asmlinkage void _restore_lsx_upper(struct loongarch_fpu *fpu); +asmlinkage int _save_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr); +asmlinkage int _restore_lsx_context(void __user *fpregs, void __user *fcc, void __user *fcsr); + +asmlinkage void _save_lasx(struct loongarch_fpu *fpu); +asmlinkage void _restore_lasx(struct loongarch_fpu *fpu); +asmlinkage void _init_lasx_upper(void); +asmlinkage void _restore_lasx_upper(struct loongarch_fpu *fpu); +asmlinkage int _save_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr); +asmlinkage int _restore_lasx_context(void __user *fpregs, void __user *fcc, void __user *fcsr);static inline void enable_lsx (void );static inline void disable_lsx (void );
arch/loongarch/include/asm/lbt.h +7 -3
@@ -12,9 +12,13 @@#include <asm/loongarch.h> #include <asm/processor.h> -extern void _init_lbt (void ); -extern void _save_lbt (struct loongarch_lbt *); -extern void _restore_lbt (struct loongarch_lbt *); +asmlinkage void _init_lbt(void); +asmlinkage void _save_lbt(struct loongarch_lbt *); +asmlinkage void _restore_lbt(struct loongarch_lbt *); +asmlinkage int _save_lbt_context(void __user *regs, void __user *eflags); +asmlinkage int _restore_lbt_context(void __user *regs, void __user *eflags); +asmlinkage int _save_ftop_context(void __user *ftop); +asmlinkage int _restore_ftop_context(void __user *ftop);static inline int is_lbt_enabled (void ) {
arch/loongarch/kernel/fpu.S +6 -0
@@ -458,6 +458,7 @@ SYM_FUNC_START(_save_fp_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_fp_context) +EXPORT_SYMBOL_GPL(_save_fp_context) /* * a0: fpregs
@@ -471,6 +472,7 @@ SYM_FUNC_START(_restore_fp_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_fp_context) +EXPORT_SYMBOL_GPL(_restore_fp_context) /* * a0: fpregs
@@ -484,6 +486,7 @@ SYM_FUNC_START(_save_lsx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_lsx_context) +EXPORT_SYMBOL_GPL(_save_lsx_context) /* * a0: fpregs
@@ -497,6 +500,7 @@ SYM_FUNC_START(_restore_lsx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_lsx_context) +EXPORT_SYMBOL_GPL(_restore_lsx_context) /* * a0: fpregs
@@ -510,6 +514,7 @@ SYM_FUNC_START(_save_lasx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_lasx_context) +EXPORT_SYMBOL_GPL(_save_lasx_context) /* * a0: fpregs
@@ -523,6 +528,7 @@ SYM_FUNC_START(_restore_lasx_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_lasx_context) +EXPORT_SYMBOL_GPL(_restore_lasx_context) .L_fpu_fault: li.w a0, -EFAULT # failure
arch/loongarch/kernel/lbt.S +4 -0
@@ -90,6 +90,7 @@ SYM_FUNC_START(_save_lbt_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_lbt_context) +EXPORT_SYMBOL_GPL(_save_lbt_context) /* * a0: scr
@@ -110,6 +111,7 @@ SYM_FUNC_START(_restore_lbt_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_lbt_context) +EXPORT_SYMBOL_GPL(_restore_lbt_context) /* * a0: ftop
@@ -120,6 +122,7 @@ SYM_FUNC_START(_save_ftop_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_save_ftop_context) +EXPORT_SYMBOL_GPL(_save_ftop_context) /* * a0: ftop
@@ -150,6 +153,7 @@ SYM_FUNC_START(_restore_ftop_context) li.w a0, 0 # success jr ra SYM_FUNC_END(_restore_ftop_context) +EXPORT_SYMBOL_GPL(_restore_ftop_context) .L_lbt_fault: li.w a0, -EFAULT # failure
arch/loongarch/kernel/signal.c +0 -21
@@ -51,27 +51,6 @@#define lock_lbt_owner () ({ preempt_disable(); pagefault_disable(); })#define unlock_lbt_owner () ({ pagefault_enable(); preempt_enable(); }) -/* Assembly functions to move context to/from the FPU */ -extern asmlinkage int -_save_fp_context (void __user *fpregs,void __user *fcc,void __user *csr); -extern asmlinkage int -_restore_fp_context (void __user *fpregs,void __user *fcc,void __user *csr); -extern asmlinkage int -_save_lsx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); -extern asmlinkage int -_restore_lsx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); -extern asmlinkage int -_save_lasx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); -extern asmlinkage int -_restore_lasx_context (void __user *fpregs,void __user *fcc,void __user *fcsr); - -#ifdef CONFIG_CPU_HAS_LBT -extern asmlinkage int _save_lbt_context(void __user *regs, void __user *eflags); -extern asmlinkage int _restore_lbt_context(void __user *regs, void __user *eflags); -extern asmlinkage int _save_ftop_context(void __user *ftop); -extern asmlinkage int _restore_ftop_context(void __user *ftop); -#endif -struct rt_sigframe {struct siginfo rs_info;struct ucontext rs_uctx;
Greg Kroah-Hartman
maintainerPATCH 129/311 LoongArch: Return NULL from huge_pte_offset() for invalid PMD
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Wang <[email protected]>
commit bd51834d1cf65a2c801295d230c220aeebf87a73 upstream.
LoongArch's huge_pte_offset() currently returns a pointer to a PMD slot even if the underlying entry points to invalid_pte_table (indicating no mapping). Callers like smaps_hugetlb_range() fetch this invalid entry value (the address of invalid_pte_table) via this pointer.
The generic is_swap_pte() check then incorrectly identifies this address as a swap entry on LoongArch, because it satisfies the "!pte_present() && !pte_none()" conditions. This misinterpretation, combined with a coincidental match by is_migration_entry() on the address bits, leads to kernel crashes in pfn_swap_entry_to_page().
Fix this at the architecture level by modifying huge_pte_offset() to check the PMD entry's content using pmd_none() before returning. If the entry is invalid (i.e., it points to invalid_pte_table), return NULL instead of the pointer to the slot.
--- arch/loongarch/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/loongarch/mm/hugetlbpage.c +1 -1
@@ -47,7 +47,7 @@ pte_t *huge_pte_offset(struct mm_struct pmd =pmd_offset (pud, addr); } } -return (pte_t *) pmd; +return pmd_none (pmdp_get (pmd)) ?NULL : (pte_t *) pmd; }uint64_t pmd_to_entrylo (unsigned long pmd_val)
Greg Kroah-Hartman
maintainerPATCH 130/311 LoongArch: Remove a bogus reference to ZONE_DMA
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Tesarik <[email protected]>
commit c37325cbd91abe3bfab280b3b09947155abe8e07 upstream.
Remove dead code. LoongArch does not have a DMA memory zone (24bit DMA). The architecture does not even define MAX_DMA_PFN.
--- arch/loongarch/mm/init.c | 3 --- 1 file changed, 3 deletions(-)
arch/loongarch/mm/init.c +0 -3
@@ -65,9 +65,6 @@ void __init paging_init(void) {unsigned long max_zone_pfns[MAX_NR_ZONES ]; -#ifdef CONFIG_ZONE_DMA - max_zone_pfns[ZONE_DMA ] =MAX_DMA_PFN ; -#endif #ifdef CONFIG_ZONE_DMA32 max_zone_pfns[ZONE_DMA32 ] =MAX_DMA32_PFN ;#endif