6.1.93-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 6.1.93-rc1 review
This is the start of the stable review cycle for the 6.1.93 release. There are 473 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 08 Jun 2024 13:15:55 +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.1.93-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.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.1.93-rc1
Takashi Iwai <[email protected]>
ALSA: timer: Set lower bound of start tick time
Sergey Matyukevich <[email protected]>
riscv: prevent pt_regs corruption for secondary idle threads
Guenter Roeck <[email protected]>
hwmon: (shtc1) Fix property misspelling
Michael Ellerman <[email protected]>
powerpc/uaccess: Use YZ asm constraint for ld
Nathan Lynch <[email protected]>
powerpc/pseries/lparcfg: drop error message from guest name lookup
Yue Haibing <[email protected]>
ipvlan: Dont Use skb->sk in ipvlan_process_v{4,6}_outboundShay Agroskin <[email protected]>
net: ena: Fix redundant device NUMA node override
David Arinzon <[email protected]>
net: ena: Reduce lines with longer column width boundary
David Arinzon <[email protected]>
net: ena: Add dynamic recycling mechanism for rx buffers
Tristram Ha <[email protected]>
net: dsa: microchip: fix RGMII error in KSZ DSA driver
Uwe Kleine-König <[email protected]>
spi: stm32: Don't warn about spurious interrupts
Arnd Bergmann <[email protected]>
drm/i915/guc: avoid FIELD_PREP warning
Masahiro Yamada <[email protected]>
kconfig: fix comparison to constant symbols, 'm', 'n'
Eric Garver <[email protected]>
netfilter: nft_fib: allow from forward/input without iif selector
Florian Westphal <[email protected]>
netfilter: tproxy: bail out if IP has been disabled on the device
Pablo Neira Ayuso <[email protected]>
netfilter: nft_payload: skbuff vlan metadata mangle support
Florian Westphal <[email protected]>
netfilter: nft_payload: rebuild vlan header on h_proto access
Pablo Neira Ayuso <[email protected]>
netfilter: nft_payload: rebuild vlan header when needed
Pablo Neira Ayuso <[email protected]>
netfilter: nft_payload: move struct nft_payload_set definition where it belongs
Jacob Keller <[email protected]>
ice: fix accounting if a VLAN already exists
Xiaolei Wang <[email protected]>
net:fec: Add fec_enet_deinit()
Jakub Sitnicki <[email protected]>
bpf: Allow delete from sockmap/sockhash only if update is allowed
Parthiban Veerasooran <[email protected]>
net: usb: smsc95xx: fix changing LED_SEL bit value updated from EEPROM
Kuniyuki Iwashima <[email protected]>
af_unix: Read sk->sk_hash under bindlock during bind().
Roded Zats <[email protected]>
enic: Validate length of nl attributes in enic_set_vf_port
Luke D. Jones <[email protected]>
ALSA: hda/realtek: Adjust G814JZR to use SPI init for amp
Luke D. Jones <[email protected]>
ALSA: hda/realtek: Amend G634 quirk to enable rear speakers
Luke D. Jones <[email protected]>
ALSA: hda/realtek: Add quirk for ASUS ROG G634Z
Takashi Iwai <[email protected]>
ALSA: core: Remove debugfs at disconnection
Takashi Iwai <[email protected]>
ALSA: jack: Use guard() for locking
Friedrich Vock <[email protected]>
bpf: Fix potential integer overflow in resolve_btfids
Tetsuo Handa <[email protected]>
dma-buf/sw-sync: don't enable IRQ from sync_print_obj()
Gal Pressman <[email protected]>
net/mlx5e: Fix UDP GSO for encapsulated packets
Carolina Jubran <[email protected]>
net/mlx5e: Use rx_missed_errors instead of rx_dropped for reporting buffer exhaustion
Rahul Rameshbabu <[email protected]>
net/mlx5e: Fix IPsec tunnel mode offload feature check
Maher Sanalla <[email protected]>
net/mlx5: Lag, do bond only if slaves agree on roce state
Mathieu Othacehe <[email protected]>
net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8061
Sagi Grimberg <[email protected]>
nvmet: fix ns enable/disable possible hang
Fedor Pchelkin <[email protected]>
dma-mapping: benchmark: handle NUMA_NO_NODE correctly
Fedor Pchelkin <[email protected]>
dma-mapping: benchmark: fix node id validation
Andy Shevchenko <[email protected]>
spi: Don't mark message DMA mapped when no transfer in it is
Pablo Neira Ayuso <[email protected]>
netfilter: nft_payload: restore vlan q-in-q match support
Eric Dumazet <[email protected]>
netfilter: nfnetlink_queue: acquire rcu_read_lock() in instance_destroy_rcu()
Larysa Zaremba <[email protected]>
ice: Interpret .set_channels() input differently
Henry Wang <[email protected]>
drivers/xen: Improve the late XenStore init protocol
Ryosuke Yasuoka <[email protected]>
nfc: nci: Fix handling of zero-length payload packets in nci_rx_work()
Tetsuo Handa <[email protected]>
nfc: nci: Fix kcov check in nci_rx_work()
Paolo Abeni <[email protected]>
net: relax socket state check at accept time.
Paolo Abeni <[email protected]>
inet: factor out locked section of inet_accept() in a new helper
Jason Xing <[email protected]>
tcp: remove 64 KByte limit for initial tp->rcv_wnd value
Dae R. Jeong <[email protected]>
tls: fix missing memory barrier in tls_init
Wei Fang <[email protected]>
net: fec: avoid lock evasion when reading pps_enable
Jacob Keller <[email protected]>
Revert "ixgbe: Manual AN-37 for troublesome link partners for X550 SFI"
Matthew Bystrin <[email protected]>
riscv: stacktrace: fixed walk_stackframe()
Guo Ren <[email protected]>
riscv: stacktrace: Make walk_stackframe cross pt_regs frame
Jiri Pirko <[email protected]>
virtio: delete vq in vp_find_vqs_msix() when request_irq() fails
Yang Li <[email protected]>
rv: Update rv_en(dis)able_monitor doc to match kernel-doc
Jiangfeng Xiao <[email protected]>
arm64: asm-bug: Add .align 2 to the end of __BUG_ENTRY
Aaron Conole <[email protected]>
openvswitch: Set the skbuff pkt_type for proper pmtud support.
Olga Kornievskaia <[email protected]>
pNFS/filelayout: fixup pNfs allocation modes
Kuniyuki Iwashima <[email protected]>
tcp: Fix shift-out-of-bounds in dctcp_update_alpha().
Hangbin Liu <[email protected]>
ipv6: sr: fix memleak in seg6_hmac_init_algo
Kuniyuki Iwashima <[email protected]>
af_unix: Update unix_sk(sk)->oob_skb under sk_receive_queue lock.
Dan Aloni <[email protected]>
rpcrdma: fix handling for RDMA_CM_EVENT_DEVICE_REMOVAL
Dan Aloni <[email protected]>
sunrpc: fix NFSACL RPC retry on soft mount
Martin Kaiser <[email protected]>
nfs: keep server info for remounts
Benjamin Coddington <[email protected]>
NFSv4: Fixup smatch warning for ambiguous return
Shenghao Ding <[email protected]>
ASoC: tas2552: Add TX path for capturing AUDIO-OUT data
Ryosuke Yasuoka <[email protected]>
nfc: nci: Fix uninit-value in nci_rx_work
Taehee Yoo <[email protected]>
selftests: net: kill smcrouted in the cleanup logic in amt.sh
Andrea Mayer <[email protected]>
ipv6: sr: fix missing sk_buff release in seg6_input_core
Florian Fainelli <[email protected]>
net: Always descend into dsa/ folder with CONFIG_NET_DSA enabled
Masahiro Yamada <[email protected]>
x86/kconfig: Select ARCH_WANT_FRAME_POINTERS again when UNWINDER_FRAME_POINTER=y
Namhyung Kim <[email protected]>
perf/arm-dmc620: Fix lockdep assert in ->event_init()
Matti Vaittinen <[email protected]>
regulator: bd71828: Don't overwrite runtime voltages
Hsin-Te Yuan <[email protected]>
ASoC: mediatek: mt8192: fix register configuration for tdm
Richard Fitzgerald <[email protected]>
ALSA: hda/cs_dsp_ctl: Use private_free for control cleanup
Ryusuke Konishi <[email protected]>
nilfs2: make superblock data array index computation sparse friendly
Zhu Yanjun <[email protected]>
null_blk: Fix the WARNING: modpost: missing MODULE_DESCRIPTION()
Konrad Dybcio <[email protected]>
drm/msm/a6xx: Avoid a nullptr dereference when speedbin setting fails
Rob Clark <[email protected]>
drm/msm: Enable clamp_to_idle for 7c3
Luca Ceresoli <[email protected]>
Revert "drm/bridge: ti-sn65dsi83: Fix enable error path"
Hans Verkuil <[email protected]>
media: cec: core: avoid confusing "transmit timed out" message
Hans Verkuil <[email protected]>
media: cec: core: avoid recursive cec_claim_log_addrs
Hans Verkuil <[email protected]>
media: cec: cec-api: add locking in cec_release()
Hans Verkuil <[email protected]>
media: cec: cec-adap: always cancel work in cec_transmit_msg_fh
Randy Dunlap <[email protected]>
media: sunxi: a83-mips-csi2: also select GENERIC_PHY
Tiwei Bie <[email protected]>
um: Fix the declaration of kasan_map_memory
Tiwei Bie <[email protected]>
um: Fix the -Wmissing-prototypes warning for get_thread_reg
Tiwei Bie <[email protected]>
um: Fix the -Wmissing-prototypes warning for __switch_mm
Shrikanth Hegde <[email protected]>
powerpc/pseries: Add failure related checks for h_get_mpp and h_get_ppp
Dongliang Mu <[email protected]>
media: flexcop-usb: fix sanity check of bNumEndpoints
Marek Szyprowski <[email protected]>
Input: cyapa - add missing input core locking to suspend/resume functions
Azeem Shaikh <[email protected]>
scsi: qla2xxx: Replace all non-returning strlcpy() with strscpy()
Dan Carpenter <[email protected]>
media: stk1160: fix bounds checking in stk1160_copy_video()
Michael Walle <[email protected]>
drm/bridge: tc358775: fix support for jeida-18 and jeida-24
Konstantin Komarov <[email protected]>
fs/ntfs3: Use variable length array instead of fixed size
Konstantin Komarov <[email protected]>
fs/ntfs3: Use 64 bit variable to avoid 32 bit overflow
Johannes Berg <[email protected]>
um: vector: fix bpfflash parameter evaluation
Roberto Sassu <[email protected]>
um: Add winch to winch_handlers before registering winch IRQ
Duoming Zhou <[email protected]>
um: Fix return value in ubd_init()
Wojciech Macek <[email protected]>
drm/mediatek: dp: Fix mtk_dp_aux_transfer return value
AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: dp: Add support for embedded DisplayPort aux-bus
AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: dp: Move PHY registration to new function
Marijn Suijten <[email protected]>
drm/msm/dpu: Always flush the slave INTF on the CTL
Marijn Suijten <[email protected]>
drm/msm/dsi: Print dual-DSI-adjusted pclk instead of original mode pclk
Fenglin Wu <[email protected]>
Input: pm8xxx-vibrator - correct VIB_MAX_LEVELS calculation
Judith Mendez <[email protected]>
mmc: sdhci_am654: Fix ITAPDLY for HS400 timing
Judith Mendez <[email protected]>
mmc: sdhci_am654: Add ITAPDLYSEL in sdhci_j721e_4bit_set_clock
Judith Mendez <[email protected]>
mmc: sdhci_am654: Add OTAP/ITAP delay enable
Vignesh Raghavendra <[email protected]>
mmc: sdhci_am654: Drop lookup for deprecated ti,otap-del-sel
Judith Mendez <[email protected]>
mmc: sdhci_am654: Write ITAPDLY for DDR52 timing
Judith Mendez <[email protected]>
mmc: sdhci_am654: Add tuning algorithm for delay chain
Karel Balej <[email protected]>
Input: ioc3kbd - add device table
Uwe Kleine-König <[email protected]>
Input: ioc3kbd - convert to platform remove callback returning void
Arnd Bergmann <[email protected]>
Input: ims-pcu - fix printf string overflow
Sven Schnelle <[email protected]>
s390/boot: Remove alt_stfle_fac_list from decompressor
Alexander Egorenkov <[email protected]>
s390/ipl: Fix incorrect initialization of nvme dump block
Alexander Egorenkov <[email protected]>
s390/ipl: Fix incorrect initialization of len fields in nvme reipl block
Heiko Carstens <[email protected]>
s390/vdso: Use standard stack frame layout
Jens Remus <[email protected]>
s390/vdso: Generate unwind information for C modules
Sumanth Korikkar <[email protected]>
s390/vdso64: filter out munaligned-symbols flag for vdso
Sumanth Korikkar <[email protected]>
s390/vdso: filter out mno-pic-data-is-text-relative cflag
Huacai Chen <[email protected]>
LoongArch: Fix callchain parse error with kernel tracepoint events again
Ian Rogers <[email protected]>
perf stat: Don't display metric header for non-leader uncore events
Chao Yu <[email protected]>
f2fs: fix to add missing iput() in gc_data_segment()
Samasth Norway Ananda <[email protected]>
perf daemon: Fix file leak in daemon_session__control
Ian Rogers <[email protected]>
libsubcmd: Fix parse-options memory leak
Wolfram Sang <[email protected]>
serial: sh-sci: protect invalidating RXDMA on shutdown
Chao Yu <[email protected]>
f2fs: compress: don't allow unaligned truncation on released compress inode
Chao Yu <[email protected]>
f2fs: fix to release node block count in error path of f2fs_new_node_page()
Chao Yu <[email protected]>
f2fs: compress: fix to cover {reserve,release}_compress_blocks() w/ cp_rwsem lock
Chao Yu <[email protected]>
f2fs: compress: fix to update i_compr_blocks correctly
Ian Rogers <[email protected]>
perf report: Avoid SEGV in report__setup_sample_type()
Ian Rogers <[email protected]>
perf ui browser: Avoid SEGV on title
Kuppuswamy Sathyanarayanan <[email protected]>
PCI/EDR: Align EDR_PORT_LOCATE_DSM with PCI Firmware r3.3
Kuppuswamy Sathyanarayanan <[email protected]>
PCI/EDR: Align EDR_PORT_DPC_ENABLE_DSM with PCI Firmware r3.3
Randy Dunlap <[email protected]>
extcon: max8997: select IRQ_DOMAIN instead of depending on it
Ian Rogers <[email protected]>
perf ui browser: Don't save pointer to stack memory
He Zhe <[email protected]>
perf bench internals inject-build-id: Fix trap divide when collecting just one DSO
Huai-Yuan Liu <[email protected]>
ppdev: Add an error check in register_device
Christophe JAILLET <[email protected]>
ppdev: Remove usage of the deprecated ida_simple_xx() API
Dan Carpenter <[email protected]>
stm class: Fix a double free in stm_register_device()
Chris Wulff <[email protected]>
usb: gadget: u_audio: Clear uac pointer when freed.
Chris Wulff <[email protected]>
usb: gadget: u_audio: Fix race condition use of controls after free during gadget unbind.
Chen Ni <[email protected]>
watchdog: sa1100: Fix PTR_ERR_OR_ZERO() vs NULL check in sa1100dog_probe()
Matti Vaittinen <[email protected]>
watchdog: bd9576: Drop "always-running" property
Rafał Miłecki <[email protected]>
dt-bindings: pinctrl: mediatek: mt7622: fix array properties
Christophe JAILLET <[email protected]>
VMCI: Fix an error handling path in vmci_guest_probe_device()
Miklos Szeredi <[email protected]>
ovl: remove upper umask handling from ovl_create_upper()
Adrian Hunter <[email protected]>
perf intel-pt: Fix unassigned instruction op (discovered by MemorySanitizer)
Michal Simek <[email protected]>
microblaze: Remove early printk call from cpuinfo-static.c
Michal Simek <[email protected]>
microblaze: Remove gcc flag for non existing early_printk.c file
Marco Pagani <[email protected]>
fpga: region: add owner module and take its refcount
Suzuki K Poulose <[email protected]>
coresight: etm4x: Fix access to resource selector registers
Suzuki K Poulose <[email protected]>
coresight: etm4x: Safe access for TRCQCLTR
Suzuki K Poulose <[email protected]>
coresight: etm4x: Do not save/restore Data trace control registers
Suzuki K Poulose <[email protected]>
coresight: etm4x: Do not hardcode IOMEM access for register restore
Thomas Haemmerle <[email protected]>
iio: pressure: dps310: support negative temperature values
Ian Rogers <[email protected]>
perf docs: Document bpf event modifier
Anshuman Khandual <[email protected]>
coresight: etm4x: Fix unbalanced pm_runtime_enable()
Jonathan Cameron <[email protected]>
iio: adc: stm32: Fixing err code to not indicate success
Chao Yu <[email protected]>
f2fs: fix to check pinfile flag in f2fs_move_file_range()
Chao Yu <[email protected]>
f2fs: fix to relocate check condition in f2fs_fallocate()
Jinyoung CHOI <[email protected]>
f2fs: fix typos in comments
Chao Yu <[email protected]>
f2fs: compress: fix to relocate check condition in f2fs_ioc_{,de}compress_file()
Chao Yu <[email protected]>
f2fs: compress: fix to relocate check condition in f2fs_{release,reserve}_compress_blocks()
Geert Uytterhoeven <[email protected]>
dt-bindings: PCI: rcar-pci-host: Add missing IOMMU properties
Wolfram Sang <[email protected]>
dt-bindings: PCI: rcar-pci-host: Add optional regulators
James Clark <[email protected]>
perf tests: Make "test data symbol" more robust on Neoverse N1
Namhyung Kim <[email protected]>
perf test: Add 'datasym' test workload
Namhyung Kim <[email protected]>
perf test: Add 'brstack' test workload
Namhyung Kim <[email protected]>
perf test: Add 'sqrtloop' test workload
Namhyung Kim <[email protected]>
perf test: Add 'leafloop' test workload
Namhyung Kim <[email protected]>
perf test: Add 'thloop' test workload
Namhyung Kim <[email protected]>
perf test: Add -w/--workload option
Xianwei Zhao <[email protected]>
arm64: dts: meson: fix S4 power-controller node
Konrad Dybcio <[email protected]>
interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment
Hugo Villeneuve <[email protected]>
serial: sc16is7xx: add proper sched.h include for sched_set_fifo()
Vidya Sagar <[email protected]>
PCI: tegra194: Fix probe path for Endpoint mode
Arnd Bergmann <[email protected]>
greybus: arche-ctrl: move device table to its right location
Andy Shevchenko <[email protected]>
serial: max3100: Fix bitwise types
Andy Shevchenko <[email protected]>
serial: max3100: Update uart_driver_registered on driver removal
Andy Shevchenko <[email protected]>
serial: max3100: Lock port->lock when calling uart_handle_cts_change()
Arnd Bergmann <[email protected]>
firmware: dmi-id: add a release callback function
Chen Ni <[email protected]>
dmaengine: idma64: Add check for dma_set_max_seg_size
Pierre-Louis Bossart <[email protected]>
soundwire: cadence: fix invalid PDI offset
Namhyung Kim <[email protected]>
perf annotate: Get rid of duplicate --group option item
Randy Dunlap <[email protected]>
counter: linux/counter.h: fix Excess kernel-doc description warning
Chao Yu <[email protected]>
f2fs: fix to wait on page writeback in __clone_blkaddrs()
Chao Yu <[email protected]>
f2fs: multidev: fix to recognize valid zero block address
Rui Miguel Silva <[email protected]>
greybus: lights: check return of get_channel_from_mode
Andy Shevchenko <[email protected]>
iio: core: Leave private pointer NULL when no private data supplied
Arnaldo Carvalho de Melo <[email protected]>
perf probe: Add missing libgen.h header needed for using basename()
Ian Rogers <[email protected]>
perf record: Delete session after stopping sideband thread
Neil Armstrong <[email protected]>
scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5
Cheng Yu <[email protected]>
sched/core: Fix incorrect initialization of the 'burst' parameter in cpu_max_write()
Vitalii Bursov <[email protected]>
sched/fair: Allow disabling sched_balance_newidle with sched_relax_domain_level
Eric Dumazet <[email protected]>
af_packet: do not call packet_read_pending() from tpacket_destruct_skb()
Eric Dumazet <[email protected]>
netrom: fix possible dead-lock in nr_rt_ioctl()
Chris Lew <[email protected]>
net: qrtr: ns: Fix module refcnt
Nikolay Aleksandrov <[email protected]>
net: bridge: mst: fix vlan use-after-free
Nikolay Aleksandrov <[email protected]>
selftests: net: bridge: increase IGMP/MLD exclude timeout membership interval
Nikolay Aleksandrov <[email protected]>
net: bridge: xmit: make sure we have at least eth header len bytes
Eric Dumazet <[email protected]>
net: add pskb_may_pull_reason() helper
Leon Romanovsky <[email protected]>
RDMA/IPoIB: Fix format truncation compilation errors
Edward Liaw <[email protected]>
selftests/kcmp: remove unused open mode
Chuck Lever <[email protected]>
SUNRPC: Fix gss_free_in_token_pages()
Dan Carpenter <[email protected]>
ext4: fix potential unnitialized variable
Kemeng Shi <[email protected]>
ext4: remove unused parameter from ext4_mb_new_blocks_simple()
Kemeng Shi <[email protected]>
ext4: try all groups in ext4_mb_new_blocks_simple
Kemeng Shi <[email protected]>
ext4: fix unit mismatch in ext4_mb_new_blocks_simple
Kemeng Shi <[email protected]>
ext4: simplify calculation of blkoff in ext4_mb_new_blocks_simple
Aleksandr Aprelkov <[email protected]>
sunrpc: removed redundant procp check
David Hildenbrand <[email protected]>
drivers/virt/acrn: fix PFNMAP PTE checks in acrn_vm_ram_map()
Christoph Hellwig <[email protected]>
virt: acrn: stop using follow_pfn
Jan Kara <[email protected]>
ext4: avoid excessive credit estimate in ext4_tmpfile()
Adrian Hunter <[email protected]>
x86/insn: Add VEX versions of VPDPBUSD, VPDPBUSDS, VPDPWSSD and VPDPWSSDS
Adrian Hunter <[email protected]>
x86/insn: Fix PUSH instruction in x86 instruction decoder opcode map
Marc Gonzalez <[email protected]>
clk: qcom: mmcc-msm8998: fix venus clock issue
Dmitry Baryshkov <[email protected]>
clk: qcom: dispcc-sm6350: fix DisplayPort clocks
Dmitry Baryshkov <[email protected]>
clk: qcom: dispcc-sm8450: fix DisplayPort clocks
Duoming Zhou <[email protected]>
lib/test_hmm.c: handle src_pfns and dst_pfns allocation failure
Lad Prabhakar <[email protected]>
clk: renesas: r9a07g043: Add clock and reset entry for PLIC
Geert Uytterhoeven <[email protected]>
clk: renesas: r8a779a0: Fix CANFD parent clock
Jason Gunthorpe <[email protected]>
IB/mlx5: Use __iowrite64_copy() for write combining stores
Bob Pearson <[email protected]>
RDMA/rxe: Fix incorrect rxe_put in error path
Bob Pearson <[email protected]>
RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_net.c
Bob Pearson <[email protected]>
RDMA/rxe: Fix seg fault in rxe_comp_queue_pkt
Catalin Popescu <[email protected]>
clk: rs9: fix wrong default value for clock amplitude
Alexandre Mergnat <[email protected]>
clk: mediatek: mt8365-mm: fix DPI0 parent
Chengchang Tang <[email protected]>
RDMA/hns: Modify the print level of CQE error
Chengchang Tang <[email protected]>
RDMA/hns: Use complete parentheses in macros
Chengchang Tang <[email protected]>
RDMA/hns: Fix GMV table pagesize
Chengchang Tang <[email protected]>
RDMA/hns: Fix UAF for cq async event
Chengchang Tang <[email protected]>
RDMA/hns: Fix deadlock on SRQ async events.
Zhengchao Shao <[email protected]>
RDMA/hns: Fix return value in hns_roce_map_mr_sg
Or Har-Toov <[email protected]>
RDMA/mlx5: Adding remote atomic access flag to updatable flags
Jaewon Kim <[email protected]>
clk: samsung: exynosautov9: fix wrong pll clock id value
Detlev Casanova <[email protected]>
drm/rockchip: vop2: Do not divide height twice for YUV
Dmitry Baryshkov <[email protected]>
drm/mipi-dsi: use correct return type for the DSC functions
Marek Vasut <[email protected]>
drm/panel: simple: Add missing Innolux G121X1-L03 format, flags, connector
Nícolas F. R. A. Prado <[email protected]>
drm/panel: novatek-nt35950: Don't log an error when DSI host can't be found
Nícolas F. R. A. Prado <[email protected]>
drm/bridge: dpc3433: Don't log an error when DSI host can't be found
Nícolas F. R. A. Prado <[email protected]>
drm/bridge: tc358775: Don't log an error when DSI host can't be found
Nícolas F. R. A. Prado <[email protected]>
drm/bridge: lt9611uxc: Don't log an error when DSI host can't be found
Nícolas F. R. A. Prado <[email protected]>
drm/bridge: lt9611: Don't log an error when DSI host can't be found
Nícolas F. R. A. Prado <[email protected]>
drm/bridge: lt8912b: Don't log an error when DSI host can't be found
Nícolas F. R. A. Prado <[email protected]>
drm/bridge: icn6211: Don't log an error when DSI host can't be found
Nícolas F. R. A. Prado <[email protected]>
drm/bridge: anx7625: Don't log an error when DSI host can't be found
Steven Rostedt <[email protected]>
ASoC: tracing: Export SND_SOC_DAPM_DIR_OUT to its value
Aleksandr Mishin <[email protected]>
drm: vc4: Fix possible null pointer dereference
Huai-Yuan Liu <[email protected]>
drm/arm/malidp: fix a possible null pointer dereference
Zhipeng Lu <[email protected]>
media: atomisp: ssh_css: Fix a null-pointer dereference in load_video_binaries
Randy Dunlap <[email protected]>
fbdev: sh7760fb: allow modular build
Fabio Estevam <[email protected]>
media: dt-bindings: ovti,ov2680: Fix the power supply names
Sakari Ailus <[email protected]>
media: ipu3-cio2: Request IRQ earlier
Douglas Anderson <[email protected]>
drm/msm/dp: Avoid a long timeout for AUX transfer if nothing connected
Douglas Anderson <[email protected]>
drm/msm/dp: Return IRQ_NONE for unhandled interrupts
Dmitry Baryshkov <[email protected]>
drm/msm/dp: allow voltage swing / pre emphasis of 3
Armin Wolf <[email protected]>
platform/x86: xiaomi-wmi: Fix race condition when reporting key events
Aleksandr Mishin <[email protected]>
drm: bridge: cdns-mhdp8546: Fix possible null pointer dereference
Ricardo Ribalda <[email protected]>
media: radio-shark2: Avoid led_names truncations
Arnd Bergmann <[email protected]>
media: rcar-vin: work around -Wenum-compare-conditional warning
Aleksandr Burakov <[email protected]>
media: ngene: Add dvb_ca_en50221_init return value check
Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Fix potential integer overflow
Cezary Rojewski <[email protected]>
ASoC: Intel: avs: Fix ASRC module initialization
Arnd Bergmann <[email protected]>
fbdev: sisfb: hide unused variables
Arnd Bergmann <[email protected]>
powerpc/fsl-soc: hide unused const variable
Justin Green <[email protected]>
drm/mediatek: Add 0 size check to mtk_drm_gem_obj
Christian Hewitt <[email protected]>
drm/meson: vclk: fix calculation of 59.94 fractional rates
Aleksandr Mishin <[email protected]>
ASoC: kirkwood: Fix potential NULL dereference
Arnd Bergmann <[email protected]>
fbdev: shmobile: fix snprintf truncation
Maxim Korotkov <[email protected]>
mtd: rawnand: hynix: fixed typo
Aapo Vienamo <[email protected]>
mtd: core: Report error if first mtd_otp_size() call fails in mtd_otp_nvmem_add()
Cezary Rojewski <[email protected]>
ASoC: Intel: avs: ssm4567: Do not ignore route checks
Cezary Rojewski <[email protected]>
ASoC: Intel: Disable route checks for Skylake boards
Srinivasan Shanmugam <[email protected]>
drm/amd/display: Fix potential index out of bounds in color transformation function
Douglas Anderson <[email protected]>
drm/panel: atna33xc20: Fix unbalanced regulator in the case HPD doesn't assert
Douglas Anderson <[email protected]>
drm/dp: Don't attempt AUX transfers when eDP panels are not powered
Drew Davenport <[email protected]>
drm/panel-samsung-atna33xc20: Use ktime_get_boottime for delays
Marek Vasut <[email protected]>
drm/lcdif: Do not disable clocks on already suspended hardware
Geert Uytterhoeven <[email protected]>
dev_printk: Add and use dev_no_printk()
Geert Uytterhoeven <[email protected]>
printk: Let no_printk() use _printk()
Jagan Teki <[email protected]>
drm/bridge: Fix improper bridge init order with pre_enable_prev_first
Dan Carpenter <[email protected]>
Bluetooth: qca: Fix error code in qca_read_fw_build_info()
Sebastian Urban <[email protected]>
Bluetooth: compute LE flow credits based on recvbuf space
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Consolidate code around sk_alloc into a helper function
Matthieu Baerts (NGI0) <[email protected]>
mptcp: SO_KEEPALIVE: fix getsockopt support
Duoming Zhou <[email protected]>
ax25: Fix reference count leak issue of net_device
Duoming Zhou <[email protected]>
ax25: Fix reference count leak issues of ax25_dev
Duoming Zhou <[email protected]>
ax25: Use kernel universal linked list to implement ax25_dev_list
Puranjay Mohan <[email protected]>
riscv, bpf: make some atomic operations fully ordered
Ilya Leoshkevich <[email protected]>
s390/bpf: Emit a barrier for BPF_FETCH instructions
Akiva Goldberger <[email protected]>
net/mlx5: Discard command completions in internal error
Akiva Goldberger <[email protected]>
net/mlx5: Add a timeout to acquire the command queue semaphore
Hangbin Liu <[email protected]>
ipv6: sr: fix invalid unregister error path
Hangbin Liu <[email protected]>
ipv6: sr: fix incorrect unregister order
Hangbin Liu <[email protected]>
ipv6: sr: add missing seg6_local_exit
Ilya Maximets <[email protected]>
net: openvswitch: fix overwriting ct original tuple for ICMPv6
Eric Dumazet <[email protected]>
net: usb: smsc95xx: stop lying about skb->truesize
Breno Leitao <[email protected]>
af_unix: Fix data races in unix_release_sock/unix_stream_sendmsg
Linus Walleij <[email protected]>
net: ethernet: cortina: Locking fixes
Jakub Kicinski <[email protected]>
selftests: net: move amt to socat for better compatibility
Jakub Kicinski <[email protected]>
eth: sungem: remove .ndo_poll_controller to avoid deadlocks
gaoxingwang <[email protected]>
net: ipv6: fix wrong start position when receive hop-by-hop fragment
Finn Thain <[email protected]>
m68k: mac: Fix reboot hang on Mac IIci
Michael Schmitz <[email protected]>
m68k: Fix spinlock race in kernel thread creation
Eric Dumazet <[email protected]>
net: usb: sr9700: stop lying about skb->truesize
Eric Dumazet <[email protected]>
usb: aqc111: stop lying about skb->truesize
Basavaraj Natikar <[email protected]>
HID: amd_sfh: Handle "no sensors" in PM operations
Dan Carpenter <[email protected]>
wifi: mwl8k: initialize cmd->addr[] properly
Robert Richter <[email protected]>
x86/numa: Fix SRAT lookup of CFMWS ranges with numa_fill_memblks()
Kent Overstreet <[email protected]>
kernel/numa.c: Move logging out of numa.h
Himanshu Madhani <[email protected]>
scsi: qla2xxx: Fix debugfs output for fw_resource_count
Bui Quang Minh <[email protected]>
scsi: qedf: Ensure the copied buf is NUL terminated
Bui Quang Minh <[email protected]>
scsi: bfa: Ensure the copied buf is NUL terminated
Chen Ni <[email protected]>
HID: intel-ish-hid: ipc: Add check for pci_alloc_irq_vectors
Mickaël Salaün <[email protected]>
kunit: Fix kthread reference
Valentin Obst <[email protected]>
selftests: default to host arch for LLVM builds
John Hubbard <[email protected]>
selftests/resctrl: fix clang build failure: use LOCAL_HDRS
John Hubbard <[email protected]>
selftests/binderfs: use the Makefile's rules, not Make's implicit rules
Jiri Olsa <[email protected]>
libbpf: Fix error message in attach_kprobe_multi
Felix Fietkau <[email protected]>
wifi: mt76: mt7603: add wpdma tx eof flag for PSE client reset
Guenter Roeck <[email protected]>
Revert "sh: Handle calling csum_partial with misaligned data"
Geert Uytterhoeven <[email protected]>
sh: kprobes: Merge arch_copy_kprobe() into arch_prepare_kprobe()
Nikita Zhandarovich <[email protected]>
wifi: ar5523: enable proper endpoint verification
Nikita Zhandarovich <[email protected]>
wifi: carl9170: add a proper sanity check for endpoints
Finn Thain <[email protected]>
macintosh/via-macii: Fix "BUG: sleeping function called from invalid context"
Eric Dumazet <[email protected]>
net: give more chances to rcu in netdev_wait_allrefs_any()
Hao Chen <[email protected]>
drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
Junhao He <[email protected]>
drivers/perf: hisi: hns3: Fix out-of-bound access when valid event group
Junhao He <[email protected]>
drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group
Uwe Kleine-König <[email protected]>
pwm: sti: Simplify probe function using devm functions
Uwe Kleine-König <[email protected]>
pwm: sti: Prepare removing pwm_chip from driver data
Uwe Kleine-König <[email protected]>
pwm: sti: Convert to platform remove callback returning void
Eric Dumazet <[email protected]>
tcp: avoid premature drops in tcp_add_backlog()
Matthias Schiffer <[email protected]>
net: dsa: mv88e6xxx: Avoid EEPROM timeout without EEPROM on 88E6250-family switches
Matthias Schiffer <[email protected]>
net: dsa: mv88e6xxx: Add support for model-specific pre- and post-reset handlers
Dmitry Baryshkov <[email protected]>
wifi: ath10k: populate board data for WCN3990
Geliang Tang <[email protected]>
selftests/bpf: Fix a fd leak in error paths in open_netns
Su Hui <[email protected]>
wifi: ath10k: Fix an error code problem in ath10k_dbg_sta_write_peer_debug_trigger()
Aleksandr Mishin <[email protected]>
thermal/drivers/tsens: Fix null pointer dereference
Ard Biesheuvel <[email protected]>
x86/purgatory: Switch to the position-independent small code model
Yuri Karpov <[email protected]>
scsi: hpsa: Fix allocation size for Scsi_Host private data
Xingui Yang <[email protected]>
scsi: libsas: Fix the failure of adding phy with zero-address to port
Aleksandr Mishin <[email protected]>
cppc_cpufreq: Fix possible null pointer dereference
Gabriel Krisman Bertazi <[email protected]>
udp: Avoid call to compute_score on multiple sites
Lorenz Bauer <[email protected]>
net: remove duplicate reuseport_lookup functions
Lorenz Bauer <[email protected]>
net: export inet_lookup_reuseport and inet6_lookup_reuseport
Juergen Gross <[email protected]>
x86/pat: Fix W^X violation false-positives when running as Xen PV guest
Juergen Gross <[email protected]>
x86/pat: Restructure _lookup_address_cpa()
Juergen Gross <[email protected]>
x86/pat: Introduce lookup_address_in_pgd_attr()
Viresh Kumar <[email protected]>
cpufreq: exit() callback is optional
Geliang Tang <[email protected]>
selftests/bpf: Fix umount cgroup2 error in test_sockmap
Ard Biesheuvel <[email protected]>
x86/boot/64: Clear most of CR4 in startup_64(), except PAE, MCE and LA57
Andreas Gruenbacher <[email protected]>
gfs2: Fix "ignore unlock failures after withdraw"
Andreas Gruenbacher <[email protected]>
gfs2: Don't forget to complete delayed withdraw
Arnd Bergmann <[email protected]>
ACPI: disable -Wstringop-truncation
Zenghui Yu <[email protected]>
irqchip/loongson-pch-msi: Fix off-by-one on allocation error path
Zenghui Yu <[email protected]>
irqchip/alpine-msi: Fix off-by-one in allocation error path
Andy Shevchenko <[email protected]>
ACPI: LPSS: Advertise number of chip selects via property
Andrew Halaney <[email protected]>
scsi: ufs: core: Perform read back after disabling UIC_COMMAND_COMPL
Andrew Halaney <[email protected]>
scsi: ufs: core: Perform read back after disabling interrupts
Andrew Halaney <[email protected]>
scsi: ufs: cdns-pltfrm: Perform read back after writing HCLKDIV
Andrew Halaney <[email protected]>
scsi: ufs: qcom: Perform read back after writing CGC enable
Andrew Halaney <[email protected]>
scsi: ufs: qcom: Perform read back after writing unipro mode
Abel Vesa <[email protected]>
scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW version major 5
Manivannan Sadhasivam <[email protected]>
scsi: ufs: ufs-qcom: Fix the Qcom register name for offset 0xD0
Andrew Halaney <[email protected]>
scsi: ufs: qcom: Perform read back after writing REG_UFS_SYS1CLK_1US
Andrew Halaney <[email protected]>
scsi: ufs: qcom: Perform read back after writing reset bit
Anton Protopopov <[email protected]>
bpf: Pack struct bpf_fib_lookup
Arnd Bergmann <[email protected]>
wifi: carl9170: re-fix fortified-memset warning
Alexander Lobakin <[email protected]>
bitops: add missing prototype check
Arnd Bergmann <[email protected]>
mlx5: stop warning for 64KB pages
Adham Faris <[email protected]>
net/mlx5e: Fail with messages when params are not valid for XSK
Arnd Bergmann <[email protected]>
qed: avoid truncating work queue length
Armin Wolf <[email protected]>
ACPI: Fix Generic Initiator Affinity _OSC bit
Shrikanth Hegde <[email protected]>
sched/fair: Add EAS checks before updating root_domain::overutilized
Guixiong Wei <[email protected]>
x86/boot: Ignore relocations in .notes sections in walk_relocs() too
Yonghong Song <[email protected]>
bpftool: Fix missing pids during link show
Baochen Qiang <[email protected]>
wifi: ath11k: don't force enable power save on non-running vdevs
Duoming Zhou <[email protected]>
wifi: brcmfmac: pcie: handle randbuf allocation failure
Baochen Qiang <[email protected]>
wifi: ath10k: poll service ready message before failing
Yu Kuai <[email protected]>
block: support to account io_ticks precisely
Chaitanya Kulkarni <[email protected]>
block: open code __blk_account_io_done()
Chaitanya Kulkarni <[email protected]>
block: open code __blk_account_io_start()
Yu Kuai <[email protected]>
md: fix resync softlockup when bitmap size is less than array size
Zhu Yanjun <[email protected]>
null_blk: Fix missing mutex_destroy() at module removal
Chun-Kuang Hu <[email protected]>
soc: mediatek: cmdq: Fix typo of CMDQ_JUMP_RELATIVE
Ilya Denisyev <[email protected]>
jffs2: prevent xattr node from overflowing the eraseblock
Maxime Ripard <[email protected]>
ARM: configs: sunxi: Enable DRM_DW_HDMI
Nikita Kiryushin <[email protected]>
rcu: Fix buffer overflow in print_cpu_stall_info()
Nikita Kiryushin <[email protected]>
rcu-tasks: Fix show_rcu_tasks_trace_gp_kthread buffer overflow
Jens Axboe <[email protected]>
io_uring: use the right type for work_llist empty check
Jens Axboe <[email protected]>
io_uring: don't use TIF_NOTIFY_SIGNAL to test for availability of task_work
Peter Oberparleiter <[email protected]>
s390/cio: fix tracepoint subchannel type field
Eric Biggers <[email protected]>
crypto: x86/sha512-avx2 - add missing vzeroupper
Eric Biggers <[email protected]>
crypto: x86/sha256-avx2 - add missing vzeroupper
Eric Biggers <[email protected]>
crypto: x86/nh-avx2 - add missing vzeroupper
Arnd Bergmann <[email protected]>
crypto: ccp - drop platform ifdef checks
Al Viro <[email protected]>
parisc: add missing export of __cmpxchg_u8()
Arnd Bergmann <[email protected]>
nilfs2: fix out-of-range warning
Brian Kubisiak <[email protected]>
ecryptfs: Fix buffer size for tag 66 packet
Laurent Pinchart <[email protected]>
firmware: raspberrypi: Use correct device for DMA mappings
Guenter Roeck <[email protected]>
mm/slub, kunit: Use inverted data to corrupt kmem cache
Aleksandr Mishin <[email protected]>
crypto: bcm - Fix pointer arithmetic
Eric Sandeen <[email protected]>
openpromfs: finish conversion to the new mount API
Dan Carpenter <[email protected]>
nvmet: prevent sprintf() overflow in nvmet_subsys_nsid_exists()
Linus Torvalds <[email protected]>
epoll: be better about file lifetimes
Sagi Grimberg <[email protected]>
nvmet: fix nvme status code when namespace is disabled
Sagi Grimberg <[email protected]>
nvmet-tcp: fix possible memory leak when tearing down a controller
Maurizio Lombardi <[email protected]>
nvmet-auth: replace pr_debug() with pr_err() to report an error.
Maurizio Lombardi <[email protected]>
nvmet-auth: return the error code to the nvmet_auth_host_hash() callers
Nilay Shroff <[email protected]>
nvme: find numa distance only if controller has valid numa id
Linus Torvalds <[email protected]>
x86/mm: Remove broken vsyscall emulation code from the page fault code
Lancelot SIX <[email protected]>
drm/amdkfd: Flush the process wq before creating a kfd_process
Rodrigo Siqueira <[email protected]>
drm/amd/display: Add VCO speed parameter for DCN31 FPU
Swapnil Patel <[email protected]>
drm/amd/display: Add dtbclk access to dcn315
Pierre-Louis Bossart <[email protected]>
ALSA: hda: intel-dsp-config: harden I2C/I2S codec detection
Pierre-Louis Bossart <[email protected]>
ASoC: da7219-aad: fix usage of device_get_named_child_node()
Zqiang <[email protected]>
softirq: Fix suspicious RCU usage in __do_softirq()
Peter Colberg <[email protected]>
fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card
Dongli Zhang <[email protected]>
genirq/cpuhotplug, x86/vector: Prevent vector leak during CPU offline
Gerd Hoffmann <[email protected]>
KVM: x86: Don't advertise guest.MAXPHYADDR as host.MAXPHYADDR in CPUID
Hagar Hemdan <[email protected]>
efi: libstub: only free priv.runtime_map when allocated
Ard Biesheuvel <[email protected]>
x86/efistub: Omit physical KASLR when memory reservations exist
Oliver Upton <[email protected]>
KVM: selftests: Add test for uaccesses to non-existent vgic-v2 CPUIF
Jack Yu <[email protected]>
ASoC: rt715-sdca: volume step modification
Jack Yu <[email protected]>
ASoC: rt715: add vendor clear control register
Krzysztof Kozlowski <[email protected]>
regulator: vqmmc-ipq4019: fix module autoloading
Derek Fang <[email protected]>
ASoC: dt-bindings: rt5645: add cbj sleeve gpio property
Derek Fang <[email protected]>
ASoC: rt5645: Fix the electric noise due to the CBJ contacts floating
Matti Vaittinen <[email protected]>
regulator: irq_helpers: duplicate IRQ name
Hans de Goede <[email protected]>
ASoC: Intel: bytcr_rt5640: Apply Asus T100TA quirk to Asus T100TAM too
Oleg Nesterov <[email protected]>
sched/isolation: Fix boot crash when maxcpus < first housekeeping CPU
Clément Léger <[email protected]>
selftests: sud_test: return correct emulated syscall value on RISC-V
Bibo Mao <[email protected]>
LoongArch: Lately init pmu after smp is online
Jack Xiao <[email protected]>
drm/amdgpu/mes: fix use-after-free issue
Prike Liang <[email protected]>
drm/amdgpu: Fix the ring buffer size for queue VM flush
Felix Kuehling <[email protected]>
drm/amdgpu: Update BO eviction priorities
Joshua Ashton <[email protected]>
drm/amd/display: Set color_mgmt_changed to true on unsuspend
Daniele Palmas <[email protected]>
net: usb: qmi_wwan: add Telit FN920C04 compositions
Rob Herring <[email protected]>
dt-bindings: rockchip: grf: Add missing type to 'pcie-phy' node
Igor Artemiev <[email protected]>
wifi: cfg80211: fix the order of arguments for trace events of the tx_rx_evt class
Richard Kinder <[email protected]>
wifi: mac80211: ensure beacon is non-S1G prior to extracting the beacon timestamp field
Johannes Berg <[email protected]>
wifi: mac80211: don't use rate mask for scanning
Eric Biggers <[email protected]>
KEYS: asymmetric: Add missing dependencies of FIPS_SIGNATURE_SELFTEST
Takashi Iwai <[email protected]>
ALSA: Fix deadlocks with kctl removals at disconnection
Takashi Iwai <[email protected]>
ALSA: core: Fix NULL module pointer assignment at card init
Andy Chi <[email protected]>
ALSA: hda/realtek: fix mute/micmute LEDs don't work for ProBook 440/460 G11.
Nandor Kracser <[email protected]>
ksmbd: ignore trailing slashes in share paths
Namjae Jeon <[email protected]>
ksmbd: avoid to send duplicate oplock break notifications
Konstantin Komarov <[email protected]>
fs/ntfs3: Break dir enumeration if directory contents error
Konstantin Komarov <[email protected]>
fs/ntfs3: Fix case when index is reused during tree transformation
Konstantin Komarov <[email protected]>
fs/ntfs3: Taking DOS names into account during link counting
Konstantin Komarov <[email protected]>
fs/ntfs3: Remove max link count info display during driver init
Ryusuke Konishi <[email protected]>
nilfs2: fix potential hang in nilfs_detach_log_writer()
Ryusuke Konishi <[email protected]>
nilfs2: fix unexpected freezing of nilfs_segctor_sync()
Thorsten Blum <[email protected]>
net: smc91x: Fix m68k kernel compilation for ColdFire CPU
Brennan Xavier McManus <[email protected]>
tools/nolibc/stdlib: fix memory error in realloc()
Shuah Khan <[email protected]>
tools/latency-collector: Fix -Wformat-security compile warns
Petr Pavlu <[email protected]>
ring-buffer: Fix a race between readers and resize checks
Ken Milmore <[email protected]>
r8169: Fix possible ring buffer corruption on fragmented Tx packets.
Heiner Kallweit <[email protected]>
Revert "r8169: don't try to disable interrupts if NAPI is, scheduled already"
Ming Lei <[email protected]>
io_uring: fail NOP if non-zero op flags is passed in
Pin-yen Lin <[email protected]>
serial: 8520_mtk: Set RTS on shutdown for Rx in-band wakeup
Doug Berger <[email protected]>
serial: 8250_bcm7271: use default_mux_rate if possible
Dan Carpenter <[email protected]>
speakup: Fix sizeof() vs ARRAY_SIZE() bug
Daniel Starke <[email protected]>
tty: n_gsm: fix missing receive state reset after mode switch
Daniel Starke <[email protected]>
tty: n_gsm: fix possible out-of-bounds in gsm0_receive()
Zheng Yejian <[email protected]>
ftrace: Fix possible use-after-free issue in ftrace_location()
Daniel J Blueman <[email protected]>
x86/tsc: Trust initial offset in architectural TSC-adjust MSRs
-------------
Diffstat:
.../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 18 +- .../devicetree/bindings/pci/rcar-pci-host.yaml | 14 + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 92 +++--- .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + Documentation/devicetree/bindings/sound/rt5645.txt | 6 + Documentation/driver-api/fpga/fpga-region.rst | 13 +- .../device_drivers/ethernet/amazon/ena.rst | 32 ++ Makefile | 4 +- arch/arm/configs/sunxi_defconfig | 1 + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13 +- arch/arm64/include/asm/asm-bug.h | 1 + arch/loongarch/include/asm/perf_event.h | 3 +- arch/loongarch/kernel/perf_event.c | 2 +- arch/m68k/kernel/entry.S | 4 +- arch/m68k/mac/misc.c | 36 +-- arch/microblaze/kernel/Makefile | 1 - arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- arch/parisc/kernel/parisc_ksyms.c | 1 + arch/powerpc/include/asm/hvcall.h | 2 +- arch/powerpc/include/asm/uaccess.h | 11 + arch/powerpc/platforms/pseries/lpar.c | 6 +- arch/powerpc/platforms/pseries/lparcfg.c | 10 +- arch/powerpc/sysdev/fsl_msi.c | 2 + arch/riscv/kernel/cpu_ops_sbi.c | 2 +- arch/riscv/kernel/cpu_ops_spinwait.c | 3 +- arch/riscv/kernel/entry.S | 3 +- arch/riscv/kernel/stacktrace.c | 29 +- arch/riscv/net/bpf_jit_comp64.c | 20 +- arch/s390/boot/startup.c | 1 - arch/s390/kernel/ipl.c | 10 +- arch/s390/kernel/setup.c | 2 +- arch/s390/kernel/vdso32/Makefile | 5 +- arch/s390/kernel/vdso64/Makefile | 6 +- arch/s390/net/bpf_jit_comp.c | 8 +- arch/sh/kernel/kprobes.c | 7 +- arch/sh/lib/checksum.S | 67 ++--- arch/um/drivers/line.c | 14 +- arch/um/drivers/ubd_kern.c | 4 +- arch/um/drivers/vector_kern.c | 2 +- arch/um/include/asm/kasan.h | 1 - arch/um/include/asm/mmu.h | 2 - arch/um/include/asm/processor-generic.h | 1 - arch/um/include/shared/kern_util.h | 2 + arch/um/include/shared/skas/mm_id.h | 2 + arch/um/os-Linux/mem.c | 1 + arch/x86/Kconfig.debug | 5 +- arch/x86/boot/compressed/head_64.S | 5 + arch/x86/crypto/nh-avx2-x86_64.S | 1 + arch/x86/crypto/sha256-avx2-asm.S | 1 + arch/x86/crypto/sha512-avx2-asm.S | 1 + arch/x86/entry/vsyscall/vsyscall_64.c | 28 +- arch/x86/include/asm/pgtable_types.h | 2 + arch/x86/include/asm/processor.h | 1 - arch/x86/include/asm/sparsemem.h | 2 - arch/x86/kernel/apic/vector.c | 9 +- arch/x86/kernel/tsc_sync.c | 6 +- arch/x86/kvm/cpuid.c | 21 +- arch/x86/lib/x86-opcode-map.txt | 10 +- arch/x86/mm/fault.c | 33 +-- arch/x86/mm/numa.c | 4 +- arch/x86/mm/pat/set_memory.c | 68 ++++- arch/x86/purgatory/Makefile | 3 +- arch/x86/tools/relocs.c | 9 + arch/x86/um/shared/sysdep/archsetjmp.h | 7 + block/blk-core.c | 9 +- block/blk-merge.c | 2 + block/blk-mq.c | 60 ++-- block/blk.h | 1 + block/genhd.c | 2 +- crypto/asymmetric_keys/Kconfig | 2 + drivers/accessibility/speakup/main.c | 2 +- drivers/acpi/acpi_lpss.c | 1 + drivers/acpi/acpica/Makefile | 1 + drivers/acpi/numa/srat.c | 5 + drivers/block/null_blk/main.c | 3 + drivers/bluetooth/btqca.c | 4 +- drivers/char/ppdev.c | 21 +- drivers/clk/clk-renesas-pcie.c | 10 +- drivers/clk/mediatek/clk-mt8365-mm.c | 2 +- drivers/clk/qcom/dispcc-sm6350.c | 11 +- drivers/clk/qcom/dispcc-sm8450.c | 20 +- drivers/clk/qcom/mmcc-msm8998.c | 8 + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 2 +- drivers/clk/renesas/r9a07g043-cpg.c | 9 + drivers/clk/samsung/clk-exynosautov9.c | 8 +- drivers/cpufreq/cppc_cpufreq.c | 14 +- drivers/cpufreq/cpufreq.c | 11 +- drivers/crypto/bcm/spu2.c | 2 +- drivers/crypto/ccp/sp-platform.c | 14 +- drivers/dma-buf/sync_debug.c | 4 +- drivers/dma/idma64.c | 4 +- drivers/extcon/Kconfig | 3 +- drivers/firmware/dmi-id.c | 7 +- drivers/firmware/efi/libstub/fdt.c | 4 +- drivers/firmware/efi/libstub/x86-stub.c | 28 +- drivers/firmware/raspberrypi.c | 7 +- drivers/fpga/dfl-pci.c | 3 + drivers/fpga/fpga-region.c | 24 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 - drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 8 + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 5 + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 2 + drivers/gpu/drm/arm/malidp_mw.c | 5 +- drivers/gpu/drm/bridge/analogix/anx7625.c | 6 +- .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 3 + drivers/gpu/drm/bridge/chipone-icn6211.c | 6 +- drivers/gpu/drm/bridge/lontium-lt8912b.c | 6 +- drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +- drivers/gpu/drm/bridge/tc358775.c | 27 +- drivers/gpu/drm/bridge/ti-dlpc3433.c | 17 +- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 - drivers/gpu/drm/display/drm_dp_helper.c | 35 +++ drivers/gpu/drm/drm_bridge.c | 10 +- drivers/gpu/drm/drm_mipi_dsi.c | 6 +- drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 6 +- drivers/gpu/drm/mediatek/Kconfig | 1 + drivers/gpu/drm/mediatek/mtk_dp.c | 137 +++++++-- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 3 + drivers/gpu/drm/meson/meson_vclk.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 17 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 - drivers/gpu/drm/msm/dp/dp_aux.c | 32 +- drivers/gpu/drm/msm/dp/dp_aux.h | 3 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 16 +- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 12 +- drivers/gpu/drm/msm/dp/dp_link.c | 22 +- drivers/gpu/drm/msm/dp/dp_link.h | 14 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 10 +- drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- drivers/gpu/drm/panel/panel-edp.c | 3 + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 6 +- drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 32 +- drivers/gpu/drm/panel/panel-simple.c | 3 + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 22 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 10 + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 5 + drivers/hwmon/shtc1.c | 2 +- drivers/hwtracing/coresight/coresight-etm4x-core.c | 29 +- drivers/hwtracing/coresight/coresight-etm4x.h | 31 +- drivers/hwtracing/stm/core.c | 11 +- drivers/iio/adc/stm32-adc.c | 1 + drivers/iio/industrialio-core.c | 6 +- drivers/iio/pressure/dps310.c | 11 +- drivers/infiniband/hw/hns/hns_roce_cq.c | 24 +- drivers/infiniband/hw/hns/hns_roce_hem.h | 12 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 7 +- drivers/infiniband/hw/hns/hns_roce_main.c | 1 + drivers/infiniband/hw/hns/hns_roce_mr.c | 15 +- drivers/infiniband/hw/hns/hns_roce_srq.c | 6 +- drivers/infiniband/hw/mlx5/mem.c | 8 +- drivers/infiniband/hw/mlx5/mr.c | 3 +- drivers/infiniband/sw/rxe/rxe_comp.c | 6 +- drivers/infiniband/sw/rxe/rxe_net.c | 46 ++- drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 8 +- drivers/input/misc/ims-pcu.c | 4 +- drivers/input/misc/pm8xxx-vibrator.c | 7 +- drivers/input/mouse/cyapa.c | 12 +- drivers/input/serio/ioc3kbd.c | 13 +- drivers/interconnect/qcom/qcm2290.c | 2 +- drivers/irqchip/irq-alpine-msi.c | 2 +- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- drivers/macintosh/via-macii.c | 11 +- drivers/md/md-bitmap.c | 6 +- drivers/media/cec/core/cec-adap.c | 24 +- drivers/media/cec/core/cec-api.c | 5 +- drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 10 +- drivers/media/pci/ngene/ngene-core.c | 4 +- drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 2 +- .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 1 + drivers/media/radio/radio-shark2.c | 2 +- drivers/media/usb/b2c2/flexcop-usb.c | 2 +- drivers/media/usb/stk1160/stk1160-video.c | 20 +- drivers/misc/vmw_vmci/vmci_guest.c | 10 +- drivers/mmc/host/sdhci_am654.c | 205 +++++++++---- drivers/mtd/mtdcore.c | 6 +- drivers/mtd/nand/raw/nand_hynix.c | 2 +- drivers/net/Makefile | 4 +- drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/dsa/mv88e6xxx/chip.c | 50 +++- drivers/net/dsa/mv88e6xxx/chip.h | 6 + drivers/net/dsa/mv88e6xxx/global1.c | 89 ++++++ drivers/net/dsa/mv88e6xxx/global1.h | 2 + drivers/net/ethernet/amazon/ena/ena_admin_defs.h | 6 +- drivers/net/ethernet/amazon/ena/ena_com.c | 326 +++++++-------------- drivers/net/ethernet/amazon/ena/ena_eth_com.c | 49 ++-- drivers/net/ethernet/amazon/ena/ena_eth_com.h | 15 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 160 ++++++---- drivers/net/ethernet/amazon/ena/ena_netdev.h | 4 + drivers/net/ethernet/cisco/enic/enic_main.c | 12 + drivers/net/ethernet/cortina/gemini.c | 12 +- drivers/net/ethernet/freescale/fec_main.c | 10 + drivers/net/ethernet/freescale/fec_ptp.c | 14 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 19 +- drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 11 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 - drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 56 +--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 46 ++- .../net/ethernet/mellanox/mlx5/core/en/params.c | 9 +- .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 23 +- .../mellanox/mlx5/core/en_accel/en_accel.h | 8 +- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 17 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 12 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 9 +- drivers/net/ethernet/realtek/r8169_main.c | 9 +- drivers/net/ethernet/smsc/smc91x.h | 4 +- drivers/net/ethernet/sun/sungem.c | 14 - drivers/net/ipvlan/ipvlan_core.c | 4 +- drivers/net/phy/micrel.c | 1 + drivers/net/usb/aqc111.c | 8 +- drivers/net/usb/qmi_wwan.c | 3 + drivers/net/usb/smsc95xx.c | 26 +- drivers/net/usb/sr9700.c | 10 +- drivers/net/wireless/ath/ar5523/ar5523.c | 14 + drivers/net/wireless/ath/ath10k/core.c | 3 + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +- drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/targaddrs.h | 3 + drivers/net/wireless/ath/ath10k/wmi.c | 26 +- drivers/net/wireless/ath/ath11k/mac.c | 9 +- drivers/net/wireless/ath/carl9170/tx.c | 3 +- drivers/net/wireless/ath/carl9170/usb.c | 32 ++ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 15 +- drivers/net/wireless/marvell/mwl8k.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 1 + drivers/nvme/host/multipath.c | 3 +- drivers/nvme/target/auth.c | 8 +- drivers/nvme/target/configfs.c | 20 ++ drivers/nvme/target/core.c | 5 +- drivers/nvme/target/nvmet.h | 1 + drivers/nvme/target/tcp.c | 11 +- drivers/pci/controller/dwc/pcie-tegra194.c | 3 + drivers/pci/pcie/edr.c | 28 +- drivers/perf/arm_dmc620_pmu.c | 9 +- drivers/perf/hisilicon/hisi_pcie_pmu.c | 14 +- drivers/perf/hisilicon/hns3_pmu.c | 16 +- drivers/platform/x86/xiaomi-wmi.c | 18 ++ drivers/pwm/pwm-sti.c | 48 +-- drivers/regulator/bd71828-regulator.c | 58 +--- drivers/regulator/irq_helpers.c | 3 + drivers/regulator/vqmmc-ipq4019-regulator.c | 1 + drivers/s390/cio/trace.h | 2 +- drivers/scsi/bfa/bfad_debugfs.c | 4 +- drivers/scsi/hpsa.c | 2 +- drivers/scsi/libsas/sas_expander.c | 3 +- drivers/scsi/qedf/qedf_debugfs.c | 2 +- drivers/scsi/qla2xxx/qla_dfs.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 8 +- drivers/scsi/qla2xxx/qla_mr.c | 20 +- drivers/soc/mediatek/mtk-cmdq-helper.c | 5 +- drivers/soundwire/cadence_master.c | 2 +- drivers/spi/spi-stm32.c | 2 +- drivers/spi/spi.c | 4 + drivers/staging/greybus/arche-apb-ctrl.c | 1 + drivers/staging/greybus/arche-platform.c | 9 +- drivers/staging/greybus/light.c | 8 +- drivers/staging/media/atomisp/pci/sh_css.c | 1 + drivers/thermal/qcom/tsens.c | 2 +- drivers/tty/n_gsm.c | 140 ++++++--- drivers/tty/serial/8250/8250_bcm7271.c | 99 ++++--- drivers/tty/serial/8250/8250_mtk.c | 8 +- drivers/tty/serial/max3100.c | 22 +- drivers/tty/serial/sc16is7xx.c | 2 +- drivers/tty/serial/sh-sci.c | 5 + drivers/ufs/core/ufshcd.c | 4 +- drivers/ufs/host/cdns-pltfrm.c | 2 +- drivers/ufs/host/ufs-qcom.c | 13 +- drivers/ufs/host/ufs-qcom.h | 21 +- drivers/usb/gadget/function/u_audio.c | 21 +- drivers/video/fbdev/Kconfig | 4 +- drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- drivers/video/fbdev/sis/init301.c | 3 +- drivers/virt/acrn/mm.c | 61 +++- drivers/virtio/virtio_pci_common.c | 4 +- drivers/watchdog/bd9576_wdt.c | 12 +- drivers/watchdog/sa1100_wdt.c | 5 +- drivers/xen/xenbus/xenbus_probe.c | 36 ++- fs/ecryptfs/keystore.c | 4 +- fs/eventpoll.c | 38 ++- fs/ext4/mballoc.c | 134 ++++----- fs/ext4/namei.c | 2 +- fs/f2fs/checkpoint.c | 4 +- fs/f2fs/compress.c | 2 +- fs/f2fs/data.c | 10 +- fs/f2fs/extent_cache.c | 4 +- fs/f2fs/file.c | 96 +++--- fs/f2fs/gc.c | 9 +- fs/f2fs/namei.c | 2 +- fs/f2fs/node.c | 2 +- fs/f2fs/segment.c | 2 +- fs/gfs2/glock.c | 4 +- fs/gfs2/glops.c | 3 + fs/gfs2/util.c | 1 - fs/jffs2/xattr.c | 3 + fs/nfs/filelayout/filelayout.c | 4 +- fs/nfs/fs_context.c | 9 +- fs/nfs/nfs4state.c | 12 +- fs/nilfs2/ioctl.c | 2 +- fs/nilfs2/segment.c | 38 ++- fs/nilfs2/the_nilfs.c | 20 +- fs/ntfs3/dir.c | 1 + fs/ntfs3/fslog.c | 3 +- fs/ntfs3/index.c | 6 + fs/ntfs3/inode.c | 7 +- fs/ntfs3/ntfs.h | 2 +- fs/ntfs3/record.c | 11 +- fs/ntfs3/super.c | 2 - fs/openpromfs/inode.c | 8 +- fs/overlayfs/dir.c | 3 - fs/smb/server/mgmt/share_config.c | 6 +- fs/smb/server/oplock.c | 21 +- include/drm/display/drm_dp_helper.h | 6 + include/drm/drm_mipi_dsi.h | 6 +- include/linux/acpi.h | 2 +- include/linux/bitops.h | 1 + include/linux/counter.h | 1 - include/linux/dev_printk.h | 25 +- include/linux/fpga/fpga-region.h | 13 +- include/linux/mlx5/driver.h | 1 + include/linux/numa.h | 26 +- include/linux/printk.h | 2 +- include/linux/skbuff.h | 19 +- include/media/cec.h | 1 + include/net/ax25.h | 3 +- include/net/bluetooth/bluetooth.h | 2 + include/net/bluetooth/l2cap.h | 11 +- include/net/inet6_hashtables.h | 16 + include/net/inet_common.h | 2 + include/net/inet_hashtables.h | 18 +- include/net/mac80211.h | 3 + include/net/netfilter/nf_tables_core.h | 10 - include/trace/events/asoc.h | 2 + include/uapi/linux/bpf.h | 2 +- io_uring/io_uring.h | 3 +- io_uring/nop.c | 2 + kernel/Makefile | 1 + kernel/bpf/verifier.c | 10 +- kernel/cgroup/cpuset.c | 2 +- kernel/dma/map_benchmark.c | 6 +- kernel/irq/cpuhotplug.c | 16 +- kernel/numa.c | 26 ++ kernel/rcu/tasks.h | 2 +- kernel/rcu/tree_stall.h | 3 +- kernel/sched/core.c | 2 +- kernel/sched/fair.c | 53 ++-- kernel/sched/isolation.c | 7 +- kernel/sched/topology.c | 2 +- kernel/softirq.c | 12 +- kernel/trace/ftrace.c | 39 ++- kernel/trace/ring_buffer.c | 9 + kernel/trace/rv/rv.c | 2 + lib/kunit/try-catch.c | 9 +- lib/slub_kunit.c | 2 +- lib/test_hmm.c | 8 +- net/ax25/ax25_dev.c | 48 +-- net/bluetooth/af_bluetooth.c | 21 ++ net/bluetooth/bnep/sock.c | 10 +- net/bluetooth/hci_sock.c | 10 +- net/bluetooth/iso.c | 10 +- net/bluetooth/l2cap_core.c | 56 +++- net/bluetooth/l2cap_sock.c | 99 +++++-- net/bluetooth/rfcomm/sock.c | 13 +- net/bluetooth/sco.c | 10 +- net/bridge/br_device.c | 6 + net/bridge/br_mst.c | 16 +- net/core/dev.c | 3 +- net/ipv4/af_inet.c | 34 ++- net/ipv4/inet_hashtables.c | 29 +- net/ipv4/netfilter/nf_tproxy_ipv4.c | 2 + net/ipv4/tcp_dctcp.c | 13 +- net/ipv4/tcp_ipv4.c | 13 +- net/ipv4/tcp_output.c | 2 +- net/ipv4/udp.c | 55 ++-- net/ipv6/inet6_hashtables.c | 27 +- net/ipv6/reassembly.c | 2 +- net/ipv6/seg6.c | 5 +- net/ipv6/seg6_hmac.c | 42 ++- net/ipv6/seg6_iptunnel.c | 11 +- net/ipv6/udp.c | 61 ++-- net/mac80211/mlme.c | 3 +- net/mac80211/rate.c | 6 +- net/mac80211/scan.c | 1 + net/mac80211/tx.c | 13 +- net/mptcp/sockopt.c | 2 - net/netfilter/nfnetlink_queue.c | 2 + net/netfilter/nft_fib.c | 8 +- net/netfilter/nft_payload.c | 111 +++++-- net/netrom/nr_route.c | 19 +- net/nfc/nci/core.c | 17 +- net/openvswitch/actions.c | 6 + net/openvswitch/flow.c | 3 +- net/packet/af_packet.c | 3 +- net/qrtr/ns.c | 27 ++ net/sunrpc/auth_gss/svcauth_gss.c | 10 +- net/sunrpc/clnt.c | 1 + net/sunrpc/svc.c | 2 - net/sunrpc/xprtrdma/verbs.c | 6 +- net/tls/tls_main.c | 10 +- net/unix/af_unix.c | 39 ++- net/wireless/trace.h | 4 +- scripts/kconfig/symbol.c | 6 +- sound/core/init.c | 20 +- sound/core/jack.c | 46 ++- sound/core/timer.c | 10 + sound/hda/intel-dsp-config.c | 27 +- sound/pci/hda/hda_cs_dsp_ctl.c | 47 ++- sound/pci/hda/patch_realtek.c | 16 +- sound/soc/codecs/da7219-aad.c | 6 +- sound/soc/codecs/rt5645.c | 25 ++ sound/soc/codecs/rt715-sdca.c | 8 +- sound/soc/codecs/rt715-sdw.c | 1 + sound/soc/codecs/tas2552.c | 15 +- sound/soc/intel/avs/boards/ssm4567.c | 1 - sound/soc/intel/avs/cldma.c | 2 +- sound/soc/intel/avs/path.c | 1 + sound/soc/intel/boards/bxt_da7219_max98357a.c | 1 + sound/soc/intel/boards/bxt_rt298.c | 1 + sound/soc/intel/boards/bytcr_rt5640.c | 24 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 + sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 + sound/soc/intel/boards/kbl_rt5660.c | 1 + sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 1 + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 1 + sound/soc/intel/boards/skl_rt286.c | 1 + sound/soc/kirkwood/kirkwood-dma.c | 3 + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 4 +- tools/arch/x86/lib/x86-opcode-map.txt | 10 +- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- tools/bpf/resolve_btfids/main.c | 2 +- tools/include/nolibc/stdlib.h | 2 +- tools/include/uapi/linux/bpf.h | 2 +- tools/lib/bpf/libbpf.c | 2 +- tools/lib/subcmd/parse-options.c | 8 +- tools/perf/Documentation/perf-list.txt | 1 + tools/perf/bench/inject-buildid.c | 2 +- tools/perf/builtin-annotate.c | 2 - tools/perf/builtin-daemon.c | 4 +- tools/perf/builtin-record.c | 4 +- tools/perf/builtin-report.c | 2 +- tools/perf/tests/Build | 2 + tools/perf/tests/builtin-test.c | 29 ++ tools/perf/tests/tests.h | 27 ++ tools/perf/tests/workloads/Build | 13 + tools/perf/tests/workloads/brstack.c | 40 +++ tools/perf/tests/workloads/datasym.c | 40 +++ tools/perf/tests/workloads/leafloop.c | 34 +++ tools/perf/tests/workloads/noploop.c | 32 ++ tools/perf/tests/workloads/sqrtloop.c | 45 +++ tools/perf/tests/workloads/thloop.c | 53 ++++ tools/perf/ui/browser.c | 6 +- tools/perf/ui/browser.h | 2 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 + tools/perf/util/intel-pt.c | 2 + tools/perf/util/probe-event.c | 1 + tools/perf/util/stat-display.c | 3 + tools/testing/selftests/bpf/network_helpers.c | 2 + tools/testing/selftests/bpf/test_sockmap.c | 2 +- .../selftests/filesystems/binderfs/Makefile | 2 - tools/testing/selftests/kcmp/kcmp_test.c | 2 +- tools/testing/selftests/kvm/aarch64/vgic_init.c | 50 ++++ tools/testing/selftests/lib.mk | 12 +- tools/testing/selftests/net/amt.sh | 20 +- .../selftests/net/forwarding/bridge_igmp.sh | 6 +- .../testing/selftests/net/forwarding/bridge_mld.sh | 6 +- tools/testing/selftests/resctrl/Makefile | 4 +- .../selftests/syscall_user_dispatch/sud_test.c | 14 + tools/tracing/latency/latency-collector.c | 8 +- 480 files changed, 4208 insertions(+), 2400 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/473 x86/tsc: Trust initial offset in architectural TSC-adjust MSRs
6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel J Blueman <[email protected]>
commit 455f9075f14484f358b3c1d6845b4a438de198a7 upstream.
When the BIOS configures the architectural TSC-adjust MSRs on secondary sockets to correct a constant inter-chassis offset, after Linux brings the cores online, the TSC sync check later resets the core-local MSR to 0, triggering HPET fallback and leading to performance loss.
Fix this by unconditionally using the initial adjust values read from the MSRs. Trusting the initial offsets in this architectural mechanism is a better approach than special-casing workarounds for specific platforms.
--- arch/x86/kernel/tsc_sync.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/x86/kernel/tsc_sync.c +2 -4
@@ -192,11 +192,9 @@ bool tsc_store_and_check_tsc_adjust(bool cur->warned = false;/* -* If a non-zero TSC value for socket 0 may be valid then the default -* adjusted value cannot assumed to be zero either. +* The default adjust value cannot be assumed to be zero on any socket. */ -if (tsc_async_resets) - cur->adjusted = bootval; + cur->adjusted = bootval;/* * Check whether this CPU is the first in a package to come up. In
Greg Kroah-Hartman
maintainerPATCH 2/473 ftrace: Fix possible use-after-free issue in ftrace_location()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zheng Yejian <[email protected]>
commit e60b613df8b6253def41215402f72986fee3fc8d upstream.
KASAN reports a bug:
BUG: KASAN: use-after-free in ftrace_location+0x90/0x120 Read of size 8 at addr ffff888141d40010 by task insmod/424 CPU: 8 PID: 424 Comm: insmod Tainted: G W 6.9.0-rc2+ [...] Call Trace: <TASK> dump_stack_lvl+0x68/0xa0 print_report+0xcf/0x610 kasan_report+0xb5/0xe0 ftrace_location+0x90/0x120 register_kprobe+0x14b/0xa40 kprobe_init+0x2d/0xff0 [kprobe_example] do_one_initcall+0x8f/0x2d0 do_init_module+0x13a/0x3c0 load_module+0x3082/0x33d0 init_module_from_file+0xd2/0x130 __x64_sys_finit_module+0x306/0x440 do_syscall_64+0x68/0x140 entry_SYSCALL_64_after_hwframe+0x71/0x79
The root cause is that, in lookup_rec(), ftrace record of some address is being searched in ftrace pages of some module, but those ftrace pages at the same time is being freed in ftrace_release_mod() as the corresponding module is being deleted:
CPU1 | CPU2
register_kprobes() { | delete_module() {
check_kprobe_address_safe() { |
arch_check_ftrace_location() { |
ftrace_location() { |
lookup_rec() // USE! | ftrace_release_mod() // Free!To fix this issue:
1. Hold rcu lock as accessing ftrace pages in ftrace_location_range();
2. Use ftrace_location_range() instead of lookup_rec() in
ftrace_location();
3. Call synchronize_rcu() before freeing any ftrace pages both in ftrace_process_locs()/ftrace_release_mod()/ftrace_free_mem().
--- kernel/trace/ftrace.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-)
kernel/trace/ftrace.c +23 -16
@@ -1565,12 +1565,15 @@ static struct dyn_ftrace *lookup_rec(unsunsigned long ftrace_location_range (unsigned long start,unsigned long end) {struct dyn_ftrace *rec; +unsigned long ip =0 ; +rcu_read_lock (); rec =lookup_rec (start, end);if (rec) -return rec->ip; + ip = rec->ip; +rcu_read_unlock (); -return 0 ; +return ip; }/**
@@ -1583,25 +1586,22 @@ unsigned long ftrace_location_range(unsi*/ unsigned long ftrace_location (unsigned long ip) { -struct dyn_ftrace *rec; +unsigned long loc;unsigned long offset;unsigned long size; - rec =lookup_rec (ip, ip); -if (!rec) { + loc =ftrace_location_range (ip, ip); +if (!loc) {if (!kallsyms_lookup_size_offset (ip, &size, &offset)) goto out;/* map sym+0 to __fentry__ */ if (!offset) - rec =lookup_rec (ip, ip + size -1 ); + loc =ftrace_location_range (ip, ip + size -1 ); } -if (rec) -return rec->ip; - out: -return 0 ; +return loc; }/**
@@ -6784,6 +6784,8 @@ static int ftrace_process_locs(struct mo/* We should have used all pages unless we skipped some */ if (pg_unuse) {WARN_ON (!skipped); +/* Need to synchronize with ftrace_location_range() */ +synchronize_rcu ();ftrace_free_pages (pg_unuse); }return ret;
@@ -6998,6 +7000,9 @@ void ftrace_release_mod(struct module *m out_unlock:mutex_unlock (&ftrace_lock); +/* Need to synchronize with ftrace_location_range() */ +if (tmp_page) +synchronize_rcu ();for (pg = tmp_page; pg; pg = tmp_page) {/* Needs to be called outside of ftrace_lock */
@@ -7332,6 +7337,7 @@ void ftrace_free_mem(struct module *mod,unsigned long start = (unsigned long )(start_ptr);unsigned long end = (unsigned long )(end_ptr);struct ftrace_page **last_pg = &ftrace_pages_start; +struct ftrace_page *tmp_page =NULL ;struct ftrace_page *pg;struct dyn_ftrace *rec;struct dyn_ftrace key;
@@ -7375,12 +7381,8 @@ void ftrace_free_mem(struct module *mod, ftrace_update_tot_cnt--;if (!pg->index) { *last_pg = pg->next; -if (pg->records) { -free_pages ((unsigned long )pg->records, pg->order); - ftrace_number_of_pages -=1 << pg->order; - } - ftrace_number_of_groups--; -kfree (pg); + pg->next = tmp_page; + tmp_page = pg; pg = container_of(last_pg, struct ftrace_page, next);if (!(*last_pg)) ftrace_pages = pg;
@@ -7397,6 +7399,11 @@ void ftrace_free_mem(struct module *mod,clear_func_from_hashes (func);kfree (func); } +/* Need to synchronize with ftrace_location_range() */ +if (tmp_page) { +synchronize_rcu (); +ftrace_free_pages (tmp_page); + } }void __init ftrace_free_init_mem (void )
Greg Kroah-Hartman
maintainerPATCH 3/473 tty: n_gsm: fix possible out-of-bounds in gsm0_receive()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Starke <[email protected]>
commit 47388e807f85948eefc403a8a5fdc5b406a65d5a upstream.
Assuming the following:
- side A configures the n_gsm in basic option mode
- side B sends the header of a basic option mode frame with data length 1
- side A switches to advanced option mode
- side B sends 2 data bytes which exceeds gsm->len
Reason: gsm->len is not used in advanced option mode.
- side A switches to basic option mode
- side B keeps sending until gsm0_receive() writes past gsm->buf
Reason: Neither gsm->state nor gsm->len have been reset after reconfiguration.
Fix this by changing gsm->count to gsm->len comparison from equal to less than. Also add upper limit checks against the constant MAX_MRU in gsm0_receive() and gsm1_receive() to harden against memory corruption of gsm->len and gsm->mru.
All other checks remain as we still need to limit the data according to the user configuration and actual payload size.
--- drivers/tty/n_gsm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/tty/n_gsm.c +5 -2
@@ -2325,7 +2325,10 @@ static void gsm0_receive(struct gsm_muxbreak ;case GSM_DATA :/* Data */ gsm->buf[gsm->count++] = c; -if (gsm->count == gsm->len) { +if (gsm->count >=MAX_MRU ) { + gsm->bad_size++; + gsm->state =GSM_SEARCH ; + }else if (gsm->count >= gsm->len) {/* Calculate final FCS for UI frames over all data */ if ((gsm->control & ~PF ) !=UIH ) { gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf,
@@ -2438,7 +2441,7 @@ static void gsm1_receive(struct gsm_mux gsm->state =GSM_DATA ;break ;case GSM_DATA :/* Data */ -if (gsm->count > gsm->mru) {/* Allow one for the FCS */ +if (gsm->count > gsm->mru || gsm->count >MAX_MRU ) {/* Allow one for the FCS */ gsm->state =GSM_OVERRUN ; gsm->bad_size++; }else
Greg Kroah-Hartman
maintainerPATCH 4/473 tty: n_gsm: fix missing receive state reset after mode switch
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Starke <[email protected]>
commit 70d7f1427afcf7fa2d21cb5a04c6f3555d5b9357 upstream.
The current implementation uses either gsm0_receive() or gsm1_receive() depending on whether the user configured the mux in basic or advanced option mode. Both functions share some state values over the same logical elements of the frame. However, both frame types differ in their nature. gsm0_receive() uses non-transparency framing, whereas gsm1_receive() uses transparency mechanism. Switching between both modes leaves the receive function in an undefined state when done during frame reception.
Fix this by splitting both states. Add gsm0_receive_state_check_and_fix() and gsm1_receive_state_check_and_fix() to ensure that gsm->state is reset after a change of gsm->receive.
Note that gsm->state is only accessed in:
- gsm0_receive()
- gsm1_receive()
- gsm_error()
--- drivers/tty/n_gsm.c | 133 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 92 insertions(+), 41 deletions(-)
drivers/tty/n_gsm.c +92 -41
@@ -202,16 +202,18 @@ enum gsm_encoding {enum gsm_mux_state {GSM_SEARCH , -GSM_START , -GSM_ADDRESS , -GSM_CONTROL , -GSM_LEN , -GSM_DATA , -GSM_FCS , -GSM_OVERRUN , -GSM_LEN0 , -GSM_LEN1 , -GSM_SSOF , +GSM0_ADDRESS , +GSM0_CONTROL , +GSM0_LEN0 , +GSM0_LEN1 , +GSM0_DATA , +GSM0_FCS , +GSM0_SSOF , +GSM1_START , +GSM1_ADDRESS , +GSM1_CONTROL , +GSM1_DATA , +GSM1_OVERRUN , };/*
@@ -2259,6 +2261,30 @@ invalid:return ; } +/** +* gsm0_receive_state_check_and_fix - check and correct receive state +* @gsm: gsm data for this ldisc instance +* +* Ensures that the current receive state is valid for basic option mode. +*/ + +static void gsm0_receive_state_check_and_fix (struct gsm_mux *gsm) +{ +switch (gsm->state) { +case GSM_SEARCH : +case GSM0_ADDRESS : +case GSM0_CONTROL : +case GSM0_LEN0 : +case GSM0_LEN1 : +case GSM0_DATA : +case GSM0_FCS : +case GSM0_SSOF : +break ; +default : + gsm->state =GSM_SEARCH ; +break ; + } +}/** * gsm0_receive - perform processing for non-transparency
@@ -2272,26 +2298,27 @@ static void gsm0_receive(struct gsm_mux {unsigned int len; +gsm0_receive_state_check_and_fix (gsm);switch (gsm->state) {case GSM_SEARCH :/* SOF marker */ if (c ==GSM0_SOF ) { - gsm->state =GSM_ADDRESS ; + gsm->state =GSM0_ADDRESS ; gsm->address =0 ; gsm->len =0 ; gsm->fcs =INIT_FCS ; }break ; -case GSM_ADDRESS :/* Address EA */ +case GSM0_ADDRESS :/* Address EA */ gsm->fcs =gsm_fcs_add (gsm->fcs, c);if (gsm_read_ea (&gsm->address, c)) - gsm->state =GSM_CONTROL ; + gsm->state =GSM0_CONTROL ;break ; -case GSM_CONTROL :/* Control Byte */ +case GSM0_CONTROL :/* Control Byte */ gsm->fcs =gsm_fcs_add (gsm->fcs, c); gsm->control = c; - gsm->state =GSM_LEN0 ; + gsm->state =GSM0_LEN0 ;break ; -case GSM_LEN0 :/* Length EA */ +case GSM0_LEN0 :/* Length EA */ gsm->fcs =gsm_fcs_add (gsm->fcs, c);if (gsm_read_ea (&gsm->len, c)) {if (gsm->len > gsm->mru) {
@@ -2301,14 +2328,14 @@ static void gsm0_receive(struct gsm_mux } gsm->count =0 ;if (!gsm->len) - gsm->state =GSM_FCS ; + gsm->state =GSM0_FCS ;else - gsm->state =GSM_DATA ; + gsm->state =GSM0_DATA ;break ; } - gsm->state =GSM_LEN1 ; + gsm->state =GSM0_LEN1 ;break ; -case GSM_LEN1 : +case GSM0_LEN1 : gsm->fcs =gsm_fcs_add (gsm->fcs, c); len = c; gsm->len |= len <<7 ;
@@ -2319,11 +2346,11 @@ static void gsm0_receive(struct gsm_mux } gsm->count =0 ;if (!gsm->len) - gsm->state =GSM_FCS ; + gsm->state =GSM0_FCS ;else - gsm->state =GSM_DATA ; + gsm->state =GSM0_DATA ;break ; -case GSM_DATA :/* Data */ +case GSM0_DATA :/* Data */ gsm->buf[gsm->count++] = c;if (gsm->count >=MAX_MRU ) { gsm->bad_size++;
@@ -2334,14 +2361,14 @@ static void gsm0_receive(struct gsm_mux gsm->fcs =gsm_fcs_add_block (gsm->fcs, gsm->buf, gsm->count); } - gsm->state =GSM_FCS ; + gsm->state =GSM0_FCS ; }break ; -case GSM_FCS :/* FCS follows the packet */ +case GSM0_FCS :/* FCS follows the packet */ gsm->fcs =gsm_fcs_add (gsm->fcs, c); - gsm->state =GSM_SSOF ; + gsm->state =GSM0_SSOF ;break ; -case GSM_SSOF : +case GSM0_SSOF : gsm->state =GSM_SEARCH ;if (c ==GSM0_SOF )gsm_queue (gsm);
@@ -2355,6 +2382,29 @@ static void gsm0_receive(struct gsm_mux }/** +* gsm1_receive_state_check_and_fix - check and correct receive state +* @gsm: gsm data for this ldisc instance +* +* Ensures that the current receive state is valid for advanced option mode. +*/ + +static void gsm1_receive_state_check_and_fix (struct gsm_mux *gsm) +{ +switch (gsm->state) { +case GSM_SEARCH : +case GSM1_START : +case GSM1_ADDRESS : +case GSM1_CONTROL : +case GSM1_DATA : +case GSM1_OVERRUN : +break ; +default : + gsm->state =GSM_SEARCH ; +break ; + } +} + +/** * gsm1_receive - perform processing for non-transparency * @gsm: gsm data for this ldisc instance * @c: character
@@ -2364,6 +2414,7 @@ static void gsm0_receive(struct gsm_muxstatic void gsm1_receive (struct gsm_mux *gsm,unsigned char c) { +gsm1_receive_state_check_and_fix (gsm);/* handle XON/XOFF */ if ((c &ISO_IEC_646_MASK ) ==XON ) { gsm->constipated = true;
@@ -2376,11 +2427,11 @@ static void gsm1_receive(struct gsm_mux }if (c ==GSM1_SOF ) {/* EOF is only valid in frame if we have got to the data state */ -if (gsm->state ==GSM_DATA ) { +if (gsm->state ==GSM1_DATA ) {if (gsm->count <1 ) {/* Missing FSC */ gsm->malformed++; - gsm->state =GSM_START ; + gsm->state =GSM1_START ;return ; }/* Remove the FCS from data */
@@ -2396,14 +2447,14 @@ static void gsm1_receive(struct gsm_mux gsm->fcs =gsm_fcs_add (gsm->fcs, gsm->buf[gsm->count]); gsm->len = gsm->count;gsm_queue (gsm); - gsm->state =GSM_START ; + gsm->state =GSM1_START ;return ; }/* Any partial frame was a runt so go back to start */ -if (gsm->state !=GSM_START ) { +if (gsm->state !=GSM1_START ) {if (gsm->state !=GSM_SEARCH ) gsm->malformed++; - gsm->state =GSM_START ; + gsm->state =GSM1_START ; }/* A SOF in GSM_START means we are still reading idling or framing bytes */
@@ -2424,30 +2475,30 @@ static void gsm1_receive(struct gsm_mux gsm->escape = false; }switch (gsm->state) { -case GSM_START :/* First byte after SOF */ +case GSM1_START :/* First byte after SOF */ gsm->address =0 ; - gsm->state =GSM_ADDRESS ; + gsm->state =GSM1_ADDRESS ; gsm->fcs =INIT_FCS ; fallthrough; -case GSM_ADDRESS :/* Address continuation */ +case GSM1_ADDRESS :/* Address continuation */ gsm->fcs =gsm_fcs_add (gsm->fcs, c);if (gsm_read_ea (&gsm->address, c)) - gsm->state =GSM_CONTROL ; + gsm->state =GSM1_CONTROL ;break ; -case GSM_CONTROL :/* Control Byte */ +case GSM1_CONTROL :/* Control Byte */ gsm->fcs =gsm_fcs_add (gsm->fcs, c); gsm->control = c; gsm->count =0 ; - gsm->state =GSM_DATA ; + gsm->state =GSM1_DATA ;break ; -case GSM_DATA :/* Data */ +case GSM1_DATA :/* Data */ if (gsm->count > gsm->mru || gsm->count >MAX_MRU ) {/* Allow one for the FCS */ - gsm->state =GSM_OVERRUN ; + gsm->state =GSM1_OVERRUN ; gsm->bad_size++; }else gsm->buf[gsm->count++] = c;break ; -case GSM_OVERRUN :/* Over-long - eg a dropped SOF */ +case GSM1_OVERRUN :/* Over-long - eg a dropped SOF */ break ;default :pr_debug ("%s: unhandled state: %d\n" , __func__, gsm->state);
Greg Kroah-Hartman
maintainerPATCH 5/473 speakup: Fix sizeof() vs ARRAY_SIZE() bug
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
commit 008ab3c53bc4f0b2f20013c8f6c204a3203d0b8b upstream.
The "buf" pointer is an array of u16 values. This code should be using ARRAY_SIZE() (which is 256) instead of sizeof() (which is 512), otherwise it can the still got out of bounds.
--- drivers/accessibility/speakup/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/accessibility/speakup/main.c +1 -1
@@ -573,7 +573,7 @@ static u_long get_word(struct vc_data *v } attr_ch =get_char (vc, (u_short *)tmp_pos, &spk_attr); buf[cnt++] = attr_ch; -while (tmpx < vc->vc_cols -1 && cnt <sizeof (buf) -1 ) { +while (tmpx < vc->vc_cols -1 && cnt <ARRAY_SIZE (buf) -1 ) { tmp_pos +=2 ; tmpx++; ch =get_char (vc, (u_short *)tmp_pos, &temp);
Greg Kroah-Hartman
maintainerPATCH 6/473 serial: 8250_bcm7271: use default_mux_rate if possible
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Doug Berger <[email protected]>
commit 614a19b89ca43449196a8af1afac7d55c6781687 upstream.
There is a scenario when resuming from some power saving states with no_console_suspend where console output can be generated before the 8250_bcm7271 driver gets the opportunity to restore the baud_mux_clk frequency. Since the baud_mux_clk is at its default frequency at this time the output can be garbled until the driver gets the opportunity to resume.
Since this is only an issue with console use of the serial port during that window and the console isn't likely to use baud rates that require alternate baud_mux_clk frequencies, allow the driver to select the default_mux_rate if it is accurate enough.
--- drivers/tty/serial/8250/8250_bcm7271.c | 101 +++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 41 deletions(-)
drivers/tty/serial/8250/8250_bcm7271.c +60 -41
@@ -674,18 +674,46 @@ static void init_real_clk_rates(struct dclk_set_rate (priv->baud_mux_clk, priv->default_mux_rate); } +static u32 find_quot (struct device *dev,u32 freq,u32 baud,u32 *percent) +{ +u32 quot; +u32 rate; +u64 hires_rate; +u64 hires_baud; +u64 hires_err; + + rate = freq /16 ; + quot =DIV_ROUND_CLOSEST (rate, baud); +if (!quot) +return 0 ; + +/* increase resolution to get xx.xx percent */ + hires_rate =div_u64 ((u64 )rate *10000 , (u64 )quot); + hires_baud = (u64 )baud *10000 ; + +/* get the delta */ +if (hires_rate > hires_baud) + hires_err = (hires_rate - hires_baud); +else + hires_err = (hires_baud - hires_rate); + + *percent = (unsigned long )DIV_ROUND_CLOSEST_ULL (hires_err, baud); + +dev_dbg (dev,"Baud rate: %u, MUX Clk: %u, Error: %u.%u%%\n" , + baud, freq, *percent /100 , *percent %100 ); + +return quot; +} +static void set_clock_mux (struct uart_port *up,struct brcmuart_priv *priv,u32 baud) {u32 percent;u32 best_percent =UINT_MAX ;u32 quot; +u32 freq;u32 best_quot =1 ; -u32 rate; -int best_index =-1 ; -u64 hires_rate; -u64 hires_baud; -u64 hires_err; +u32 best_freq =0 ;int rc;int i;int real_baud;
@@ -694,44 +722,35 @@ static void set_clock_mux(struct uart_poif (priv->baud_mux_clk ==NULL )return ; -/* Find the closest match for specified baud */ -for (i =0 ; i <ARRAY_SIZE (priv->real_rates); i++) { -if (priv->real_rates[i] ==0 ) -continue ; - rate = priv->real_rates[i] /16 ; - quot =DIV_ROUND_CLOSEST (rate, baud); -if (!quot) -continue ; - -/* increase resolution to get xx.xx percent */ - hires_rate = (u64 )rate *10000 ; - hires_baud = (u64 )baud *10000 ; - - hires_err =div_u64 (hires_rate, (u64 )quot); - -/* get the delta */ -if (hires_err > hires_baud) - hires_err = (hires_err - hires_baud); -else - hires_err = (hires_baud - hires_err); - - percent = (unsigned long )DIV_ROUND_CLOSEST_ULL (hires_err, baud); -dev_dbg (up->dev, -"Baud rate: %u, MUX Clk: %u, Error: %u.%u%%\n" , - baud, priv->real_rates[i], percent /100 , - percent %100 ); -if (percent < best_percent) { - best_percent = percent; - best_index = i; - best_quot = quot; +/* Try default_mux_rate first */ + quot =find_quot (up->dev, priv->default_mux_rate, baud, &percent); +if (quot) { + best_percent = percent; + best_freq = priv->default_mux_rate; + best_quot = quot; + } +/* If more than 1% error, find the closest match for specified baud */ +if (best_percent >100 ) { +for (i =0 ; i <ARRAY_SIZE (priv->real_rates); i++) { + freq = priv->real_rates[i]; +if (freq ==0 || freq == priv->default_mux_rate) +continue ; + quot =find_quot (up->dev, freq, baud, &percent); +if (!quot) +continue ; + +if (percent < best_percent) { + best_percent = percent; + best_freq = freq; + best_quot = quot; + } } } -if (best_index ==-1 ) { +if (!best_freq) {dev_err (up->dev,"Error, %d BAUD rate is too fast.\n" , baud);return ; } - rate = priv->real_rates[best_index]; - rc =clk_set_rate (priv->baud_mux_clk, rate); + rc =clk_set_rate (priv->baud_mux_clk, best_freq);if (rc)dev_err (up->dev,"Error selecting BAUD MUX clock\n" );
@@ -740,8 +759,8 @@ static void set_clock_mux(struct uart_podev_err (up->dev,"Error, baud: %d has %u.%u%% error\n" , baud, percent /100 , percent %100 ); - real_baud = rate /16 / best_quot; -dev_dbg (up->dev,"Selecting BAUD MUX rate: %u\n" , rate); + real_baud = best_freq /16 / best_quot; +dev_dbg (up->dev,"Selecting BAUD MUX rate: %u\n" , best_freq);dev_dbg (up->dev,"Requested baud: %u, Actual baud: %u\n" , baud, real_baud);
@@ -750,7 +769,7 @@ static void set_clock_mux(struct uart_po i += (i /2 ); priv->char_wait =ns_to_ktime (i); - up->uartclk = rate; + up->uartclk = best_freq; } static void brcmstb_set_termios(struct uart_port *up,
Greg Kroah-Hartman
maintainerPATCH 7/473 serial: 8520_mtk: Set RTS on shutdown for Rx in-band wakeup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pin-yen Lin <[email protected]>
commit 4244f830a56058ee0670d80e7ac9fd7c982eb480 upstream.
When Rx in-band wakeup is enabled, set RTS to true in mtk8250_shutdown() so the connected device can still send message and trigger IRQ when the system is suspended.
--- drivers/tty/serial/8250/8250_mtk.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_mtk.c +6 -2
@@ -209,15 +209,19 @@ static int mtk8250_startup(struct uart_pstatic void mtk8250_shutdown (struct uart_port *port) { -#ifdef CONFIG_SERIAL_8250_DMA struct uart_8250_port *up =up_to_u8250p (port);struct mtk8250_data *data = port->private_data; +int irq = data->rx_wakeup_irq; +#ifdef CONFIG_SERIAL_8250_DMA if (up->dma) data->rx_status =DMA_RX_SHUTDOWN ;#endif -return serial8250_do_shutdown (port); +serial8250_do_shutdown (port); + +if (irq >=0 ) +serial8250_do_set_mctrl (&up->port,TIOCM_RTS ); }static void mtk8250_disable_intrs (struct uart_8250_port *up,int mask)
Greg Kroah-Hartman
maintainerPATCH 8/473 io_uring: fail NOP if non-zero op flags is passed in
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit 3d8f874bd620ce03f75a5512847586828ab86544 upstream.
The NOP op flags should have been checked from beginning like any other opcode, otherwise NOP may not be extended with the op flags.
Given both liburing and Rust io-uring crate always zeros SQE op flags, just ignore users which play raw NOP uring interface without zeroing SQE, because NOP is just for test purpose. Then we can save one NOP2 opcode.
--- io_uring/nop.c | 2 ++ 1 file changed, 2 insertions(+)
io_uring/nop.c +2 -0
@@ -12,6 +12,8 @@int io_nop_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { +if (READ_ONCE (sqe->rw_flags)) +return -EINVAL ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 9/473 Revert "r8169: dont try to disable interrupts if NAPI is, scheduled already"
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
commit eabb8a9be1e4a12f3bf37ceb7411083e3775672d upstream.
This reverts commit 7274c4147afbf46f45b8501edbdad6da8cd013b9.
Ken reported that RTL8125b can lock up if gro_flush_timeout has the default value of 20000 and napi_defer_hard_irqs is set to 0. In this scenario device interrupts aren't disabled, what seems to trigger some silicon bug under heavy load. I was able to reproduce this behavior on RTL8168h. Fix this by reverting 7274c4147afb.
--- drivers/net/ethernet/realtek/r8169_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -4
@@ -4607,10 +4607,8 @@ static irqreturn_t rtl8169_interrupt(intrtl_schedule_task (tp,RTL_FLAG_TASK_RESET_PENDING ); } -if (napi_schedule_prep (&tp->napi)) { -rtl_irq_disable (tp); -__napi_schedule (&tp->napi); - } +rtl_irq_disable (tp); +napi_schedule (&tp->napi); out:rtl_ack_events (tp, status);
Greg Kroah-Hartman
maintainerPATCH 10/473 r8169: Fix possible ring buffer corruption on fragmented Tx packets.
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ken Milmore <[email protected]>
commit c71e3a5cffd5309d7f84444df03d5b72600cc417 upstream.
An issue was found on the RTL8125b when transmitting small fragmented packets, whereby invalid entries were inserted into the transmit ring buffer, subsequently leading to calls to dma_unmap_single() with a null address.
This was caused by rtl8169_start_xmit() not noticing changes to nr_frags which may occur when small packets are padded (to work around hardware quirks) in rtl8169_tso_csum_v2().
To fix this, postpone inspecting nr_frags until after any padding has been applied.
--- drivers/net/ethernet/realtek/r8169_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -1
@@ -4263,11 +4263,11 @@ static void rtl8169_doorbell(struct rtl8static netdev_tx_t rtl8169_start_xmit (struct sk_buff *skb,struct net_device *dev) { -unsigned int frags =skb_shinfo (skb)->nr_frags;struct rtl8169_private *tp =netdev_priv (dev);unsigned int entry = tp->cur_tx %NUM_TX_DESC ;struct TxDesc *txd_first, *txd_last;bool stop_queue, door_bell; +unsigned int frags;u32 opts[2 ];if (unlikely (!rtl_tx_slots_avail (tp))) {
@@ -4290,6 +4290,7 @@ static netdev_tx_t rtl8169_start_xmit(st txd_first = tp->TxDescArray + entry; + frags =skb_shinfo (skb)->nr_frags;if (frags) {if (rtl8169_xmit_frags (tp, skb, opts, entry)) goto err_dma_1;
Greg Kroah-Hartman
maintainerPATCH 11/473 ring-buffer: Fix a race between readers and resize checks
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Pavlu <[email protected]>
commit c2274b908db05529980ec056359fae916939fdaa upstream.
The reader code in rb_get_reader_page() swaps a new reader page into the ring buffer by doing cmpxchg on old->list.prev->next to point it to the new page. Following that, if the operation is successful, old->list.next->prev gets updated too. This means the underlying doubly-linked list is temporarily inconsistent, page->prev->next or page->next->prev might not be equal back to page for some page in the ring buffer.
The resize operation in ring_buffer_resize() can be invoked in parallel. It calls rb_check_pages() which can detect the described inconsistency and stop further tracing:
[ 190.271762] ------------[ cut here ]------------ [ 190.271771] WARNING: CPU: 1 PID: 6186 at kernel/trace/ring_buffer.c:1467 rb_check_pages.isra.0+0x6a/0xa0 [ 190.271789] Modules linked in: [...] [ 190.271991] Unloaded tainted modules: intel_uncore_frequency(E):1 skx_edac(E):1 [ 190.272002] CPU: 1 PID: 6186 Comm: cmd.sh Kdump: loaded Tainted: G E 6.9.0-rc6-default #5 158d3e1e6d0b091c34c3b96bfd99a1c58306d79f [ 190.272011] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.0-0-gd239552c-rebuilt.opensuse.org 04/01/2014 [ 190.272015] RIP: 0010:rb_check_pages.isra.0+0x6a/0xa0 [ 190.272023] Code: [...] [ 190.272028] RSP: 0018:ffff9c37463abb70 EFLAGS: 00010206 [ 190.272034] RAX: ffff8eba04b6cb80 RBX: 0000000000000007 RCX: ffff8eba01f13d80 [ 190.272038] RDX: ffff8eba01f130c0 RSI: ffff8eba04b6cd00 RDI: ffff8eba0004c700 [ 190.272042] RBP: ffff8eba0004c700 R08: 0000000000010002 R09: 0000000000000000 [ 190.272045] R10: 00000000ffff7f52 R11: ffff8eba7f600000 R12: ffff8eba0004c720 [ 190.272049] R13: ffff8eba00223a00 R14: 0000000000000008 R15: ffff8eba067a8000 [ 190.272053] FS: 00007f1bd64752c0(0000) GS:ffff8eba7f680000(0000) knlGS:0000000000000000 [ 190.272057] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 190.272061] CR2: 00007f1bd6662590 CR3: 000000010291e001 CR4: 0000000000370ef0 [ 190.272070] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 190.272073] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 190.272077] Call Trace: [ 190.272098] <TASK> [ 190.272189] ring_buffer_resize+0x2ab/0x460 [ 190.272199] __tracing_resize_ring_buffer.part.0+0x23/0xa0 [ 190.272206] tracing_resize_ring_buffer+0x65/0x90 [ 190.272216] tracing_entries_write+0x74/0xc0 [ 190.272225] vfs_write+0xf5/0x420 [ 190.272248] ksys_write+0x67/0xe0 [ 190.272256] do_syscall_64+0x82/0x170 [ 190.272363] entry_SYSCALL_64_after_hwframe+0x76/0x7e [ 190.272373] RIP: 0033:0x7f1bd657d263 [ 190.272381] Code: [...] [ 190.272385] RSP: 002b:00007ffe72b643f8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 190.272391] RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f1bd657d263 [ 190.272395] RDX: 0000000000000002 RSI: 0000555a6eb538e0 RDI: 0000000000000001 [ 190.272398] RBP: 0000555a6eb538e0 R08: 000000000000000a R09: 0000000000000000 [ 190.272401] R10: 0000555a6eb55190 R11: 0000000000000246 R12: 00007f1bd6662500 [ 190.272404] R13: 0000000000000002 R14: 00007f1bd6667c00 R15: 0000000000000002 [ 190.272412] </TASK> [ 190.272414] ---[ end trace 0000000000000000 ]---
Note that ring_buffer_resize() calls rb_check_pages() only if the parent trace_buffer has recording disabled. Recent commit d78ab792705c ("tracing: Stop current tracer when resizing buffer") causes that it is now always the case which makes it more likely to experience this issue.
The window to hit this race is nonetheless very small. To help reproducing it, one can add a delay loop in rb_get_reader_page():
ret = rb_head_page_replace(reader, cpu_buffer->reader_page); if (!ret)
goto spin;
for (unsigned i = 0; i < 1U << 26; i++) /* inserted delay loop */
__asm__ __volatile__ ("" : : : "memory");
rb_list_head(reader->list.next)->prev = &cpu_buffer->reader_page->list;
.. and then run the following commands on the target system:
echo 1 > /sys/kernel/tracing/events/sched/sched_switch/enable while true; do
echo 16 > /sys/kernel/tracing/buffer_size_kb; sleep 0.1 echo 8 > /sys/kernel/tracing/buffer_size_kb; sleep 0.1
done &
while true; do
for i in /sys/kernel/tracing/per_cpu/*; do
timeout 0.1 cat $i/trace_pipe; sleep 0.2
done
done
To fix the problem, make sure ring_buffer_resize() doesn't invoke rb_check_pages() concurrently with a reader operating on the same ring_buffer_per_cpu by taking its cpu_buffer->reader_lock.
--- kernel/trace/ring_buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/trace/ring_buffer.c +9 -0
@@ -1602,6 +1602,11 @@ static int rb_check_bpage(struct ring_bu* * As a safety measure we check to make sure the data pages have not * been corrupted. +* +* Callers of this function need to guarantee that the list of pages doesn't get +* modified during the check. In particular, if it's possible that the function +* is invoked with concurrent readers which can swap in a new reader page then +* the caller should take cpu_buffer->reader_lock. */ static int rb_check_pages (struct ring_buffer_per_cpu *cpu_buffer) {
@@ -2323,8 +2328,12 @@ int ring_buffer_resize(struct trace_buff*/ synchronize_rcu ();for_each_buffer_cpu (buffer, cpu) { +unsigned long flags; + cpu_buffer = buffer->buffers[cpu]; +raw_spin_lock_irqsave (&cpu_buffer->reader_lock, flags);rb_check_pages (cpu_buffer); +raw_spin_unlock_irqrestore (&cpu_buffer->reader_lock, flags); }atomic_dec (&buffer->record_disabled); }
Greg Kroah-Hartman
maintainerPATCH 12/473 tools/latency-collector: Fix -Wformat-security compile warns
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuah Khan <[email protected]>
commit df73757cf8f66fa54c4721c53b0916af3c4d9818 upstream.
Fix the following -Wformat-security compile warnings adding missing format arguments:
latency-collector.c: In function ‘show_available’:
latency-collector.c:938:17: warning: format not a string literal and no format arguments [-Wformat-security]
938 | warnx(no_tracer_msg);
| ^~~~~latency-collector.c:943:17: warning: format not a string literal and no format arguments [-Wformat-security]
943 | warnx(no_latency_tr_msg);
| ^~~~~latency-collector.c: In function ‘find_default_tracer’:
latency-collector.c:986:25: warning: format not a string literal and no format arguments [-Wformat-security]
986 | errx(EXIT_FAILURE, no_tracer_msg);
|
^~~~
latency-collector.c: In function ‘scan_arguments’:
latency-collector.c:1881:33: warning: format not a string literal and
no format arguments [-Wformat-security]
1881 | errx(EXIT_FAILURE, no_tracer_msg);
| ^~~~--- tools/tracing/latency/latency-collector.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/tracing/latency/latency-collector.c +4 -4
@@ -935,12 +935,12 @@ static void show_available(void) }if (!tracers) { -warnx (no_tracer_msg); +warnx ("%s" , no_tracer_msg);return ; }if (!found) { -warnx (no_latency_tr_msg); +warnx ("%s" , no_latency_tr_msg);tracefs_list_free (tracers);return ; }
@@ -983,7 +983,7 @@ static const char *find_default_tracer(vfor (i =0 ; relevant_tracers[i]; i++) { valid =tracer_valid (relevant_tracers[i], ¬racer);if (notracer) -errx (EXIT_FAILURE , no_tracer_msg); +errx (EXIT_FAILURE ,"%s" , no_tracer_msg);if (valid)return relevant_tracers[i]; }
@@ -1878,7 +1878,7 @@ static void scan_arguments(int argc, cha } valid =tracer_valid (current_tracer, ¬racer);if (notracer) -errx (EXIT_FAILURE , no_tracer_msg); +errx (EXIT_FAILURE ,"%s" , no_tracer_msg);if (!valid)errx (EXIT_FAILURE ,"The tracer %s is not supported by your kernel!\n" , current_tracer);
Greg Kroah-Hartman
maintainerPATCH 13/473 tools/nolibc/stdlib: fix memory error in realloc()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brennan Xavier McManus <[email protected]>
commit 791f4641142e2aced85de082e5783b4fb0b977c2 upstream.
Pass user_p_len to memcpy() instead of heap->len to prevent realloc() from copying an extra sizeof(heap) bytes from beyond the allocated region.
--- tools/include/nolibc/stdlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/include/nolibc/stdlib.h +1 -1
@@ -166,7 +166,7 @@ void *realloc(void *old_ptr, size_t new_if (__builtin_expect (!ret,0 ))return NULL ; -memcpy (ret, heap->user_p, heap->len); +memcpy (ret, heap->user_p, user_p_len);munmap (heap, heap->len);return ret; }
Greg Kroah-Hartman
maintainerPATCH 14/473 net: smc91x: Fix m68k kernel compilation for ColdFire CPU
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Blum <[email protected]>
commit 5eefb477d21a26183bc3499aeefa991198315a2d upstream.
Compiling the m68k kernel with support for the ColdFire CPU family fails with the following error:
In file included from drivers/net/ethernet/smsc/smc91x.c:80:drivers/net/ethernet/smsc/smc91x.c: In function ‘smc_reset’:drivers/net/ethernet/smsc/smc91x.h:160:40: error: implicit declaration of function ‘_swapw’; did you mean ‘swap’? [-Werror=implicit-function-declaration]
160 | #define SMC_outw(lp, v, a, r) writew(_swapw(v), (a) + (r))
| ^~~~~~drivers/net/ethernet/smsc/smc91x.h:904:25: note: in expansion of macro ‘SMC_outw’
904 | SMC_outw(lp, x, ioaddr, BANK_SELECT); \
| ^~~~~~~~
drivers/net/ethernet/smsc/smc91x.c:250:9: note: in expansion of macro ‘SMC_SELECT_BANK’
250 | SMC_SELECT_BANK(lp, 2);
| ^~~~~~~~~~~~~~~cc1: some warnings being treated as errors
The function _swapw() was removed in commit d97cf70af097 ("m68k: use asm-generic/io.h for non-MMU io access functions"), but is still used in drivers/net/ethernet/smsc/smc91x.h.
Use ioread16be() and iowrite16be() to resolve the error.
--- drivers/net/ethernet/smsc/smc91x.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/smsc/smc91x.h +2 -2
@@ -175,8 +175,8 @@ static inline void mcf_outsw(void *a, unwritew (*wp++, a); } -#define SMC_inw (a, r) _swapw(readw((a) + (r))) -#define SMC_outw (lp, v, a, r) writew(_swapw(v), (a) + (r)) +#define SMC_inw (a, r) ioread16be((a) + (r)) +#define SMC_outw (lp, v, a, r) iowrite16be(v, (a) + (r))#define SMC_insw (a, r, p, l) mcf_insw(a + r, p, l)#define SMC_outsw (a, r, p, l) mcf_outsw(a + r, p, l)
Greg Kroah-Hartman
maintainerPATCH 15/473 nilfs2: fix unexpected freezing of nilfs_segctor_sync()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 936184eadd82906992ff1f5ab3aada70cce44cee upstream.
A potential and reproducible race issue has been identified where nilfs_segctor_sync() would block even after the log writer thread writes a checkpoint, unless there is an interrupt or other trigger to resume log writing.
This turned out to be because, depending on the execution timing of the log writer thread running in parallel, the log writer thread may skip responding to nilfs_segctor_sync(), which causes a call to schedule() waiting for completion within nilfs_segctor_sync() to lose the opportunity to wake up.
The reason why waking up the task waiting in nilfs_segctor_sync() may be skipped is that updating the request generation issued using a shared sequence counter and adding an wait queue entry to the request wait queue to the log writer, are not done atomically. There is a possibility that log writing and request completion notification by nilfs_segctor_wakeup() may occur between the two operations, and in that case, the wait queue entry is not yet visible to nilfs_segctor_wakeup() and the wake-up of nilfs_segctor_sync() will be carried over until the next request occurs.
Fix this issue by performing these two operations simultaneously within the lock section of sc_state_lock. Also, following the memory barrier guidelines for event waiting loops, move the call to set_current_state() in the same location into the event waiting loop to ensure that a memory barrier is inserted just before the event condition determination.
--- fs/nilfs2/segment.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
fs/nilfs2/segment.c +13 -4
@@ -2207,19 +2207,28 @@ static int nilfs_segctor_sync(struct nilstruct nilfs_segctor_wait_request wait_req;int err =0 ; -spin_lock (&sci->sc_state_lock);init_wait (&wait_req.wq); wait_req.err =0 ;atomic_set (&wait_req.done,0 ); +init_waitqueue_entry (&wait_req.wq, current); + +/* +* To prevent a race issue where completion notifications from the +* log writer thread are missed, increment the request sequence count +* "sc_seq_request" and insert a wait queue entry using the current +* sequence number into the "sc_wait_request" queue at the same time +* within the lock section of "sc_state_lock". +*/ +spin_lock (&sci->sc_state_lock); wait_req.seq = ++sci->sc_seq_request; +add_wait_queue (&sci->sc_wait_request, &wait_req.wq);spin_unlock (&sci->sc_state_lock); -init_waitqueue_entry (&wait_req.wq, current); -add_wait_queue (&sci->sc_wait_request, &wait_req.wq); -set_current_state (TASK_INTERRUPTIBLE );wake_up (&sci->sc_wait_daemon);for (;;) { +set_current_state (TASK_INTERRUPTIBLE ); +if (atomic_read (&wait_req.done)) { err = wait_req.err;break ;
Greg Kroah-Hartman
maintainerPATCH 16/473 nilfs2: fix potential hang in nilfs_detach_log_writer()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit eb85dace897c5986bc2f36b3c783c6abb8a4292e upstream.
Syzbot has reported a potential hang in nilfs_detach_log_writer() called during nilfs2 unmount.
Analysis revealed that this is because nilfs_segctor_sync(), which synchronizes with the log writer thread, can be called after nilfs_segctor_destroy() terminates that thread, as shown in the call trace below:
nilfs_detach_log_writer
nilfs_segctor_destroy
nilfs_segctor_kill_thread --> Shut down log writer thread
flush_work
nilfs_iput_work_func
nilfs_dispose_list
iput
nilfs_evict_inode
nilfs_transaction_commit
nilfs_construct_segment (if inode needs sync)
nilfs_segctor_sync --> Attempt to synchronize with
log writer thread
*** DEADLOCK ***Fix this issue by changing nilfs_segctor_sync() so that the log writer thread returns normally without synchronizing after it terminates, and by forcing tasks that are already waiting to complete once after the thread terminates.
The skipped inode metadata flushout will then be processed together in the subsequent cleanup work in nilfs_segctor_destroy().
--- fs/nilfs2/segment.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)
fs/nilfs2/segment.c +18 -3
@@ -2229,6 +2229,14 @@ static int nilfs_segctor_sync(struct nilfor (;;) {set_current_state (TASK_INTERRUPTIBLE ); +/* +* Synchronize only while the log writer thread is alive. +* Leave flushing out after the log writer thread exits to +* the cleanup work in nilfs_segctor_destroy(). +*/ +if (!sci->sc_task) +break ; +if (atomic_read (&wait_req.done)) { err = wait_req.err;break ;
@@ -2244,7 +2252,7 @@ static int nilfs_segctor_sync(struct nilreturn err; } -static void nilfs_segctor_wakeup (struct nilfs_sc_info *sci,int err) +static void nilfs_segctor_wakeup (struct nilfs_sc_info *sci,int err,bool force) {struct nilfs_segctor_wait_request *wrq, *n;unsigned long flags;
@@ -2252,7 +2260,7 @@ static void nilfs_segctor_wakeup(structspin_lock_irqsave (&sci->sc_wait_request.lock, flags);list_for_each_entry_safe (wrq, n, &sci->sc_wait_request.head, wq.entry) {if (!atomic_read (&wrq->done) && -nilfs_cnt32_ge (sci->sc_seq_done, wrq->seq)) { + (force ||nilfs_cnt32_ge (sci->sc_seq_done, wrq->seq))) { wrq->err = err;atomic_set (&wrq->done,1 ); }
@@ -2390,7 +2398,7 @@ static void nilfs_segctor_notify(structif (mode ==SC_LSEG_SR ) { sci->sc_state &= ~NILFS_SEGCTOR_COMMIT ; sci->sc_seq_done = sci->sc_seq_accepted; -nilfs_segctor_wakeup (sci, err); +nilfs_segctor_wakeup (sci, err, false); sci->sc_flush_request =0 ; }else {if (mode ==SC_FLUSH_FILE )
@@ -2772,6 +2780,13 @@ static void nilfs_segctor_destroy(struct || sci->sc_seq_request != sci->sc_seq_done);spin_unlock (&sci->sc_state_lock); +/* +* Forcibly wake up tasks waiting in nilfs_segctor_sync(), which can +* be called from delayed iput() via nilfs_evict_inode() and can race +* with the above log writer thread termination. +*/ +nilfs_segctor_wakeup (sci,0 , true); +if (flush_work (&sci->sc_iput_work)) flag = true;
Greg Kroah-Hartman
maintainerPATCH 17/473 fs/ntfs3: Remove max link count info display during driver init
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
commit a8948b5450e7c65a3a34ebf4ccfcebc19335d4fb upstream.
Removes the output of this purely informational message from the kernel buffer:
"ntfs3: Max link count 4000"
--- fs/ntfs3/super.c | 2 -- 1 file changed, 2 deletions(-)
fs/ntfs3/super.c +0 -2
@@ -1453,8 +1453,6 @@ static int __init init_ntfs_fs(void) {int err; -pr_info ("ntfs3: Max link count %u\n" ,NTFS_LINK_MAX ); -if (IS_ENABLED (CONFIG_NTFS3_FS_POSIX_ACL ))pr_info ("ntfs3: Enabled Linux POSIX ACLs support\n" );if (IS_ENABLED (CONFIG_NTFS3_64BIT_CLUSTER ))
Greg Kroah-Hartman
maintainerPATCH 18/473 fs/ntfs3: Taking DOS names into account during link counting
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
commit 110b24eb1a749bea3440f3ca2ff890a26179050a upstream.
When counting and checking hard links in an ntfs file record,
struct MFT_REC {
struct NTFS_RECORD_HEADER rhdr; // 'FILE'
__le16 seq; // 0x10: Sequence number for this record.
Quoted 1 line
Quoted 1 line
__le16hard_links; //0x12: The number of hard links to record.
__le16 attr_off; // 0x14: Offset to attributes.
...
the ntfs3 driver ignored short names (DOS names), causing the link count to be reduced by 1 and messages to be output to dmesg.
For Windows, such a situation is a minor error, meaning chkdsk does not report errors on such a volume, and in the case of using the /f switch, it silently corrects them, reporting that no errors were found. This does not affect the consistency of the file system.
Nevertheless, the behavior in the ntfs3 driver is incorrect and changes the content of the file system. This patch should fix that.
PS: most likely, there has been a confusion of concepts MFT_REC::hard_links and inode::__i_nlink.
--- fs/ntfs3/inode.c | 7 ++++--- fs/ntfs3/record.c | 11 ++--------- 2 files changed, 6 insertions(+), 12 deletions(-)
fs/ntfs3/inode.c +4 -3
@@ -37,7 +37,7 @@ static struct inode *ntfs_read_mft(strucbool is_dir;unsigned long ino = inode->i_ino;u32 rp_fa =0 , asize, t32; -u16 roff, rsize, names =0 ; +u16 roff, rsize, names =0 , links =0 ;const struct ATTR_FILE_NAME *fname =NULL ;const struct INDEX_ROOT *root;struct REPARSE_DATA_BUFFER rp;// 0x18 bytes
@@ -190,11 +190,12 @@ next_attr: rsize < SIZEOF_ATTRIBUTE_FILENAME) goto out; + names +=1 ; fname =Add2Ptr (attr, roff);if (fname->type ==FILE_NAME_DOS ) goto next_attr; - names +=1 ; + links +=1 ;if (name && name->len == fname->name_len && !ntfs_cmp_names_cpu (name, (struct le_str *)&fname->name_len,NULL , false))
@@ -421,7 +422,7 @@ end_enum: ni->mi.dirty = true; } -set_nlink (inode, names); +set_nlink (inode, links);if (S_ISDIR (mode)) { ni->std_fa |=FILE_ATTRIBUTE_DIRECTORY ;
fs/ntfs3/record.c +2 -9
@@ -485,16 +485,9 @@ bool mi_remove_attr(struct ntfs_inode *nif (aoff + asize > used)return false; -if (ni &&is_attr_indexed (attr)) { +if (ni &&is_attr_indexed (attr) && attr->type ==ATTR_NAME ) {u16 links =le16_to_cpu (ni->mi.mrec->hard_links); -struct ATTR_FILE_NAME *fname = - attr->type !=ATTR_NAME ? -NULL : -resident_data_ex (attr, -SIZEOF_ATTRIBUTE_FILENAME ); -if (fname && fname->type ==FILE_NAME_DOS ) { -/* Do not decrease links count deleting DOS name. */ - }else if (!links) { +if (!links) {/* minor error. Not critical. */ }else { ni->mi.mrec->hard_links =cpu_to_le16 (links -1 );
Greg Kroah-Hartman
maintainerPATCH 19/473 fs/ntfs3: Fix case when index is reused during tree transformation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
commit 05afeeebcac850a016ec4fb1f681ceda11963562 upstream.
In most cases when adding a cluster to the directory index, they are placed at the end, and in the bitmap, this cluster corresponds to the last bit. The new directory size is calculated as follows:
data_size = (u64)(bit + 1) << indx->index_bits;
In the case of reusing a non-final cluster from the index, data_size is calculated incorrectly, resulting in the directory size differing from the actual size.
A check for cluster reuse has been added, and the size update is skipped.
--- fs/ntfs3/index.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/ntfs3/index.c +6 -0
@@ -1531,6 +1531,11 @@ static int indx_add_allocate(struct ntfs goto out1; } +if (data_size <=le64_to_cpu (alloc->nres.data_size)) { +/* Reuse index. */ + goto out; + } +/* Increase allocation. */ err = attr_set_size(ni, ATTR_ALLOC, in->name, in->name_len, &indx->alloc_run, data_size, &data_size, true,
@@ -1541,6 +1546,7 @@ static int indx_add_allocate(struct ntfs goto out1; } +out: *vbn = bit << indx->idx2vbn_bits;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 20/473 fs/ntfs3: Break dir enumeration if directory contents error
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Komarov <[email protected]>
commit 302e9dca8428979c9c99f2dbb44dc1783f5011c3 upstream.
If we somehow attempt to read beyond the directory size, an error is supposed to be returned.
However, in some cases, read requests do not stop and instead enter into a loop.
To avoid this, we set the position in the directory to the end.
--- fs/ntfs3/dir.c | 1 + 1 file changed, 1 insertion(+)
fs/ntfs3/dir.c +1 -0
@@ -475,6 +475,7 @@ static int ntfs_readdir(struct file *fil vbo = (u64 )bit << index_bits;if (vbo >= i_size) {ntfs_inode_err (dir,"Looks like your dir is corrupt" ); + ctx->pos = eod; err = -EINVAL ; goto out; }
Greg Kroah-Hartman
maintainerPATCH 21/473 ksmbd: avoid to send duplicate oplock break notifications
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
commit c91ecba9e421e4f2c9219cf5042fa63a12025310 upstream.
This patch fixes generic/011 when oplocks is enable.
Avoid to send duplicate oplock break notifications like smb2 leases case.
--- fs/smb/server/oplock.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
fs/smb/server/oplock.c +13 -8
@@ -613,19 +613,24 @@ static int oplock_break_pending(struct oif (opinfo->op_state ==OPLOCK_CLOSING )return -ENOENT ;else if (opinfo->level <= req_op_level) { -if (opinfo->is_lease && - opinfo->o_lease->state != - (SMB2_LEASE_HANDLE_CACHING_LE | -SMB2_LEASE_READ_CACHING_LE )) +if (opinfo->is_lease == false) +return 1 ; + +if (opinfo->o_lease->state != + (SMB2_LEASE_HANDLE_CACHING_LE | +SMB2_LEASE_READ_CACHING_LE ))return 1 ; } }if (opinfo->level <= req_op_level) { -if (opinfo->is_lease && - opinfo->o_lease->state != - (SMB2_LEASE_HANDLE_CACHING_LE | -SMB2_LEASE_READ_CACHING_LE )) { +if (opinfo->is_lease == false) { +wake_up_oplock_break (opinfo); +return 1 ; + } +if (opinfo->o_lease->state != + (SMB2_LEASE_HANDLE_CACHING_LE | +SMB2_LEASE_READ_CACHING_LE )) {wake_up_oplock_break (opinfo);return 1 ; }
Greg Kroah-Hartman
maintainerPATCH 22/473 ksmbd: ignore trailing slashes in share paths
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nandor Kracser <[email protected]>
commit 405ee4097c4bc3e70556520aed5ba52a511c2266 upstream.
Trailing slashes in share paths (like: /home/me/Share/) caused permission issues with shares for clients on iOS and on Android TV for me, but otherwise they work fine with plain old Samba.
--- fs/smb/server/mgmt/share_config.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/smb/server/mgmt/share_config.c +5 -1
@@ -165,8 +165,12 @@ static struct ksmbd_share_config *share_ share->path =kstrndup (ksmbd_share_config_path (resp), path_len,GFP_KERNEL ); -if (share->path) +if (share->path) { share->path_sz =strlen (share->path); +while (share->path_sz >1 && + share->path[share->path_sz -1 ] =='/' ) + share->path[--share->path_sz] ='\0' ; + } share->create_mask = resp->create_mask; share->directory_mask = resp->directory_mask; share->force_create_mode = resp->force_create_mode;
Greg Kroah-Hartman
maintainerPATCH 23/473 ALSA: hda/realtek: fix mute/micmute LEDs dont work for ProBook 440/460 G11.
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Chi <[email protected]>
commit b3b6f125da2773cbc681316842afba63ca9869aa upstream.
HP ProBook 440/460 G11 needs ALC236_FIXUP_HP_GPIO_LED quirk to make mic-mute/audio-mute working.
--- sound/pci/hda/patch_realtek.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/patch_realtek.c +3 -0
@@ -9793,8 +9793,11 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8c70 ,"HP EliteBook 835 G11" ,ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c71 ,"HP EliteBook 845 G11" ,ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c72 ,"HP EliteBook 865 G11" ,ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8c89 ,"HP ProBook 460 G11" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c8a ,"HP EliteBook 630" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c8c ,"HP EliteBook 660" ,ALC236_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8c8d ,"HP ProBook 440 G11" ,ALC236_FIXUP_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8c8e ,"HP ProBook 460 G11" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c90 ,"HP EliteBook 640" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c91 ,"HP EliteBook 660" ,ALC236_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8c96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
Greg Kroah-Hartman
maintainerPATCH 24/473 ALSA: core: Fix NULL module pointer assignment at card init
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 39381fe7394e5eafac76e7e9367e7351138a29c1 upstream.
The commit 81033c6b584b ("ALSA: core: Warn on empty module") introduced a WARN_ON() for a NULL module pointer passed at snd_card object creation, and it also wraps the code around it with '#ifdef MODULE'. This works in most cases, but the devils are always in details. "MODULE" is defined when the target code (i.e. the sound core) is built as a module; but this doesn't mean that the caller is also built-in or not. Namely, when only the sound core is built-in (CONFIG_SND=y) while the driver is a module (CONFIG_SND_USB_AUDIO=m), the passed module pointer is ignored even if it's non-NULL, and card->module remains as NULL. This would result in the missing module reference up/down at the device open/close, leading to a race with the code execution after the module removal.
For addressing the bug, move the assignment of card->module again out of ifdef. The WARN_ON() is still wrapped with ifdef because the module can be really NULL when all sound drivers are built-in.
Note that we keep 'ifdef MODULE' for WARN_ON(), otherwise it would lead to a false-positive NULL module check. Admittedly it won't catch perfectly, i.e. no check is performed when CONFIG_SND=y. But, it's no real problem as it's only for debugging, and the condition is pretty rare.
--- sound/core/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/init.c +1 -1
@@ -307,8 +307,8 @@ static int snd_card_init(struct snd_card card->number = idx;#ifdef MODULE WARN_ON (!module); - card->module = module;#endif + card->module = module;INIT_LIST_HEAD (&card->devices);init_rwsem (&card->controls_rwsem);rwlock_init (&card->ctl_files_rwlock);
Greg Kroah-Hartman
maintainerPATCH 25/473 ALSA: Fix deadlocks with kctl removals at disconnection
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 87988a534d8e12f2e6fc01fe63e6c1925dc5307c upstream.
In snd_card_disconnect(), we set card->shutdown flag at the beginning, call callbacks and do sync for card->power_ref_sleep waiters at the end. The callback may delete a kctl element, and this can lead to a deadlock when the device was in the suspended state. Namely:
* A process waits for the power up at snd_power_ref_and_wait() in snd_ctl_info() or read/write() inside card->controls_rwsem.
* The system gets disconnected meanwhile, and the driver tries to delete a kctl via snd_ctl_remove*(); it tries to take card->controls_rwsem again, but this is already locked by the above. Since the sleeper isn't woken up, this deadlocks.
An easy fix is to wake up sleepers before processing the driver disconnect callbacks but right after setting the card->shutdown flag. Then all sleepers will abort immediately, and the code flows again.
So, basically this patch moves the wait_event() call at the right timing. While we're at it, just to be sure, call wait_event_all() instead of wait_event(), although we don't use exclusive events on this queue for now.
--- sound/core/init.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
sound/core/init.c +8 -1
@@ -518,6 +518,14 @@ int snd_card_disconnect(struct snd_card }spin_unlock (&card->files_lock); +#ifdef CONFIG_PM +/* wake up sleepers here before other callbacks for avoiding potential +* deadlocks with other locks (e.g. in kctls); +* then this notifies the shutdown and sleepers would abort immediately +*/ +wake_up_all (&card->power_sleep); +#endif +/* notify all connected devices about disconnection */ /* at this point, they cannot respond to any calls except release() */
@@ -545,7 +553,6 @@ int snd_card_disconnect(struct snd_cardmutex_unlock (&snd_card_mutex);#ifdef CONFIG_PM -wake_up (&card->power_sleep);snd_power_sync_ref (card);#endif return 0 ;
Greg Kroah-Hartman
maintainerPATCH 26/473 KEYS: asymmetric: Add missing dependencies of FIPS_SIGNATURE_SELFTEST
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
commit 9d2fd8bdc12f403a5c35c971936a0e1d5cb5108e upstream.
Since the signature self-test uses RSA and SHA-256, it must only be enabled when those algorithms are enabled. Otherwise it fails and panics the kernel on boot-up.
--- crypto/asymmetric_keys/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
crypto/asymmetric_keys/Kconfig +2 -0
@@ -84,5 +84,7 @@ config FIPS_SIGNATURE_SELFTEST depends on KEYS depends on ASYMMETRIC_KEY_TYPE depends on PKCS7_MESSAGE_PARSER + depends on CRYPTO_RSA + depends on CRYPTO_SHA256 endif # ASYMMETRIC_KEY_TYPE
Greg Kroah-Hartman
maintainerPATCH 27/473 wifi: mac80211: dont use rate mask for scanning
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit ab9177d83c040eba58387914077ebca56f14fae6 ]
The rate mask is intended for use during operation, and can be set to only have masks for the currently active band. As such, it cannot be used for scanning which can be on other bands as well.
Simply ignore the rate masks during scanning to avoid warnings from incorrect settings.
--- include/net/mac80211.h | 3 +++ net/mac80211/rate.c | 6 +++++- net/mac80211/scan.c | 1 + net/mac80211/tx.c | 13 +++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-)
include/net/mac80211.h +3 -0
@@ -885,6 +885,8 @@ enum mac80211_tx_info_flags {* of their QoS TID or other priority field values. * @IEEE80211_TX_CTRL_MCAST_MLO_FIRST_TX: first MLO TX, used mostly internally * for sequence number assignment +* @IEEE80211_TX_CTRL_SCAN_TX: Indicates that this frame is transmitted +* due to scanning, not in normal operation on the interface. * @IEEE80211_TX_CTRL_MLO_LINK: If not @IEEE80211_LINK_UNSPECIFIED, this * frame should be transmitted on the specific link. This really is * only relevant for frames that do not have data present, and is
@@ -905,6 +907,7 @@ enum mac80211_tx_control_flags {IEEE80211_TX_CTRL_NO_SEQNO =BIT (7 ),IEEE80211_TX_CTRL_DONT_REORDER =BIT (8 ),IEEE80211_TX_CTRL_MCAST_MLO_FIRST_TX =BIT (9 ), +IEEE80211_TX_CTRL_SCAN_TX =BIT (10 ), IEEE80211_TX_CTRL_MLO_LINK = 0xf0000000, };
net/mac80211/rate.c +5 -1
@@ -877,6 +877,7 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,struct ieee80211_sub_if_data *sdata;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);struct ieee80211_supported_band *sband; +u32 mask = ~0 ;rate_control_fill_sta_table (sta, info, dest, max_rates);
@@ -889,9 +890,12 @@ void ieee80211_get_tx_rates(struct ieee80211_vif *vif,if (ieee80211_is_tx_data (skb))rate_control_apply_mask (sdata, sta, sband, dest, max_rates); +if (!(info->control.flags &IEEE80211_TX_CTRL_SCAN_TX )) + mask = sdata->rc_rateidx_mask[info->band]; +if (dest[0 ].idx <0 )__rate_control_send_low (&sdata->local->hw, sband, sta, info, - sdata->rc_rateidx_mask[info->band]); + mask);if (sta)rate_fixup_ratelist (vif, sband, info, dest, max_rates);
net/mac80211/scan.c +1 -0
@@ -647,6 +647,7 @@ static void ieee80211_send_scan_probe_req(struct ieee80211_sub_if_data *sdata,cpu_to_le16 (IEEE80211_SN_TO_SEQ (sn)); }IEEE80211_SKB_CB (skb)->flags |= tx_flags; +IEEE80211_SKB_CB (skb)->control.flags |=IEEE80211_TX_CTRL_SCAN_TX ;ieee80211_tx_skb_tid_band (sdata, skb,7 , channel->band); } }
net/mac80211/tx.c +9 -4
@@ -720,11 +720,16 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx) txrc.bss_conf = &tx->sdata->vif.bss_conf; txrc.skb = tx->skb; txrc.reported_rate.idx =-1 ; - txrc.rate_idx_mask = tx->sdata->rc_rateidx_mask[info->band]; -if (tx->sdata->rc_has_mcs_mask[info->band]) - txrc.rate_idx_mcs_mask = - tx->sdata->rc_rateidx_mcs_mask[info->band]; +if (unlikely (info->control.flags &IEEE80211_TX_CTRL_SCAN_TX )) { + txrc.rate_idx_mask = ~0 ; + }else { + txrc.rate_idx_mask = tx->sdata->rc_rateidx_mask[info->band]; + +if (tx->sdata->rc_has_mcs_mask[info->band]) + txrc.rate_idx_mcs_mask = + tx->sdata->rc_rateidx_mcs_mask[info->band]; + } txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP || tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 28/473 wifi: mac80211: ensure beacon is non-S1G prior to extracting the beacon timestamp field
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Kinder <[email protected]>
[ Upstream commit d12b9779cc9ba29d65fbfc728eb8a037871dd331 ]
Logic inside ieee80211_rx_mgmt_beacon accesses the mgmt->u.beacon.timestamp field without first checking whether the beacon received is non-S1G format.
Fix the problem by checking the beacon is non-S1G format to avoid access of the mgmt->u.beacon.timestamp field.
--- net/mac80211/mlme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/mlme.c +2 -1
@@ -5528,7 +5528,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_link_data *link, link->u.mgd.dtim_period = elems->dtim_period; link->u.mgd.have_beacon = true; ifmgd->assoc_data->need_beacon = false; -if (ieee80211_hw_check (&local->hw,TIMING_BEACON_ONLY )) { +if (ieee80211_hw_check (&local->hw,TIMING_BEACON_ONLY ) && + !ieee80211_is_s1g_beacon (hdr->frame_control)) { link->conf->sync_tsf =le64_to_cpu (mgmt->u.beacon.timestamp); link->conf->sync_device_ts =
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 29/473 wifi: cfg80211: fix the order of arguments for trace events of the tx_rx_evt class
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Igor Artemiev <[email protected]>
[ Upstream commit 9ef369973cd2c97cce3388d2c0c7e3c056656e8a ]
The declarations of the tx_rx_evt class and the rdev_set_antenna event use the wrong order of arguments in the TP_ARGS macro.
Fix the order of arguments in the TP_ARGS macro.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- net/wireless/trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/wireless/trace.h +2 -2
@@ -1734,7 +1734,7 @@ TRACE_EVENT(rdev_return_void_tx_rx, DECLARE_EVENT_CLASS(tx_rx_evt, TP_PROTO(struct wiphy *wiphy, u32 tx, u32 rx), - TP_ARGS(wiphy, rx, tx), + TP_ARGS(wiphy, tx, rx), TP_STRUCT__entry( WIPHY_ENTRY __field(u32, tx)
@@ -1751,7 +1751,7 @@ DECLARE_EVENT_CLASS(tx_rx_evt,DEFINE_EVENT (tx_rx_evt, rdev_set_antenna, TP_PROTO(struct wiphy *wiphy, u32 tx, u32 rx), -TP_ARGS (wiphy, rx, tx) +TP_ARGS (wiphy, tx, rx) ); DECLARE_EVENT_CLASS(wiphy_netdev_id_evt,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 30/473 dt-bindings: rockchip: grf: Add missing type to pcie-phy node
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit d41201c90f825f19a46afbfb502f22f612d8ccc4 ]
'pcie-phy' is missing any type. Add 'type: object' to indicate it's a node.
--- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/soc/rockchip/grf.yaml +1 -0
@@ -151,6 +151,7 @@ allOf: unevaluatedProperties: false pcie-phy: + type: object description: Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 31/473 net: usb: qmi_wwan: add Telit FN920C04 compositions
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniele Palmas <[email protected]>
[ Upstream commit 0b8fe5bd73249dc20be2e88a12041f8920797b59 ]
Add the following Telit FN920C04 compositions:
0x10a0: rmnet + tty (AT/NMEA) + tty (AT) + tty (diag)
T: Bus=03 Lev=01 Prnt=03 Port=06 Cnt=01 Dev#= 5 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=10a0 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FN920 S: SerialNumber=92c4c4d8 C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
0x10a4: rmnet + tty (AT) + tty (AT) + tty (diag)
T: Bus=03 Lev=01 Prnt=03 Port=06 Cnt=01 Dev#= 8 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=10a4 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FN920 S: SerialNumber=92c4c4d8 C: #Ifs= 4 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
0x10a9: rmnet + tty (AT) + tty (diag) + DPL (data packet logging) + adb
T: Bus=03 Lev=01 Prnt=03 Port=06 Cnt=01 Dev#= 9 Spd=480 MxCh= 0 D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=1bc7 ProdID=10a9 Rev=05.15 S: Manufacturer=Telit Cinterion S: Product=FN920 S: SerialNumber=92c4c4d8 C: #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I: If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms I: If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=80 Driver=(none) E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/net/usb/qmi_wwan.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/qmi_wwan.c +3 -0
@@ -1367,6 +1367,9 @@ static const struct usb_device_id products[] = { {QMI_QUIRK_SET_DTR(0x1bc7, 0x1060, 2)}, /* Telit LN920 */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1070, 2)}, /* Telit FN990 */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1080, 2)}, /* Telit FE990 */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x10a0, 0)}, /* Telit FN920C04 */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x10a4, 0)}, /* Telit FN920C04 */ + {QMI_QUIRK_SET_DTR(0x1bc7, 0x10a9, 0)}, /* Telit FN920C04 */ {QMI_FIXED_INTF(0x1bc7, 0x1100, 3)}, /* Telit ME910 */ {QMI_FIXED_INTF(0x1bc7, 0x1101, 3)}, /* Telit ME910 dual modem */ {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 32/473 drm/amd/display: Set color_mgmt_changed to true on unsuspend
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joshua Ashton <[email protected]>
[ Upstream commit 2eb9dd497a698dc384c0dd3e0311d541eb2e13dd ]
Otherwise we can end up with a frame on unsuspend where color management is not applied when userspace has not committed themselves.
Fixes re-applying color management on Steam Deck/Gamescope on S3 resume.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -0
@@ -2964,6 +2964,7 @@ static int dm_resume(void *handle)dc_stream_release (dm_new_crtc_state->stream); dm_new_crtc_state->stream =NULL ; } + dm_new_crtc_state->base.color_mgmt_changed = true; }for_each_new_plane_in_state (dm->cached_state, plane, new_plane_state, i) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 33/473 drm/amdgpu: Update BO eviction priorities
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Kuehling <[email protected]>
[ Upstream commit b0b13d532105e0e682d95214933bb8483a063184 ]
Make SVM BOs more likely to get evicted than other BOs. These BOs opportunistically use available VRAM, but can fall back relatively seamlessly to system memory. It also avoids SVM migrations evicting other, more important BOs as they will evict other SVM allocations first.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -0
@@ -585,6 +585,8 @@ int amdgpu_bo_create(struct amdgpu_device *adev,else amdgpu_bo_placement_from_domain (bo, bp->domain);if (bp->type == ttm_bo_type_kernel) + bo->tbo.priority =2 ; +else if (!(bp->flags &AMDGPU_GEM_CREATE_DISCARDABLE )) bo->tbo.priority =1 ;if (!bp->destroy)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 34/473 drm/amdgpu: Fix the ring buffer size for queue VM flush
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Prike Liang <[email protected]>
[ Upstream commit fe93b0927bc58cb1d64230f45744e527d9d8482c ]
Here are the corrections needed for the queue ring buffer size calculation for the following cases:
- Remove the KIQ VM flush ring usage.
- Add the invalidate TLBs packet for gfx10 and gfx11 queue.
- There's no VM flush and PFP sync, so remove the gfx9 real ring and compute ring buffer usage.
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1 -2
@@ -9352,7 +9352,7 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_gfx = {7 +/* PIPELINE_SYNC */ SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + -2 +/* VM_FLUSH */ +4 +/* VM_FLUSH */ 8 +/* FENCE for VM_FLUSH */ 20 +/* GDS switch */ 4 +/* double SWITCH_BUFFER,
@@ -9445,7 +9445,6 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = {7 +/* gfx_v10_0_ring_emit_pipeline_sync */ SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + -2 +/* gfx_v10_0_ring_emit_vm_flush */ 8 + 8 + 8, /* gfx_v10_0_ring_emit_fence_kiq x3 for user fence, vm fence */ .emit_ib_size = 7, /* gfx_v10_0_ring_emit_ib_compute */ .emit_ib = gfx_v10_0_ring_emit_ib_compute,
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +1 -2
@@ -6157,7 +6157,7 @@ static const struct amdgpu_ring_funcs gfx_v11_0_ring_funcs_gfx = {7 +/* PIPELINE_SYNC */ SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + -2 +/* VM_FLUSH */ +4 +/* VM_FLUSH */ 8 +/* FENCE for VM_FLUSH */ 20 +/* GDS switch */ 5 + /* COND_EXEC */
@@ -6243,7 +6243,6 @@ static const struct amdgpu_ring_funcs gfx_v11_0_ring_funcs_kiq = {7 +/* gfx_v11_0_ring_emit_pipeline_sync */ SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + -2 +/* gfx_v11_0_ring_emit_vm_flush */ 8 + 8 + 8, /* gfx_v11_0_ring_emit_fence_kiq x3 for user fence, vm fence */ .emit_ib_size = 7, /* gfx_v11_0_ring_emit_ib_compute */ .emit_ib = gfx_v11_0_ring_emit_ib_compute,
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0 -2
@@ -6742,7 +6742,6 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = {7 +/* gfx_v9_0_ring_emit_pipeline_sync */ SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + -2 +/* gfx_v9_0_ring_emit_vm_flush */ 8 +8 +8 +/* gfx_v9_0_ring_emit_fence x3 for user fence, vm fence */ 7 +/* gfx_v9_0_emit_mem_sync */ 5 + /* gfx_v9_0_emit_wave_limit for updating mmSPI_WCL_PIPE_PERCENT_GFX register */
@@ -6781,7 +6780,6 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = {7 +/* gfx_v9_0_ring_emit_pipeline_sync */ SOC15_FLUSH_GPU_TLB_NUM_WREG *5 +SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT *7 + -2 +/* gfx_v9_0_ring_emit_vm_flush */ 8 + 8 + 8, /* gfx_v9_0_ring_emit_fence_kiq x3 for user fence, vm fence */ .emit_ib_size = 7, /* gfx_v9_0_ring_emit_ib_compute */ .emit_fence = gfx_v9_0_ring_emit_fence_kiq,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 35/473 drm/amdgpu/mes: fix use-after-free issue
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Xiao <[email protected]>
[ Upstream commit 948255282074d9367e01908b3f5dcf8c10fc9c3d ]
Delete fence fallback timer to fix the ramdom use-after-free issue.
v2: move to amdgpu_mes.c
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +1 -0
@@ -1083,6 +1083,7 @@ void amdgpu_mes_remove_ring(struct amdgpu_device *adev,return ;amdgpu_mes_remove_hw_queue (adev, ring->hw_queue_id); +del_timer_sync (&ring->fence_drv.fallback_timer);amdgpu_ring_fini (ring);kfree (ring); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 36/473 LoongArch: Lately init pmu after smp is online
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bibo Mao <[email protected]>
[ Upstream commit f3334ebb8a2a1841c2824594dd992e66de19deb2 ]
There is an smp function call named reset_counters() to init PMU registers of every CPU in PMU initialization state. It requires that all CPUs are online. However there is an early_initcall() wrapper for the PMU init funciton init_hw_perf_events(), so that pmu init funciton is called in do_pre_smp_initcalls() which before function smp_init(). Function reset_counters() cannot work on other CPUs since they haven't boot up still.
Here replace the wrapper early_initcall() with pure_initcall(), so that the PMU init function is called after every cpu is online.
--- arch/loongarch/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/loongarch/kernel/perf_event.c +1 -1
@@ -884,4 +884,4 @@ static int __init init_hw_perf_events(void)return 0 ; } -early_initcall (init_hw_perf_events); +pure_initcall (init_hw_perf_events);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 37/473 selftests: sud_test: return correct emulated syscall value on RISC-V
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Clément Léger <[email protected]>
[ Upstream commit 17c67ed752d6a456602b3dbb25c5ae4d3de5deab ]
Currently, the sud_test expects the emulated syscall to return the emulated syscall number. This assumption only works on architectures were the syscall calling convention use the same register for syscall number/syscall return value. This is not the case for RISC-V and thus the return value must be also emulated using the provided ucontext.
--- .../selftests/syscall_user_dispatch/sud_test.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
tools/testing/selftests/syscall_user_dispatch/sud_test.c +14 -0
@@ -158,6 +158,20 @@ static void handle_sigsys(int sig, siginfo_t *info, void *ucontext)/* In preparation for sigreturn. */ SYSCALL_DISPATCH_OFF (glob_sel); + +/* +* The tests for argument handling assume that `syscall(x) == x`. This +* is a NOP on x86 because the syscall number is passed in %rax, which +* happens to also be the function ABI return register. Other +* architectures may need to swizzle the arguments around. +*/ +#if defined(__riscv) +/* REG_A7 is not defined in libc headers */ +# define REG_A7 (REG_A0 + 7) + + ((ucontext_t *)ucontext)->uc_mcontext.__gregs[REG_A0 ] = + ((ucontext_t *)ucontext)->uc_mcontext.__gregs[REG_A7 ]; +#endif }TEST (dispatch_and_return)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 38/473 sched/isolation: Fix boot crash when maxcpus < first housekeeping CPU
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
[ Upstream commit 257bf89d84121280904800acd25cc2c444c717ae ]
housekeeping_setup() checks cpumask_intersects(present, online) to ensure that the kernel will have at least one housekeeping CPU after smp_init(), but this doesn't work if the maxcpus= kernel parameter limits the number of processors available after bootup.
For example, a kernel with "maxcpus=2 nohz_full=0-2" parameters crashes at boot time on a virtual machine with 4 CPUs.
Change housekeeping_setup() to use cpumask_first_and() and check that the returned CPU number is valid and less than setup_max_cpus.
Another corner case is "nohz_full=0" on a machine with a single CPU or with the maxcpus=1 kernel argument. In this case non_housekeeping_mask is empty and tick_nohz_full_setup() makes no sense. And indeed, the kernel hits the WARN_ON(tick_nohz_full_running) in tick_sched_do_timer().
And how should the kernel interpret the "nohz_full=" parameter? It should be silently ignored, but currently cpulist_parse() happily returns the empty cpumask and this leads to the same problem.
Change housekeeping_setup() to check cpumask_empty(non_housekeeping_mask) and do nothing in this case.
--- kernel/sched/isolation.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/sched/isolation.c +6 -1
@@ -109,6 +109,7 @@ static void __init housekeeping_setup_type(enum hk_type type,static int __init housekeeping_setup (char *str,unsigned long flags) {cpumask_var_t non_housekeeping_mask, housekeeping_staging; +unsigned int first_cpu;int err =0 ;if ((flags &HK_FLAG_TICK ) && !(housekeeping.flags &HK_FLAG_TICK )) {
@@ -129,7 +130,8 @@ static int __init housekeeping_setup(char *str, unsigned long flags)cpumask_andnot (housekeeping_staging, cpu_possible_mask, non_housekeeping_mask); -if (!cpumask_intersects (cpu_present_mask, housekeeping_staging)) { + first_cpu =cpumask_first_and (cpu_present_mask, housekeeping_staging); +if (first_cpu >= nr_cpu_ids || first_cpu >= setup_max_cpus) {__cpumask_set_cpu (smp_processor_id (), housekeeping_staging);__cpumask_clear_cpu (smp_processor_id (), non_housekeeping_mask);if (!housekeeping.flags) {
@@ -138,6 +140,9 @@ static int __init housekeeping_setup(char *str, unsigned long flags) } } +if (cpumask_empty (non_housekeeping_mask)) + goto free_housekeeping_staging; +if (!housekeeping.flags) {/* First setup call ("nohz_full=" or "isolcpus=") */ enum hk_type type;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 39/473 ASoC: Intel: bytcr_rt5640: Apply Asus T100TA quirk to Asus T100TAM too
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit e50729d742ec364895f1c389c32315984a987aa5 ]
The Asus T100TA quirk has been using an exact match on a product-name of "T100TA" but there are also T100TAM variants with a slightly higher clocked CPU and a metal backside which need the same quirk.
Sort the existing T100TA (stereo speakers) below the more specific T100TAF (mono speaker) quirk and switch from exact matching to substring matching so that the T100TA quirk will also match on the T100TAM models.
--- sound/soc/intel/boards/bytcr_rt5640.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
sound/soc/intel/boards/bytcr_rt5640.c +8 -6
@@ -636,28 +636,30 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { BYT_RT5640_USE_AMCR0F28), }, { +/* Asus T100TAF, unlike other T100TA* models this one has a mono speaker */ .matches = {DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TAF"), }, .driver_data = (void *)(BYT_RT5640_IN1_MAP |BYT_RT5640_JD_SRC_JD2_IN4N |BYT_RT5640_OVCD_TH_2000UA |BYT_RT5640_OVCD_SF_0P75 | +BYT_RT5640_MONO_SPEAKER | +BYT_RT5640_DIFF_MIC | +BYT_RT5640_SSP0_AIF2 | BYT_RT5640_MCLK_EN), }, { +/* Asus T100TA and T100TAM, must come after T100TAF (mono spk) match */ .matches = { -DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TAF"), +DMI_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), + DMI_MATCH(DMI_PRODUCT_NAME, "T100TA"), }, .driver_data = (void *)(BYT_RT5640_IN1_MAP |BYT_RT5640_JD_SRC_JD2_IN4N |BYT_RT5640_OVCD_TH_2000UA |BYT_RT5640_OVCD_SF_0P75 | -BYT_RT5640_MONO_SPEAKER | -BYT_RT5640_DIFF_MIC | -BYT_RT5640_SSP0_AIF2 | BYT_RT5640_MCLK_EN), }, {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 40/473 regulator: irq_helpers: duplicate IRQ name
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matti Vaittinen <[email protected]>
[ Upstream commit 7ab681ddedd4b6dd2b047c74af95221c5f827e1d ]
The regulator IRQ helper requires caller to provide pointer to IRQ name which is kept in memory by caller. All other data passed to the helper in the regulator_irq_desc structure is copied. This can cause some confusion and unnecessary complexity.
Make the regulator_irq_helper() to copy also the provided IRQ name information so caller can discard the name after the call to regulator_irq_helper() completes.
--- drivers/regulator/irq_helpers.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/regulator/irq_helpers.c +3 -0
@@ -352,6 +352,9 @@ void *regulator_irq_helper(struct device *dev, h->irq = irq; h->desc = *d; + h->desc.name =devm_kstrdup (dev, d->name,GFP_KERNEL ); +if (!h->desc.name) +return ERR_PTR (-ENOMEM ); ret =init_rdev_state (dev, h, rdev, common_errs, per_rdev_errs, rdev_amount);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 41/473 ASoC: rt5645: Fix the electric noise due to the CBJ contacts floating
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Derek Fang <[email protected]>
[ Upstream commit 103abab975087e1f01b76fcb54c91dbb65dbc249 ]
The codec leaves tie combo jack's sleeve/ring2 to floating status default. It would cause electric noise while connecting the active speaker jack during boot or shutdown.
This patch requests a gpio to control the additional jack circuit to tie the contacts to the ground or floating.
--- sound/soc/codecs/rt5645.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
sound/soc/codecs/rt5645.c +25 -0
@@ -441,6 +441,7 @@ struct rt5645_priv {struct regmap *regmap;struct i2c_client *i2c;struct gpio_desc *gpiod_hp_det; +struct gpio_desc *gpiod_cbj_sleeve;struct snd_soc_jack *hp_jack;struct snd_soc_jack *mic_jack;struct snd_soc_jack *btn_jack;
@@ -3179,6 +3180,9 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_inseregmap_update_bits (rt5645->regmap,RT5645_IN1_CTRL2 ,RT5645_CBJ_MN_JD ,0 ); +if (rt5645->gpiod_cbj_sleeve) +gpiod_set_value (rt5645->gpiod_cbj_sleeve,1 ); +msleep (600 );regmap_read (rt5645->regmap,RT5645_IN1_CTRL3 , &val); val &=0x7 ;
@@ -3195,6 +3199,8 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_insesnd_soc_dapm_disable_pin (dapm,"Mic Det Power" );snd_soc_dapm_sync (dapm); rt5645->jack_type =SND_JACK_HEADPHONE ; +if (rt5645->gpiod_cbj_sleeve) +gpiod_set_value (rt5645->gpiod_cbj_sleeve,0 ); }if (rt5645->pdata.level_trigger_irq) regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,
@@ -3220,6 +3226,9 @@ static int rt5645_jack_detect(struct snd_soc_component *component, int jack_inseif (rt5645->pdata.level_trigger_irq)regmap_update_bits (rt5645->regmap,RT5645_IRQ_CTRL2 ,RT5645_JD_1_1_MASK ,RT5645_JD_1_1_INV ); + +if (rt5645->gpiod_cbj_sleeve) +gpiod_set_value (rt5645->gpiod_cbj_sleeve,0 ); }return rt5645->jack_type;
@@ -3931,6 +3940,16 @@ static int rt5645_i2c_probe(struct i2c_client *i2c)return ret; } + rt5645->gpiod_cbj_sleeve =devm_gpiod_get_optional (&i2c->dev,"cbj-sleeve" , +GPIOD_OUT_LOW ); + +if (IS_ERR (rt5645->gpiod_cbj_sleeve)) { + ret =PTR_ERR (rt5645->gpiod_cbj_sleeve); +dev_info (&i2c->dev,"failed to initialize gpiod, ret=%d\n" , ret); +if (ret != -ENOENT ) +return ret; + } +for (i =0 ; i <ARRAY_SIZE (rt5645->supplies); i++) rt5645->supplies[i].supply = rt5645_supply_names[i];
@@ -4174,6 +4193,9 @@ static void rt5645_i2c_remove(struct i2c_client *i2c)cancel_delayed_work_sync (&rt5645->jack_detect_work);cancel_delayed_work_sync (&rt5645->rcclock_work); +if (rt5645->gpiod_cbj_sleeve) +gpiod_set_value (rt5645->gpiod_cbj_sleeve,0 ); +regulator_bulk_disable (ARRAY_SIZE (rt5645->supplies), rt5645->supplies); }
@@ -4189,6 +4211,9 @@ static void rt5645_i2c_shutdown(struct i2c_client *i2c) 0);msleep (20 );regmap_write (rt5645->regmap,RT5645_RESET ,0 ); + +if (rt5645->gpiod_cbj_sleeve) +gpiod_set_value (rt5645->gpiod_cbj_sleeve,0 ); }static struct i2c_driver rt5645_i2c_driver = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 42/473 ASoC: dt-bindings: rt5645: add cbj sleeve gpio property
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Derek Fang <[email protected]>
[ Upstream commit 306b38e3fa727d22454a148a364123709e356600 ]
Add an optional gpio property to control external CBJ circuits to avoid some electric noise caused by sleeve/ring2 contacts floating.
--- Documentation/devicetree/bindings/sound/rt5645.txt | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/sound/rt5645.txt +6 -0
@@ -20,6 +20,11 @@ Optional properties: a GPIO spec for the external headphone detect pin. If jd-mode = 0, we will get the JD status by getting the value of hp-detect-gpios. +- cbj-sleeve-gpios: + a GPIO spec to control the external combo jack circuit to tie the sleeve/ring2 + contacts to the ground or floating. It could avoid some electric noise from the + active speaker jacks. + - realtek,in2-differential Boolean. Indicate MIC2 input are differential, rather than single-ended.
@@ -68,6 +73,7 @@ codec: rt5650@1a { compatible = "realtek,rt5650"; reg = <0x1a>; hp-detect-gpios = <&gpio 19 0>; + cbj-sleeve-gpios = <&gpio 20 0>; interrupt-parent = <&gpio>; interrupts = <7 IRQ_TYPE_EDGE_FALLING>; realtek,dmic-en = "true";
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 43/473 regulator: vqmmc-ipq4019: fix module autoloading
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 68adb581a39ae63a0ed082c47f01fbbe515efa0e ]
Add MODULE_DEVICE_TABLE(), so the module could be properly autoloaded based on the alias from of_device_id table.
--- drivers/regulator/vqmmc-ipq4019-regulator.c | 1 + 1 file changed, 1 insertion(+)
drivers/regulator/vqmmc-ipq4019-regulator.c +1 -0
@@ -84,6 +84,7 @@ static const struct of_device_id regulator_ipq4019_of_match[] = { { .compatible = "qcom,vqmmc-ipq4019-regulator", }, {}, }; +MODULE_DEVICE_TABLE (of, regulator_ipq4019_of_match);static struct platform_driver ipq4019_regulator_driver = { .probe = ipq4019_regulator_probe,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 44/473 ASoC: rt715: add vendor clear control register
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Yu <[email protected]>
[ Upstream commit cebfbc89ae2552dbb58cd9b8206a5c8e0e6301e9 ]
Add vendor clear control register in readable register's callback function. This prevents an access failure reported in Intel CI tests.
--- sound/soc/codecs/rt715-sdw.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt715-sdw.c +1 -0
@@ -111,6 +111,7 @@ static bool rt715_readable_register(struct device *dev, unsigned int reg)case 0x839d :case 0x83a7 :case 0x83a9 : +case 0x752001 :case 0x752039 :return true;default :
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 45/473 ASoC: rt715-sdca: volume step modification
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Yu <[email protected]>
[ Upstream commit bda16500dd0b05e2e047093b36cbe0873c95aeae ]
Volume step (dB/step) modification to fix format error which shown in amixer control.
--- sound/soc/codecs/rt715-sdca.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt715-sdca.c +4 -4
@@ -315,7 +315,7 @@ static int rt715_sdca_set_amp_gain_8ch_get(struct snd_kcontrol *kcontrol,return 0 ; } -static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -17625, 375, 0); +static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -1725, 75, 0); static const DECLARE_TLV_DB_SCALE(mic_vol_tlv, 0, 1000, 0); static int rt715_sdca_get_volsw(struct snd_kcontrol *kcontrol,
@@ -476,7 +476,7 @@ static const struct snd_kcontrol_new rt715_sdca_snd_controls[] = { RT715_SDCA_FU_VOL_CTRL, CH_01),SDW_SDCA_CTL (FUN_MIC_ARRAY ,RT715_SDCA_FU_ADC7_27_VOL ,RT715_SDCA_FU_VOL_CTRL ,CH_02 ), - 0x2f, 0x7f, 0, + 0x2f, 0x3f, 0, rt715_sdca_set_amp_gain_get, rt715_sdca_set_amp_gain_put, in_vol_tlv), RT715_SDCA_EXT_TLV("FU02 Capture Volume",
@@ -484,13 +484,13 @@ static const struct snd_kcontrol_new rt715_sdca_snd_controls[] = { RT715_SDCA_FU_VOL_CTRL, CH_01), rt715_sdca_set_amp_gain_4ch_get, rt715_sdca_set_amp_gain_4ch_put, - in_vol_tlv, 4, 0x7f), + in_vol_tlv, 4, 0x3f),RT715_SDCA_EXT_TLV ("FU06 Capture Volume" ,SDW_SDCA_CTL (FUN_MIC_ARRAY ,RT715_SDCA_FU_ADC10_11_VOL ,RT715_SDCA_FU_VOL_CTRL ,CH_01 ), rt715_sdca_set_amp_gain_4ch_get, rt715_sdca_set_amp_gain_4ch_put, - in_vol_tlv,4 ,0x7f ), + in_vol_tlv,4 ,0x3f ),/* MIC Boost Control */ RT715_SDCA_BOOST_EXT_TLV("FU0E Boost", SDW_SDCA_CTL(FUN_MIC_ARRAY, RT715_SDCA_FU_DMIC_GAIN_EN,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 46/473 KVM: selftests: Add test for uaccesses to non-existent vgic-v2 CPUIF
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Upton <[email protected]>
[ Upstream commit 160933e330f4c5a13931d725a4d952a4b9aefa71 ]
Assert that accesses to a non-existent vgic-v2 CPU interface consistently fail across the various KVM device attr ioctls. This also serves as a regression test for a bug wherein KVM hits a NULL dereference when the CPUID specified in the ioctl is invalid.
Note that there is no need to print the observed errno, as TEST_ASSERT() will take care of it.
--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
tools/testing/selftests/kvm/aarch64/vgic_init.c +50 -0
@@ -6,6 +6,7 @@*/ #define _GNU_SOURCE#include <linux/kernel.h> +#include <linux/bitfield.h> #include <sys/syscall.h> #include <asm/kvm.h> #include <asm/kvm_para.h>
@@ -86,6 +87,18 @@ static struct vm_gic vm_gic_create_with_return v; } +static struct vm_gic vm_gic_create_barebones (uint32_t gic_dev_type) +{ +struct vm_gic v; + + v.gic_dev_type = gic_dev_type; + v.vm =vm_create_barebones (); + v.gic_fd =kvm_create_device (v.vm, gic_dev_type); + +return v; +} + +static void vm_gic_destroy (struct vm_gic *v) {close (v->gic_fd);
@@ -359,6 +372,40 @@ static void test_vcpus_then_vgic(uint32_vm_gic_destroy (&v); } +#define KVM_VGIC_V2_ATTR (offset, cpu) \ + (FIELD_PREP(KVM_DEV_ARM_VGIC_OFFSET_MASK, offset) | \ + FIELD_PREP(KVM_DEV_ARM_VGIC_CPUID_MASK, cpu)) + +#define GIC_CPU_CTRL 0x00 + +static void test_v2_uaccess_cpuif_no_vcpus (void ) +{ +struct vm_gic v; +u64 val =0 ; +int ret; + + v =vm_gic_create_barebones (KVM_DEV_TYPE_ARM_VGIC_V2 ); +subtest_dist_rdist (&v); + + ret =__kvm_has_device_attr (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CPU_REGS , +KVM_VGIC_V2_ATTR (GIC_CPU_CTRL ,0 )); +TEST_ASSERT (ret && errno ==EINVAL , +"accessed non-existent CPU interface, want errno: %i" , +EINVAL ); + ret =__kvm_device_attr_get (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CPU_REGS , +KVM_VGIC_V2_ATTR (GIC_CPU_CTRL ,0 ), &val); +TEST_ASSERT (ret && errno ==EINVAL , +"accessed non-existent CPU interface, want errno: %i" , +EINVAL ); + ret =__kvm_device_attr_set (v.gic_fd,KVM_DEV_ARM_VGIC_GRP_CPU_REGS , +KVM_VGIC_V2_ATTR (GIC_CPU_CTRL ,0 ), &val); +TEST_ASSERT (ret && errno ==EINVAL , +"accessed non-existent CPU interface, want errno: %i" , +EINVAL ); + +vm_gic_destroy (&v); +} +static void test_v3_new_redist_regions (void ) {struct kvm_vcpu *vcpus[NR_VCPUS ];
@@ -677,6 +724,9 @@ void run_tests(uint32_t gic_dev_type)test_vcpus_then_vgic (gic_dev_type);test_vgic_then_vcpus (gic_dev_type); +if (VGIC_DEV_IS_V2 (gic_dev_type)) +test_v2_uaccess_cpuif_no_vcpus (); +if (VGIC_DEV_IS_V3 (gic_dev_type)) {test_v3_new_redist_regions ();test_v3_typer_accesses ();
Greg Kroah-Hartman
maintainerPATCH 47/473 x86/efistub: Omit physical KASLR when memory reservations exist
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
commit 15aa8fb852f995dd234a57f12dfb989044968bb6 upstream.
The legacy decompressor has elaborate logic to ensure that the randomized physical placement of the decompressed kernel image does not conflict with any memory reservations, including ones specified on the command line using mem=, memmap=, efi_fake_mem= or hugepages=, which are taken into account by the kernel proper at a later stage.
When booting in EFI mode, it is the firmware's job to ensure that the chosen range does not conflict with any memory reservations that it knows about, and this is trivially achieved by using the firmware's memory allocation APIs.
That leaves reservations specified on the command line, though, which the firmware knows nothing about, as these regions have no other special significance to the platform. Since commit
a1b87d54f4e4 ("x86/efistub: Avoid legacy decompressor when doing EFI boot")
these reservations are not taken into account when randomizing the physical placement, which may result in conflicts where the memory cannot be reserved by the kernel proper because its own executable image resides there.
To avoid having to duplicate or reuse the existing complicated logic, disable physical KASLR entirely when such overrides are specified. These are mostly diagnostic tools or niche features, and physical KASLR (as opposed to virtual KASLR, which is much more important as it affects the memory addresses observed by code executing in the kernel) is something we can live without.
--- drivers/firmware/efi/libstub/x86-stub.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/firmware/efi/libstub/x86-stub.c +26 -2
@@ -736,6 +736,26 @@ static void error(char *str)efi_warn ("Decompression failed: %s\n" , str); } +static const char *cmdline_memmap_override; + +static efi_status_t parse_options (const char *cmdline) +{ +static const char opts[][14 ] = { +"mem=" ,"memmap=" ,"efi_fake_mem=" ,"hugepages=" + }; + +for (int i =0 ; i <ARRAY_SIZE (opts); i++) { +const char *p =strstr (cmdline, opts[i]); + +if (p == cmdline || (p > cmdline &&isspace (p[-1 ]))) { + cmdline_memmap_override = opts[i]; +break ; + } + } + +return efi_parse_options (cmdline); +} +static efi_status_t efi_decompress_kernel (unsigned long *kernel_entry) {unsigned long virt_addr =LOAD_PHYSICAL_ADDR ;
@@ -767,6 +787,10 @@ static efi_status_t efi_decompress_kerne !memcmp(efistub_fw_vendor(), ami, sizeof(ami))) {efi_debug ("AMI firmware v2.0 or older detected - disabling physical KASLR\n" ); seed[0 ] =0 ; + } else if (cmdline_memmap_override) { +efi_info ("%s detected on the kernel command line - disabling physical KASLR\n" , + cmdline_memmap_override); + seed[0 ] =0 ; } boot_params_ptr->hdr.loadflags |=KASLR_FLAG ;
@@ -843,7 +867,7 @@ void __noreturn efi_stub_entry(efi_handl }#ifdef CONFIG_CMDLINE_BOOL - status =efi_parse_options (CONFIG_CMDLINE ); + status =parse_options (CONFIG_CMDLINE );if (status !=EFI_SUCCESS ) {efi_err ("Failed to parse options\n" ); goto fail;
@@ -852,7 +876,7 @@ void __noreturn efi_stub_entry(efi_handlif (!IS_ENABLED (CONFIG_CMDLINE_OVERRIDE )) {unsigned long cmdline_paddr = ((u64 )hdr->cmd_line_ptr | ((u64 )boot_params->ext_cmd_line_ptr <<32 )); - status =efi_parse_options ((char *)cmdline_paddr); + status =parse_options ((char *)cmdline_paddr);if (status !=EFI_SUCCESS ) {efi_err ("Failed to parse options\n" ); goto fail;
Greg Kroah-Hartman
maintainerPATCH 48/473 efi: libstub: only free priv.runtime_map when allocated
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hagar Hemdan <[email protected]>
commit 4b2543f7e1e6b91cfc8dd1696e3cdf01c3ac8974 upstream.
priv.runtime_map is only allocated when efi_novamap is not set. Otherwise, it is an uninitialized value. In the error path, it is freed unconditionally. Avoid passing an uninitialized value to free_pool. Free priv.runtime_map only when it was allocated.
This bug was discovered and resolved using Coverity Static Analysis Security Testing (SAST) by Synopsys, Inc.
--- drivers/firmware/efi/libstub/fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/efi/libstub/fdt.c +2 -2
@@ -335,8 +335,8 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle, fail:efi_free (fdt_size, fdt_addr); - -efi_bs_call (free_pool, priv.runtime_map); +if (!efi_novamap) +efi_bs_call (free_pool, priv.runtime_map);return EFI_LOAD_ERROR ; }
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 49/473 KVM: x86: Dont advertise guest.MAXPHYADDR as host.MAXPHYADDR in CPUID
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gerd Hoffmann <[email protected]>
commit 6f5c9600621b4efb5c61b482d767432eb1ad3a9c upstream.
Drop KVM's propagation of GuestPhysBits (CPUID leaf 80000008, EAX[23:16]) to HostPhysBits (same leaf, EAX[7:0]) when advertising the address widths to userspace via KVM_GET_SUPPORTED_CPUID.
Per AMD, GuestPhysBits is intended for software use, and physical CPUs do not set that field. I.e. GuestPhysBits will be non-zero if and only if KVM is running as a nested hypervisor, and in that case, GuestPhysBits is NOT guaranteed to capture the CPU's effective MAXPHYADDR when running with TDP enabled.
E.g. KVM will soon use GuestPhysBits to communicate the CPU's maximum *addressable* guest physical address, which would result in KVM under- reporting PhysBits when running as an L1 on a CPU with MAXPHYADDR=52, but without 5-level paging.
--- arch/x86/kvm/cpuid.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
arch/x86/kvm/cpuid.c +10 -11
@@ -1157,9 +1157,8 @@ static inline int __do_cpuid_func(struct entry->eax = entry->ebx = entry->ecx =0 ;break ;case 0x80000008 : { -unsigned g_phys_as = (entry->eax >>16 ) &0xff ; -unsigned virt_as =max ((entry->eax >>8 ) &0xff ,48U ); -unsigned phys_as = entry->eax &0xff ; +unsigned int virt_as =max ((entry->eax >>8 ) &0xff ,48U ); +unsigned int phys_as;/* * If TDP (NPT) is disabled use the adjusted host MAXPHYADDR as
@@ -1167,16 +1166,16 @@ static inline int __do_cpuid_func(struct* reductions in MAXPHYADDR for memory encryption affect shadow * paging, too. * -* If TDP is enabled but an explicit guest MAXPHYADDR is not -* provided, use the raw bare metal MAXPHYADDR as reductions to -* the HPAs do not affect GPAs. +* If TDP is enabled, use the raw bare metal MAXPHYADDR as +* reductions to the HPAs do not affect GPAs. */ -if (!tdp_enabled) - g_phys_as = boot_cpu_data.x86_phys_bits; -else if (!g_phys_as) - g_phys_as = phys_as; +if (!tdp_enabled) { + phys_as = boot_cpu_data.x86_phys_bits; + }else { + phys_as = entry->eax &0xff ; + } - entry->eax = g_phys_as | (virt_as <<8 ); + entry->eax = phys_as | (virt_as <<8 ); entry->ecx &= ~(GENMASK (31 ,16 ) |GENMASK (11 ,8 )); entry->edx =0 ;cpuid_entry_override (entry,CPUID_8000_0008_EBX );
Greg Kroah-Hartman
maintainerPATCH 50/473 genirq/cpuhotplug, x86/vector: Prevent vector leak during CPU offline
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongli Zhang <[email protected]>
commit a6c11c0a5235fb144a65e0cb2ffd360ddc1f6c32 upstream.
The absence of IRQD_MOVE_PCNTXT prevents immediate effectiveness of interrupt affinity reconfiguration via procfs. Instead, the change is deferred until the next instance of the interrupt being triggered on the original CPU.
When the interrupt next triggers on the original CPU, the new affinity is enforced within __irq_move_irq(). A vector is allocated from the new CPU, but the old vector on the original CPU remains and is not immediately reclaimed. Instead, apicd->move_in_progress is flagged, and the reclaiming process is delayed until the next trigger of the interrupt on the new CPU.
Upon the subsequent triggering of the interrupt on the new CPU, irq_complete_move() adds a task to the old CPU's vector_cleanup list if it remains online. Subsequently, the timer on the old CPU iterates over its vector_cleanup list, reclaiming old vectors.
However, a rare scenario arises if the old CPU is outgoing before the interrupt triggers again on the new CPU.
In that case irq_force_complete_move() is not invoked on the outgoing CPU to reclaim the old apicd->prev_vector because the interrupt isn't currently affine to the outgoing CPU, and irq_needs_fixup() returns false. Even though __vector_schedule_cleanup() is later called on the new CPU, it doesn't reclaim apicd->prev_vector; instead, it simply resets both apicd->move_in_progress and apicd->prev_vector to 0.
As a result, the vector remains unreclaimed in vector_matrix, leading to a CPU vector leak.
To address this issue, move the invocation of irq_force_complete_move() before the irq_needs_fixup() call to reclaim apicd->prev_vector, if the interrupt is currently or used to be affine to the outgoing CPU.
Additionally, reclaim the vector in __vector_schedule_cleanup() as well, following a warning message, although theoretically it should never see apicd->move_in_progress with apicd->prev_cpu pointing to an offline CPU.
--- arch/x86/kernel/apic/vector.c | 9 ++++++--- kernel/irq/cpuhotplug.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-)
arch/x86/kernel/apic/vector.c +6 -3
@@ -982,7 +982,8 @@ static void __send_cleanup_vector(structhlist_add_head (&apicd->clist,per_cpu_ptr (&cleanup_list, cpu)); apic->send_IPI (cpu,IRQ_MOVE_CLEANUP_VECTOR ); }else { - apicd->prev_vector =0 ; +pr_warn ("IRQ %u schedule cleanup for offline CPU %u\n" , apicd->irq, cpu); +free_moved_vector (apicd); }raw_spin_unlock (&vector_lock); }
@@ -1019,6 +1020,7 @@ void irq_complete_move(struct irq_cfg *c*/ void irq_force_complete_move (struct irq_desc *desc) { +unsigned int cpu =smp_processor_id ();struct apic_chip_data *apicd;struct irq_data *irqd;unsigned int vector;
@@ -1043,10 +1045,11 @@ void irq_force_complete_move(struct irq_ goto unlock;/* -* If prev_vector is empty, no action required. +* If prev_vector is empty or the descriptor is neither currently +* nor previously on the outgoing CPU no action required. */ vector = apicd->prev_vector; -if (!vector) +if (!vector || (apicd->cpu != cpu && apicd->prev_cpu != cpu)) goto unlock;/*
kernel/irq/cpuhotplug.c +8 -8
@@ -70,6 +70,14 @@ static bool migrate_one_irq(struct irq_d }/* +* Complete an eventually pending irq move cleanup. If this +* interrupt was moved in hard irq context, then the vectors need +* to be cleaned up. It can't wait until this interrupt actually +* happens and this CPU was involved. +*/ +irq_force_complete_move (desc); + +/* * No move required, if: * - Interrupt is per cpu * - Interrupt is not started
@@ -88,14 +96,6 @@ static bool migrate_one_irq(struct irq_d }/* -* Complete an eventually pending irq move cleanup. If this -* interrupt was moved in hard irq context, then the vectors need -* to be cleaned up. It can't wait until this interrupt actually -* happens and this CPU was involved. -*/ -irq_force_complete_move (desc); - -/* * If there is a setaffinity pending, then try to reuse the pending * mask, so the last change of the affinity does not get lost. If * there is no move pending or the pending mask does not contain
Greg Kroah-Hartman
maintainerPATCH 51/473 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Colberg <[email protected]>
[ Upstream commit bb1dbeceb1c20cfd81271e1bd69892ebd1ee38e0 ]
Add PCI subdevice ID for the Intel D5005 Stratix 10 FPGA card as used with the Open FPGA Stack (OFS) FPGA Interface Manager (FIM).
Unlike the Intel D5005 PAC FIM which exposed a separate PCI device ID, the OFS FIM reuses the same device ID for all DFL-based FPGA cards and differentiates on the subdevice ID. The subdevice ID values were chosen as the numeric part of the FPGA card names in hexadecimal.
--- drivers/fpga/dfl-pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/fpga/dfl-pci.c +3 -0
@@ -79,6 +79,7 @@ static void cci_pci_free_irq(struct pci_dev *pcidev)#define PCIE_DEVICE_ID_SILICOM_PAC_N5011 0x1001#define PCIE_DEVICE_ID_INTEL_DFL 0xbcce/* PCI Subdevice ID for PCIE_DEVICE_ID_INTEL_DFL */ +#define PCIE_SUBDEVICE_ID_INTEL_D5005 0x138d#define PCIE_SUBDEVICE_ID_INTEL_N6000 0x1770#define PCIE_SUBDEVICE_ID_INTEL_N6001 0x1771#define PCIE_SUBDEVICE_ID_INTEL_C6100 0x17d4
@@ -102,6 +103,8 @@ static struct pci_device_id cci_pcie_id_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_PAC_D5005_VF),}, {PCI_DEVICE(PCI_VENDOR_ID_SILICOM_DENMARK, PCIE_DEVICE_ID_SILICOM_PAC_N5010),}, {PCI_DEVICE(PCI_VENDOR_ID_SILICOM_DENMARK, PCIE_DEVICE_ID_SILICOM_PAC_N5011),}, + {PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_DFL, + PCI_VENDOR_ID_INTEL, PCIE_SUBDEVICE_ID_INTEL_D5005),}, {PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_DFL, PCI_VENDOR_ID_INTEL, PCIE_SUBDEVICE_ID_INTEL_N6000),}, {PCI_DEVICE_SUB(PCI_VENDOR_ID_INTEL, PCIE_DEVICE_ID_INTEL_DFL_VF,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 52/473 softirq: Fix suspicious RCU usage in __do_softirq()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zqiang <[email protected]>
[ Upstream commit 1dd1eff161bd55968d3d46bc36def62d71fb4785 ]
Currently, the condition "__this_cpu_read(ksoftirqd) == current" is used to invoke rcu_softirq_qs() in ksoftirqd tasks context for non-RT kernels.
This works correctly as long as the context is actually task context but this condition is wrong when:
- the current task is ksoftirqd
- the task is interrupted in a RCU read side critical section
- __do_softirq() is invoked on return from interrupt
Syzkaller triggered the following scenario:
-> finish_task_switch()
-> put_task_struct_rcu_user()
-> call_rcu(&task->rcu, delayed_put_task_struct)
-> __kasan_record_aux_stack()
-> pfn_valid()
-> rcu_read_lock_sched()
<interrupt>
__irq_exit_rcu()
-> __do_softirq)()
-> if (!IS_ENABLED(CONFIG_PREEMPT_RT) &&
__this_cpu_read(ksoftirqd) == current)
-> rcu_softirq_qs()
-> RCU_LOCKDEP_WARN(lock_is_held(&rcu_sched_lock_map))The rcu quiescent state is reported in the rcu-read critical section, so the lockdep warning is triggered.
Fix this by splitting out the inner working of __do_softirq() into a helper function which takes an argument to distinguish between ksoftirqd task context and interrupted context and invoke it from the relevant call sites with the proper context information and use that for the conditional invocation of rcu_softirq_qs().
--- kernel/softirq.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
kernel/softirq.c +8 -4
@@ -525,7 +525,7 @@ static inline bool lockdep_softirq_start(void) { return false; }static inline void lockdep_softirq_end (bool in_hardirq) { }#endif -asmlinkage __visible void __softirq_entry __do_softirq(void) +static void handle_softirqs (bool ksirqd) {unsigned long end = jiffies +MAX_SOFTIRQ_TIME ;unsigned long old_flags = current->flags;
@@ -580,8 +580,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void) pending >>= softirq_bit; } -if (!IS_ENABLED (CONFIG_PREEMPT_RT ) && -__this_cpu_read (ksoftirqd) == current) +if (!IS_ENABLED (CONFIG_PREEMPT_RT ) && ksirqd)rcu_softirq_qs ();local_irq_disable ();
@@ -601,6 +600,11 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)current_restore_flags (old_flags,PF_MEMALLOC ); } +asmlinkage __visible void __softirq_entry __do_softirq(void) +{ +handle_softirqs (false); +} +/** * irq_enter_rcu - Enter an interrupt context with RCU watching */
@@ -931,7 +935,7 @@ static void run_ksoftirqd(unsigned int cpu)* We can safely run softirq on inline stack, as we are not deep * in the task stack here. */ -__do_softirq (); +handle_softirqs (true);ksoftirqd_run_end ();cond_resched ();return ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 53/473 ASoC: da7219-aad: fix usage of device_get_named_child_node()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit e8a6a5ad73acbafd98e8fd3f0cbf6e379771bb76 ]
The documentation for device_get_named_child_node() mentions this important point:
"
The caller is responsible for calling fwnode_handle_put() on the returned fwnode pointer.
"
Add fwnode_handle_put() to avoid a leaked reference.
--- sound/soc/codecs/da7219-aad.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/codecs/da7219-aad.c +5 -1
@@ -638,8 +638,10 @@ static struct da7219_aad_pdata *da7219_aad_fw_to_pdata(struct device *dev)return NULL ; aad_pdata =devm_kzalloc (dev,sizeof (*aad_pdata),GFP_KERNEL ); -if (!aad_pdata) +if (!aad_pdata) { +fwnode_handle_put (aad_np);return NULL ; + } aad_pdata->irq = i2c->irq;
@@ -714,6 +716,8 @@ static struct da7219_aad_pdata *da7219_aad_fw_to_pdata(struct device *dev)else aad_pdata->adc_1bit_rpt =DA7219_AAD_ADC_1BIT_RPT_1 ; +fwnode_handle_put (aad_np); +return aad_pdata; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 54/473 ALSA: hda: intel-dsp-config: harden I2C/I2S codec detection
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 79ac4c1443eaec0d09355307043a9149287f23c1 ]
The SOF driver is selected whenever specific I2C/I2S HIDs are reported as 'present' in the ACPI DSDT. In some cases, an HID is reported but the hardware does not actually rely on I2C/I2S. This false positive leads to an invalid selection of the SOF driver and as a result an invalid topology is loaded.
This patch hardens the detection with a check that the NHLT table is consistent with the report of an I2S-based codec in DSDT. This table should expose at least one SSP endpoint configured for an I2S-codec connection.
Tested on Huawei Matebook D14 (NBLB-WAX9N) using an HDaudio codec with an invalid ES8336 ACPI HID reported:
[ 7.858249] snd_hda_intel 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040380 [ 7.858312] snd_hda_intel 0000:00:1f.3: snd_intel_dsp_find_config: no valid SSP found for HID ESSX8336, skipped
Message-ID: <[email protected]>
--- sound/hda/intel-dsp-config.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
sound/hda/intel-dsp-config.c +25 -2
@@ -511,9 +511,32 @@ static const struct config_entry *snd_intel_dsp_find_configif (table->codec_hid) {int i; -for (i =0 ; i < table->codec_hid->num_codecs; i++) -if (acpi_dev_present (table->codec_hid->codecs[i],NULL ,-1 )) +for (i =0 ; i < table->codec_hid->num_codecs; i++) { +struct nhlt_acpi_table *nhlt; +bool ssp_found = false; + +if (!acpi_dev_present (table->codec_hid->codecs[i],NULL ,-1 )) +continue ; + + nhlt =intel_nhlt_init (&pci->dev); +if (!nhlt) { +dev_warn (&pci->dev,"%s: NHLT table not found, skipped HID %s\n" , + __func__, table->codec_hid->codecs[i]); +continue ; + } + +if (intel_nhlt_has_endpoint_type (nhlt,NHLT_LINK_SSP ) && +intel_nhlt_ssp_endpoint_mask (nhlt,NHLT_DEVICE_I2S )) + ssp_found = true; + +intel_nhlt_free (nhlt); + +if (ssp_found)break ; + +dev_warn (&pci->dev,"%s: no valid SSP found for HID %s, skipped\n" , + __func__, table->codec_hid->codecs[i]); + }if (i == table->codec_hid->num_codecs)continue ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 55/473 drm/amd/display: Add dtbclk access to dcn315
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Swapnil Patel <[email protected]>
[ Upstream commit a01b64f31d65bdc917d1afb4cec9915beb6931be ]
[Why & How]
Currently DCN315 clk manager is missing code to enable/disable dtbclk. Because of this, "optimized_required" flag is constantly set and this prevents FreeSync from engaging for certain high bandwidth display Modes which require DTBCLK.
--- .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c +8 -0
@@ -131,6 +131,10 @@ static void dcn315_update_clocks(struct clk_mgr *clk_mgr_base,*/ clk_mgr_base->clks.zstate_support = new_clocks->zstate_support;if (safe_to_lower) { +if (clk_mgr_base->clks.dtbclk_en && !new_clocks->dtbclk_en) { +dcn315_smu_set_dtbclk (clk_mgr, false); + clk_mgr_base->clks.dtbclk_en = new_clocks->dtbclk_en; + }/* check that we're not already in lower */ if (clk_mgr_base->clks.pwr_state !=DCN_PWR_STATE_LOW_POWER ) { display_count =dcn315_get_active_display_cnt_wa (dc, context);
@@ -146,6 +150,10 @@ static void dcn315_update_clocks(struct clk_mgr *clk_mgr_base, } } }else { +if (!clk_mgr_base->clks.dtbclk_en && new_clocks->dtbclk_en) { +dcn315_smu_set_dtbclk (clk_mgr, true); + clk_mgr_base->clks.dtbclk_en = new_clocks->dtbclk_en; + }/* check that we're not already in D0 */ if (clk_mgr_base->clks.pwr_state !=DCN_PWR_STATE_MISSION_MODE ) {union display_idle_optimization_u idle_info = {0 };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 56/473 drm/amd/display: Add VCO speed parameter for DCN31 FPU
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rodrigo Siqueira <[email protected]>
[ Upstream commit 0e62103bdcbc88281e16add299a946fb3bd02fbe ]
Add VCO speed parameters in the bounding box array.
--- drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +2 -0
@@ -291,6 +291,7 @@ static struct _vcs_dpi_soc_bounding_box_st dcn3_15_soc = { .do_urgent_latency_adjustment = false, .urgent_latency_adjustment_fabric_clock_component_us = 0, .urgent_latency_adjustment_fabric_clock_reference_mhz = 0, + .dispclk_dppclk_vco_speed_mhz = 2400.0, .num_chans = 4, .dummy_pstate_latency_us = 10.0 };
@@ -438,6 +439,7 @@ static struct _vcs_dpi_soc_bounding_box_st dcn3_16_soc = { .do_urgent_latency_adjustment = false, .urgent_latency_adjustment_fabric_clock_component_us = 0, .urgent_latency_adjustment_fabric_clock_reference_mhz = 0, + .dispclk_dppclk_vco_speed_mhz = 2500.0, }; void dcn31_zero_pipe_dcc_fraction(display_e2e_pipe_params_st *pipes,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 57/473 drm/amdkfd: Flush the process wq before creating a kfd_process
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lancelot SIX <[email protected]>
[ Upstream commit f5b9053398e70a0c10aa9cb4dd5910ab6bc457c5 ]
There is a race condition when re-creating a kfd_process for a process. This has been observed when a process under the debugger executes exec(3). In this scenario:
- The process executes exec.
- This will eventually release the process's mm, which will cause the kfd_process object associated with the process to be freed (kfd_process_free_notifier decrements the reference count to the kfd_process to 0). This causes kfd_process_ref_release to enqueue kfd_process_wq_release to the kfd_process_wq.
- The debugger receives the PTRACE_EVENT_EXEC notification, and tries to re-enable AMDGPU traps (KFD_IOC_DBG_TRAP_ENABLE).
- When handling this request, KFD tries to re-create a kfd_process. This eventually calls kfd_create_process and kobject_init_and_add.
At this point the call to kobject_init_and_add can fail because the old kfd_process.kobj has not been freed yet by kfd_process_wq_release.
This patch proposes to avoid this race by making sure to drain kfd_process_wq before creating a new kfd_process object. This way, we know that any cleanup task is done executing when we reach kobject_init_and_add.
--- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_process.c +8 -0
@@ -823,6 +823,14 @@ struct kfd_process *kfd_create_process(struct file *filep)if (process) {pr_debug ("Process already found\n" ); }else { +/* If the process just called exec(3), it is possible that the +* cleanup of the kfd_process (following the release of the mm +* of the old process image) is still in the cleanup work queue. +* Make sure to drain any job before trying to recreate any +* resource for this process. +*/ +flush_workqueue (kfd_process_wq); + process =create_process (thread);if (IS_ERR (process)) goto out;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 58/473 x86/mm: Remove broken vsyscall emulation code from the page fault code
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
[ Upstream commit 02b670c1f88e78f42a6c5aee155c7b26960ca054 ]
The syzbot-reported stack trace from hell in this discussion thread actually has three nested page faults:
https://lore.kernel.org/r/[email protected]
... and I think that's actually the important thing here:
- the first page fault is from user space, and triggers the vsyscall emulation.
- the second page fault is from __do_sys_gettimeofday(), and that should just have caused the exception that then sets the return value to -EFAULT
- the third nested page fault is due to _raw_spin_unlock_irqrestore() -> preempt_schedule() -> trace_sched_switch(), which then causes a BPF trace program to run, which does that bpf_probe_read_compat(), which causes that page fault under pagefault_disable().
It's quite the nasty backtrace, and there's a lot going on.
The problem is literally the vsyscall emulation, which sets
current->thread.sig_on_uaccess_err = 1;
and that causes the fixup_exception() code to send the signal *despite* the exception being caught.
And I think that is in fact completely bogus. It's completely bogus exactly because it sends that signal even when it *shouldn't* be sent - like for the BPF user mode trace gathering.
In other words, I think the whole "sig_on_uaccess_err" thing is entirely broken, because it makes any nested page-faults do all the wrong things.
Now, arguably, I don't think anybody should enable vsyscall emulation any more, but this test case clearly does.
I think we should just make the "send SIGSEGV" be something that the vsyscall emulation does on its own, not this broken per-thread state for something that isn't actually per thread.
The x86 page fault code actually tried to deal with the "incorrect nesting" by having that:
if (in_interrupt())
return;which ignores the sig_on_uaccess_err case when it happens in interrupts, but as shown by this example, these nested page faults do not need to be about interrupts at all.
IOW, I think the only right thing is to remove that horrendously broken code.
The attached patch looks like the ObviouslyCorrect(tm) thing to do.
NOTE! This broken code goes back to this commit in 2011:
4fc3490114bb ("x86-64: Set siginfo and context on vsyscall emulation faults")
... and back then the reason was to get all the siginfo details right. Honestly, I do not for a moment believe that it's worth getting the siginfo details right here, but part of the commit says:
This fixes issues with UML when vsyscall=emulate.
... and so my patch to remove this garbage will probably break UML in this situation.
I do not believe that anybody should be running with vsyscall=emulate in 2024 in the first place, much less if you are doing things like UML. But let's see if somebody screams.
--- arch/x86/entry/vsyscall/vsyscall_64.c | 28 ++--------------------- arch/x86/include/asm/processor.h | 1 - arch/x86/mm/fault.c | 33 +-------------------------- 3 files changed, 3 insertions(+), 59 deletions(-)
arch/x86/entry/vsyscall/vsyscall_64.c +2 -26
@@ -98,11 +98,6 @@ static int addr_to_vsyscall_nr(unsigned long addr)static bool write_ok_or_segv (unsigned long ptr,size_t size) { -/* -* XXX: if access_ok, get_user, and put_user handled -* sig_on_uaccess_err, this could go away. -*/ -if (!access_ok ((void __user *)ptr, size)) {struct thread_struct *thread = ¤t->thread;
@@ -120,10 +115,8 @@ static bool write_ok_or_segv(unsigned long ptr, size_t size)bool emulate_vsyscall (unsigned long error_code,struct pt_regs *regs,unsigned long address) { -struct task_struct *tsk;unsigned long caller;int vsyscall_nr, syscall_nr, tmp; -int prev_sig_on_uaccess_err;long ret;unsigned long orig_dx;
@@ -172,8 +165,6 @@ bool emulate_vsyscall(unsigned long error_code, goto sigsegv; } - tsk = current; -/* * Check for access_ok violations and find the syscall nr. *
@@ -234,12 +225,8 @@ bool emulate_vsyscall(unsigned long error_code, goto do_ret;/* skip requested */ /* -* With a real vsyscall, page faults cause SIGSEGV. We want to -* preserve that behavior to make writing exploits harder. +* With a real vsyscall, page faults cause SIGSEGV. */ - prev_sig_on_uaccess_err = current->thread.sig_on_uaccess_err; - current->thread.sig_on_uaccess_err =1 ; - ret = -EFAULT ;switch (vsyscall_nr) {case 0 :
@@ -262,23 +249,12 @@ bool emulate_vsyscall(unsigned long error_code,break ; } - current->thread.sig_on_uaccess_err = prev_sig_on_uaccess_err; - check_fault:if (ret == -EFAULT ) {/* Bad news -- userspace fed a bad pointer to a vsyscall. */ warn_bad_vsyscall (KERN_INFO , regs,"vsyscall fault (exploit attempt?)" ); - -/* -* If we failed to generate a signal for any reason, -* generate one here. (This should be impossible.) -*/ -if (WARN_ON_ONCE (!sigismember (&tsk->pending.signal,SIGBUS ) && - !sigismember (&tsk->pending.signal,SIGSEGV ))) - goto sigsegv; - -return true;/* Don't emulate the ret. */ + goto sigsegv; } regs->ax = ret;
arch/x86/include/asm/processor.h +0 -1
@@ -519,7 +519,6 @@ struct thread_struct {unsigned long iopl_emul; unsigned int iopl_warn:1; - unsigned int sig_on_uaccess_err:1;/* * Protection Keys Register for Userspace. Loaded immediately on
arch/x86/mm/fault.c +1 -32
@@ -737,39 +737,8 @@ kernelmode_fixup_or_oops(struct pt_regs *regs, unsigned long error_code,WARN_ON_ONCE (user_mode (regs));/* Are we prepared to handle this kernel fault? */ -if (fixup_exception (regs,X86_TRAP_PF , error_code, address)) { -/* -* Any interrupt that takes a fault gets the fixup. This makes -* the below recursive fault logic only apply to a faults from -* task context. -*/ -if (in_interrupt ()) -return ; - -/* -* Per the above we're !in_interrupt(), aka. task context. -* -* In this case we need to make sure we're not recursively -* faulting through the emulate_vsyscall() logic. -*/ -if (current->thread.sig_on_uaccess_err && signal) { -sanitize_error_code (address, &error_code); - -set_signal_archinfo (address, error_code); - -if (si_code ==SEGV_PKUERR ) { -force_sig_pkuerr ((void __user *)address, pkey); - }else { -/* XXX: hwpoison faults will set the wrong code. */ -force_sig_fault (signal, si_code, (void __user *)address); - } - } - -/* -* Barring that, we can do the fixup and be happy. -*/ +if (fixup_exception (regs,X86_TRAP_PF , error_code, address))return ; - }/* * AMD erratum #91 manifests as a spurious page fault on a PREFETCH
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 59/473 nvme: find numa distance only if controller has valid numa id
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nilay Shroff <[email protected]>
[ Upstream commit 863fe60ed27f2c85172654a63c5b827e72c8b2e6 ]
On system where native nvme multipath is configured and iopolicy is set to numa but the nvme controller numa node id is undefined or -1 (NUMA_NO_NODE) then avoid calculating node distance for finding optimal io path. In such case we may access numa distance table with invalid index and that may potentially refer to incorrect memory. So this patch ensures that if the nvme controller numa node id is -1 then instead of calculating node distance for finding optimal io path, we set the numa node distance of such controller to default 10 (LOCAL_DISTANCE).
--- drivers/nvme/host/multipath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/multipath.c +2 -1
@@ -213,7 +213,8 @@ static struct nvme_ns *__nvme_find_path(struct nvme_ns_head *head, int node)if (nvme_path_is_disabled (ns))continue ; -if (READ_ONCE (head->subsys->iopolicy) ==NVME_IOPOLICY_NUMA ) +if (ns->ctrl->numa_node !=NUMA_NO_NODE && +READ_ONCE (head->subsys->iopolicy) ==NVME_IOPOLICY_NUMA ) distance =node_distance (node, ns->ctrl->numa_node);else distance =LOCAL_DISTANCE ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 60/473 nvmet-auth: return the error code to the nvmet_auth_host_hash() callers
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit 46b8f9f74f6d500871985e22eb19560b21f3bc81 ]
If the nvmet_auth_host_hash() function fails, the error code should be returned to its callers.
--- drivers/nvme/target/auth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/target/auth.c +1 -1
@@ -368,7 +368,7 @@ int nvmet_auth_host_hash(struct nvmet_req *req, u8 *response,kfree_sensitive (host_response); out_free_tfm:crypto_free_shash (shash_tfm); -return 0 ; +return ret; } int nvmet_auth_ctrl_hash(struct nvmet_req *req, u8 *response,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 61/473 nvmet-auth: replace pr_debug() with pr_err() to report an error.
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit 445f9119e70368ccc964575c2a6d3176966a9d65 ]
In nvmet_auth_host_hash(), if a mismatch is detected in the hash length the kernel should print an error.
--- drivers/nvme/target/auth.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/target/auth.c +3 -3
@@ -284,9 +284,9 @@ int nvmet_auth_host_hash(struct nvmet_req *req, u8 *response, }if (shash_len !=crypto_shash_digestsize (shash_tfm)) { -pr_debug ("%s: hash len mismatch (len %d digest %d)\n" , - __func__, shash_len, -crypto_shash_digestsize (shash_tfm)); +pr_err ("%s: hash len mismatch (len %d digest %d)\n" , + __func__, shash_len, +crypto_shash_digestsize (shash_tfm)); ret = -EINVAL ; goto out_free_tfm; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 62/473 nvmet-tcp: fix possible memory leak when tearing down a controller
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
[ Upstream commit 6825bdde44340c5a9121f6d6fa25cc885bd9e821 ]
When we teardown the controller, we wait for pending I/Os to complete (sq->ref on all queues to drop to zero) and then we go over the commands, and free their command buffers in case they are still fetching data from the host (e.g. processing nvme writes) and have yet to take a reference on the sq.
However, we may miss the case where commands have failed before executing and are queued for sending a response, but will never occur because the queue socket is already down. In this case we may miss deallocating command buffers.
Solve this by freeing all commands buffers as nvmet_tcp_free_cmd_buffers is idempotent anyways.
--- drivers/nvme/target/tcp.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/nvme/target/tcp.c +4 -7
@@ -297,6 +297,7 @@ static int nvmet_tcp_check_ddgst(struct nvmet_tcp_queue *queue, void *pdu)return 0 ; } +/* If cmd buffers are NULL, no operation is performed */ static void nvmet_tcp_free_cmd_buffers (struct nvmet_tcp_cmd *cmd) {kfree (cmd->iov);
@@ -1437,13 +1438,9 @@ static void nvmet_tcp_free_cmd_data_in_buffers(struct nvmet_tcp_queue *queue)struct nvmet_tcp_cmd *cmd = queue->cmds;int i; -for (i =0 ; i < queue->nr_cmds; i++, cmd++) { -if (nvmet_tcp_need_data_in (cmd)) -nvmet_tcp_free_cmd_buffers (cmd); - } - -if (!queue->nr_cmds &&nvmet_tcp_need_data_in (&queue->connect)) -nvmet_tcp_free_cmd_buffers (&queue->connect); +for (i =0 ; i < queue->nr_cmds; i++, cmd++) +nvmet_tcp_free_cmd_buffers (cmd); +nvmet_tcp_free_cmd_buffers (&queue->connect); }static void nvmet_tcp_release_queue_work (struct work_struct *w)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 63/473 nvmet: fix nvme status code when namespace is disabled
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
[ Upstream commit 505363957fad35f7aed9a2b0d8dad73451a80fb5 ]
If the user disabled a nvmet namespace, it is removed from the subsystem namespaces list. When nvmet processes a command directed to an nsid that was disabled, it cannot differentiate between a nsid that is disabled vs. a non-existent namespace, and resorts to return NVME_SC_INVALID_NS with the dnr bit set.
This translates to a non-retryable status for the host, which translates to a user error. We should expect disabled namespaces to not cause an I/O error in a multipath environment.
Address this by searching a configfs item for the namespace nvmet failed to find, and if we found one, conclude that the namespace is disabled (perhaps temporarily). Return NVME_SC_INTERNAL_PATH_ERROR in this case and keep DNR bit cleared.
--- drivers/nvme/target/configfs.c | 13 +++++++++++++ drivers/nvme/target/core.c | 5 ++++- drivers/nvme/target/nvmet.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-)
drivers/nvme/target/configfs.c +13 -0
@@ -615,6 +615,19 @@ static struct configfs_attribute *nvmet_ns_attrs[] = { NULL, }; +bool nvmet_subsys_nsid_exists (struct nvmet_subsys *subsys,u32 nsid) +{ +struct config_item *ns_item; +char name[4 ] = {}; + +if (sprintf (name,"%u" , nsid) <=0 ) +return false; +mutex_lock (&subsys->namespaces_group.cg_subsys->su_mutex); + ns_item =config_group_find_item (&subsys->namespaces_group, name); +mutex_unlock (&subsys->namespaces_group.cg_subsys->su_mutex); +return ns_item !=NULL ; +} +static void nvmet_ns_release (struct config_item *item) {struct nvmet_ns *ns =to_nvmet_ns (item);
drivers/nvme/target/core.c +4 -1
@@ -423,10 +423,13 @@ void nvmet_stop_keep_alive_timer(struct nvmet_ctrl *ctrl)u16 nvmet_req_find_ns (struct nvmet_req *req) {u32 nsid =le32_to_cpu (req->cmd->common.nsid); +struct nvmet_subsys *subsys =nvmet_req_subsys (req); - req->ns =xa_load (&nvmet_req_subsys (req)->namespaces, nsid); + req->ns =xa_load (&subsys->namespaces, nsid);if (unlikely (!req->ns)) { req->error_loc = offsetof(struct nvme_common_command , nsid); +if (nvmet_subsys_nsid_exists (subsys, nsid)) +return NVME_SC_INTERNAL_PATH_ERROR ;return NVME_SC_INVALID_NS |NVME_SC_DNR ; }
drivers/nvme/target/nvmet.h +1 -0
@@ -527,6 +527,7 @@ void nvmet_subsys_disc_changed(struct nvmet_subsys *subsys, struct nvmet_host *host);void nvmet_add_async_event (struct nvmet_ctrl *ctrl,u8 event_type,u8 event_info,u8 log_page); +bool nvmet_subsys_nsid_exists (struct nvmet_subsys *subsys,u32 nsid);#define NVMET_QUEUE_SIZE 1024#define NVMET_NR_QUEUES 128
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 64/473 epoll: be better about file lifetimes
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
[ Upstream commit 4efaa5acf0a1d2b5947f98abb3acf8bfd966422b ]
epoll can call out to vfs_poll() with a file pointer that may race with the last 'fput()'. That would make f_count go down to zero, and while the ep->mtx locking means that the resulting file pointer tear-down will be blocked until the poll returns, it means that f_count is already dead, and any use of it won't actually get a reference to the file any
more: it's dead regardless.
Make sure we have a valid ref on the file pointer before we call down to vfs_poll() from the epoll routines.
--- fs/eventpoll.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)
fs/eventpoll.c +37 -1
@@ -839,6 +839,34 @@ static __poll_t __ep_eventpoll_poll(struct file *file, poll_table *wait, int depreturn res; } +/* +* The ffd.file pointer may be in the process of being torn down due to +* being closed, but we may not have finished eventpoll_release() yet. +* +* Normally, even with the atomic_long_inc_not_zero, the file may have +* been free'd and then gotten re-allocated to something else (since +* files are not RCU-delayed, they are SLAB_TYPESAFE_BY_RCU). +* +* But for epoll, users hold the ep->mtx mutex, and as such any file in +* the process of being free'd will block in eventpoll_release_file() +* and thus the underlying file allocation will not be free'd, and the +* file re-use cannot happen. +* +* For the same reason we can avoid a rcu_read_lock() around the +* operation - 'ffd.file' cannot go away even if the refcount has +* reached zero (but we must still not call out to ->poll() functions +* etc). +*/ +static struct file *epi_fget (const struct epitem *epi) +{ +struct file *file; + + file = epi->ffd.file; +if (!atomic_long_inc_not_zero (&file->f_count)) + file =NULL ; +return file; +} +/* * Differs from ep_eventpoll_poll() in that internal callers already have * the ep->mtx so we need to start from depth=1, such that mutex_lock_nested()
@@ -847,14 +875,22 @@ static __poll_t __ep_eventpoll_poll(struct file *file, poll_table *wait, int depstatic __poll_t ep_item_poll (const struct epitem *epi,poll_table *pt,int depth) { -struct file *file = epi->ffd.file; +struct file *file =epi_fget (epi);__poll_t res; +/* +* We could return EPOLLERR | EPOLLHUP or something, but let's +* treat this more as "file doesn't exist, poll didn't happen". +*/ +if (!file) +return 0 ; + pt->_key = epi->event.events;if (!is_file_epoll (file)) res =vfs_poll (file, pt);else res =__ep_eventpoll_poll (file, pt, depth); +fput (file);return res & epi->event.events; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 65/473 nvmet: prevent sprintf() overflow in nvmet_subsys_nsid_exists()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit d15dcd0f1a4753b57e66c64c8dc2a9779ff96aab ]
The nsid value is a u32 that comes from nvmet_req_find_ns(). It's endian data and we're on an error path and both of those raise red flags. So let's make this safer.
1) Make the buffer large enough for any u32.
2) Remove the unnecessary initialization.
3) Use snprintf() instead of sprintf() for even more safety.
4) The sprintf() function returns the number of bytes printed, not counting the NUL terminator. It is impossible for the return value to be <= 0 so delete that.
--- drivers/nvme/target/configfs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/nvme/target/configfs.c +2 -3
@@ -618,10 +618,9 @@ static struct configfs_attribute *nvmet_ns_attrs[] = {bool nvmet_subsys_nsid_exists (struct nvmet_subsys *subsys,u32 nsid) {struct config_item *ns_item; -char name[4 ] = {}; +char name[12 ]; -if (sprintf (name,"%u" , nsid) <=0 ) -return false; +snprintf (name,sizeof (name),"%u" , nsid);mutex_lock (&subsys->namespaces_group.cg_subsys->su_mutex); ns_item =config_group_find_item (&subsys->namespaces_group, name);mutex_unlock (&subsys->namespaces_group.cg_subsys->su_mutex);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 66/473 openpromfs: finish conversion to the new mount API
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Sandeen <[email protected]>
[ Upstream commit 8f27829974b025d4df2e78894105d75e3bf349f0 ]
The original mount API conversion inexplicably left out the change from ->remount_fs to ->reconfigure; do that now.
--- fs/openpromfs/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/openpromfs/inode.c +4 -4
@@ -355,10 +355,10 @@ static struct inode *openprom_iget(struct super_block *sb, ino_t ino)return inode; } -static int openprom_remount (struct super_block *sb,int *flags,char *data) +static int openpromfs_reconfigure (struct fs_context *fc) { -sync_filesystem (sb); - *flags |=SB_NOATIME ; +sync_filesystem (fc->root->d_sb); + fc->sb_flags |=SB_NOATIME ;return 0 ; }
@@ -366,7 +366,6 @@ static const struct super_operations openprom_sops = { .alloc_inode = openprom_alloc_inode, .free_inode = openprom_free_inode, .statfs = simple_statfs, - .remount_fs = openprom_remount, };static int openprom_fill_super (struct super_block *s,struct fs_context *fc)
@@ -416,6 +415,7 @@ static int openpromfs_get_tree(struct fs_context *fc)static const struct fs_context_operations openpromfs_context_ops = { .get_tree = openpromfs_get_tree, + .reconfigure = openpromfs_reconfigure, };static int openpromfs_init_fs_context (struct fs_context *fc)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 67/473 crypto: bcm - Fix pointer arithmetic
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit 2b3460cbf454c6b03d7429e9ffc4fe09322eb1a9 ]
In spu2_dump_omd() value of ptr is increased by ciph_key_len instead of hash_iv_len which could lead to going beyond the buffer boundaries.
Fix this bug by changing ciph_key_len to hash_iv_len.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/crypto/bcm/spu2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/bcm/spu2.c +1 -1
@@ -495,7 +495,7 @@ static void spu2_dump_omd(u8 *omd, u16 hash_key_len, u16 ciph_key_len,if (hash_iv_len) {packet_log (" Hash IV Length %u bytes\n" , hash_iv_len);packet_dump (" hash IV: " , ptr, hash_iv_len); - ptr += ciph_key_len; + ptr += hash_iv_len; }if (ciph_iv_len) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 68/473 mm/slub, kunit: Use inverted data to corrupt kmem cache
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit b1080c667b3b2c8c38a7fa83ca5567124887abae ]
Two failure patterns are seen randomly when running slub_kunit tests with CONFIG_SLAB_FREELIST_RANDOM and CONFIG_SLAB_FREELIST_HARDENED enabled.
Pattern 1:
# test_clobber_zone: pass:1 fail:0 skip:0 total:1 ok 1 test_clobber_zone
# test_next_pointer: EXPECTATION FAILED at lib/slub_kunit.c:72 Expected 3 == slab_errors, but
slab_errors == 0 (0x0)
# test_next_pointer: EXPECTATION FAILED at lib/slub_kunit.c:84 Expected 2 == slab_errors, but
slab_errors == 0 (0x0)
# test_next_pointer: pass:0 fail:1 skip:0 total:1 not ok 2 test_next_pointer
In this case, test_next_pointer() overwrites p[s->offset], but the data at p[s->offset] is already 0x12.
Pattern 2:
ok 1 test_clobber_zone
# test_next_pointer: EXPECTATION FAILED at lib/slub_kunit.c:72 Expected 3 == slab_errors, but
slab_errors == 2 (0x2)
# test_next_pointer: pass:0 fail:1 skip:0 total:1 not ok 2 test_next_pointer
In this case, p[s->offset] has a value other than 0x12, but one of the expected failures is nevertheless missing.
Invert data instead of writing a fixed value to corrupt the cache data structures to fix the problem.
--- lib/slub_kunit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/slub_kunit.c +1 -1
@@ -39,7 +39,7 @@ static void test_next_pointer(struct kunit *test) ptr_addr = (unsigned long *)(p + s->offset); tmp = *ptr_addr; - p[s->offset] =0x12 ; + p[s->offset] = ~p[s->offset];/* * Expecting three errors.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 69/473 firmware: raspberrypi: Use correct device for DMA mappings
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laurent Pinchart <[email protected]>
[ Upstream commit df518a0ae1b982a4dcf2235464016c0c4576a34d ]
The buffer used to transfer data over the mailbox interface is mapped using the client's device. This is incorrect, as the device performing the DMA transfer is the mailbox itself. Fix it by using the mailbox controller device instead.
This requires including the mailbox_controller.h header to dereference the mbox_chan and mbox_controller structures. The header is not meant to be included by clients. This could be fixed by extending the client API with a function to access the controller's device.
--- drivers/firmware/raspberrypi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/firmware/raspberrypi.c +4 -3
@@ -9,6 +9,7 @@#include <linux/dma-mapping.h> #include <linux/kref.h> #include <linux/mailbox_client.h> +#include <linux/mailbox_controller.h> #include <linux/module.h> #include <linux/of_platform.h> #include <linux/platform_device.h>
@@ -96,8 +97,8 @@ int rpi_firmware_property_list(struct rpi_firmware *fw,if (size &3 )return -EINVAL ; - buf =dma_alloc_coherent (fw->cl.dev,PAGE_ALIGN (size), &bus_addr, -GFP_ATOMIC ); + buf =dma_alloc_coherent (fw->chan->mbox->dev,PAGE_ALIGN (size), + &bus_addr,GFP_ATOMIC );if (!buf)return -ENOMEM ;
@@ -125,7 +126,7 @@ int rpi_firmware_property_list(struct rpi_firmware *fw, ret = -EINVAL ; } -dma_free_coherent (fw->cl.dev,PAGE_ALIGN (size), buf, bus_addr); +dma_free_coherent (fw->chan->mbox->dev,PAGE_ALIGN (size), buf, bus_addr);return ret; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 70/473 ecryptfs: Fix buffer size for tag 66 packet
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brian Kubisiak <[email protected]>
[ Upstream commit 85a6a1aff08ec9f5b929d345d066e2830e8818e5 ]
The 'TAG 66 Packet Format' description is missing the cipher code and checksum fields that are packed into the message packet. As a result, the buffer allocated for the packet is 3 bytes too small and write_tag_66_packet() will write up to 3 bytes past the end of the buffer.
Fix this by increasing the size of the allocation so the whole packet will always fit in the buffer.
This fixes the below kasan slab-out-of-bounds bug:
BUG: KASAN: slab-out-of-bounds in ecryptfs_generate_key_packet_set+0x7d6/0xde0 Write of size 1 at addr ffff88800afbb2a5 by task touch/181 CPU: 0 PID: 181 Comm: touch Not tainted 6.6.13-gnu #1 4c9534092be820851bb687b82d1f92a426598dc6 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.2/GNU Guix 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x4c/0x70 print_report+0xc5/0x610 ? ecryptfs_generate_key_packet_set+0x7d6/0xde0 ? kasan_complete_mode_report_info+0x44/0x210 ? ecryptfs_generate_key_packet_set+0x7d6/0xde0 kasan_report+0xc2/0x110 ? ecryptfs_generate_key_packet_set+0x7d6/0xde0 __asan_store1+0x62/0x80 ecryptfs_generate_key_packet_set+0x7d6/0xde0 ? __pfx_ecryptfs_generate_key_packet_set+0x10/0x10 ? __alloc_pages+0x2e2/0x540 ? __pfx_ovl_open+0x10/0x10 [overlay 30837f11141636a8e1793533a02e6e2e885dad1d] ? dentry_open+0x8f/0xd0 ecryptfs_write_metadata+0x30a/0x550 ? __pfx_ecryptfs_write_metadata+0x10/0x10 ? ecryptfs_get_lower_file+0x6b/0x190 ecryptfs_initialize_file+0x77/0x150 ecryptfs_create+0x1c2/0x2f0 path_openat+0x17cf/0x1ba0 ? __pfx_path_openat+0x10/0x10 do_filp_open+0x15e/0x290 ? __pfx_do_filp_open+0x10/0x10 ? __kasan_check_write+0x18/0x30 ? _raw_spin_lock+0x86/0xf0 ? __pfx__raw_spin_lock+0x10/0x10 ? __kasan_check_write+0x18/0x30 ? alloc_fd+0xf4/0x330 do_sys_openat2+0x122/0x160 ? __pfx_do_sys_openat2+0x10/0x10 __x64_sys_openat+0xef/0x170 ? __pfx___x64_sys_openat+0x10/0x10 do_syscall_64+0x60/0xd0 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 RIP: 0033:0x7f00a703fd67 Code: 25 00 00 41 00 3d 00 00 41 00 74 37 64 8b 04 25 18 00 00 00 85 c0 75 5b 44 89 e2 48 89 ee bf 9c ff ff ff b8 01 01 00 00 0f 05 <48> 3d 00 f0 ff ff 0f 87 85 00 00 00 48 83 c4 68 5d 41 5c c3 0f 1f RSP: 002b:00007ffc088e30b0 EFLAGS: 00000246 ORIG_RAX: 0000000000000101 RAX: ffffffffffffffda RBX: 00007ffc088e3368 RCX: 00007f00a703fd67 RDX: 0000000000000941 RSI: 00007ffc088e48d7 RDI: 00000000ffffff9c RBP: 00007ffc088e48d7 R08: 0000000000000001 R09: 0000000000000000 R10: 00000000000001b6 R11: 0000000000000246 R12: 0000000000000941 R13: 0000000000000000 R14: 00007ffc088e48d7 R15: 00007f00a7180040 </TASK> Allocated by task 181: kasan_save_stack+0x2f/0x60 kasan_set_track+0x29/0x40 kasan_save_alloc_info+0x25/0x40 __kasan_kmalloc+0xc5/0xd0 __kmalloc+0x66/0x160 ecryptfs_generate_key_packet_set+0x6d2/0xde0 ecryptfs_write_metadata+0x30a/0x550 ecryptfs_initialize_file+0x77/0x150 ecryptfs_create+0x1c2/0x2f0 path_openat+0x17cf/0x1ba0 do_filp_open+0x15e/0x290 do_sys_openat2+0x122/0x160 __x64_sys_openat+0xef/0x170 do_syscall_64+0x60/0xd0 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
--- fs/ecryptfs/keystore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ecryptfs/keystore.c +3 -1
@@ -300,9 +300,11 @@ write_tag_66_packet(char *signature, u8 cipher_code,* | Key Identifier Size | 1 or 2 bytes | * | Key Identifier | arbitrary | * | File Encryption Key Size | 1 or 2 bytes | +* | Cipher Code | 1 byte | * | File Encryption Key | arbitrary | +* | Checksum | 2 bytes | */ - data_len = (5 +ECRYPTFS_SIG_SIZE_HEX + crypt_stat->key_size); + data_len = (8 +ECRYPTFS_SIG_SIZE_HEX + crypt_stat->key_size); *packet =kmalloc (data_len,GFP_KERNEL ); message = *packet;if (!message) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 71/473 nilfs2: fix out-of-range warning
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit c473bcdd80d4ab2ae79a7a509a6712818366e32a ]
clang-14 points out that v_size is always smaller than a 64KB page size if that is configured by the CPU architecture:
fs/nilfs2/ioctl.c:63:19: error: result of comparison of constant 65536 with expression of type '__u16' (aka 'unsigned short') is always false [-Werror,-Wtautological-constant-out-of-range-compare]
if (argv->v_size > PAGE_SIZE)
~~~~~~~~~~~~ ^ ~~~~~~~~~This is ok, so just shut up that warning with a cast.
--- fs/nilfs2/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nilfs2/ioctl.c +1 -1
@@ -60,7 +60,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs,if (argv->v_nmembs ==0 )return 0 ; -if (argv->v_size >PAGE_SIZE ) +if ((size_t )argv->v_size >PAGE_SIZE )return -EINVAL ;/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 72/473 parisc: add missing export of __cmpxchg_u8()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit c57e5dccb06decf3cb6c272ab138c033727149b5 ]
__cmpxchg_u8() had been added (initially) for the sake of drivers/phy/ti/phy-tusb1210.c; the thing is, that drivers is modular, so we need an export
--- arch/parisc/kernel/parisc_ksyms.c | 1 + 1 file changed, 1 insertion(+)
arch/parisc/kernel/parisc_ksyms.c +1 -0
@@ -21,6 +21,7 @@ EXPORT_SYMBOL(memset);#include <linux/atomic.h> EXPORT_SYMBOL (__xchg8);EXPORT_SYMBOL (__xchg32); +EXPORT_SYMBOL (__cmpxchg_u8);EXPORT_SYMBOL (__cmpxchg_u32);EXPORT_SYMBOL (__cmpxchg_u64);#ifdef CONFIG_SMP
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 73/473 crypto: ccp - drop platform ifdef checks
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 42c2d7d02977ef09d434b1f5b354f5bc6c1027ab ]
When both ACPI and OF are disabled, the dev_vdata variable is unused:
drivers/crypto/ccp/sp-platform.c:33:34: error: unused variable 'dev_vdata' [-Werror,-Wunused-const-variable]
This is not a useful configuration, and there is not much point in saving a few bytes when only one of the two is enabled, so just remove all these ifdef checks and rely on of_match_node() and acpi_match_device() returning NULL when these subsystems are disabled.
--- drivers/crypto/ccp/sp-platform.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/crypto/ccp/sp-platform.c +2 -12
@@ -39,44 +39,38 @@ static const struct sp_dev_vdata dev_vdata[] = { }, }; -#ifdef CONFIG_ACPI static const struct acpi_device_id sp_acpi_match[] = { {"AMDI0C00" , (kernel_ulong_t)&dev_vdata[0 ] }, { }, };MODULE_DEVICE_TABLE (acpi, sp_acpi_match); -#endif -#ifdef CONFIG_OF static const struct of_device_id sp_of_match[] = { { .compatible ="amd,ccp-seattle-v1a" , .data = (const void *)&dev_vdata[0 ] }, { }, };MODULE_DEVICE_TABLE (of, sp_of_match); -#endif static struct sp_dev_vdata *sp_get_of_version (struct platform_device *pdev) { -#ifdef CONFIG_OF const struct of_device_id *match; match =of_match_node (sp_of_match, pdev->dev.of_node);if (match && match->data)return (struct sp_dev_vdata *)match->data; -#endif +return NULL ; }static struct sp_dev_vdata *sp_get_acpi_version (struct platform_device *pdev) { -#ifdef CONFIG_ACPI const struct acpi_device_id *match; match =acpi_match_device (sp_acpi_match, &pdev->dev);if (match && match->driver_data)return (struct sp_dev_vdata *)match->driver_data; -#endif +return NULL ; }
@@ -214,12 +208,8 @@ static int sp_platform_resume(struct platform_device *pdev)static struct platform_driver sp_platform_driver = { .driver = { .name ="ccp" , -#ifdef CONFIG_ACPI .acpi_match_table = sp_acpi_match, -#endif -#ifdef CONFIG_OF .of_match_table = sp_of_match, -#endif }, .probe = sp_platform_probe, .remove = sp_platform_remove,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 74/473 crypto: x86/nh-avx2 - add missing vzeroupper
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit 4ad096cca942959871d8ff73826d30f81f856f6e ]
Since nh_avx2() uses ymm registers, execute vzeroupper before returning from it. This is necessary to avoid reducing the performance of SSE code.
--- arch/x86/crypto/nh-avx2-x86_64.S | 1 + 1 file changed, 1 insertion(+)
arch/x86/crypto/nh-avx2-x86_64.S +1 -0
@@ -153,5 +153,6 @@ SYM_FUNC_START(nh_avx2) vpaddq T1, T0, T0 vpaddq T4, T0, T0 vmovdqu T0, (HASH) + vzeroupper RET SYM_FUNC_END(nh_avx2)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 75/473 crypto: x86/sha256-avx2 - add missing vzeroupper
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit 57ce8a4e162599cf9adafef1f29763160a8e5564 ]
Since sha256_transform_rorx() uses ymm registers, execute vzeroupper before returning from it. This is necessary to avoid reducing the performance of SSE code.
--- arch/x86/crypto/sha256-avx2-asm.S | 1 + 1 file changed, 1 insertion(+)
arch/x86/crypto/sha256-avx2-asm.S +1 -0
@@ -711,6 +711,7 @@ done_hash: popq %r13 popq %r12 popq %rbx + vzeroupper RET SYM_FUNC_END(sha256_transform_rorx)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 76/473 crypto: x86/sha512-avx2 - add missing vzeroupper
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit 6a24fdfe1edbafacdacd53516654d99068f20eec ]
Since sha512_transform_rorx() uses ymm registers, execute vzeroupper before returning from it. This is necessary to avoid reducing the performance of SSE code.
--- arch/x86/crypto/sha512-avx2-asm.S | 1 + 1 file changed, 1 insertion(+)
arch/x86/crypto/sha512-avx2-asm.S +1 -0
@@ -680,6 +680,7 @@ done_hash: pop %r12 pop %rbx + vzeroupper RET SYM_FUNC_END(sha512_transform_rorx)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 77/473 s390/cio: fix tracepoint subchannel type field
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Oberparleiter <[email protected]>
[ Upstream commit 8692a24d0fae19f674d51726d179ad04ba95d958 ]
The subchannel-type field "st" of s390_cio_stsch and s390_cio_msch tracepoints is incorrectly filled with the subchannel-enabled SCHIB value "ena". Fix this by assigning the correct value.
--- drivers/s390/cio/trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/cio/trace.h +1 -1
@@ -50,7 +50,7 @@ DECLARE_EVENT_CLASS(s390_class_schib, __entry->devno = schib->pmcw.dev; __entry->schib = *schib; __entry->pmcw_ena = schib->pmcw.ena; - __entry->pmcw_st = schib->pmcw.ena; + __entry->pmcw_st = schib->pmcw.st; __entry->pmcw_dnv = schib->pmcw.dnv; __entry->pmcw_dev = schib->pmcw.dev; __entry->pmcw_lpm = schib->pmcw.lpm;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 78/473 io_uring: dont use TIF_NOTIFY_SIGNAL to test for availability of task_work
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit 6434ec0186b80c734aa7a2acf95f75f5c6dd943b ]
Use task_work_pending() as a better test for whether we have task_work or not, TIF_NOTIFY_SIGNAL is only valid if the any of the task_work items had been queued with TWA_SIGNAL as the notification mechanism. Hence task_work_pending() is a more reliable check.
Stable-dep-of: 22537c9f7941 ("io_uring: use the right type for work_llist empty check")
--- io_uring/io_uring.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
io_uring/io_uring.h +1 -2
@@ -275,8 +275,7 @@ static inline int io_run_task_work(void)static inline bool io_task_work_pending (struct io_ring_ctx *ctx) { -return test_thread_flag (TIF_NOTIFY_SIGNAL ) || - !wq_list_empty (&ctx->work_llist); +return task_work_pending (current) || !wq_list_empty (&ctx->work_llist); }static inline int io_run_task_work_ctx (struct io_ring_ctx *ctx)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 79/473 io_uring: use the right type for work_llist empty check
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit 22537c9f79417fed70b352d54d01d2586fee9521 ]
io_task_work_pending() uses wq_list_empty() on ctx->work_llist, but it's not an io_wq_work_list, it's a struct llist_head. They both have ->first as head-of-list, and it turns out the checks are identical. But be proper and use the right helper.
--- io_uring/io_uring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/io_uring.h +1 -1
@@ -275,7 +275,7 @@ static inline int io_run_task_work(void)static inline bool io_task_work_pending (struct io_ring_ctx *ctx) { -return task_work_pending (current) || !wq_list_empty (&ctx->work_llist); +return task_work_pending (current) || !llist_empty (&ctx->work_llist); }static inline int io_run_task_work_ctx (struct io_ring_ctx *ctx)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 80/473 rcu-tasks: Fix show_rcu_tasks_trace_gp_kthread buffer overflow
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Kiryushin <[email protected]>
[ Upstream commit cc5645fddb0ce28492b15520306d092730dffa48 ]
There is a possibility of buffer overflow in show_rcu_tasks_trace_gp_kthread() if counters, passed to sprintf() are huge. Counter numbers, needed for this are unrealistically high, but buffer overflow is still possible.
Use snprintf() with buffer size instead of sprintf().
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- kernel/rcu/tasks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/tasks.h +1 -1
@@ -1789,7 +1789,7 @@ void show_rcu_tasks_trace_gp_kthread(void) {char buf[64 ]; - sprintf(buf, "N%lu h:%lu/%lu/%lu", + snprintf(buf, sizeof(buf), "N%lu h:%lu/%lu/%lu", data_race(n_trc_holdouts), data_race(n_heavy_reader_ofl_updates), data_race(n_heavy_reader_updates),
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 81/473 rcu: Fix buffer overflow in print_cpu_stall_info()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nikita Kiryushin <[email protected]>
[ Upstream commit 3758f7d9917bd7ef0482c4184c0ad673b4c4e069 ]
The rcuc-starvation output from print_cpu_stall_info() might overflow the buffer if there is a huge difference in jiffies difference. The situation might seem improbable, but computers sometimes get very confused about time, which can result in full-sized integers, and, in this case, buffer overflow.
Also, the unsigned jiffies difference is printed using %ld, which is normally for signed integers. This is intentional for debugging purposes, but it is not obvious from the code.
This commit therefore changes sprintf() to snprintf() and adds a clarifying comment about intention of %ld format.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- kernel/rcu/tree_stall.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/rcu/tree_stall.h +2 -1
@@ -474,7 +474,8 @@ static void print_cpu_stall_info(int cpu)rcu_dynticks_in_eqs (rcu_dynticks_snap (cpu)); rcuc_starved =rcu_is_rcuc_kthread_starving (rdp, &j);if (rcuc_starved) -sprintf (buf," rcuc=%ld jiffies(starved)" , j); +// Print signed value, as negative values indicate a probable bug. +snprintf (buf,sizeof (buf)," rcuc=%ld jiffies(starved)" , j); pr_err("\t%d-%c%c%c%c: (%lu %s) idle=%04x/%ld/%#lx softirq=%u/%u fqs=%ld%s%s\n", cpu, "O."[!!cpu_online(cpu)],
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 82/473 ARM: configs: sunxi: Enable DRM_DW_HDMI
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maxime Ripard <[email protected]>
[ Upstream commit deff401b14e2d832b25b55862ad6c73378fe034e ]
Commit 4fc8cb47fcfd ("drm/display: Move HDMI helpers into display-helper module") turned the DRM_DW_HDMI dependency of DRM_SUN8I_DW_HDMI into a depends on which ended up disabling the driver in the defconfig. Make sure it's still enabled.
--- arch/arm/configs/sunxi_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/sunxi_defconfig +1 -0
@@ -110,6 +110,7 @@ CONFIG_DRM_PANEL_LVDS=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_EDP=y CONFIG_DRM_SIMPLE_BRIDGE=y +CONFIG_DRM_DW_HDMI=y CONFIG_DRM_LIMA=y CONFIG_FB_SIMPLE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 83/473 jffs2: prevent xattr node from overflowing the eraseblock
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Denisyev <[email protected]>
[ Upstream commit c6854e5a267c28300ff045480b5a7ee7f6f1d913 ]
Add a check to make sure that the requested xattr node size is no larger than the eraseblock minus the cleanmarker.
Unlike the usual inode nodes, the xattr nodes aren't split into parts and spread across multiple eraseblocks, which means that a xattr node must not occupy more than one eraseblock. If the requested xattr value is too large, the xattr node can spill onto the next eraseblock, overwriting the nodes and causing errors such as:
jffs2: argh. node added in wrong place at 0x0000b050(2)
jffs2: nextblock 0x0000a000, expected at 0000b00c
jffs2: error: (823) do_verify_xattr_datum: node CRC failed at 0x01e050, read=0xfc892c93, calc=0x000000
jffs2: notice: (823) jffs2_get_inode_nodes: Node header CRC failed at 0x01e00c. {848f,2fc4,0fef511f,59a3d171}
jffs2: Node at 0x0000000c with length 0x00001044 would run over the end of the erase block
jffs2: Perhaps the file system was created with the wrong erase size?
jffs2: jffs2_scan_eraseblock(): Magic bitmask 0x1985 not found at 0x00000010: 0x1044 instead
This breaks the filesystem and can lead to KASAN crashes such as:
BUG: KASAN: slab-out-of-bounds in jffs2_sum_add_kvec+0x125e/0x15d0 Read of size 4 at addr ffff88802c31e914 by task repro/830 CPU: 0 PID: 830 Comm: repro Not tainted 6.9.0-rc3+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Arch Linux 1.16.3-1-1 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0xc6/0x120 print_report+0xc4/0x620 ? __virt_addr_valid+0x308/0x5b0 kasan_report+0xc1/0xf0 ? jffs2_sum_add_kvec+0x125e/0x15d0 ? jffs2_sum_add_kvec+0x125e/0x15d0 jffs2_sum_add_kvec+0x125e/0x15d0 jffs2_flash_direct_writev+0xa8/0xd0 jffs2_flash_writev+0x9c9/0xef0 ? __x64_sys_setxattr+0xc4/0x160 ? do_syscall_64+0x69/0x140 ? entry_SYSCALL_64_after_hwframe+0x76/0x7e [...]
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- fs/jffs2/xattr.c | 3 +++ 1 file changed, 3 insertions(+)
fs/jffs2/xattr.c +3 -0
@@ -1111,6 +1111,9 @@ int do_jffs2_setxattr(struct inode *inode, int xprefix, const char *xname,return rc; request =PAD (sizeof (struct jffs2_raw_xattr ) +strlen (xname) +1 + size); +if (request > c->sector_size - c->cleanmarker_size) +return -ERANGE ; + rc =jffs2_reserve_space (c, request, &length,ALLOC_NORMAL ,JFFS2_SUMMARY_XATTR_SIZE );if (rc) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 84/473 soc: mediatek: cmdq: Fix typo of CMDQ_JUMP_RELATIVE
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chun-Kuang Hu <[email protected]>
[ Upstream commit ed4d5ab179b9f0a60da87c650a31f1816db9b4b4 ]
For cmdq jump command, offset 0 means relative jump and offset 1 means absolute jump. cmdq_pkt_jump() is absolute jump, so fix the typo of CMDQ_JUMP_RELATIVE in cmdq_pkt_jump().
--- drivers/soc/mediatek/mtk-cmdq-helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/soc/mediatek/mtk-cmdq-helper.c +3 -2
@@ -13,7 +13,8 @@#define CMDQ_POLL_ENABLE_MASK BIT(0)#define CMDQ_EOC_IRQ_EN BIT(0)#define CMDQ_REG_TYPE 1 -#define CMDQ_JUMP_RELATIVE 1 +#define CMDQ_JUMP_RELATIVE 0 +#define CMDQ_JUMP_ABSOLUTE 1 struct cmdq_instruction { union {
@@ -396,7 +397,7 @@ int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr)struct cmdq_instruction inst = {}; inst.op =CMDQ_CODE_JUMP ; - inst.offset =CMDQ_JUMP_RELATIVE ; + inst.offset =CMDQ_JUMP_ABSOLUTE ; inst.value = addr >>cmdq_get_shift_pa (((struct cmdq_client *)pkt->cl)->chan);return cmdq_pkt_append_command (pkt, inst);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 85/473 null_blk: Fix missing mutex_destroy() at module removal
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Yanjun <[email protected]>
[ Upstream commit 07d1b99825f40f9c0d93e6b99d79a08d0717bac1 ]
When a mutex lock is not used any more, the function mutex_destroy should be called to mark the mutex lock uninitialized.
--- drivers/block/null_blk/main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/null_blk/main.c +2 -0
@@ -2298,6 +2298,8 @@ static void __exit null_exit(void)if (g_queue_mode ==NULL_Q_MQ && shared_tags)blk_mq_free_tag_set (&tag_set); + +mutex_destroy (&lock); }module_init (null_init);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 86/473 md: fix resync softlockup when bitmap size is less than array size
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit f0e729af2eb6bee9eb58c4df1087f14ebaefe26b ]
Is is reported that for dm-raid10, lvextend + lvchange --syncaction will trigger following softlockup:
kernel:watchdog: BUG: soft lockup - CPU#3 stuck for 26s! [mdX_resync:6976]
CPU: 7 PID: 3588 Comm: mdX_resync Kdump: loaded Not tainted 6.9.0-rc4-next-20240419 #1 RIP: 0010:_raw_spin_unlock_irq+0x13/0x30 Call Trace: <TASK> md_bitmap_start_sync+0x6b/0xf0 raid10_sync_request+0x25c/0x1b40 [raid10] md_do_sync+0x64b/0x1020 md_thread+0xa7/0x170 kthread+0xcf/0x100 ret_from_fork+0x30/0x50 ret_from_fork_asm+0x1a/0x30
And the detailed process is as follows:
md_do_sync
j = mddev->resync_min
while (j < max_sectors)
sectors = raid10_sync_request(mddev, j, &skipped)
if (!md_bitmap_start_sync(..., &sync_blocks))
// md_bitmap_start_sync set sync_blocks to 0
return sync_blocks + sectors_skippe; // sectors = 0;
j += sectors;
// j never change
Root cause is that commit 301867b1c168 ("md/raid10: check slab-out-of-bounds in md_bitmap_get_counter") return early from md_bitmap_get_counter(), without setting returned blocks.
Fix this problem by always set returned blocks from md_bitmap_get_counter"(), as it used to be.
Noted that this patch just fix the softlockup problem in kernel, the case that bitmap size doesn't match array size still need to be fixed.
--- drivers/md/md-bitmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/md/md-bitmap.c +3 -3
@@ -1352,7 +1352,7 @@ __acquires(bitmap->lock)sector_t chunk = offset >> bitmap->chunkshift;unsigned long page = chunk >>PAGE_COUNTER_SHIFT ;unsigned long pageoff = (chunk &PAGE_COUNTER_MASK ) <<COUNTER_BYTE_SHIFT ; -sector_t csize; +sector_t csize = ((sector_t )1 ) << bitmap->chunkshift;int err;if (page >= bitmap->pages) {
@@ -1361,6 +1361,7 @@ __acquires(bitmap->lock)* End-of-device while looking for a whole page or * user set a huge number to sysfs bitmap_set_bits. */ + *blocks = csize - (offset & (csize -1 ));return NULL ; } err =md_bitmap_checkpage (bitmap, page, create,0 );
@@ -1369,8 +1370,7 @@ __acquires(bitmap->lock) bitmap->bp[page].map == NULL) csize = ((sector_t )1 ) << (bitmap->chunkshift +PAGE_COUNTER_SHIFT ); - else - csize = ((sector_t )1 ) << bitmap->chunkshift; + *blocks = csize - (offset & (csize -1 ));if (err <0 )
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 87/473 block: open code __blk_account_io_start()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chaitanya Kulkarni <[email protected]>
[ Upstream commit e165fb4dd6985b37215178e514a2e09dab8fef14 ]
There is only one caller for __blk_account_io_start(), the function is small enough to fit in its caller blk_account_io_start().
Remove the function and opencode in the its caller blk_account_io_start().
Stable-dep-of: 99dc422335d8 ("block: support to account io_ticks precisely")
--- block/blk-mq.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-)
block/blk-mq.c +16 -20
@@ -994,28 +994,24 @@ static inline void blk_account_io_done(struct request *req, u64 now)__blk_account_io_done (req, now); } -static void __blk_account_io_start (struct request *rq) -{ -/* -* All non-passthrough requests are created from a bio with one -* exception: when a flush command that is part of a flush sequence -* generated by the state machine in blk-flush.c is cloned onto the -* lower device by dm-multipath we can get here without a bio. -*/ -if (rq->bio) - rq->part = rq->bio->bi_bdev; -else - rq->part = rq->q->disk->part0; - -part_stat_lock (); -update_io_ticks (rq->part, jiffies, false); -part_stat_unlock (); -} -static inline void blk_account_io_start (struct request *req) { -if (blk_do_io_stat (req)) -__blk_account_io_start (req); +if (blk_do_io_stat (req)) { +/* +* All non-passthrough requests are created from a bio with one +* exception: when a flush command that is part of a flush sequence +* generated by the state machine in blk-flush.c is cloned onto the +* lower device by dm-multipath we can get here without a bio. +*/ +if (req->bio) + req->part = req->bio->bi_bdev; +else + req->part = req->q->disk->part0; + +part_stat_lock (); +update_io_ticks (req->part, jiffies, false); +part_stat_unlock (); + } }static inline void __blk_mq_end_request_acct (struct request *rq,u64 now)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 88/473 block: open code __blk_account_io_done()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chaitanya Kulkarni <[email protected]>
[ Upstream commit 06965037ce942500c1ce3aa29ca217093a9c5720 ]
There is only one caller for __blk_account_io_done(), the function is small enough to fit in its caller blk_account_io_done().
Remove the function and opencode in the its caller blk_account_io_done().
Stable-dep-of: 99dc422335d8 ("block: support to account io_ticks precisely")
--- block/blk-mq.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
block/blk-mq.c +9 -13
@@ -971,17 +971,6 @@ bool blk_update_request(struct request *req, blk_status_t error, }EXPORT_SYMBOL_GPL (blk_update_request); -static void __blk_account_io_done (struct request *req,u64 now) -{ -const int sgrp =op_stat_group (req_op (req)); - -part_stat_lock (); -update_io_ticks (req->part, jiffies, true); -part_stat_inc (req->part, ios[sgrp]); -part_stat_add (req->part, nsecs[sgrp], now - req->start_time_ns); -part_stat_unlock (); -} -static inline void blk_account_io_done (struct request *req,u64 now) {/*
@@ -990,8 +979,15 @@ static inline void blk_account_io_done(struct request *req, u64 now)* containing request is enough. */ if (blk_do_io_stat (req) && req->part && - !(req->rq_flags &RQF_FLUSH_SEQ )) -__blk_account_io_done (req, now); + !(req->rq_flags &RQF_FLUSH_SEQ )) { +const int sgrp =op_stat_group (req_op (req)); + +part_stat_lock (); +update_io_ticks (req->part, jiffies, true); +part_stat_inc (req->part, ios[sgrp]); +part_stat_add (req->part, nsecs[sgrp], now - req->start_time_ns); +part_stat_unlock (); + } }static inline void blk_account_io_start (struct request *req)
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 89/473 block: support to account io_ticks precisely
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yu Kuai <[email protected]>
[ Upstream commit 99dc422335d8b2bd4d105797241d3e715bae90e9 ]
Currently, io_ticks is accounted based on sampling, specifically update_io_ticks() will always account io_ticks by 1 jiffies from bdev_start_io_acct()/blk_account_io_start(), and the result can be inaccurate, for example(HZ is 250):
Test script:
fio -filename=/dev/sda -bs=4k -rw=write -direct=1 -name=test -thinktime=4ms
Test result: util is about 90%, while the disk is really idle.
This behaviour is introduced by commit 5b18b5a73760 ("block: delete part_round_stats and switch to less precise counting"), however, there was a key point that is missed that this patch also improve performance a lot:
Before the commit:part_round_stats:
if (part->stamp != now)
stats |= 1;
part_in_flight()
-> there can be lots of task here in 1 jiffies.
part_round_stats_single()
__part_stat_add()
part->stamp = now;
After the commit:update_io_ticks:
stamp = part->bd_stamp;
if (time_after(now, stamp))
if (try_cmpxchg())
__part_stat_add()
-> only one task can reach here in 1 jiffies.Hence in order to account io_ticks precisely, we only need to know if there are IO inflight at most once in one jiffies. Noted that for rq-based device, iterating tags should not be used here because 'tags->lock' is grabbed in blk_mq_find_and_get_req(), hence part_stat_lock_inc/dec() and part_in_flight() is used to trace inflight. The additional overhead is quite little:
- per cpu add/dec for each IO for rq-based device;
- per cpu sum for each jiffies;
And it's verified by null-blk that there are no performance degration under heavy IO pressure.
--- block/blk-core.c | 9 +++++---- block/blk-merge.c | 2 ++ block/blk-mq.c | 4 ++++ block/blk.h | 1 + block/genhd.c | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-)
block/blk-core.c +5 -4
@@ -933,10 +933,11 @@ void update_io_ticks(struct block_device *part, unsigned long now, bool end)unsigned long stamp; again: stamp =READ_ONCE (part->bd_stamp); -if (unlikely (time_after (now, stamp))) { -if (likely (try_cmpxchg (&part->bd_stamp, &stamp, now))) -__part_stat_add (part, io_ticks, end ? now - stamp :1 ); - } +if (unlikely (time_after (now, stamp)) && +likely (try_cmpxchg (&part->bd_stamp, &stamp, now)) && + (end ||part_in_flight (part))) +__part_stat_add (part, io_ticks, now - stamp); +if (part->bd_partno) { part =bdev_whole (part); goto again;
block/blk-merge.c +2 -0
@@ -779,6 +779,8 @@ static void blk_account_io_merge_request(struct request *req)if (blk_do_io_stat (req)) {part_stat_lock ();part_stat_inc (req->part, merges[op_stat_group (req_op (req))]); +part_stat_local_dec (req->part, + in_flight[op_is_write (req_op (req))]);part_stat_unlock (); } }
block/blk-mq.c +4 -0
@@ -986,6 +986,8 @@ static inline void blk_account_io_done(struct request *req, u64 now)update_io_ticks (req->part, jiffies, true);part_stat_inc (req->part, ios[sgrp]);part_stat_add (req->part, nsecs[sgrp], now - req->start_time_ns); +part_stat_local_dec (req->part, + in_flight[op_is_write (req_op (req))]);part_stat_unlock (); } }
@@ -1006,6 +1008,8 @@ static inline void blk_account_io_start(struct request *req)part_stat_lock ();update_io_ticks (req->part, jiffies, false); +part_stat_local_inc (req->part, + in_flight[op_is_write (req_op (req))]);part_stat_unlock (); } }
block/blk.h +1 -0
@@ -346,6 +346,7 @@ static inline bool blk_do_io_stat(struct request *rq) }void update_io_ticks (struct block_device *part,unsigned long now,bool end); +unsigned int part_in_flight (struct block_device *part);static inline void req_set_nomerge (struct request_queue *q,struct request *req) {
block/genhd.c +1 -1
@@ -123,7 +123,7 @@ static void part_stat_read_all(struct block_device *part, } } -static unsigned int part_in_flight (struct block_device *part) +unsigned int part_in_flight (struct block_device *part) {unsigned int inflight =0 ;int cpu;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 90/473 wifi: ath10k: poll service ready message before failing
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit e57b7d62a1b2f496caf0beba81cec3c90fad80d5 ]
Currently host relies on CE interrupts to get notified that the service ready message is ready. This results in timeout issue if the interrupt is not fired, due to some unknown reasons. See below logs:
[76321.937866] ath10k_pci 0000:02:00.0: wmi service ready event not received ... [76322.016738] ath10k_pci 0000:02:00.0: Could not init core: -110
And finally it causes WLAN interface bring up failure.
Change to give it one more chance here by polling CE rings, before failing directly.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00157-QCARMSWPZ-1
--- drivers/net/wireless/ath/ath10k/wmi.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/wmi.c +23 -3
@@ -1762,12 +1762,32 @@ void ath10k_wmi_put_wmi_channel(struct ath10k *ar, struct wmi_channel *ch,int ath10k_wmi_wait_for_service_ready (struct ath10k *ar) { -unsigned long time_left; +unsigned long time_left, i; time_left =wait_for_completion_timeout (&ar->wmi.service_ready,WMI_SERVICE_READY_TIMEOUT_HZ ); -if (!time_left) -return -ETIMEDOUT ; +if (!time_left) { +/* Sometimes the PCI HIF doesn't receive interrupt +* for the service ready message even if the buffer +* was completed. PCIe sniffer shows that it's +* because the corresponding CE ring doesn't fires +* it. Workaround here by polling CE rings once. +*/ +ath10k_warn (ar,"failed to receive service ready completion, polling..\n" ); + +for (i =0 ; i <CE_COUNT ; i++) +ath10k_hif_send_complete_check (ar, i,1 ); + + time_left =wait_for_completion_timeout (&ar->wmi.service_ready, +WMI_SERVICE_READY_TIMEOUT_HZ ); +if (!time_left) { +ath10k_warn (ar,"polling timed out\n" ); +return -ETIMEDOUT ; + } + +ath10k_warn (ar,"service ready completion received, continuing normally\n" ); + } +return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 91/473 wifi: brcmfmac: pcie: handle randbuf allocation failure
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Duoming Zhou <[email protected]>
[ Upstream commit 316f790ebcf94bdf59f794b7cdea4068dc676d4c ]
The kzalloc() in brcmf_pcie_download_fw_nvram() will return null if the physical memory has run out. As a result, if we use get_random_bytes() to generate random bytes in the randbuf, the null pointer dereference bug will happen.
In order to prevent allocation failure, this patch adds a separate function using buffer on kernel stack to generate random bytes in the randbuf, which could prevent the kernel stack from overflow.
--- .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +10 -5
@@ -1640,6 +1640,15 @@ struct brcmf_random_seed_footer {#define BRCMF_RANDOM_SEED_MAGIC 0xfeedc0de#define BRCMF_RANDOM_SEED_LENGTH 0x100 +static noinline_for_stack void +brcmf_pcie_provide_random_bytes (struct brcmf_pciedev_info *devinfo,u32 address) +{ +u8 randbuf[BRCMF_RANDOM_SEED_LENGTH ]; + +get_random_bytes (randbuf,BRCMF_RANDOM_SEED_LENGTH ); +memcpy_toio (devinfo->tcm + address, randbuf,BRCMF_RANDOM_SEED_LENGTH ); +} +static int brcmf_pcie_download_fw_nvram (struct brcmf_pciedev_info *devinfo,const struct firmware *fw,void *nvram,u32 nvram_len)
@@ -1682,7 +1691,6 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo, .length = cpu_to_le32(rand_len), .magic = cpu_to_le32(BRCMF_RANDOM_SEED_MAGIC), }; -void *randbuf;/* Some Apple chips/firmwares expect a buffer of random * data to be present before NVRAM
@@ -1694,10 +1702,7 @@ static int brcmf_pcie_download_fw_nvram(struct brcmf_pciedev_info *devinfo, sizeof(footer)); address -= rand_len; - randbuf =kzalloc (rand_len,GFP_KERNEL ); -get_random_bytes (randbuf, rand_len); -memcpy_toio (devinfo->tcm + address, randbuf, rand_len); -kfree (randbuf); +brcmf_pcie_provide_random_bytes (devinfo, address); } }else { brcmf_dbg(PCIE, "No matching NVRAM file found %s\n",
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 92/473 wifi: ath11k: dont force enable power save on non-running vdevs
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Baochen Qiang <[email protected]>
[ Upstream commit 01296b39d3515f20a1db64d3c421c592b1e264a0 ]
Currently we force enable power save on non-running vdevs, this results in unexpected ping latency in below scenarios:
1. disable power save from userspace.
2. trigger suspend/resume.
With step 1 power save is disabled successfully and we get a good latency:
PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data. 64 bytes from 192.168.1.1: icmp_seq=1 ttl=64 time=5.13 ms 64 bytes from 192.168.1.1: icmp_seq=2 ttl=64 time=5.45 ms 64 bytes from 192.168.1.1: icmp_seq=3 ttl=64 time=5.99 ms 64 bytes from 192.168.1.1: icmp_seq=4 ttl=64 time=6.34 ms 64 bytes from 192.168.1.1: icmp_seq=5 ttl=64 time=4.47 ms 64 bytes from 192.168.1.1: icmp_seq=6 ttl=64 time=6.45 ms
While after step 2, the latency becomes much larger:
PING 192.168.1.1 (192.168.1.1) 56(84) bytes of data. 64 bytes from 192.168.1.1: icmp_seq=1 ttl=64 time=17.7 ms 64 bytes from 192.168.1.1: icmp_seq=2 ttl=64 time=15.0 ms 64 bytes from 192.168.1.1: icmp_seq=3 ttl=64 time=14.3 ms 64 bytes from 192.168.1.1: icmp_seq=4 ttl=64 time=16.5 ms 64 bytes from 192.168.1.1: icmp_seq=5 ttl=64 time=20.1 ms
The reason is, with step 2, power save is force enabled due to vdev not running, although mac80211 was trying to disable it to honor userspace configuration:
ath11k_pci 0000:03:00.0: wmi cmd sta powersave mode psmode 1 vdev id 0
Call Trace: ath11k_wmi_pdev_set_ps_mode ath11k_mac_op_bss_info_changed ieee80211_bss_info_change_notify ieee80211_reconfig ieee80211_resume wiphy_resume
This logic is taken from ath10k where it was added due to below comment:
Firmware doesn't behave nicely and consumes more power than necessary if PS is disabled on a non-started vdev.
However we don't know whether such an issue also occurs to ath11k firmware or not. But even if it does, it's not appropriate because it goes against userspace, even cfg/mac80211 don't know we have enabled it in fact.
Remove it to fix this issue. In this way we not only get a better latency, but also, and the most important, keeps the consistency between userspace and kernel/driver. The biggest price for that would be the power consumption, which is not that important, compared with the consistency.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30
--- drivers/net/wireless/ath/ath11k/mac.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -8
@@ -1226,14 +1226,7 @@ static int ath11k_mac_vif_setup_ps(struct ath11k_vif *arvif) enable_ps = arvif->ps; -if (!arvif->is_started) { -/* mac80211 can update vif powersave state while disconnected. -* Firmware doesn't behave nicely and consumes more power than -* necessary if PS is disabled on a non-started vdev. Hence -* force-enable PS for non-running vdevs. -*/ - psmode =WMI_STA_PS_MODE_ENABLED ; - }else if (enable_ps) { +if (enable_ps) { psmode =WMI_STA_PS_MODE_ENABLED ; param =WMI_STA_PS_PARAM_INACTIVITY_TIME ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 93/473 bpftool: Fix missing pids during link show
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit fe879bb42f8a6513ed18e9d22efb99cb35590201 ]
Current 'bpftool link' command does not show pids, e.g.,
$ tools/build/bpftool/bpftool link
...
4: tracing prog 23
prog_type lsm attach_type lsm_mac
target_obj_id 1 target_btf_id 31320Hack the following change to enable normal libbpf debug output,
# --- a/tools/bpf/bpftool/pids.c # +++ b/tools/bpf/bpftool/pids.c # @@ -121,9 +121,9 @@ int build_obj_refs_table(struct hashmap **map, enum bpf_obj_type type) # /* we don't want output polluted with libbpf errors if bpf_iter is not # * supported # */ # - default_print = libbpf_set_print(libbpf_print_none); # + /* default_print = libbpf_set_print(libbpf_print_none); */ # err = pid_iter_bpf__load(skel); # - libbpf_set_print(default_print); # + /* libbpf_set_print(default_print); */
Rerun the above bpftool command:
$ tools/build/bpftool/bpftool link libbpf: prog 'iter': BPF program load failed: Permission denied libbpf: prog 'iter': -- BEGIN PROG LOAD LOG -- 0: R1=ctx() R10=fp0 ; struct task_struct *task = ctx->task; @ pid_iter.bpf.c:69 0: (79) r6 = *(u64 *)(r1 +8) ; R1=ctx() R6_w=ptr_or_null_task_struct(id=1) ; struct file *file = ctx->file; @ pid_iter.bpf.c:68 ... ; struct bpf_link *link = (struct bpf_link *) file->private_data; @ pid_iter.bpf.c:103 80: (79) r3 = *(u64 *)(r8 +432) ; R3_w=scalar() R8=ptr_file() ; if (link->type == bpf_core_enum_value(enum bpf_link_type___local, @ pid_iter.bpf.c:105 81: (61) r1 = *(u32 *)(r3 +12) R3 invalid mem access 'scalar' processed 39 insns (limit 1000000) max_states_per_insn 0 total_states 3 peak_states 3 mark_read 2 -- END PROG LOAD LOG -- libbpf: prog 'iter': failed to load: -13 ...
The 'file->private_data' returns a 'void' type and this caused subsequent 'link->type' (insn #81) failed in verification.
To fix the issue, restore the previous BPF_CORE_READ so old kernels can also work. With this patch, the 'bpftool link' runs successfully with 'pids'.
$ tools/build/bpftool/bpftool link
...
4: tracing prog 23
prog_type lsm attach_type lsm_mac
target_obj_id 1 target_btf_id 31320
pids systemd(1)--- tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/bpf/bpftool/skeleton/pid_iter.bpf.c +2 -2
@@ -102,8 +102,8 @@ int iter(struct bpf_iter__task_file *ctx) BPF_LINK_TYPE_PERF_EVENT___local)) {struct bpf_link *link = (struct bpf_link *) file->private_data; - if (link->type == bpf_core_enum_value(enum bpf_link_type___local, - BPF_LINK_TYPE_PERF_EVENT___local)) { + if (BPF_CORE_READ(link, type) == bpf_core_enum_value(enum bpf_link_type___local, + BPF_LINK_TYPE_PERF_EVENT___local)) { e.has_bpf_cookie = true; e.bpf_cookie =get_bpf_cookie (link); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 94/473 x86/boot: Ignore relocations in .notes sections in walk_relocs() too
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guixiong Wei <[email protected]>
[ Upstream commit 76e9762d66373354b45c33b60e9a53ef2a3c5ff2 ]
Commit:
aaa8736370db ("x86, relocs: Ignore relocations in .notes section")
... only started ignoring the .notes sections in print_absolute_relocs(), but the same logic should also by applied in walk_relocs() to avoid such relocations.
[ mingo: Fixed various typos in the changelog, removed extra curly braces from the code. ]
--- arch/x86/tools/relocs.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/tools/relocs.c +9 -0
@@ -746,6 +746,15 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,if (!(sec_applies->shdr.sh_flags &SHF_ALLOC )) {continue ; } + +/* +* Do not perform relocations in .notes sections; any +* values there are meant for pre-boot consumption (e.g. +* startup_xen). +*/ +if (sec_applies->shdr.sh_type ==SHT_NOTE ) +continue ; + sh_symtab = sec_symtab->symtab; sym_strtab = sec_symtab->link->strtab;for (j =0 ; j < sec->shdr.sh_size/sizeof (Elf_Rel); j++) {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 95/473 sched/fair: Add EAS checks before updating root_domain::overutilized
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shrikanth Hegde <[email protected]>
[ Upstream commit be3a51e68f2f1b17250ce40d8872c7645b7a2991 ]
root_domain::overutilized is only used for EAS(energy aware scheduler) to decide whether to do load balance or not. It is not used if EAS not possible.
Currently enqueue_task_fair and task_tick_fair accesses, sometime updates this field. In update_sd_lb_stats it is updated often. This causes cache contention due to true sharing and burns a lot of cycles. ::overload and ::overutilized are part of the same cacheline. Updating it often invalidates the cacheline. That causes access to ::overload to slow down due to false sharing. Hence add EAS check before accessing/updating this field. EAS check is optimized at compile time or it is a static branch. Hence it shouldn't cost much.
With the patch, both enqueue_task_fair and newidle_balance don't show up as hot routines in perf profile.
6.8-rc4:
7.18% swapper [kernel.vmlinux] [k] enqueue_task_fair 6.78% s [kernel.vmlinux] [k] newidle_balance
+patch:
0.14% swapper [kernel.vmlinux] [k] enqueue_task_fair 0.00% swapper [kernel.vmlinux] [k] newidle_balance
While at it: trace_sched_overutilized_tp expect that second argument to be bool. So do a int to bool conversion for that.
--- kernel/sched/fair.c | 53 +++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 19 deletions(-)
kernel/sched/fair.c +34 -19
@@ -6020,22 +6020,42 @@ static inline void hrtick_update(struct rq *rq)#ifdef CONFIG_SMP static inline bool cpu_overutilized (int cpu) { -unsigned long rq_util_min =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MIN ); -unsigned long rq_util_max =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MAX ); +unsigned long rq_util_min, rq_util_max; + +if (!sched_energy_enabled ()) +return false; + + rq_util_min =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MIN ); + rq_util_max =uclamp_rq_get (cpu_rq (cpu),UCLAMP_MAX );/* Return true only if the utilization doesn't fit CPU's capacity */ return !util_fits_cpu (cpu_util_cfs (cpu), rq_util_min, rq_util_max, cpu); } -static inline void update_overutilized_status (struct rq *rq) +static inline void set_rd_overutilized_status (struct root_domain *rd, +unsigned int status) { -if (!READ_ONCE (rq->rd->overutilized) &&cpu_overutilized (rq->cpu)) { -WRITE_ONCE (rq->rd->overutilized,SG_OVERUTILIZED ); -trace_sched_overutilized_tp (rq->rd,SG_OVERUTILIZED ); - } +if (!sched_energy_enabled ()) +return ; + +WRITE_ONCE (rd->overutilized, status); +trace_sched_overutilized_tp (rd, !!status); +} + +static inline void check_update_overutilized_status (struct rq *rq) +{ +/* +* overutilized field is used for load balancing decisions only +* if energy aware scheduler is being used +*/ +if (!sched_energy_enabled ()) +return ; + +if (!READ_ONCE (rq->rd->overutilized) &&cpu_overutilized (rq->cpu)) +set_rd_overutilized_status (rq->rd,SG_OVERUTILIZED ); }#else -static inline void update_overutilized_status (struct rq *rq) { } +static inline void check_update_overutilized_status (struct rq *rq) { }#endif /* Runqueue only has SCHED_IDLE tasks enqueued */
@@ -6147,7 +6167,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)* and the following generally works well enough in practice. */ if (!task_new) -update_overutilized_status (rq); +check_update_overutilized_status (rq); enqueue_throttle:assert_list_leaf_cfs_rq (rq);
@@ -9923,19 +9943,14 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd env->fbq_type =fbq_classify_group (&sds->busiest_stat);if (!env->sd->parent) { -struct root_domain *rd = env->dst_rq->rd; -/* update overload indicator if we are at root domain */ -WRITE_ONCE (rd->overload, sg_status &SG_OVERLOAD ); +WRITE_ONCE (env->dst_rq->rd->overload, sg_status &SG_OVERLOAD );/* Update over-utilization (tipping point, U >= 0) indicator */ -WRITE_ONCE (rd->overutilized, sg_status &SG_OVERUTILIZED ); -trace_sched_overutilized_tp (rd, sg_status &SG_OVERUTILIZED ); +set_rd_overutilized_status (env->dst_rq->rd, + sg_status &SG_OVERUTILIZED ); }else if (sg_status &SG_OVERUTILIZED ) { -struct root_domain *rd = env->dst_rq->rd; - -WRITE_ONCE (rd->overutilized,SG_OVERUTILIZED ); -trace_sched_overutilized_tp (rd,SG_OVERUTILIZED ); +set_rd_overutilized_status (env->dst_rq->rd,SG_OVERUTILIZED ); }update_idle_cpu_scan (env, sum_util);
@@ -11849,7 +11864,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)task_tick_numa (rq, curr);update_misfit_status (curr, rq); -update_overutilized_status (task_rq (curr)); +check_update_overutilized_status (task_rq (curr));task_tick_core (rq, curr); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 96/473 ACPI: Fix Generic Initiator Affinity _OSC bit
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Armin Wolf <[email protected]>
[ Upstream commit d0d4f1474e36b195eaad477373127ae621334c01 ]
The ACPI spec says bit 17 should be used to indicate support for Generic Initiator Affinity Structure in SRAT, but we currently set bit 13 ("Interrupt ResourceSource support").
Fix this by actually setting bit 17 when evaluating _OSC.
--- include/linux/acpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/acpi.h +1 -1
@@ -582,8 +582,8 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);#define OSC_SB_PCLPI_SUPPORT 0x00000080#define OSC_SB_OSLPI_SUPPORT 0x00000100#define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT 0x00001000 -#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00002000#define OSC_SB_CPC_FLEXIBLE_ADR_SPACE 0x00004000 +#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00020000#define OSC_SB_NATIVE_USB4_SUPPORT 0x00040000#define OSC_SB_PRM_SUPPORT 0x00200000
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 97/473 qed: avoid truncating work queue length
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 954fd908f177604d4cce77e2a88cc50b29bad5ff ]
clang complains that the temporary string for the name passed into alloc_workqueue() is too short for its contents:
drivers/net/ethernet/qlogic/qed/qed_main.c:1218:3: error: 'snprintf' will always be truncated; specified size is 16, but format string expands to at least 18 [-Werror,-Wformat-truncation]
There is no need for a temporary buffer, and the actual name of a workqueue is 32 bytes (WQ_NAME_LEN), so just use the interface as intended to avoid the truncation.
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_main.c +4 -5
@@ -1215,7 +1215,6 @@ static void qed_slowpath_task(struct work_struct *work)static int qed_slowpath_wq_start (struct qed_dev *cdev) {struct qed_hwfn *hwfn; -char name[NAME_SIZE ];int i;if (IS_VF (cdev))
@@ -1224,11 +1223,11 @@ static int qed_slowpath_wq_start(struct qed_dev *cdev)for_each_hwfn (cdev, i) { hwfn = &cdev->hwfns[i]; -snprintf (name,NAME_SIZE ,"slowpath-%02x:%02x.%02x" , - cdev->pdev->bus->number, -PCI_SLOT (cdev->pdev->devfn), hwfn->abs_pf_id); + hwfn->slowpath_wq =alloc_workqueue ("slowpath-%02x:%02x.%02x" , +0 ,0 , cdev->pdev->bus->number, +PCI_SLOT (cdev->pdev->devfn), + hwfn->abs_pf_id); - hwfn->slowpath_wq =alloc_workqueue (name,0 ,0 );if (!hwfn->slowpath_wq) {DP_NOTICE (hwfn,"Cannot create slowpath workqueue\n" );return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 98/473 net/mlx5e: Fail with messages when params are not valid for XSK
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adham Faris <[email protected]>
[ Upstream commit 130b12079f3732babe2772314ab129bca0d8492f ]
Current XSK prerequisites validation implementation (setup.c/mlx5e_validate_xsk_param()) fails silently when xsk prerequisites are not fulfilled.
Add error messages to the kernel log to help the user understand what went wrong when params are not valid for XSK.
Stable-dep-of: a5535e533694 ("mlx5: stop warning for 64KB pages")
--- .../ethernet/mellanox/mlx5/core/en/params.c | 9 +++++++-- .../mellanox/mlx5/core/en/xsk/setup.c | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +7 -2
@@ -581,11 +581,16 @@ int mlx5e_mpwrq_validate_xsk(struct mlx5_core_dev *mdev, struct mlx5e_params *pabool unaligned = xsk ? xsk->unaligned : false;u16 max_mtu_pkts; -if (!mlx5e_check_fragmented_striding_rq_cap (mdev, page_shift, umr_mode)) +if (!mlx5e_check_fragmented_striding_rq_cap (mdev, page_shift, umr_mode)) { +mlx5_core_err (mdev,"Striding RQ for XSK can't be activated with page_shift %u and umr_mode %d\n" , + page_shift, umr_mode);return -EOPNOTSUPP ; + } -if (!mlx5e_rx_mpwqe_is_linear_skb (mdev, params, xsk)) +if (!mlx5e_rx_mpwqe_is_linear_skb (mdev, params, xsk)) { +mlx5_core_err (mdev,"Striding RQ linear mode for XSK can't be activated with current params\n" );return -EINVAL ; + }/* Current RQ length is too big for the given frame size, the * needed number of WQEs exceeds the maximum.
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c +17 -2
@@ -7,6 +7,18 @@#include "en/health.h" #include <net/xdp_sock_drv.h> +static int mlx5e_legacy_rq_validate_xsk (struct mlx5_core_dev *mdev, +struct mlx5e_params *params, +struct mlx5e_xsk_param *xsk) +{ +if (!mlx5e_rx_is_linear_skb (mdev, params, xsk)) { +mlx5_core_err (mdev,"Legacy RQ linear mode for XSK can't be activated with current params\n" ); +return -EINVAL ; + } + +return 0 ; +} +/* The limitation of 2048 can be altered, but shouldn't go beyond the minimal * stride size of striding RQ. */
@@ -17,8 +29,11 @@ bool mlx5e_validate_xsk_param(struct mlx5e_params *params, struct mlx5_core_dev *mdev) {/* AF_XDP doesn't support frames larger than PAGE_SIZE. */ -if (xsk->chunk_size >PAGE_SIZE || xsk->chunk_size <MLX5E_MIN_XSK_CHUNK_SIZE ) +if (xsk->chunk_size >PAGE_SIZE || xsk->chunk_size <MLX5E_MIN_XSK_CHUNK_SIZE ) { +mlx5_core_err (mdev,"XSK chunk size %u out of bounds [%u, %lu]\n" , xsk->chunk_size, +MLX5E_MIN_XSK_CHUNK_SIZE ,PAGE_SIZE );return false; + }/* frag_sz is different for regular and XSK RQs, so ensure that linear * SKB mode is possible.
@@ -27,7 +42,7 @@ bool mlx5e_validate_xsk_param(struct mlx5e_params *params,case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ :return !mlx5e_mpwrq_validate_xsk (mdev, params, xsk);default :/* MLX5_WQ_TYPE_CYCLIC */ -return mlx5e_rx_is_linear_skb (mdev, params, xsk); +return !mlx5e_legacy_rq_validate_xsk (mdev, params, xsk); } }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 99/473 mlx5: stop warning for 64KB pages
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit a5535e5336943b33689f558199366102387b7bbf ]
When building with 64KB pages, clang points out that xsk->chunk_size can never be PAGE_SIZE:
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c:19:22: error: result of comparison of constant 65536 with expression of type 'u16' (aka 'unsigned short') is always false [-Werror,-Wtautological-constant-out-of-range-compare]
if (xsk->chunk_size > PAGE_SIZE ||
~~~~~~~~~~~~~~~ ^ ~~~~~~~~~In older versions of this code, using PAGE_SIZE was the only possibility, so this would have never worked on 64KB page kernels, but the patch apparently did not address this case completely.
As Maxim Mikityanskiy suggested, 64KB chunks are really not all that useful, so just shut up the warning by adding a cast.
--- drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c +4 -2
@@ -28,8 +28,10 @@ bool mlx5e_validate_xsk_param(struct mlx5e_params *params, struct mlx5e_xsk_param *xsk, struct mlx5_core_dev *mdev) { -/* AF_XDP doesn't support frames larger than PAGE_SIZE. */ -if (xsk->chunk_size >PAGE_SIZE || xsk->chunk_size <MLX5E_MIN_XSK_CHUNK_SIZE ) { +/* AF_XDP doesn't support frames larger than PAGE_SIZE, +* and xsk->chunk_size is limited to 65535 bytes. +*/ +if ((size_t )xsk->chunk_size >PAGE_SIZE || xsk->chunk_size <MLX5E_MIN_XSK_CHUNK_SIZE ) {mlx5_core_err (mdev,"XSK chunk size %u out of bounds [%u, %lu]\n" , xsk->chunk_size,MLX5E_MIN_XSK_CHUNK_SIZE ,PAGE_SIZE );return false;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 100/473 bitops: add missing prototype check
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Lobakin <[email protected]>
[ Upstream commit 72cc1980a0ef3ccad0d539e7dace63d0d7d432a4 ]
Commit 8238b4579866 ("wait_on_bit: add an acquire memory barrier") added a new bitop, test_bit_acquire(), with proper wrapping in order to try to optimize it at compile-time, but missed the list of bitops used for checking their prototypes a bit below.
The functions added have consistent prototypes, so that no more changes are required and no functional changes take place.
--- include/linux/bitops.h | 1 + 1 file changed, 1 insertion(+)
include/linux/bitops.h +1 -0
@@ -80,6 +80,7 @@ __check_bitop_pr(__test_and_set_bit);__check_bitop_pr (__test_and_clear_bit);__check_bitop_pr (__test_and_change_bit);__check_bitop_pr (test_bit); +__check_bitop_pr (test_bit_acquire);#undef __check_bitop_pr
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 101/473 wifi: carl9170: re-fix fortified-memset warning
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 066afafc10c9476ee36c47c9062527a17e763901 ]
The carl9170_tx_release() function sometimes triggers a fortified-memset warning in my randconfig builds:
In file included from include/linux/string.h:254,
from drivers/net/wireless/ath/carl9170/tx.c:40:
In function 'fortify_memset_chk',
inlined from 'carl9170_tx_release' at drivers/net/wireless/ath/carl9170/tx.c:283:2,
inlined from 'kref_put' at include/linux/kref.h:65:3,
inlined from 'carl9170_tx_put_skb' at drivers/net/wireless/ath/carl9170/tx.c:342:9:include/linux/fortify-string.h:493:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
493 | __write_overflow_field(p_size_field, size);
Kees previously tried to avoid this by using memset_after(), but it seems this does not fully address the problem. I noticed that the memset_after() here is done on a different part of the union (status) than the original cast was from (rate_driver_data), which may confuse the compiler.
Unfortunately, the memset_after() trick does not work on driver_rates[] because that is part of an anonymous struct, and I could not get struct_group() to do this either. Using two separate memset() calls on the two members does address the warning though.
--- drivers/net/wireless/ath/carl9170/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/tx.c +2 -1
@@ -280,7 +280,8 @@ static void carl9170_tx_release(struct kref *ref)* carl9170_tx_fill_rateinfo() has filled the rate information * before we get to this point. */ -memset_after (&txinfo->status,0 , rates); +memset (&txinfo->pad,0 ,sizeof (txinfo->pad)); +memset (&txinfo->rate_driver_data,0 ,sizeof (txinfo->rate_driver_data));if (atomic_read (&ar->tx_total_queued)) ar->tx_schedule = true;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 102/473 bpf: Pack struct bpf_fib_lookup
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Protopopov <[email protected]>
[ Upstream commit f91717007217d975aa975ddabd91ae1a107b9bff ]
The struct bpf_fib_lookup is supposed to be of size 64. A recent commit 59b418c7063d ("bpf: Add a check for struct bpf_fib_lookup size") added a static assertion to check this property so that future changes to the structure will not accidentally break this assumption.
As it immediately turned out, on some 32-bit arm systems, when AEABI=n, the total size of the structure was equal to 68, see [1]. This happened because the bpf_fib_lookup structure contains a union of two 16-bit fields:
union {
__u16 tot_len;
__u16 mtu_result;
};which was supposed to compile to a 16-bit-aligned 16-bit field. On the aforementioned setups it was instead both aligned and padded to 32-bits.
Declare this inner union as __attribute__((packed, aligned(2))) such that it always is of size 2 and is aligned to 16 bits.
[1] https://lore.kernel.org/all/CA+G9fYtsoP51f-oP_Sp5MOq-Ffv8La2RztNpwvE6+R1VtFiLrw@mail.gmail.com/#t
--- include/uapi/linux/bpf.h | 2 +- tools/include/uapi/linux/bpf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +1 -1
@@ -6730,7 +6730,7 @@ struct bpf_fib_lookup {/* output: MTU value */ __u16 mtu_result; - }; + } __attribute__((packed, aligned(2)));/* input: L3 device index for lookup * output: device index from FIB lookup */
tools/include/uapi/linux/bpf.h +1 -1
@@ -6730,7 +6730,7 @@ struct bpf_fib_lookup {/* output: MTU value */ __u16 mtu_result; - }; + } __attribute__((packed, aligned(2)));/* input: L3 device index for lookup * output: device index from FIB lookup */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 103/473 scsi: ufs: qcom: Perform read back after writing reset bit
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit c4d28e06b0c94636f6e35d003fa9ebac0a94e1ae ]
Currently, the reset bit for the UFS provided reset controller (used by its phy) is written to, and then a mb() happens to try and ensure that hit the device. Immediately afterwards a usleep_range() occurs.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. By doing so and guaranteeing the ordering against the immediately following usleep_range(), the mb() can safely be removed.
--- drivers/ufs/host/ufs-qcom.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/ufs/host/ufs-qcom.h +6 -6
@@ -146,10 +146,10 @@ static inline void ufs_qcom_assert_reset(struct ufs_hba *hba) 1 << OFFSET_UFS_PHY_SOFT_RESET, REG_UFS_CFG1);/* -* Make sure assertion of ufs phy reset is written to -* register before returning +* Dummy read to ensure the write takes effect before doing any sort +* of delay */ -mb (); +ufshcd_readl (hba,REG_UFS_CFG1 ); }static inline void ufs_qcom_deassert_reset (struct ufs_hba *hba)
@@ -158,10 +158,10 @@ static inline void ufs_qcom_deassert_reset(struct ufs_hba *hba) 0 << OFFSET_UFS_PHY_SOFT_RESET, REG_UFS_CFG1);/* -* Make sure de-assertion of ufs phy reset is written to -* register before returning +* Dummy read to ensure the write takes effect before doing any sort +* of delay */ -mb (); +ufshcd_readl (hba,REG_UFS_CFG1 ); }/* Host controller hardware version: major.minor.step */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 104/473 scsi: ufs: qcom: Perform read back after writing REG_UFS_SYS1CLK_1US
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit a862fafa263aea0f427d51aca6ff7fd9eeaaa8bd ]
Currently after writing to REG_UFS_SYS1CLK_1US a mb() is used to ensure that write has gone through to the device.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -432,7 +432,7 @@ static int ufs_qcom_cfg_timers(struct ufs_hba *hba, u32 gear,* make sure above write gets applied before we return from * this function. */ -mb (); +ufshcd_readl (hba,REG_UFS_SYS1CLK_1US ); }if (ufs_qcom_cap_qunipro (host))
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 105/473 scsi: ufs: ufs-qcom: Fix the Qcom register name for offset 0xD0
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 7959587f3284bf163e4f1baff3c6fa71fc6a55b1 ]
On newer UFS revisions, the register at offset 0xD0 is called, REG_UFS_PARAM0. Since the existing register, RETRY_TIMER_REG is not used anywhere, it is safe to use the new name.
Stable-dep-of: 823150ecf04f ("scsi: ufs: qcom: Perform read back after writing unipro mode")
--- drivers/ufs/host/ufs-qcom.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.h +2 -1
@@ -36,7 +36,8 @@ enum {REG_UFS_TX_SYMBOL_CLK_NS_US =0xC4 ,REG_UFS_LOCAL_PORT_ID_REG =0xC8 ,REG_UFS_PA_ERR_CODE =0xCC , -REG_UFS_RETRY_TIMER_REG =0xD0 , +/* On older UFS revisions, this register is called "RETRY_TIMER_REG" */ +REG_UFS_PARAM0 =0xD0 ,REG_UFS_PA_LINK_STARTUP_TIMER =0xD8 ,REG_UFS_CFG1 =0xDC , REG_UFS_CFG2 = 0xE0,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 106/473 scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW version major 5
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abel Vesa <[email protected]>
[ Upstream commit 9c02aa24bf404a39ec509d9f50539056b9b128f7 ]
On SM8550, depending on the Qunipro, we can run with G5 or G4. For now, when the major version is 5 or above, we go with G5. Therefore, we need to specifically tell UFS HC that.
Stable-dep-of: 823150ecf04f ("scsi: ufs: qcom: Perform read back after writing unipro mode")
--- drivers/ufs/host/ufs-qcom.c | 8 ++++++-- drivers/ufs/host/ufs-qcom.h | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/ufs/host/ufs-qcom.c +6 -2
@@ -226,6 +226,10 @@ static void ufs_qcom_select_unipro_mode(struct ufs_qcom_host *host)ufshcd_rmwl (host->hba,QUNIPRO_SEL ,ufs_qcom_cap_qunipro (host) ?QUNIPRO_SEL :0 ,REG_UFS_CFG1 ); + +if (host->hw_ver.major ==0x05 ) +ufshcd_rmwl (host->hba,QUNIPRO_G4_SEL ,0 ,REG_UFS_CFG0 ); +/* make sure above configuration is applied before we return */ mb (); }
@@ -498,9 +502,9 @@ static int ufs_qcom_cfg_timers(struct ufs_hba *hba, u32 gear,mb (); } -if (update_link_startup_timer) { +if (update_link_startup_timer && host->hw_ver.major !=0x5 ) {ufshcd_writel (hba, ((core_clk_rate /MSEC_PER_SEC ) *100 ), -REG_UFS_PA_LINK_STARTUP_TIMER ); +REG_UFS_CFG0 );/* * make sure that this configuration is applied before * we return
drivers/ufs/host/ufs-qcom.h +5 -1
@@ -38,7 +38,8 @@ enum {REG_UFS_PA_ERR_CODE =0xCC ,/* On older UFS revisions, this register is called "RETRY_TIMER_REG" */ REG_UFS_PARAM0 =0xD0 , -REG_UFS_PA_LINK_STARTUP_TIMER =0xD8 , +/* On older UFS revisions, this register is called "REG_UFS_PA_LINK_STARTUP_TIMER" */ +REG_UFS_CFG0 =0xD8 ,REG_UFS_CFG1 =0xDC ,REG_UFS_CFG2 =0xE0 , REG_UFS_HW_VERSION = 0xE4,
@@ -76,6 +77,9 @@ enum {#define UFS_CNTLR_2_x_x_VEN_REGS_OFFSET (x) (0x000 + x)#define UFS_CNTLR_3_x_x_VEN_REGS_OFFSET (x) (0x400 + x) +/* bit definitions for REG_UFS_CFG0 register */ +#define QUNIPRO_G4_SEL BIT(5) +/* bit definitions for REG_UFS_CFG1 register */ #define QUNIPRO_SEL 0x1#define UTP_DBG_RAMS_EN 0x20000
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 107/473 scsi: ufs: qcom: Perform read back after writing unipro mode
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit 823150ecf04f958213cf3bf162187cd1a91c885c ]
Currently, the QUNIPRO_SEL bit is written to and then an mb() is used to ensure that completes before continuing.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
But, there's really no reason to even ensure completion before continuing. The only requirement here is that this write is ordered to this endpoint (which readl()/writel() guarantees already). For that reason the mb() can be dropped altogether without anything forcing completion.
--- drivers/ufs/host/ufs-qcom.c | 3 --- 1 file changed, 3 deletions(-)
drivers/ufs/host/ufs-qcom.c +0 -3
@@ -229,9 +229,6 @@ static void ufs_qcom_select_unipro_mode(struct ufs_qcom_host *host)if (host->hw_ver.major ==0x05 )ufshcd_rmwl (host->hba,QUNIPRO_G4_SEL ,0 ,REG_UFS_CFG0 ); - -/* make sure above configuration is applied before we return */ -mb (); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 108/473 scsi: ufs: qcom: Perform read back after writing CGC enable
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit d9488511b3ac7eb48a91bc5eded7027525525e03 ]
Currently, the CGC enable bit is written and then an mb() is used to ensure that completes before continuing.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -336,7 +336,7 @@ static void ufs_qcom_enable_hw_clk_gating(struct ufs_hba *hba) REG_UFS_CFG2);/* Ensure that HW clock gating is enabled before next operations */ -mb (); +ufshcd_readl (hba,REG_UFS_CFG2 ); } static int ufs_qcom_hce_enable_notify(struct ufs_hba *hba,
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 109/473 scsi: ufs: cdns-pltfrm: Perform read back after writing HCLKDIV
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit b715c55daf598aac8fa339048e4ca8a0916b332e ]
Currently, HCLKDIV is written to and then completed with an mb().
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/host/cdns-pltfrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/cdns-pltfrm.c +1 -1
@@ -137,7 +137,7 @@ static int cdns_ufs_set_hclkdiv(struct ufs_hba *hba)* Make sure the register was updated, * UniPro layer will not work with an incorrect value. */ -mb (); +ufshcd_readl (hba,CDNS_UFS_REG_HCLKDIV );return 0 ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 110/473 scsi: ufs: core: Perform read back after disabling interrupts
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit e4a628877119bd40164a651d20321247b6f94a8b ]
Currently, interrupts are cleared and disabled prior to registering the interrupt. An mb() is used to complete the clear/disable writes before the interrupt is registered.
mb() ensures that the write completes, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring these bits have taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure these bits hit the device. Because the mb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/core/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -9817,7 +9817,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)* Make sure that UFS interrupts are disabled and any pending interrupt * status is cleared before registering UFS interrupt handler. */ -mb (); +ufshcd_readl (hba,REG_INTERRUPT_ENABLE );/* IRQ registration */ err =devm_request_irq (dev, irq, ufshcd_intr,IRQF_SHARED ,UFSHCD , hba);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 111/473 scsi: ufs: core: Perform read back after disabling UIC_COMMAND_COMPL
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Halaney <[email protected]>
[ Upstream commit 4bf3855497b60765ca03b983d064b25e99b97657 ]
Currently, the UIC_COMMAND_COMPL interrupt is disabled and a wmb() is used to complete the register write before any following writes.
wmb() ensures the writes complete in that order, but completion doesn't mean that it isn't stored in a buffer somewhere. The recommendation for ensuring this bit has taken effect on the device is to perform a read back to force it to make it all the way to the device. This is documented in device-io.rst and a talk by Will Deacon on this can be seen over here:
https://youtu.be/i6DayghhA8Q?si=MiyxB5cKJXSaoc01&t=1678
Let's do that to ensure the bit hits the device. Because the wmb()'s purpose wasn't to add extra ordering (on top of the ordering guaranteed by writel()/readl()), it can safely be removed.
--- drivers/ufs/core/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/core/ufshcd.c +1 -1
@@ -4074,7 +4074,7 @@ static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)* Make sure UIC command completion interrupt is disabled before * issuing UIC command. */ -wmb (); +ufshcd_readl (hba,REG_INTERRUPT_ENABLE ); reenable_intr = true; }spin_unlock_irqrestore (hba->host->host_lock, flags);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 112/473 ACPI: LPSS: Advertise number of chip selects via property
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
[ Upstream commit 07b73ee599428b41d0240f2f7b31b524eba07dd0 ]
Advertise number of chip selects via property for Intel Braswell.
--- drivers/acpi/acpi_lpss.c | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/acpi_lpss.c +1 -0
@@ -319,6 +319,7 @@ static const struct lpss_device_desc bsw_i2c_dev_desc = {static const struct property_entry bsw_spi_properties[] = {PROPERTY_ENTRY_U32 ("intel,spi-pxa2xx-type" ,LPSS_BSW_SSP ), +PROPERTY_ENTRY_U32 ("num-cs" ,2 ), { } };
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 113/473 irqchip/alpine-msi: Fix off-by-one in allocation error path
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zenghui Yu <[email protected]>
[ Upstream commit ff3669a71afa06208de58d6bea1cc49d5e3fcbd1 ]
When alpine_msix_gic_domain_alloc() fails, there is an off-by-one in the number of interrupts to be freed.
Fix it by passing the number of successfully allocated interrupts, instead of the relative index of the last allocated one.
--- drivers/irqchip/irq-alpine-msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-alpine-msi.c +1 -1
@@ -165,7 +165,7 @@ static int alpine_msix_middle_domain_alloc(struct irq_domain *domain,return 0 ; err_sgi: -irq_domain_free_irqs_parent (domain, virq, i -1 ); +irq_domain_free_irqs_parent (domain, virq, i);alpine_msix_free_sgi (priv, sgi, nr_irqs);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 114/473 irqchip/loongson-pch-msi: Fix off-by-one on allocation error path
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zenghui Yu <[email protected]>
[ Upstream commit b327708798809328f21da8dc14cc8883d1e8a4b3 ]
When pch_msi_parent_domain_alloc() returns an error, there is an off-by-one in the number of interrupts to be freed.
Fix it by passing the number of successfully allocated interrupts, instead of the relative index of the last allocated one.
--- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-loongson-pch-msi.c +1 -1
@@ -136,7 +136,7 @@ static int pch_msi_middle_domain_alloc(struct irq_domain *domain, err_hwirq:pch_msi_free_hwirq (priv, hwirq, nr_irqs); -irq_domain_free_irqs_parent (domain, virq, i -1 ); +irq_domain_free_irqs_parent (domain, virq, i);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 115/473 ACPI: disable -Wstringop-truncation
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit a3403d304708f60565582d60af4316289d0316a0 ]
gcc -Wstringop-truncation warns about copying a string that results in a missing nul termination:
drivers/acpi/acpica/tbfind.c: In function 'acpi_tb_find_table':drivers/acpi/acpica/tbfind.c:60:9: error: 'strncpy' specified bound 6 equals destination size [-Werror=stringop-truncation]
60 | strncpy(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/acpi/acpica/tbfind.c:61:9: error: 'strncpy' specified bound 8 equals destination size [-Werror=stringop-truncation]
61 | strncpy(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The code works as intended, and the warning could be addressed by using a memcpy(), but turning the warning off for this file works equally well and may be easier to merge.
--- drivers/acpi/acpica/Makefile | 1 + 1 file changed, 1 insertion(+)
drivers/acpi/acpica/Makefile +1 -0
@@ -5,6 +5,7 @@ ccflags-y := -D_LINUX -DBUILDING_ACPICA ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT +CFLAGS_tbfind.o += $(call cc-disable-warning, stringop-truncation) # use acpi.o to put all files here into acpi.o modparam namespace obj-y += acpi.o
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 116/473 gfs2: Dont forget to complete delayed withdraw
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit b01189333ee91c1ae6cd96dfd1e3a3c2e69202f0 ]
Commit fffe9bee14b0 ("gfs2: Delay withdraw from atomic context") switched from gfs2_withdraw() to gfs2_withdraw_delayed() in gfs2_ail_error(), but failed to then check if a delayed withdraw had occurred. Fix that by adding the missing check in __gfs2_ail_flush(), where the spin locks are already dropped and a withdraw is possible.
--- fs/gfs2/glops.c | 3 +++ 1 file changed, 3 insertions(+)
fs/gfs2/glops.c +3 -0
@@ -82,6 +82,9 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl, bool fsync,GLOCK_BUG_ON (gl, !fsync &&atomic_read (&gl->gl_ail_count));spin_unlock (&sdp->sd_ail_lock);gfs2_log_unlock (sdp); + +if (gfs2_withdrawing (sdp)) +gfs2_withdraw (sdp); }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 117/473 gfs2: Fix "ignore unlock failures after withdraw"
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andreas Gruenbacher <[email protected]>
[ Upstream commit 5d9231111966b6c5a65016d58dcbeab91055bc91 ]
Commit 3e11e53041502 tries to suppress dlm_lock() lock conversion errors that occur when the lockspace has already been released.
It does that by setting and checking the SDF_SKIP_DLM_UNLOCK flag. This conflicts with the intended meaning of the SDF_SKIP_DLM_UNLOCK flag, so check whether the lockspace is still allocated instead.
(Given the current DLM API, checking for this kind of error after the fact seems easier that than to make sure that the lockspace is still allocated before calling dlm_lock(). Changing the DLM API so that users maintain the lockspace references themselves would be an option.)
--- fs/gfs2/glock.c | 4 +++- fs/gfs2/util.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-)
fs/gfs2/glock.c +3 -1
@@ -855,11 +855,13 @@ __acquires(&gl->gl_lockref.lock) }if (sdp->sd_lockstruct.ls_ops->lm_lock) { +struct lm_lockstruct *ls = &sdp->sd_lockstruct; +/* lock_dlm */ ret = sdp->sd_lockstruct.ls_ops->lm_lock (gl, target, lck_flags);if (ret == -EINVAL && gl->gl_target ==LM_ST_UNLOCKED && target ==LM_ST_UNLOCKED && -test_bit (SDF_SKIP_DLM_UNLOCK , &sdp->sd_flags)) { +test_bit (DFL_UNMOUNT , &ls->ls_recover_flags)) {finish_xmote (gl, target);gfs2_glock_queue_work (gl,0 ); }else if (ret) {
fs/gfs2/util.c +0 -1
@@ -359,7 +359,6 @@ int gfs2_withdraw(struct gfs2_sbd *sdp)fs_err (sdp,"telling LM to unmount\n" ); lm->lm_unmount (sdp); } -set_bit (SDF_SKIP_DLM_UNLOCK , &sdp->sd_flags);fs_err (sdp,"File system withdrawn\n" );dump_stack ();clear_bit (SDF_WITHDRAW_IN_PROG , &sdp->sd_flags);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 118/473 x86/boot/64: Clear most of CR4 in startup_64(), except PAE, MCE and LA57
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit a0025f587c685e5ff842fb0194036f2ca0b6eaf4 ]
The early 64-bit boot code must be entered with a 1:1 mapping of the bootable image, but it cannot operate without a 1:1 mapping of all the assets in memory that it accesses, and therefore, it creates such mappings for all known assets upfront, and additional ones on demand when a page fault happens on a memory address.
These mappings are created with the global bit G set, as the flags used to create page table descriptors are based on __PAGE_KERNEL_LARGE_EXEC defined by the core kernel, even though the context where these mappings are used is very different.
This means that the TLB maintenance carried out by the decompressor is not sufficient if it is entered with CR4.PGE enabled, which has been observed to happen with the stage0 bootloader of project Oak. While this is a dubious practice if no global mappings are being used to begin with, the decompressor is clearly at fault here for creating global mappings and not performing the appropriate TLB maintenance.
Since commit:
f97b67a773cd84b ("x86/decompressor: Only call the trampoline when changing paging levels")
CR4 is no longer modified by the decompressor if no change in the number of paging levels is needed. Before that, CR4 would always be set to a consistent value with PGE cleared.
So let's reinstate a simplified version of the original logic to put CR4 into a known state, and preserve the PAE, MCE and LA57 bits, none of which can be modified freely at this point (PAE and LA57 cannot be changed while running in long mode, and MCE cannot be cleared when running under some hypervisors).
This effectively clears PGE and works around the project Oak bug.
--- arch/x86/boot/compressed/head_64.S | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/boot/compressed/head_64.S +5 -0
@@ -390,6 +390,11 @@ SYM_CODE_START(startup_64) call sev_enable #endif + /* Preserve only the CR4 bits that must be preserved, and clear the rest */ + movq %cr4, %rax + andl $(X86_CR4_PAE | X86_CR4_MCE | X86_CR4_LA57), %eax + movq %rax, %cr4 + /* * configure_5level_paging() updates the number of paging levels using * a trampoline in 32-bit addressable memory if the current number does
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 119/473 selftests/bpf: Fix umount cgroup2 error in test_sockmap
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit d75142dbeb2bd1587b9cc19f841578f541275a64 ]
This patch fixes the following "umount cgroup2" error in test_sockmap.c:
(cgroup_helpers.c:353: errno: Device or resource busy) umount cgroup2
Cgroup fd cg_fd should be closed before cleanup_cgroup_environment().
--- tools/testing/selftests/bpf/test_sockmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/bpf/test_sockmap.c +1 -1
@@ -2086,9 +2086,9 @@ int main(int argc, char **argv)free (options.whitelist);if (options.blacklist)free (options.blacklist); +close (cg_fd);if (cg_created)cleanup_cgroup_environment (); -close (cg_fd);return err; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 120/473 cpufreq: exit() callback is optional
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viresh Kumar <[email protected]>
[ Upstream commit b8f85833c05730d631576008daaa34096bc7f3ce ]
The exit() callback is optional and shouldn't be called without checking a valid pointer first.
Also, we must clear freq_table pointer even if the exit() callback isn't present.
--- drivers/cpufreq/cpufreq.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/cpufreq/cpufreq.c +7 -4
@@ -1619,10 +1619,13 @@ static void __cpufreq_offline(unsigned int cpu, struct cpufreq_policy *policy)*/ if (cpufreq_driver->offline) { cpufreq_driver->offline (policy); - }else if (cpufreq_driver->exit) { - cpufreq_driver->exit (policy); - policy->freq_table =NULL ; +return ; } + +if (cpufreq_driver->exit) + cpufreq_driver->exit (policy); + + policy->freq_table =NULL ; }static int cpufreq_offline (unsigned int cpu)
@@ -1680,7 +1683,7 @@ static void cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) }/* We did light-weight exit earlier, do full tear down now */ -if (cpufreq_driver->offline) +if (cpufreq_driver->offline && cpufreq_driver->exit) cpufreq_driver->exit (policy);up_write (&policy->rwsem);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 121/473 x86/pat: Introduce lookup_address_in_pgd_attr()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
[ Upstream commit ceb647b4b529fdeca9021cd34486f5a170746bda ]
Add lookup_address_in_pgd_attr() doing the same as the already existing lookup_address_in_pgd(), but returning the effective settings of the NX and RW bits of all walked page table levels, too.
This will be needed in order to match hardware behavior when looking for effective access rights, especially for detecting writable code pages.
In order to avoid code duplication, let lookup_address_in_pgd() call lookup_address_in_pgd_attr() with dummy parameters.
Stable-dep-of: 5bc8b0f5dac0 ("x86/pat: Fix W^X violation false-positives when running as Xen PV guest")
--- arch/x86/include/asm/pgtable_types.h | 2 ++ arch/x86/mm/pat/set_memory.c | 33 +++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-)
arch/x86/include/asm/pgtable_types.h +2 -0
@@ -544,6 +544,8 @@ static inline void update_page_count(int level, unsigned long pages) { }extern pte_t *lookup_address (unsigned long address,unsigned int *level);extern pte_t *lookup_address_in_pgd (pgd_t *pgd,unsigned long address,unsigned int *level); +pte_t *lookup_address_in_pgd_attr (pgd_t *pgd,unsigned long address, +unsigned int *level,bool *nx,bool *rw);extern pmd_t *lookup_pmd_address (unsigned long address);extern phys_addr_t slow_virt_to_phys (void *__address); extern int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn,
arch/x86/mm/pat/set_memory.c +30 -3
@@ -625,20 +625,26 @@ static inline pgprot_t verify_rwx(pgprot_t old, pgprot_t new, unsigned long star/* * Lookup the page table entry for a virtual address in a specific pgd. -* Return a pointer to the entry and the level of the mapping. +* Return a pointer to the entry, the level of the mapping, and the effective +* NX and RW bits of all page table levels. */ -pte_t *lookup_address_in_pgd (pgd_t *pgd,unsigned long address, -unsigned int *level) +pte_t *lookup_address_in_pgd_attr (pgd_t *pgd,unsigned long address, +unsigned int *level,bool *nx,bool *rw) {p4d_t *p4d;pud_t *pud;pmd_t *pmd; *level =PG_LEVEL_NONE ; + *nx = false; + *rw = true;if (pgd_none (*pgd))return NULL ; + *nx |=pgd_flags (*pgd) & _PAGE_NX; + *rw &=pgd_flags (*pgd) & _PAGE_RW; + p4d =p4d_offset (pgd, address);if (p4d_none (*p4d))return NULL ;
@@ -647,6 +653,9 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address,if (p4d_large (*p4d) || !p4d_present (*p4d))return (pte_t *)p4d; + *nx |=p4d_flags (*p4d) & _PAGE_NX; + *rw &=p4d_flags (*p4d) & _PAGE_RW; + pud =pud_offset (p4d, address);if (pud_none (*pud))return NULL ;
@@ -655,6 +664,9 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address,if (pud_large (*pud) || !pud_present (*pud))return (pte_t *)pud; + *nx |=pud_flags (*pud) & _PAGE_NX; + *rw &=pud_flags (*pud) & _PAGE_RW; + pmd =pmd_offset (pud, address);if (pmd_none (*pmd))return NULL ;
@@ -663,11 +675,26 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address,if (pmd_large (*pmd) || !pmd_present (*pmd))return (pte_t *)pmd; + *nx |=pmd_flags (*pmd) & _PAGE_NX; + *rw &=pmd_flags (*pmd) & _PAGE_RW; + *level =PG_LEVEL_4K ;return pte_offset_kernel (pmd, address); } +/* +* Lookup the page table entry for a virtual address in a specific pgd. +* Return a pointer to the entry and the level of the mapping. +*/ +pte_t *lookup_address_in_pgd (pgd_t *pgd,unsigned long address, +unsigned int *level) +{ +bool nx, rw; + +return lookup_address_in_pgd_attr (pgd, address, level, &nx, &rw); +} +/* * Lookup the page table entry for a virtual address. Return a pointer * to the entry and the level of the mapping.
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 122/473 x86/pat: Restructure _lookup_address_cpa()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
[ Upstream commit 02eac06b820c3eae73e5736ae62f986d37fed991 ]
Modify _lookup_address_cpa() to no longer use lookup_address(), but only lookup_address_in_pgd().
This is done in preparation of using lookup_address_in_pgd_attr().
No functional change intended.
Stable-dep-of: 5bc8b0f5dac0 ("x86/pat: Fix W^X violation false-positives when running as Xen PV guest")
--- arch/x86/mm/pat/set_memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/mm/pat/set_memory.c +7 -4
@@ -712,11 +712,14 @@ EXPORT_SYMBOL_GPL(lookup_address);static pte_t *_lookup_address_cpa (struct cpa_data *cpa,unsigned long address,unsigned int *level) { -if (cpa->pgd) -return lookup_address_in_pgd (cpa->pgd +pgd_index (address), - address, level); +pgd_t *pgd; + +if (!cpa->pgd) + pgd =pgd_offset_k (address); +else + pgd = cpa->pgd +pgd_index (address); -return lookup_address (address, level); +return lookup_address_in_pgd (pgd, address, level); }/*
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 123/473 x86/pat: Fix W^X violation false-positives when running as Xen PV guest
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juergen Gross <[email protected]>
[ Upstream commit 5bc8b0f5dac04cd4ebe47f8090a5942f2f2647ef ]
When running as Xen PV guest in some cases W^X violation WARN()s have been observed. Those WARN()s are produced by verify_rwx(), which looks into the PTE to verify that writable kernel pages have the NX bit set in order to avoid code modifications of the kernel by rogue code.
As the NX bits of all levels of translation entries are or-ed and the RW bits of all levels are and-ed, looking just into the PTE isn't enough for the decision that a writable page is executable, too.
When running as a Xen PV guest, the direct map PMDs and kernel high map PMDs share the same set of PTEs. Xen kernel initialization will set the NX bit in the direct map PMD entries, and not the shared PTEs.
--- arch/x86/mm/pat/set_memory.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
arch/x86/mm/pat/set_memory.c +18 -8
@@ -583,7 +583,8 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long start,* Validate strict W^X semantics. */ static inline pgprot_t verify_rwx (pgprot_t old,pgprot_t new,unsigned long start, -unsigned long pfn,unsigned long npg) +unsigned long pfn,unsigned long npg, +bool nx,bool rw) {unsigned long end;
@@ -609,6 +610,10 @@ static inline pgprot_t verify_rwx(pgprot_t old, pgprot_t new, unsigned long starif ((pgprot_val (new) & (_PAGE_RW | _PAGE_NX)) != _PAGE_RW)return new; +/* Non-leaf translation entries can disable writing or execution. */ +if (!rw || nx) +return new; + end = start + npg *PAGE_SIZE -1 ; WARN_ONCE(1, "CPA detected W^X violation: %016llx -> %016llx range: 0x%016lx - 0x%016lx PFN %lx\n", (unsigned long long)pgprot_val(old),
@@ -710,7 +715,7 @@ pte_t *lookup_address(unsigned long address, unsigned int *level)EXPORT_SYMBOL_GPL (lookup_address);static pte_t *_lookup_address_cpa (struct cpa_data *cpa,unsigned long address, -unsigned int *level) +unsigned int *level,bool *nx,bool *rw) {pgd_t *pgd;
@@ -719,7 +724,7 @@ static pte_t *_lookup_address_cpa(struct cpa_data *cpa, unsigned long address,else pgd = cpa->pgd +pgd_index (address); -return lookup_address_in_pgd (pgd, address, level); +return lookup_address_in_pgd_attr (pgd, address, level, nx, rw); }/*
@@ -843,12 +848,13 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address,pgprot_t old_prot, new_prot, req_prot, chk_prot;pte_t new_pte, *tmp;enum pg_level level; +bool nx, rw;/* * Check for races, another CPU might have split this page * up already: */ - tmp =_lookup_address_cpa (cpa, address, &level); + tmp =_lookup_address_cpa (cpa, address, &level, &nx, &rw);if (tmp != kpte)return 1 ;
@@ -959,7 +965,8 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address, new_prot =static_protections (req_prot, lpaddr, old_pfn, numpages, psize,CPA_DETECT ); - new_prot =verify_rwx (old_prot, new_prot, lpaddr, old_pfn, numpages); + new_prot =verify_rwx (old_prot, new_prot, lpaddr, old_pfn, numpages, + nx, rw);/* * If there is a conflict, split the large page.
@@ -1040,6 +1047,7 @@ __split_large_page(struct cpa_data *cpa, pte_t *kpte, unsigned long address,pte_t *pbase = (pte_t *)page_address (base);unsigned int i, level;pgprot_t ref_prot; +bool nx, rw;pte_t *tmp;spin_lock (&pgd_lock);
@@ -1047,7 +1055,7 @@ __split_large_page(struct cpa_data *cpa, pte_t *kpte, unsigned long address,* Check for races, another CPU might have split this page * up for us already: */ - tmp =_lookup_address_cpa (cpa, address, &level); + tmp =_lookup_address_cpa (cpa, address, &level, &nx, &rw);if (tmp != kpte) {spin_unlock (&pgd_lock);return 1 ;
@@ -1588,10 +1596,11 @@ static int __change_page_attr(struct cpa_data *cpa, int primary)int do_split, err;unsigned int level;pte_t *kpte, old_pte; +bool nx, rw; address =__cpa_addr (cpa, cpa->curpage); repeat: - kpte =_lookup_address_cpa (cpa, address, &level); + kpte =_lookup_address_cpa (cpa, address, &level, &nx, &rw);if (!kpte)return __cpa_process_fault (cpa, address, primary);
@@ -1613,7 +1622,8 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) new_prot =static_protections (new_prot, address, pfn,1 ,0 ,CPA_PROTECT ); - new_prot =verify_rwx (old_prot, new_prot, address, pfn,1 ); + new_prot =verify_rwx (old_prot, new_prot, address, pfn,1 , + nx, rw); new_prot =pgprot_clear_protnone_bits (new_prot);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 124/473 net: export inet_lookup_reuseport and inet6_lookup_reuseport
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenz Bauer <[email protected]>
[ Upstream commit ce796e60b3b196b61fcc565df195443cbb846ef0 ]
Rename the existing reuseport helpers for IPv4 and IPv6 so that they can be invoked in the follow up commit. Export them so that building DCCP and IPv6 as a module works.
No change in functionality.
Stable-dep-of: 50aee97d1511 ("udp: Avoid call to compute_score on multiple sites")
--- include/net/inet6_hashtables.h | 7 +++++++ include/net/inet_hashtables.h | 5 +++++ net/ipv4/inet_hashtables.c | 15 ++++++++------- net/ipv6/inet6_hashtables.c | 19 ++++++++++--------- 4 files changed, 30 insertions(+), 16 deletions(-)
include/net/inet6_hashtables.h +7 -0
@@ -48,6 +48,13 @@ struct sock *__inet6_lookup_established(struct net *net, const u16 hnum, const int dif, const int sdif); +struct sock *inet6_lookup_reuseport (struct net *net,struct sock *sk, +struct sk_buff *skb,int doff, +const struct in6_addr *saddr, +__be16 sport, +const struct in6_addr *daddr, +unsigned short hnum); + struct sock *inet6_lookup_listener(struct net *net, struct inet_hashinfo *hashinfo, struct sk_buff *skb, int doff,
include/net/inet_hashtables.h +5 -0
@@ -379,6 +379,11 @@ struct sock *__inet_lookup_established(struct net *net, const __be32 daddr, const u16 hnum, const int dif, const int sdif); +struct sock *inet_lookup_reuseport (struct net *net,struct sock *sk, +struct sk_buff *skb,int doff, +__be32 saddr,__be16 sport, +__be32 daddr,unsigned short hnum); +static inline struct sock * inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo, const __be32 saddr, const __be16 sport,
net/ipv4/inet_hashtables.c +8 -7
@@ -338,10 +338,10 @@ static inline int compute_score(struct sock *sk, struct net *net,return score; } -static inline struct sock *lookup_reuseport (struct net *net,struct sock *sk, -struct sk_buff *skb,int doff, -__be32 saddr,__be16 sport, -__be32 daddr,unsigned short hnum) +struct sock *inet_lookup_reuseport (struct net *net,struct sock *sk, +struct sk_buff *skb,int doff, +__be32 saddr,__be16 sport, +__be32 daddr,unsigned short hnum) {struct sock *reuse_sk =NULL ;u32 phash;
@@ -352,6 +352,7 @@ static inline struct sock *lookup_reuseport(struct net *net, struct sock *sk, }return reuse_sk; } +EXPORT_SYMBOL_GPL (inet_lookup_reuseport);/* * Here are some nice properties to exploit here. The BSD API
@@ -375,8 +376,8 @@ static struct sock *inet_lhash2_lookup(struct net *net,sk_nulls_for_each_rcu (sk, node, &ilb2->nulls_head) { score =compute_score (sk, net, hnum, daddr, dif, sdif);if (score > hiscore) { - result =lookup_reuseport (net, sk, skb, doff, - saddr, sport, daddr, hnum); + result =inet_lookup_reuseport (net, sk, skb, doff, + saddr, sport, daddr, hnum);if (result)return result;
@@ -405,7 +406,7 @@ static inline struct sock *inet_lookup_run_bpf(struct net *net,if (no_reuseport ||IS_ERR_OR_NULL (sk))return sk; - reuse_sk =lookup_reuseport (net, sk, skb, doff, saddr, sport, daddr, hnum); + reuse_sk =inet_lookup_reuseport (net, sk, skb, doff, saddr, sport, daddr, hnum);if (reuse_sk) sk = reuse_sk;return sk;
net/ipv6/inet6_hashtables.c +10 -9
@@ -111,12 +111,12 @@ static inline int compute_score(struct sock *sk, struct net *net,return score; } -static inline struct sock *lookup_reuseport (struct net *net,struct sock *sk, -struct sk_buff *skb,int doff, -const struct in6_addr *saddr, -__be16 sport, -const struct in6_addr *daddr, -unsigned short hnum) +struct sock *inet6_lookup_reuseport (struct net *net,struct sock *sk, +struct sk_buff *skb,int doff, +const struct in6_addr *saddr, +__be16 sport, +const struct in6_addr *daddr, +unsigned short hnum) {struct sock *reuse_sk =NULL ;u32 phash;
@@ -127,6 +127,7 @@ static inline struct sock *lookup_reuseport(struct net *net, struct sock *sk, }return reuse_sk; } +EXPORT_SYMBOL_GPL (inet6_lookup_reuseport);/* called with rcu_read_lock() */ static struct sock *inet6_lhash2_lookup(struct net *net,
@@ -143,8 +144,8 @@ static struct sock *inet6_lhash2_lookup(struct net *net,sk_nulls_for_each_rcu (sk, node, &ilb2->nulls_head) { score =compute_score (sk, net, hnum, daddr, dif, sdif);if (score > hiscore) { - result =lookup_reuseport (net, sk, skb, doff, - saddr, sport, daddr, hnum); + result =inet6_lookup_reuseport (net, sk, skb, doff, + saddr, sport, daddr, hnum);if (result)return result;
@@ -175,7 +176,7 @@ static inline struct sock *inet6_lookup_run_bpf(struct net *net,if (no_reuseport ||IS_ERR_OR_NULL (sk))return sk; - reuse_sk =lookup_reuseport (net, sk, skb, doff, saddr, sport, daddr, hnum); + reuse_sk =inet6_lookup_reuseport (net, sk, skb, doff, saddr, sport, daddr, hnum);if (reuse_sk) sk = reuse_sk;return sk;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 125/473 net: remove duplicate reuseport_lookup functions
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenz Bauer <[email protected]>
[ Upstream commit 0f495f7617229772403e683033abc473f0f0553c ]
There are currently four copies of reuseport_lookup: one each for (TCP, UDP)x(IPv4, IPv6). This forces us to duplicate all callers of those functions as well. This is already the case for sk_lookup helpers (inet,inet6,udp4,udp6)_lookup_run_bpf.
There are two differences between the reuseport_lookup helpers:
1. They call different hash functions depending on protocol
2. UDP reuseport_lookup checks that sk_state != TCP_ESTABLISHED
Move the check for sk_state into the caller and use the INDIRECT_CALL infrastructure to cut down the helpers to one per IP version.
Stable-dep-of: 50aee97d1511 ("udp: Avoid call to compute_score on multiple sites")
--- include/net/inet6_hashtables.h | 11 ++++++++- include/net/inet_hashtables.h | 15 ++++++++----- net/ipv4/inet_hashtables.c | 20 +++++++++++------ net/ipv4/udp.c | 34 +++++++++++----------------- net/ipv6/inet6_hashtables.c | 14 ++++++++---- net/ipv6/udp.c | 41 +++++++++++++--------------------- 6 files changed, 72 insertions(+), 63 deletions(-)
include/net/inet6_hashtables.h +10 -1
@@ -48,12 +48,21 @@ struct sock *__inet6_lookup_established(struct net *net, const u16 hnum, const int dif, const int sdif); +typedef u32 (inet6_ehashfn_t )(const struct net *net, +const struct in6_addr *laddr,const u16 lport, +const struct in6_addr *faddr,const __be16 fport); + +inet6_ehashfn_t inet6_ehashfn; + +INDIRECT_CALLABLE_DECLARE(inet6_ehashfn_t udp6_ehashfn); +struct sock *inet6_lookup_reuseport (struct net *net,struct sock *sk,struct sk_buff *skb,int doff,const struct in6_addr *saddr,__be16 sport,const struct in6_addr *daddr, -unsigned short hnum); +unsigned short hnum, +inet6_ehashfn_t *ehashfn); struct sock *inet6_lookup_listener(struct net *net, struct inet_hashinfo *hashinfo,
include/net/inet_hashtables.h +10 -5
@@ -379,10 +379,19 @@ struct sock *__inet_lookup_established(struct net *net, const __be32 daddr, const u16 hnum, const int dif, const int sdif); +typedef u32 (inet_ehashfn_t )(const struct net *net, +const __be32 laddr,const __u16 lport, +const __be32 faddr,const __be16 fport); + +inet_ehashfn_t inet_ehashfn; + +INDIRECT_CALLABLE_DECLARE(inet_ehashfn_t udp_ehashfn); +struct sock *inet_lookup_reuseport (struct net *net,struct sock *sk,struct sk_buff *skb,int doff,__be32 saddr,__be16 sport, -__be32 daddr,unsigned short hnum); +__be32 daddr,unsigned short hnum, +inet_ehashfn_t *ehashfn);static inline struct sock * inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo,
@@ -453,10 +462,6 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo, refcounted); } -u32 inet6_ehashfn (const struct net *net, -const struct in6_addr *laddr,const u16 lport, -const struct in6_addr *faddr,const __be16 fport); -static inline void sk_daddr_set (struct sock *sk,__be32 addr) { sk->sk_daddr = addr;/* alias of inet_daddr */
net/ipv4/inet_hashtables.c +13 -7
@@ -28,9 +28,9 @@#include <net/tcp.h> #include <net/sock_reuseport.h> -static u32 inet_ehashfn (const struct net *net,const __be32 laddr, -const __u16 lport,const __be32 faddr, -const __be16 fport) +u32 inet_ehashfn (const struct net *net,const __be32 laddr, +const __u16 lport,const __be32 faddr, +const __be16 fport) {static u32 inet_ehash_secret__read_mostly ;
@@ -39,6 +39,7 @@ static u32 inet_ehashfn(const struct net *net, const __be32 laddr,return __inet_ehashfn (laddr, lport, faddr, fport, inet_ehash_secret +net_hash_mix (net)); } +EXPORT_SYMBOL_GPL (inet_ehashfn);/* This function handles inet_sock, but also timewait and request sockets * for IPv4/IPv6.
@@ -338,16 +339,20 @@ static inline int compute_score(struct sock *sk, struct net *net,return score; } +INDIRECT_CALLABLE_DECLARE(inet_ehashfn_t udp_ehashfn); +struct sock *inet_lookup_reuseport (struct net *net,struct sock *sk,struct sk_buff *skb,int doff,__be32 saddr,__be16 sport, -__be32 daddr,unsigned short hnum) +__be32 daddr,unsigned short hnum, +inet_ehashfn_t *ehashfn) {struct sock *reuse_sk =NULL ;u32 phash;if (sk->sk_reuseport) { - phash =inet_ehashfn (net, daddr, hnum, saddr, sport); + phash =INDIRECT_CALL_2 (ehashfn, udp_ehashfn, inet_ehashfn, + net, daddr, hnum, saddr, sport); reuse_sk =reuseport_select_sock (sk, phash, skb, doff); }return reuse_sk;
@@ -377,7 +382,7 @@ static struct sock *inet_lhash2_lookup(struct net *net, score =compute_score (sk, net, hnum, daddr, dif, sdif);if (score > hiscore) { result =inet_lookup_reuseport (net, sk, skb, doff, - saddr, sport, daddr, hnum); + saddr, sport, daddr, hnum, inet_ehashfn);if (result)return result;
@@ -406,7 +411,8 @@ static inline struct sock *inet_lookup_run_bpf(struct net *net,if (no_reuseport ||IS_ERR_OR_NULL (sk))return sk; - reuse_sk =inet_lookup_reuseport (net, sk, skb, doff, saddr, sport, daddr, hnum); + reuse_sk =inet_lookup_reuseport (net, sk, skb, doff, saddr, sport, daddr, hnum, + inet_ehashfn);if (reuse_sk) sk = reuse_sk;return sk;
net/ipv4/udp.c +13 -21
@@ -400,9 +400,9 @@ static int compute_score(struct sock *sk, struct net *net,return score; } -static u32 udp_ehashfn (const struct net *net,const __be32 laddr, -const __u16 lport,const __be32 faddr, -const __be16 fport) +INDIRECT_CALLABLE_SCOPE +u32 udp_ehashfn(const struct net *net, const __be32 laddr, const __u16 lport, +const __be32 faddr,const __be16 fport) {static u32 udp_ehash_secret__read_mostly ;
@@ -412,22 +412,6 @@ static u32 udp_ehashfn(const struct net *net, const __be32 laddr, udp_ehash_secret + net_hash_mix(net)); } -static struct sock *lookup_reuseport (struct net *net,struct sock *sk, -struct sk_buff *skb, -__be32 saddr,__be16 sport, -__be32 daddr,unsigned short hnum) -{ -struct sock *reuse_sk =NULL ; -u32 hash; - -if (sk->sk_reuseport && sk->sk_state !=TCP_ESTABLISHED ) { - hash =udp_ehashfn (net, daddr, hnum, saddr, sport); - reuse_sk =reuseport_select_sock (sk, hash, skb, -sizeof (struct udphdr )); - } -return reuse_sk; -} -/* called with rcu_read_lock() */ static struct sock *udp4_lib_lookup2(struct net *net, __be32 saddr, __be16 sport,
@@ -446,7 +430,14 @@ static struct sock *udp4_lib_lookup2(struct net *net, daddr, hnum, dif, sdif);if (score > badness) { badness = score; - result =lookup_reuseport (net, sk, skb, saddr, sport, daddr, hnum); + +if (sk->sk_state ==TCP_ESTABLISHED ) { + result = sk; +continue ; + } + + result =inet_lookup_reuseport (net, sk, skb,sizeof (struct udphdr ), + saddr, sport, daddr, hnum, udp_ehashfn);if (!result) { result = sk;continue ;
@@ -485,7 +476,8 @@ static struct sock *udp4_lookup_run_bpf(struct net *net,if (no_reuseport ||IS_ERR_OR_NULL (sk))return sk; - reuse_sk =lookup_reuseport (net, sk, skb, saddr, sport, daddr, hnum); + reuse_sk =inet_lookup_reuseport (net, sk, skb,sizeof (struct udphdr ), + saddr, sport, daddr, hnum, udp_ehashfn);if (reuse_sk) sk = reuse_sk;return sk;
net/ipv6/inet6_hashtables.c +10 -4
@@ -39,6 +39,7 @@ u32 inet6_ehashfn(const struct net *net,return __inet6_ehashfn (lhash, lport, fhash, fport, inet6_ehash_secret +net_hash_mix (net)); } +EXPORT_SYMBOL_GPL (inet6_ehashfn);/* * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so
@@ -111,18 +112,22 @@ static inline int compute_score(struct sock *sk, struct net *net,return score; } +INDIRECT_CALLABLE_DECLARE(inet6_ehashfn_t udp6_ehashfn); +struct sock *inet6_lookup_reuseport (struct net *net,struct sock *sk,struct sk_buff *skb,int doff,const struct in6_addr *saddr,__be16 sport,const struct in6_addr *daddr, -unsigned short hnum) +unsigned short hnum, +inet6_ehashfn_t *ehashfn) {struct sock *reuse_sk =NULL ;u32 phash;if (sk->sk_reuseport) { - phash =inet6_ehashfn (net, daddr, hnum, saddr, sport); + phash =INDIRECT_CALL_INET (ehashfn, udp6_ehashfn, inet6_ehashfn, + net, daddr, hnum, saddr, sport); reuse_sk =reuseport_select_sock (sk, phash, skb, doff); }return reuse_sk;
@@ -145,7 +150,7 @@ static struct sock *inet6_lhash2_lookup(struct net *net, score =compute_score (sk, net, hnum, daddr, dif, sdif);if (score > hiscore) { result =inet6_lookup_reuseport (net, sk, skb, doff, - saddr, sport, daddr, hnum); + saddr, sport, daddr, hnum, inet6_ehashfn);if (result)return result;
@@ -176,7 +181,8 @@ static inline struct sock *inet6_lookup_run_bpf(struct net *net,if (no_reuseport ||IS_ERR_OR_NULL (sk))return sk; - reuse_sk =inet6_lookup_reuseport (net, sk, skb, doff, saddr, sport, daddr, hnum); + reuse_sk =inet6_lookup_reuseport (net, sk, skb, doff, + saddr, sport, daddr, hnum, inet6_ehashfn);if (reuse_sk) sk = reuse_sk;return sk;
net/ipv6/udp.c +16 -25
65 lines not on this page · raw message
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 126/473 udp: Avoid call to compute_score on multiple sites
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Krisman Bertazi <[email protected]>
[ Upstream commit 50aee97d15113b95a68848db1f0cb2a6c09f753a ]
We've observed a 7-12% performance regression in iperf3 UDP ipv4 and ipv6 tests with multiple sockets on Zen3 cpus, which we traced back to commit f0ea27e7bfe1 ("udp: re-score reuseport groups when connected sockets are present"). The failing tests were those that would spawn UDP sockets per-cpu on systems that have a high number of cpus.
Unsurprisingly, it is not caused by the extra re-scoring of the reused socket, but due to the compiler no longer inlining compute_score, once it has the extra call site in udp4_lib_lookup2. This is augmented by the "Safe RET" mitigation for SRSO, needed in our Zen3 cpus.
We could just explicitly inline it, but compute_score() is quite a large function, around 300b. Inlining in two sites would almost double udp4_lib_lookup2, which is a silly thing to do just to workaround a mitigation. Instead, this patch shuffles the code a bit to avoid the multiple calls to compute_score. Since it is a static function used in one spot, the compiler can safely fold it in, as it did before, without increasing the text size.
With this patch applied I ran my original iperf3 testcases. The failing cases all looked like this (ipv4):
iperf3 -c 127.0.0.1 --udp -4 -f K -b $R -l 8920 -t 30 -i 5 -P 64 -O 2
where $R is either 1G/10G/0 (max, unlimited). I ran 3 times each. baseline is v6.9-rc3. harmean == harmonic mean; CV == coefficient of variation.
ipv4:
1G 10G MAX
HARMEAN (CV) HARMEAN (CV) HARMEAN (CV)
baseline 1743852.66(0.0208) 1725933.02(0.0167) 1705203.78(0.0386) patched 1968727.61(0.0035) 1962283.22(0.0195) 1923853.50(0.0256)
ipv6:
1G 10G MAX
HARMEAN (CV) HARMEAN (CV) HARMEAN (CV)
baseline 1729020.03(0.0028) 1691704.49(0.0243) 1692251.34(0.0083) patched 1900422.19(0.0067) 1900968.01(0.0067) 1568532.72(0.1519)
This restores the performance we had before the change above with this benchmark. We obviously don't expect any real impact when mitigations are disabled, but just to be sure it also doesn't regresses:
mitigations=off ipv4:
1G 10G MAX
HARMEAN (CV) HARMEAN (CV) HARMEAN (CV)
baseline 3230279.97(0.0066) 3229320.91(0.0060) 2605693.19(0.0697) patched 3242802.36(0.0073) 3239310.71(0.0035) 2502427.19(0.0882)
--- net/ipv4/udp.c | 21 ++++++++++++++++----- net/ipv6/udp.c | 20 ++++++++++++++++---- 2 files changed, 32 insertions(+), 9 deletions(-)
net/ipv4/udp.c +16 -5
@@ -422,15 +422,21 @@ static struct sock *udp4_lib_lookup2(struct net *net, {struct sock *sk, *result;int score, badness; +bool need_rescore; result =NULL ; badness =0 ;udp_portaddr_for_each_entry_rcu (sk, &hslot2->head) { - score =compute_score (sk, net, saddr, sport, - daddr, hnum, dif, sdif); + need_rescore = false; +rescore: + score =compute_score (need_rescore ? result : sk, net, saddr, + sport, daddr, hnum, dif, sdif);if (score > badness) { badness = score; +if (need_rescore) +continue ; +if (sk->sk_state ==TCP_ESTABLISHED ) { result = sk;continue ;
@@ -451,9 +457,14 @@ static struct sock *udp4_lib_lookup2(struct net *net,if (IS_ERR (result))continue ; - badness =compute_score (result, net, saddr, sport, - daddr, hnum, dif, sdif); - +/* compute_score is too long of a function to be +* inlined, and calling it again here yields +* measureable overhead for some +* workloads. Work around it by jumping +* backwards to rescore 'result'. +*/ + need_rescore = true; + goto rescore; } }return result;
net/ipv6/udp.c +16 -4
@@ -169,15 +169,21 @@ static struct sock *udp6_lib_lookup2(struct net *net, {struct sock *sk, *result;int score, badness; +bool need_rescore; result =NULL ; badness =-1 ;udp_portaddr_for_each_entry_rcu (sk, &hslot2->head) { - score =compute_score (sk, net, saddr, sport, - daddr, hnum, dif, sdif); + need_rescore = false; +rescore: + score =compute_score (need_rescore ? result : sk, net, saddr, + sport, daddr, hnum, dif, sdif);if (score > badness) { badness = score; +if (need_rescore) +continue ; +if (sk->sk_state ==TCP_ESTABLISHED ) { result = sk;continue ;
@@ -198,8 +204,14 @@ static struct sock *udp6_lib_lookup2(struct net *net,if (IS_ERR (result))continue ; - badness =compute_score (sk, net, saddr, sport, - daddr, hnum, dif, sdif); +/* compute_score is too long of a function to be +* inlined, and calling it again here yields +* measureable overhead for some +* workloads. Work around it by jumping +* backwards to rescore 'result'. +*/ + need_rescore = true; + goto rescore; } }return result;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 127/473 cppc_cpufreq: Fix possible null pointer dereference
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit cf7de25878a1f4508c69dc9f6819c21ba177dbfe ]
cppc_cpufreq_get_rate() and hisi_cppc_cpufreq_get_rate() can be called from different places with various parameters. So cpufreq_cpu_get() can return null as 'policy' in some circumstances.
Fix this bug by adding null return check.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/cpufreq/cppc_cpufreq.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/cpufreq/cppc_cpufreq.c +12 -2
@@ -841,10 +841,15 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu) {struct cppc_perf_fb_ctrs fb_ctrs_t0 = {0 }, fb_ctrs_t1 = {0 };struct cpufreq_policy *policy =cpufreq_cpu_get (cpu); -struct cppc_cpudata *cpu_data = policy->driver_data; +struct cppc_cpudata *cpu_data;u64 delivered_perf;int ret; +if (!policy) +return -ENODEV ; + + cpu_data = policy->driver_data; +cpufreq_cpu_put (policy); ret =cppc_get_perf_ctrs (cpu, &fb_ctrs_t0);
@@ -924,10 +929,15 @@ static struct cpufreq_driver cppc_cpufreq_driver = {static unsigned int hisi_cppc_cpufreq_get_rate (unsigned int cpu) {struct cpufreq_policy *policy =cpufreq_cpu_get (cpu); -struct cppc_cpudata *cpu_data = policy->driver_data; +struct cppc_cpudata *cpu_data;u64 desired_perf;int ret; +if (!policy) +return -ENODEV ; + + cpu_data = policy->driver_data; +cpufreq_cpu_put (policy); ret =cppc_get_desired_perf (cpu, &desired_perf);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 128/473 scsi: libsas: Fix the failure of adding phy with zero-address to port
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xingui Yang <[email protected]>
[ Upstream commit 06036a0a5db34642c5dbe22021a767141f010b7a ]
As of commit 7d1d86518118 ("[SCSI] libsas: fix false positive 'device attached' conditions"), reset the phy->entacted_sas_addr address to a zero-address when the link rate is less than 1.5G.
Currently we find that when a new device is attached, and the link rate is less than 1.5G, but the device type is not NO_DEVICE, for example: the link rate is SAS_PHY_RESET_IN_PROGRESS and the device type is stp. After setting the phy->entacted_sas_addr address to the zero address, the port will continue to be created for the phy with the zero-address, and other phys with the zero-address will be tried to be added to the new port:
[562240.051197] sas: ex 500e004aaaaaaa1f phy19:U:0 attached: 0000000000000000 (no device) // phy19 is deleted but still on the parent port's phy_list [562240.062536] sas: ex 500e004aaaaaaa1f phy0 new device attached [562240.062616] sas: ex 500e004aaaaaaa1f phy00:U:5 attached: 0000000000000000 (stp) [562240.062680] port-7:7:0: trying to add phy phy-7:7:19 fails: it's already part of another port
Therefore, it should be the same as sas_get_phy_attached_dev(). Only when device_type is SAS_PHY_UNUSED, sas_address is set to the 0 address.
--- drivers/scsi/libsas/sas_expander.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/libsas/sas_expander.c +1 -2
@@ -239,8 +239,7 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id,/* help some expanders that fail to zero sas_address in the 'no * device' case */ -if (phy->attached_dev_type ==SAS_PHY_UNUSED || - phy->linkrate <SAS_LINK_RATE_1_5_GBPS ) +if (phy->attached_dev_type ==SAS_PHY_UNUSED )memset (phy->attached_sas_addr,0 ,SAS_ADDR_SIZE );else memcpy (phy->attached_sas_addr, dr->attached_sas_addr,SAS_ADDR_SIZE );
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 129/473 scsi: hpsa: Fix allocation size for Scsi_Host private data
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuri Karpov <[email protected]>
[ Upstream commit 504e2bed5d50610c1836046c0c195b0a6dba9c72 ]
struct Scsi_Host private data contains pointer to struct ctlr_info.
Restore allocation of only 8 bytes to store pointer in struct Scsi_Host private data area.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/scsi/hpsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hpsa.c +1 -1
@@ -5850,7 +5850,7 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h) {struct Scsi_Host *sh; - sh =scsi_host_alloc (&hpsa_driver_template,sizeof (struct ctlr_info )); + sh =scsi_host_alloc (&hpsa_driver_template,sizeof (struct ctlr_info *));if (sh ==NULL ) {dev_err (&h->pdev->dev,"scsi_host_alloc failed\n" );return -ENOMEM ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 130/473 x86/purgatory: Switch to the position-independent small code model
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit cba786af84a0f9716204e09f518ce3b7ada8555e ]
On x86, the ordinary, position dependent small and kernel code models only support placement of the executable in 32-bit addressable memory, due to the use of 32-bit signed immediates to generate references to global variables. For the kernel, this implies that all global variables must reside in the top 2 GiB of the kernel virtual address space, where the implicit address bits 63:32 are equal to sign bit 31.
This means the kernel code model is not suitable for other bare metal executables such as the kexec purgatory, which can be placed arbitrarily in the physical address space, where its address may no longer be representable as a sign extended 32-bit quantity. For this reason, commit
e16c2983fba0 ("x86/purgatory: Change compiler flags from -mcmodel=kernel to -mcmodel=large to fix kexec relocation errors")
switched to the large code model, which uses 64-bit immediates for all symbol references, including function calls, in order to avoid relying on any assumptions regarding proximity of symbols in the final executable.
The large code model is rarely used, clunky and the least likely to operate in a similar fashion when comparing GCC and Clang, so it is best avoided. This is especially true now that Clang 18 has started to emit executable code in two separate sections (.text and .ltext), which triggers an issue in the kexec loading code at runtime.
The SUSE bugzilla fixes tag points to gcc 13 having issues with the large model too and that perhaps the large model should simply not be used at all.
Instead, use the position independent small code model, which makes no assumptions about placement but only about proximity, where all referenced symbols must be within -/+ 2 GiB, i.e., in range for a RIP-relative reference. Use hidden visibility to suppress the use of a GOT, which carries absolute addresses that are not covered by static ELF relocations, and is therefore incompatible with the kexec loader's relocation logic.
[ bp: Massage commit message. ]
--- arch/x86/purgatory/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/purgatory/Makefile +2 -1
@@ -42,7 +42,8 @@ KCOV_INSTRUMENT := n # make up the standalone purgatory.ro PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel -PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss -g0 +PURGATORY_CFLAGS := -mcmodel=small -ffreestanding -fno-zero-initialized-in-bss -g0 +PURGATORY_CFLAGS += -fpic -fvisibility=hidden PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) -DDISABLE_BRANCH_PROFILING PURGATORY_CFLAGS += -fno-stack-protector
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 131/473 thermal/drivers/tsens: Fix null pointer dereference
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aleksandr Mishin <[email protected]>
[ Upstream commit d998ddc86a27c92140b9f7984ff41e3d1d07a48f ]
compute_intercept_slope() is called from calibrate_8960() (in tsens-8960.c) as compute_intercept_slope(priv, p1, NULL, ONE_PT_CALIB) which lead to null pointer dereference (if DEBUG or DYNAMIC_DEBUG set).
Fix this bug by adding null pointer check.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/thermal/qcom/tsens.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/qcom/tsens.c +1 -1
@@ -85,7 +85,7 @@ void compute_intercept_slope(struct tsens_priv *priv, u32 *p1,for (i =0 ; i < priv->num_sensors; i++) {dev_dbg (priv->dev,"%s: sensor%d - data_point1:%#x data_point2:%#x\n" , - __func__, i, p1[i], p2[i]); + __func__, i, p1[i], p2 ? p2[i] :0 );if (!priv->sensor[i].slope) priv->sensor[i].slope =SLOPE_DEFAULT ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 132/473 wifi: ath10k: Fix an error code problem in ath10k_dbg_sta_write_peer_debug_trigger()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Su Hui <[email protected]>
[ Upstream commit c511a9c12674d246916bb16c479d496b76983193 ]
Clang Static Checker (scan-build) warns:
drivers/net/wireless/ath/ath10k/debugfs_sta.c:line 429, column 3 Value stored to 'ret' is never read.
Return 'ret' rather than 'count' when 'ret' stores an error code.
--- drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/debugfs_sta.c +1 -1
@@ -438,7 +438,7 @@ ath10k_dbg_sta_write_peer_debug_trigger(struct file *file, } out:mutex_unlock (&ar->conf_mutex); -return count; +return ret ?: count; }static const struct file_operations fops_peer_debug_trigger = {
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 133/473 selftests/bpf: Fix a fd leak in error paths in open_netns
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
[ Upstream commit 151f7442436658ee84076681d8f52e987fe147ea ]
As Martin mentioned in review comment, there is an existing bug that orig_netns_fd will be leaked in the later "goto fail;" case after open("/proc/self/ns/net") in open_netns() in network_helpers.c. This patch adds "close(token->orig_netns_fd);" before "free(token);" to fix it.
--- tools/testing/selftests/bpf/network_helpers.c | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/bpf/network_helpers.c +2 -0
@@ -459,6 +459,8 @@ struct nstoken *open_netns(const char *name)return token; fail: +if (token->orig_netns_fd !=-1 ) +close (token->orig_netns_fd);free (token);return NULL ; }
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 134/473 wifi: ath10k: populate board data for WCN3990
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Baryshkov <[email protected]>
[ Upstream commit f1f1b5b055c9f27a2f90fd0f0521f5920e9b3c18 ]
Specify board data size (and board.bin filename) for the WCN3990 platform.
--- drivers/net/wireless/ath/ath10k/core.c | 3 +++ drivers/net/wireless/ath/ath10k/hw.h | 1 + drivers/net/wireless/ath/ath10k/targaddrs.h | 3 +++ 3 files changed, 7 insertions(+)
drivers/net/wireless/ath/ath10k/core.c +3 -0
@@ -704,6 +704,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .max_spatial_stream = 4, .fw = { .dir = WCN3990_HW_1_0_FW_DIR, + .board = WCN3990_HW_1_0_BOARD_DATA_FILE, + .board_size = WCN3990_BOARD_DATA_SZ, + .board_ext_size = WCN3990_BOARD_EXT_DATA_SZ, }, .sw_decrypt_mcast_mgmt = true, .rx_desc_ops = &wcn3990_rx_desc_ops,
drivers/net/wireless/ath/ath10k/hw.h +1 -0
@@ -132,6 +132,7 @@ enum qca9377_chip_id_rev {/* WCN3990 1.0 definitions */ #define WCN3990_HW_1_0_DEV_VERSION ATH10K_HW_WCN3990#define WCN3990_HW_1_0_FW_DIR ATH10K_FW_DIR "/WCN3990/hw1.0" +#define WCN3990_HW_1_0_BOARD_DATA_FILE "board.bin"#define ATH10K_FW_FILE_BASE "firmware"#define ATH10K_FW_API_MAX 6
drivers/net/wireless/ath/ath10k/targaddrs.h +3 -0
@@ -491,4 +491,7 @@ struct host_interest {#define QCA4019_BOARD_DATA_SZ 12064#define QCA4019_BOARD_EXT_DATA_SZ 0 +#define WCN3990_BOARD_DATA_SZ 26328 +#define WCN3990_BOARD_EXT_DATA_SZ 0 +#endif /* __TARGADDRS_H__ */
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 135/473 net: dsa: mv88e6xxx: Add support for model-specific pre- and post-reset handlers
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthias Schiffer <[email protected]>
[ Upstream commit 0fdd27b9d6d7c60bd319d3497ad797934bab13cb ]
Instead of calling mv88e6xxx_g2_eeprom_wait() directly from mv88e6xxx_hardware_reset(), add configurable pre- and post-reset hard reset handlers. Initially, the handlers are set to mv88e6xxx_g2_eeprom_wait() for all families that have get/set_eeprom() to match the existing behavior. No functional change intended (except for additional error messages on failure).
--- drivers/net/dsa/mv88e6xxx/chip.c | 50 +++++++++++++++++++++++++++++--- drivers/net/dsa/mv88e6xxx/chip.h | 6 ++++ 2 files changed, 52 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +46 -4
@@ -3003,6 +3003,7 @@ static int mv88e6xxx_software_reset(struct mv88e6xxx_chip *chip)static void mv88e6xxx_hardware_reset (struct mv88e6xxx_chip *chip) {struct gpio_desc *gpiod = chip->reset; +int err;/* If there is a GPIO connected to the reset pin, toggle it */ if (gpiod) {
@@ -3011,17 +3012,26 @@ static void mv88e6xxx_hardware_reset(struct mv88e6xxx_chip *chip)* mid-byte, causing the first EEPROM read after the reset * from the wrong location resulting in the switch booting * to wrong mode and inoperable. +* For this reason, switch families with EEPROM support +* generally wait for EEPROM loads to complete as their pre- +* and post-reset handlers. */ -if (chip->info->ops->get_eeprom) -mv88e6xxx_g2_eeprom_wait (chip); +if (chip->info->ops->hardware_reset_pre) { + err = chip->info->ops->hardware_reset_pre (chip); +if (err) +dev_err (chip->dev,"pre-reset error: %d\n" , err); + }gpiod_set_value_cansleep (gpiod,1 );usleep_range (10000 ,20000 );gpiod_set_value_cansleep (gpiod,0 );usleep_range (10000 ,20000 ); -if (chip->info->ops->get_eeprom) -mv88e6xxx_g2_eeprom_wait (chip); +if (chip->info->ops->hardware_reset_post) { + err = chip->info->ops->hardware_reset_post (chip); +if (err) +dev_err (chip->dev,"post-reset error: %d\n" , err); + } } }
@@ -4339,6 +4349,8 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4529,6 +4541,8 @@ static const struct mv88e6xxx_ops mv88e6172_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4630,6 +4644,8 @@ static const struct mv88e6xxx_ops mv88e6176_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4731,6 +4747,8 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4794,6 +4812,8 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4855,6 +4875,8 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4919,6 +4941,8 @@ static const struct mv88e6xxx_ops mv88e6240_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -4977,6 +5001,8 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { .watchdog_ops = &mv88e6250_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6250_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
@@ -5021,6 +5047,8 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5085,6 +5113,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
@@ -5129,6 +5159,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .set_egress_port = mv88e6095_g1_set_egress_port, .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
@@ -5177,6 +5209,8 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5333,6 +5367,8 @@ static const struct mv88e6xxx_ops mv88e6352_ops = { .watchdog_ops = &mv88e6097_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6352_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5400,6 +5436,8 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5467,6 +5505,8 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { .watchdog_ops = &mv88e6390_watchdog_ops, .mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
@@ -5537,6 +5577,8 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { .watchdog_ops = &mv88e6393x_watchdog_ops, .mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, + .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, .rmu_disable = mv88e6390_g1_rmu_disable, .atu_get_hash = mv88e6165_g1_atu_get_hash,
drivers/net/dsa/mv88e6xxx/chip.h +6 -0
@@ -458,6 +458,12 @@ struct mv88e6xxx_ops {int (*ppu_enable)(struct mv88e6xxx_chip *chip);int (*ppu_disable)(struct mv88e6xxx_chip *chip); +/* Additional handlers to run before and after hard reset, to make sure +* that the switch and EEPROM are in a good state. +*/ +int (*hardware_reset_pre)(struct mv88e6xxx_chip *chip); +int (*hardware_reset_post)(struct mv88e6xxx_chip *chip); +/* Switch Software Reset */ int (*reset)(struct mv88e6xxx_chip *chip);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 136/473 net: dsa: mv88e6xxx: Avoid EEPROM timeout without EEPROM on 88E6250-family switches
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matthias Schiffer <[email protected]>
[ Upstream commit e44894e2aa4eb311ceda134de8b6f51ff979211b ]
88E6250-family switches have the quirk that the EEPROM Running flag can get stuck at 1 when no EEPROM is connected, causing mv88e6xxx_g2_eeprom_wait() to time out. We still want to wait for the EEPROM however, to avoid interrupting a transfer and leaving the EEPROM in an invalid state.
The condition to wait for recommended by the hardware spec is the EEInt flag, however this flag is cleared on read, so before the hardware reset, is may have been cleared already even though the EEPROM has been read successfully.
For this reason, we revive the mv88e6xxx_g1_wait_eeprom_done() function that was removed in commit 6ccf50d4d474
("net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent") in a slightly refactored form, and introduce a new mv88e6xxx_g1_wait_eeprom_done_prereset() that additionally handles this case by triggering another EEPROM reload that can be waited on.
On other switch models without this quirk, mv88e6xxx_g2_eeprom_wait() is kept, as it avoids the additional reload.
--- drivers/net/dsa/mv88e6xxx/chip.c | 4 +- drivers/net/dsa/mv88e6xxx/global1.c | 89 +++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/global1.h | 2 + 3 files changed, 93 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +2 -2
@@ -5001,8 +5001,8 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { .watchdog_ops = &mv88e6250_watchdog_ops, .mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu, .pot_clear = mv88e6xxx_g2_pot_clear, - .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, - .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, + .hardware_reset_pre = mv88e6250_g1_wait_eeprom_done_prereset, + .hardware_reset_post = mv88e6xxx_g1_wait_eeprom_done, .reset = mv88e6250_g1_reset, .vtu_getnext = mv88e6185_g1_vtu_getnext, .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
drivers/net/dsa/mv88e6xxx/global1.c +89 -0
95 lines not on this page · raw message
drivers/net/dsa/mv88e6xxx/global1.h +2 -0
@@ -281,6 +281,8 @@ int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr);int mv88e6185_g1_reset (struct mv88e6xxx_chip *chip);int mv88e6352_g1_reset (struct mv88e6xxx_chip *chip);int mv88e6250_g1_reset (struct mv88e6xxx_chip *chip); +int mv88e6xxx_g1_wait_eeprom_done (struct mv88e6xxx_chip *chip); +int mv88e6250_g1_wait_eeprom_done_prereset (struct mv88e6xxx_chip *chip);int mv88e6185_g1_ppu_enable (struct mv88e6xxx_chip *chip);int mv88e6185_g1_ppu_disable (struct mv88e6xxx_chip *chip);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 137/473 tcp: avoid premature drops in tcp_add_backlog()
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit ec00ed472bdb7d0af840da68c8c11bff9f4d9caa ]
While testing TCP performance with latest trees,
I saw suspect SOCKET_BACKLOG drops.
tcp_add_backlog() computes its limit with :
limit = (u32)READ_ONCE(sk->sk_rcvbuf) +
(u32)(READ_ONCE(sk->sk_sndbuf) >> 1);
limit += 64 * 1024;This does not take into account that sk->sk_backlog.len is reset only at the very end of __release_sock().
Both sk->sk_backlog.len and sk->sk_rmem_alloc could reach sk_rcvbuf in normal conditions.
We should double sk->sk_rcvbuf contribution in the formula to absorb bubbles in the backlog, which happen more often for very fast flows.
This change maintains decent protection against abuses.
--- net/ipv4/tcp_ipv4.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/ipv4/tcp_ipv4.c +11 -2
@@ -1771,7 +1771,7 @@ int tcp_v4_early_demux(struct sk_buff *skb)bool tcp_add_backlog (struct sock *sk,struct sk_buff *skb,enum skb_drop_reason *reason) { -u32 limit, tail_gso_size, tail_gso_segs; +u32 tail_gso_size, tail_gso_segs;struct skb_shared_info *shinfo;const struct tcphdr *th;struct tcphdr *thtail;
@@ -1780,6 +1780,7 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,bool fragstolen;u32 gso_segs;u32 gso_size; +u64 limit;int delta;/* In case all data was pulled from skb frags (in __pskb_pull_tail()),
@@ -1877,7 +1878,13 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,__skb_push (skb, hdrlen); no_coalesce: - limit = (u32 )READ_ONCE (sk->sk_rcvbuf) + (u32)(READ_ONCE (sk->sk_sndbuf) >>1 ); +/* sk->sk_backlog.len is reset only at the end of __release_sock(). +* Both sk->sk_backlog.len and sk->sk_rmem_alloc could reach +* sk_rcvbuf in normal conditions. +*/ + limit = ((u64 )READ_ONCE (sk->sk_rcvbuf)) <<1 ; + + limit += ((u32 )READ_ONCE (sk->sk_sndbuf)) >>1 ;/* Only socket owner can try to collapse/prune rx queues * to reduce memory overhead, so add a little headroom here.
@@ -1885,6 +1892,8 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb,*/ limit +=64 *1024 ; + limit =min_t (u64, limit,UINT_MAX ); +if (unlikely (sk_add_backlog (sk, skb, limit))) {bh_unlock_sock (sk); *reason =SKB_DROP_REASON_SOCKET_BACKLOG ;
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 138/473 pwm: sti: Convert to platform remove callback returning void
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit e13cec3617c6ace4fc389b60d2a7d5b305b62683 ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void.
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 5bb0b194aeee ("pwm: sti: Simplify probe function using devm functions")
--- drivers/pwm/pwm-sti.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pwm/pwm-sti.c +2 -4
@@ -677,7 +677,7 @@ static int sti_pwm_probe(struct platform_device *pdev)return 0 ; } -static int sti_pwm_remove (struct platform_device *pdev) +static void sti_pwm_remove (struct platform_device *pdev) {struct sti_pwm_chip *pc =platform_get_drvdata (pdev);
@@ -685,8 +685,6 @@ static int sti_pwm_remove(struct platform_device *pdev)clk_unprepare (pc->pwm_clk);clk_unprepare (pc->cpt_clk); - -return 0 ; }static const struct of_device_id sti_pwm_of_match[] = {
@@ -701,7 +699,7 @@ static struct platform_driver sti_pwm_driver = { .of_match_table = sti_pwm_of_match, }, .probe = sti_pwm_probe, - .remove = sti_pwm_remove, + .remove_new = sti_pwm_remove, };module_platform_driver (sti_pwm_driver);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 139/473 pwm: sti: Prepare removing pwm_chip from driver data
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 54272761ce7c475fa30a31b59b0cb89f7652b39e ]
This prepares the driver for further changes that will drop struct pwm_chip chip from struct sti_pwm_chip. Use the pwm_chip as driver data instead of the sti_pwm_chip to get access to the pwm_chip in sti_pwm_remove() without using pc->chip.
Stable-dep-of: 5bb0b194aeee ("pwm: sti: Simplify probe function using devm functions")
--- drivers/pwm/pwm-sti.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/pwm/pwm-sti.c +10 -7
@@ -571,6 +571,7 @@ static int sti_pwm_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct sti_pwm_compat_data *cdata; +struct pwm_chip *chip;struct sti_pwm_chip *pc;unsigned int i;int irq, ret;
@@ -578,6 +579,7 @@ static int sti_pwm_probe(struct platform_device *pdev) pc =devm_kzalloc (dev,sizeof (*pc),GFP_KERNEL );if (!pc)return -ENOMEM ; + chip = &pc->chip; cdata =devm_kzalloc (dev,sizeof (*cdata),GFP_KERNEL );if (!cdata)
@@ -654,9 +656,9 @@ static int sti_pwm_probe(struct platform_device *pdev)return -ENOMEM ; } - pc->chip.dev = dev; - pc->chip.ops = &sti_pwm_ops; - pc->chip.npwm =max (cdata->pwm_num_devs, cdata->cpt_num_devs); + chip->dev = dev; + chip->ops = &sti_pwm_ops; + chip->npwm =max (cdata->pwm_num_devs, cdata->cpt_num_devs);for (i =0 ; i < cdata->cpt_num_devs; i++) {struct sti_cpt_ddata *ddata = &cdata->ddata[i];
@@ -665,23 +667,24 @@ static int sti_pwm_probe(struct platform_device *pdev)mutex_init (&ddata->lock); } - ret =pwmchip_add (&pc->chip); + ret =pwmchip_add (chip);if (ret <0 ) {clk_unprepare (pc->pwm_clk);clk_unprepare (pc->cpt_clk);return ret; } -platform_set_drvdata (pdev, pc); +platform_set_drvdata (pdev, chip);return 0 ; }static void sti_pwm_remove (struct platform_device *pdev) { -struct sti_pwm_chip *pc =platform_get_drvdata (pdev); +struct pwm_chip *chip =platform_get_drvdata (pdev); +struct sti_pwm_chip *pc =to_sti_pwmchip (chip); -pwmchip_remove (&pc->chip); +pwmchip_remove (chip);clk_unprepare (pc->pwm_clk);clk_unprepare (pc->cpt_clk);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 140/473 pwm: sti: Simplify probe function using devm functions
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 5bb0b194aeee5d5da6881232f4e9989b35957c25 ]
Instead of of_clk_get_by_name() use devm_clk_get_prepared() which has several advantages:
- Combines getting the clock and a call to clk_prepare(). The latter can be dropped from sti_pwm_probe() accordingly.
- Cares for calling clk_put() which is missing in both probe's error path and the remove function.
- Cares for calling clk_unprepare() which can be dropped from the error paths and the remove function. (Note that not all error path got this right.)
With additionally using devm_pwmchip_add() instead of pwmchip_add() the remove callback can be dropped completely. With it the last user of platform_get_drvdata() goes away and so platform_set_drvdata() can be dropped from the probe function, too.
--- drivers/pwm/pwm-sti.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-)
drivers/pwm/pwm-sti.c +3 -36
@@ -625,32 +625,20 @@ static int sti_pwm_probe(struct platform_device *pdev)return ret;if (cdata->pwm_num_devs) { - pc->pwm_clk =of_clk_get_by_name (dev->of_node,"pwm" ); + pc->pwm_clk =devm_clk_get_prepared (dev,"pwm" );if (IS_ERR (pc->pwm_clk)) {dev_err (dev,"failed to get PWM clock\n" );return PTR_ERR (pc->pwm_clk); } - - ret =clk_prepare (pc->pwm_clk); -if (ret) { -dev_err (dev,"failed to prepare clock\n" ); -return ret; - } }if (cdata->cpt_num_devs) { - pc->cpt_clk =of_clk_get_by_name (dev->of_node,"capture" ); + pc->cpt_clk =devm_clk_get_prepared (dev,"capture" );if (IS_ERR (pc->cpt_clk)) {dev_err (dev,"failed to get PWM capture clock\n" );return PTR_ERR (pc->cpt_clk); } - ret =clk_prepare (pc->cpt_clk); -if (ret) { -dev_err (dev,"failed to prepare clock\n" ); -return ret; - } - cdata->ddata =devm_kzalloc (dev, cdata->cpt_num_devs *sizeof (*cdata->ddata),GFP_KERNEL );if (!cdata->ddata)return -ENOMEM ;
@@ -667,27 +655,7 @@ static int sti_pwm_probe(struct platform_device *pdev)mutex_init (&ddata->lock); } - ret =pwmchip_add (chip); -if (ret <0 ) { -clk_unprepare (pc->pwm_clk); -clk_unprepare (pc->cpt_clk); -return ret; - } - -platform_set_drvdata (pdev, chip); - -return 0 ; -} - -static void sti_pwm_remove (struct platform_device *pdev) -{ -struct pwm_chip *chip =platform_get_drvdata (pdev); -struct sti_pwm_chip *pc =to_sti_pwmchip (chip); - -pwmchip_remove (chip); - -clk_unprepare (pc->pwm_clk); -clk_unprepare (pc->cpt_clk); +return devm_pwmchip_add (dev, chip); }static const struct of_device_id sti_pwm_of_match[] = {
@@ -702,7 +670,6 @@ static struct platform_driver sti_pwm_driver = { .of_match_table = sti_pwm_of_match, }, .probe = sti_pwm_probe, - .remove_new = sti_pwm_remove, };module_platform_driver (sti_pwm_driver);
Signature · 1 line
2.43.0
Greg Kroah-Hartman
maintainerPATCH 141/473 drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group
In reply to Greg Kroah-Hartman6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junhao He <[email protected]>
[ Upstream commit 77fce82678ea5fd51442e62febec2004f79e041b ]
The perf tool allows users to create event groups through following cmd [1], but the driver does not check whether the array index is out of bounds when writing data to the event_group array. If the number of events in an event_group is greater than HISI_PCIE_MAX_COUNTERS, the memory write overflow of event_group array occurs.
Add array index check to fix the possible array out of bounds violation, and return directly when write new events are written to array bounds.
There are 9 different events in an event_group.
[1] perf stat -e '{pmu/event1/, ... ,pmu/event9/}'
--- drivers/perf/hisilicon/hisi_pcie_pmu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/perf/hisilicon/hisi_pcie_pmu.c +13 -1
@@ -326,15 +326,27 @@ static bool hisi_pcie_pmu_validate_event_group(struct perf_event *event)return false;for (num =0 ; num < counters; num++) { +/* +* If we find a related event, then it's a valid group +* since we don't need to allocate a new counter for it. +*/ if (hisi_pcie_pmu_cmp_event (event_group[num], sibling))break ; } +/* +* Otherwise it's a new event but if there's no available counter, +* fail the check since we cannot schedule all the events in +* the group simultaneously. +*/ +if (num ==HISI_PCIE_MAX_COUNTERS ) +return false; +if (num == counters) event_group[counters++] = sibling; } -return counters <=HISI_PCIE_MAX_COUNTERS ; +return true; }static int hisi_pcie_pmu_event_init (struct perf_event *event)
Signature · 1 line
2.43.0