5.17.3-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 5.17.3-rc1 review
This is the start of the stable review cycle for the 5.17.3 release. There are 343 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 14 Apr 2022 06:28:59 +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/v5.x/stable-review/patch-5.17.3-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-5.17.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.17.3-rc1
Jens Axboe <[email protected]>
io_uring: drop the old style inflight file tracking
Jens Axboe <[email protected]>
io_uring: defer file assignment
Jens Axboe <[email protected]>
io_uring: propagate issue_flags state down to file assignment
Jens Axboe <[email protected]>
io_uring: move read/write file prep state into actual opcode handler
Christophe Leroy <[email protected]>
static_call: Don't make __static_call_return0 static
Waiman Long <[email protected]>
mm/sparsemem: fix 'mem_section' will never be NULL gcc 12 warning
Andre Przywara <[email protected]>
irqchip/gic, gic-v3: Prevent GSI to SGI translations
Christophe Leroy <[email protected]>
powerpc/64: Fix build failure with allyesconfig in book3s_64_entry.S
Marc Zyngier <[email protected]>
irqchip/gic-v4: Wait for GICR_VPENDBASER.Dirty to clear before descheduling
Nick Desaulniers <[email protected]>
x86/extable: Prefer local labels in .set directives
Peter Zijlstra <[email protected]>
x86,static_call: Fix __static_call_return0 for i386
Sebastian Andrzej Siewior <[email protected]>
sched: Teach the forced-newidle balancer about CPU affinity limitation.
Peter Zijlstra <[email protected]>
sched/core: Fix forceidle balancing
Peter Zijlstra <[email protected]>
objtool: Fix SLS validation for kcov tail-call replacement
Vincent Mailhol <[email protected]>
x86/bug: Prevent shadowing in __WARN_FLAGS
Kefeng Wang <[email protected]>
Revert "powerpc: Set max_mapnr correctly"
Kefeng Wang <[email protected]>
powerpc: Fix virt_addr_valid() for 64-bit Book3E & 32-bit
Andrea Parri (Microsoft) <[email protected]>
Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb()
Paolo Bonzini <[email protected]>
KVM: avoid NULL pointer dereference in kvm_dirty_ring_push
Vinod Koul <[email protected]>
dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error"
Arnaldo Carvalho de Melo <[email protected]>
tools build: Use $(shell ) instead of `` to get embedded libperl's ccopts
Arnaldo Carvalho de Melo <[email protected]>
tools build: Filter out options and warnings not supported by clang
Arnaldo Carvalho de Melo <[email protected]>
perf python: Fix probing for some clang command line options
Arnaldo Carvalho de Melo <[email protected]>
perf build: Don't use -ffat-lto-objects in the python feature test when building with clang-13
Jakub Sitnicki <[email protected]>
bpf: Treat bpf_sk_lookup remote_port as a 2-byte field
Jakub Sitnicki <[email protected]>
selftests/bpf: Fix u8 narrow load checks for bpf_sk_lookup remote_port
Jakub Sitnicki <[email protected]>
bpf: Make remote_port field in struct bpf_sk_lookup 16-bit wide
Jakub Kicinski <[email protected]>
Revert "selftests: net: Add tls config dependency for tls selftests"
Dust Li <[email protected]>
net/smc: send directly on setting TCP_NODELAY
Philip Yang <[email protected]>
drm/amdkfd: Fix variable set but not used warning
Akihiko Odaki <[email protected]>
Revert "ACPI: processor: idle: Only flush cache on entering C3"
Trond Myklebust <[email protected]>
SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()
Alex Deucher <[email protected]>
drm/amdgpu: don't use BACO for reset in S3
Lee Jones <[email protected]>
drm/amdkfd: Create file descriptor after client is added to smi_clients list
Karol Herbst <[email protected]>
drm/nouveau/pmu: Add missing callbacks for Tegra devices
Emily Deng <[email protected]>
drm/amdgpu/vcn: Fix the register setting for vcn1
Alex Deucher <[email protected]>
drm/amdgpu/smu10: fix SoC/fclk units in auto mode
Benjamin Marty <[email protected]>
drm/amdgpu/display: change pipe policy for DCN 2.1
CHANDAN VURDIGERE NATARAJ <[email protected]>
drm/amd/display: Fix by adding FPU protection for dcn30_internal_validate_bw
Daniel Mack <[email protected]>
drm/panel: ili9341: fix optional regulator handling
Shirish S <[email protected]>
amd/display: set backlight only if required
Thomas Zimmermann <[email protected]>
fbdev: Fix unregistering of framebuffers without device
Marc Zyngier <[email protected]>
irqchip/gic-v3: Fix GICR_CTLR.RWP polling
Namhyung Kim <[email protected]>
perf/core: Inherit event_caps
Xiaomeng Tong <[email protected]>
perf: qcom_l2_pmu: fix an incorrect NULL check on list iterator
Christian Lamparter <[email protected]>
ata: sata_dwc_460ex: Fix crash due to OOB write
Kan Liang <[email protected]>
perf/x86/intel: Don't extend the pseudo-encoding to GP counters
Dave Hansen <[email protected]>
x86/mm/tlb: Revert retpoline avoidance approach
Reto Buerki <[email protected]>
x86/msi: Fix msi message data shadow struct
Shreeya Patel <[email protected]>
gpio: Restrict usage of GPIO chip irq members before initialization
Xiaomeng Tong <[email protected]>
drbd: fix an invalid memory access caused by incorrect use of list iterator
Douglas Miller <[email protected]>
RDMA/hfi1: Fix use-after-free bug for mm struct
Guo Ren <[email protected]>
arm64: patch_text: Fixup last cpu should be master
Manish Chopra <[email protected]>
qed: fix ethtool register dump
Paulo Alcantara <[email protected]>
cifs: force new session setup and tcon for dfs
Vinod Koul <[email protected]>
spi: core: add dma_map_dev for __spi_unmap_msg()
Kaiwen Hu <[email protected]>
btrfs: prevent subvol with swapfile from being deleted
Qu Wenruo <[email protected]>
btrfs: avoid defragging extents whose next extents are not targets
Qu Wenruo <[email protected]>
btrfs: remove device item and update super block in the same transaction
Johannes Thumshirn <[email protected]>
btrfs: zoned: traverse devices under chunk_mutex in btrfs_can_activate_zone
Ethan Lien <[email protected]>
btrfs: fix qgroup reserve overflow the qgroup limit
Kan Liang <[email protected]>
perf/x86/intel: Update the FRONTEND MSR mask on Sapphire Rapids
Pawan Gupta <[email protected]>
x86/speculation: Restore speculation related MSRs during S3 resume
Pawan Gupta <[email protected]>
x86/pm: Save the MSR validity status at context setup
Jens Axboe <[email protected]>
io_uring: fix race between timeout flush and removal
Eugene Syromiatnikov <[email protected]>
io_uring: implement compat handling for IORING_REGISTER_IOWQ_AFF
Jens Axboe <[email protected]>
io_uring: defer splice/tee file validity check until command issue
Jens Axboe <[email protected]>
io_uring: don't check req->file in io_fsync_prep()
Miaohe Lin <[email protected]>
mm/mempolicy: fix mpol_new leak in shared_policy_replace
Paolo Bonzini <[email protected]>
mmmremap.c: avoid pointless invalidate_range_start/end on mremap(old_size=0)
Max Filippov <[email protected]>
highmem: fix checks in __kmap_local_sched_{in,out}Guo Xuenan <[email protected]>
lz4: fix LZ4_decompress_safe_partial read out of bound
Michael Wu <[email protected]>
mmc: core: Fixup support for writeback-cache for eMMC and SD
Wolfram Sang <[email protected]>
mmc: renesas_sdhi: don't overwrite TAP settings when HS400 tuning is complete
Wolfram Sang <[email protected]>
mmc: renesas_sdhi: special 4tap settings only apply to HS400
Yann Gautier <[email protected]>
mmc: mmci: stm32: correctly check all elements of sg list
Christian Löhle <[email protected]>
mmc: block: Check for errors after write on SPI
Pali Rohár <[email protected]>
Revert "mmc: sdhci-xenon: fix annoying 1.8V regulator warning"
Adrian Hunter <[email protected]>
scsi: ufs: ufs-pci: Add support for Intel MTL
Damien Le Moal <[email protected]>
scsi: mpt3sas: Fix use after free in _scsih_expander_node_remove()
Chanho Park <[email protected]>
arm64: Add part number for Arm Cortex-A78AE
Denis Nikitin <[email protected]>
perf session: Remap buf if there is no space for event
Adrian Hunter <[email protected]>
perf tools: Fix perf's libperf_print callback
James Clark <[email protected]>
perf: arm-spe: Fix perf report --mem-mode
James Clark <[email protected]>
perf unwind: Don't show unwind error messages when augmenting frame pointer stack
Tony Lindgren <[email protected]>
iommu/omap: Fix regression in probe for NULL pointer dereference
Trond Myklebust <[email protected]>
SUNRPC: svc_tcp_sendmsg() should handle errors from xdr_alloc_bvec()
Trond Myklebust <[email protected]>
SUNRPC: Handle low memory situations in call_status()
Trond Myklebust <[email protected]>
SUNRPC: Handle ENOMEM in call_transmit_status()
Pavel Begunkov <[email protected]>
io_uring: don't touch scm_fp_list after queueing skb
Pavel Begunkov <[email protected]>
io_uring: nospec index for tags on files update
Xiaomeng Tong <[email protected]>
scsi: ufs: ufshpb: Fix a NULL check on list iterator
Martin K. Petersen <[email protected]>
scsi: sd: sd_read_cpr() requires VPD pages
Lv Yunlong <[email protected]>
drbd: Fix five use after free bugs in get_initial_state
Maxim Mikityanskiy <[email protected]>
bpf: Support dual-stack sockets in bpf_tcp_check_syncookie
Roman Li <[email protected]>
drm/amd/display: Remove redundant dsc power gating from init_hw
Meenakshikumar Somasundaram <[email protected]>
drm/amd/display: Fix for dmub outbox notification enable
Kamal Dasu <[email protected]>
spi: bcm-qspi: fix MSPI only access with bcm_qspi_exec_mem_op()
Jamie Bainbridge <[email protected]>
qede: confirm skb is allocated before using
Michael Walle <[email protected]>
net: phy: mscc-miim: reject clause 45 register accesses
Taehee Yoo <[email protected]>
net: sfc: fix using uninitialized xdp tx_queue
Eric Dumazet <[email protected]>
rxrpc: fix a race in rxrpc_exit_net()
Ilya Maximets <[email protected]>
net: openvswitch: fix leak of nested actions
Andrew Lunn <[email protected]>
net: ethernet: mv643xx: Fix over zealous checking of_get_mac_address()
Ilya Maximets <[email protected]>
net: openvswitch: don't send internal clone attribute to the userspace.
Maciej Fijalkowski <[email protected]>
ice: clear cmd_type_offset_bsz for TX rings
Maciej Fijalkowski <[email protected]>
ice: xsk: fix VSI state check in ice_xsk_wakeup()
Maciej Fijalkowski <[email protected]>
ice: synchronize_rcu() when terminating rings
David Ahern <[email protected]>
ipv6: Fix stats accounting in ip6_pkt_drop
Anatolii Gerasymenko <[email protected]>
ice: Do not skip not enabled queues in ice_vc_dis_qs_msg
Anatolii Gerasymenko <[email protected]>
ice: Set txq_teid to ICE_INVAL_TEID on ring creation
Miaoqian Lin <[email protected]>
dpaa2-ptp: Fix refcount leak in dpaa2_ptp_probe
Jamie Bainbridge <[email protected]>
sctp: count singleton chunks in assoc user stats
Niels Dossche <[email protected]>
IB/rdmavt: add lock to call to rvt_error_qp to prevent a race condition
Paulo Alcantara <[email protected]>
cifs: fix potential race with cifsd thread
Mark Zhang <[email protected]>
IB/cm: Cancel mad on the DREQ event when the state is MRA_REP_RCVD
Aharon Landau <[email protected]>
RDMA/mlx5: Add a missing update of cache->last_add
Aharon Landau <[email protected]>
RDMA/mlx5: Don't remove cache MRs when a delay is needed
Martin Habets <[email protected]>
sfc: Do not free an empty page_ring
Ray Jui <[email protected]>
bnxt_en: Prevent XDP redirect from running when stopping TX queue
Andy Gospodarek <[email protected]>
bnxt_en: reserve space inside receive page for skb_shared_info
Pavan Chebbi <[email protected]>
bnxt_en: Synchronize tx when xdp redirects happen on same ring
Phil Auld <[email protected]>
arch/arm64: Fix topology initialization for core scheduling
Axel Lin <[email protected]>
regulator: atc260x: Fix missing active_discharge_on setting
Geert Uytterhoeven <[email protected]>
spi: rpc-if: Fix RPM imbalance in probe error path
Axel Lin <[email protected]>
regulator: rtq2134: Fix missing active_discharge_on setting
Liu Ying <[email protected]>
drm/imx: dw_hdmi-imx: Fix bailout in error cases of probe
José Expósito <[email protected]>
drm/imx: Fix memory leak in imx_pd_connector_get_modes
Jiasheng Jiang <[email protected]>
drm/imx: imx-ldb: Check for null pointer after calling kmemdup
Chen-Yu Tsai <[email protected]>
net: stmmac: Fix unset max_speed difference between DT and non-DT platforms
Nikolay Aleksandrov <[email protected]>
net: ipv4: fix route with nexthop object delete warning
Matt Johnston <[email protected]>
mctp: Use output netdev to allocate skb headroom
Matt Johnston <[email protected]>
mctp: Fix check for dev_hard_header() result
Ivan Vecera <[email protected]>
ice: Fix MAC address setting
Ivan Vecera <[email protected]>
ice: Clear default forwarding VSI during VSI release
Vladimir Oltean <[email protected]>
Revert "net: dsa: stop updating master MTU from master.c"
Jean-Philippe Brucker <[email protected]>
skbuff: fix coalescing for page_pool fragment recycling
Eyal Birger <[email protected]>
vrf: fix packet sniffing for traffic originating from ip tunnels
Ziyang Xuan <[email protected]>
net/tls: fix slab-out-of-bounds bug in decrypt_internal
Taehee Yoo <[email protected]>
net: sfc: add missing xdp queue reinitialization
Jason Wang <[email protected]>
vdpa: mlx5: prevent cvq work from hogging CPU
Christophe JAILLET <[email protected]>
scsi: zorro7xx: Fix a resource leak in zorro7xx_remove_one()
John Garry <[email protected]>
scsi: core: Fix sbitmap depth in scsi_realloc_sdev_budget_map()
Kevin Groeneveld <[email protected]>
scsi: sr: Fix typo in CDROM(CLOSETRAY|EJECT) handling
Tomas Henzl <[email protected]>
scsi: core: scsi_logging: Fix a BUG
ChenXiaoSong <[email protected]>
NFSv4: fix open failure with O_ACCMODE flag
ChenXiaoSong <[email protected]>
Revert "NFSv4: Handle the special Linux file open access mode"
Jeremy Sowden <[email protected]>
netfilter: bitwise: fix reduce comparisons
Guilherme G. Piccoli <[email protected]>
Drivers: hv: vmbus: Fix potential crash on module unload
Andrea Parri (Microsoft) <[email protected]>
Drivers: hv: vmbus: Fix initialization of device object in vmbus_device_register()
Dan Carpenter <[email protected]>
drm/amdgpu: fix off by one in amdgpu_gfx_kiq_acquire()
Mauricio Faria de Oliveira <[email protected]>
mm: fix race between MADV_FREE reclaim and blkdev direct IO read
John David Anglin <[email protected]>
parisc: Fix patch code locking and flushing
Helge Deller <[email protected]>
parisc: Fix CPU affinity for Lasi, WAX and Dino chips
Naresh Kamboju <[email protected]>
selftests: net: Add tls config dependency for tls selftests
Trond Myklebust <[email protected]>
NFS: Avoid writeback threads getting stuck in mempool_alloc()
Trond Myklebust <[email protected]>
NFS: nfsiod should not block forever in mempool_alloc()
Trond Myklebust <[email protected]>
SUNRPC: Fix socket waits for write buffer space
Haimin Zhang <[email protected]>
jfs: prevent NULL deref in diFree
Randy Dunlap <[email protected]>
virtio_console: eliminate anonymous module_init & module_exit
Jiri Slaby <[email protected]>
serial: samsung_tty: do not unlock port->lock for uart_write_wakeup()
Nathan Chancellor <[email protected]>
x86/Kconfig: Do not allow CONFIG_X86_X32_ABI=y with llvm-objcopy
Peter Zijlstra <[email protected]>
x86: Annotate call_on_stack()
NeilBrown <[email protected]>
NFS: swap-out must always use STABLE writes.
NeilBrown <[email protected]>
NFS: swap IO handling is slightly different for O_DIRECT IO
NeilBrown <[email protected]>
SUNRPC: remove scheduling boost for "SWAPPER" tasks.
NeilBrown <[email protected]>
SUNRPC/xprt: async tasks mustn't block waiting for memory
Maxime Ripard <[email protected]>
clk: Enforce that disjoints limits are invalid
Tony Lindgren <[email protected]>
clk: ti: Preserve node in ti_dt_clocks_register()
Dongli Zhang <[email protected]>
xen: delay xen_hvm_init_time_ops() if kdump is boot on vcpu>=32
Oded Gabbay <[email protected]>
habanalabs/gaudi: handle axi errors from NIC engines
Oded Gabbay <[email protected]>
habanalabs: reject host map with mmu disabled
Ohad Sharabi <[email protected]>
habanalabs: fix possible memory leak in MMU DR fini
Trond Myklebust <[email protected]>
NFSv4: Protect the state recovery thread against direct reclaim
Xin Xiong <[email protected]>
NFSv4.2: fix reference count leaks in _nfs42_proc_copy_notify()
Lucas Denefle <[email protected]>
w1: w1_therm: fixes w1_seq for ds28ea00 sensors
Xiaoke Wang <[email protected]>
staging: wfx: fix an error handling in wfx_init_common()
Jérôme Pouiller <[email protected]>
staging: wfx: apply the necessary SDIO quirks for the Silabs WF200
Viresh Kumar <[email protected]>
opp: Expose of-node's name in debugfs
Pierre Gondois <[email protected]>
cpufreq: CPPC: Fix performance/frequency conversion
Sascha Hauer <[email protected]>
clk: rockchip: drop CLK_SET_RATE_PARENT from dclk_vop* on rk3568
Amjad Ouled-Ameur <[email protected]>
phy: amlogic: meson8b-usb2: fix shared reset control use
Amjad Ouled-Ameur <[email protected]>
phy: amlogic: meson8b-usb2: Use dev_err_probe()
Amjad Ouled-Ameur <[email protected]>
phy: amlogic: phy-meson-gxl-usb2: fix shared reset controller use
Stefan Wahren <[email protected]>
staging: vchiq_core: handle NULL result of find_service_by_handle
Stefan Wahren <[email protected]>
staging: vchiq_arm: Avoid NULL ptr deref in vchiq_dump_platform_instances
José Expósito <[email protected]>
clk: mediatek: Fix memory leaks on probe
Adam Wujek <[email protected]>
clk: si5341: fix reported clk_rate when output divider is 2
Qinghua Jin <[email protected]>
minix: fix bug when opening a file with O_DIRECT
Randy Dunlap <[email protected]>
init/main.c: return 1 from handled __setup() functions
Feng Tang <[email protected]>
lib/Kconfig.debug: add ARCH dependency for FUNCTION_ALIGN option
Xiubo Li <[email protected]>
ceph: fix memory leak in ceph_readdir when note_last_dentry returns error
Xiubo Li <[email protected]>
ceph: fix inode reference leakage in ceph_get_snapdir()
Wang Yufen <[email protected]>
netlabel: fix out-of-bounds memory accesses
Florian Westphal <[email protected]>
netfilter: conntrack: revisit gc autotuning
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix use after free in hci_send_acl
Krzysztof Kozlowski <[email protected]>
MIPS: ingenic: correct unit node address
Arnd Bergmann <[email protected]>
iwlwifi: mei: fix building iwlmei
Max Filippov <[email protected]>
xtensa: fix DTC warning unit_address_format
Deren Wu <[email protected]>
mt76: fix monitor mode crash with sdio driver
Juergen Gross <[email protected]>
xen/usb: harden xen_hcd against malicious backends
H. Nikolaus Schaller <[email protected]>
usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on omap5evm
Michael Walle <[email protected]>
net: sfp: add 2500base-X quirk for Lantech SFP module
Jorge Lopez <[email protected]>
platform/x86: hp-wmi: Fix 0x05 error code reported by several WMI calls
Jorge Lopez <[email protected]>
platform/x86: hp-wmi: Fix SW_TABLET_MODE detection method
Gal Pressman <[email protected]>
net/mlx5e: Remove overzealous validations in netlink EEPROM query
Jakub Kicinski <[email protected]>
net: limit altnames to 64k total
Jakub Kicinski <[email protected]>
net: account alternate interface name memory
Michael T. Kloos <[email protected]>
riscv: Fixed misaligned memory access. Fixed pointer comparison.
Vincent Mailhol <[email protected]>
can: etas_es58x: es58x_fd_rx_event_msg(): initialize rx_event_msg before calling es58x_check_msg_len()
Oliver Hartkopp <[email protected]>
can: isotp: set default value for N_As to 50 micro seconds
Hans de Goede <[email protected]>
platform/x86: x86-android-tablets: Depend on EFI and SPI
Jianglei Nie <[email protected]>
scsi: libfc: Fix use after free in fc_exch_abts_resp()
Hangyu Hua <[email protected]>
powerpc/secvar: fix refcount leak in format_show()
Michael Ellerman <[email protected]>
powerpc/64e: Tie PPC_BOOK3E_64 to PPC_FSL_BOOK3E
Michael Ellerman <[email protected]>
powerpc/code-patching: Pre-map patch area
Alexander Lobakin <[email protected]>
MIPS: fix fortify panic when copying asm exception handlers
Li Chen <[email protected]>
PCI: endpoint: Fix misused goto label
Michael Chan <[email protected]>
bnxt_en: Eliminate unintended link toggle during FW reset
Minghao Chi (CGEL ZTE) <[email protected]>
Bluetooth: use memset avoid memory leaks
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix not checking for valid hdev on bt_dev_{info,warn,err,dbg}Sean Wang <[email protected]>
Bluetooth: mediatek: fix the conflict between mtk and msft vendor event
Harold Huang <[email protected]>
tuntap: add sanity checks about msg_controllen in sendmsg
Mark Pearson <[email protected]>
platform/x86: thinkpad_acpi: Add dual fan probe
Sven Eckelmann <[email protected]>
macvtap: advertise link netns via netlink
Mateusz Palczewski <[email protected]>
iavf: stop leaking iavf_status as "errno" values
Hangyu Hua <[email protected]>
mips: ralink: fix a refcount leak in ill_acc_of_setup()
Dust Li <[email protected]>
net/smc: correct settings of RMB window update limit
Xiang Chen <[email protected]>
scsi: hisi_sas: Limit users changing debugfs BIST count value
Qi Liu <[email protected]>
scsi: hisi_sas: Free irq vectors in order for v3 HW
Randy Dunlap <[email protected]>
scsi: aha152x: Fix aha152x_setup() __setup handler return value
Hans de Goede <[email protected]>
power: supply: axp288_fuel_gauge: Use acpi_quirk_skip_acpi_ac_and_battery()
Hans de Goede <[email protected]>
power: supply: axp288_charger: Use acpi_quirk_skip_acpi_ac_and_battery()
Yang Li <[email protected]>
mt76: mt7615: Fix assigning negative values to unsigned variable
Nicholas Piggin <[email protected]>
powerpc/64s/hash: Make hash faults work in NMI context
Matt Johnston <[email protected]>
mctp: make __mctp_dev_get() take a refcount hold
Johan Almbladh <[email protected]>
mt76: mt7915: fix injected MPDU transmission to not use HW A-MSDU
Damien Le Moal <[email protected]>
scsi: pm8001: Fix memory leak in pm8001_chip_fw_flash_update_req()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix tag leaks on error
Damien Le Moal <[email protected]>
scsi: pm8001: Fix task leak in pm8001_send_abort_all()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix tag values handling
Damien Le Moal <[email protected]>
scsi: pm8001: Fix pm8001_mpi_task_abort_resp()
Damien Le Moal <[email protected]>
scsi: pm8001: Fix pm80xx_pci_mem_copy() interface
Alex Williamson <[email protected]>
vfio/pci: Stub vfio_pci_vga_rw when !CONFIG_VFIO_PCI_VGA
Alex Deucher <[email protected]>
drm/amdkfd: make CRAT table missing message informational only
Mike Snitzer <[email protected]>
dm: requeue IO if mapping table not yet available
Jordy Zomer <[email protected]>
dm ioctl: prevent potential spectre v1 gadget
Ping-Ke Shih <[email protected]>
rtw88: change rtw_info() to proper message level
Ido Schimmel <[email protected]>
ipv4: Invalidate neighbour for broadcast address upon address addition
Baochen Qiang <[email protected]>
ath11k: Fix frames flush failure caused by deadlock
Jiri Kosina <[email protected]>
rtw89: fix RCU usage in rtw89_core_txq_push()
Jue Wang <[email protected]>
x86/mce: Work around an erratum on fast string copy instructions
Daniel Thompson <[email protected]>
drm/msm/dsi: Remove spurious IRQF_ONESHOT flag
Eric Dumazet <[email protected]>
ipv6: annotate some data-races around sk->sk_prot
Miri Korenblit <[email protected]>
iwlwifi: mvm: move only to an enabled channel
Luca Coelho <[email protected]>
iwlwifi: fix small doc mistake for iwl_fw_ini_addr_val
Ilan Peer <[email protected]>
iwlwifi: mvm: Correctly set fragmented EBS
Hans de Goede <[email protected]>
usb: dwc3: pci: Set the swnode from inside dwc3_pci_quirks()
José Expósito <[email protected]>
HID: apple: Report Magic Keyboard 2021 with fingerprint reader battery over USB
José Expósito <[email protected]>
HID: apple: Report Magic Keyboard 2021 battery over USB
Maxim Mikityanskiy <[email protected]>
net/mlx5e: Disable TX queues before registering the netdev
Sung Joon Kim <[email protected]>
drm/amd/display: reset lane settings after each PHY repeater LT
Kevin Tang <[email protected]>
drm/sprd: check the platform_get_resource() return value
Kevin Tang <[email protected]>
drm/sprd: fix potential NULL dereference
Hans de Goede <[email protected]>
power: supply: axp288-charger: Set Vhold to 4.4V
Christophe Leroy <[email protected]>
powerpc/set_memory: Avoid spinlock recursion in change_page_attr()
Sreekanth Reddy <[email protected]>
scsi: mpi3mr: Fix memory leaks
Sreekanth Reddy <[email protected]>
scsi: mpi3mr: Fix reporting of actual data transfer size
Sreekanth Reddy <[email protected]>
scsi: mpi3mr: Fix deadlock while canceling the fw event
Manivannan Sadhasivam <[email protected]>
PCI: pciehp: Add Qualcomm quirk for Command Completed erratum
Sebastian Andrzej Siewior <[email protected]>
tcp: Don't acquire inet_listen_hashbucket::lock with disabled BH.
Hou Zhiqiang <[email protected]>
PCI: endpoint: Fix alignment fault error in copy tests
Ilya Leoshkevich <[email protected]>
libbpf: Fix accessing the first syscall argument on s390
Ilya Leoshkevich <[email protected]>
libbpf: Fix accessing the first syscall argument on arm64
Ilya Leoshkevich <[email protected]>
libbpf: Fix accessing syscall arguments on powerpc
Marc Zyngier <[email protected]>
KVM: arm64: Do not change the PMU event filter after a VCPU has run
Neal Liu <[email protected]>
usb: ehci: add pci device support for Aspeed platforms
Zhou Guanghui <[email protected]>
iommu/arm-smmu-v3: fix event handling soft lockup
Ricardo Koller <[email protected]>
kvm: selftests: aarch64: use a tighter assert in vgic_poke_irq()
Ricardo Koller <[email protected]>
kvm: selftests: aarch64: fix some vgic related comments
Ricardo Koller <[email protected]>
kvm: selftests: aarch64: fix the failure check in kvm_set_gsi_routing_irqchip_check
Ricardo Koller <[email protected]>
kvm: selftests: aarch64: pass vgic_irq guest args as a pointer
Ricardo Koller <[email protected]>
kvm: selftests: aarch64: fix assert in gicv3_access_reg
Pali Rohár <[email protected]>
PCI: aardvark: Fix support for MSI interrupts
Mahesh Rajashekhara <[email protected]>
scsi: smartpqi: Fix kdump issue when controller is locked up
Don Brace <[email protected]>
scsi: smartpqi: Fix rmmod stack trace
Rajneesh Bhardwaj <[email protected]>
drm/amdgpu: Fix recursive locking warning
Sourabh Jain <[email protected]>
powerpc: Set crashkernel offset to mid of RMA region
Eric Dumazet <[email protected]>
net: initialize init_net earlier
Eric Dumazet <[email protected]>
ref_tracker: implement use-after-free detection
Eric Dumazet <[email protected]>
ipv6: make mc_forwarding atomic
Yonghong Song <[email protected]>
libbpf: Fix build issue with llvm-readelf
Avraham Stern <[email protected]>
cfg80211: don't add non transmitted BSS to 6GHz scanned channels
Jedrzej Jagielski <[email protected]>
i40e: Add sending commands in atomic context
Lorenzo Bianconi <[email protected]>
mt76: dma: initialize skip_unmap in mt76_dma_rx_fill
Ben Greear <[email protected]>
mt76: mt7921: fix crash when startup fails.
Evgeny Boger <[email protected]>
power: supply: axp20x_battery: properly report current when discharging
Yongzhi Liu <[email protected]>
drm/v3d: fix missing unlock
Yang Guang <[email protected]>
scsi: bfa: Replace snprintf() with sysfs_emit()
Yang Guang <[email protected]>
scsi: mvsas: Replace snprintf() with sysfs_emit()
Jakub Sitnicki <[email protected]>
bpf: Make dst_port field in struct bpf_sock 16-bit wide
Yongzhi Liu <[email protected]>
drm/bridge: Add missing pm_runtime_put_sync
Tony Lu <[email protected]>
net/smc: Send directly when TCP_CORK is cleared
Kalle Valo <[email protected]>
ath11k: mhi: use mhi_sync_power_up()
Kalle Valo <[email protected]>
ath11k: pci: fix crash on suspend if board file is not found
Venkateswara Naralasetty <[email protected]>
ath11k: fix kernel panic during unload/load ath11k modules
Maxim Kiselev <[email protected]>
powerpc: dts: t104xrdb: fix phy type for FMAN 4/5
Sachin Sant <[email protected]>
powerpc/xive: Export XIVE IPI information for online-only processors.
Jack Wang <[email protected]>
RDMA/rtrs-clt: Do stop and failover outside reconnect work.
Amit Cohen <[email protected]>
mlxsw: spectrum: Guard against invalid local ports
Tianci.Yin <[email protected]>
drm/amdgpu: Fix an error message in rmmod
Philip Yang <[email protected]>
drm/amdkfd: svm range restore work deadlock when process exit
Philip Yang <[email protected]>
drm/amdkfd: Ensure mm remain valid in svm deferred_list work
Philip Yang <[email protected]>
drm/amdkfd: Don't take process mutex for svm ioctls
Roi Dayan <[email protected]>
net/mlx5e: TC, Hold sample_attr on stack instead of pointer
Magnus Karlsson <[email protected]>
selftests, xsk: Fix bpf_res cleanup test
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_sync: Fix queuing commands when HCI_UNREGISTER is set
Yang Guang <[email protected]>
ptp: replace snprintf with sysfs_emit
Pawel Laszczak <[email protected]>
usb: cdnsp: fix cdnsp_decode_trb function to properly handle ret value
Wayne Chang <[email protected]>
usb: gadget: tegra-xudc: Fix control endpoint's definitions
Wayne Chang <[email protected]>
usb: gadget: tegra-xudc: Do not program SPARAM
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Use PSR version selected during set_psr_caps
Yongzhi Liu <[email protected]>
drm/amd/display: Fix memory leak
Xin Xiong <[email protected]>
drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj
Soenke Huster <[email protected]>
Bluetooth: hci_event: Ignore multiple conn complete events
Jani Nikula <[email protected]>
drm/edid: improve non-desktop quirk logging
Philipp Zabel <[email protected]>
drm/edid: remove non_desktop quirk for HPN-3515 and LEN-B800.
Eric Huang <[email protected]>
drm/amdkfd: enable heavy-weight TLB flush on Arcturus
Dale Zhao <[email protected]>
drm/amd/display: Add signal type check when verify stream backends same
Soenke Huster <[email protected]>
Bluetooth: fix null ptr deref on hci_sync_conn_complete_evt
Zekun Shen <[email protected]>
ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111
Luiz Augusto von Dentz <[email protected]>
Bluetooth: hci_sync: Fix compilation warning
Anisse Astier <[email protected]>
drm: Add orientation quirk for GPD Win Max
Hou Wenlong <[email protected]>
KVM: x86/emulator: Emulate RDPID only if it is enabled in guest
Like Xu <[email protected]>
KVM: x86/pmu: Fix and isolate TSX-specific performance event logic
Jim Mattson <[email protected]>
KVM: x86/svm: Clear reserved bits written to PerfEvtSeln MSRs
Peter Gonda <[email protected]>
KVM: SVM: Fix kvm_cache_regs.h inclusions for is_guest_mode()
Jim Mattson <[email protected]>
KVM: x86/pmu: Use different raw event masks for AMD and Intel
Muchun Song <[email protected]>
mm: kfence: fix objcgs vector allocation
Zheng Yongjun <[email protected]>
net: dsa: felix: fix possible NULL pointer dereference
Jiasheng Jiang <[email protected]>
rtc: wm8350: Handle error for wm8350_register_irq
Benjamin Beichler <[email protected]>
um: fix and optimize xor select template for CONFIG64 and timetravel mode
Johannes Berg <[email protected]>
lib/logic_iomem: correct fallback config references
-------------
Diffstat:
Documentation/virt/kvm/devices/vcpu.rst | 2 +- Makefile | 4 +- arch/arm64/include/asm/cputype.h | 2 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kernel/patching.c | 4 +- arch/arm64/kernel/proton-pack.c | 1 + arch/arm64/kernel/smp.c | 2 +- arch/arm64/kvm/arm.c | 4 + arch/arm64/kvm/pmu-emul.c | 33 +- arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +- arch/mips/include/asm/setup.h | 2 +- arch/mips/kernel/traps.c | 22 +- arch/mips/ralink/ill_acc.c | 1 + arch/parisc/kernel/patch.c | 25 +- arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 4 +- arch/powerpc/include/asm/interrupt.h | 2 +- arch/powerpc/include/asm/page.h | 6 +- arch/powerpc/kernel/rtas.c | 6 + arch/powerpc/kernel/secvar-sysfs.c | 9 +- arch/powerpc/kexec/core.c | 15 +- arch/powerpc/kvm/book3s_64_entry.S | 10 +- arch/powerpc/lib/code-patching.c | 14 + arch/powerpc/mm/book3s64/hash_utils.c | 54 +- arch/powerpc/mm/mem.c | 2 +- arch/powerpc/mm/pageattr.c | 32 +- arch/powerpc/perf/callchain.h | 9 +- arch/powerpc/perf/callchain_64.c | 27 - arch/powerpc/platforms/Kconfig.cputype | 3 +- arch/powerpc/sysdev/xive/common.c | 2 +- arch/riscv/lib/memmove.S | 368 +++++++++++--- arch/um/include/asm/xor.h | 4 +- arch/x86/Kconfig | 5 + arch/x86/events/intel/core.c | 8 +- arch/x86/include/asm/asm.h | 20 +- arch/x86/include/asm/bug.h | 4 +- arch/x86/include/asm/irq_stack.h | 3 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/msi.h | 19 +- arch/x86/include/asm/perf_event.h | 5 + arch/x86/kernel/cpu/mce/core.c | 64 +++ arch/x86/kernel/cpu/mce/internal.h | 5 +- arch/x86/kernel/static_call.c | 5 +- arch/x86/kvm/emulate.c | 4 +- arch/x86/kvm/kvm_emulate.h | 1 + arch/x86/kvm/pmu.c | 18 +- arch/x86/kvm/svm/pmu.c | 9 +- arch/x86/kvm/svm/svm.h | 2 + arch/x86/kvm/svm/svm_onhyperv.c | 1 - arch/x86/kvm/vmx/pmu_intel.c | 14 +- arch/x86/kvm/x86.c | 6 + arch/x86/mm/tlb.c | 37 +- arch/x86/power/cpu.c | 21 +- arch/x86/xen/smp_hvm.c | 6 + arch/x86/xen/time.c | 24 +- arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 8 +- arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 8 +- arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 4 +- drivers/acpi/processor_idle.c | 3 +- drivers/ata/sata_dwc_460ex.c | 6 +- drivers/block/drbd/drbd_int.h | 8 +- drivers/block/drbd/drbd_main.c | 6 +- drivers/block/drbd/drbd_nl.c | 41 +- drivers/block/drbd/drbd_state.c | 18 +- drivers/block/drbd/drbd_state_change.h | 8 +- drivers/bluetooth/btmtk.h | 1 + drivers/bluetooth/btmtksdio.c | 9 +- drivers/bluetooth/btusb.c | 8 - drivers/char/virtio_console.c | 8 +- drivers/clk/clk-si5341.c | 16 +- drivers/clk/clk.c | 24 + drivers/clk/mediatek/clk-mt8192.c | 36 +- drivers/clk/rockchip/clk-rk3568.c | 6 +- drivers/clk/ti/clk.c | 13 +- drivers/cpufreq/cppc_cpufreq.c | 43 +- drivers/dma/sh/shdma-base.c | 4 +- drivers/gpio/gpiolib.c | 19 + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 14 +- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 1 - drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 24 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 80 +-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 6 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 80 ++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 66 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 15 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 + drivers/gpu/drm/amd/display/dc/dc.h | 3 + drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.c | 25 +- drivers/gpu/drm/amd/display/dc/dce/dmub_outbox.h | 4 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 11 - .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 2 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 11 + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 8 +- drivers/gpu/drm/bridge/nwl-dsi.c | 18 +- drivers/gpu/drm/drm_edid.c | 19 +- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + drivers/gpu/drm/imx/dw_hdmi-imx.c | 8 +- drivers/gpu/drm/imx/imx-ldb.c | 2 + drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 1 + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +- drivers/gpu/drm/sprd/sprd_dpu.c | 5 + drivers/gpu/drm/sprd/sprd_drm.c | 2 +- drivers/gpu/drm/sprd/sprd_dsi.c | 5 + drivers/gpu/drm/v3d/v3d_gem.c | 6 +- drivers/hid/hid-apple.c | 6 +- drivers/hv/channel_mgmt.c | 6 +- drivers/hv/vmbus_drv.c | 16 +- drivers/infiniband/core/cm.c | 3 +- drivers/infiniband/hw/hfi1/mmu_rb.c | 6 + drivers/infiniband/hw/mlx5/mr.c | 5 +- drivers/infiniband/sw/rdmavt/qp.c | 6 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 40 +- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + drivers/iommu/omap-iommu.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 28 +- drivers/irqchip/irq-gic-v3.c | 14 +- drivers/irqchip/irq-gic.c | 6 + drivers/md/dm-ioctl.c | 2 + drivers/md/dm-rq.c | 7 +- drivers/md/dm.c | 11 +- drivers/misc/habanalabs/common/memory.c | 30 +- drivers/misc/habanalabs/common/mmu/mmu_v1.c | 2 +- drivers/misc/habanalabs/gaudi/gaudi.c | 48 ++ drivers/mmc/core/block.c | 46 +- drivers/mmc/core/quirks.h | 5 + drivers/mmc/host/mmci_stm32_sdmmc.c | 6 +- drivers/mmc/host/renesas_sdhi_core.c | 8 +- drivers/mmc/host/sdhci-xenon.c | 10 - drivers/net/can/usb/etas_es58x/es58x_fd.c | 3 +- drivers/net/dsa/ocelot/felix_vsc9959.c | 4 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 7 + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 5 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 14 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 4 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 21 +- drivers/net/ethernet/intel/iavf/iavf.h | 5 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 173 +++++-- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 18 +- drivers/net/ethernet/intel/ice/ice.h | 2 +- drivers/net/ethernet/intel/ice/ice_lib.c | 3 + drivers/net/ethernet/intel/ice/ice_main.c | 13 +- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 4 +- drivers/net/ethernet/intel/ice/ice_xsk.c | 6 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- .../ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 7 +- .../net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 2 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/port.c | 23 - drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 7 + drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +- drivers/net/ethernet/qlogic/qede/qede_fp.c | 3 + drivers/net/ethernet/sfc/efx_channels.c | 148 +++--- drivers/net/ethernet/sfc/rx_common.c | 3 + drivers/net/ethernet/sfc/tx.c | 3 + drivers/net/ethernet/sfc/tx_common.c | 2 + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +- drivers/net/macvtap.c | 6 + drivers/net/mdio/mdio-mscc-miim.c | 6 + drivers/net/phy/sfp-bus.c | 6 + drivers/net/tap.c | 3 +- drivers/net/tun.c | 3 +- drivers/net/vrf.c | 15 +- drivers/net/wireless/ath/ath11k/ahb.c | 2 + drivers/net/wireless/ath/ath11k/mac.c | 2 +- drivers/net/wireless/ath/ath11k/mhi.c | 2 +- drivers/net/wireless/ath/ath11k/pci.c | 10 + drivers/net/wireless/ath/ath5k/eeprom.c | 3 + drivers/net/wireless/intel/iwlwifi/Kconfig | 1 + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 31 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 5 +- drivers/net/wireless/mediatek/mt76/dma.c | 1 + drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 1 + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 1 + drivers/net/wireless/realtek/rtw88/debug.c | 2 +- drivers/net/wireless/realtek/rtw88/debug.h | 1 + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- drivers/net/wireless/realtek/rtw88/mac80211.c | 8 +- drivers/net/wireless/realtek/rtw88/main.c | 8 +- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 4 +- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 4 +- drivers/net/wireless/realtek/rtw88/sar.c | 8 +- drivers/net/wireless/realtek/rtw89/core.c | 5 +- drivers/opp/debugfs.c | 5 + drivers/opp/opp.h | 1 + drivers/parisc/dino.c | 41 +- drivers/parisc/gsc.c | 31 ++ drivers/parisc/gsc.h | 1 + drivers/parisc/lasi.c | 7 +- drivers/parisc/wax.c | 7 +- drivers/pci/controller/pci-aardvark.c | 16 +- drivers/pci/endpoint/functions/pci-epf-test.c | 14 +- drivers/pci/hotplug/pciehp_hpc.c | 2 + drivers/perf/qcom_l2_pmu.c | 6 +- drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +- drivers/phy/amlogic/phy-meson8b-usb2.c | 9 +- drivers/platform/x86/Kconfig | 2 +- drivers/platform/x86/hp-wmi.c | 93 ++-- drivers/platform/x86/thinkpad_acpi.c | 15 +- drivers/power/supply/Kconfig | 4 +- drivers/power/supply/axp20x_battery.c | 13 +- drivers/power/supply/axp288_charger.c | 21 +- drivers/power/supply/axp288_fuel_gauge.c | 14 +- drivers/ptp/ptp_sysfs.c | 4 +- drivers/regulator/atc260x-regulator.c | 1 + drivers/regulator/rtq2134-regulator.c | 1 + drivers/rtc/rtc-wm8350.c | 11 +- drivers/scsi/aha152x.c | 6 +- drivers/scsi/bfa/bfad_attr.c | 26 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 68 ++- drivers/scsi/libfc/fc_exch.c | 1 + drivers/scsi/mpi3mr/mpi3mr.h | 4 + drivers/scsi/mpi3mr/mpi3mr_fw.c | 4 +- drivers/scsi/mpi3mr/mpi3mr_os.c | 108 +++- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 5 +- drivers/scsi/mvsas/mv_init.c | 4 +- drivers/scsi/pm8001/pm8001_hwi.c | 79 ++- drivers/scsi/pm8001/pm8001_init.c | 3 +- drivers/scsi/pm8001/pm8001_sas.c | 15 +- drivers/scsi/pm8001/pm8001_sas.h | 2 + drivers/scsi/pm8001/pm80xx_hwi.c | 22 +- drivers/scsi/scsi_logging.c | 2 +- drivers/scsi/scsi_scan.c | 5 + drivers/scsi/sd.c | 2 +- drivers/scsi/smartpqi/smartpqi_init.c | 45 +- drivers/scsi/sr.c | 2 +- drivers/scsi/ufs/ufshcd-pci.c | 17 + drivers/scsi/ufs/ufshpb.c | 11 +- drivers/scsi/zorro7xx.c | 2 + drivers/spi/spi-bcm-qspi.c | 4 +- drivers/spi/spi-rpc-if.c | 8 +- drivers/spi/spi.c | 4 + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 6 + drivers/staging/wfx/bus_sdio.c | 3 - drivers/staging/wfx/main.c | 7 +- drivers/tty/serial/samsung_tty.c | 5 +- drivers/usb/cdns3/cdnsp-debug.h | 305 ++++++------ drivers/usb/dwc3/dwc3-omap.c | 2 +- drivers/usb/dwc3/dwc3-pci.c | 11 +- drivers/usb/gadget/udc/tegra-xudc.c | 20 +- drivers/usb/host/ehci-pci.c | 9 + drivers/usb/host/xen-hcd.c | 57 ++- drivers/vdpa/mlx5/net/mlx5_vnet.c | 21 +- drivers/vfio/pci/vfio_pci_rdwr.c | 2 + drivers/vhost/net.c | 1 + drivers/video/fbdev/core/fbmem.c | 9 +- drivers/w1/slaves/w1_therm.c | 8 +- fs/btrfs/extent_io.h | 2 +- fs/btrfs/inode.c | 22 + fs/btrfs/ioctl.c | 20 +- fs/btrfs/volumes.c | 65 ++- fs/btrfs/zoned.c | 9 +- fs/ceph/dir.c | 11 +- fs/ceph/inode.c | 10 +- fs/cifs/connect.c | 15 +- fs/cifs/netmisc.c | 2 +- fs/file_table.c | 1 + fs/io-wq.h | 1 + fs/io_uring.c | 388 +++++++-------- fs/jfs/inode.c | 3 +- fs/minix/inode.c | 3 +- fs/nfs/dir.c | 10 - fs/nfs/direct.c | 48 +- fs/nfs/file.c | 4 +- fs/nfs/inode.c | 1 - fs/nfs/internal.h | 17 + fs/nfs/nfs42proc.c | 9 +- fs/nfs/nfs4file.c | 6 +- fs/nfs/nfs4state.c | 12 + fs/nfs/pagelist.c | 10 +- fs/nfs/pnfs_nfs.c | 8 +- fs/nfs/write.c | 34 +- include/linux/gpio/driver.h | 9 + include/linux/ipv6.h | 2 +- include/linux/mmzone.h | 11 +- include/linux/nfs_fs.h | 10 +- include/linux/ref_tracker.h | 2 + include/linux/static_call.h | 5 +- include/linux/vfio_pci_core.h | 9 + include/net/arp.h | 1 + include/net/bluetooth/bluetooth.h | 14 +- include/net/bluetooth/hci_core.h | 3 + include/net/mctp.h | 2 - include/net/net_namespace.h | 6 + include/trace/events/sunrpc.h | 1 - include/uapi/linux/bpf.h | 6 +- include/uapi/linux/can/isotp.h | 28 +- init/main.c | 8 +- kernel/Makefile | 3 +- kernel/events/core.c | 3 + kernel/sched/core.c | 16 +- kernel/sched/idle.c | 1 - kernel/sched/sched.h | 6 - kernel/static_call.c | 542 +------------------- kernel/static_call_inline.c | 543 +++++++++++++++++++++ lib/Kconfig.debug | 3 +- lib/logic_iomem.c | 8 +- lib/lz4/lz4_decompress.c | 8 +- lib/ref_tracker.c | 5 + mm/highmem.c | 4 +- mm/kfence/core.c | 11 +- mm/kfence/kfence.h | 3 + mm/mempolicy.c | 1 + mm/mremap.c | 3 + mm/rmap.c | 25 +- net/batman-adv/multicast.c | 2 +- net/bluetooth/hci_conn.c | 1 + net/bluetooth/hci_event.c | 79 ++- net/bluetooth/hci_sync.c | 7 +- net/bluetooth/l2cap_core.c | 1 + net/bpf/test_run.c | 4 +- net/can/isotp.c | 12 +- net/core/dev.c | 3 +- net/core/filter.c | 46 +- net/core/net_namespace.c | 17 +- net/core/rtnetlink.c | 13 +- net/core/skbuff.c | 15 +- net/dsa/master.c | 25 +- net/ipv4/arp.c | 9 +- net/ipv4/fib_frontend.c | 5 +- net/ipv4/fib_semantics.c | 7 +- net/ipv4/inet_hashtables.c | 53 +- net/ipv6/addrconf.c | 4 +- net/ipv6/af_inet6.c | 24 +- net/ipv6/inet6_hashtables.c | 5 +- net/ipv6/ip6_input.c | 2 +- net/ipv6/ip6mr.c | 8 +- net/ipv6/ipv6_sockglue.c | 6 +- net/ipv6/route.c | 2 +- net/mctp/af_mctp.c | 46 +- net/mctp/device.c | 21 +- net/mctp/route.c | 21 +- net/mctp/test/utils.c | 1 - net/netfilter/nf_conntrack_core.c | 85 +++- net/netfilter/nft_bitwise.c | 4 +- net/netlabel/netlabel_kapi.c | 2 + net/openvswitch/actions.c | 2 +- net/openvswitch/flow_netlink.c | 99 +++- net/rxrpc/net_ns.c | 2 +- net/sctp/outqueue.c | 6 +- net/smc/af_smc.c | 8 +- net/smc/smc_core.c | 2 +- net/smc/smc_tx.c | 25 +- net/smc/smc_tx.h | 1 + net/sunrpc/clnt.c | 7 + net/sunrpc/sched.c | 7 - net/sunrpc/svcsock.c | 4 +- net/sunrpc/xprt.c | 23 +- net/sunrpc/xprtrdma/transport.c | 2 +- net/sunrpc/xprtsock.c | 70 ++- net/tls/tls_sw.c | 2 +- net/wireless/scan.c | 9 +- tools/build/feature/Makefile | 9 +- tools/lib/bpf/Makefile | 4 +- tools/lib/bpf/bpf_tracing.h | 14 + tools/objtool/check.c | 11 + tools/perf/Makefile.config | 6 + tools/perf/arch/arm64/util/arm-spe.c | 6 + tools/perf/perf.c | 2 +- tools/perf/tests/dwarf-unwind.c | 2 +- .../perf/util/arm64-frame-pointer-unwind-support.c | 2 +- tools/perf/util/machine.c | 2 +- tools/perf/util/session.c | 15 +- tools/perf/util/setup.py | 8 +- tools/perf/util/unwind-libdw.c | 10 +- tools/perf/util/unwind-libdw.h | 1 + tools/perf/util/unwind-libunwind-local.c | 10 +- tools/perf/util/unwind-libunwind.c | 6 +- tools/perf/util/unwind.h | 13 +- tools/testing/selftests/bpf/progs/test_sk_lookup.c | 3 +- tools/testing/selftests/bpf/xdpxceiver.c | 80 +-- tools/testing/selftests/bpf/xdpxceiver.h | 2 +- tools/testing/selftests/kvm/aarch64/vgic_irq.c | 45 +- tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 12 +- tools/testing/selftests/kvm/lib/aarch64/vgic.c | 9 +- virt/kvm/kvm_main.c | 2 +- 404 files changed, 4510 insertions(+), 2534 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/343 lib/logic_iomem: correct fallback config references
From: Johannes Berg <[email protected]>
[ Upstream commit 2a6852cb8ff0c8c1363cac648d68489343813212 ]
Due to some renaming, we ended up with the "indirect iomem" naming in Kconfig, following INDIRECT_PIO. However, clearly I missed following through on that in the ifdefs, but so far INDIRECT_IOMEM_FALLBACK isn't used by any architecture.
--- lib/logic_iomem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
lib/logic_iomem.c +4 -4
@@ -68,7 +68,7 @@ int logic_iomem_add_region(struct resource *resource, }EXPORT_SYMBOL (logic_iomem_add_region); -#ifndef CONFIG_LOGIC_IOMEM_FALLBACK +#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK static void __iomem *real_ioremap (phys_addr_t offset,size_t size) { WARN(1, "invalid ioremap(0x%llx, 0x%zx)\n",
@@ -81,7 +81,7 @@ static void real_iounmap(volatile void __iomem *addr)WARN (1 ,"invalid iounmap for addr 0x%llx\n" , (unsigned long long)(uintptr_t __force)addr); } -#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */ +#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */ void __iomem *ioremap (phys_addr_t offset,size_t size) {
@@ -168,7 +168,7 @@ void iounmap(volatile void __iomem *addr) }EXPORT_SYMBOL (iounmap); -#ifndef CONFIG_LOGIC_IOMEM_FALLBACK +#ifndef CONFIG_INDIRECT_IOMEM_FALLBACK #define MAKE_FALLBACK (op, sz) \ static u##sz real_raw_read ## op(const volatile void __iomem *addr) \ { \
@@ -213,7 +213,7 @@ static void real_memcpy_toio(volatile void __iomem *addr, const void *buffer,WARN (1 ,"Invalid memcpy_toio at address 0x%llx\n" , (unsigned long long)(uintptr_t __force)addr); } -#endif /* CONFIG_LOGIC_IOMEM_FALLBACK */ +#endif /* CONFIG_INDIRECT_IOMEM_FALLBACK */ #define MAKE_OP (op, sz) \ u##sz __raw_read ## op(const volatile void __iomem *addr) \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 2/343 um: fix and optimize xor select template for CONFIG64 and timetravel mode
In reply to Greg Kroah-HartmanFrom: Benjamin Beichler <[email protected]>
[ Upstream commit e3a33af812c611d99756e2ec61e9d7068d466bdf ]
Due to dropped inclusion of asm-generic/xor.h, xor_block_8regs symbol is missing with CONFIG64 and break compilation, as the asm/xor_64.h also did not include it. The patch recreate the logic from arch/x86, which check whether AVX is available and add fallbacks for 32bit and 64bit config of um.
A very minor additional "fix" is, the return of the macro parameter instead of NULL, as this is the original intent of the macro, but this does not change the actual behavior.
--- arch/um/include/asm/xor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/um/include/asm/xor.h +3 -1
@@ -4,8 +4,10 @@#ifdef CONFIG_64BIT #undef CONFIG_X86_32 +#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_sse_pf64))#else #define CONFIG_X86_32 1 +#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_8regs))#endif #include <asm/cpufeature.h>
@@ -16,7 +18,7 @@#undef XOR_SELECT_TEMPLATE/* pick an arbitrary one - measuring isn't possible with inf-cpu */ #define XOR_SELECT_TEMPLATE (x) \ - (time_travel_mode == TT_MODE_INFCPU ? &xor_block_8regs : NULL) + (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x))#endif #endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 3/343 rtc: wm8350: Handle error for wm8350_register_irq
In reply to Greg Kroah-HartmanFrom: Jiasheng Jiang <[email protected]>
[ Upstream commit 43f0269b6b89c1eec4ef83c48035608f4dcdd886 ]
As the potential failure of the wm8350_register_irq(), it should be better to check it and return error if fails. Also, it need not free 'wm_rtc->rtc' since it will be freed automatically.
--- drivers/rtc/rtc-wm8350.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/rtc/rtc-wm8350.c +9 -2
@@ -432,14 +432,21 @@ static int wm8350_rtc_probe(struct platform_device *pdev)return ret; } -wm8350_register_irq (wm8350,WM8350_IRQ_RTC_SEC , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_RTC_SEC , wm8350_rtc_update_handler,0 ,"RTC Seconds" , wm8350); +if (ret) +return ret; +wm8350_mask_irq (wm8350,WM8350_IRQ_RTC_SEC ); -wm8350_register_irq (wm8350,WM8350_IRQ_RTC_ALM , + ret =wm8350_register_irq (wm8350,WM8350_IRQ_RTC_ALM , wm8350_rtc_alarm_handler,0 ,"RTC Alarm" , wm8350); +if (ret) { +wm8350_free_irq (wm8350,WM8350_IRQ_RTC_SEC , wm8350); +return ret; + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 4/343 net: dsa: felix: fix possible NULL pointer dereference
In reply to Greg Kroah-HartmanFrom: Zheng Yongjun <[email protected]>
[ Upstream commit 866b7a278cdb51eb158cd8513bc7438fc857804a ]
As the possible failure of the allocation, kzalloc() may return NULL pointer.
Therefore, it should be better to check the 'sgi' in order to prevent the dereference of NULL pointer.
--- drivers/net/dsa/ocelot/felix_vsc9959.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/dsa/ocelot/felix_vsc9959.c +4 -0
@@ -1940,6 +1940,10 @@ static int vsc9959_psfp_filter_add(struct ocelot *ocelot, int port,case FLOW_ACTION_GATE : size =struct_size (sgi, entries, a->gate.num_entries); sgi =kzalloc (size,GFP_KERNEL ); +if (!sgi) { + ret = -ENOMEM ; + goto err; + }vsc9959_psfp_parse_gate (a, sgi); ret =vsc9959_psfp_sgi_table_add (ocelot, sgi);if (ret) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 5/343 mm: kfence: fix objcgs vector allocation
In reply to Greg Kroah-HartmanFrom: Muchun Song <[email protected]>
[ Upstream commit 8f0b36497303487d5a32c75789c77859cc2ee895 ]
If the kfence object is allocated to be used for objects vector, then this slot of the pool eventually being occupied permanently since the vector is never freed. The solutions could be (1) freeing vector when the kfence object is freed or (2) allocating all vectors statically.
Since the memory consumption of object vectors is low, it is better to chose (2) to fix the issue and it is also can reduce overhead of vectors allocating in the future.
--- mm/kfence/core.c | 11 ++++++++++- mm/kfence/kfence.h | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-)
mm/kfence/core.c +10 -1
@@ -555,6 +555,8 @@ static bool __init kfence_init_pool(void)* enters __slab_free() slow-path. */ for (i =0 ; i <KFENCE_POOL_SIZE /PAGE_SIZE ; i++) { +struct slab *slab =page_slab (&pages[i]); +if (!i || (i %2 ))continue ;
@@ -562,7 +564,11 @@ static bool __init kfence_init_pool(void)if (WARN_ON (compound_head (&pages[i]) != &pages[i])) goto err; -__SetPageSlab (&pages[i]); +__folio_set_slab (slab_folio (slab)); +#ifdef CONFIG_MEMCG + slab->memcg_data = (unsigned long )&kfence_metadata[i /2 -1 ].objcg | +MEMCG_DATA_OBJCGS ; +#endif }/*
@@ -938,6 +944,9 @@ void __kfence_free(void *addr) {struct kfence_metadata *meta =addr_to_metadata ((unsigned long )addr); +#ifdef CONFIG_MEMCG +KFENCE_WARN_ON (meta->objcg); +#endif /* * If the objects of the cache are SLAB_TYPESAFE_BY_RCU, defer freeing * the object, as the object page may be recycled for other-typed
mm/kfence/kfence.h +3 -0
@@ -89,6 +89,9 @@ struct kfence_metadata {struct kfence_track free_track;/* For updating alloc_covered on frees. */ u32 alloc_stack_hash; +#ifdef CONFIG_MEMCG +struct obj_cgroup *objcg; +#endif };extern struct kfence_metadata kfence_metadata[CONFIG_KFENCE_NUM_OBJECTS ];
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 6/343 KVM: x86/pmu: Use different raw event masks for AMD and Intel
In reply to Greg Kroah-HartmanFrom: Jim Mattson <[email protected]>
[ Upstream commit 95b065bf5c431c06c68056a03a5853b660640ecc ]
The third nybble of AMD's event select overlaps with Intel's IN_TX and IN_TXCP bits. Therefore, we can't use AMD64_RAW_EVENT_MASK on Intel platforms that support TSX.
Declare a raw_event_mask in the kvm_pmu structure, initialize it in the vendor-specific pmu_refresh() functions, and use that mask for PERF_TYPE_RAW configurations in reprogram_gp_counter().
Message-Id: <[email protected]>
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/pmu.c | 3 ++- arch/x86/kvm/svm/pmu.c | 1 + arch/x86/kvm/vmx/pmu_intel.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -509,6 +509,7 @@ struct kvm_pmu {u64 global_ctrl_mask;u64 global_ovf_ctrl_mask;u64 reserved_bits; +u64 raw_event_mask;u8 version;struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC ];struct kvm_pmc fixed_counters[INTEL_PMC_MAX_FIXED ];
arch/x86/kvm/pmu.c +2 -1
@@ -185,6 +185,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel)u32 type =PERF_TYPE_RAW ;struct kvm *kvm = pmc->vcpu->kvm;struct kvm_pmu_event_filter *filter; +struct kvm_pmu *pmu =vcpu_to_pmu (pmc->vcpu);bool allow_event = true;if (eventsel &ARCH_PERFMON_EVENTSEL_PIN_CONTROL )
@@ -221,7 +222,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) }if (type ==PERF_TYPE_RAW ) - config = eventsel &AMD64_RAW_EVENT_MASK ; + config = eventsel & pmu->raw_event_mask;if (pmc->current_config == eventsel &&pmc_resume_counter (pmc))return ;
arch/x86/kvm/svm/pmu.c +1 -0
@@ -284,6 +284,7 @@ static void amd_pmu_refresh(struct kvm_vcpu *vcpu) pmu->counter_bitmask[KVM_PMC_GP ] = ((u64 )1 <<48 ) -1 ; pmu->reserved_bits =0xfffffff000280000ull ; + pmu->raw_event_mask =AMD64_RAW_EVENT_MASK ; pmu->version =1 ;/* not applicable to AMD; but clean them to prevent any fall out */ pmu->counter_bitmask[KVM_PMC_FIXED ] =0 ;
arch/x86/kvm/vmx/pmu_intel.c +1 -0
@@ -485,6 +485,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->counter_bitmask[KVM_PMC_FIXED ] =0 ; pmu->version =0 ; pmu->reserved_bits =0xffffffff00200000ull ; + pmu->raw_event_mask =X86_RAW_EVENT_MASK ; entry =kvm_find_cpuid_entry (vcpu,0xa ,0 );if (!entry || !enable_pmu)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 7/343 KVM: SVM: Fix kvm_cache_regs.h inclusions for is_guest_mode()
In reply to Greg Kroah-HartmanFrom: Peter Gonda <[email protected]>
[ Upstream commit 4a9e7b9ea252842bc8b14d495706ac6317fafd5d ]
Include kvm_cache_regs.h to pick up the definition of is_guest_mode(), which is referenced by nested_svm_virtualize_tpr() in svm.h. Remove include from svm_onhpyerv.c which was done only because of lack of include in svm.h.
Message-Id: <[email protected]>
--- arch/x86/kvm/svm/svm.h | 2 ++ arch/x86/kvm/svm/svm_onhyperv.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/svm.h +2 -0
@@ -22,6 +22,8 @@#include <asm/svm.h> #include <asm/sev-common.h> +#include "kvm_cache_regs.h" +#define __sme_page_pa (x) __sme_set(page_to_pfn(x) << PAGE_SHIFT)#define IOPM_SIZE PAGE_SIZE * 3
arch/x86/kvm/svm/svm_onhyperv.c +0 -1
@@ -4,7 +4,6 @@*/ #include <linux/kvm_host.h> -#include "kvm_cache_regs.h" #include <asm/mshyperv.h>
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 8/343 KVM: x86/svm: Clear reserved bits written to PerfEvtSeln MSRs
In reply to Greg Kroah-HartmanFrom: Jim Mattson <[email protected]>
[ Upstream commit 9b026073db2f1ad0e4d8b61c83316c8497981037 ]
AMD EPYC CPUs never raise a #GP for a WRMSR to a PerfEvtSeln MSR. Some reserved bits are cleared, and some are not. Specifically, on Zen3/Milan, bits 19 and 42 are not cleared.
When emulating such a WRMSR, KVM should not synthesize a #GP, regardless of which bits are set. However, undocumented bits should not be passed through to the hardware MSR. So, rather than checking for reserved bits and synthesizing a #GP, just clear the reserved bits.
This may seem pedantic, but since KVM currently does not support the "Host/Guest Only" bits (41:40), it is necessary to clear these bits rather than synthesizing #GP, because some popular guests (e.g Linux) will set the "Host Only" bit even on CPUs that don't support EFER.SVME, and they don't expect a #GP.
For example,
root@Ubuntu1804:~# perf stat -e r26 -a sleep 1
Performance counter stats for 'system wide':
0 r26
1.001070977 seconds time elapsedFeb 23 03:59:58 Ubuntu1804 kernel: [ 405.379957] unchecked MSR access error: WRMSR to 0xc0010200 (tried to write 0x0000020000130026) at rIP: 0xffffffff9b276a28 (native_write_msr+0x8/0x30) Feb 23 03:59:58 Ubuntu1804 kernel: [ 405.379958] Call Trace: Feb 23 03:59:58 Ubuntu1804 kernel: [ 405.379963] amd_pmu_disable_event+0x27/0x90
Message-Id: <[email protected]>
--- arch/x86/kvm/svm/pmu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
arch/x86/kvm/svm/pmu.c +3 -5
@@ -262,12 +262,10 @@ static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)/* MSR_EVNTSELn */ pmc =get_gp_pmc_amd (pmu, msr,PMU_TYPE_EVNTSEL );if (pmc) { -if (data == pmc->eventsel) -return 0 ; -if (!(data & pmu->reserved_bits)) { + data &= ~pmu->reserved_bits; +if (data != pmc->eventsel)reprogram_gp_counter (pmc, data); -return 0 ; - } +return 0 ; }return 1 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 9/343 KVM: x86/pmu: Fix and isolate TSX-specific performance event logic
In reply to Greg Kroah-HartmanFrom: Like Xu <[email protected]>
[ Upstream commit e644896f5106aa3f6d7e8c7adf2e4dc0fce53555 ]
HSW_IN_TX* bits are used in generic code which are not supported on AMD. Worse, these bits overlap with AMD EventSelect[11:8] and hence using HSW_IN_TX* bits unconditionally in generic code is resulting in unintentional pmu behavior on AMD. For example, if EventSelect[11:8] is 0x2, pmc_reprogram_counter() wrongly assumes that HSW_IN_TX_CHECKPOINTED is set and thus forces sampling period to be 0.
Also per the SDM, both bits 32 and 33 "may only be set if the processor supports HLE or RTM" and for "IN_TXCP (bit 33): this bit may only be set for IA32_PERFEVTSEL2."
Opportunistically eliminate code redundancy, because if the HSW_IN_TX* bit is set in pmc->eventsel, it is already set in attr.config.
Message-Id: <[email protected]>
--- arch/x86/kvm/pmu.c | 15 +++++---------- arch/x86/kvm/vmx/pmu_intel.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 13 deletions(-)
arch/x86/kvm/pmu.c +5 -10
@@ -96,8 +96,7 @@ static void kvm_perf_overflow(struct perf_event *perf_event,static void pmc_reprogram_counter (struct kvm_pmc *pmc,u32 type,u64 config,bool exclude_user, -bool exclude_kernel,bool intr, -bool in_tx,bool in_tx_cp) +bool exclude_kernel,bool intr) {struct perf_event *event;struct perf_event_attr attr = {
@@ -116,16 +115,14 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type, attr.sample_period =get_sample_period (pmc, pmc->counter); -if (in_tx) - attr.config |=HSW_IN_TX ; -if (in_tx_cp) { +if ((attr.config &HSW_IN_TX_CHECKPOINTED ) && +guest_cpuid_is_intel (pmc->vcpu)) {/* * HSW_IN_TX_CHECKPOINTED is not supported with nonzero * period. Just clear the sample period so at least * allocating the counter doesn't fail. */ attr.sample_period =0 ; - attr.config |=HSW_IN_TX_CHECKPOINTED ; } event = perf_event_create_kernel_counter(&attr, -1, current,
@@ -233,9 +230,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel)pmc_reprogram_counter (pmc, type, config, !(eventsel &ARCH_PERFMON_EVENTSEL_USR ), !(eventsel &ARCH_PERFMON_EVENTSEL_OS ), - eventsel &ARCH_PERFMON_EVENTSEL_INT , - (eventsel &HSW_IN_TX ), - (eventsel &HSW_IN_TX_CHECKPOINTED )); + eventsel &ARCH_PERFMON_EVENTSEL_INT ); }EXPORT_SYMBOL_GPL (reprogram_gp_counter);
@@ -271,7 +266,7 @@ void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 ctrl, int idx) kvm_x86_ops.pmu_ops->pmc_perf_hw_id (pmc), !(en_field &0x2 ),/* exclude user */ !(en_field &0x1 ),/* exclude kernel */ - pmi, false, false); + pmi); }EXPORT_SYMBOL_GPL (reprogram_fixed_counter);
arch/x86/kvm/vmx/pmu_intel.c +10 -3
@@ -389,6 +389,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)struct kvm_pmc *pmc;u32 msr = msr_info->index;u64 data = msr_info->data; +u64 reserved_bits;switch (msr) {case MSR_CORE_PERF_FIXED_CTR_CTRL :
@@ -443,7 +444,11 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) }else if ((pmc =get_gp_pmc (pmu, msr,MSR_P6_EVNTSEL0 ))) {if (data == pmc->eventsel)return 0 ; -if (!(data & pmu->reserved_bits)) { + reserved_bits = pmu->reserved_bits; +if ((pmc->idx ==2 ) && + (pmu->raw_event_mask &HSW_IN_TX_CHECKPOINTED )) + reserved_bits ^=HSW_IN_TX_CHECKPOINTED ; +if (!(data & reserved_bits)) {reprogram_gp_counter (pmc, data);return 0 ; }
@@ -534,8 +539,10 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) entry =kvm_find_cpuid_entry (vcpu,7 ,0 );if (entry && (boot_cpu_has (X86_FEATURE_HLE ) ||boot_cpu_has (X86_FEATURE_RTM )) && - (entry->ebx & (X86_FEATURE_HLE |X86_FEATURE_RTM ))) - pmu->reserved_bits ^=HSW_IN_TX |HSW_IN_TX_CHECKPOINTED ; + (entry->ebx & (X86_FEATURE_HLE |X86_FEATURE_RTM ))) { + pmu->reserved_bits ^=HSW_IN_TX ; + pmu->raw_event_mask |= (HSW_IN_TX |HSW_IN_TX_CHECKPOINTED ); + }bitmap_set (pmu->all_valid_pmc_idx,0 , pmu->nr_arch_gp_counters);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 10/343 KVM: x86/emulator: Emulate RDPID only if it is enabled in guest
In reply to Greg Kroah-HartmanFrom: Hou Wenlong <[email protected]>
[ Upstream commit a836839cbfe60dc434c5476a7429cf2bae36415d ]
When RDTSCP is supported but RDPID is not supported in host, RDPID emulation is available. However, __kvm_get_msr() would only fail when RDTSCP/RDPID both are disabled in guest, so the emulator wouldn't inject a #UD when RDPID is disabled but RDTSCP is enabled in guest.
Message-Id: <1dfd46ae5b76d3ed87bde3154d51c64ea64c99c1.1646226788.git.houwenlong.hwl@antgroup.com>
--- arch/x86/kvm/emulate.c | 4 +++- arch/x86/kvm/kvm_emulate.h | 1 + arch/x86/kvm/x86.c | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-)
arch/x86/kvm/emulate.c +3 -1
@@ -3523,8 +3523,10 @@ static int em_rdpid(struct x86_emulate_ctxt *ctxt) {u64 tsc_aux =0 ; -if (ctxt->ops->get_msr (ctxt,MSR_TSC_AUX , &tsc_aux)) +if (!ctxt->ops->guest_has_rdpid (ctxt))return emulate_ud (ctxt); + + ctxt->ops->get_msr (ctxt,MSR_TSC_AUX , &tsc_aux); ctxt->dst.val = tsc_aux;return X86EMUL_CONTINUE ; }
arch/x86/kvm/kvm_emulate.h +1 -0
@@ -226,6 +226,7 @@ struct x86_emulate_ops {bool (*guest_has_long_mode)(struct x86_emulate_ctxt *ctxt);bool (*guest_has_movbe)(struct x86_emulate_ctxt *ctxt);bool (*guest_has_fxsr)(struct x86_emulate_ctxt *ctxt); +bool (*guest_has_rdpid)(struct x86_emulate_ctxt *ctxt);void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt,bool masked);
arch/x86/kvm/x86.c +6 -0
@@ -7675,6 +7675,11 @@ static bool emulator_guest_has_fxsr(struct x86_emulate_ctxt *ctxt)return guest_cpuid_has (emul_to_vcpu (ctxt),X86_FEATURE_FXSR ); } +static bool emulator_guest_has_rdpid (struct x86_emulate_ctxt *ctxt) +{ +return guest_cpuid_has (emul_to_vcpu (ctxt),X86_FEATURE_RDPID ); +} +static ulong emulator_read_gpr (struct x86_emulate_ctxt *ctxt,unsigned reg) {return kvm_register_read_raw (emul_to_vcpu (ctxt), reg);
@@ -7757,6 +7762,7 @@ static const struct x86_emulate_ops emulate_ops = { .guest_has_long_mode = emulator_guest_has_long_mode, .guest_has_movbe = emulator_guest_has_movbe, .guest_has_fxsr = emulator_guest_has_fxsr, + .guest_has_rdpid = emulator_guest_has_rdpid, .set_nmi_mask = emulator_set_nmi_mask, .get_hflags = emulator_get_hflags, .exiting_smm = emulator_exiting_smm,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 11/343 drm: Add orientation quirk for GPD Win Max
In reply to Greg Kroah-HartmanFrom: Anisse Astier <[email protected]>
[ Upstream commit 0b464ca3e0dd3cec65f28bc6d396d82f19080f69 ]
Panel is 800x1280, but mounted on a laptop form factor, sideways.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -180,6 +180,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MicroPC"), }, .driver_data = (void *)&lcd720x1280_rightside_up, + }, { /* GPD Win Max */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"GPD" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "G1619-01"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /** GPD Pocket, note that the the DMI data is less generic then * it seems, devices with a board-vendor of "AMI Corporation"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 12/343 Bluetooth: hci_sync: Fix compilation warning
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 89a0b8b98f49ae34886e67624208c2898e1e4d7f ]
This fixes the following warning:
net/bluetooth/hci_sync.c:5143:5: warning: no previous prototype for ‘hci_le_ext_create_conn_sync’ [-Wmissing-prototypes]
--- net/bluetooth/hci_sync.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bluetooth/hci_sync.c +2 -2
@@ -5156,8 +5156,8 @@ static void set_ext_conn_params(struct hci_conn *conn, p->max_ce_len =cpu_to_le16 (0x0000 ); } -int hci_le_ext_create_conn_sync (struct hci_dev *hdev,struct hci_conn *conn, -u8 own_addr_type) +static int hci_le_ext_create_conn_sync (struct hci_dev *hdev, +struct hci_conn *conn,u8 own_addr_type) {struct hci_cp_le_ext_create_conn *cp;struct hci_cp_le_ext_conn_param *p;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 13/343 ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111
In reply to Greg Kroah-HartmanFrom: Zekun Shen <[email protected]>
[ Upstream commit 564d4eceb97eaf381dd6ef6470b06377bb50c95a ]
The bug was found during fuzzing. Stacktrace locates it in ath5k_eeprom_convert_pcal_info_5111.
When none of the curve is selected in the loop, idx can go up to AR5K_EEPROM_N_PD_CURVES. The line makes pd out of bound. pd = &chinfo[pier].pd_curves[idx];
There are many OOB writes using pd later in the code. So I added a sanity check for idx. Checks for other loops involving AR5K_EEPROM_N_PD_CURVES are not needed as the loop index is not used outside the loops.
The patch is NOT tested with real device.
The following is the fuzzing report
BUG: KASAN: slab-out-of-bounds in ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] Write of size 1 at addr ffff8880174a4d60 by task modprobe/214 CPU: 0 PID: 214 Comm: modprobe Not tainted 5.6.0 #1 Call Trace: dump_stack+0x76/0xa0 print_address_description.constprop.0+0x16/0x200 ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] __kasan_report.cold+0x37/0x7c ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] kasan_report+0xe/0x20 ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] ? apic_timer_interrupt+0xa/0x20 ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] ? ath5k_pci_eeprom_read+0x228/0x3c0 [ath5k] ath5k_eeprom_init+0x2513/0x6290 [ath5k] ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] ? usleep_range+0xb8/0x100 ? apic_timer_interrupt+0xa/0x20 ? ath5k_eeprom_read_pcal_info_2413+0x2f20/0x2f20 [ath5k] ath5k_hw_init+0xb60/0x1970 [ath5k] ath5k_init_ah+0x6fe/0x2530 [ath5k] ? kasprintf+0xa6/0xe0 ? ath5k_stop+0x140/0x140 [ath5k] ? _dev_notice+0xf6/0xf6 ? apic_timer_interrupt+0xa/0x20 ath5k_pci_probe.cold+0x29a/0x3d6 [ath5k] ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] ? mutex_lock+0x89/0xd0 ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] local_pci_probe+0xd3/0x160 pci_device_probe+0x23f/0x3e0 ? pci_device_remove+0x280/0x280 ? pci_device_remove+0x280/0x280 really_probe+0x209/0x5d0
--- drivers/net/wireless/ath/ath5k/eeprom.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath5k/eeprom.c +3 -0
@@ -746,6 +746,9 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode, } } +if (idx ==AR5K_EEPROM_N_PD_CURVES ) + goto err_out; + ee->ee_pd_gains[mode] =1 ; pd = &chinfo[pier].pd_curves[idx];
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 14/343 Bluetooth: fix null ptr deref on hci_sync_conn_complete_evt
In reply to Greg Kroah-HartmanFrom: Soenke Huster <[email protected]>
[ Upstream commit 3afee2118132e93e5f6fa636dfde86201a860ab3 ]
This event is just specified for SCO and eSCO link types.
On the reception of a HCI_Synchronous_Connection_Complete for a BDADDR of an existing LE connection, LE link type and a status that triggers the second case of the packet processing a NULL pointer dereference happens, as conn->link is NULL.
--- net/bluetooth/hci_event.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
net/bluetooth/hci_event.c +13 -0
@@ -4661,6 +4661,19 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, void *data,struct hci_ev_sync_conn_complete *ev = data;struct hci_conn *conn; +switch (ev->link_type) { +case SCO_LINK : +case ESCO_LINK : +break ; +default : +/* As per Core 5.3 Vol 4 Part E 7.7.35 (p.2219), Link_Type +* for HCI_Synchronous_Connection_Complete is limited to +* either SCO or eSCO +*/ +bt_dev_err (hdev,"Ignoring connect complete event for invalid link type" ); +return ; + } +bt_dev_dbg (hdev,"status 0x%2.2x" , ev->status);hci_dev_lock (hdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 15/343 drm/amd/display: Add signal type check when verify stream backends same
In reply to Greg Kroah-HartmanFrom: Dale Zhao <[email protected]>
[ Upstream commit 047db281c026de5971cedb5bb486aa29bd16a39d ]
[Why]
For allow eDP hot-plug feature, the stream signal may change to VIRTUAL when plug-out and back to eDP when plug-in. OS will still setPathMode with same timing for each plugging, but eDP gets no stream update as we don't check signal type changing back as keeping it VIRTUAL. It's also unsafe for future cases that stream signal is switched with same timing.
[How]
Check stream signal type change include previous HDMI signal case.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -0
@@ -1640,6 +1640,9 @@ static bool are_stream_backends_same(if (is_timing_changed (stream_a, stream_b))return false; +if (stream_a->signal != stream_b->signal) +return false; +if (stream_a->dpms_off != stream_b->dpms_off)return false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 16/343 drm/amdkfd: enable heavy-weight TLB flush on Arcturus
In reply to Greg Kroah-HartmanFrom: Eric Huang <[email protected]>
[ Upstream commit f61c40c0757a79bcf744314df606c2bc8ae6a729 ]
SDMA FW fixes the hang issue for adding heavy-weight TLB flush on Arcturus, so we can enable it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 ------ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +0 -6
@@ -1813,12 +1813,6 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( true); ret =unreserve_bo_and_vms (&ctx, false, false); -/* Only apply no TLB flush on Aldebaran to -* workaround regressions on other Asics. -*/ -if (table_freed && (adev->asic_type !=CHIP_ALDEBARAN )) - *table_freed = true; - goto out; out_unreserve:
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +8 -2
@@ -1416,6 +1416,12 @@ static int kfd_ioctl_free_memory_of_gpu(struct file *filep,return ret; } +static bool kfd_flush_tlb_after_unmap (struct kfd_dev *dev) { +return KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,2 ) || + (KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,1 ) && + dev->adev->sdma.instance[0 ].fw_version >=18 ); +} +static int kfd_ioctl_map_memory_to_gpu (struct file *filep,struct kfd_process *p,void *data) {
@@ -1503,7 +1509,7 @@ static int kfd_ioctl_map_memory_to_gpu(struct file *filep, }/* Flush TLBs after waiting for the page table updates to complete */ -if (table_freed) { +if (table_freed || !kfd_flush_tlb_after_unmap (dev)) {for (i =0 ; i < args->n_devices; i++) { peer =kfd_device_by_id (devices_arr[i]);if (WARN_ON_ONCE (!peer))
@@ -1603,7 +1609,7 @@ static int kfd_ioctl_unmap_memory_from_gpu(struct file *filep, }mutex_unlock (&p->mutex); -if (KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,2 )) { +if (kfd_flush_tlb_after_unmap (dev)) { err =amdgpu_amdkfd_gpuvm_sync_memory (dev->adev, (struct kgd_mem *) mem, true);if (err) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 17/343 drm/edid: remove non_desktop quirk for HPN-3515 and LEN-B800.
In reply to Greg Kroah-HartmanFrom: Philipp Zabel <[email protected]>
[ Upstream commit 50dc95d561a2552b0d76a9f91b38005195bf2974 ]
Now that there is support for the Microsoft VSDB for HMDs, remove the non-desktop quirk for two devices that are verified to contain it in their EDID: HPN-3515 and LEN-B800.
Presumably most of the other Windows Mixed Reality headsets contain it as well, but there are ACR-7FCE and SEC-5194 devices without it.
Tested with LEN-B800.
--- drivers/gpu/drm/drm_edid.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -2
@@ -212,9 +212,7 @@ static const struct edid_quirk {/* Windows Mixed Reality Headsets */ EDID_QUIRK ('A' ,'C' ,'R' ,0x7fce ,EDID_QUIRK_NON_DESKTOP ), -EDID_QUIRK ('H' ,'P' ,'N' ,0x3515 ,EDID_QUIRK_NON_DESKTOP ),EDID_QUIRK ('L' ,'E' ,'N' ,0x0408 ,EDID_QUIRK_NON_DESKTOP ), -EDID_QUIRK ('L' ,'E' ,'N' ,0xb800 ,EDID_QUIRK_NON_DESKTOP ),EDID_QUIRK ('F' ,'U' ,'J' ,0x1970 ,EDID_QUIRK_NON_DESKTOP ),EDID_QUIRK ('D' ,'E' ,'L' ,0x7fce ,EDID_QUIRK_NON_DESKTOP ), EDID_QUIRK('S', 'E', 'C', 0x144a, EDID_QUIRK_NON_DESKTOP),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 18/343 drm/edid: improve non-desktop quirk logging
In reply to Greg Kroah-HartmanFrom: Jani Nikula <[email protected]>
[ Upstream commit ce99534e978d4a36787dbe5e5c57749d12e6bf4a ]
Improve non-desktop quirk logging if the EDID indicates non-desktop. If both are set, note about redundant quirk. If there's no quirk but the EDID indicates non-desktop, don't log non-desktop is set to 0.
--- drivers/gpu/drm/drm_edid.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_edid.c +10 -7
@@ -5325,17 +5325,13 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi info->width_mm = edid->width_cm *10 ; info->height_mm = edid->height_cm *10 ; - info->non_desktop = !!(quirks &EDID_QUIRK_NON_DESKTOP ); -drm_get_monitor_range (connector, edid); -DRM_DEBUG_KMS ("non_desktop set to %d\n" , info->non_desktop); -if (edid->revision <3 ) -return quirks; + goto out;if (!(edid->input &DRM_EDID_INPUT_DIGITAL )) -return quirks; + goto out; info->color_formats |=DRM_COLOR_FORMAT_RGB444 ;drm_parse_cea_ext (connector, edid);
@@ -5356,7 +5352,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi/* Only defined for 1.4 with digital displays */ if (edid->revision <4 ) -return quirks; + goto out;switch (edid->input &DRM_EDID_DIGITAL_DEPTH_MASK ) {case DRM_EDID_DIGITAL_DEPTH_6 :
@@ -5393,6 +5389,13 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edidrm_update_mso (connector, edid); +out: +if (quirks &EDID_QUIRK_NON_DESKTOP ) { +drm_dbg_kms (connector->dev,"Non-desktop display%s\n" , + info->non_desktop ?" (redundant quirk)" :"" ); + info->non_desktop = true; + } +return quirks; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 19/343 Bluetooth: hci_event: Ignore multiple conn complete events
In reply to Greg Kroah-HartmanFrom: Soenke Huster <[email protected]>
[ Upstream commit d5ebaa7c5f6f688959e8d40840b2249ede63b8ed ]
When one of the three connection complete events is received multiple times for the same handle, the device is registered multiple times which leads to memory corruptions. Therefore, consequent events for a single connection are ignored.
The conn->state can hold different values, therefore HCI_CONN_HANDLE_UNSET is introduced to identify new connections. To make sure the events do not contain this or another invalid handle HCI_CONN_HANDLE_MAX and checks are introduced.
--- include/net/bluetooth/hci_core.h | 3 ++ net/bluetooth/hci_conn.c | 1 + net/bluetooth/hci_event.c | 63 ++++++++++++++++++++++++-------- 3 files changed, 52 insertions(+), 15 deletions(-)
include/net/bluetooth/hci_core.h +3 -0
@@ -294,6 +294,9 @@ struct adv_monitor {#define HCI_MAX_SHORT_NAME_LENGTH 10 +#define HCI_CONN_HANDLE_UNSET 0xffff +#define HCI_CONN_HANDLE_MAX 0x0eff +/* Min encryption key size to match with SMP */ #define HCI_MIN_ENC_KEY_SIZE 7
net/bluetooth/hci_conn.c +1 -0
@@ -691,6 +691,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst,bacpy (&conn->dst, dst);bacpy (&conn->src, &hdev->bdaddr); + conn->handle =HCI_CONN_HANDLE_UNSET ; conn->hdev = hdev; conn->type = type; conn->role = role;
net/bluetooth/hci_event.c +48 -15
101 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 20/343 drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj
In reply to Greg Kroah-HartmanFrom: Xin Xiong <[email protected]>
[ Upstream commit dfced44f122c500004a48ecc8db516bb6a295a1b ]
This issue takes place in an error path in amdgpu_cs_fence_to_handle_ioctl(). When info->in.what falls into default case, the function simply returns -EINVAL, forgetting to decrement the reference count of a dma_fence obj, which is bumped earlier by amdgpu_cs_get_fence(). This may result in reference count leaks.
Fix it by decreasing the refcount of specific object before returning the error code.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -0
@@ -1509,6 +1509,7 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data,return 0 ;default : +dma_fence_put (fence);return -EINVAL ; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 21/343 drm/amd/display: Fix memory leak
In reply to Greg Kroah-HartmanFrom: Yongzhi Liu <[email protected]>
[ Upstream commit 5d5c6dba2b43e28845d7d7ed32a36802329a5f52 ]
[why]
Resource release is needed on the error handling path to prevent memory leak.
[how]
Fix this by adding kfree on the error handling path.
--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 80 ++++++++++++++----- 1 file changed, 60 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +60 -20
@@ -227,8 +227,10 @@ static ssize_t dp_link_settings_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -389,8 +391,10 @@ static ssize_t dp_phy_settings_read(struct file *f, char __user *buf,break ; r =put_user ((*(rd_buf + result)), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1359,8 +1363,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1376,8 +1382,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1546,8 +1554,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1563,8 +1573,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1731,8 +1743,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1748,8 +1762,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1912,8 +1928,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1929,8 +1947,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2088,8 +2108,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2105,8 +2127,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2145,8 +2169,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2162,8 +2188,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2217,8 +2245,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2234,8 +2264,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2289,8 +2321,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2306,8 +2340,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -3459,8 +3495,10 @@ static ssize_t dcc_en_bits_read( dc->hwss.get_dcc_en_bits (dc, dcc_en_bits); rd_buf =kcalloc (rd_buf_size,sizeof (char ),GFP_KERNEL ); -if (!rd_buf) +if (!rd_buf) { +kfree (dcc_en_bits);return -ENOMEM ; + }for (i =0 ; i < num_pipes; i++) offset += snprintf(rd_buf + offset, rd_buf_size - offset,
@@ -3473,8 +3511,10 @@ static ssize_t dcc_en_bits_read(if (*pos >= rd_buf_size)break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ; *pos +=1 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 22/343 drm/amd/display: Use PSR version selected during set_psr_caps
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit b80ddeb29d9df449f875f0b6f5de08d7537c02b8 ]
[Why]
If the DPCD caps specifies a PSR version newer than PSR_VERSION_1 then we fallback to using PSR_VERSION_1 in amdgpu_dm_set_psr_caps.
This gets overriden with the raw DPCD value in amdgpu_dm_link_setup_psr, which can result in DMCUB hanging if we pass in an unsupported PSR version number.
[How]
Fix the hang by using link->psr_settings.psr_version directly during amdgpu_dm_link_setup_psr.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +2 -4
@@ -149,10 +149,8 @@ bool amdgpu_dm_link_setup_psr(struct dc_stream_state *stream) link = stream->link; - psr_config.psr_version = link->dpcd_caps.psr_caps.psr_version; - -if (psr_config.psr_version >0 ) { - psr_config.psr_exit_link_training_required =0x1 ; +if (link->psr_settings.psr_version !=DC_PSR_VERSION_UNSUPPORTED ) { + psr_config.psr_version = link->psr_settings.psr_version; psr_config.psr_frame_capture_indication_req =0 ; psr_config.psr_rfb_setup_time =0x37 ; psr_config.psr_sdp_transmit_line_num_deadline =0x20 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 23/343 usb: gadget: tegra-xudc: Do not program SPARAM
In reply to Greg Kroah-HartmanFrom: Wayne Chang <[email protected]>
[ Upstream commit 62fb61580eb48fc890b7bc9fb5fd263367baeca8 ]
According to the Tegra Technical Reference Manual, SPARAM is a read-only register and should not be programmed in the driver.
The change removes the wrong SPARAM usage.
--- drivers/usb/gadget/udc/tegra-xudc.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/usb/gadget/udc/tegra-xudc.c +0 -8
@@ -32,9 +32,6 @@#include <linux/workqueue.h> /* XUSB_DEV registers */ -#define SPARAM 0x000 -#define SPARAM_ERSTMAX_MASK GENMASK(20, 16) -#define SPARAM_ERSTMAX (x) (((x) << 16) & SPARAM_ERSTMAX_MASK)#define DB 0x004#define DB_TARGET_MASK GENMASK(15, 8)#define DB_TARGET (x) (((x) << 8) & DB_TARGET_MASK)
@@ -3295,11 +3292,6 @@ static void tegra_xudc_init_event_ring(struct tegra_xudc *xudc)unsigned int i;u32 val; - val =xudc_readl (xudc,SPARAM ); - val &= ~(SPARAM_ERSTMAX_MASK ); - val |=SPARAM_ERSTMAX (XUDC_NR_EVENT_RINGS ); -xudc_writel (xudc, val,SPARAM ); -for (i =0 ; i <ARRAY_SIZE (xudc->event_ring); i++) {memset (xudc->event_ring[i],0 ,XUDC_EVENT_RING_SIZE *sizeof (*xudc->event_ring[i]));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 24/343 usb: gadget: tegra-xudc: Fix control endpoints definitions
In reply to Greg Kroah-HartmanFrom: Wayne Chang <[email protected]>
[ Upstream commit 7bd42fb95eb4f98495ccadf467ad15124208ec49 ]
According to the Tegra Technical Reference Manual, the seq_num field of control endpoint is not [31:24] but [31:27]. Bit 24 is reserved and bit 26 is splitxstate.
The change fixes the wrong control endpoint's definitions.
--- drivers/usb/gadget/udc/tegra-xudc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/usb/gadget/udc/tegra-xudc.c +10 -2
@@ -272,8 +272,10 @@ BUILD_EP_CONTEXT_RW(deq_hi, deq_hi, 0, 0xffffffff) BUILD_EP_CONTEXT_RW(avg_trb_len, tx_info, 0, 0xffff) BUILD_EP_CONTEXT_RW(max_esit_payload, tx_info, 16, 0xffff) BUILD_EP_CONTEXT_RW(edtla, rsvd[0], 0, 0xffffff) -BUILD_EP_CONTEXT_RW(seq_num, rsvd[0], 24, 0xff) +BUILD_EP_CONTEXT_RW(rsvd, rsvd[0], 24, 0x1) BUILD_EP_CONTEXT_RW(partial_td, rsvd[0], 25, 0x1) +BUILD_EP_CONTEXT_RW(splitxstate, rsvd[0], 26, 0x1) +BUILD_EP_CONTEXT_RW(seq_num, rsvd[0], 27, 0x1f) BUILD_EP_CONTEXT_RW(cerrcnt, rsvd[1], 18, 0x3) BUILD_EP_CONTEXT_RW(data_offset, rsvd[2], 0, 0x1ffff)BUILD_EP_CONTEXT_RW (numtrbs, rsvd[2 ],22 ,0x1f )
@@ -1554,6 +1556,9 @@ static int __tegra_xudc_ep_set_halt(struct tegra_xudc_ep *ep, bool halt)ep_reload (xudc, ep->index);ep_ctx_write_state (ep->context,EP_STATE_RUNNING ); +ep_ctx_write_rsvd (ep->context,0 ); +ep_ctx_write_partial_td (ep->context,0 ); +ep_ctx_write_splitxstate (ep->context,0 );ep_ctx_write_seq_num (ep->context,0 );ep_reload (xudc, ep->index);
@@ -2809,7 +2814,10 @@ static void tegra_xudc_reset(struct tegra_xudc *xudc) xudc->setup_seq_num =0 ; xudc->queued_setup_packet = false; -ep_ctx_write_seq_num (ep0->context, xudc->setup_seq_num); +ep_ctx_write_rsvd (ep0->context,0 ); +ep_ctx_write_partial_td (ep0->context,0 ); +ep_ctx_write_splitxstate (ep0->context,0 ); +ep_ctx_write_seq_num (ep0->context,0 ); deq_ptr =trb_virt_to_phys (ep0, &ep0->transfer_ring[ep0->deq_ptr]);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 25/343 usb: cdnsp: fix cdnsp_decode_trb function to properly handle ret value
In reply to Greg Kroah-HartmanFrom: Pawel Laszczak <[email protected]>
[ Upstream commit 03db9289b5ab59437e42a111a34545a7cedb5190 ]
Variable ret in function cdnsp_decode_trb is initialized but not used. To fix this compiler warning patch adds checking whether the data buffer has not been overflowed.
--- drivers/usb/cdns3/cdnsp-debug.h | 305 ++++++++++++++++---------------- 1 file changed, 154 insertions(+), 151 deletions(-)
drivers/usb/cdns3/cdnsp-debug.h +154 -151
@@ -182,208 +182,211 @@ static inline const char *cdnsp_decode_trb(char *str, size_t size, u32 field0,int ep_id =TRB_TO_EP_INDEX (field3) -1 ;int type =TRB_FIELD_TO_TYPE (field3);unsigned int ep_num; -int ret =0 ; +int ret;u32 temp; ep_num =DIV_ROUND_UP (ep_id,2 );switch (type) {case TRB_LINK : - ret +=snprintf (str, size, -"LINK %08x%08x intr %ld type '%s' flags %c:%c:%c:%c" , - field1, field0,GET_INTR_TARGET (field2), -cdnsp_trb_type_string (type), - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_TC ?'T' :'t' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"LINK %08x%08x intr %ld type '%s' flags %c:%c:%c:%c" , + field1, field0,GET_INTR_TARGET (field2), +cdnsp_trb_type_string (type), + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_TC ?'T' :'t' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_TRANSFER :case TRB_COMPLETION :case TRB_PORT_STATUS :case TRB_HC_EVENT : - ret +=snprintf (str, size, -"ep%d%s(%d) type '%s' TRB %08x%08x status '%s'" -" len %ld slot %ld flags %c:%c" , - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), -cdnsp_trb_type_string (type), field1, field0, -cdnsp_trb_comp_code_string (GET_COMP_CODE (field2)), -EVENT_TRB_LEN (field2),TRB_TO_SLOT_ID (field3), - field3 &EVENT_DATA ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"ep%d%s(%d) type '%s' TRB %08x%08x status '%s'" +" len %ld slot %ld flags %c:%c" , + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), +cdnsp_trb_type_string (type), field1, field0, +cdnsp_trb_comp_code_string (GET_COMP_CODE (field2)), +EVENT_TRB_LEN (field2),TRB_TO_SLOT_ID (field3), + field3 &EVENT_DATA ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_MFINDEX_WRAP : - ret +=snprintf (str, size,"%s: flags %c" , -cdnsp_trb_type_string (type), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: flags %c" , +cdnsp_trb_type_string (type), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_SETUP : - ret +=snprintf (str, size, -"type '%s' bRequestType %02x bRequest %02x " -"wValue %02x%02x wIndex %02x%02x wLength %d " -"length %ld TD size %ld intr %ld Setup ID %ld " -"flags %c:%c:%c" , -cdnsp_trb_type_string (type), - field0 &0xff , - (field0 &0xff00 ) >>8 , - (field0 &0xff000000 ) >>24 , - (field0 &0xff0000 ) >>16 , - (field1 &0xff00 ) >>8 , - field1 &0xff , - (field1 &0xff000000 ) >>16 | - (field1 &0xff0000 ) >>16 , -TRB_LEN (field2),GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), -TRB_SETUPID_TO_TYPE (field3), - field3 &TRB_IDT ?'D' :'d' , - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"type '%s' bRequestType %02x bRequest %02x " +"wValue %02x%02x wIndex %02x%02x wLength %d " +"length %ld TD size %ld intr %ld Setup ID %ld " +"flags %c:%c:%c" , +cdnsp_trb_type_string (type), + field0 &0xff , + (field0 &0xff00 ) >>8 , + (field0 &0xff000000 ) >>24 , + (field0 &0xff0000 ) >>16 , + (field1 &0xff00 ) >>8 , + field1 &0xff , + (field1 &0xff000000 ) >>16 | + (field1 &0xff0000 ) >>16 , +TRB_LEN (field2),GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), +TRB_SETUPID_TO_TYPE (field3), + field3 &TRB_IDT ?'D' :'d' , + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_DATA : - ret +=snprintf (str, size, -"type '%s' Buffer %08x%08x length %ld TD size %ld " -"intr %ld flags %c:%c:%c:%c:%c:%c:%c" , -cdnsp_trb_type_string (type), - field1, field0,TRB_LEN (field2), -GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), - field3 &TRB_IDT ?'D' :'i' , - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_NO_SNOOP ?'S' :'s' , - field3 &TRB_ISP ?'I' :'i' , - field3 &TRB_ENT ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"type '%s' Buffer %08x%08x length %ld TD size %ld " +"intr %ld flags %c:%c:%c:%c:%c:%c:%c" , +cdnsp_trb_type_string (type), + field1, field0,TRB_LEN (field2), +GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), + field3 &TRB_IDT ?'D' :'i' , + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_NO_SNOOP ?'S' :'s' , + field3 &TRB_ISP ?'I' :'i' , + field3 &TRB_ENT ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_STATUS : - ret +=snprintf (str, size, -"Buffer %08x%08x length %ld TD size %ld intr" -"%ld type '%s' flags %c:%c:%c:%c" , - field1, field0,TRB_LEN (field2), -GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), -cdnsp_trb_type_string (type), - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_ENT ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"Buffer %08x%08x length %ld TD size %ld intr" +"%ld type '%s' flags %c:%c:%c:%c" , + field1, field0,TRB_LEN (field2), +GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), +cdnsp_trb_type_string (type), + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_ENT ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_NORMAL :case TRB_ISOC :case TRB_EVENT_DATA :case TRB_TR_NOOP : - ret +=snprintf (str, size, -"type '%s' Buffer %08x%08x length %ld " -"TD size %ld intr %ld " -"flags %c:%c:%c:%c:%c:%c:%c:%c:%c" , -cdnsp_trb_type_string (type), - field1, field0,TRB_LEN (field2), -GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), - field3 &TRB_BEI ?'B' :'b' , - field3 &TRB_IDT ?'T' :'t' , - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_NO_SNOOP ?'S' :'s' , - field3 &TRB_ISP ?'I' :'i' , - field3 &TRB_ENT ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' , - !(field3 &TRB_EVENT_INVALIDATE ) ?'V' :'v' ); + ret =snprintf (str, size, +"type '%s' Buffer %08x%08x length %ld " +"TD size %ld intr %ld " +"flags %c:%c:%c:%c:%c:%c:%c:%c:%c" , +cdnsp_trb_type_string (type), + field1, field0,TRB_LEN (field2), +GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), + field3 &TRB_BEI ?'B' :'b' , + field3 &TRB_IDT ?'T' :'t' , + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_NO_SNOOP ?'S' :'s' , + field3 &TRB_ISP ?'I' :'i' , + field3 &TRB_ENT ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' , + !(field3 &TRB_EVENT_INVALIDATE ) ?'V' :'v' );break ;case TRB_CMD_NOOP :case TRB_ENABLE_SLOT : - ret +=snprintf (str, size,"%s: flags %c" , -cdnsp_trb_type_string (type), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: flags %c" , +cdnsp_trb_type_string (type), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_DISABLE_SLOT : - ret +=snprintf (str, size,"%s: slot %ld flags %c" , -cdnsp_trb_type_string (type), -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: slot %ld flags %c" , +cdnsp_trb_type_string (type), +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_ADDR_DEV : - ret +=snprintf (str, size, -"%s: ctx %08x%08x slot %ld flags %c:%c" , -cdnsp_trb_type_string (type), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_BSR ?'B' :'b' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ctx %08x%08x slot %ld flags %c:%c" , +cdnsp_trb_type_string (type), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_BSR ?'B' :'b' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_CONFIG_EP : - ret +=snprintf (str, size, -"%s: ctx %08x%08x slot %ld flags %c:%c" , -cdnsp_trb_type_string (type), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_DC ?'D' :'d' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ctx %08x%08x slot %ld flags %c:%c" , +cdnsp_trb_type_string (type), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_DC ?'D' :'d' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_EVAL_CONTEXT : - ret +=snprintf (str, size, -"%s: ctx %08x%08x slot %ld flags %c" , -cdnsp_trb_type_string (type), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ctx %08x%08x slot %ld flags %c" , +cdnsp_trb_type_string (type), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_RESET_EP :case TRB_HALT_ENDPOINT :case TRB_FLUSH_ENDPOINT : - ret +=snprintf (str, size, -"%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_STOP_RING : - ret +=snprintf (str, size, -"%s: ep%d%s(%d) slot %ld sp %d flags %c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), -TRB_TO_SLOT_ID (field3), -TRB_TO_SUSPEND_PORT (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ep%d%s(%d) slot %ld sp %d flags %c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), +TRB_TO_SLOT_ID (field3), +TRB_TO_SUSPEND_PORT (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_SET_DEQ : - ret +=snprintf (str, size, -"%s: ep%d%s(%d) deq %08x%08x stream %ld slot %ld flags %c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), field1, field0, -TRB_TO_STREAM_ID (field2), -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ep%d%s(%d) deq %08x%08x stream %ld slot %ld flags %c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), field1, field0, +TRB_TO_STREAM_ID (field2), +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_RESET_DEV : - ret +=snprintf (str, size,"%s: slot %ld flags %c" , -cdnsp_trb_type_string (type), -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: slot %ld flags %c" , +cdnsp_trb_type_string (type), +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_ENDPOINT_NRDY : - temp =TRB_TO_HOST_STREAM (field2); - - ret +=snprintf (str, size, -"%s: ep%d%s(%d) H_SID %x%s%s D_SID %lx flags %c:%c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), temp, - temp ==STREAM_PRIME_ACK ?"(PRIME)" :"" , - temp ==STREAM_REJECTED ?"(REJECTED)" :"" , -TRB_TO_DEV_STREAM (field0), - field3 &TRB_STAT ?'S' :'s' , - field3 &TRB_CYCLE ?'C' :'c' ); + temp =TRB_TO_HOST_STREAM (field2); + + ret =snprintf (str, size, +"%s: ep%d%s(%d) H_SID %x%s%s D_SID %lx flags %c:%c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), temp, + temp ==STREAM_PRIME_ACK ?"(PRIME)" :"" , + temp ==STREAM_REJECTED ?"(REJECTED)" :"" , +TRB_TO_DEV_STREAM (field0), + field3 &TRB_STAT ?'S' :'s' , + field3 &TRB_CYCLE ?'C' :'c' );break ;default : - ret +=snprintf (str, size, -"type '%s' -> raw %08x %08x %08x %08x" , -cdnsp_trb_type_string (type), - field0, field1, field2, field3); + ret =snprintf (str, size, +"type '%s' -> raw %08x %08x %08x %08x" , +cdnsp_trb_type_string (type), + field0, field1, field2, field3); } +if (ret >= size) +pr_info ("CDNSP: buffer overflowed.\n" ); +return str; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 26/343 ptp: replace snprintf with sysfs_emit
In reply to Greg Kroah-HartmanFrom: Yang Guang <[email protected]>
[ Upstream commit e2cf07654efb0fd7bbcb475c6f74be7b5755a8fd ]
coccinelle report:
./drivers/ptp/ptp_sysfs.c:17:8-16:
WARNING: use scnprintf or sprintf
./drivers/ptp/ptp_sysfs.c:390:8-16:
WARNING: use scnprintf or sprintf
Use sysfs_emit instead of scnprintf or sprintf makes more sense.
--- drivers/ptp/ptp_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ptp/ptp_sysfs.c +2 -2
@@ -14,7 +14,7 @@ static ssize_t clock_name_show(struct device *dev, struct device_attribute *attr, char *page) { struct ptp_clock *ptp = dev_get_drvdata(dev); -return snprintf (page,PAGE_SIZE -1 ,"%s\n" , ptp->info->name); +return sysfs_emit (page,"%s\n" , ptp->info->name); }static DEVICE_ATTR_RO (clock_name);
@@ -387,7 +387,7 @@ static ssize_t ptp_pin_show(struct device *dev, struct device_attribute *attr,mutex_unlock (&ptp->pincfg_mux); -return snprintf (page,PAGE_SIZE ,"%u %u\n" , func, chan); +return sysfs_emit (page,"%u %u\n" , func, chan); } static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 27/343 Bluetooth: hci_sync: Fix queuing commands when HCI_UNREGISTER is set
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 0b94f2651f56b9e4aa5f012b0d7eb57308c773cf ]
hci_cmd_sync_queue shall return an error if HCI_UNREGISTER flag has been set as that means hci_unregister_dev has been called so it will likely cause a uaf after the timeout as the hdev will be freed.
--- net/bluetooth/hci_sync.c | 3 +++ 1 file changed, 3 insertions(+)
net/bluetooth/hci_sync.c +3 -0
@@ -379,6 +379,9 @@ int hci_cmd_sync_queue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func, {struct hci_cmd_sync_work_entry *entry; +if (hci_dev_test_flag (hdev,HCI_UNREGISTER )) +return -ENODEV ; + entry =kmalloc (sizeof (*entry),GFP_KERNEL );if (!entry)return -ENOMEM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 28/343 selftests, xsk: Fix bpf_res cleanup test
In reply to Greg Kroah-HartmanFrom: Magnus Karlsson <[email protected]>
[ Upstream commit 3b22523bca02b0d5618c08b93d8fd1fb578e1cc3 ]
After commit 710ad98c363a ("veth: Do not record rx queue hint in veth_xmit"), veth no longer receives traffic on the same queue as it was sent on. This breaks the bpf_res test for the AF_XDP selftests as the socket tied to queue 1 will not receive traffic anymore.
Modify the test so that two sockets are tied to queue id 0 using a shared umem instead. When killing the first socket enter the second socket into the xskmap so that traffic will flow to it. This will still test that the resources are not cleaned up until after the second socket dies, without having to rely on veth supporting rx_queue hints.
--- tools/testing/selftests/bpf/xdpxceiver.c | 80 +++++++++++++++--------- tools/testing/selftests/bpf/xdpxceiver.h | 2 +- 2 files changed, 50 insertions(+), 32 deletions(-)
tools/testing/selftests/bpf/xdpxceiver.c +49 -31
@@ -266,22 +266,24 @@ static int xsk_configure_umem(struct xsk_umem_info *umem, void *buffer, u64 size }static int xsk_configure_socket (struct xsk_socket_info *xsk,struct xsk_umem_info *umem, -struct ifobject *ifobject,u32 qid) +struct ifobject *ifobject,bool shared) { -struct xsk_socket_config cfg; +struct xsk_socket_config cfg = {};struct xsk_ring_cons *rxr;struct xsk_ring_prod *txr; xsk->umem = umem; cfg.rx_size = xsk->rxqsize; cfg.tx_size =XSK_RING_PROD__DEFAULT_NUM_DESCS ; - cfg.libbpf_flags =0 ; + cfg.libbpf_flags =XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD ; cfg.xdp_flags = ifobject->xdp_flags; cfg.bind_flags = ifobject->bind_flags; +if (shared) + cfg.bind_flags |=XDP_SHARED_UMEM ; txr = ifobject->tx_on ? &xsk->tx :NULL ; rxr = ifobject->rx_on ? &xsk->rx :NULL ; -return xsk_socket__create (&xsk->xsk, ifobject->ifname, qid, umem->umem, rxr, txr, &cfg); +return xsk_socket__create (&xsk->xsk, ifobject->ifname,0 , umem->umem, rxr, txr, &cfg); }static struct option long_options[] = {
@@ -387,7 +389,6 @@ static void __test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx,for (i =0 ; i <MAX_INTERFACES ; i++) {struct ifobject *ifobj = i ? ifobj_rx : ifobj_tx; - ifobj->umem = &ifobj->umem_arr[0 ]; ifobj->xsk = &ifobj->xsk_arr[0 ]; ifobj->use_poll = false; ifobj->pacing_on = true;
@@ -401,11 +402,12 @@ static void __test_spec_init(struct test_spec *test, struct ifobject *ifobj_tx, ifobj->tx_on = false; } +memset (ifobj->umem,0 ,sizeof (*ifobj->umem)); + ifobj->umem->num_frames =DEFAULT_UMEM_BUFFERS ; + ifobj->umem->frame_size =XSK_UMEM__DEFAULT_FRAME_SIZE ; +for (j =0 ; j <MAX_SOCKETS ; j++) { -memset (&ifobj->umem_arr[j],0 ,sizeof (ifobj->umem_arr[j]));memset (&ifobj->xsk_arr[j],0 ,sizeof (ifobj->xsk_arr[j])); - ifobj->umem_arr[j].num_frames =DEFAULT_UMEM_BUFFERS ; - ifobj->umem_arr[j].frame_size =XSK_UMEM__DEFAULT_FRAME_SIZE ; ifobj->xsk_arr[j].rxqsize =XSK_RING_CONS__DEFAULT_NUM_DESCS ; } }
@@ -950,7 +952,10 @@ static void tx_stats_validate(struct ifobject *ifobject)static void thread_common_ops (struct test_spec *test,struct ifobject *ifobject) { +u64 umem_sz = ifobject->umem->num_frames * ifobject->umem->frame_size;int mmap_flags =MAP_PRIVATE |MAP_ANONYMOUS |MAP_NORESERVE ; +int ret, ifindex; +void *bufs;u32 i; ifobject->ns_fd =switch_namespace (ifobject->nsname);
@@ -958,23 +963,20 @@ static void thread_common_ops(struct test_spec *test, struct ifobject *ifobject)if (ifobject->umem->unaligned_mode) mmap_flags |=MAP_HUGETLB ; -for (i =0 ; i < test->nb_sockets; i++) { -u64 umem_sz = ifobject->umem->num_frames * ifobject->umem->frame_size; -u32 ctr =0 ; -void *bufs; -int ret; + bufs =mmap (NULL , umem_sz,PROT_READ |PROT_WRITE , mmap_flags,-1 ,0 ); +if (bufs ==MAP_FAILED ) +exit_with_error (errno); - bufs =mmap (NULL , umem_sz,PROT_READ |PROT_WRITE , mmap_flags,-1 ,0 ); -if (bufs ==MAP_FAILED ) -exit_with_error (errno); + ret =xsk_configure_umem (ifobject->umem, bufs, umem_sz); +if (ret) +exit_with_error (-ret); - ret =xsk_configure_umem (&ifobject->umem_arr[i], bufs, umem_sz); -if (ret) -exit_with_error (-ret); +for (i =0 ; i < test->nb_sockets; i++) { +u32 ctr =0 ;while (ctr++ <SOCK_RECONF_CTR ) { - ret =xsk_configure_socket (&ifobject->xsk_arr[i], &ifobject->umem_arr[i], - ifobject, i); + ret =xsk_configure_socket (&ifobject->xsk_arr[i], ifobject->umem, + ifobject, !!i);if (!ret)break ;
@@ -985,8 +987,22 @@ static void thread_common_ops(struct test_spec *test, struct ifobject *ifobject) } } - ifobject->umem = &ifobject->umem_arr[0 ]; ifobject->xsk = &ifobject->xsk_arr[0 ]; + +if (!ifobject->rx_on) +return ; + + ifindex =if_nametoindex (ifobject->ifname); +if (!ifindex) +exit_with_error (errno); + + ret =xsk_setup_xdp_prog (ifindex, &ifobject->xsk_map_fd); +if (ret) +exit_with_error (-ret); + + ret =xsk_socket__update_xskmap (ifobject->xsk->xsk, ifobject->xsk_map_fd); +if (ret) +exit_with_error (-ret); }static void testapp_cleanup_xsk_res (struct ifobject *ifobj)
@@ -1142,14 +1158,16 @@ static void testapp_bidi(struct test_spec *test)static void swap_xsk_resources (struct ifobject *ifobj_tx,struct ifobject *ifobj_rx) { +int ret; +xsk_socket__delete (ifobj_tx->xsk->xsk); -xsk_umem__delete (ifobj_tx->umem->umem);xsk_socket__delete (ifobj_rx->xsk->xsk); -xsk_umem__delete (ifobj_rx->umem->umem); - ifobj_tx->umem = &ifobj_tx->umem_arr[1 ]; ifobj_tx->xsk = &ifobj_tx->xsk_arr[1 ]; - ifobj_rx->umem = &ifobj_rx->umem_arr[1 ]; ifobj_rx->xsk = &ifobj_rx->xsk_arr[1 ]; + + ret =xsk_socket__update_xskmap (ifobj_rx->xsk->xsk, ifobj_rx->xsk_map_fd); +if (ret) +exit_with_error (-ret); }static void testapp_bpf_res (struct test_spec *test)
@@ -1408,13 +1426,13 @@ static struct ifobject *ifobject_create(void)if (!ifobj->xsk_arr) goto out_xsk_arr; - ifobj->umem_arr =calloc (MAX_SOCKETS ,sizeof (*ifobj->umem_arr)); -if (!ifobj->umem_arr) - goto out_umem_arr; + ifobj->umem =calloc (1 ,sizeof (*ifobj->umem)); +if (!ifobj->umem) + goto out_umem;return ifobj; -out_umem_arr: +out_umem:free (ifobj->xsk_arr); out_xsk_arr:free (ifobj);
@@ -1423,7 +1441,7 @@ static struct ifobject *ifobject_create(void)static void ifobject_delete (struct ifobject *ifobj) { -free (ifobj->umem_arr); +free (ifobj->umem);free (ifobj->xsk_arr);free (ifobj); }
tools/testing/selftests/bpf/xdpxceiver.h +1 -1
@@ -125,10 +125,10 @@ struct ifobject {struct xsk_socket_info *xsk;struct xsk_socket_info *xsk_arr;struct xsk_umem_info *umem; -struct xsk_umem_info *umem_arr;thread_func_t func_ptr;struct pkt_stream *pkt_stream;int ns_fd; +int xsk_map_fd;u32 dst_ip;u32 src_ip;u32 xdp_flags;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 29/343 net/mlx5e: TC, Hold sample_attr on stack instead of pointer
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
[ Upstream commit eeed226ed110ed40598e60e29b66643012277be7 ]
In later commit we are going to instantiate multiple attr instances for flow instead of single attr.
Parsing TC sample allocates a new memory but there is no symmetric cleanup in the infrastructure.
To avoid asymmetric alloc/free use sample_attr as part of the flow attr and not allocated and held as a pointer.
This will avoid a cleanup leak when sample action is not on the first attr.
--- .../net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c | 7 +------ drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c | 10 +++++----- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 2 +- .../net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +++--- 5 files changed, 10 insertions(+), 16 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c +1 -6
@@ -27,11 +27,7 @@ tc_act_parse_sample(struct mlx5e_tc_act_parse_state *parse_state,struct mlx5e_priv *priv, struct mlx5_flow_attr *attr) { - struct mlx5e_sample_attr *sample_attr; - - sample_attr =kzalloc (sizeof (*attr->sample_attr),GFP_KERNEL ); -if (!sample_attr) -return -ENOMEM ; + struct mlx5e_sample_attr *sample_attr = &attr->sample_attr; sample_attr->rate = act->sample.rate; sample_attr->group_num = act->sample.psample_group->group_num;
@@ -39,7 +35,6 @@ tc_act_parse_sample(struct mlx5e_tc_act_parse_state *parse_state,if (act->sample.truncate) sample_attr->trunc_size = act->sample.trunc_size; - attr->sample_attr = sample_attr;flow_flag_set (parse_state->flow,SAMPLE );return 0 ;
drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c +5 -5
@@ -513,7 +513,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample, sample_flow =kzalloc (sizeof (*sample_flow),GFP_KERNEL );if (!sample_flow)return ERR_PTR (-ENOMEM ); - sample_attr = attr->sample_attr; + sample_attr = &attr->sample_attr; sample_attr->sample_flow = sample_flow;/* For NICs with reg_c_preserve support or decap action, use
@@ -546,6 +546,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample, err =PTR_ERR (sample_flow->sampler); goto err_sampler; } + sample_attr->sampler_id = sample_flow->sampler->sampler_id;/* Create an id mapping reg_c0 value to sample object. */ restore_obj.type =MLX5_MAPPED_OBJ_SAMPLE ;
@@ -585,8 +586,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample, pre_attr->outer_match_level = attr->outer_match_level; pre_attr->chain = attr->chain; pre_attr->prio = attr->prio; - pre_attr->sample_attr = attr->sample_attr; - sample_attr->sampler_id = sample_flow->sampler->sampler_id; + pre_attr->sample_attr = *sample_attr; pre_esw_attr = pre_attr->esw_attr; pre_esw_attr->in_mdev = esw_attr->in_mdev; pre_esw_attr->in_rep = esw_attr->in_rep;
@@ -633,11 +633,11 @@ mlx5e_tc_sample_unoffload(struct mlx5e_tc_psample *tc_psample,* will hit fw syndromes. */ esw = tc_psample->esw; - sample_flow = attr->sample_attr->sample_flow; + sample_flow = attr->sample_attr.sample_flow;mlx5_eswitch_del_offloaded_rule (esw, sample_flow->pre_rule, sample_flow->pre_attr);sample_restore_put (tc_psample, sample_flow->restore); -mapping_remove (esw->offloads.reg_c0_obj_pool, attr->sample_attr->restore_obj_id); +mapping_remove (esw->offloads.reg_c0_obj_pool, attr->sample_attr.restore_obj_id);sampler_put (tc_psample, sample_flow->sampler);if (sample_flow->post_act_handle)mlx5e_tc_post_act_del (tc_psample->post_act, sample_flow->post_act_handle);
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +0 -1
@@ -1634,7 +1634,6 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,if (flow_flag_test (flow,L3_TO_L2_DECAP ))mlx5e_detach_decap (priv, flow); -kfree (attr->sample_attr);kvfree (attr->esw_attr->rx_tun_attr);kvfree (attr->parse_attr);kfree (flow->attr);
drivers/net/ethernet/mellanox/mlx5/core/en_tc.h +1 -1
@@ -71,7 +71,7 @@ struct mlx5_flow_attr {struct mlx5_fc *counter;struct mlx5_modify_hdr *modify_hdr;struct mlx5_ct_attr ct_attr; -struct mlx5e_sample_attr *sample_attr; +struct mlx5e_sample_attr sample_attr;struct mlx5e_tc_flow_parse_attr *parse_attr;u32 chain;u16 prio;
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +3 -3
@@ -201,12 +201,12 @@ esw_cleanup_decap_indir(struct mlx5_eswitch *esw,static int esw_setup_sampler_dest (struct mlx5_flow_destination *dest,struct mlx5_flow_act *flow_act, -struct mlx5_flow_attr *attr, +u32 sampler_id,int i) { flow_act->flags |=FLOW_ACT_IGNORE_FLOW_LEVEL ; dest[i].type =MLX5_FLOW_DESTINATION_TYPE_FLOW_SAMPLER ; - dest[i].sampler_id = attr->sample_attr->sampler_id; + dest[i].sampler_id = sampler_id;return 0 ; }
@@ -466,7 +466,7 @@ esw_setup_dests(struct mlx5_flow_destination *dest, attr->flags |=MLX5_ESW_ATTR_FLAG_SRC_REWRITE ;if (attr->flags &MLX5_ESW_ATTR_FLAG_SAMPLE ) { -esw_setup_sampler_dest (dest, flow_act, attr, *i); +esw_setup_sampler_dest (dest, flow_act, attr->sample_attr.sampler_id, *i); (*i)++; }else if (attr->dest_ft) {esw_setup_ft_dest (dest, flow_act, esw, attr, spec, *i);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 30/343 drm/amdkfd: Dont take process mutex for svm ioctls
In reply to Greg Kroah-HartmanFrom: Philip Yang <[email protected]>
[ Upstream commit ac7c48c0cce00d03b3c95fddcccb0a45257e33e3 ]
SVM ioctls take proper svms->lock to handle race conditions, don't need take process mutex to serialize ioctls. This also fixes circular locking warning:
WARNING: possible circular locking dependency detected
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock((work_completion)(&svms->deferred_list_work));
lock(&process->mutex);
lock((work_completion)(&svms->deferred_list_work)); lock(&process->mutex);
*** DEADLOCK ***
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +0 -4
@@ -1846,13 +1846,9 @@ static int kfd_ioctl_svm(struct file *filep, struct kfd_process *p, void *data)if (!args->start_addr || !args->size)return -EINVAL ; -mutex_lock (&p->mutex); - r =svm_ioctl (p, args->op, args->start_addr, args->size, args->nattr, args->attrs); -mutex_unlock (&p->mutex); - return r; }#else
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 31/343 drm/amdkfd: Ensure mm remain valid in svm deferred_list work
In reply to Greg Kroah-HartmanFrom: Philip Yang <[email protected]>
[ Upstream commit 367c9b0f1b8750a704070e7ae85234d591290434 ]
svm_deferred_list work should continue to handle deferred_range_list which maybe split to child range to avoid child range leak, and remove ranges mmu interval notifier to avoid mm mm_count leak. So taking mm reference when adding range to deferred list, to ensure mm is valid in the scheduled deferred_list_work, and drop the mm referrence after range is handled.
--- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 62 ++++++++++++++++------------ 1 file changed, 36 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +36 -26
@@ -1985,10 +1985,9 @@ svm_range_update_notifier_and_interval_tree(struct mm_struct *mm, }static void -svm_range_handle_list_op (struct svm_range_list *svms,struct svm_range *prange) +svm_range_handle_list_op (struct svm_range_list *svms,struct svm_range *prange, +struct mm_struct *mm) { -struct mm_struct *mm = prange->work_item.mm; -switch (prange->work_item.op) {case SVM_OP_NULL : pr_debug("NULL OP 0x%p prange 0x%p [0x%lx 0x%lx]\n",
@@ -2071,34 +2070,41 @@ static void svm_range_deferred_list_work(struct work_struct *work)pr_debug ("enter svms 0x%p\n" , svms); p = container_of(svms, struct kfd_process, svms); -/* Avoid mm is gone when inserting mmu notifier */ - mm =get_task_mm (p->lead_thread); -if (!mm) { -pr_debug ("svms 0x%p process mm gone\n" , svms); -return ; - } -retry: -mmap_write_lock (mm); - -/* Checking for the need to drain retry faults must be inside -* mmap write lock to serialize with munmap notifiers. -*/ -if (unlikely (atomic_read (&svms->drain_pagefaults))) { -mmap_write_unlock (mm); -svm_range_drain_retry_fault (svms); - goto retry; - }spin_lock (&svms->deferred_list_lock);while (!list_empty (&svms->deferred_range_list)) { prange =list_first_entry (&svms->deferred_range_list, struct svm_range, deferred_list); -list_del_init (&prange->deferred_list);spin_unlock (&svms->deferred_list_lock);pr_debug ("prange 0x%p [0x%lx 0x%lx] op %d\n" , prange, prange->start, prange->last, prange->work_item.op); + mm = prange->work_item.mm; +retry: +mmap_write_lock (mm); + +/* Checking for the need to drain retry faults must be inside +* mmap write lock to serialize with munmap notifiers. +*/ +if (unlikely (atomic_read (&svms->drain_pagefaults))) { +mmap_write_unlock (mm); +svm_range_drain_retry_fault (svms); + goto retry; + } + +/* Remove from deferred_list must be inside mmap write lock, for +* two race cases: +* 1. unmap_from_cpu may change work_item.op and add the range +* to deferred_list again, cause use after free bug. +* 2. svm_range_list_lock_and_flush_work may hold mmap write +* lock and continue because deferred_list is empty, but +* deferred_list work is actually waiting for mmap lock. +*/ +spin_lock (&svms->deferred_list_lock); +list_del_init (&prange->deferred_list); +spin_unlock (&svms->deferred_list_lock); +mutex_lock (&svms->lock);mutex_lock (&prange->migrate_mutex);while (!list_empty (&prange->child_list)) {
@@ -2109,19 +2115,20 @@ static void svm_range_deferred_list_work(struct work_struct *work)pr_debug ("child prange 0x%p op %d\n" , pchild, pchild->work_item.op);list_del_init (&pchild->child_list); -svm_range_handle_list_op (svms, pchild); +svm_range_handle_list_op (svms, pchild, mm); }mutex_unlock (&prange->migrate_mutex); -svm_range_handle_list_op (svms, prange); +svm_range_handle_list_op (svms, prange, mm);mutex_unlock (&svms->lock); +mmap_write_unlock (mm); + +/* Pairs with mmget in svm_range_add_list_work */ +mmput (mm);spin_lock (&svms->deferred_list_lock); }spin_unlock (&svms->deferred_list_lock); - -mmap_write_unlock (mm); -mmput (mm);pr_debug ("exit svms 0x%p\n" , svms); }
@@ -2139,6 +2146,9 @@ svm_range_add_list_work(struct svm_range_list *svms, struct svm_range *prange, prange->work_item.op = op; }else { prange->work_item.op = op; + +/* Pairs with mmput in deferred_list_work */ +mmget (mm); prange->work_item.mm = mm;list_add_tail (&prange->deferred_list, &prange->svms->deferred_range_list);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/343 drm/amdkfd: svm range restore work deadlock when process exit
In reply to Greg Kroah-HartmanFrom: Philip Yang <[email protected]>
[ Upstream commit 6225bb3a88d22594aacea2485dc28ca12d596721 ]
kfd_process_notifier_release flush svm_range_restore_work which calls svm_range_list_lock_and_flush_work to flush deferred_list work, but if deferred_list work mmput release the last user, it will call exit_mmap -> notifier_release, it is deadlock with below backtrace.
Move flush svm_range_restore_work to kfd_process_wq_release to avoid deadlock. Then svm_range_restore_work take task->mm ref to avoid mm is gone while validating and mapping ranges to GPU.
Workqueue: events svm_range_deferred_list_work [amdgpu] Call Trace: wait_for_completion+0x94/0x100 __flush_work+0x12a/0x1e0 __cancel_work_timer+0x10e/0x190 cancel_delayed_work_sync+0x13/0x20 kfd_process_notifier_release+0x98/0x2a0 [amdgpu] __mmu_notifier_release+0x74/0x1f0 exit_mmap+0x170/0x200 mmput+0x5d/0x130 svm_range_deferred_list_work+0x104/0x230 [amdgpu] process_one_work+0x220/0x3c0
--- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 1 - drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 15 +++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_process.c +0 -1
@@ -1150,7 +1150,6 @@ static void kfd_process_notifier_release(struct mmu_notifier *mn,cancel_delayed_work_sync (&p->eviction_work);cancel_delayed_work_sync (&p->restore_work); -cancel_delayed_work_sync (&p->svms.restore_work);mutex_lock (&p->mutex);
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +9 -6
@@ -1643,13 +1643,14 @@ static void svm_range_restore_work(struct work_struct *work)pr_debug ("restore svm ranges\n" ); -/* kfd_process_notifier_release destroys this worker thread. So during -* the lifetime of this thread, kfd_process and mm will be valid. -*/ p = container_of(svms, struct kfd_process, svms); - mm = p->mm; -if (!mm) + +/* Keep mm reference when svm_range_validate_and_map ranges */ + mm =get_task_mm (p->lead_thread); +if (!mm) { +pr_debug ("svms 0x%p process mm gone\n" , svms);return ; + }svm_range_list_lock_and_flush_work (svms, mm);mutex_lock (&svms->lock);
@@ -1703,6 +1704,7 @@ static void svm_range_restore_work(struct work_struct *work) out_reschedule:mutex_unlock (&svms->lock);mmap_write_unlock (mm); +mmput (mm);/* If validation failed, reschedule another attempt */ if (evicted_ranges) {
@@ -2840,6 +2842,8 @@ void svm_range_list_fini(struct kfd_process *p)pr_debug ("pasid 0x%x svms 0x%p\n" , p->pasid, &p->svms); +cancel_delayed_work_sync (&p->svms.restore_work); +/* Ensure list work is finished before process is destroyed */ flush_work (&p->svms.deferred_list_work);
@@ -2850,7 +2854,6 @@ void svm_range_list_fini(struct kfd_process *p)atomic_inc (&p->svms.drain_pagefaults);svm_range_drain_retry_fault (&p->svms); -list_for_each_entry_safe (prange, next, &p->svms.list, list) {svm_range_unlink (prange);svm_range_remove_notifier (prange);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 33/343 drm/amdgpu: Fix an error message in rmmod
In reply to Greg Kroah-HartmanFrom: Tianci.Yin <[email protected]>
[ Upstream commit 7270e8957eb9aacf5914605d04865f3829a14bce ]
[why]
In rmmod procedure, kfd sends cp a dequeue request, but the request does not get response, then an error message "cp queue pipe 4 queue 0 preemption failed" printed.
[how]
Performing kfd suspending after disabling gfxoff can fix it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -2
@@ -2723,11 +2723,11 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev) } } -amdgpu_amdkfd_suspend (adev, false); -amdgpu_device_set_pg_state (adev,AMD_PG_STATE_UNGATE );amdgpu_device_set_cg_state (adev,AMD_CG_STATE_UNGATE ); +amdgpu_amdkfd_suspend (adev, false); +/* Workaroud for ASICs need to disable SMC first */ amdgpu_device_smu_fini_early (adev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 34/343 mlxsw: spectrum: Guard against invalid local ports
In reply to Greg Kroah-HartmanFrom: Amit Cohen <[email protected]>
[ Upstream commit bcdfd615f83b4bd04678109bf18022d1476e4bbf ]
When processing events generated by the device's firmware, the driver protects itself from events reported for non-existent local ports, but not for the CPU port (local port 0), which exists, but does not have all the fields as any local port.
This can result in a NULL pointer dereference when trying access 'struct mlxsw_sp_port' fields which are not initialized for CPU port.
Commit 63b08b1f6834 ("mlxsw: spectrum: Protect driver from buggy firmware") already handled such issue by bailing early when processing a PUDE event reported for the CPU port.
Generalize the approach by moving the check to a common function and making use of it in all relevant places.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +--- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 7 +++++++ drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 3 +-- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 +-- 4 files changed, 10 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +1 -3
@@ -2148,13 +2148,11 @@ static void mlxsw_sp_pude_event_func(const struct mlxsw_reg_info *reg,struct mlxsw_sp *mlxsw_sp = priv;struct mlxsw_sp_port *mlxsw_sp_port;enum mlxsw_reg_pude_oper_status status; -unsigned int max_ports;u16 local_port; - max_ports =mlxsw_core_max_ports (mlxsw_sp->core); local_port =mlxsw_reg_pude_local_port_get (pude_pl); -if (WARN_ON_ONCE (!local_port || local_port >= max_ports)) +if (WARN_ON_ONCE (!mlxsw_sp_local_port_is_valid (mlxsw_sp, local_port)))return ; mlxsw_sp_port = mlxsw_sp->ports[local_port];if (!mlxsw_sp_port)
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +7 -0
@@ -481,6 +481,13 @@ int mlxsw_sp_port_vlan_classification_set(struct mlxsw_sp_port *mlxsw_sp_port, bool is_8021ad_tagged, bool is_8021q_tagged); +static inline bool +mlxsw_sp_local_port_is_valid (struct mlxsw_sp *mlxsw_sp,u16 local_port) +{ +unsigned int max_ports =mlxsw_core_max_ports (mlxsw_sp->core); + +return local_port < max_ports && local_port; +}/* spectrum_buffers.c */ struct mlxsw_sp_hdroom_prio {
drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c +1 -2
@@ -568,12 +568,11 @@ void mlxsw_sp1_ptp_got_timestamp(struct mlxsw_sp *mlxsw_sp, bool ingress, u8 domain_number, u16 sequence_id, u64 timestamp) { - unsigned int max_ports = mlxsw_core_max_ports(mlxsw_sp->core); struct mlxsw_sp_port *mlxsw_sp_port;struct mlxsw_sp1_ptp_key key;u8 types; -if (WARN_ON_ONCE (local_port >= max_ports)) +if (WARN_ON_ONCE (!mlxsw_sp_local_port_is_valid (mlxsw_sp, local_port)))return ; mlxsw_sp_port = mlxsw_sp->ports[local_port];if (!mlxsw_sp_port)
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +1 -2
@@ -2616,7 +2616,6 @@ static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp, char *sfn_pl, int rec_index, bool adding) { - unsigned int max_ports = mlxsw_core_max_ports(mlxsw_sp->core); struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan;struct mlxsw_sp_bridge_device *bridge_device;struct mlxsw_sp_bridge_port *bridge_port;
@@ -2630,7 +2629,7 @@ static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp,mlxsw_reg_sfn_mac_unpack (sfn_pl, rec_index, mac, &fid, &local_port); -if (WARN_ON_ONCE (local_port >= max_ports)) +if (WARN_ON_ONCE (!mlxsw_sp_local_port_is_valid (mlxsw_sp, local_port)))return ; mlxsw_sp_port = mlxsw_sp->ports[local_port];if (!mlxsw_sp_port) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 35/343 RDMA/rtrs-clt: Do stop and failover outside reconnect work.
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit c1289d5d8502d62e5bc50ff066c9d6daabfc3264 ]
We can't do instant reconnect, not to DDoS server, but we should stop and failover earlier, so there is less service interruption.
To avoid deadlock, as error_recovery is called from different callback like rdma event or hb error handler, add a new err recovery_work.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 40 ++++++++++++++------------ drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 + 2 files changed, 23 insertions(+), 18 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +22 -18
@@ -297,6 +297,7 @@ static bool rtrs_clt_change_state_from_to(struct rtrs_clt_path *clt_path,return changed; } +static void rtrs_clt_stop_and_destroy_conns (struct rtrs_clt_path *clt_path);static void rtrs_rdma_error_recovery (struct rtrs_clt_con *con) {struct rtrs_clt_path *clt_path =to_clt_path (con->c.path);
@@ -304,16 +305,7 @@ static void rtrs_rdma_error_recovery(struct rtrs_clt_con *con)if (rtrs_clt_change_state_from_to (clt_path,RTRS_CLT_CONNECTED ,RTRS_CLT_RECONNECTING )) { -struct rtrs_clt_sess *clt = clt_path->clt; -unsigned int delay_ms; - -/* -* Normal scenario, reconnect if we were successfully connected -*/ - delay_ms = clt->reconnect_delay_sec *1000 ; -queue_delayed_work (rtrs_wq, &clt_path->reconnect_dwork, -msecs_to_jiffies (delay_ms + -prandom_u32 () %RTRS_RECONNECT_SEED )); +queue_work (rtrs_wq, &clt_path->err_recovery_work); }else {/* * Error can happen just on establishing new connection,
@@ -1511,6 +1503,22 @@ static void rtrs_clt_init_hb(struct rtrs_clt_path *clt_path)static void rtrs_clt_reconnect_work (struct work_struct *work);static void rtrs_clt_close_work (struct work_struct *work); +static void rtrs_clt_err_recovery_work (struct work_struct *work) +{ +struct rtrs_clt_path *clt_path; +struct rtrs_clt_sess *clt; +int delay_ms; + + clt_path = container_of(work, struct rtrs_clt_path, err_recovery_work); + clt = clt_path->clt; + delay_ms = clt->reconnect_delay_sec *1000 ; +rtrs_clt_stop_and_destroy_conns (clt_path); +queue_delayed_work (rtrs_wq, &clt_path->reconnect_dwork, +msecs_to_jiffies (delay_ms + +prandom_u32 () % +RTRS_RECONNECT_SEED )); +} +static struct rtrs_clt_path *alloc_path (struct rtrs_clt_sess *clt,const struct rtrs_addr *path,size_t con_num,u32 nr_poll_queues)
@@ -1562,6 +1570,7 @@ static struct rtrs_clt_path *alloc_path(struct rtrs_clt_sess *clt, clt_path->state =RTRS_CLT_CONNECTING ;atomic_set (&clt_path->connected_cnt,0 );INIT_WORK (&clt_path->close_work, rtrs_clt_close_work); +INIT_WORK (&clt_path->err_recovery_work, rtrs_clt_err_recovery_work);INIT_DELAYED_WORK (&clt_path->reconnect_dwork, rtrs_clt_reconnect_work);rtrs_clt_init_hb (clt_path);
@@ -2326,6 +2335,7 @@ static void rtrs_clt_close_work(struct work_struct *work) clt_path = container_of(work, struct rtrs_clt_path, close_work); +cancel_work_sync (&clt_path->err_recovery_work);cancel_delayed_work_sync (&clt_path->reconnect_dwork);rtrs_clt_stop_and_destroy_conns (clt_path);rtrs_clt_change_state_get_old (clt_path,RTRS_CLT_CLOSED ,NULL );
@@ -2638,7 +2648,6 @@ static void rtrs_clt_reconnect_work(struct work_struct *work) {struct rtrs_clt_path *clt_path;struct rtrs_clt_sess *clt; -unsigned int delay_ms;int err; clt_path = container_of(to_delayed_work(work), struct rtrs_clt_path,
@@ -2655,8 +2664,6 @@ static void rtrs_clt_reconnect_work(struct work_struct *work) } clt_path->reconnect_attempts++; -/* Stop everything */ -rtrs_clt_stop_and_destroy_conns (clt_path);msleep (RTRS_RECONNECT_BACKOFF );if (rtrs_clt_change_state_get_old (clt_path,RTRS_CLT_CONNECTING ,NULL )) { err =init_path (clt_path);
@@ -2669,11 +2676,7 @@ static void rtrs_clt_reconnect_work(struct work_struct *work) reconnect_again:if (rtrs_clt_change_state_get_old (clt_path,RTRS_CLT_RECONNECTING ,NULL )) { clt_path->stats->reconnects.fail_cnt++; - delay_ms = clt->reconnect_delay_sec *1000 ; -queue_delayed_work (rtrs_wq, &clt_path->reconnect_dwork, -msecs_to_jiffies (delay_ms + -prandom_u32 () % -RTRS_RECONNECT_SEED )); +queue_work (rtrs_wq, &clt_path->err_recovery_work); } }
@@ -2908,6 +2911,7 @@ int rtrs_clt_reconnect_from_sysfs(struct rtrs_clt_path *clt_path) &old_state);if (changed) { clt_path->reconnect_attempts =0 ; +rtrs_clt_stop_and_destroy_conns (clt_path);queue_delayed_work (rtrs_wq, &clt_path->reconnect_dwork,0 ); }if (changed || old_state ==RTRS_CLT_RECONNECTING ) {
drivers/infiniband/ulp/rtrs/rtrs-clt.h +1 -0
@@ -134,6 +134,7 @@ struct rtrs_clt_path {struct rtrs_clt_io_req *reqs;struct delayed_work reconnect_dwork;struct work_struct close_work; +struct work_struct err_recovery_work;unsigned int reconnect_attempts;bool established;struct rtrs_rbuf *rbufs;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 36/343 powerpc/xive: Export XIVE IPI information for online-only processors.
In reply to Greg Kroah-HartmanFrom: Sachin Sant <[email protected]>
[ Upstream commit 279d1a72c0f8021520f68ddb0a1346ff9ba1ea8c ]
Cédric pointed out that XIVE IPI information exported via sysfs (debug/powerpc/xive) display empty lines for processors which are not online.
Switch to using for_each_online_cpu() so that information is displayed for online-only processors.
--- arch/powerpc/sysdev/xive/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/sysdev/xive/common.c +1 -1
@@ -1791,7 +1791,7 @@ static int xive_ipi_debug_show(struct seq_file *m, void *private)if (xive_ops->debug_show) xive_ops->debug_show (m, private); -for_each_possible_cpu (cpu) +for_each_online_cpu (cpu)xive_debug_show_ipi (m, cpu);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 37/343 powerpc: dts: t104xrdb: fix phy type for FMAN 4/5
In reply to Greg Kroah-HartmanFrom: Maxim Kiselev <[email protected]>
[ Upstream commit 17846485dff91acce1ad47b508b633dffc32e838 ]
T1040RDB has two RTL8211E-VB phys which requires setting of internal delays for correct work.
Changing the phy-connection-type property to rgmii-id will fix this issue.
--- arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi +2 -2
@@ -139,12 +139,12 @@ fman@400000 { ethernet@e6000 { phy-handle = <&phy_rgmii_0>; - phy-connection-type = "rgmii"; + phy-connection-type = "rgmii-id"; }; ethernet@e8000 { phy-handle = <&phy_rgmii_1>; - phy-connection-type = "rgmii"; + phy-connection-type = "rgmii-id"; }; mdio0: mdio@fc000 {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 38/343 ath11k: fix kernel panic during unload/load ath11k modules
In reply to Greg Kroah-HartmanFrom: Venkateswara Naralasetty <[email protected]>
[ Upstream commit 22b59cb965f79ee1accf83172441c9ca0ecb632a ]
Call netif_napi_del() from ath11k_ahb_free_ext_irq() to fix the following kernel panic when unload/load ath11k modules for few iterations.
[ 971.201365] Unable to handle kernel paging request at virtual address 6d97a208 [ 971.204227] pgd = 594c2919 [ 971.211478] [6d97a208] *pgd=00000000 [ 971.214120] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 971.412024] CPU: 2 PID: 4435 Comm: insmod Not tainted 5.4.89 #0 [ 971.434256] Hardware name: Generic DT based system [ 971.440165] PC is at napi_by_id+0x10/0x40 [ 971.445019] LR is at netif_napi_add+0x160/0x1dc
[ 971.743127] (napi_by_id) from [<807d89a0>] (netif_napi_add+0x160/0x1dc) [ 971.751295] (netif_napi_add) from [<7f1209ac>] (ath11k_ahb_config_irq+0xf8/0x414 [ath11k_ahb]) [ 971.759164] (ath11k_ahb_config_irq [ath11k_ahb]) from [<7f12135c>] (ath11k_ahb_probe+0x40c/0x51c [ath11k_ahb]) [ 971.768567] (ath11k_ahb_probe [ath11k_ahb]) from [<80666864>] (platform_drv_probe+0x48/0x94) [ 971.779670] (platform_drv_probe) from [<80664718>] (really_probe+0x1c8/0x450) [ 971.789389] (really_probe) from [<80664cc4>] (driver_probe_device+0x15c/0x1b8) [ 971.797547] (driver_probe_device) from [<80664f60>] (device_driver_attach+0x44/0x60) [ 971.805795] (device_driver_attach) from [<806650a0>] (__driver_attach+0x124/0x140) [ 971.814822] (__driver_attach) from [<80662adc>] (bus_for_each_dev+0x58/0xa4) [ 971.823328] (bus_for_each_dev) from [<80663a2c>] (bus_add_driver+0xf0/0x1e8) [ 971.831662] (bus_add_driver) from [<806658a4>] (driver_register+0xa8/0xf0) [ 971.839822] (driver_register) from [<8030269c>] (do_one_initcall+0x78/0x1ac) [ 971.847638] (do_one_initcall) from [<80392524>] (do_init_module+0x54/0x200) [ 971.855968] (do_init_module) from [<803945b0>] (load_module+0x1e30/0x1ffc) [ 971.864126] (load_module) from [<803948b0>] (sys_init_module+0x134/0x17c) [ 971.871852] (sys_init_module) from [<80301000>] (ret_fast_syscall+0x0/0x50)
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.6.0.1-00760-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/ahb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath11k/ahb.c +2 -0
@@ -391,6 +391,8 @@ static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab)for (j =0 ; j < irq_grp->num_irq; j++)free_irq (ab->irq_num[irq_grp->irqs[j]], irq_grp); + +netif_napi_del (&irq_grp->napi); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/343 ath11k: pci: fix crash on suspend if board file is not found
In reply to Greg Kroah-HartmanFrom: Kalle Valo <[email protected]>
[ Upstream commit b4f4c56459a5c744f7f066b9fc2b54ea995030c5 ]
Mario reported that the kernel was crashing on suspend if ath11k was not able to find a board file:
[ 473.693286] PM: Suspending system (s2idle) [ 473.693291] printk: Suspending console(s) (use no_console_suspend to debug) [ 474.407787] BUG: unable to handle page fault for address: 0000000000002070 [ 474.407791] #PF: supervisor read access in kernel mode [ 474.407794] #PF: error_code(0x0000) - not-present page [ 474.407798] PGD 0 P4D 0 [ 474.407801] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 474.407805] CPU: 2 PID: 2350 Comm: kworker/u32:14 Tainted: G W 5.16.0 #248 [...] [ 474.407868] Call Trace: [ 474.407870] <TASK> [ 474.407874] ? _raw_spin_lock_irqsave+0x2a/0x60 [ 474.407882] ? lock_timer_base+0x72/0xa0 [ 474.407889] ? _raw_spin_unlock_irqrestore+0x29/0x3d [ 474.407892] ? try_to_del_timer_sync+0x54/0x80 [ 474.407896] ath11k_dp_rx_pktlog_stop+0x49/0xc0 [ath11k] [ 474.407912] ath11k_core_suspend+0x34/0x130 [ath11k] [ 474.407923] ath11k_pci_pm_suspend+0x1b/0x50 [ath11k_pci] [ 474.407928] pci_pm_suspend+0x7e/0x170 [ 474.407935] ? pci_pm_freeze+0xc0/0xc0 [ 474.407939] dpm_run_callback+0x4e/0x150 [ 474.407947] __device_suspend+0x148/0x4c0 [ 474.407951] async_suspend+0x20/0x90 dmesg-efi-164255130401001: Oops#1 Part1 [ 474.407955] async_run_entry_fn+0x33/0x120 [ 474.407959] process_one_work+0x220/0x3f0 [ 474.407966] worker_thread+0x4a/0x3d0 [ 474.407971] kthread+0x17a/0x1a0 [ 474.407975] ? process_one_work+0x3f0/0x3f0 [ 474.407979] ? set_kthread_struct+0x40/0x40 [ 474.407983] ret_from_fork+0x22/0x30 [ 474.407991] </TASK>
The issue here is that board file loading happens after ath11k_pci_probe() succesfully returns (ath11k initialisation happends asynchronously) and the suspend handler is still enabled, of course failing as ath11k is not properly initialised. Fix this by checking ATH11K_FLAG_QMI_FAIL during both suspend and resume.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
--- drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/ath/ath11k/pci.c +10 -0
@@ -1571,6 +1571,11 @@ static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev)struct ath11k_base *ab =dev_get_drvdata (dev);int ret; +if (test_bit (ATH11K_FLAG_QMI_FAIL , &ab->dev_flags)) { +ath11k_dbg (ab,ATH11K_DBG_BOOT ,"boot skipping pci suspend as qmi is not initialised\n" ); +return 0 ; + } + ret =ath11k_core_suspend (ab);if (ret)ath11k_warn (ab,"failed to suspend core: %d\n" , ret);
@@ -1583,6 +1588,11 @@ static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)struct ath11k_base *ab =dev_get_drvdata (dev);int ret; +if (test_bit (ATH11K_FLAG_QMI_FAIL , &ab->dev_flags)) { +ath11k_dbg (ab,ATH11K_DBG_BOOT ,"boot skipping pci resume as qmi is not initialised\n" ); +return 0 ; + } + ret =ath11k_core_resume (ab);if (ret)ath11k_warn (ab,"failed to resume core: %d\n" , ret);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 40/343 ath11k: mhi: use mhi_sync_power_up()
In reply to Greg Kroah-HartmanFrom: Kalle Valo <[email protected]>
[ Upstream commit 3df6d74aedfdca919cca475d15dfdbc8b05c9e5d ]
If amss.bin was missing ath11k would crash during 'rmmod ath11k_pci'. The reason for that was that we were using mhi_async_power_up() which does not check any errors. But mhi_sync_power_up() on the other hand does check for errors so let's use that to fix the crash.
I was not able to find a reason why an async version was used. ath11k_mhi_start() (which enables state ATH11K_MHI_POWER_ON) is called from ath11k_hif_power_up(), which can sleep. So sync version should be safe to use here.
[ 145.569731] general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC KASAN PTI [ 145.569789] KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] [ 145.569843] CPU: 2 PID: 1628 Comm: rmmod Kdump: loaded Tainted: G W 5.16.0-wt-ath+ #567 [ 145.569898] Hardware name: Intel(R) Client Systems NUC8i7HVK/NUC8i7HVB, BIOS HNKBLi70.86A.0067.2021.0528.1339 05/28/2021 [ 145.569956] RIP: 0010:ath11k_hal_srng_access_begin+0xb5/0x2b0 [ath11k] [ 145.570028] Code: df 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 ec 01 00 00 48 8b ab a8 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 ea 48 c1 ea 03 <0f> b6 14 02 48 89 e8 83 e0 07 83 c0 03 45 85 ed 75 48 38 d0 7c 08 [ 145.570089] RSP: 0018:ffffc900025d7ac0 EFLAGS: 00010246 [ 145.570144] RAX: dffffc0000000000 RBX: ffff88814fca2dd8 RCX: 1ffffffff50cb455 [ 145.570196] RDX: 0000000000000000 RSI: ffff88814fca2dd8 RDI: ffff88814fca2e80 [ 145.570252] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffffffa8659497 [ 145.570329] R10: fffffbfff50cb292 R11: 0000000000000001 R12: ffff88814fca0000 [ 145.570410] R13: 0000000000000000 R14: ffff88814fca2798 R15: ffff88814fca2dd8 [ 145.570465] FS: 00007fa399988540(0000) GS:ffff888233e00000(0000) knlGS:0000000000000000 [ 145.570519] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 145.570571] CR2: 00007fa399b51421 CR3: 0000000137898002 CR4: 00000000003706e0 [ 145.570623] Call Trace: [ 145.570675] <TASK> [ 145.570727] ? ath11k_ce_tx_process_cb+0x34b/0x860 [ath11k] [ 145.570797] ath11k_ce_tx_process_cb+0x356/0x860 [ath11k] [ 145.570864] ? tasklet_init+0x150/0x150 [ 145.570919] ? ath11k_ce_alloc_pipes+0x280/0x280 [ath11k] [ 145.570986] ? tasklet_clear_sched+0x42/0xe0 [ 145.571042] ? tasklet_kill+0xe9/0x1b0 [ 145.571095] ? tasklet_clear_sched+0xe0/0xe0 [ 145.571148] ? irq_has_action+0x120/0x120 [ 145.571202] ath11k_ce_cleanup_pipes+0x45a/0x580 [ath11k] [ 145.571270] ? ath11k_pci_stop+0x10e/0x170 [ath11k_pci] [ 145.571345] ath11k_core_stop+0x8a/0xc0 [ath11k] [ 145.571434] ath11k_core_deinit+0x9e/0x150 [ath11k] [ 145.571499] ath11k_pci_remove+0xd2/0x260 [ath11k_pci] [ 145.571553] pci_device_remove+0x9a/0x1c0 [ 145.571605] __device_release_driver+0x332/0x660 [ 145.571659] driver_detach+0x1e7/0x2c0 [ 145.571712] bus_remove_driver+0xe2/0x2d0 [ 145.571772] pci_unregister_driver+0x21/0x250 [ 145.571826] __do_sys_delete_module+0x30a/0x4b0 [ 145.571879] ? free_module+0xac0/0xac0 [ 145.571933] ? lockdep_hardirqs_on_prepare.part.0+0x18c/0x370 [ 145.571986] ? syscall_enter_from_user_mode+0x1d/0x50 [ 145.572039] ? lockdep_hardirqs_on+0x79/0x100 [ 145.572097] do_syscall_64+0x3b/0x90 [ 145.572153] entry_SYSCALL_64_after_hwframe+0x44/0xae
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
--- drivers/net/wireless/ath/ath11k/mhi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mhi.c +1 -1
@@ -561,7 +561,7 @@ static int ath11k_mhi_set_state(struct ath11k_pci *ab_pci, ret =0 ;break ;case ATH11K_MHI_POWER_ON : - ret =mhi_async_power_up (ab_pci->mhi_ctrl); + ret =mhi_sync_power_up (ab_pci->mhi_ctrl);break ;case ATH11K_MHI_POWER_OFF :mhi_power_down (ab_pci->mhi_ctrl, true);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/343 net/smc: Send directly when TCP_CORK is cleared
In reply to Greg Kroah-HartmanFrom: Tony Lu <[email protected]>
[ Upstream commit ea785a1a573b390a150010b3c5b81e1ccd8c98a8 ]
According to the man page of TCP_CORK [1], if set, don't send out partial frames. All queued partial frames are sent when option is cleared again.
When applications call setsockopt to disable TCP_CORK, this call is protected by lock_sock(), and tries to mod_delayed_work() to 0, in order to send pending data right now. However, the delayed work smc_tx_work is also protected by lock_sock(). There introduces lock contention for sending data.
To fix it, send pending data directly which acts like TCP, without lock_sock() protected in the context of setsockopt (already lock_sock()ed), and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
--- net/smc/af_smc.c | 4 ++-- net/smc/smc_tx.c | 25 +++++++++++++++---------- net/smc/smc_tx.h | 1 + 3 files changed, 18 insertions(+), 12 deletions(-)
net/smc/af_smc.c +2 -2
@@ -2636,8 +2636,8 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, sk->sk_state != SMC_CLOSED) {if (!val) {SMC_STAT_INC (smc, cork_cnt); -mod_delayed_work (smc->conn.lgr->tx_wq, - &smc->conn.tx_work,0 ); +smc_tx_pending (&smc->conn); +cancel_delayed_work (&smc->conn.tx_work); } }break ;
net/smc/smc_tx.c +15 -10
@@ -597,27 +597,32 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn)return rc; } -/* Wakeup sndbuf consumers from process context -* since there is more data to transmit -*/ -void smc_tx_work (struct work_struct *work) +void smc_tx_pending (struct smc_connection *conn) { -struct smc_connection *conn =container_of (to_delayed_work (work), - struct smc_connection, - tx_work); struct smc_sock *smc = container_of(conn, struct smc_sock, conn);int rc; -lock_sock (&smc->sk);if (smc->sk.sk_err) - goto out; +return ; rc =smc_tx_sndbuf_nonempty (conn);if (!rc && conn->local_rx_ctrl.prod_flags.write_blocked && !atomic_read (&conn->bytes_to_rcv)) conn->local_rx_ctrl.prod_flags.write_blocked =0 ; +} + +/* Wakeup sndbuf consumers from process context +* since there is more data to transmit +*/ +void smc_tx_work (struct work_struct *work) +{ +struct smc_connection *conn =container_of (to_delayed_work (work), + struct smc_connection, + tx_work); + struct smc_sock *smc = container_of(conn, struct smc_sock, conn); -out: +lock_sock (&smc->sk); +smc_tx_pending (conn);release_sock (&smc->sk); }
net/smc/smc_tx.h +1 -0
@@ -27,6 +27,7 @@ static inline int smc_tx_prepared_sends(struct smc_connection *conn)return smc_curs_diff (conn->sndbuf_desc->len, &sent, &prep); } +void smc_tx_pending (struct smc_connection *conn);void smc_tx_work (struct work_struct *work);void smc_tx_init (struct smc_sock *smc);int smc_tx_sendmsg (struct smc_sock *smc,struct msghdr *msg,size_t len);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 42/343 drm/bridge: Add missing pm_runtime_put_sync
In reply to Greg Kroah-HartmanFrom: Yongzhi Liu <[email protected]>
[ Upstream commit 46f47807738441e354873546dde0b000106c068a ]
pm_runtime_get_sync() will increase the rumtime PM counter even when it returns an error. Thus a pairing decrement is needed to prevent refcount leak. Fix this by replacing this API with pm_runtime_resume_and_get(), which will not change the runtime PM counter on error. Besides, a matching decrement is needed on the error handling path to keep the counter balanced.
--- drivers/gpu/drm/bridge/nwl-dsi.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/nwl-dsi.c +12 -6
@@ -861,18 +861,19 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge,memcpy (&dsi->mode, adjusted_mode,sizeof (dsi->mode));drm_mode_debug_printmodeline (adjusted_mode); -pm_runtime_get_sync (dev); +if (pm_runtime_resume_and_get (dev) <0 ) +return ;if (clk_prepare_enable (dsi->lcdif_clk) <0 ) -return ; + goto runtime_put;if (clk_prepare_enable (dsi->core_clk) <0 ) -return ; + goto runtime_put;/* Step 1 from DSI reset-out instructions */ ret =reset_control_deassert (dsi->rst_pclk);if (ret <0 ) {DRM_DEV_ERROR (dev,"Failed to deassert PCLK: %d\n" , ret); -return ; + goto runtime_put; }/* Step 2 from DSI reset-out instructions */
@@ -882,13 +883,18 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, ret =reset_control_deassert (dsi->rst_esc);if (ret <0 ) {DRM_DEV_ERROR (dev,"Failed to deassert ESC: %d\n" , ret); -return ; + goto runtime_put; } ret =reset_control_deassert (dsi->rst_byte);if (ret <0 ) {DRM_DEV_ERROR (dev,"Failed to deassert BYTE: %d\n" , ret); -return ; + goto runtime_put; } + +return ; + +runtime_put: +pm_runtime_put_sync (dev); } static void
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/343 bpf: Make dst_port field in struct bpf_sock 16-bit wide
In reply to Greg Kroah-HartmanFrom: Jakub Sitnicki <[email protected]>
[ Upstream commit 4421a582718ab81608d8486734c18083b822390d ]
Menglong Dong reports that the documentation for the dst_port field in struct bpf_sock is inaccurate and confusing. From the BPF program PoV, the field is a zero-padded 16-bit integer in network byte order. The value appears to the BPF user as if laid out in memory as so:
offsetof(struct bpf_sock, dst_port) + 0 <port MSB>
+ 8 <port LSB>
+16 0x00
+24 0x0032-, 16-, and 8-bit wide loads from the field are all allowed, but only if the offset into the field is 0.
32-bit wide loads from dst_port are especially confusing. The loaded value, after converting to host byte order with bpf_ntohl(dst_port), contains the port number in the upper 16-bits.
Remove the confusion by splitting the field into two 16-bit fields. For backward compatibility, allow 32-bit wide loads from offsetof(struct bpf_sock, dst_port).
While at it, allow loads 8-bit loads at offset [0] and [1] from dst_port.
--- include/uapi/linux/bpf.h | 3 ++- net/core/filter.c | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +2 -1
@@ -5500,7 +5500,8 @@ struct bpf_sock {__u32 src_ip4;__u32 src_ip6[4 ];__u32 src_port;/* host byte order */ -__u32 dst_port;/* network byte order */ +__be16 dst_port;/* network byte order */ + __u16 :16 ;/* zero padding */ __u32 dst_ip4;__u32 dst_ip6[4 ];__u32 state;
net/core/filter.c +9 -1
@@ -8033,6 +8033,7 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type, struct bpf_insn_access_aux *info) {const int size_default =sizeof (__u32); +int field_size;if (off <0 || off >=sizeof (struct bpf_sock ))return false;
@@ -8044,7 +8045,6 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type,case offsetof(struct bpf_sock , family):case offsetof(struct bpf_sock , type):case offsetof(struct bpf_sock , protocol): -case offsetof(struct bpf_sock , dst_port):case offsetof(struct bpf_sock , src_port):case offsetof(struct bpf_sock , rx_queue_mapping): case bpf_ctx_range(struct bpf_sock, src_ip4):
@@ -8053,6 +8053,14 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type, case bpf_ctx_range_till(struct bpf_sock, dst_ip6[0], dst_ip6[3]):bpf_ctx_record_field_size (info, size_default);return bpf_ctx_narrow_access_ok (off, size, size_default); + case bpf_ctx_range(struct bpf_sock, dst_port): + field_size = size == size_default ? + size_default : sizeof_field(struct bpf_sock, dst_port); +bpf_ctx_record_field_size (info, field_size); +return bpf_ctx_narrow_access_ok (off, size, field_size); + case offsetofend(struct bpf_sock, dst_port) ... + offsetof(struct bpf_sock, dst_ip4) - 1: +return false; }return size == size_default;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 44/343 scsi: mvsas: Replace snprintf() with sysfs_emit()
In reply to Greg Kroah-HartmanFrom: Yang Guang <[email protected]>
[ Upstream commit 0ad3867b0f13e45cfee5a1298bfd40eef096116c ]
coccinelle report:
./drivers/scsi/mvsas/mv_init.c:699:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/mvsas/mv_init.c:747:8-16:
WARNING: use scnprintf or sprintf
Use sysfs_emit() instead of scnprintf() or sprintf().
--- drivers/scsi/mvsas/mv_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/mvsas/mv_init.c +2 -2
@@ -696,7 +696,7 @@ static struct pci_driver mvs_pci_driver = {static ssize_t driver_version_show (struct device *cdev,struct device_attribute *attr,char *buffer) { -return snprintf (buffer,PAGE_SIZE ,"%s\n" ,DRV_VERSION ); +return sysfs_emit (buffer,"%s\n" ,DRV_VERSION ); }static DEVICE_ATTR_RO (driver_version);
@@ -744,7 +744,7 @@ static ssize_t interrupt_coalescing_store(struct device *cdev,static ssize_t interrupt_coalescing_show (struct device *cdev,struct device_attribute *attr,char *buffer) { -return snprintf (buffer,PAGE_SIZE ,"%d\n" , interrupt_coalescing); +return sysfs_emit (buffer,"%d\n" , interrupt_coalescing); }static DEVICE_ATTR_RW (interrupt_coalescing);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 45/343 scsi: bfa: Replace snprintf() with sysfs_emit()
In reply to Greg Kroah-HartmanFrom: Yang Guang <[email protected]>
[ Upstream commit 2245ea91fd3a04cafbe2f54911432a8657528c3b ]
coccinelle report:
./drivers/scsi/bfa/bfad_attr.c:908:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:860:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:888:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:853:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:808:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:728:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:822:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:927:9-17:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:900:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:874:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:714:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:839:8-16:
WARNING: use scnprintf or sprintf
Use sysfs_emit() instead of scnprintf() or sprintf().
--- drivers/scsi/bfa/bfad_attr.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/scsi/bfa/bfad_attr.c +13 -13
@@ -711,7 +711,7 @@ bfad_im_serial_num_show(struct device *dev, struct device_attribute *attr,char serial_num[BFA_ADAPTER_SERIAL_NUM_LEN ];bfa_get_adapter_serial_num (&bfad->bfa, serial_num); -return snprintf (buf,PAGE_SIZE ,"%s\n" , serial_num); +return sysfs_emit (buf,"%s\n" , serial_num); } static ssize_t
@@ -725,7 +725,7 @@ bfad_im_model_show(struct device *dev, struct device_attribute *attr,char model[BFA_ADAPTER_MODEL_NAME_LEN ];bfa_get_adapter_model (&bfad->bfa, model); -return snprintf (buf,PAGE_SIZE ,"%s\n" , model); +return sysfs_emit (buf,"%s\n" , model); } static ssize_t
@@ -805,7 +805,7 @@ bfad_im_model_desc_show(struct device *dev, struct device_attribute *attr,snprintf (model_descr,BFA_ADAPTER_MODEL_DESCR_LEN ,"Invalid Model" ); -return snprintf (buf,PAGE_SIZE ,"%s\n" , model_descr); +return sysfs_emit (buf,"%s\n" , model_descr); } static ssize_t
@@ -819,7 +819,7 @@ bfad_im_node_name_show(struct device *dev, struct device_attribute *attr,u64 nwwn; nwwn =bfa_fcs_lport_get_nwwn (port->fcs_port); -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" ,cpu_to_be64 (nwwn)); +return sysfs_emit (buf,"0x%llx\n" ,cpu_to_be64 (nwwn)); } static ssize_t
@@ -836,7 +836,7 @@ bfad_im_symbolic_name_show(struct device *dev, struct device_attribute *attr,bfa_fcs_lport_get_attr (&bfad->bfa_fcs.fabric.bport, &port_attr);strlcpy (symname, port_attr.port_cfg.sym_name.symname,BFA_SYMNAME_MAXLEN ); -return snprintf (buf,PAGE_SIZE ,"%s\n" , symname); +return sysfs_emit (buf,"%s\n" , symname); } static ssize_t
@@ -850,14 +850,14 @@ bfad_im_hw_version_show(struct device *dev, struct device_attribute *attr,char hw_ver[BFA_VERSION_LEN ];bfa_get_pci_chip_rev (&bfad->bfa, hw_ver); -return snprintf (buf,PAGE_SIZE ,"%s\n" , hw_ver); +return sysfs_emit (buf,"%s\n" , hw_ver); }static ssize_t bfad_im_drv_version_show (struct device *dev,struct device_attribute *attr,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%s\n" ,BFAD_DRIVER_VERSION ); +return sysfs_emit (buf,"%s\n" ,BFAD_DRIVER_VERSION ); } static ssize_t
@@ -871,7 +871,7 @@ bfad_im_optionrom_version_show(struct device *dev,char optrom_ver[BFA_VERSION_LEN ];bfa_get_adapter_optrom_ver (&bfad->bfa, optrom_ver); -return snprintf (buf,PAGE_SIZE ,"%s\n" , optrom_ver); +return sysfs_emit (buf,"%s\n" , optrom_ver); } static ssize_t
@@ -885,7 +885,7 @@ bfad_im_fw_version_show(struct device *dev, struct device_attribute *attr,char fw_ver[BFA_VERSION_LEN ];bfa_get_adapter_fw_ver (&bfad->bfa, fw_ver); -return snprintf (buf,PAGE_SIZE ,"%s\n" , fw_ver); +return sysfs_emit (buf,"%s\n" , fw_ver); } static ssize_t
@@ -897,7 +897,7 @@ bfad_im_num_of_ports_show(struct device *dev, struct device_attribute *attr, (struct bfad_im_port_s *) shost->hostdata[0 ];struct bfad_s *bfad = im_port->bfad; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return sysfs_emit (buf,"%d\n" ,bfa_get_nports (&bfad->bfa)); }
@@ -905,7 +905,7 @@ static ssize_t bfad_im_drv_name_show(struct device *dev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%s\n", BFAD_DRIVER_NAME); + return sysfs_emit(buf, "%s\n", BFAD_DRIVER_NAME); } static ssize_t
@@ -924,14 +924,14 @@ bfad_im_num_of_discovered_ports_show(struct device *dev, rports =kcalloc (nrports,sizeof (struct bfa_rport_qualifier_s ),GFP_ATOMIC );if (rports ==NULL ) -return snprintf (buf,PAGE_SIZE ,"Failed\n" ); +return sysfs_emit (buf,"Failed\n" );spin_lock_irqsave (&bfad->bfad_lock, flags);bfa_fcs_lport_get_rport_quals (port->fcs_port, rports, &nrports);spin_unlock_irqrestore (&bfad->bfad_lock, flags);kfree (rports); -return snprintf (buf,PAGE_SIZE ,"%d\n" , nrports); +return sysfs_emit (buf,"%d\n" , nrports); } static DEVICE_ATTR(serial_number, S_IRUGO,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/343 drm/v3d: fix missing unlock
In reply to Greg Kroah-HartmanFrom: Yongzhi Liu <[email protected]>
[ Upstream commit e57c1a3bd5e8e0c7181f65ae55581f0236a8f284 ]
[why]
Unlock is needed on the error handling path to prevent dead lock. v3d_submit_cl_ioctl and v3d_submit_csd_ioctl is missing unlock.
[how]
Fix this by changing goto target on the error handling path. So changing the goto to target an error handling path that includes drm_gem_unlock reservations.
--- drivers/gpu/drm/v3d/v3d_gem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/v3d/v3d_gem.c +4 -2
@@ -798,7 +798,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,if (!render->base.perfmon) { ret = -ENOENT ; - goto fail; + goto fail_perfmon; } }
@@ -847,6 +847,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, fail_unreserve:mutex_unlock (&v3d->sched_lock); +fail_perfmon:drm_gem_unlock_reservations (last_job->bo, last_job->bo_count, &acquire_ctx); fail:
@@ -1027,7 +1028,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, args->perfmon_id);if (!job->base.perfmon) { ret = -ENOENT ; - goto fail; + goto fail_perfmon; } }
@@ -1056,6 +1057,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, fail_unreserve:mutex_unlock (&v3d->sched_lock); +fail_perfmon:drm_gem_unlock_reservations (clean_job->bo, clean_job->bo_count, &acquire_ctx); fail:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 47/343 power: supply: axp20x_battery: properly report current when discharging
In reply to Greg Kroah-HartmanFrom: Evgeny Boger <[email protected]>
[ Upstream commit d4f408cdcd26921c1268cb8dcbe8ffb6faf837f3 ]
As stated in [1], negative current values are used for discharging batteries.
AXP PMICs internally have two different ADC channels for shunt current
measurement: one used during charging and one during discharging. The values reported by these ADCs are unsigned.
While the driver properly selects ADC channel to get the data from, it doesn't apply negative sign when reporting discharging current.
[1] Documentation/ABI/testing/sysfs-class-power
--- drivers/power/supply/axp20x_battery.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/power/supply/axp20x_battery.c +6 -7
@@ -186,7 +186,6 @@ static int axp20x_battery_get_prop(struct power_supply *psy, union power_supply_propval *val) {struct axp20x_batt_ps *axp20x_batt =power_supply_get_drvdata (psy); -struct iio_channel *chan;int ret =0 , reg, val1;switch (psp) {
@@ -266,12 +265,12 @@ static int axp20x_battery_get_prop(struct power_supply *psy,if (ret)return ret; -if (reg &AXP20X_PWR_STATUS_BAT_CHARGING ) - chan = axp20x_batt->batt_chrg_i; -else - chan = axp20x_batt->batt_dischrg_i; - - ret =iio_read_channel_processed (chan, &val->intval); +if (reg &AXP20X_PWR_STATUS_BAT_CHARGING ) { + ret =iio_read_channel_processed (axp20x_batt->batt_chrg_i, &val->intval); + }else { + ret =iio_read_channel_processed (axp20x_batt->batt_dischrg_i, &val1); + val->intval = -val1; + }if (ret)return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 48/343 mt76: mt7921: fix crash when startup fails.
In reply to Greg Kroah-HartmanFrom: Ben Greear <[email protected]>
[ Upstream commit 827e7799c61b978fbc2cc9dac66cb62401b2b3f0 ]
If the nic fails to start, it is possible that the reset_work has already been scheduled. Ensure the work item is canceled so we do not have use-after-free crash in case cleanup is called before the work item is executed.
This fixes crash on my x86_64 apu2 when mt7921k radio fails to work. Radio still fails, but OS does not crash.
--- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -0
@@ -273,6 +273,7 @@ static void mt7921_stop(struct ieee80211_hw *hw)cancel_delayed_work_sync (&dev->pm.ps_work);cancel_work_sync (&dev->pm.wake_work); +cancel_work_sync (&dev->reset_work);mt76_connac_free_pending_tx_skbs (&dev->pm,NULL );mt7921_mutex_acquire (dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 49/343 mt76: dma: initialize skip_unmap in mt76_dma_rx_fill
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 577298ec55dfc8b9aece54520f0258c3f93a6573 ]
Even if it is only a false-positive since skip_buf0/skip_buf1 are only used in mt76_dma_tx_cleanup_idx routine, initialize skip_unmap in mt76_dma_rx_fill in order to fix the following UBSAN report:
[ 13.924906] UBSAN: invalid-load in linux-5.15.0/drivers/net/wireless/mediatek/mt76/dma.c:162:13 [ 13.924909] load of value 225 is not a valid value for type '_Bool' [ 13.924912] CPU: 9 PID: 672 Comm: systemd-udevd Not tainted 5.15.0-18-generic #18-Ubuntu [ 13.924914] Hardware name: LENOVO 21A0000CMX/21A0000CMX, BIOS R1MET43W (1.13 ) 11/05/2021 [ 13.924915] Call Trace: [ 13.924917] <TASK> [ 13.924920] show_stack+0x52/0x58 [ 13.924925] dump_stack_lvl+0x4a/0x5f [ 13.924931] dump_stack+0x10/0x12 [ 13.924932] ubsan_epilogue+0x9/0x45 [ 13.924934] __ubsan_handle_load_invalid_value.cold+0x44/0x49 [ 13.924935] ? __iommu_dma_map+0x84/0xf0 [ 13.924939] mt76_dma_add_buf.constprop.0.cold+0x23/0x85 [mt76] [ 13.924949] mt76_dma_rx_fill.isra.0+0x102/0x1f0 [mt76] [ 13.924954] mt76_dma_init+0xc9/0x150 [mt76] [ 13.924959] ? mt7921_dma_enable+0x110/0x110 [mt7921e] [ 13.924966] mt7921_dma_init+0x1e3/0x260 [mt7921e] [ 13.924970] mt7921_register_device+0x29d/0x510 [mt7921e] [ 13.924975] mt7921_pci_probe.part.0+0x17f/0x1b0 [mt7921e] [ 13.924980] mt7921_pci_probe+0x43/0x60 [mt7921e] [ 13.924984] local_pci_probe+0x4b/0x90 [ 13.924987] pci_device_probe+0x115/0x1f0 [ 13.924989] really_probe+0x21e/0x420 [ 13.924992] __driver_probe_device+0x115/0x190 [ 13.924994] driver_probe_device+0x23/0xc0 [ 13.924996] __driver_attach+0xbd/0x1d0 [ 13.924998] ? __device_attach_driver+0x110/0x110 [ 13.924999] bus_for_each_dev+0x7e/0xc0 [ 13.925001] driver_attach+0x1e/0x20 [ 13.925003] bus_add_driver+0x135/0x200 [ 13.925005] driver_register+0x95/0xf0 [ 13.925008] ? 0xffffffffc0766000 [ 13.925010] __pci_register_driver+0x68/0x70 [ 13.925011] mt7921_pci_driver_init+0x23/0x1000 [mt7921e] [ 13.925015] do_one_initcall+0x48/0x1d0 [ 13.925019] ? kmem_cache_alloc_trace+0x19e/0x2e0 [ 13.925022] do_init_module+0x62/0x280 [ 13.925025] load_module+0xac9/0xbb0 [ 13.925027] __do_sys_finit_module+0xbf/0x120 [ 13.925029] __x64_sys_finit_module+0x18/0x20 [ 13.925030] do_syscall_64+0x5c/0xc0 [ 13.925033] ? do_syscall_64+0x69/0xc0 [ 13.925034] ? sysvec_reschedule_ipi+0x78/0xe0 [ 13.925036] ? asm_sysvec_reschedule_ipi+0xa/0x20 [ 13.925039] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 13.925040] RIP: 0033:0x7fbf2b90f94d [ 13.925045] RSP: 002b:00007ffe2ec7e5d8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 13.925047] RAX: ffffffffffffffda RBX: 000056106b0634e0 RCX: 00007fbf2b90f94d [ 13.925048] RDX: 0000000000000000 RSI: 00007fbf2baa3441 RDI: 0000000000000013 [ 13.925049] RBP: 0000000000020000 R08: 0000000000000000 R09: 0000000000000002 [ 13.925050] R10: 0000000000000013 R11: 0000000000000246 R12: 00007fbf2baa3441 [ 13.925051] R13: 000056106b062620 R14: 000056106b0610c0 R15: 000056106b0640d0 [ 13.925053] </TASK>
--- drivers/net/wireless/mediatek/mt76/dma.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/dma.c +1 -0
@@ -465,6 +465,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) qbuf.addr = addr + offset; qbuf.len = len - offset; + qbuf.skip_unmap = false;mt76_dma_add_buf (dev, q, &qbuf,1 ,0 , buf,NULL ); frames++; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/343 i40e: Add sending commands in atomic context
In reply to Greg Kroah-HartmanFrom: Jedrzej Jagielski <[email protected]>
[ Upstream commit 59b3d7350ff35c939b8e173eb2eecac80a5ee046 ]
Change functions:
- i40e_aq_add_macvlan
- i40e_aq_remove_macvlan
- i40e_aq_delete_element
- i40e_aq_add_vsi
- i40e_aq_update_vsi_params
to explicitly use i40e_asq_send_command_atomic(..., true) instead of i40e_asq_send_command, as they use mutexes and do some work in an atomic context.
Without this change setting vlan via netdev will fail with call trace cased by bug "BUG: scheduling while atomic".
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +12 -9
@@ -1899,8 +1899,9 @@ i40e_status i40e_aq_add_vsi(struct i40e_hw *hw, desc.flags |=cpu_to_le16 ((u16)(I40E_AQ_FLAG_BUF |I40E_AQ_FLAG_RD )); - status =i40e_asq_send_command (hw, &desc, &vsi_ctx->info, -sizeof (vsi_ctx->info), cmd_details); + status =i40e_asq_send_command_atomic (hw, &desc, &vsi_ctx->info, +sizeof (vsi_ctx->info), + cmd_details, true);if (status) goto aq_add_vsi_exit;
@@ -2287,8 +2288,9 @@ i40e_status i40e_aq_update_vsi_params(struct i40e_hw *hw, desc.flags |=cpu_to_le16 ((u16)(I40E_AQ_FLAG_BUF |I40E_AQ_FLAG_RD )); - status =i40e_asq_send_command (hw, &desc, &vsi_ctx->info, -sizeof (vsi_ctx->info), cmd_details); + status =i40e_asq_send_command_atomic (hw, &desc, &vsi_ctx->info, +sizeof (vsi_ctx->info), + cmd_details, true); vsi_ctx->vsis_allocated =le16_to_cpu (resp->vsi_used); vsi_ctx->vsis_unallocated =le16_to_cpu (resp->vsi_free);
@@ -2673,8 +2675,8 @@ i40e_status i40e_aq_add_macvlan(struct i40e_hw *hw, u16 seid,if (buf_size >I40E_AQ_LARGE_BUF ) desc.flags |=cpu_to_le16 ((u16 )I40E_AQ_FLAG_LB ); - status =i40e_asq_send_command (hw, &desc, mv_list, buf_size, - cmd_details); + status =i40e_asq_send_command_atomic (hw, &desc, mv_list, buf_size, + cmd_details, true);return status; }
@@ -2715,8 +2717,8 @@ i40e_status i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 seid,if (buf_size >I40E_AQ_LARGE_BUF ) desc.flags |=cpu_to_le16 ((u16 )I40E_AQ_FLAG_LB ); - status =i40e_asq_send_command (hw, &desc, mv_list, buf_size, - cmd_details); + status =i40e_asq_send_command_atomic (hw, &desc, mv_list, buf_size, + cmd_details, true);return status; }
@@ -3868,7 +3870,8 @@ i40e_status i40e_aq_delete_element(struct i40e_hw *hw, u16 seid, cmd->seid =cpu_to_le16 (seid); - status =i40e_asq_send_command (hw, &desc,NULL ,0 , cmd_details); + status =i40e_asq_send_command_atomic (hw, &desc,NULL ,0 , + cmd_details, true);return status; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 51/343 cfg80211: dont add non transmitted BSS to 6GHz scanned channels
In reply to Greg Kroah-HartmanFrom: Avraham Stern <[email protected]>
[ Upstream commit 5666ee154f4696c011dfa8544aaf5591b6b87515 ]
When adding 6GHz channels to scan request based on reported co-located APs, don't add channels that have only APs with "non-transmitted" BSSes if they only match the wildcard SSID since they will be found by probing the "transmitted" BSS.
--- net/wireless/scan.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/wireless/scan.c +8 -1
@@ -700,8 +700,12 @@ static bool cfg80211_find_ssid_match(struct cfg80211_colocated_ap *ap,for (i =0 ; i < request->n_ssids; i++) {/* wildcard ssid in the scan request */ -if (!request->ssids[i].ssid_len) +if (!request->ssids[i].ssid_len) { +if (ap->multi_bss && !ap->transmitted_bssid) +continue ; +return true; + }if (ap->ssid_len && ap->ssid_len == request->ssids[i].ssid_len) {
@@ -827,6 +831,9 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev) !cfg80211_find_ssid_match(ap, request))continue ; +if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid) +continue ; +cfg80211_scan_req_add_chan (request, chan, true);memcpy (scan_6ghz_params->bssid, ap->bssid,ETH_ALEN ); scan_6ghz_params->short_ssid = ap->short_ssid;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 52/343 libbpf: Fix build issue with llvm-readelf
In reply to Greg Kroah-HartmanFrom: Yonghong Song <[email protected]>
[ Upstream commit 0908a66ad1124c1634c33847ac662106f7f2c198 ]
There are cases where clang compiler is packaged in a way readelf is a symbolic link to llvm-readelf. In such cases, llvm-readelf will be used instead of default binutils readelf, and the following error will appear during libbpf build:
# Warning: Num of global symbols in
# /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) # does NOT match with num of versioned symbols in # /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). # Please make sure all LIBBPF_API symbols are versioned in libbpf.map. # --- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... # +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... # @@ -324,6 +324,22 @@ # btf__str_by_offset # btf__type_by_id # btf__type_cnt # +LIBBPF_0.0.1 # +LIBBPF_0.0.2 # +LIBBPF_0.0.3 # +LIBBPF_0.0.4 # +LIBBPF_0.0.5 # +LIBBPF_0.0.6 # +LIBBPF_0.0.7 # +LIBBPF_0.0.8 # +LIBBPF_0.0.9 # +LIBBPF_0.1.0 # +LIBBPF_0.2.0 # +LIBBPF_0.3.0 # +LIBBPF_0.4.0 # +LIBBPF_0.5.0 # +LIBBPF_0.6.0 # +LIBBPF_0.7.0 # libbpf_attach_type_by_name # libbpf_find_kernel_btf # libbpf_find_vmlinux_btf_id
# make[2]: *** [Makefile:184: check_abi] Error 1
# make[1]: *** [Makefile:140: all] Error 2
The above failure is due to different printouts for some ABS versioned symbols. For example, with the same libbpf.so,
$ /bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS
134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0
202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0
...
$ /opt/llvm/bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS
134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0@@LIBBPF_0.5.0
202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0@@LIBBPF_0.6.0
...
The binutils readelf doesn't print out the symbol LIBBPF_* version and llvm-readelf does.
Such a difference caused libbpf build failure with llvm-readelf.The proposed fix filters out all ABS symbols as they are not part of the comparison. This works for both binutils readelf and llvm-readelf.
--- tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/Makefile +2 -2
@@ -131,7 +131,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s -- sort -u | wc -l) VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ + awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}' | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) CMD_TARGETS = $(LIB_TARGET) $(PC_FILE)
@@ -194,7 +194,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ + awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}'| \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ diff -u $(OUTPUT)libbpf_global_syms.tmp \
Greg Kroah-Hartman
maintainerPATCH 53/343 ipv6: make mc_forwarding atomic
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 145c7a793838add5e004e7d49a67654dc7eba147 ]
This fixes minor data-races in ip6_mc_input() andbatadv_mcast_mla_rtr_flags_softif_get_ipv6()
--- include/linux/ipv6.h | 2 +- net/batman-adv/multicast.c | 2 +- net/ipv6/addrconf.c | 4 ++-- net/ipv6/ip6_input.c | 2 +- net/ipv6/ip6mr.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-)
include/linux/ipv6.h +1 -1
@@ -51,7 +51,7 @@ struct ipv6_devconf {__s32 use_optimistic;#endif #ifdef CONFIG_IPV6_MROUTE -__s32 mc_forwarding; +atomic_t mc_forwarding;#endif __s32 disable_ipv6;__s32 drop_unicast_in_l2_multicast;
net/batman-adv/multicast.c +1 -1
@@ -134,7 +134,7 @@ static u8 batadv_mcast_mla_rtr_flags_softif_get_ipv6(struct net_device *dev) {struct inet6_dev *in6_dev =__in6_dev_get (dev); -if (in6_dev && in6_dev->cnf.mc_forwarding) +if (in6_dev &&atomic_read (&in6_dev->cnf.mc_forwarding))return BATADV_NO_FLAGS ;else return BATADV_MCAST_WANT_NO_RTR6 ;
net/ipv6/addrconf.c +2 -2
@@ -554,7 +554,7 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,#ifdef CONFIG_IPV6_MROUTE if ((all || type ==NETCONFA_MC_FORWARDING ) &&nla_put_s32 (skb,NETCONFA_MC_FORWARDING , - devconf->mc_forwarding) <0 ) +atomic_read (&devconf->mc_forwarding)) <0 ) goto nla_put_failure;#endif if ((all || type == NETCONFA_PROXY_NEIGH) &&
@@ -5539,7 +5539,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, array[DEVCONF_USE_OPTIMISTIC ] = cnf->use_optimistic;#endif #ifdef CONFIG_IPV6_MROUTE - array[DEVCONF_MC_FORWARDING ] = cnf->mc_forwarding; + array[DEVCONF_MC_FORWARDING ] =atomic_read (&cnf->mc_forwarding);#endif array[DEVCONF_DISABLE_IPV6 ] = cnf->disable_ipv6; array[DEVCONF_ACCEPT_DAD ] = cnf->accept_dad;
net/ipv6/ip6_input.c +1 -1
@@ -508,7 +508,7 @@ int ip6_mc_input(struct sk_buff *skb)/* * IPv6 multicast router mode is now supported ;) */ -if (dev_net (skb->dev)->ipv6.devconf_all->mc_forwarding && +if (atomic_read (&dev_net (skb->dev)->ipv6.devconf_all->mc_forwarding) && !(ipv6_addr_type (&hdr->daddr) & (IPV6_ADDR_LOOPBACK |IPV6_ADDR_LINKLOCAL )) &&likely (!(IP6CB (skb)->flags &IP6SKB_FORWARDED ))) {
net/ipv6/ip6mr.c +4 -4
@@ -734,7 +734,7 @@ static int mif6_delete(struct mr_table *mrt, int vifi, int notify, in6_dev =__in6_dev_get (dev);if (in6_dev) { - in6_dev->cnf.mc_forwarding--; +atomic_dec (&in6_dev->cnf.mc_forwarding);inet6_netconf_notify_devconf (dev_net (dev),RTM_NEWNETCONF ,NETCONFA_MC_FORWARDING , dev->ifindex, &in6_dev->cnf);
@@ -902,7 +902,7 @@ static int mif6_add(struct net *net, struct mr_table *mrt, in6_dev =__in6_dev_get (dev);if (in6_dev) { - in6_dev->cnf.mc_forwarding++; +atomic_inc (&in6_dev->cnf.mc_forwarding);inet6_netconf_notify_devconf (dev_net (dev),RTM_NEWNETCONF ,NETCONFA_MC_FORWARDING , dev->ifindex, &in6_dev->cnf);
@@ -1553,7 +1553,7 @@ static int ip6mr_sk_init(struct mr_table *mrt, struct sock *sk) }else {rcu_assign_pointer (mrt->mroute_sk, sk);sock_set_flag (sk,SOCK_RCU_FREE ); - net->ipv6.devconf_all->mc_forwarding++; +atomic_inc (&net->ipv6.devconf_all->mc_forwarding); }write_unlock_bh (&mrt_lock);
@@ -1586,7 +1586,7 @@ int ip6mr_sk_done(struct sock *sk)* so the RCU grace period before sk freeing * is guaranteed by sk_destruct() */ - net->ipv6.devconf_all->mc_forwarding--; +atomic_dec (&net->ipv6.devconf_all->mc_forwarding);write_unlock_bh (&mrt_lock); inet6_netconf_notify_devconf(net, RTM_NEWNETCONF, NETCONFA_MC_FORWARDING,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 54/343 ref_tracker: implement use-after-free detection
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit e3ececfe668facd87d920b608349a32607060e66 ]
Whenever ref_tracker_dir_init() is called, mark the struct ref_tracker_dir as dead.
Test the dead status from ref_tracker_alloc() and ref_tracker_free()
This should detect buggy dev_put()/dev_hold() happening too late in netdevice dismantle process.
--- include/linux/ref_tracker.h | 2 ++ lib/ref_tracker.c | 5 +++++ 2 files changed, 7 insertions(+)
include/linux/ref_tracker.h +2 -0
@@ -13,6 +13,7 @@ struct ref_tracker_dir {spinlock_t lock;unsigned int quarantine_avail;refcount_t untracked; +bool dead;struct list_head list;/* List of active trackers */ struct list_head quarantine;/* List of dead trackers */ #endif
@@ -26,6 +27,7 @@ static inline void ref_tracker_dir_init(struct ref_tracker_dir *dir,INIT_LIST_HEAD (&dir->quarantine);spin_lock_init (&dir->lock); dir->quarantine_avail = quarantine_count; + dir->dead = false;refcount_set (&dir->untracked,1 );stack_depot_init (); }
lib/ref_tracker.c +5 -0
@@ -20,6 +20,7 @@ void ref_tracker_dir_exit(struct ref_tracker_dir *dir)unsigned long flags;bool leak = false; + dir->dead = true;spin_lock_irqsave (&dir->lock, flags);list_for_each_entry_safe (tracker, n, &dir->quarantine, head) {list_del (&tracker->head);
@@ -72,6 +73,8 @@ int ref_tracker_alloc(struct ref_tracker_dir *dir,gfp_t gfp_mask = gfp;unsigned long flags; +WARN_ON_ONCE (dir->dead); +if (gfp & __GFP_DIRECT_RECLAIM) gfp_mask |= __GFP_NOFAIL; *trackerp = tracker =kzalloc (sizeof (*tracker), gfp_mask);
@@ -100,6 +103,8 @@ int ref_tracker_free(struct ref_tracker_dir *dir,unsigned int nr_entries;unsigned long flags; +WARN_ON_ONCE (dir->dead); +if (!tracker) {refcount_dec (&dir->untracked);return -EEXIST ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 55/343 net: initialize init_net earlier
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9c1be1935fb68b2413796cdc03d019b8cf35ab51 ]
While testing a patch that will follow later ("net: add netns refcount tracker to struct nsproxy") I found that devtmpfs_init() was called before init_net was initialized.
This is a bug, because devtmpfs_setup() callsksys_unshare(CLONE_NEWNS);
This has the effect of increasing init_net refcount,
which will be later overwritten to 1, as part of setup_net(&init_net)
We had too many prior patches [1] trying to work around the root cause.
Really, make sure init_net is in BSS section, and that net_ns_init() is called earlier at boot time.
Note that another patch ("vfs: add netns refcount tracker to struct fs_context") also will need net_ns_init() being called before vfs_caches_init()
As a bonus, this patch saves around 4KB in .data section.
[1]
f8c46cb39079 ("netns: do not call pernet ops for not yet set up init_net namespace") b5082df8019a ("net: Initialise init_net.count to 1")734b65417b24 ("net: Statically initialize init_net.dev_base_head")
v2: fixed a build error reported by kernel build bots (CONFIG_NET=n)
--- include/net/net_namespace.h | 6 ++++++ init/main.c | 2 ++ net/core/dev.c | 3 +-- net/core/net_namespace.c | 17 +++++------------ 4 files changed, 14 insertions(+), 14 deletions(-)
include/net/net_namespace.h +6 -0
@@ -513,4 +513,10 @@ static inline void fnhe_genid_bump(struct net *net) atomic_inc(&net->fnhe_genid); } +#ifdef CONFIG_NET +void net_ns_init (void ); +#else +static inline void net_ns_init (void ) {} +#endif +#endif /* __NET_NET_NAMESPACE_H */
init/main.c +2 -0
@@ -99,6 +99,7 @@#include <linux/kcsan.h> #include <linux/init_syscalls.h> #include <linux/stackdepot.h> +#include <net/net_namespace.h> #include <asm/io.h> #include <asm/bugs.h>
@@ -1116,6 +1117,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)key_init ();security_init ();dbg_late_init (); +net_ns_init ();vfs_caches_init ();pagecache_init ();signals_init ();
net/core/dev.c +1 -2
@@ -10732,8 +10732,7 @@ static int __net_init netdev_init(struct net *net)BUILD_BUG_ON (GRO_HASH_BUCKETS > 8 * sizeof_field(struct napi_struct, gro_bitmask)); -if (net != &init_net) -INIT_LIST_HEAD (&net->dev_base_head); +INIT_LIST_HEAD (&net->dev_base_head); net->dev_name_head =netdev_create_hash ();if (net->dev_name_head ==NULL )
net/core/net_namespace.c +5 -12
@@ -44,13 +44,7 @@ EXPORT_SYMBOL_GPL(net_rwsem);static struct key_tag init_net_key_domain = { .usage =REFCOUNT_INIT (1 ) };#endif -struct net init_net = { - .ns.count =REFCOUNT_INIT (1 ), - .dev_base_head =LIST_HEAD_INIT (init_net.dev_base_head), -#ifdef CONFIG_KEYS - .key_domain = &init_net_key_domain, -#endif -}; +struct net init_net;EXPORT_SYMBOL (init_net);static bool init_net_initialized;
@@ -1084,7 +1078,7 @@ static void rtnl_net_notifyid(struct net *net, int cmd, int id, u32 portid,rtnl_set_sk_err (net,RTNLGRP_NSID , err); } -static int __init net_ns_init (void ) +void __init net_ns_init (void ) {struct net_generic *ng;
@@ -1105,6 +1099,9 @@ static int __init net_ns_init(void)rcu_assign_pointer (init_net.gen, ng); +#ifdef CONFIG_KEYS + init_net.key_domain = &init_net_key_domain; +#endif down_write (&pernet_ops_rwsem);if (setup_net (&init_net, &init_user_ns))panic ("Could not setup the initial network namespace" );
@@ -1119,12 +1116,8 @@ static int __init net_ns_init(void) RTNL_FLAG_DOIT_UNLOCKED);rtnl_register (PF_UNSPEC ,RTM_GETNSID , rtnl_net_getid, rtnl_net_dumpid,RTNL_FLAG_DOIT_UNLOCKED ); - -return 0 ; } -pure_initcall (net_ns_init); -static void free_exit_list (struct pernet_operations *ops,struct list_head *net_exit_list) {ops_pre_exit_list (ops, net_exit_list);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 56/343 powerpc: Set crashkernel offset to mid of RMA region
In reply to Greg Kroah-HartmanFrom: Sourabh Jain <[email protected]>
[ Upstream commit 7c5ed82b800d8615cdda00729e7b62e5899f0b13 ]
On large config LPARs (having 192 and more cores), Linux fails to boot due to insufficient memory in the first memblock. It is due to the memory reservation for the crash kernel which starts at 128MB offset of the first memblock. This memory reservation for the crash kernel doesn't leave enough space in the first memblock to accommodate other essential system resources.
The crash kernel start address was set to 128MB offset by default to ensure that the crash kernel get some memory below the RMA region which is used to be of size 256MB. But given that the RMA region size can be 512MB or more, setting the crash kernel offset to mid of RMA size will leave enough space for the kernel to allocate memory for other system resources.
Since the above crash kernel offset change is only applicable to the LPAR platform, the LPAR feature detection is pushed before the crash kernel reservation. The rest of LPAR specific initialization will still be done during pseries_probe_fw_features as usual.
This patch is dependent on changes to paca allocation for boot CPU. It expect boot CPU to discover 1T segment support which is introduced by the patch posted here:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2022-January/239175.html
--- arch/powerpc/kernel/rtas.c | 6 ++++++ arch/powerpc/kexec/core.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
arch/powerpc/kernel/rtas.c +6 -0
@@ -1313,6 +1313,12 @@ int __init early_init_dt_scan_rtas(unsigned long node, entryp =of_get_flat_dt_prop (node,"linux,rtas-entry" ,NULL ); sizep =of_get_flat_dt_prop (node,"rtas-size" ,NULL ); +#ifdef CONFIG_PPC64 +/* need this feature to decide the crashkernel offset */ +if (of_get_flat_dt_prop (node,"ibm,hypertas-functions" ,NULL )) + powerpc_firmware_features |=FW_FEATURE_LPAR ; +#endif +if (basep && entryp && sizep) { rtas.base = *basep; rtas.entry = *entryp;
arch/powerpc/kexec/core.c +11 -4
@@ -134,11 +134,18 @@ void __init reserve_crashkernel(void)if (!crashk_res.start) {#ifdef CONFIG_PPC64 /* -* On 64bit we split the RMO in half but cap it at half of -* a small SLB (128MB) since the crash kernel needs to place -* itself and some stacks to be in the first segment. +* On the LPAR platform place the crash kernel to mid of +* RMA size (512MB or more) to ensure the crash kernel +* gets enough space to place itself and some stack to be +* in the first segment. At the same time normal kernel +* also get enough space to allocate memory for essential +* system resource in the first segment. Keep the crash +* kernel starts at 128MB offset on other platforms. */ - crashk_res.start =min (0x8000000ULL , (ppc64_rma_size /2 )); +if (firmware_has_feature (FW_FEATURE_LPAR )) + crashk_res.start = ppc64_rma_size /2 ; +else + crashk_res.start =min (0x8000000ULL , (ppc64_rma_size /2 ));#else crashk_res.start =KDUMP_KERNELBASE ;#endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 57/343 drm/amdgpu: Fix recursive locking warning
In reply to Greg Kroah-HartmanFrom: Rajneesh Bhardwaj <[email protected]>
[ Upstream commit 447c7997b62a5115ba4da846dcdee4fc12298a6a ]
Noticed the below warning while running a pytorch workload on vega10 GPUs. Change to trylock to avoid conflicts with already held reservation locks.
[ +0.000003] WARNING: possible recursive locking detected
[ +0.000003] 5.13.0-kfd-rajneesh #1030 Not tainted
[ +0.000004] --------------------------------------------
[ +0.000002] python/4822 is trying to acquire lock:
[ +0.000004] ffff932cd9a259f8 (reservation_ww_class_mutex){+.+.}-{3:3},at: amdgpu_bo_release_notify+0xc4/0x160 [amdgpu]
[ +0.000203]
but task is already holding lock:
[ +0.000003] ffff932cbb7181f8 (reservation_ww_class_mutex){+.+.}-{3:3},
at: ttm_eu_reserve_buffers+0x270/0x470 [ttm]
[ +0.000017]
other info that might help us debug this:
[ +0.000002] Possible unsafe locking scenario:
[ +0.000003] CPU0
[ +0.000002] ----
[ +0.000002] lock(reservation_ww_class_mutex);
[ +0.000004] lock(reservation_ww_class_mutex);
[ +0.000003]
*** DEADLOCK ***[ +0.000002] May be due to missing lock nesting notation
[ +0.000003] 7 locks held by python/4822:
[ +0.000003] #0: ffff932c4ac028d0 (&process->mutex){+.+.}-{3:3}, at:kfd_ioctl_map_memory_to_gpu+0x10b/0x320 [amdgpu]
[ +0.000232] #1: ffff932c55e830a8 (&info->lock#2){+.+.}-{3:3}, at:amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x64/0xf60 [amdgpu]
[ +0.000241] #2: ffff932cc45b5e68 (&(*mem)->lock){+.+.}-{3:3}, at:amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0xdf/0xf60 [amdgpu]
[ +0.000236] #3: ffffb2b35606fd28 (reservation_ww_class_acquire){+.+.}-{0:0}, at:amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x232/0xf60 [amdgpu] [ +0.000235] #4: ffff932cbb7181f8 (reservation_ww_class_mutex){+.+.}-{3:3}, at:ttm_eu_reserve_buffers+0x270/0x470 [ttm]
[ +0.000015] #5: ffffffffc045f700 (*(sspp++)){....}-{0:0}, at:drm_dev_enter+0x5/0xa0 [drm]
[ +0.000038] #6: ffff932c52da7078 (&vm->eviction_lock){+.+.}-{3:3},
at: amdgpu_vm_bo_update_mapping+0xd5/0x4f0 [amdgpu]
[ +0.000195]
stack backtrace:
[ +0.000003] CPU: 11 PID: 4822 Comm: python Not tainted 5.13.0-kfd-rajneesh #1030
[ +0.000005] Hardware name: GIGABYTE MZ01-CE0-00/MZ01-CE0-00, BIOS F02 08/29/2018
[ +0.000003] Call Trace: [ +0.000003] dump_stack+0x6d/0x89 [ +0.000010] __lock_acquire+0xb93/0x1a90 [ +0.000009] lock_acquire+0x25d/0x2d0 [ +0.000005] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000184] ? lock_is_held_type+0xa2/0x110 [ +0.000006] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000184] __ww_mutex_lock.constprop.17+0xca/0x1060 [ +0.000007] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000183] ? lock_release+0x13f/0x270 [ +0.000005] ? lock_is_held_type+0xa2/0x110 [ +0.000006] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000183] amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000185] ttm_bo_release+0x4c6/0x580 [ttm] [ +0.000010] amdgpu_bo_unref+0x1a/0x30 [amdgpu] [ +0.000183] amdgpu_vm_free_table+0x76/0xa0 [amdgpu] [ +0.000189] amdgpu_vm_free_pts+0xb8/0xf0 [amdgpu] [ +0.000189] amdgpu_vm_update_ptes+0x411/0x770 [amdgpu] [ +0.000191] amdgpu_vm_bo_update_mapping+0x324/0x4f0 [amdgpu] [ +0.000191] amdgpu_vm_bo_update+0x251/0x610 [amdgpu] [ +0.000191] update_gpuvm_pte+0xcc/0x290 [amdgpu] [ +0.000229] ? amdgpu_vm_bo_map+0xd7/0x130 [amdgpu] [ +0.000190] amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x912/0xf60 [amdgpu] [ +0.000234] kfd_ioctl_map_memory_to_gpu+0x182/0x320 [amdgpu] [ +0.000218] kfd_ioctl+0x2b9/0x600 [amdgpu] [ +0.000216] ? kfd_ioctl_unmap_memory_from_gpu+0x270/0x270 [amdgpu] [ +0.000216] ? lock_release+0x13f/0x270 [ +0.000006] ? __fget_files+0x107/0x1e0 [ +0.000007] __x64_sys_ioctl+0x8b/0xd0 [ +0.000007] do_syscall_64+0x36/0x70 [ +0.000004] entry_SYSCALL_64_after_hwframe+0x44/0xae [ +0.000007] RIP: 0033:0x7fbff90a7317 [ +0.000004] Code: b3 66 90 48 8b 05 71 4b 2d 00 64 c7 00 26 00 00 00
48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 41 4b 2d 00 f7 d8 64 89 01 48 [ +0.000005] RSP: 002b:00007fbe301fe648 EFLAGS: 00000246 ORIG_RAX:
0000000000000010
[ +0.000006] RAX: ffffffffffffffda RBX: 00007fbcc402d820 RCX:00007fbff90a7317
[ +0.000003] RDX: 00007fbe301fe690 RSI: 00000000c0184b18 RDI:
0000000000000004
[ +0.000003] RBP: 00007fbe301fe690 R08: 0000000000000000 R09:00007fbcc402d880
[ +0.000003] R10: 0000000002001000 R11: 0000000000000246 R12:00000000c0184b18
[ +0.000003] R13: 0000000000000004 R14: 00007fbf689593a0 R15:00007fbcc402d820
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -1
@@ -1303,7 +1303,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) return; -dma_resv_lock (bo->base.resv,NULL ); +if (WARN_ON_ONCE (!dma_resv_trylock (bo->base.resv))) +return ; r =amdgpu_fill_buffer (abo,AMDGPU_POISON , bo->base.resv, &fence);if (!WARN_ON (r)) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 58/343 scsi: smartpqi: Fix rmmod stack trace
In reply to Greg Kroah-HartmanFrom: Don Brace <[email protected]>
[ Upstream commit c4ff687d25c05919382a759503bd3821689f4e2f ]
Prevent "BUG: scheduling while atomic: rmmod" stack trace.
Stop setting spin_locks before calling OS functions to remove devices.
--- drivers/scsi/smartpqi/smartpqi_init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +2 -4
@@ -2513,17 +2513,15 @@ static void pqi_remove_all_scsi_devices(struct pqi_ctrl_info *ctrl_info)struct pqi_scsi_dev *device;struct pqi_scsi_dev *next; -spin_lock_irqsave (&ctrl_info->scsi_device_list_lock, flags); -list_for_each_entry_safe (device, next, &ctrl_info->scsi_device_list, scsi_device_list_entry) {if (pqi_is_device_added (device))pqi_remove_device (ctrl_info, device); +spin_lock_irqsave (&ctrl_info->scsi_device_list_lock, flags);list_del (&device->scsi_device_list_entry);pqi_free_device (device); +spin_unlock_irqrestore (&ctrl_info->scsi_device_list_lock, flags); } - -spin_unlock_irqrestore (&ctrl_info->scsi_device_list_lock, flags); }static int pqi_scan_scsi_devices (struct pqi_ctrl_info *ctrl_info)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 59/343 scsi: smartpqi: Fix kdump issue when controller is locked up
In reply to Greg Kroah-HartmanFrom: Mahesh Rajashekhara <[email protected]>
[ Upstream commit 3ada501d602abf02353445c03bb3258146445d90 ]
Avoid dropping into shell if the controller is in locked up state.
Driver issues SIS soft reset to bring back the controller to SIS mode while OS boots into kdump mode.
If the controller is in lockup state, SIS soft reset does not work.
Since the controller lockup code has not been cleared, driver considers the firmware is no longer up and running. Driver returns back an error code to OS and the kdump fails.
--- drivers/scsi/smartpqi/smartpqi_init.c | 39 ++++++++++++++++----------- 1 file changed, 23 insertions(+), 16 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +23 -16
@@ -7855,6 +7855,21 @@ static int pqi_force_sis_mode(struct pqi_ctrl_info *ctrl_info)return pqi_revert_to_sis_mode (ctrl_info); } +static void pqi_perform_lockup_action (void ) +{ +switch (pqi_lockup_action) { +case PANIC : +panic ("FATAL: Smart Family Controller lockup detected" ); +break ; +case REBOOT : +emergency_restart (); +break ; +case NONE : +default : +break ; + } +} +static int pqi_ctrl_init (struct pqi_ctrl_info *ctrl_info) {int rc;
@@ -7879,8 +7894,15 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)* commands. */ rc =sis_wait_for_ctrl_ready (ctrl_info); -if (rc) +if (rc) { +if (reset_devices) { +dev_err (&ctrl_info->pci_dev->dev, +"kdump init failed with error %d\n" , rc); + pqi_lockup_action =REBOOT ; +pqi_perform_lockup_action (); + }return rc; + }/* * Get the controller properties. This allows us to determine
@@ -8605,21 +8627,6 @@ static int pqi_ofa_ctrl_restart(struct pqi_ctrl_info *ctrl_info, unsigned int dereturn pqi_ctrl_init_resume (ctrl_info); } -static void pqi_perform_lockup_action (void ) -{ -switch (pqi_lockup_action) { -case PANIC : -panic ("FATAL: Smart Family Controller lockup detected" ); -break ; -case REBOOT : -emergency_restart (); -break ; -case NONE : -default : -break ; - } -} -static struct pqi_raid_error_info pqi_ctrl_offline_raid_error_info = { .data_out_result =PQI_DATA_IN_OUT_HARDWARE_ERROR , .status =SAM_STAT_CHECK_CONDITION ,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/343 PCI: aardvark: Fix support for MSI interrupts
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit b0b0b8b897f8e12b2368e868bd7cdc5742d5c5a9 ]
Aardvark hardware supports Multi-MSI and MSI_FLAG_MULTI_PCI_MSI is already set for the MSI chip. But when allocating MSI interrupt numbers for Multi-MSI, the numbers need to be properly aligned, otherwise endpoint devices send MSI interrupt with incorrect numbers.
Fix this issue by using function bitmap_find_free_region() instead of bitmap_find_next_zero_area().
To ensure that aligned MSI interrupt numbers are used by endpoint devices, we cannot use Linux virtual irq numbers (as they are random and not properly aligned). Instead we need to use the aligned hwirq numbers.
This change fixes receiving MSI interrupts on Armada 3720 boards and allows using NVMe disks which use Multi-MSI feature with 3 interrupts.
Without this NVMe disks freeze booting as linux nvme-core.c is waiting 60s for an interrupt.
--- drivers/pci/controller/pci-aardvark.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/pci/controller/pci-aardvark.c +6 -10
@@ -1186,7 +1186,7 @@ static void advk_msi_irq_compose_msi_msg(struct irq_data *data, msg->address_lo =lower_32_bits (msi_msg); msg->address_hi =upper_32_bits (msi_msg); - msg->data = data->irq; + msg->data = data->hwirq; } static int advk_msi_set_affinity(struct irq_data *irq_data,
@@ -1203,15 +1203,11 @@ static int advk_msi_irq_domain_alloc(struct irq_domain *domain,int hwirq, i;mutex_lock (&pcie->msi_used_lock); - hwirq =bitmap_find_next_zero_area (pcie->msi_used,MSI_IRQ_NUM , -0 , nr_irqs,0 ); -if (hwirq >=MSI_IRQ_NUM ) { -mutex_unlock (&pcie->msi_used_lock); -return -ENOSPC ; - } - -bitmap_set (pcie->msi_used, hwirq, nr_irqs); + hwirq =bitmap_find_free_region (pcie->msi_used,MSI_IRQ_NUM , +order_base_2 (nr_irqs));mutex_unlock (&pcie->msi_used_lock); +if (hwirq <0 ) +return -ENOSPC ;for (i =0 ; i < nr_irqs; i++) irq_domain_set_info(domain, virq + i, hwirq + i,
@@ -1229,7 +1225,7 @@ static void advk_msi_irq_domain_free(struct irq_domain *domain,struct advk_pcie *pcie = domain->host_data;mutex_lock (&pcie->msi_used_lock); -bitmap_clear (pcie->msi_used, d->hwirq, nr_irqs); +bitmap_release_region (pcie->msi_used, d->hwirq,order_base_2 (nr_irqs));mutex_unlock (&pcie->msi_used_lock); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 61/343 kvm: selftests: aarch64: fix assert in gicv3_access_reg
In reply to Greg Kroah-HartmanFrom: Ricardo Koller <[email protected]>
[ Upstream commit cc94d47ce16d4147d546e47c8248e8bd12ba5fe5 ]
The val argument in gicv3_access_reg can have any value when used for a read, not necessarily 0. Fix the assert by checking val only for writes.
--- tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/aarch64/gic_v3.c +1 -1
@@ -159,7 +159,7 @@ static void gicv3_access_reg(uint32_t intid, uint64_t offset,uint32_t cpu_or_dist;GUEST_ASSERT (bits_per_field <= reg_bits); -GUEST_ASSERT (*val < (1U << bits_per_field)); +GUEST_ASSERT (!write || *val < (1U << bits_per_field));/* Some registers like IROUTER are 64 bit long. Those are currently not * supported by readl nor writel, so just asserting here until then. */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 62/343 kvm: selftests: aarch64: pass vgic_irq guest args as a pointer
In reply to Greg Kroah-HartmanFrom: Ricardo Koller <[email protected]>
[ Upstream commit 11024a7a0ac26dd31ddfa0f6590e158bdf9ab858 ]
The guest in vgic_irq gets its arguments in a struct. This struct used to fit nicely in a single register so vcpu_args_set() was able to pass it by value by setting x0 with it. Unfortunately, this args struct grew after some commits and some guest args became random (specically kvm_supports_irqfd).
Fix this by passing the guest args as a pointer (after allocating some guest memory for it).
--- .../testing/selftests/kvm/aarch64/vgic_irq.c | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_irq.c +16 -13
@@ -472,10 +472,10 @@ static void test_restore_active(struct test_args *args, struct kvm_inject_desc *guest_restore_active (args,MIN_SPI ,4 , f->cmd); } -static void guest_code (struct test_args args) +static void guest_code (struct test_args *args) { -uint32_t i, nr_irqs = args.nr_irqs; -bool level_sensitive = args.level_sensitive; +uint32_t i, nr_irqs = args->nr_irqs; +bool level_sensitive = args->level_sensitive;struct kvm_inject_desc *f, *inject_fns;gic_init (GIC_V3 ,1 , dist, redist);
@@ -484,11 +484,11 @@ static void guest_code(struct test_args args)gic_irq_enable (i);for (i =MIN_SPI ; i < nr_irqs; i++) -gic_irq_set_config (i, !args.level_sensitive); +gic_irq_set_config (i, !level_sensitive); -gic_set_eoi_split (args.eoi_split); +gic_set_eoi_split (args->eoi_split); -reset_priorities (&args); +reset_priorities (args);gic_set_priority_mask (CPU_PRIO_MASK ); inject_fns = level_sensitive ? inject_level_fns
@@ -497,17 +497,17 @@ static void guest_code(struct test_args args)local_irq_enable ();/* Start the tests. */ -for_each_supported_inject_fn (&args, inject_fns, f) { -test_injection (&args, f); -test_preemption (&args, f); -test_injection_failure (&args, f); +for_each_supported_inject_fn (args, inject_fns, f) { +test_injection (args, f); +test_preemption (args, f); +test_injection_failure (args, f); }/* Restore the active state of IRQs. This would happen when live * migrating IRQs in the middle of being handled. */ -for_each_supported_activate_fn (&args, set_active_fns, f) -test_restore_active (&args, f); +for_each_supported_activate_fn (args, set_active_fns, f) +test_restore_active (args, f);GUEST_DONE (); }
@@ -739,6 +739,7 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split)int gic_fd;struct kvm_vm *vm;struct kvm_inject_args inject_args; +vm_vaddr_t args_gva;struct test_args args = { .nr_irqs = nr_irqs,
@@ -757,7 +758,9 @@ static void test_vgic(uint32_t nr_irqs, bool level_sensitive, bool eoi_split)vcpu_init_descriptor_tables (vm,VCPU_ID );/* Setup the guest args page (so it gets the args). */ -vcpu_args_set (vm,0 ,1 , args); + args_gva =vm_vaddr_alloc_page (vm); +memcpy (addr_gva2hva (vm, args_gva), &args,sizeof (args)); +vcpu_args_set (vm,0 ,1 , args_gva); gic_fd =vgic_v3_setup (vm,1 , nr_irqs,GICD_BASE_GPA ,GICR_BASE_GPA );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 63/343 kvm: selftests: aarch64: fix the failure check in kvm_set_gsi_routing_irqchip_check
In reply to Greg Kroah-HartmanFrom: Ricardo Koller <[email protected]>
[ Upstream commit 5b7898648f02083012900e48d063e51ccbdad165 ]
kvm_set_gsi_routing_irqchip_check(expect_failure=true) is used to check the error code returned by the kernel when trying to setup an invalid gsi routing table. The ioctl fails if "pin >= KVM_IRQCHIP_NUM_PINS", so kvm_set_gsi_routing_irqchip_check() should test the error only when "intid >= KVM_IRQCHIP_NUM_PINS+32". The issue is that the test check is "intid >= KVM_IRQCHIP_NUM_PINS", so for a case like "intid = KVM_IRQCHIP_NUM_PINS" the test wrongly assumes that the kernel will return an error. Fix this by using the right check.
--- tools/testing/selftests/kvm/aarch64/vgic_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_irq.c +2 -2
@@ -573,8 +573,8 @@ static void kvm_set_gsi_routing_irqchip_check(struct kvm_vm *vm,kvm_gsi_routing_write (vm, routing); }else { ret =_kvm_gsi_routing_write (vm, routing); -/* The kernel only checks for KVM_IRQCHIP_NUM_PINS. */ -if (intid >=KVM_IRQCHIP_NUM_PINS ) +/* The kernel only checks e->irqchip.pin >= KVM_IRQCHIP_NUM_PINS */ +if (((uint64_t )intid + num -1 -MIN_SPI ) >=KVM_IRQCHIP_NUM_PINS )TEST_ASSERT (ret !=0 && errno ==EINVAL ,"Bad intid %u did not cause KVM_SET_GSI_ROUTING " "error: rc: %i errno: %i" , intid, ret, errno);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 64/343 kvm: selftests: aarch64: fix some vgic related comments
In reply to Greg Kroah-HartmanFrom: Ricardo Koller <[email protected]>
[ Upstream commit a5cd38fd9c47b23abc6df08d6ee6a71b39038185 ]
Fix the formatting of some comments and the wording of one of them (in gicv3_access_reg).
--- tools/testing/selftests/kvm/aarch64/vgic_irq.c | 12 ++++++++---- tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 10 ++++++---- tools/testing/selftests/kvm/lib/aarch64/vgic.c | 3 ++- 3 files changed, 16 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_irq.c +8 -4
@@ -306,7 +306,8 @@ static void guest_restore_active(struct test_args *args,uint32_t prio, intid, ap1r;int i; -/* Set the priorities of the first (KVM_NUM_PRIOS - 1) IRQs +/* +* Set the priorities of the first (KVM_NUM_PRIOS - 1) IRQs * in descending order, so intid+1 can preempt intid. */ for (i =0 , prio = (num -1 ) *8 ; i < num; i++, prio -=8 ) {
@@ -315,7 +316,8 @@ static void guest_restore_active(struct test_args *args,gic_set_priority (intid, prio); } -/* In a real migration, KVM would restore all GIC state before running +/* +* In a real migration, KVM would restore all GIC state before running * guest code. */ for (i =0 ; i < num; i++) {
@@ -503,7 +505,8 @@ static void guest_code(struct test_args *args)test_injection_failure (args, f); } -/* Restore the active state of IRQs. This would happen when live +/* +* Restore the active state of IRQs. This would happen when live * migrating IRQs in the middle of being handled. */ for_each_supported_activate_fn (args, set_active_fns, f)
@@ -844,7 +847,8 @@ int main(int argc, char **argv) } } -/* If the user just specified nr_irqs and/or gic_version, then run all +/* +* If the user just specified nr_irqs and/or gic_version, then run all * combinations. */ if (default_args) {
tools/testing/selftests/kvm/lib/aarch64/gic_v3.c +6 -4
@@ -19,7 +19,7 @@ struct gicv3_data {unsigned int nr_spis; }; -#define sgi_base_from_redist (redist_base) (redist_base + SZ_64K) +#define sgi_base_from_redist (redist_base) (redist_base + SZ_64K)#define DIST_BIT (1U << 31)enum gicv3_intid_range {
@@ -105,7 +105,8 @@ static void gicv3_set_eoi_split(bool split) {uint32_t val; -/* All other fields are read-only, so no need to read CTLR first. In +/* +* All other fields are read-only, so no need to read CTLR first. In * fact, the kernel does the same. */ val = split ? (1U <<1 ) :0 ;
@@ -160,8 +161,9 @@ static void gicv3_access_reg(uint32_t intid, uint64_t offset,GUEST_ASSERT (bits_per_field <= reg_bits);GUEST_ASSERT (!write || *val < (1U << bits_per_field)); -/* Some registers like IROUTER are 64 bit long. Those are currently not -* supported by readl nor writel, so just asserting here until then. +/* +* This function does not support 64 bit accesses. Just asserting here +* until we implement readq/writeq. */ GUEST_ASSERT (reg_bits ==32 );
tools/testing/selftests/kvm/lib/aarch64/vgic.c +2 -1
@@ -152,7 +152,8 @@ static void vgic_poke_irq(int gic_fd, uint32_t intid, attr +=SZ_64K ; } -/* All calls will succeed, even with invalid intid's, as long as the +/* +* All calls will succeed, even with invalid intid's, as long as the * addr part of the attr is within 32 bits (checked above). An invalid * intid will just make the read/writes point to above the intended * register space (i.e., ICPENDR after ISPENDR).
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/343 kvm: selftests: aarch64: use a tighter assert in vgic_poke_irq()
In reply to Greg Kroah-HartmanFrom: Ricardo Koller <[email protected]>
[ Upstream commit b53de63a89244c196d8a2ea76b6754e3fdb4b626 ]
vgic_poke_irq() checks that the attr argument passed to the vgic device ioctl is sane. Make this check tighter by moving it to after the last attr update.
--- tools/testing/selftests/kvm/lib/aarch64/vgic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/testing/selftests/kvm/lib/aarch64/vgic.c +3 -3
@@ -140,9 +140,6 @@ static void vgic_poke_irq(int gic_fd, uint32_t intid,uint64_t val;bool intid_is_private =INTID_IS_SGI (intid) ||INTID_IS_PPI (intid); -/* Check that the addr part of the attr is within 32 bits. */ -assert (attr <=KVM_DEV_ARM_VGIC_OFFSET_MASK ); -uint32_t group = intid_is_private ?KVM_DEV_ARM_VGIC_GRP_REDIST_REGS :KVM_DEV_ARM_VGIC_GRP_DIST_REGS ;
@@ -152,6 +149,9 @@ static void vgic_poke_irq(int gic_fd, uint32_t intid, attr +=SZ_64K ; } +/* Check that the addr part of the attr is within 32 bits. */ +assert ((attr & ~KVM_DEV_ARM_VGIC_OFFSET_MASK ) ==0 ); +/* * All calls will succeed, even with invalid intid's, as long as the * addr part of the attr is within 32 bits (checked above). An invalid
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 66/343 iommu/arm-smmu-v3: fix event handling soft lockup
In reply to Greg Kroah-HartmanFrom: Zhou Guanghui <[email protected]>
[ Upstream commit 30de2b541af98179780054836b48825fcfba4408 ]
During event processing, events are read from the event queue one by one until the queue is empty.If the master device continuously requests address access at the same time and the SMMU generates events, the cyclic processing of the event takes a long time and softlockup warnings may be reported.
arm-smmu-v3 arm-smmu-v3.34.auto: event 0x0a received:
arm-smmu-v3 arm-smmu-v3.34.auto: 0x00007f220000280a
arm-smmu-v3 arm-smmu-v3.34.auto: 0x000010000000007e
arm-smmu-v3 arm-smmu-v3.34.auto: 0x00000000034e8670
watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [irq/268-arm-smm:247] Call trace: _dev_info+0x7c/0xa0 arm_smmu_evtq_thread+0x1c0/0x230 irq_thread_fn+0x30/0x80 irq_thread+0x128/0x210 kthread+0x134/0x138 ret_from_fork+0x10/0x1c Kernel panic - not syncing: softlockup: hung tasks
Fix this by calling cond_resched() after the event information is printed.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1 -0
@@ -1558,6 +1558,7 @@ static irqreturn_t arm_smmu_evtq_thread(int irq, void *dev)dev_info (smmu->dev,"\t0x%016llx\n" , (unsigned long long )evt[i]); +cond_resched (); }/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/343 usb: ehci: add pci device support for Aspeed platforms
In reply to Greg Kroah-HartmanFrom: Neal Liu <[email protected]>
[ Upstream commit c3c9cee592828528fd228b01d312c7526c584a42 ]
Enable Aspeed quirks in commit 7f2d73788d90 ("usb: ehci:
handshake CMD_RUN instead of STS_HALT") to support Aspeed ehci-pci device.
--- drivers/usb/host/ehci-pci.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/host/ehci-pci.c +9 -0
@@ -21,6 +21,9 @@ static const char hcd_name[] = "ehci-pci";/* defined here to avoid adding to pci_ids.h for single instance use */ #define PCI_DEVICE_ID_INTEL_CE4100_USB 0x2e70 +#define PCI_VENDOR_ID_ASPEED 0x1a03 +#define PCI_DEVICE_ID_ASPEED_EHCI 0x2603 +/*-------------------------------------------------------------------------*/ #define PCI_DEVICE_ID_INTEL_QUARK_X1000_SOC 0x0939static inline bool is_intel_quark_x1000 (struct pci_dev *pdev)
@@ -222,6 +225,12 @@ static int ehci_pci_setup(struct usb_hcd *hcd) ehci->has_synopsys_hc_bug =1 ; }break ; +case PCI_VENDOR_ID_ASPEED : +if (pdev->device ==PCI_DEVICE_ID_ASPEED_EHCI ) { +ehci_info (ehci,"applying Aspeed HC workaround\n" ); + ehci->is_aspeed =1 ; + } +break ; }/* optional debug port, normally in the first BAR */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 68/343 KVM: arm64: Do not change the PMU event filter after a VCPU has run
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 5177fe91e4cf78a659aada2c9cf712db4d788481 ]
Userspace can specify which events a guest is allowed to use with the KVM_ARM_VCPU_PMU_V3_FILTER attribute. The list of allowed events can be identified by a guest from reading the PMCEID{0,1}_EL0 registers.
Changing the PMU event filter after a VCPU has run can cause reads of the registers performed before the filter is changed to return different values than reads performed with the new event filter in place. The architecture defines the two registers as read-only, and this behaviour contradicts that.
Keep track when the first VCPU has run and deny changes to the PMU event filter to prevent this from happening.
--- Documentation/virt/kvm/devices/vcpu.rst | 2 +- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/arm.c | 4 +++ arch/arm64/kvm/pmu-emul.c | 33 +++++++++++++++---------- 4 files changed, 26 insertions(+), 14 deletions(-)
Documentation/virt/kvm/devices/vcpu.rst +1 -1
@@ -70,7 +70,7 @@ irqchip. -ENODEV PMUv3 not supported or GIC not initialized -ENXIO PMUv3 not properly configured or in-kernel irqchip not configured as required prior to calling this attribute - -EBUSY PMUv3 already initialized + -EBUSY PMUv3 already initialized or a VCPU has already run -EINVAL Invalid filter range ======= ======================================================
arch/arm64/include/asm/kvm_host.h +1 -0
@@ -136,6 +136,7 @@ struct kvm_arch {/* Memory Tagging Extension enabled for the guest */ bool mte_enabled; +bool ran_once; };struct kvm_vcpu_fault_info {
arch/arm64/kvm/arm.c +4 -0
@@ -634,6 +634,10 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)if (kvm_vm_is_protected (kvm))kvm_call_hyp_nvhe (__pkvm_vcpu_init_traps, vcpu); +mutex_lock (&kvm->lock); + kvm->arch.ran_once = true; +mutex_unlock (&kvm->lock); +return ret; }
arch/arm64/kvm/pmu-emul.c +20 -13
@@ -924,6 +924,8 @@ static bool pmu_irq_is_valid(struct kvm *kvm, int irq)int kvm_arm_pmu_v3_set_attr (struct kvm_vcpu *vcpu,struct kvm_device_attr *attr) { +struct kvm *kvm = vcpu->kvm; +if (!kvm_vcpu_has_pmu (vcpu))return -ENODEV ;
@@ -941,7 +943,7 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)int __user *uaddr = (int __user *)(long )attr->addr;int irq; -if (!irqchip_in_kernel (vcpu->kvm)) +if (!irqchip_in_kernel (kvm))return -EINVAL ;if (get_user (irq, uaddr))
@@ -951,7 +953,7 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)if (!(irq_is_ppi (irq) ||irq_is_spi (irq)))return -EINVAL ; -if (!pmu_irq_is_valid (vcpu->kvm, irq)) +if (!pmu_irq_is_valid (kvm, irq))return -EINVAL ;if (kvm_arm_pmu_irq_initialized (vcpu))
@@ -966,7 +968,7 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)struct kvm_pmu_event_filter filter;int nr_events; - nr_events =kvm_pmu_event_mask (vcpu->kvm) +1 ; + nr_events =kvm_pmu_event_mask (kvm) +1 ; uaddr = (struct kvm_pmu_event_filter __user *)(long )attr->addr;
@@ -978,12 +980,17 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) filter.action != KVM_PMU_EVENT_DENY))return -EINVAL ; -mutex_lock (&vcpu->kvm->lock); +mutex_lock (&kvm->lock); + +if (kvm->arch.ran_once) { +mutex_unlock (&kvm->lock); +return -EBUSY ; + } -if (!vcpu->kvm->arch.pmu_filter) { - vcpu->kvm->arch.pmu_filter =bitmap_alloc (nr_events,GFP_KERNEL_ACCOUNT ); -if (!vcpu->kvm->arch.pmu_filter) { -mutex_unlock (&vcpu->kvm->lock); +if (!kvm->arch.pmu_filter) { + kvm->arch.pmu_filter =bitmap_alloc (nr_events,GFP_KERNEL_ACCOUNT ); +if (!kvm->arch.pmu_filter) { +mutex_unlock (&kvm->lock);return -ENOMEM ; }
@@ -994,17 +1001,17 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)* events, the default is to allow. */ if (filter.action ==KVM_PMU_EVENT_ALLOW ) -bitmap_zero (vcpu->kvm->arch.pmu_filter, nr_events); +bitmap_zero (kvm->arch.pmu_filter, nr_events);else -bitmap_fill (vcpu->kvm->arch.pmu_filter, nr_events); +bitmap_fill (kvm->arch.pmu_filter, nr_events); }if (filter.action ==KVM_PMU_EVENT_ALLOW ) -bitmap_set (vcpu->kvm->arch.pmu_filter, filter.base_event, filter.nevents); +bitmap_set (kvm->arch.pmu_filter, filter.base_event, filter.nevents);else -bitmap_clear (vcpu->kvm->arch.pmu_filter, filter.base_event, filter.nevents); +bitmap_clear (kvm->arch.pmu_filter, filter.base_event, filter.nevents); -mutex_unlock (&vcpu->kvm->lock); +mutex_unlock (&kvm->lock);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/343 libbpf: Fix accessing syscall arguments on powerpc
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit f07f1503469b11b739892d50c836992ffbe026ee ]
powerpc does not select ARCH_HAS_SYSCALL_WRAPPER, so its syscall handlers take "unpacked" syscall arguments. Indicate this to libbpf using PT_REGS_SYSCALL_REGS macro.
--- tools/lib/bpf/bpf_tracing.h | 2 ++ 1 file changed, 2 insertions(+)
tools/lib/bpf/bpf_tracing.h +2 -0
@@ -178,6 +178,8 @@#define __PT_RC_REG gpr[3]#define __PT_SP_REG sp#define __PT_IP_REG nip +/* powerpc does not select ARCH_HAS_SYSCALL_WRAPPER. */ +#define PT_REGS_SYSCALL_REGS (ctx) ctx#elif defined(bpf_target_sparc)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/343 libbpf: Fix accessing the first syscall argument on arm64
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit fbca4a2f649730b67488a8b36140ce4d2cf13c63 ]
On arm64, the first syscall argument should be accessed via orig_x0 (see arch/arm64/include/asm/syscall.h). Currently regs[0] is used instead, leading to bpf_syscall_macro test failure.
orig_x0 cannot be added to struct user_pt_regs, since its layout is a part of the ABI. Therefore provide access to it only through PT_REGS_PARM1_CORE_SYSCALL() by using a struct pt_regs flavor.
--- tools/lib/bpf/bpf_tracing.h | 6 ++++++ 1 file changed, 6 insertions(+)
tools/lib/bpf/bpf_tracing.h +6 -0
@@ -140,6 +140,10 @@#elif defined(bpf_target_arm64) +struct pt_regs___arm64 { +unsigned long orig_x0; +}; +/* arm64 provides struct user_pt_regs instead of struct pt_regs to userspace */ #define __PT_REGS_CAST (x) ((const struct user_pt_regs *)(x))#define __PT_PARM1_REG regs[0]
@@ -152,6 +156,8 @@#define __PT_RC_REG regs[0]#define __PT_SP_REG sp#define __PT_IP_REG pc +#define PT_REGS_PARM1_SYSCALL (x) ({ _Pragma("GCC error \"use PT_REGS_PARM1_CORE_SYSCALL() instead\""); 0l; }) +#define PT_REGS_PARM1_CORE_SYSCALL (x) BPF_CORE_READ((const struct pt_regs___arm64 *)(x), orig_x0)#elif defined(bpf_target_mips)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/343 libbpf: Fix accessing the first syscall argument on s390
In reply to Greg Kroah-HartmanFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit 1f22a6f9f9a0f50218a11a0554709fd34a821fa3 ]
On s390, the first syscall argument should be accessed via orig_gpr2 (see arch/s390/include/asm/syscall.h). Currently gpr[2] is used instead, leading to bpf_syscall_macro test failure.
orig_gpr2 cannot be added to user_pt_regs, since its layout is a part of the ABI. Therefore provide access to it only through PT_REGS_PARM1_CORE_SYSCALL() by using a struct pt_regs flavor.
--- tools/lib/bpf/bpf_tracing.h | 6 ++++++ 1 file changed, 6 insertions(+)
tools/lib/bpf/bpf_tracing.h +6 -0
@@ -112,6 +112,10 @@#elif defined(bpf_target_s390) +struct pt_regs___s390 { +unsigned long orig_gpr2; +}; +/* s390 provides user_pt_regs instead of struct pt_regs to userspace */ #define __PT_REGS_CAST (x) ((const user_pt_regs *)(x))#define __PT_PARM1_REG gprs[2]
@@ -124,6 +128,8 @@#define __PT_RC_REG gprs[2]#define __PT_SP_REG gprs[15]#define __PT_IP_REG psw.addr +#define PT_REGS_PARM1_SYSCALL (x) ({ _Pragma("GCC error \"use PT_REGS_PARM1_CORE_SYSCALL() instead\""); 0l; }) +#define PT_REGS_PARM1_CORE_SYSCALL (x) BPF_CORE_READ((const struct pt_regs___s390 *)(x), orig_gpr2)#elif defined(bpf_target_arm)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/343 PCI: endpoint: Fix alignment fault error in copy tests
In reply to Greg Kroah-HartmanFrom: Hou Zhiqiang <[email protected]>
[ Upstream commit 829cc0e2ea2d61fb6c54bc3f8a17f86c56e11864 ]
The copy test uses the memcpy() to copy data between IO memory spaces. This can trigger an alignment fault error (pasted the error logs below) because memcpy() may use unaligned accesses on a mapped memory that is just IO, which does not support unaligned memory accesses.
Fix it by using the correct memcpy API to copy from/to IO memory.
Alignment fault error logs:
Unable to handle kernel paging request at virtual address ffff8000101cd3c1
Mem abort info:
ESR = 0x96000021
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x21: alignment fault
Data abort info:
ISV = 0, ISS = 0x00000021
CM = 0, WnR = 0
swapper pgtable: 4k pages, 48-bit VAs, pgdp=0000000081773000
[ffff8000101cd3c1] pgd=1000000082410003, p4d=1000000082410003, pud=1000000082411003, pmd=1000000082412003, pte=0068004000001f13
Internal error: Oops: 96000021 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 6 Comm: kworker/0:0H Not tainted 5.15.0-rc1-next-20210914-dirty #2
Hardware name: LS1012A RDB Board (DT)
Workqueue: kpcitest pci_epf_test_cmd_handler
pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : __memcpy+0x168/0x230
lr : pci_epf_test_cmd_handler+0x6f0/0xa68
sp : ffff80001003bce0
x29: ffff80001003bce0 x28: ffff800010135000 x27: ffff8000101e5000
x26: ffff8000101cd000 x25: ffff6cda941cf6c8 x24: 0000000000000000
x23: ffff6cda863f2000 x22: ffff6cda9096c800 x21: ffff800010135000
x20: ffff6cda941cf680 x19: ffffaf39fd999000 x18: 0000000000000000
x17: 0000000000000000 x16: 0000000000000000 x15: ffffaf39fd2b6000
x14: 0000000000000000 x13: 15f5c8fa2f984d57 x12: 604d132b60275454
x11: 065cee5e5fb428b6 x10: aae662eb17d0cf3e x9 : 1d97c9a1b4ddef37
x8 : 7541b65edebf928c x7 : e71937c4fc595de0 x6 : b8a0e09562430d1c
x5 : ffff8000101e5401 x4 : ffff8000101cd401 x3 : ffff8000101e5380
x2 : fffffffffffffff1 x1 : ffff8000101cd3c0 x0 : ffff8000101e5000
Call trace:
__memcpy+0x168/0x230
process_one_work+0x1ec/0x370
worker_thread+0x44/0x478
kthread+0x154/0x160
ret_from_fork+0x10/0x20
Code: a984346c a9c4342c f1010042 54fffee8 (a97c3c8e)
---[ end trace 568c28c7b6336335 ]------ drivers/pci/endpoint/functions/pci-epf-test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-test.c +11 -1
@@ -285,7 +285,17 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test)if (ret)dev_err (dev,"Data transfer failed\n" ); }else { -memcpy (dst_addr, src_addr, reg->size); +void *buf; + + buf =kzalloc (reg->size,GFP_KERNEL ); +if (!buf) { + ret = -ENOMEM ; + goto err_map_addr; + } + +memcpy_fromio (buf, src_addr, reg->size); +memcpy_toio (dst_addr, buf, reg->size); +kfree (buf); }ktime_get_ts64 (&end);pci_epf_test_print_rate ("COPY" , reg->size, &start, &end, use_dma);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/343 tcp: Dont acquire inet_listen_hashbucket::lock with disabled BH.
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 4f9bf2a2f5aacf988e6d5e56b961ba45c5a25248 ]
Commit
9652dc2eb9e40 ("tcp: relax listening_hash operations")
removed the need to disable bottom half while acquiring listening_hash.lock. There are still two callers left which disable bottom half before the lock is acquired.
On PREEMPT_RT the softirqs are preemptible and local_bh_disable() acts as a lock to ensure that resources, that are protected by disabling bottom halves, remain protected.
This leads to a circular locking dependency if the lock acquired with disabled bottom halves is also acquired with enabled bottom halves followed by disabling bottom halves. This is the reverse locking order. It has been observed with inet_listen_hashbucket::lock:
local_bh_disable() + spin_lock(&ilb->lock):
inet_listen()
inet_csk_listen_start()
sk->sk_prot->hash() := inet_hash()
local_bh_disable()
__inet_hash()
spin_lock(&ilb->lock);
acquire(&ilb->lock);Reverse order: spin_lock(&ilb2->lock) + local_bh_disable():
tcp_seq_next()
listening_get_next()
spin_lock(&ilb2->lock);
acquire(&ilb2->lock); tcp4_seq_show()
get_tcp4_sock()
sock_i_ino()
read_lock_bh(&sk->sk_callback_lock);
acquire(softirq_ctrl) // <---- whoops
acquire(&sk->sk_callback_lock)Drop local_bh_disable() around __inet_hash() which acquires listening_hash->lock. Split inet_unhash() and acquire the listen_hashbucket lock without disabling bottom halves; the inet_ehash lock with disabled bottom halves.
--- net/ipv4/inet_hashtables.c | 53 ++++++++++++++++++++++--------------- net/ipv6/inet6_hashtables.c | 5 +--- 2 files changed, 33 insertions(+), 25 deletions(-)
net/ipv4/inet_hashtables.c +32 -21
@@ -637,7 +637,9 @@ int __inet_hash(struct sock *sk, struct sock *osk)int err =0 ;if (sk->sk_state !=TCP_LISTEN ) { +local_bh_disable ();inet_ehash_nolisten (sk, osk,NULL ); +local_bh_enable ();return 0 ; }WARN_ON (!sk_unhashed (sk));
@@ -669,45 +671,54 @@ int inet_hash(struct sock *sk) {int err =0 ; -if (sk->sk_state !=TCP_CLOSE ) { -local_bh_disable (); +if (sk->sk_state !=TCP_CLOSE ) err =__inet_hash (sk,NULL ); -local_bh_enable (); - }return err; }EXPORT_SYMBOL_GPL (inet_hash); -void inet_unhash (struct sock *sk) +static void __inet_unhash (struct sock *sk,struct inet_listen_hashbucket *ilb) { -struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; -struct inet_listen_hashbucket *ilb =NULL ; -spinlock_t *lock; -if (sk_unhashed (sk))return ; -if (sk->sk_state ==TCP_LISTEN ) { - ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn (sk)]; - lock = &ilb->lock; - }else { - lock =inet_ehash_lockp (hashinfo, sk->sk_hash); - } -spin_lock_bh (lock); -if (sk_unhashed (sk)) - goto unlock; -if (rcu_access_pointer (sk->sk_reuseport_cb))reuseport_stop_listen_sock (sk);if (ilb) { +struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; +inet_unhash2 (hashinfo, sk); ilb->count--; }__sk_nulls_del_node_init_rcu (sk);sock_prot_inuse_add (sock_net (sk), sk->sk_prot,-1 ); -unlock: -spin_unlock_bh (lock); +} + +void inet_unhash (struct sock *sk) +{ +struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; + +if (sk_unhashed (sk)) +return ; + +if (sk->sk_state ==TCP_LISTEN ) { +struct inet_listen_hashbucket *ilb; + + ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn (sk)]; +/* Don't disable bottom halves while acquiring the lock to +* avoid circular locking dependency on PREEMPT_RT. +*/ +spin_lock (&ilb->lock); +__inet_unhash (sk, ilb); +spin_unlock (&ilb->lock); + }else { +spinlock_t *lock =inet_ehash_lockp (hashinfo, sk->sk_hash); + +spin_lock_bh (lock); +__inet_unhash (sk,NULL ); +spin_unlock_bh (lock); + } }EXPORT_SYMBOL_GPL (inet_unhash);
net/ipv6/inet6_hashtables.c +1 -4
@@ -333,11 +333,8 @@ int inet6_hash(struct sock *sk) {int err =0 ; -if (sk->sk_state !=TCP_CLOSE ) { -local_bh_disable (); +if (sk->sk_state !=TCP_CLOSE ) err =__inet_hash (sk,NULL ); -local_bh_enable (); - }return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/343 PCI: pciehp: Add Qualcomm quirk for Command Completed erratum
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 9f72d4757cbe4d1ed669192f6d23817c9e437c4b ]
The Qualcomm PCI bridge device (Device ID 0x0110) found in chipsets such as SM8450 does not set the Command Completed bit unless writes to the Slot Command register change "Control" bits.
This results in timeouts like below:
pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago)
Add the device to the Command Completed quirk to mark commands "completed" immediately unless they change the "Control" bits.
--- drivers/pci/hotplug/pciehp_hpc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/hotplug/pciehp_hpc.c +2 -0
@@ -1086,6 +1086,8 @@ static void quirk_cmd_compl(struct pci_dev *pdev) }DECLARE_PCI_FIXUP_CLASS_EARLY (PCI_VENDOR_ID_INTEL ,PCI_ANY_ID ,PCI_CLASS_BRIDGE_PCI ,8 , quirk_cmd_compl); +DECLARE_PCI_FIXUP_CLASS_EARLY (PCI_VENDOR_ID_QCOM ,0x0110 , +PCI_CLASS_BRIDGE_PCI ,8 , quirk_cmd_compl);DECLARE_PCI_FIXUP_CLASS_EARLY (PCI_VENDOR_ID_QCOM ,0x0400 ,PCI_CLASS_BRIDGE_PCI ,8 , quirk_cmd_compl); DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0401,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 75/343 scsi: mpi3mr: Fix deadlock while canceling the fw event
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit 580e6742205efe6b0bfa5a6a6079f509d99168e0 ]
During controller reset, the driver tries to flush all the pending firmware event works from worker queue that are queued prior to the reset. However, if any work is waiting for device addition/removal operation to be completed at the SML, then a deadlock is observed. This is due to the controller reset waiting for the device addition/removal to be completed and the device/addition removal is waiting for the controller reset to be completed.
To limit this deadlock, continue with the controller reset handling without canceling the work which is waiting for device addition/removal operation to complete at SML.
--- drivers/scsi/mpi3mr/mpi3mr.h | 4 ++ drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- drivers/scsi/mpi3mr/mpi3mr_os.c | 106 ++++++++++++++++++++++++++------ 3 files changed, 91 insertions(+), 21 deletions(-)
drivers/scsi/mpi3mr/mpi3mr.h +4 -0
@@ -866,6 +866,8 @@ struct mpi3mr_ioc {* @send_ack: Event acknowledgment required or not * @process_evt: Bottomhalf processing required or not * @evt_ctx: Event context to send in Ack +* @pending_at_sml: waiting for device add/remove API to complete +* @discard: discard this event * @ref_count: kref count * @event_data: Actual MPI3 event data */
@@ -877,6 +879,8 @@ struct mpi3mr_fwevt {bool send_ack;bool process_evt;u32 evt_ctx; +bool pending_at_sml; +bool discard;struct kref ref_count;char event_data[0 ]__aligned(4) ; };
drivers/scsi/mpi3mr/mpi3mr_fw.c +1 -1
@@ -4353,8 +4353,8 @@ int mpi3mr_soft_reset_handler(struct mpi3mr_ioc *mrioc,memset (mrioc->devrem_bitmap,0 , mrioc->devrem_bitmap_sz);memset (mrioc->removepend_bitmap,0 , mrioc->dev_handle_bitmap_sz);memset (mrioc->evtack_cmds_bitmap,0 , mrioc->evtack_cmds_bitmap_sz); -mpi3mr_cleanup_fwevt_list (mrioc);mpi3mr_flush_host_io (mrioc); +mpi3mr_cleanup_fwevt_list (mrioc);mpi3mr_invalidate_devhandles (mrioc);if (mrioc->prepare_for_reset) { mrioc->prepare_for_reset =0 ;
drivers/scsi/mpi3mr/mpi3mr_os.c +86 -20
165 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/343 scsi: mpi3mr: Fix reporting of actual data transfer size
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit 9992246127246a27cc7184f05cce6f62ac48f84e ]
The driver is missing to set the residual size while completing an I/O. Ensure proper data transfer size is reported to the kernel on I/O completion based on the transfer length reported by the firmware.
--- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/mpi3mr/mpi3mr_os.c +2 -0
@@ -2617,6 +2617,8 @@ void mpi3mr_process_op_reply_desc(struct mpi3mr_ioc *mrioc, scmd->result =DID_OK <<16 ; goto out_success; } + +scsi_set_resid (scmd,scsi_bufflen (scmd) - xfer_count); if (ioc_status == MPI3_IOCSTATUS_SCSI_DATA_UNDERRUN && xfer_count == 0 && (scsi_status == MPI3_SCSI_STATUS_BUSY || scsi_status == MPI3_SCSI_STATUS_RESERVATION_CONFLICT ||
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 77/343 scsi: mpi3mr: Fix memory leaks
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit d44b5fefb22e139408ae12b864da1ecb9ad9d1d2 ]
Fix memory leaks related to operational reply queue's memory segments which are not getting freed while unloading the driver.
--- drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_fw.c +1 -1
@@ -1520,7 +1520,7 @@ static void mpi3mr_free_op_req_q_segments(struct mpi3mr_ioc *mrioc, u16 q_idx)MPI3MR_MAX_SEG_LIST_SIZE , mrioc->req_qinfo[q_idx].q_segment_list, mrioc->req_qinfo[q_idx].q_segment_list_dma); - mrioc->op_reply_qinfo[q_idx].q_segment_list =NULL ; + mrioc->req_qinfo[q_idx].q_segment_list =NULL ; } }else size = mrioc->req_qinfo[q_idx].segment_qd *
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 78/343 powerpc/set_memory: Avoid spinlock recursion in change_page_attr()
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
[ Upstream commit a4c182ecf33584b9b2d1aa9dad073014a504c01f ]
Commit 1f9ad21c3b38 ("powerpc/mm: Implement set_memory() routines") included a spin_lock() to change_page_attr() in order to safely perform the three step operations. But then commit 9f7853d7609d ("powerpc/mm: Fix set_memory_*() against concurrent accesses") modify it to use pte_update() and do the operation safely against concurrent access.
In the meantime, Maxime reported some spinlock recursion.
[ 15.351649] BUG: spinlock recursion on CPU#0, kworker/0:2/217 [ 15.357540] lock: init_mm+0x3c/0x420, .magic: dead4ead, .owner: kworker/0:2/217, .owner_cpu: 0 [ 15.366563] CPU: 0 PID: 217 Comm: kworker/0:2 Not tainted 5.15.0+ #523 [ 15.373350] Workqueue: events do_free_init [ 15.377615] Call Trace: [ 15.380232] [e4105ac0] [800946a4] do_raw_spin_lock+0xf8/0x120 (unreliable) [ 15.387340] [e4105ae0] [8001f4ec] change_page_attr+0x40/0x1d4 [ 15.393413] [e4105b10] [801424e0] __apply_to_page_range+0x164/0x310 [ 15.400009] [e4105b60] [80169620] free_pcp_prepare+0x1e4/0x4a0 [ 15.406045] [e4105ba0] [8016c5a0] free_unref_page+0x40/0x2b8 [ 15.411979] [e4105be0] [8018724c] kasan_depopulate_vmalloc_pte+0x6c/0x94 [ 15.418989] [e4105c00] [801424e0] __apply_to_page_range+0x164/0x310 [ 15.425451] [e4105c50] [80187834] kasan_release_vmalloc+0xbc/0x134 [ 15.431898] [e4105c70] [8015f7a8] __purge_vmap_area_lazy+0x4e4/0xdd8 [ 15.438560] [e4105d30] [80160d10] _vm_unmap_aliases.part.0+0x17c/0x24c [ 15.445283] [e4105d60] [801642d0] __vunmap+0x2f0/0x5c8 [ 15.450684] [e4105db0] [800e32d0] do_free_init+0x68/0x94 [ 15.456181] [e4105dd0] [8005d094] process_one_work+0x4bc/0x7b8 [ 15.462283] [e4105e90] [8005d614] worker_thread+0x284/0x6e8 [ 15.468227] [e4105f00] [8006aaec] kthread+0x1f0/0x210 [ 15.473489] [e4105f40] [80017148] ret_from_kernel_thread+0x14/0x1c
Remove the read / modify / write sequence to make the operation atomic and remove the spin_lock() in change_page_attr().
To do the operation atomically, we can't use pte modification helpers anymore. Because all platforms have different combination of bits, it is not easy to use those bits directly. But all have the _PAGE_KERNEL_{RO/ROX/RW/RWX} set of flags. All we need it to compare two sets to know which bits are set or cleared.
For instance, by comparing _PAGE_KERNEL_ROX and _PAGE_KERNEL_RO you know which bit gets cleared and which bit get set when changing exec permission.
--- arch/powerpc/mm/pageattr.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-)
arch/powerpc/mm/pageattr.c +13 -19
@@ -15,12 +15,14 @@#include <asm/pgtable.h> +static pte_basic_t pte_update_delta (pte_t *ptep,unsigned long addr, +unsigned long old,unsigned long new) +{ +return pte_update (&init_mm, addr, ptep, old & ~new, new & ~old,0 ); +} +/* -* Updates the attributes of a page in three steps: -* -* 1. take the page_table_lock -* 2. install the new entry with the updated attributes -* 3. flush the TLB +* Updates the attributes of a page atomically. * * This sequence is safe against concurrent updates, and also allows updating the * attributes of a page currently being executed or accessed.
@@ -28,25 +30,21 @@static int change_page_attr (pte_t *ptep,unsigned long addr,void *data) {long action = (long )data; -pte_t pte; -spin_lock (&init_mm.page_table_lock); - - pte =ptep_get (ptep); - -/* modify the PTE bits as desired, then apply */ +/* modify the PTE bits as desired */ switch (action) {case SET_MEMORY_RO : - pte =pte_wrprotect (pte); +/* Don't clear DIRTY bit */ +pte_update_delta (ptep, addr, _PAGE_KERNEL_RW & ~_PAGE_DIRTY, _PAGE_KERNEL_RO);break ;case SET_MEMORY_RW : - pte =pte_mkwrite (pte_mkdirty (pte)); +pte_update_delta (ptep, addr, _PAGE_KERNEL_RO, _PAGE_KERNEL_RW);break ;case SET_MEMORY_NX : - pte =pte_exprotect (pte); +pte_update_delta (ptep, addr, _PAGE_KERNEL_ROX, _PAGE_KERNEL_RO);break ;case SET_MEMORY_X : - pte =pte_mkexec (pte); +pte_update_delta (ptep, addr, _PAGE_KERNEL_RO, _PAGE_KERNEL_ROX);break ;case SET_MEMORY_NP :pte_update (&init_mm, addr, ptep, _PAGE_PRESENT,0 ,0 );
@@ -59,16 +57,12 @@ static int change_page_attr(pte_t *ptep, unsigned long addr, void *data)break ; } -pte_update (&init_mm, addr, ptep, ~0UL ,pte_val (pte),0 ); -/* See ptesync comment in radix__set_pte_at() */ if (radix_enabled ()) asmvolatile ("ptesync" : : :"memory" );flush_tlb_kernel_range (addr, addr +PAGE_SIZE ); -spin_unlock (&init_mm.page_table_lock); -return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/343 power: supply: axp288-charger: Set Vhold to 4.4V
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 5ac121b81b4051e7fc83d5b3456a5e499d5bd147 ]
The AXP288's recommended and factory default Vhold value (minimum input voltage below which the input current draw will be reduced) is 4.4V. This lines up with other charger IC's such as the TI bq2419x/bq2429x series which use 4.36V or 4.44V.
For some reason some BIOS-es initialize Vhold to 4.6V or even 4.7V which combined with the typical voltage drop over typically low wire gauge micro-USB cables leads to the input-current getting capped below 1A (with a 2A capable dedicated charger) based on Vhold.
This leads to slow charging, or even to the device slowly discharging if the device is in heavy use.
As the Linux AXP288 drivers use the builtin BC1.2 charger detection and send the input-current-limit according to the detected charger there really is no reason not to use the recommended 4.4V Vhold.
Set Vhold to 4.4V to fix the slow charging issue on various devices.
There is one exception, the special-case of the HP X2 2-in-1s which combine this BC1.2 capable PMIC with a Type-C port and a 5V/3A factory provided charger with a Type-C plug which does not do BC1.2. These have their input-current-limit hardcoded to 3A (like under Windows) and use a higher Vhold on purpose to limit the current when used with other chargers. To avoid touching Vhold on these HP X2 laptops the code setting Vhold is added to an else branch of the if checking for these models.
Note this also fixes the sofar unused VBUS_ISPOUT_VHOLD_SET_MASK define, which was wrong.
--- drivers/power/supply/axp288_charger.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/power/supply/axp288_charger.c +12 -2
@@ -42,11 +42,11 @@#define VBUS_ISPOUT_CUR_LIM_1500MA 0x1/* 1500mA */ #define VBUS_ISPOUT_CUR_LIM_2000MA 0x2/* 2000mA */ #define VBUS_ISPOUT_CUR_NO_LIM 0x3/* 2500mA */ -#define VBUS_ISPOUT_VHOLD_SET_MASK 0x31 +#define VBUS_ISPOUT_VHOLD_SET_MASK 0x38#define VBUS_ISPOUT_VHOLD_SET_BIT_POS 0x3#define VBUS_ISPOUT_VHOLD_SET_OFFSET 4000/* 4000mV */ #define VBUS_ISPOUT_VHOLD_SET_LSB_RES 100/* 100mV */ -#define VBUS_ISPOUT_VHOLD_SET_4300MV 0x3/* 4300mV */ +#define VBUS_ISPOUT_VHOLD_SET_4400MV 0x4/* 4400mV */ #define VBUS_ISPOUT_VBUS_PATH_DIS BIT(7)#define CHRG_CCCV_CC_MASK 0xf/* 4 bits */
@@ -769,6 +769,16 @@ static int charger_init_hw_regs(struct axp288_chrg_info *info) ret =axp288_charger_vbus_path_select (info, true);if (ret <0 )return ret; + }else { +/* Set Vhold to the factory default / recommended 4.4V */ + val =VBUS_ISPOUT_VHOLD_SET_4400MV <<VBUS_ISPOUT_VHOLD_SET_BIT_POS ; + ret =regmap_update_bits (info->regmap,AXP20X_VBUS_IPSOUT_MGMT , +VBUS_ISPOUT_VHOLD_SET_MASK , val); +if (ret <0 ) { +dev_err (&info->pdev->dev,"register(%x) write error(%d)\n" , +AXP20X_VBUS_IPSOUT_MGMT , ret); +return ret; + } }/* Read current charge voltage and current limit */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 80/343 drm/sprd: fix potential NULL dereference
In reply to Greg Kroah-HartmanFrom: Kevin Tang <[email protected]>
[ Upstream commit 8668658aebb0a19d877d5a81c004baf716c4aaa6 ]
'drm' could be null in sprd_drm_shutdown, and drm_warn maybe dereference it, remove this warning log.
v1 -> v2:
- Split checking platform_get_resource() return value to a separate patch
- Use dev_warn() instead of removing the warning log
--- drivers/gpu/drm/sprd/sprd_drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/sprd/sprd_drm.c +1 -1
@@ -155,7 +155,7 @@ static void sprd_drm_shutdown(struct platform_device *pdev)struct drm_device *drm =platform_get_drvdata (pdev);if (!drm) { -drm_warn (drm,"drm device is not available, no shutdown\n" ); +dev_warn (&pdev->dev,"drm device is not available, no shutdown\n" );return ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 81/343 drm/sprd: check the platform_get_resource() return value
In reply to Greg Kroah-HartmanFrom: Kevin Tang <[email protected]>
[ Upstream commit 73792e6e66be1225837cc1a40f1e39b1d077751c ]
platform_get_resource() may fail and return NULL, so check it's value before using it.
v1 -> v2:
- new patch
--- drivers/gpu/drm/sprd/sprd_dpu.c | 5 +++++ drivers/gpu/drm/sprd/sprd_dsi.c | 5 +++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/sprd/sprd_dpu.c +5 -0
@@ -790,6 +790,11 @@ static int sprd_dpu_context_init(struct sprd_dpu *dpu,int ret; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (dev,"failed to get I/O resource\n" ); +return -EINVAL ; + } + ctx->base =devm_ioremap (dev, res->start,resource_size (res));if (!ctx->base) {dev_err (dev,"failed to map dpu registers\n" );
drivers/gpu/drm/sprd/sprd_dsi.c +5 -0
@@ -907,6 +907,11 @@ static int sprd_dsi_context_init(struct sprd_dsi *dsi,struct resource *res; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (dev,"failed to get I/O resource\n" ); +return -EINVAL ; + } + ctx->base =devm_ioremap (dev, res->start,resource_size (res));if (!ctx->base) {drm_err (dsi->drm,"failed to map dsi host registers\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 82/343 drm/amd/display: reset lane settings after each PHY repeater LT
In reply to Greg Kroah-HartmanFrom: Sung Joon Kim <[email protected]>
[ Upstream commit 3b853c316c9321e195414a6fb121d1c2d45b1e87 ]
[why]
In LTTPR non-transparent mode, we need
to reset the cached lane settings before performing link training on the next PHY repeater. Otherwise, the cached lane settings will be used for the next clock recovery e.g. VS = MAX (3) which should not be the case according to the DP specs. We expect to use minimum lane settings on each clock recovery sequence.
[how]
Reset DPCD and HW lane settings on each repeater LT. Set training pattern to 0 for the repeater that failed LT at the proper place.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +10 -5
@@ -2378,22 +2378,27 @@ static enum link_training_result dp_perform_8b_10b_link_training( repeater_id--) { status =perform_clock_recovery_sequence (link, link_res, lt_settings, repeater_id); -if (status !=LINK_TRAINING_SUCCESS ) +if (status !=LINK_TRAINING_SUCCESS ) { +repeater_training_done (link, repeater_id);break ; + } status =perform_channel_equalization_sequence (link, link_res, lt_settings, repeater_id); +repeater_training_done (link, repeater_id); +if (status !=LINK_TRAINING_SUCCESS )break ; -repeater_training_done (link, repeater_id); +for (lane =0 ; lane <LANE_COUNT_DP_MAX ; lane++) { + lt_settings->dpcd_lane_settings[lane].raw =0 ; + lt_settings->hw_lane_settings[lane].VOLTAGE_SWING =0 ; + lt_settings->hw_lane_settings[lane].PRE_EMPHASIS =0 ; + } } - -for (lane =0 ; lane < (uint8_t )lt_settings->link_settings.lane_count; lane++) - lt_settings->dpcd_lane_settings[lane].raw =0 ; }if (status ==LINK_TRAINING_SUCCESS ) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/343 net/mlx5e: Disable TX queues before registering the netdev
In reply to Greg Kroah-HartmanFrom: Maxim Mikityanskiy <[email protected]>
[ Upstream commit d08c6e2a4d0308a7922d7ef3b1b3af45d4096aad ]
Normally, the queues are disabled when the channels are deactivated, and enabled when the channels are activated. However, on register, the channels are not active, but the queues are enabled by default. This change fixes it, preventing mlx5e_xmit from running when the channels are deactivated in the beginning.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -0
@@ -5345,6 +5345,7 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *prof }netif_carrier_off (netdev); +netif_tx_disable (netdev);dev_net_set (netdev,mlx5_core_net (mdev));return netdev;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/343 HID: apple: Report Magic Keyboard 2021 battery over USB
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
[ Upstream commit 8ae5c16c9d421d43f32f66d2308031f1bd3f9336 ]
Like the Apple Magic Keyboard 2015, when connected over USB, the 2021 version registers 2 different interfaces. One of them is used to report the battery level.
However, unlike when connected over Bluetooth, the battery level is not reported automatically and it is required to fetch it manually.
Add the APPLE_RDESC_BATTERY quirk to fix the battery report descriptor and manually fetch the battery level.
Tested with the ANSI, ISO and JIS variants of the keyboard.
--- drivers/hid/hid-apple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-apple.c +1 -1
@@ -748,7 +748,7 @@ static const struct hid_device_id apple_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY), .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021), - .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY }, { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 85/343 HID: apple: Report Magic Keyboard 2021 with fingerprint reader battery over USB
In reply to Greg Kroah-HartmanFrom: José Expósito <[email protected]>
[ Upstream commit cbfcfbfc384890a062a5d0cc4792df094a6cc7a8 ]
Like the Apple Magic Keyboard 2015, when connected over USB, the 2021 version with fingerprint reader registers 2 different interfaces. One of them is used to report the battery level.
However, unlike when connected over Bluetooth, the battery level is not reported automatically and it is required to fetch it manually.
Add the APPLE_RDESC_BATTERY quirk to fix the battery report descriptor and manually fetch the battery level.
Tested with the ANSI variant of the keyboard with and without numpad.
--- drivers/hid/hid-apple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hid/hid-apple.c +2 -2
@@ -752,11 +752,11 @@ static const struct hid_device_id apple_devices[] = { { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021), - .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY }, { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021), - .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK }, + .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK | APPLE_RDESC_BATTERY }, { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021), .driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/343 usb: dwc3: pci: Set the swnode from inside dwc3_pci_quirks()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit e285cb403994419e997749c9a52b9370884ae0c8 ]
The quirk handling may need to set some different properties which means using a different swnode, move the setting of the swnode to inside dwc3_pci_quirks() so that the quirk handling can choose a different swnode.
--- drivers/usb/dwc3/dwc3-pci.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/usb/dwc3/dwc3-pci.c +4 -7
@@ -185,7 +185,8 @@ static const struct software_node dwc3_pci_amd_mr_swnode = { .properties = dwc3_pci_mr_properties, }; -static int dwc3_pci_quirks (struct dwc3_pci *dwc) +static int dwc3_pci_quirks (struct dwc3_pci *dwc, +const struct software_node *swnode) {struct pci_dev *pdev = dwc->pci;
@@ -242,7 +243,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) } } -return 0 ; +return device_add_software_node (&dwc->dwc3->dev, swnode); }#ifdef CONFIG_PM
@@ -307,11 +308,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) dwc->dwc3->dev.parent = dev;ACPI_COMPANION_SET (&dwc->dwc3->dev,ACPI_COMPANION (dev)); - ret =device_add_software_node (&dwc->dwc3->dev, (void *)id->driver_data); -if (ret <0 ) - goto err; - - ret =dwc3_pci_quirks (dwc); + ret =dwc3_pci_quirks (dwc, (void *)id->driver_data);if (ret) goto err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/343 iwlwifi: mvm: Correctly set fragmented EBS
In reply to Greg Kroah-HartmanFrom: Ilan Peer <[email protected]>
[ Upstream commit d8d4dd26b9e0469baf5017f0544d852fd4e3fb6d ]
Currently, fragmented EBS was set for a channel only if the 'hb_type' was set to fragmented or balanced scan. However, 'hb_type' is set only in case of CDB, and thus fragmented EBS is never set for a channel for non-CDB devices. Fix it.
--- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +4 -1
@@ -1893,7 +1893,10 @@ static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm,IWL_SCAN_CHANNEL_FLAG_CACHE_ADD ;/* set fragmented ebs for fragmented scan on HB channels */ -if (iwl_mvm_is_scan_fragmented (params->hb_type)) +if ((!iwl_mvm_is_cdb_supported (mvm) && +iwl_mvm_is_scan_fragmented (params->type)) || + (iwl_mvm_is_cdb_supported (mvm) && +iwl_mvm_is_scan_fragmented (params->hb_type))) flags |=IWL_SCAN_CHANNEL_FLAG_EBS_FRAG ;return flags;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 88/343 iwlwifi: fix small doc mistake for iwl_fw_ini_addr_val
In reply to Greg Kroah-HartmanFrom: Luca Coelho <[email protected]>
[ Upstream commit 3009c797c4b3840495e8f48d8d07f48d2ddfed80 ]
There was a small copy and paste mistake in the doc declaration of iwl_fw_ini_addr_val. Fix it.
--- drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h +2 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* -* Copyright (C) 2018-2021 Intel Corporation +* Copyright (C) 2018-2022 Intel Corporation */ #ifndef __iwl_fw_dbg_tlv_h__#define __iwl_fw_dbg_tlv_h__
@@ -249,11 +249,10 @@ struct iwl_fw_ini_hcmd_tlv { } __packed;/* FW_TLV_DEBUG_HCMD_API_S_VER_1 */ /** -* struct iwl_fw_ini_conf_tlv - preset configuration TLV +* struct iwl_fw_ini_addr_val - Address and value to set it to * * @address: the base address * @value: value to set at address -*/ struct iwl_fw_ini_addr_val {__le32 address;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 89/343 iwlwifi: mvm: move only to an enabled channel
In reply to Greg Kroah-HartmanFrom: Miri Korenblit <[email protected]>
[ Upstream commit e04135c07755d001b5cde61048c69a7cc84bb94b ]
During disassociation we're decreasing the phy's ref count. If the ref count becomes 0, we're configuring the phy ctxt to the default channel (the lowest channel which the device can operate on). Currently we're not checking whether the the default channel is enabled or not. Fix it by configuring the phy ctxt to the lowest channel which is enabled.
--- .../net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +22 -9
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2021 Intel Corporation +* Copyright (C) 2012-2014, 2018-2022 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2017 Intel Deutschland GmbH */
@@ -349,18 +349,31 @@ void iwl_mvm_phy_ctxt_unref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)* otherwise we might not be able to reuse this phy. */ if (ctxt->ref ==0 ) { -struct ieee80211_channel *chan; +struct ieee80211_channel *chan =NULL ;struct cfg80211_chan_def chandef; -struct ieee80211_supported_band *sband =NULL ; -enum nl80211_band band =NL80211_BAND_2GHZ ; +struct ieee80211_supported_band *sband; +enum nl80211_band band; +int channel; -while (!sband && band <NUM_NL80211_BANDS ) - sband = mvm->hw->wiphy->bands[band++]; +for (band =NL80211_BAND_2GHZ ; band <NUM_NL80211_BANDS ; band++) { + sband = mvm->hw->wiphy->bands[band]; -if (WARN_ON (!sband)) -return ; +if (!sband) +continue ; + +for (channel =0 ; channel < sband->n_channels; channel++) +if (!(sband->channels[channel].flags & +IEEE80211_CHAN_DISABLED )) { + chan = &sband->channels[channel]; +break ; + } - chan = &sband->channels[0 ]; +if (chan) +break ; + } + +if (WARN_ON (!chan)) +return ;cfg80211_chandef_create (&chandef, chan,NL80211_CHAN_NO_HT );iwl_mvm_phy_ctxt_changed (mvm, ctxt, &chandef,1 ,1 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/343 ipv6: annotate some data-races around sk->sk_prot
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 086d49058cd8471046ae9927524708820f5fd1c7 ]
IPv6 has this hack changing sk->sk_prot when an IPv6 socket is 'converted' to an IPv4 one with IPV6_ADDRFORM option.
This operation is only performed for TCP and UDP, knowing their 'struct proto' for the two network families are populated in the same way, and can not disappear while a reader might use and dereference sk->sk_prot.
If we think about it all reads of sk->sk_prot while
either socket lock or RTNL is not acquired should be using READ_ONCE().
Also note that other layers like MPTCP, XFRM, CHELSIO_TLS also write over sk->sk_prot.
BUG: KCSAN: data-race in inet6_recvmsg / ipv6_setsockopt
write to 0xffff8881386f7aa8 of 8 bytes by task 26932 on cpu 0:
do_ipv6_setsockopt net/ipv6/ipv6_sockglue.c:492 [inline] ipv6_setsockopt+0x3758/0x3910 net/ipv6/ipv6_sockglue.c:1019 udpv6_setsockopt+0x85/0x90 net/ipv6/udp.c:1649 sock_common_setsockopt+0x5d/0x70 net/core/sock.c:3489 __sys_setsockopt+0x209/0x2a0 net/socket.c:2180 __do_sys_setsockopt net/socket.c:2191 [inline] __se_sys_setsockopt net/socket.c:2188 [inline] __x64_sys_setsockopt+0x62/0x70 net/socket.c:2188 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x44/0xd0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
read to 0xffff8881386f7aa8 of 8 bytes by task 26911 on cpu 1:
inet6_recvmsg+0x7a/0x210 net/ipv6/af_inet6.c:659 ____sys_recvmsg+0x16c/0x320 ___sys_recvmsg net/socket.c:2674 [inline] do_recvmmsg+0x3f5/0xae0 net/socket.c:2768 __sys_recvmmsg net/socket.c:2847 [inline] __do_sys_recvmmsg net/socket.c:2870 [inline] __se_sys_recvmmsg net/socket.c:2863 [inline] __x64_sys_recvmmsg+0xde/0x160 net/socket.c:2863 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x44/0xd0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
value changed: 0xffffffff85e0e980 -> 0xffffffff85e01580
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 26911 Comm: syz-executor.3 Not tainted 5.17.0-rc2-syzkaller-00316-g0457e5153e0e-dirty #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- net/ipv6/af_inet6.c | 24 ++++++++++++++++++------ net/ipv6/ipv6_sockglue.c | 6 ++++-- 2 files changed, 22 insertions(+), 8 deletions(-)
net/ipv6/af_inet6.c +18 -6
@@ -441,11 +441,14 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) {struct sock *sk = sock->sk;u32 flags =BIND_WITH_LOCK ; +const struct proto *prot;int err =0 ; +/* IPV6_ADDRFORM can change sk->sk_prot under us. */ + prot =READ_ONCE (sk->sk_prot);/* If the socket has its own bind function then use it. */ -if (sk->sk_prot->bind) -return sk->sk_prot->bind (sk, uaddr, addr_len); +if (prot->bind) +return prot->bind (sk, uaddr, addr_len);if (addr_len <SIN6_LEN_RFC2133 )return -EINVAL ;
@@ -555,6 +558,7 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)void __user *argp = (void __user *)arg;struct sock *sk = sock->sk;struct net *net =sock_net (sk); +const struct proto *prot;switch (cmd) {case SIOCADDRT :
@@ -572,9 +576,11 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)case SIOCSIFDSTADDR :return addrconf_set_dstaddr (net, argp);default : -if (!sk->sk_prot->ioctl) +/* IPV6_ADDRFORM can change sk->sk_prot under us. */ + prot =READ_ONCE (sk->sk_prot); +if (!prot->ioctl)return -ENOIOCTLCMD ; -return sk->sk_prot->ioctl (sk, cmd, arg); +return prot->ioctl (sk, cmd, arg); }/*NOTREACHED*/ return 0 ;
@@ -636,11 +642,14 @@ INDIRECT_CALLABLE_DECLARE(int udpv6_sendmsg(struct sock *, struct msghdr *,int inet6_sendmsg (struct socket *sock,struct msghdr *msg,size_t size) {struct sock *sk = sock->sk; +const struct proto *prot;if (unlikely (inet_send_prepare (sk)))return -EAGAIN ; -return INDIRECT_CALL_2 (sk->sk_prot->sendmsg, tcp_sendmsg, udpv6_sendmsg, +/* IPV6_ADDRFORM can change sk->sk_prot under us. */ + prot =READ_ONCE (sk->sk_prot); +return INDIRECT_CALL_2 (prot->sendmsg, tcp_sendmsg, udpv6_sendmsg, sk, msg, size); }
@@ -650,13 +659,16 @@ int inet6_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, int flags) {struct sock *sk = sock->sk; +const struct proto *prot;int addr_len =0 ;int err;if (likely (!(flags &MSG_ERRQUEUE )))sock_rps_record_flow (sk); - err =INDIRECT_CALL_2 (sk->sk_prot->recvmsg, tcp_recvmsg, udpv6_recvmsg, +/* IPV6_ADDRFORM can change sk->sk_prot under us. */ + prot =READ_ONCE (sk->sk_prot); + err =INDIRECT_CALL_2 (prot->recvmsg, tcp_recvmsg, udpv6_recvmsg, sk, msg, size, flags &MSG_DONTWAIT , flags & ~MSG_DONTWAIT , &addr_len);if (err >=0 )
net/ipv6/ipv6_sockglue.c +4 -2
@@ -475,7 +475,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,sock_prot_inuse_add (net, sk->sk_prot,-1 );sock_prot_inuse_add (net, &tcp_prot,1 ); - sk->sk_prot = &tcp_prot; +/* Paired with READ_ONCE(sk->sk_prot) in net/ipv6/af_inet6.c */ +WRITE_ONCE (sk->sk_prot, &tcp_prot); icsk->icsk_af_ops = &ipv4_specific; sk->sk_socket->ops = &inet_stream_ops; sk->sk_family =PF_INET ;
@@ -489,7 +490,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,sock_prot_inuse_add (net, sk->sk_prot,-1 );sock_prot_inuse_add (net, prot,1 ); - sk->sk_prot = prot; +/* Paired with READ_ONCE(sk->sk_prot) in net/ipv6/af_inet6.c */ +WRITE_ONCE (sk->sk_prot, prot); sk->sk_socket->ops = &inet_dgram_ops; sk->sk_family =PF_INET ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/343 drm/msm/dsi: Remove spurious IRQF_ONESHOT flag
In reply to Greg Kroah-HartmanFrom: Daniel Thompson <[email protected]>
[ Upstream commit 24b176d8827d167ac3b379317f60c0985f6e95aa ]
Quoting the header comments, IRQF_ONESHOT is "Used by threaded interrupts which need to keep the irq line disabled until the threaded handler has been run.". When applied to an interrupt that doesn't request a threaded irq then IRQF_ONESHOT has a lesser known (undocumented?) side effect, which it to disable the forced threading of irqs (and for "normal" kernels it is a nop). In this case I can find no evidence that suppressing forced threading is intentional. Had it been intentional then a driver must adopt the raw_spinlock API in order to avoid deadlocks on PREEMPT_RT kernels (and avoid calling any kernel API that uses regular spinlocks).
Fix this by removing the spurious additional flag.
This change is required for my Snapdragon 7cx Gen2 tablet to boot-to-GUI with PREEMPT_RT enabled.
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +1 -1
@@ -1877,7 +1877,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)/* do not autoenable, will be enabled later */ ret =devm_request_irq (&pdev->dev, msm_host->irq, dsi_host_irq, -IRQF_TRIGGER_HIGH |IRQF_ONESHOT |IRQF_NO_AUTOEN , +IRQF_TRIGGER_HIGH |IRQF_NO_AUTOEN ,"dsi_isr" , msm_host);if (ret <0 ) { dev_err(&pdev->dev, "failed to request IRQ%u: %d\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 92/343 x86/mce: Work around an erratum on fast string copy instructions
In reply to Greg Kroah-HartmanFrom: Jue Wang <[email protected]>
[ Upstream commit 8ca97812c3c830573f965a07bbd84223e8c5f5bd ]
A rare kernel panic scenario can happen when the following conditions are met due to an erratum on fast string copy instructions:
1) An uncorrected error.
2) That error must be in first cache line of a page.
3) Kernel must execute page_copy from the page immediately before that page.
The fast string copy instructions ("REP; MOVS*") could consume an uncorrectable memory error in the cache line _right after_ the desired region to copy and raise an MCE.
Bit 0 of MSR_IA32_MISC_ENABLE can be cleared to disable fast string copy and will avoid such spurious machine checks. However, that is less preferable due to the permanent performance impact. Considering memory poison is rare, it's desirable to keep fast string copy enabled until an MCE is seen.
Intel has confirmed the following:
1. The CPU erratum of fast string copy only applies to Skylake, Cascade Lake and Cooper Lake generations.
Directly return from the MCE handler:
2. Will result in complete execution of the "REP; MOVS*" with no data loss or corruption.
3. Will not result in another MCE firing on the next poisoned cache line due to "REP; MOVS*".
4. Will resume execution from a correct point in code.
5. Will result in the same instruction that triggered the MCE firing a second MCE immediately for any other software recoverable data fetch errors.
6. Is not safe without disabling the fast string copy, as the next fast string copy of the same buffer on the same CPU would result in a PANIC MCE.
This should mitigate the erratum completely with the only caveat that the fast string copy is disabled on the affected hyper thread thus performance degradation.
This is still better than the OS crashing on MCEs raised on an irrelevant process due to "REP; MOVS*' accesses in a kernel context, e.g., copy_page.
Tested:
Injected errors on 1st cache line of 8 anonymous pages of process 'proc1' and observed MCE consumption from 'proc2' with no panic (directly returned).
Without the fix, the host panicked within a few minutes on a random 'proc2' process due to kernel access from copy_page.
[ bp: Fix comment style + touch ups, zap an unlikely(), improve the
quirk function's readability. ]
--- arch/x86/kernel/cpu/mce/core.c | 64 ++++++++++++++++++++++++++++++ arch/x86/kernel/cpu/mce/internal.h | 5 ++- 2 files changed, 68 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mce/core.c +64 -0
@@ -834,6 +834,59 @@ static void quirk_sandybridge_ifu(int bank, struct mce *m, struct pt_regs *regs) m->cs = regs->cs; } +/* +* Disable fast string copy and return from the MCE handler upon the first SRAR +* MCE on bank 1 due to a CPU erratum on Intel Skylake/Cascade Lake/Cooper Lake +* CPUs. +* The fast string copy instructions ("REP; MOVS*") could consume an +* uncorrectable memory error in the cache line _right after_ the desired region +* to copy and raise an MCE with RIP pointing to the instruction _after_ the +* "REP; MOVS*". +* This mitigation addresses the issue completely with the caveat of performance +* degradation on the CPU affected. This is still better than the OS crashing on +* MCEs raised on an irrelevant process due to "REP; MOVS*" accesses from a +* kernel context (e.g., copy_page). +* +* Returns true when fast string copy on CPU has been disabled. +*/ +static noinstr bool quirk_skylake_repmov(void) +{ +u64 mcgstatus =mce_rdmsrl (MSR_IA32_MCG_STATUS ); +u64 misc_enable =mce_rdmsrl (MSR_IA32_MISC_ENABLE ); +u64 mc1_status; + +/* +* Apply the quirk only to local machine checks, i.e., no broadcast +* sync is needed. +*/ +if (!(mcgstatus &MCG_STATUS_LMCES ) || + !(misc_enable &MSR_IA32_MISC_ENABLE_FAST_STRING )) +return false; + + mc1_status =mce_rdmsrl (MSR_IA32_MCx_STATUS (1 )); + +/* Check for a software-recoverable data fetch error. */ +if ((mc1_status & + (MCI_STATUS_VAL |MCI_STATUS_OVER |MCI_STATUS_UC |MCI_STATUS_EN | +MCI_STATUS_ADDRV |MCI_STATUS_MISCV |MCI_STATUS_PCC | +MCI_STATUS_AR |MCI_STATUS_S )) == + (MCI_STATUS_VAL |MCI_STATUS_UC |MCI_STATUS_EN | +MCI_STATUS_ADDRV |MCI_STATUS_MISCV | +MCI_STATUS_AR |MCI_STATUS_S )) { + misc_enable &= ~MSR_IA32_MISC_ENABLE_FAST_STRING ; +mce_wrmsrl (MSR_IA32_MISC_ENABLE , misc_enable); +mce_wrmsrl (MSR_IA32_MCx_STATUS (1 ),0 ); + +instrumentation_begin (); +pr_err_once ("Erratum detected, disable fast string copy instructions.\n" ); +instrumentation_end (); + +return true; + } + +return false; +} +/* * Do a quick check if any of the events requires a panic. * This decides if we keep the events around or clear them.
@@ -1403,6 +1456,9 @@ noinstr void do_machine_check(struct pt_regs *regs)else if (unlikely (!mca_cfg.initialized))return unexpected_machine_check (regs); +if (mce_flags.skx_repmov_quirk &&quirk_skylake_repmov ()) + goto clear; +/* * Establish sequential order between the CPUs entering the machine * check handler.
@@ -1545,6 +1601,7 @@ noinstr void do_machine_check(struct pt_regs *regs) out:instrumentation_end (); +clear:mce_wrmsrl (MSR_IA32_MCG_STATUS ,0 ); }EXPORT_SYMBOL_GPL (do_machine_check);
@@ -1858,6 +1915,13 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)if (c->x86 ==6 && c->x86_model ==45 ) mce_flags.snb_ifu_quirk =1 ; + +/* +* Skylake, Cascacde Lake and Cooper Lake require a quirk on +* rep movs. +*/ +if (c->x86 ==6 && c->x86_model ==INTEL_FAM6_SKYLAKE_X ) + mce_flags.skx_repmov_quirk =1 ; }if (c->x86_vendor ==X86_VENDOR_ZHAOXIN ) {
arch/x86/kernel/cpu/mce/internal.h +4 -1
@@ -170,7 +170,10 @@ struct mce_vendor_flags {/* SandyBridge IFU quirk */ snb_ifu_quirk : 1, - __reserved_0 : 57; + /* Skylake, Cascade Lake, Cooper Lake REP;MOVS* quirk */ + skx_repmov_quirk : 1, + + __reserved_0 : 56; };extern struct mce_vendor_flags mce_flags;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 93/343 rtw89: fix RCU usage in rtw89_core_txq_push()
In reply to Greg Kroah-HartmanFrom: Jiri Kosina <[email protected]>
[ Upstream commit f3d825a35920714fb7f73e4d4f36ea2328860660 ]
ieee80211_tx_h_select_key() is performing a series of RCU dereferences, but rtw89_core_txq_push() is calling it (via ieee80211_tx_dequeue_ni()) without RCU read-side lock held; fix that.
This addresses the splat below.
=============================
WARNING: suspicious RCU usage
5.17.0-rc4-00003-gccad664b7f14 #3 Tainted: G E
-----------------------------
net/mac80211/tx.c:593 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
2 locks held by kworker/u33:0/184:
#0: ffff9c0b14811d38 ((wq_completion)rtw89_tx_wq){+.+.}-{0:0}, at: process_one_work+0x258/0x660 #1: ffffb97380cf3e78 ((work_completion)(&rtwdev->txq_work)){+.+.}-{0:0}, at: process_one_work+0x258/0x660
stack backtrace: CPU: 8 PID: 184 Comm: kworker/u33:0 Tainted: G E 5.17.0-rc4-00003-gccad664b7f14 #3 473b49ab0e7c2d6af2900c756bfd04efd7a9de13 Hardware name: LENOVO 20UJS2B905/20UJS2B905, BIOS R1CET63W(1.32 ) 04/09/2021 Workqueue: rtw89_tx_wq rtw89_core_txq_work [rtw89_core] Call Trace: <TASK> dump_stack_lvl+0x58/0x71 ieee80211_tx_h_select_key+0x2c0/0x530 [mac80211 911c23e2351c0ae60b597a67b1204a5ea955e365] ieee80211_tx_dequeue+0x1a7/0x1260 [mac80211 911c23e2351c0ae60b597a67b1204a5ea955e365] rtw89_core_txq_work+0x1a6/0x420 [rtw89_core b39ba493f2e517ad75e0f8187ecc24edf58bbbea] process_one_work+0x2d8/0x660 worker_thread+0x39/0x3e0 ? process_one_work+0x660/0x660 kthread+0xe5/0x110 ? kthread_complete_and_exit+0x20/0x20 ret_from_fork+0x22/0x30 </TASK>
=============================
WARNING: suspicious RCU usage
5.17.0-rc4-00003-gccad664b7f14 #3 Tainted: G E
-----------------------------
net/mac80211/tx.c:607 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
2 locks held by kworker/u33:0/184:
#0: ffff9c0b14811d38 ((wq_completion)rtw89_tx_wq){+.+.}-{0:0}, at: process_one_work+0x258/0x660 #1: ffffb97380cf3e78 ((work_completion)(&rtwdev->txq_work)){+.+.}-{0:0}, at: process_one_work+0x258/0x660
stack backtrace: CPU: 8 PID: 184 Comm: kworker/u33:0 Tainted: G E 5.17.0-rc4-00003-gccad664b7f14 #3 473b49ab0e7c2d6af2900c756bfd04efd7a9de13 Hardware name: LENOVO 20UJS2B905/20UJS2B905, BIOS R1CET63W(1.32 ) 04/09/2021 Workqueue: rtw89_tx_wq rtw89_core_txq_work [rtw89_core] Call Trace: <TASK> dump_stack_lvl+0x58/0x71 ieee80211_tx_h_select_key+0x464/0x530 [mac80211 911c23e2351c0ae60b597a67b1204a5ea955e365] ieee80211_tx_dequeue+0x1a7/0x1260 [mac80211 911c23e2351c0ae60b597a67b1204a5ea955e365] rtw89_core_txq_work+0x1a6/0x420 [rtw89_core b39ba493f2e517ad75e0f8187ecc24edf58bbbea] process_one_work+0x2d8/0x660 worker_thread+0x39/0x3e0 ? process_one_work+0x660/0x660 kthread+0xe5/0x110 ? kthread_complete_and_exit+0x20/0x20 ret_from_fork+0x22/0x30 </TASK>
--- drivers/net/wireless/realtek/rtw89/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/core.c +4 -1
@@ -1509,11 +1509,12 @@ static void rtw89_core_txq_push(struct rtw89_dev *rtwdev,unsigned long i;int ret; +rcu_read_lock ();for (i =0 ; i < frame_cnt; i++) { skb =ieee80211_tx_dequeue_ni (rtwdev->hw, txq);if (!skb) {rtw89_debug (rtwdev,RTW89_DBG_TXRX ,"dequeue a NULL skb\n" ); -return ; + goto out; }rtw89_core_txq_check_agg (rtwdev, rtwtxq, skb); ret =rtw89_core_tx_write (rtwdev, vif, sta, skb,NULL );
@@ -1523,6 +1524,8 @@ static void rtw89_core_txq_push(struct rtw89_dev *rtwdev,break ; } } +out: +rcu_read_unlock (); }static u32 rtw89_check_and_reclaim_tx_resource (struct rtw89_dev *rtwdev,u8 tid)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/343 ath11k: Fix frames flush failure caused by deadlock
In reply to Greg Kroah-HartmanFrom: Baochen Qiang <[email protected]>
[ Upstream commit 261b07519518bd14cb168b287b17e1d195f8d0c8 ]
We are seeing below warnings:
kernel: [25393.301506] ath11k_pci 0000:01:00.0: failed to flush mgmt transmit queue 0
kernel: [25398.421509] ath11k_pci 0000:01:00.0: failed to flush mgmt transmit queue 0
kernel: [25398.421831] ath11k_pci 0000:01:00.0: dropping mgmt frame for vdev 0, is_started 0
this means ath11k fails to flush mgmt. frames because wmi_mgmt_tx_work has no chance to run in 5 seconds.
By setting /proc/sys/kernel/hung_task_timeout_secs to 20 and increasing ATH11K_FLUSH_TIMEOUT to 50 we get below warnings:
kernel: [ 120.763160] INFO: task wpa_supplicant:924 blocked for more than 20 seconds.
kernel: [ 120.763169] Not tainted 5.10.90 #12
kernel: [ 120.763177] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
kernel: [ 120.763186] task:wpa_supplicant state:D stack: 0 pid: 924 ppid: 1 flags:0x000043a0
kernel: [ 120.763201] Call Trace:
kernel: [ 120.763214] __schedule+0x785/0x12fa
kernel: [ 120.763224] ? lockdep_hardirqs_on_prepare+0xe2/0x1bb
kernel: [ 120.763242] schedule+0x7e/0xa1
kernel: [ 120.763253] schedule_timeout+0x98/0xfe
kernel: [ 120.763266] ? run_local_timers+0x4a/0x4a
kernel: [ 120.763291] ath11k_mac_flush_tx_complete+0x197/0x2b1 [ath11k 13c3a9bf37790f4ac8103b3decf7ab4008ac314a]
kernel: [ 120.763306] ? init_wait_entry+0x2e/0x2e
kernel: [ 120.763343] __ieee80211_flush_queues+0x167/0x21f [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763378] __ieee80211_recalc_idle+0x105/0x125 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763411] ieee80211_recalc_idle+0x14/0x27 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763441] ieee80211_free_chanctx+0x77/0xa2 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763473] __ieee80211_vif_release_channel+0x100/0x131 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763540] ieee80211_vif_release_channel+0x66/0x81 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763572] ieee80211_destroy_auth_data+0xa3/0xe6 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763612] ieee80211_mgd_deauth+0x178/0x29b [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.763654] cfg80211_mlme_deauth+0x1a8/0x22c [cfg80211 8945aa5bc2af5f6972336665d8ad6f9c191ad5be]
kernel: [ 120.763697] nl80211_deauthenticate+0xfa/0x123 [cfg80211 8945aa5bc2af5f6972336665d8ad6f9c191ad5be]
kernel: [ 120.763715] genl_rcv_msg+0x392/0x3c2
kernel: [ 120.763750] ? nl80211_associate+0x432/0x432 [cfg80211 8945aa5bc2af5f6972336665d8ad6f9c191ad5be]
kernel: [ 120.763782] ? nl80211_associate+0x432/0x432 [cfg80211 8945aa5bc2af5f6972336665d8ad6f9c191ad5be]
kernel: [ 120.763802] ? genl_rcv+0x36/0x36
kernel: [ 120.763814] netlink_rcv_skb+0x89/0xf7
kernel: [ 120.763829] genl_rcv+0x28/0x36
kernel: [ 120.763840] netlink_unicast+0x179/0x24b
kernel: [ 120.763854] netlink_sendmsg+0x393/0x401
kernel: [ 120.763872] sock_sendmsg+0x72/0x76
kernel: [ 120.763886] ____sys_sendmsg+0x170/0x1e6
kernel: [ 120.763897] ? copy_msghdr_from_user+0x7a/0xa2
kernel: [ 120.763914] ___sys_sendmsg+0x95/0xd1
kernel: [ 120.763940] __sys_sendmsg+0x85/0xbf
kernel: [ 120.763956] do_syscall_64+0x43/0x55
kernel: [ 120.763966] entry_SYSCALL_64_after_hwframe+0x44/0xa9
kernel: [ 120.763977] RIP: 0033:0x79089f3fcc83
kernel: [ 120.763986] RSP: 002b:00007ffe604f0508 EFLAGS: 00000246 ORIG_RAX: 000000000000002e
kernel: [ 120.763997] RAX: ffffffffffffffda RBX: 000059b40e987690 RCX: 000079089f3fcc83
kernel: [ 120.764006] RDX: 0000000000000000 RSI: 00007ffe604f0558 RDI: 0000000000000009
kernel: [ 120.764014] RBP: 00007ffe604f0540 R08: 0000000000000004 R09: 0000000000400000
kernel: [ 120.764023] R10: 00007ffe604f0638 R11: 0000000000000246 R12: 000059b40ea04980
kernel: [ 120.764032] R13: 00007ffe604f0638 R14: 000059b40e98c360 R15: 00007ffe604f0558
...
kernel: [ 120.765230] INFO: task kworker/u32:26:4239 blocked for more than 20 seconds.
kernel: [ 120.765238] Not tainted 5.10.90 #12
kernel: [ 120.765245] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
kernel: [ 120.765253] task:kworker/u32:26 state:D stack: 0 pid: 4239 ppid: 2 flags:0x00004080
kernel: [ 120.765284] Workqueue: phy0 ieee80211_iface_work [mac80211]
kernel: [ 120.765295] Call Trace:
kernel: [ 120.765306] __schedule+0x785/0x12fa
kernel: [ 120.765316] ? find_held_lock+0x3d/0xb2
kernel: [ 120.765331] schedule+0x7e/0xa1
kernel: [ 120.765340] schedule_preempt_disabled+0x15/0x1e
kernel: [ 120.765349] __mutex_lock_common+0x561/0xc0d
kernel: [ 120.765375] ? ieee80211_sta_work+0x3e/0x1232 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.765390] mutex_lock_nested+0x20/0x26
kernel: [ 120.765416] ieee80211_sta_work+0x3e/0x1232 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.765430] ? skb_dequeue+0x54/0x5e
kernel: [ 120.765456] ? ieee80211_iface_work+0x7b/0x339 [mac80211 335da900954f1c5ea7f1613d92088ce83342042c]
kernel: [ 120.765485] process_one_work+0x270/0x504
kernel: [ 120.765501] worker_thread+0x215/0x376
kernel: [ 120.765514] kthread+0x159/0x168
kernel: [ 120.765526] ? pr_cont_work+0x5b/0x5b
kernel: [ 120.765536] ? kthread_blkcg+0x31/0x31
kernel: [ 120.765550] ret_from_fork+0x22/0x30
...
kernel: [ 120.765867] Showing all locks held in the system:
...
kernel: [ 120.766164] 5 locks held by wpa_supplicant/924:
kernel: [ 120.766172] #0: ffffffffb1e63eb0 (cb_lock){++++}-{3:3}, at: genl_rcv+0x19/0x36
kernel: [ 120.766197] #1: ffffffffb1e5b1c8 (rtnl_mutex){+.+.}-{3:3}, at: nl80211_pre_doit+0x2a/0x15c [cfg80211]
kernel: [ 120.766238] #2: ffff99f08347cd08 (&wdev->mtx){+.+.}-{3:3}, at: nl80211_deauthenticate+0xde/0x123 [cfg80211]
kernel: [ 120.766279] #3: ffff99f09df12a48 (&local->mtx){+.+.}-{3:3}, at: ieee80211_destroy_auth_data+0x9b/0xe6 [mac80211]
kernel: [ 120.766321] #4: ffff99f09df12ce0 (&local->chanctx_mtx){+.+.}-{3:3}, at: ieee80211_vif_release_channel+0x5e/0x81 [mac80211]
...
kernel: [ 120.766585] 3 locks held by kworker/u32:26/4239:
kernel: [ 120.766593] #0: ffff99f04458f948 ((wq_completion)phy0){+.+.}-{0:0}, at: process_one_work+0x19a/0x504
kernel: [ 120.766621] #1: ffffbad54b3cfe50 ((work_completion)(&sdata->work)){+.+.}-{0:0}, at: process_one_work+0x1c0/0x504
kernel: [ 120.766649] #2: ffff99f08347cd08 (&wdev->mtx){+.+.}-{3:3}, at: ieee80211_sta_work+0x3e/0x1232 [mac80211]
With above info the issue is clear: First wmi_mgmt_tx_work is inserted to local->workqueue after sdata->work inserted, then wpa_supplicant acquires wdev->mtx in nl80211_deauthenticate and finally calls ath11k_mac_op_flush where it waits all mgmt. frames to be sent out by wmi_mgmt_tx_work. Meanwhile, sdata->work is blocked by wdev->mtx in ieee80211_sta_work, as a result wmi_mgmt_tx_work has no chance to run.
Change to use ab->workqueue instead of local->workqueue to fix this issue.
--- drivers/net/wireless/ath/ath11k/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mac.c +1 -1
@@ -5574,7 +5574,7 @@ static int ath11k_mac_mgmt_tx(struct ath11k *ar, struct sk_buff *skb,skb_queue_tail (q, skb);atomic_inc (&ar->num_pending_mgmt_tx); -ieee80211_queue_work (ar->hw, &ar->wmi_mgmt_tx_work); +queue_work (ar->ab->workqueue, &ar->wmi_mgmt_tx_work);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 95/343 ipv4: Invalidate neighbour for broadcast address upon address addition
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit 0c51e12e218f20b7d976158fdc18019627326f7a ]
In case user space sends a packet destined to a broadcast address when a matching broadcast route is not configured, the kernel will create a unicast neighbour entry that will never be resolved [1].
When the broadcast route is configured, the unicast neighbour entry will not be invalidated and continue to linger, resulting in packets being dropped.
Solve this by invalidating unresolved neighbour entries for broadcast addresses after routes for these addresses are internally configured by the kernel. This allows the kernel to create a broadcast neighbour entry following the next route lookup.
Another possible solution that is more generic but also more complex is to have the ARP code register a listener to the FIB notification chain and invalidate matching neighbour entries upon the addition of broadcast routes.
It is also possible to wave off the issue as a user space problem, but it seems a bit excessive to expect user space to be that intimately familiar with the inner workings of the FIB/neighbour kernel code.
[1] https://lore.kernel.org/netdev/[email protected]/
--- include/net/arp.h | 1 + net/ipv4/arp.c | 9 +++++++-- net/ipv4/fib_frontend.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-)
include/net/arp.h +1 -0
@@ -65,6 +65,7 @@ void arp_send(int type, int ptype, __be32 dest_ip, const unsigned char *src_hw, const unsigned char *th);int arp_mc_map (__be32 addr,u8 *haddr,struct net_device *dev,int dir);void arp_ifdown (struct net_device *dev); +int arp_invalidate (struct net_device *dev,__be32 ip,bool force); struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, struct net_device *dev, __be32 src_ip,
net/ipv4/arp.c +7 -2
@@ -1116,13 +1116,18 @@ static int arp_req_get(struct arpreq *r, struct net_device *dev)return err; } -static int arp_invalidate (struct net_device *dev,__be32 ip) +int arp_invalidate (struct net_device *dev,__be32 ip,bool force) {struct neighbour *neigh =neigh_lookup (&arp_tbl, &ip, dev);int err = -ENXIO ;struct neigh_table *tbl = &arp_tbl;if (neigh) { +if ((neigh->nud_state &NUD_VALID ) && !force) { +neigh_release (neigh); +return 0 ; + } +if (neigh->nud_state & ~NUD_NOARP ) err = neigh_update(neigh, NULL, NUD_FAILED, NEIGH_UPDATE_F_OVERRIDE|
@@ -1169,7 +1174,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r,if (!dev)return -EINVAL ; } -return arp_invalidate (dev, ip); +return arp_invalidate (dev, ip, true); }/*
net/ipv4/fib_frontend.c +4 -1
@@ -1115,9 +1115,11 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)return ;/* Add broadcast address, if it is explicitly assigned. */ -if (ifa->ifa_broadcast && ifa->ifa_broadcast !=htonl (0xFFFFFFFF )) +if (ifa->ifa_broadcast && ifa->ifa_broadcast !=htonl (0xFFFFFFFF )) {fib_magic (RTM_NEWROUTE ,RTN_BROADCAST , ifa->ifa_broadcast,32 , prim,0 ); +arp_invalidate (dev, ifa->ifa_broadcast, false); + }if (!ipv4_is_zeronet (prefix) && !(ifa->ifa_flags &IFA_F_SECONDARY ) && (prefix != addr || ifa->ifa_prefixlen <32 )) {
@@ -1131,6 +1133,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)if (ifa->ifa_prefixlen <31 ) {fib_magic (RTM_NEWROUTE ,RTN_BROADCAST , prefix | ~mask,32 , prim,0 ); +arp_invalidate (dev, prefix | ~mask, false); } } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 96/343 rtw88: change rtw_info() to proper message level
In reply to Greg Kroah-HartmanFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit a0061be4e54b52e5e4ff179c3f817107ddbb2830 ]
Larry reported funny log entries [1] when he used rtl8821ce. These messages are not harmless, but not useful for users, so change them to rtw_dbg() level. By the way, I review all rtw_info() and change others to rtw_warn().
[1] https://lore.kernel.org/linux-wireless/[email protected]/
--- drivers/net/wireless/realtek/rtw88/debug.c | 2 +- drivers/net/wireless/realtek/rtw88/debug.h | 1 + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- drivers/net/wireless/realtek/rtw88/mac80211.c | 8 ++++---- drivers/net/wireless/realtek/rtw88/main.c | 8 ++++---- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 4 ++-- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 4 ++-- drivers/net/wireless/realtek/rtw88/sar.c | 8 ++++---- 9 files changed, 20 insertions(+), 19 deletions(-)
drivers/net/wireless/realtek/rtw88/debug.c +1 -1
@@ -390,7 +390,7 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp, ¶m[0 ], ¶m[1 ], ¶m[2 ], ¶m[3 ], ¶m[4], ¶m[5], ¶m[6], ¶m[7]);if (num !=8 ) { -rtw_info (rtwdev,"invalid H2C command format for debug\n" ); +rtw_warn (rtwdev,"invalid H2C command format for debug\n" );return -EINVAL ; }
drivers/net/wireless/realtek/rtw88/debug.h +1 -0
@@ -23,6 +23,7 @@ enum rtw_debug_mask {RTW_DBG_PATH_DIV =0x00004000 ,RTW_DBG_ADAPTIVITY =0x00008000 ,RTW_DBG_HW_SCAN =0x00010000 , +RTW_DBG_STATE =0x00020000 , RTW_DBG_ALL = 0xffffffff };
drivers/net/wireless/realtek/rtw88/fw.c +1 -1
@@ -2131,7 +2131,7 @@ void rtw_hw_scan_status_report(struct rtw_dev *rtwdev, struct sk_buff *skb)rtw_hw_scan_complete (rtwdev, vif, aborted);if (aborted) -rtw_info (rtwdev,"HW scan aborted with code: %d\n" , rc); +rtw_dbg (rtwdev,RTW_DBG_HW_SCAN ,"HW scan aborted with code: %d\n" , rc); }void rtw_store_op_chan (struct rtw_dev *rtwdev)
drivers/net/wireless/realtek/rtw88/mac80211.c +4 -4
@@ -208,7 +208,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw,mutex_unlock (&rtwdev->mutex); -rtw_info (rtwdev,"start vif %pM on port %d\n" , vif->addr, rtwvif->port); +rtw_dbg (rtwdev,RTW_DBG_STATE ,"start vif %pM on port %d\n" , vif->addr, rtwvif->port);return 0 ; }
@@ -219,7 +219,7 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw,struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;u32 config =0 ; -rtw_info (rtwdev,"stop vif %pM on port %d\n" , vif->addr, rtwvif->port); +rtw_dbg (rtwdev,RTW_DBG_STATE ,"stop vif %pM on port %d\n" , vif->addr, rtwvif->port);mutex_lock (&rtwdev->mutex);
@@ -245,8 +245,8 @@ static int rtw_ops_change_interface(struct ieee80211_hw *hw, {struct rtw_dev *rtwdev = hw->priv; -rtw_info (rtwdev,"change vif %pM (%d)->(%d), p2p (%d)->(%d)\n" , - vif->addr, vif->type, type, vif->p2p, p2p); +rtw_dbg (rtwdev,RTW_DBG_STATE ,"change vif %pM (%d)->(%d), p2p (%d)->(%d)\n" , + vif->addr, vif->type, type, vif->p2p, p2p);rtw_ops_remove_interface (hw, vif);
drivers/net/wireless/realtek/rtw88/main.c +4 -4
@@ -314,8 +314,8 @@ int rtw_sta_add(struct rtw_dev *rtwdev, struct ieee80211_sta *sta, rtwdev->sta_cnt++; rtwdev->beacon_loss = false; -rtw_info (rtwdev,"sta %pM joined with macid %d\n" , - sta->addr, si->mac_id); +rtw_dbg (rtwdev,RTW_DBG_STATE ,"sta %pM joined with macid %d\n" , + sta->addr, si->mac_id);return 0 ; }
@@ -336,8 +336,8 @@ void rtw_sta_remove(struct rtw_dev *rtwdev, struct ieee80211_sta *sta,kfree (si->mask); rtwdev->sta_cnt--; -rtw_info (rtwdev,"sta %pM with macid %d left\n" , - sta->addr, si->mac_id); +rtw_dbg (rtwdev,RTW_DBG_STATE ,"sta %pM with macid %d left\n" , + sta->addr, si->mac_id); }struct rtw_fwcd_hdr {
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -1
@@ -499,7 +499,7 @@ static s8 get_cck_rx_pwr(struct rtw_dev *rtwdev, u8 lna_idx, u8 vga_idx) }if (lna_idx >= lna_gain_table_size) { -rtw_info (rtwdev,"incorrect lna index (%d)\n" , lna_idx); +rtw_warn (rtwdev,"incorrect lna index (%d)\n" , lna_idx);return -120 ; }
drivers/net/wireless/realtek/rtw88/rtw8822b.c +2 -2
@@ -1012,12 +1012,12 @@ static int rtw8822b_set_antenna(struct rtw_dev *rtwdev, antenna_tx, antenna_rx);if (!rtw8822b_check_rf_path (antenna_tx)) { -rtw_info (rtwdev,"unsupported tx path 0x%x\n" , antenna_tx); +rtw_warn (rtwdev,"unsupported tx path 0x%x\n" , antenna_tx);return -EINVAL ; }if (!rtw8822b_check_rf_path (antenna_rx)) { -rtw_info (rtwdev,"unsupported rx path 0x%x\n" , antenna_rx); +rtw_warn (rtwdev,"unsupported rx path 0x%x\n" , antenna_rx);return -EINVAL ; }
drivers/net/wireless/realtek/rtw88/rtw8822c.c +2 -2
@@ -2798,7 +2798,7 @@ static int rtw8822c_set_antenna(struct rtw_dev *rtwdev,case BB_PATH_AB :break ;default : -rtw_info (rtwdev,"unsupported tx path 0x%x\n" , antenna_tx); +rtw_warn (rtwdev,"unsupported tx path 0x%x\n" , antenna_tx);return -EINVAL ; }
@@ -2808,7 +2808,7 @@ static int rtw8822c_set_antenna(struct rtw_dev *rtwdev,case BB_PATH_AB :break ;default : -rtw_info (rtwdev,"unsupported rx path 0x%x\n" , antenna_rx); +rtw_warn (rtwdev,"unsupported rx path 0x%x\n" , antenna_rx);return -EINVAL ; }
drivers/net/wireless/realtek/rtw88/sar.c +4 -4
@@ -91,10 +91,10 @@ int rtw_set_sar_specs(struct rtw_dev *rtwdev,return -EINVAL ; power = sar->sub_specs[i].power; -rtw_info (rtwdev,"On freq %u to %u, set SAR %d in 1/%lu dBm\n" , - rtw_common_sar_freq_ranges[idx].start_freq, - rtw_common_sar_freq_ranges[idx].end_freq, - power,BIT (RTW_COMMON_SAR_FCT )); +rtw_dbg (rtwdev,RTW_DBG_REGD ,"On freq %u to %u, set SAR %d in 1/%lu dBm\n" , + rtw_common_sar_freq_ranges[idx].start_freq, + rtw_common_sar_freq_ranges[idx].end_freq, + power,BIT (RTW_COMMON_SAR_FCT ));for (j =0 ; j <RTW_RF_PATH_MAX ; j++) {for (k =0 ; k <RTW_RATE_SECTION_MAX ; k++) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 97/343 dm ioctl: prevent potential spectre v1 gadget
In reply to Greg Kroah-HartmanFrom: Jordy Zomer <[email protected]>
[ Upstream commit cd9c88da171a62c4b0f1c70e50c75845969fbc18 ]
It appears like cmd could be a Spectre v1 gadget as it's supplied by a user and used as an array index. Prevent the contents of kernel memory from being leaked to userspace via speculative execution by using array_index_nospec.
--- drivers/md/dm-ioctl.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/md/dm-ioctl.c +2 -0
@@ -18,6 +18,7 @@#include <linux/dm-ioctl.h> #include <linux/hdreg.h> #include <linux/compat.h> +#include <linux/nospec.h> #include <linux/uaccess.h> #include <linux/ima.h>
@@ -1788,6 +1789,7 @@ static ioctl_fn lookup_ioctl(unsigned int cmd, int *ioctl_flags)if (unlikely (cmd >=ARRAY_SIZE (_ioctls)))return NULL ; + cmd =array_index_nospec (cmd,ARRAY_SIZE (_ioctls)); *ioctl_flags = _ioctls[cmd].flags;return _ioctls[cmd].fn; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 98/343 dm: requeue IO if mapping table not yet available
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
[ Upstream commit fa247089de9936a46e290d4724cb5f0b845600f5 ]
Update both bio-based and request-based DM to requeue IO if the mapping table not available.
This race of IO being submitted before the DM device ready is so narrow, yet possible for initial table load given that the DM device's request_queue is created prior, that it best to requeue IO to handle this unlikely case.
--- drivers/md/dm-rq.c | 7 ++++++- drivers/md/dm.c | 11 +++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/md/dm-rq.c +6 -1
@@ -499,8 +499,13 @@ static blk_status_t dm_mq_queue_rq(struct blk_mq_hw_ctx *hctx,if (unlikely (!ti)) {int srcu_idx; -struct dm_table *map =dm_get_live_table (md, &srcu_idx); +struct dm_table *map; + map =dm_get_live_table (md, &srcu_idx); +if (unlikely (!map)) { +dm_put_live_table (md, srcu_idx); +return BLK_STS_RESOURCE ; + } ti =dm_table_find_target (map,0 );dm_put_live_table (md, srcu_idx); }
drivers/md/dm.c +3 -8
@@ -1519,15 +1519,10 @@ static void dm_submit_bio(struct bio *bio)struct dm_table *map; map =dm_get_live_table (md, &srcu_idx); -if (unlikely (!map)) { -DMERR_LIMIT ("%s: mapping table unavailable, erroring io" , -dm_device_name (md)); -bio_io_error (bio); - goto out; - } -/* If suspended, queue this IO for later */ -if (unlikely (test_bit (DMF_BLOCK_IO_FOR_SUSPEND , &md->flags))) { +/* If suspended, or map not yet available, queue this IO for later */ +if (unlikely (test_bit (DMF_BLOCK_IO_FOR_SUSPEND , &md->flags)) || +unlikely (!map)) {if (bio->bi_opf &REQ_NOWAIT )bio_wouldblock_error (bio);else if (bio->bi_opf &REQ_RAHEAD )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 99/343 drm/amdkfd: make CRAT table missing message informational only
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit 9dff13f9edf755a15f6507874185a3290c1ae8bb ]
The driver has a fallback so make the message informational rather than a warning. The driver has a fallback if the Component Resource Association Table (CRAT) is missing, so make this informational now.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -1
@@ -1567,7 +1567,7 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)/* Fetch the CRAT table from ACPI */ status =acpi_get_table (CRAT_SIGNATURE ,0 , &crat_table);if (status ==AE_NOT_FOUND ) { -pr_warn ("CRAT table not found\n" ); +pr_info ("CRAT table not found\n" );return -ENODATA ; }else if (ACPI_FAILURE (status)) {const char *err =acpi_format_exception (status);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 100/343 vfio/pci: Stub vfio_pci_vga_rw when !CONFIG_VFIO_PCI_VGA
In reply to Greg Kroah-HartmanFrom: Alex Williamson <[email protected]>
[ Upstream commit 6e031ec0e5a2dda53e12e0d2a7e9b15b47a3c502 ]
Resolve build errors reported against UML build for undefined ioport_map() and ioport_unmap() functions. Without this config option a device cannot have vfio_pci_core_device.has_vga set, so the existing function would always return -EINVAL anyway.
--- drivers/vfio/pci/vfio_pci_rdwr.c | 2 ++ include/linux/vfio_pci_core.h | 9 +++++++++ 2 files changed, 11 insertions(+)
drivers/vfio/pci/vfio_pci_rdwr.c +2 -0
@@ -288,6 +288,7 @@ ssize_t vfio_pci_bar_rw(struct vfio_pci_core_device *vdev, char __user *buf,return done; } +#ifdef CONFIG_VFIO_PCI_VGA ssize_t vfio_pci_vga_rw (struct vfio_pci_core_device *vdev,char __user *buf,size_t count,loff_t *ppos,bool iswrite) {
@@ -355,6 +356,7 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_core_device *vdev, char __user *buf, return done; } +#endif static void vfio_pci_ioeventfd_do_write (struct vfio_pci_ioeventfd *ioeventfd,bool test_mem)
include/linux/vfio_pci_core.h +9 -0
@@ -159,8 +159,17 @@ extern ssize_t vfio_pci_config_rw(struct vfio_pci_core_device *vdev,extern ssize_t vfio_pci_bar_rw (struct vfio_pci_core_device *vdev,char __user *buf,size_t count,loff_t *ppos,bool iswrite); +#ifdef CONFIG_VFIO_PCI_VGA extern ssize_t vfio_pci_vga_rw (struct vfio_pci_core_device *vdev,char __user *buf,size_t count,loff_t *ppos,bool iswrite); +#else +static inline ssize_t vfio_pci_vga_rw (struct vfio_pci_core_device *vdev, +char __user *buf,size_t count, +loff_t *ppos,bool iswrite) +{ +return -EINVAL ; +} +#endif extern long vfio_pci_ioeventfd (struct vfio_pci_core_device *vdev,loff_t offset,uint64_t data,int count,int fd);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 101/343 scsi: pm8001: Fix pm80xx_pci_mem_copy() interface
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 3762d8f6edcdb03994c919f9487fd6d336c06561 ]
The declaration of the local variable destination1 in pm80xx_pci_mem_copy() as a pointer to a u32 results in the sparse warning:
warning: incorrect type in assignment (different base types)
expected unsigned int [usertype]
got restricted __le32 [usertype]
Furthermore, the destination" argument of pm80xx_pci_mem_copy() is wrongly declared with the const attribute.
Fix both problems by changing the type of the "destination" argument to "__le32 *" and use this argument directly inside the pm80xx_pci_mem_copy() function, thus removing the need for the destination1 local variable.
--- drivers/scsi/pm8001/pm80xx_hwi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/scsi/pm8001/pm80xx_hwi.c +3 -5
@@ -67,18 +67,16 @@ int pm80xx_bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shift_value) }static void pm80xx_pci_mem_copy (struct pm8001_hba_info *pm8001_ha,u32 soffset, -const void *destination, +__le32 *destination,u32 dw_count,u32 bus_base_number) {u32 index, value, offset; -u32 *destination1; - destination1 = (u32 *)destination; -for (index =0 ; index < dw_count; index +=4 , destination1++) { +for (index =0 ; index < dw_count; index +=4 , destination++) { offset = (soffset + index);if (offset < (64 *1024 )) { value =pm8001_cr32 (pm8001_ha, bus_base_number, offset); - *destination1 =cpu_to_le32 (value); + *destination =cpu_to_le32 (value); } }return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 102/343 scsi: pm8001: Fix pm8001_mpi_task_abort_resp()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 7e6b7e740addcea450041b5be8e42f0a4ceece0f ]
The call to pm8001_ccb_task_free() at the end of pm8001_mpi_task_abort_resp() already frees the ccb tag. So when the device NCQ_ABORT_ALL_FLAG is set, the tag should not be freed again. Also change the hardcoded 0xBFFFFFFF value to ~NCQ_ABORT_ALL_FLAG as it ought to be.
--- drivers/scsi/pm8001/pm8001_hwi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +3 -4
@@ -3706,12 +3706,11 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)mb ();if (pm8001_dev->id &NCQ_ABORT_ALL_FLAG ) { -pm8001_tag_free (pm8001_ha, tag);sas_free_task (t); -/* clear the flag */ - pm8001_dev->id &=0xBFFFFFFF ; - }else + pm8001_dev->id &= ~NCQ_ABORT_ALL_FLAG ; + }else { t->task_done (t); + }return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 103/343 scsi: pm8001: Fix tag values handling
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 7fb23a785ba38dea907323a039123f231195b297 ]
The function pm8001_tag_alloc() determines free tags using the function find_first_zero_bit() which can return 0 when the first bit of the bitmap being inspected is 0. As such, tag 0 is a valid tag value that should not be dismissed as invalid. Fix the functions pm8001_work_fn(), mpi_sata_completion(), pm8001_mpi_task_abort_resp() and pm8001_open_reject_retry() to not dismiss 0 tags as invalid.
The value 0xffffffff is used for invalid tags for unused ccb information structures. Add the macro definition PM8001_INVALID_TAG to define this value.
--- drivers/scsi/pm8001/pm8001_hwi.c | 52 +++++++++++-------------------- drivers/scsi/pm8001/pm8001_init.c | 3 +- drivers/scsi/pm8001/pm8001_sas.c | 13 ++++---- drivers/scsi/pm8001/pm8001_sas.h | 2 ++ drivers/scsi/pm8001/pm80xx_hwi.c | 5 --- 5 files changed, 28 insertions(+), 47 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +18 -34
@@ -1522,7 +1522,6 @@ void pm8001_work_fn(struct work_struct *work)case IO_XFER_ERROR_BREAK : {/* This one stashes the sas_task instead */ struct sas_task *t = (struct sas_task *)pm8001_dev; -u32 tag;struct pm8001_ccb_info *ccb;struct pm8001_hba_info *pm8001_ha = pw->pm8001_ha;unsigned long flags, flags1;
@@ -1544,8 +1543,8 @@ void pm8001_work_fn(struct work_struct *work)/* Search for a possible ccb that matches the task */ for (i =0 ; ccb =NULL , i <PM8001_MAX_CCB ; i++) { ccb = &pm8001_ha->ccb_info[i]; - tag = ccb->ccb_tag; -if ((tag !=0xFFFFFFFF ) && (ccb->task == t)) +if ((ccb->ccb_tag !=PM8001_INVALID_TAG ) && + (ccb->task == t))break ; }if (!ccb) {
@@ -1567,11 +1566,11 @@ void pm8001_work_fn(struct work_struct *work)spin_unlock_irqrestore (&t->task_state_lock, flags1);pm8001_dbg (pm8001_ha,FAIL ,"task 0x%p done with event 0x%x resp 0x%x stat 0x%x but aborted by upper layer!\n" , t, pw->handler, ts->resp, ts->stat); -pm8001_ccb_task_free (pm8001_ha, t, ccb, tag); +pm8001_ccb_task_free (pm8001_ha, t, ccb, ccb->ccb_tag);spin_unlock_irqrestore (&pm8001_ha->lock, flags); }else {spin_unlock_irqrestore (&t->task_state_lock, flags1); -pm8001_ccb_task_free (pm8001_ha, t, ccb, tag); +pm8001_ccb_task_free (pm8001_ha, t, ccb, ccb->ccb_tag);mb ();/* in order to force CPU ordering */ spin_unlock_irqrestore (&pm8001_ha->lock, flags); t->task_done (t);
@@ -1580,7 +1579,6 @@ void pm8001_work_fn(struct work_struct *work)case IO_XFER_OPEN_RETRY_TIMEOUT : {/* This one stashes the sas_task instead */ struct sas_task *t = (struct sas_task *)pm8001_dev; -u32 tag;struct pm8001_ccb_info *ccb;struct pm8001_hba_info *pm8001_ha = pw->pm8001_ha;unsigned long flags, flags1;
@@ -1614,8 +1612,8 @@ void pm8001_work_fn(struct work_struct *work)/* Search for a possible ccb that matches the task */ for (i =0 ; ccb =NULL , i <PM8001_MAX_CCB ; i++) { ccb = &pm8001_ha->ccb_info[i]; - tag = ccb->ccb_tag; -if ((tag !=0xFFFFFFFF ) && (ccb->task == t)) +if ((ccb->ccb_tag !=PM8001_INVALID_TAG ) && + (ccb->task == t))break ; }if (!ccb) {
@@ -1686,19 +1684,13 @@ void pm8001_work_fn(struct work_struct *work)struct task_status_struct *ts;struct sas_task *task;int i; -u32 tag, device_id; +u32 device_id;for (i =0 ; ccb =NULL , i <PM8001_MAX_CCB ; i++) { ccb = &pm8001_ha->ccb_info[i]; task = ccb->task; ts = &task->task_status; - tag = ccb->ccb_tag; -/* check if tag is NULL */ -if (!tag) { -pm8001_dbg (pm8001_ha,FAIL , -"tag Null\n" ); -continue ; - } +if (task !=NULL ) { dev = task->dev;if (!dev) {
@@ -1707,10 +1699,11 @@ void pm8001_work_fn(struct work_struct *work)continue ; }/*complete sas task and update to top layer */ -pm8001_ccb_task_free (pm8001_ha, task, ccb, tag); +pm8001_ccb_task_free (pm8001_ha, task, ccb, + ccb->ccb_tag); ts->resp =SAS_TASK_COMPLETE ; task->task_done (task); - }else if (tag !=0xFFFFFFFF ) { + }else if (ccb->ccb_tag !=PM8001_INVALID_TAG ) {/* complete the internal commands/non-sas task */ pm8001_dev = ccb->device;if (pm8001_dev->dcompletion) {
@@ -1718,7 +1711,7 @@ void pm8001_work_fn(struct work_struct *work) pm8001_dev->dcompletion =NULL ; }complete (pm8001_ha->nvmd_completion); -pm8001_tag_free (pm8001_ha, tag); +pm8001_tag_free (pm8001_ha, ccb->ccb_tag); } }/* Deregister all the device ids */
@@ -2316,11 +2309,6 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb) param =le32_to_cpu (psataPayload->param); tag =le32_to_cpu (psataPayload->tag); -if (!tag) { -pm8001_dbg (pm8001_ha,FAIL ,"tag null\n" ); -return ; - } - ccb = &pm8001_ha->ccb_info[tag]; t = ccb->task; pm8001_dev = ccb->device;
@@ -3056,7 +3044,7 @@ void pm8001_mpi_set_dev_state_resp(struct pm8001_hba_info *pm8001_ha, device_id, pds, nds, status);complete (pm8001_dev->setds_completion); ccb->task =NULL ; - ccb->ccb_tag =0xFFFFFFFF ; + ccb->ccb_tag =PM8001_INVALID_TAG ;pm8001_tag_free (pm8001_ha, tag); }
@@ -3074,7 +3062,7 @@ void pm8001_mpi_set_nvmd_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) dlen_status); } ccb->task =NULL ; - ccb->ccb_tag =0xFFFFFFFF ; + ccb->ccb_tag =PM8001_INVALID_TAG ;pm8001_tag_free (pm8001_ha, tag); }
@@ -3101,7 +3089,7 @@ pm8001_mpi_get_nvmd_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)* freed by requesting path anywhere. */ ccb->task =NULL ; - ccb->ccb_tag =0xFFFFFFFF ; + ccb->ccb_tag =PM8001_INVALID_TAG ;pm8001_tag_free (pm8001_ha, tag);return ; }
@@ -3147,7 +3135,7 @@ pm8001_mpi_get_nvmd_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)complete (pm8001_ha->nvmd_completion);pm8001_dbg (pm8001_ha,MSG ,"Get nvmd data complete!\n" ); ccb->task =NULL ; - ccb->ccb_tag =0xFFFFFFFF ; + ccb->ccb_tag =PM8001_INVALID_TAG ;pm8001_tag_free (pm8001_ha, tag); }
@@ -3560,7 +3548,7 @@ int pm8001_mpi_reg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) }complete (pm8001_dev->dcompletion); ccb->task =NULL ; - ccb->ccb_tag =0xFFFFFFFF ; + ccb->ccb_tag =PM8001_INVALID_TAG ;pm8001_tag_free (pm8001_ha, htag);return 0 ; }
@@ -3632,7 +3620,7 @@ int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha, }kfree (ccb->fw_control_context); ccb->task =NULL ; - ccb->ccb_tag =0xFFFFFFFF ; + ccb->ccb_tag =PM8001_INVALID_TAG ;pm8001_tag_free (pm8001_ha, tag);complete (pm8001_ha->nvmd_completion);return 0 ;
@@ -3668,10 +3656,6 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) status =le32_to_cpu (pPayload->status); tag =le32_to_cpu (pPayload->tag); -if (!tag) { -pm8001_dbg (pm8001_ha,FAIL ," TAG NULL. RETURNING !!!\n" ); -return -1 ; - } scp =le32_to_cpu (pPayload->scp); ccb = &pm8001_ha->ccb_info[tag];
drivers/scsi/pm8001/pm8001_init.c +2 -1
@@ -1216,10 +1216,11 @@ pm8001_init_ccb_tag(struct pm8001_hba_info *pm8001_ha, struct Scsi_Host *shost, goto err_out; } pm8001_ha->ccb_info[i].task =NULL ; - pm8001_ha->ccb_info[i].ccb_tag =0xffffffff ; + pm8001_ha->ccb_info[i].ccb_tag =PM8001_INVALID_TAG ; pm8001_ha->ccb_info[i].device =NULL ; ++pm8001_ha->tags_num; } +return 0 ; err_out_noccb:
drivers/scsi/pm8001/pm8001_sas.c +6 -7
@@ -567,7 +567,7 @@ void pm8001_ccb_task_free(struct pm8001_hba_info *pm8001_ha, task->lldd_task =NULL ; ccb->task =NULL ; - ccb->ccb_tag =0xFFFFFFFF ; + ccb->ccb_tag =PM8001_INVALID_TAG ; ccb->open_retry =0 ;pm8001_tag_free (pm8001_ha, ccb_idx); }
@@ -952,9 +952,11 @@ void pm8001_open_reject_retry(struct task_status_struct *ts;struct pm8001_device *pm8001_dev;unsigned long flags1; -u32 tag;struct pm8001_ccb_info *ccb = &pm8001_ha->ccb_info[i]; +if (ccb->ccb_tag ==PM8001_INVALID_TAG ) +continue ; + pm8001_dev = ccb->device;if (!pm8001_dev || (pm8001_dev->dev_type ==SAS_PHY_UNUSED ))continue ;
@@ -966,9 +968,6 @@ void pm8001_open_reject_retry(continue ; }else if (pm8001_dev != device_to_close)continue ; - tag = ccb->ccb_tag; -if (!tag || (tag ==0xFFFFFFFF )) -continue ; task = ccb->task;if (!task || !task->task_done)continue ;
@@ -989,11 +988,11 @@ void pm8001_open_reject_retry( & SAS_TASK_STATE_ABORTED))) { spin_unlock_irqrestore(&task->task_state_lock, flags1); - pm8001_ccb_task_free(pm8001_ha, task, ccb, tag); + pm8001_ccb_task_free(pm8001_ha, task, ccb, ccb->ccb_tag); } else {spin_unlock_irqrestore (&task->task_state_lock, flags1); -pm8001_ccb_task_free (pm8001_ha, task, ccb, tag); +pm8001_ccb_task_free (pm8001_ha, task, ccb, ccb->ccb_tag);mb ();/* in order to force CPU ordering */ spin_unlock_irqrestore (&pm8001_ha->lock, flags); task->task_done (task);
drivers/scsi/pm8001/pm8001_sas.h +2 -0
@@ -738,6 +738,8 @@ void pm8001_free_dev(struct pm8001_device *pm8001_dev);/* ctl shared API */ extern const struct attribute_group *pm8001_host_groups[]; +#define PM8001_INVALID_TAG ((u32)-1) + static inline void pm8001_ccb_task_free_done(struct pm8001_hba_info *pm8001_ha, struct sas_task *task, struct pm8001_ccb_info *ccb,
drivers/scsi/pm8001/pm80xx_hwi.c +0 -5
@@ -2404,11 +2404,6 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, param =le32_to_cpu (psataPayload->param); tag =le32_to_cpu (psataPayload->tag); -if (!tag) { -pm8001_dbg (pm8001_ha,FAIL ,"tag null\n" ); -return ; - } - ccb = &pm8001_ha->ccb_info[tag]; t = ccb->task; pm8001_dev = ccb->device;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 104/343 scsi: pm8001: Fix task leak in pm8001_send_abort_all()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit f90a74892f3acf0cdec5844e90fc8686ca13e7d7 ]
In pm8001_send_abort_all(), make sure to free the allocated sas task if pm8001_tag_alloc() or pm8001_mpi_build_cmd() fail.
--- drivers/scsi/pm8001/pm8001_hwi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +6 -3
@@ -1765,7 +1765,6 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, } task =sas_alloc_slow_task (GFP_ATOMIC ); -if (!task) {pm8001_dbg (pm8001_ha,FAIL ,"cannot allocate task\n" );return ;
@@ -1774,8 +1773,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, task->task_done = pm8001_task_done; res =pm8001_tag_alloc (pm8001_ha, &ccb_tag); -if (res) +if (res) { +sas_free_task (task);return ; + } ccb = &pm8001_ha->ccb_info[ccb_tag]; ccb->device = pm8001_ha_dev;
@@ -1792,8 +1793,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, ret =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &task_abort,sizeof (task_abort),0 ); -if (ret) +if (ret) { +sas_free_task (task);pm8001_tag_free (pm8001_ha, ccb_tag); + } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 105/343 scsi: pm8001: Fix tag leaks on error
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit 4c8f04b1905cd4b776d0b720463c091545478ef7 ]
In pm8001_chip_set_dev_state_req(), pm8001_chip_fw_flash_update_req(), pm80xx_chip_phy_ctl_req() and pm8001_chip_reg_dev_req() add missing calls to pm8001_tag_free() to free the allocated tag when pm8001_mpi_build_cmd() fails.
Similarly, in pm8001_exec_internal_task_abort(), if the chip ->task_abort method fails, the tag allocated for the abort request task must be freed. Add the missing call to pm8001_tag_free().
--- drivers/scsi/pm8001/pm8001_hwi.c | 9 +++++++++ drivers/scsi/pm8001/pm8001_sas.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 9 +++++++-- 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +9 -0
@@ -4465,6 +4465,9 @@ static int pm8001_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, SAS_ADDR_SIZE); rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload,sizeof (payload),0 ); +if (rc) +pm8001_tag_free (pm8001_ha, tag); +return rc; }
@@ -4877,6 +4880,9 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha, ccb->ccb_tag = tag; rc =pm8001_chip_fw_flash_update_build (pm8001_ha, &flash_update_info, tag); +if (rc) +pm8001_tag_free (pm8001_ha, tag); +return rc; }
@@ -4981,6 +4987,9 @@ pm8001_chip_set_dev_state_req(struct pm8001_hba_info *pm8001_ha, payload.nds =cpu_to_le32 (state); rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload,sizeof (payload),0 ); +if (rc) +pm8001_tag_free (pm8001_ha, tag); +return rc; }
drivers/scsi/pm8001/pm8001_sas.c +1 -1
@@ -847,10 +847,10 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha, res =PM8001_CHIP_DISP ->task_abort (pm8001_ha, pm8001_dev, flag, task_tag, ccb_tag); -if (res) {del_timer (&task->slow_task->timer);pm8001_dbg (pm8001_ha,FAIL ,"Executing internal task failed\n" ); +pm8001_tag_free (pm8001_ha, ccb_tag); goto ex_err; }wait_for_completion (&task->slow_task->completion);
drivers/scsi/pm8001/pm80xx_hwi.c +7 -2
@@ -4920,8 +4920,13 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, payload.tag =cpu_to_le32 (tag); payload.phyop_phyid =cpu_to_le32 (((phy_op &0xFF ) <<8 ) | (phyId &0xFF )); -return pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload, -sizeof (payload),0 ); + + rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload, +sizeof (payload),0 ); +if (rc) +pm8001_tag_free (pm8001_ha, tag); + +return rc; }static u32 pm80xx_chip_is_our_interrupt (struct pm8001_hba_info *pm8001_ha)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 106/343 scsi: pm8001: Fix memory leak in pm8001_chip_fw_flash_update_req()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
[ Upstream commit f792a3629f4c4aa4c3703d66b43ce1edcc3ec09a ]
In pm8001_chip_fw_flash_update_build(), if pm8001_chip_fw_flash_update_build() fails, the struct fw_control_ex allocated must be freed.
--- drivers/scsi/pm8001/pm8001_hwi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_hwi.c +3 -1
@@ -4880,8 +4880,10 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha, ccb->ccb_tag = tag; rc =pm8001_chip_fw_flash_update_build (pm8001_ha, &flash_update_info, tag); -if (rc) +if (rc) { +kfree (fw_control_context);pm8001_tag_free (pm8001_ha, tag); + }return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 107/343 mt76: mt7915: fix injected MPDU transmission to not use HW A-MSDU
In reply to Greg Kroah-HartmanFrom: Johan Almbladh <[email protected]>
[ Upstream commit 28225a6ef80ebf46c46e5fbd5b1ee231a0b2b5b7 ]
Before, the hardware would be allowed to transmit injected 802.11 MPDUs as A-MSDU. This resulted in corrupted frames being transmitted. Now, injected MPDUs are transmitted as-is, without A-MSDU.
The fix was verified with frame injection on MT7915 hardware, both with and without the injected frame being encrypted.
If the hardware cannot do A-MSDU aggregation on MPDUs, this problem would also be present in the TX path where mac80211 does the 802.11 encapsulation. However, I have not observed any such problem when disabling IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD to force that mode. Therefore this fix is isolated to injected frames only.
The same A-MSDU logic is also present in the mt7921 driver, so it is likely that this fix should be applied there too. I do not have access to mt7921 hardware so I have not been able to test that.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -0
@@ -1085,6 +1085,7 @@ mt7915_mac_write_txwi_80211(struct mt7915_dev *dev, __le32 *txwi, val =MT_TXD3_SN_VALID |FIELD_PREP (MT_TXD3_SEQ ,IEEE80211_SEQ_TO_SN (seqno)); txwi[3 ] |=cpu_to_le32 (val); + txwi[7 ] &= ~cpu_to_le32 (MT_TXD7_HW_AMSDU ); } val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 108/343 mctp: make __mctp_dev_get() take a refcount hold
In reply to Greg Kroah-HartmanFrom: Matt Johnston <[email protected]>
[ Upstream commit dc121c0084910db985cf1c8ba6fce5d8c307cc02 ]
Previously there was a race that could allow the mctp_dev refcount to hit zero:
rcu_read_lock();
mdev = __mctp_dev_get(dev);
// mctp_unregister() happens here, mdev->refs hits zero mctp_dev_hold(dev);rcu_read_unlock();
Now we make __mctp_dev_get() take the hold itself. It is safe to test against the zero refcount because __mctp_dev_get() is called holding rcu_read_lock and mctp_dev uses kfree_rcu().
--- net/mctp/device.c | 21 ++++++++++++++++++--- net/mctp/route.c | 5 ++++- net/mctp/test/utils.c | 1 - 3 files changed, 22 insertions(+), 5 deletions(-)
net/mctp/device.c +18 -3
@@ -24,12 +24,25 @@ struct mctp_dump_cb {size_t a_idx; }; -/* unlocked: caller must hold rcu_read_lock */ +/* unlocked: caller must hold rcu_read_lock. +* Returned mctp_dev has its refcount incremented, or NULL if unset. +*/ struct mctp_dev *__mctp_dev_get (const struct net_device *dev) { -return rcu_dereference (dev->mctp_ptr); +struct mctp_dev *mdev =rcu_dereference (dev->mctp_ptr); + +/* RCU guarantees that any mdev is still live. +* Zero refcount implies a pending free, return NULL. +*/ +if (mdev) +if (!refcount_inc_not_zero (&mdev->refs)) +return NULL ; +return mdev; } +/* Returned mctp_dev does not have refcount incremented. The returned pointer +* remains live while rtnl_lock is held, as that prevents mctp_unregister() +*/ struct mctp_dev *mctp_dev_get_rtnl (const struct net_device *dev) {return rtnl_dereference (dev->mctp_ptr);
@@ -123,6 +136,7 @@ static int mctp_dump_addrinfo(struct sk_buff *skb, struct netlink_callback *cb)if (mdev) { rc =mctp_dump_dev_addrinfo (mdev, skb, cb); +mctp_dev_put (mdev);// Error indicates full buffer, this // callback will get retried. if (rc <0 )
@@ -297,7 +311,7 @@ void mctp_dev_hold(struct mctp_dev *mdev)void mctp_dev_put (struct mctp_dev *mdev) { -if (refcount_dec_and_test (&mdev->refs)) { +if (mdev &&refcount_dec_and_test (&mdev->refs)) {dev_put (mdev->dev);kfree_rcu (mdev, rcu); }
@@ -369,6 +383,7 @@ static size_t mctp_get_link_af_size(const struct net_device *dev,if (!mdev)return 0 ; ret =nla_total_size (4 );/* IFLA_MCTP_NET */ +mctp_dev_put (mdev);return ret; }
net/mctp/route.c +4 -1
@@ -786,7 +786,7 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, { struct mctp_sock *msk = container_of(sk, struct mctp_sock, sk);struct mctp_skb_cb *cb =mctp_cb (skb); -struct mctp_route tmp_rt; +struct mctp_route tmp_rt = {0 };struct mctp_sk_key *key;struct net_device *dev;struct mctp_hdr *hdr;
@@ -892,6 +892,7 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt,mctp_route_release (rt);dev_put (dev); +mctp_dev_put (tmp_rt.dev);return rc;
@@ -1057,11 +1058,13 @@ static int mctp_pkttype_receive(struct sk_buff *skb, struct net_device *dev, rt->output (rt, skb);mctp_route_release (rt); +mctp_dev_put (mdev);return NET_RX_SUCCESS ; err_drop:kfree_skb (skb); +mctp_dev_put (mdev);return NET_RX_DROP ; }
net/mctp/test/utils.c +0 -1
@@ -54,7 +54,6 @@ struct mctp_test_dev *mctp_test_create_dev(void)rcu_read_lock (); dev->mdev =__mctp_dev_get (ndev); -mctp_dev_hold (dev->mdev);rcu_read_unlock ();return dev;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 109/343 powerpc/64s/hash: Make hash faults work in NMI context
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 8b91cee5eadd2021f55e6775f2d50bd56d00c217 ]
Hash faults are not resoved in NMI context, instead causing the access to fail. This is done because perf interrupts can get backtraces including walking the user stack, and taking a hash fault on those could deadlock on the HPTE lock if the perf interrupt hits while the same HPTE lock is being held by the hash fault code. The user-access for the stack walking will notice the access failed and deal with that in the perf code.
The reason to allow perf interrupts in is to better profile hash faults.
The problem with this is any hash fault on a kernel access that happens in NMI context will crash, because kernel accesses must not fail.
Hard lockups, system reset, machine checks that access vmalloc space including modules and including stack backtracing and symbol lookup in modules, per-cpu data, etc could all run into this problem.
Fix this by disallowing perf interrupts in the hash fault code (the direct hash fault is covered by MSR[EE]=0 so the PMI disable just needs to extend to the preload case). This simplifies the tricky logic in hash faults and perf, at the cost of reduced profiling of hash faults.
perf can still latch addresses when interrupts are disabled, it just won't get the stack trace at that point, so it would still find hot spots, just sometimes with confusing stack chains.
An alternative could be to allow perf interrupts here but always do the slowpath stack walk if we are in nmi context, but that slows down all perf interrupt stack walking on hash though and it does not remove as much tricky code.
--- arch/powerpc/include/asm/interrupt.h | 2 +- arch/powerpc/mm/book3s64/hash_utils.c | 54 ++++----------------------- arch/powerpc/perf/callchain.h | 9 +---- arch/powerpc/perf/callchain_64.c | 27 -------------- 4 files changed, 10 insertions(+), 82 deletions(-)
arch/powerpc/include/asm/interrupt.h +1 -1
@@ -612,7 +612,7 @@ DECLARE_INTERRUPT_HANDLER_RAW(do_slb_fault);DECLARE_INTERRUPT_HANDLER (do_bad_segment_interrupt);/* hash_utils.c */ -DECLARE_INTERRUPT_HANDLER_RAW (do_hash_fault); +DECLARE_INTERRUPT_HANDLER (do_hash_fault);/* fault.c */ DECLARE_INTERRUPT_HANDLER (do_page_fault);
arch/powerpc/mm/book3s64/hash_utils.c +8 -46
84 lines not on this page · raw message
arch/powerpc/perf/callchain.h +1 -8
@@ -2,7 +2,6 @@#ifndef _POWERPC_PERF_CALLCHAIN_H#define _POWERPC_PERF_CALLCHAIN_H -int read_user_stack_slow (const void __user *ptr,void *buf,int nb);void perf_callchain_user_64 (struct perf_callchain_entry_ctx *entry,struct pt_regs *regs); void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry,
@@ -26,17 +25,11 @@ static inline int __read_user_stack(const void __user *ptr, void *ret, size_t size) {unsigned long addr = (unsigned long )ptr; -int rc;if (addr >TASK_SIZE - size || (addr & (size -1 )))return -EFAULT ; - rc =copy_from_user_nofault (ret, ptr, size); - -if (IS_ENABLED (CONFIG_PPC64 ) && !radix_enabled () && rc) -return read_user_stack_slow (ptr, ret, size); - -return rc; +return copy_from_user_nofault (ret, ptr, size); }#endif /* _POWERPC_PERF_CALLCHAIN_H */
arch/powerpc/perf/callchain_64.c +0 -27
@@ -18,33 +18,6 @@#include "callchain.h" -/* -* On 64-bit we don't want to invoke hash_page on user addresses from -* interrupt context, so if the access faults, we read the page tables -* to find which page (if any) is mapped and access it directly. Radix -* has no need for this so it doesn't use read_user_stack_slow. -*/ -int read_user_stack_slow (const void __user *ptr,void *buf,int nb) -{ - -unsigned long addr = (unsigned long ) ptr; -unsigned long offset; -struct page *page; -void *kaddr; - -if (get_user_page_fast_only (addr,FOLL_WRITE , &page)) { - kaddr =page_address (page); - -/* align address to page boundary */ - offset = addr & ~PAGE_MASK ; - -memcpy (buf, kaddr + offset, nb); -put_page (page); -return 0 ; - } -return -EFAULT ; -} -static int read_user_stack_64 (const unsigned long __user *ptr,unsigned long *ret) {return __read_user_stack (ptr, ret,sizeof (*ret));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 110/343 mt76: mt7615: Fix assigning negative values to unsigned variable
In reply to Greg Kroah-HartmanFrom: Yang Li <[email protected]>
[ Upstream commit 9273ffcc9a11942bd586bb42584337ef3962b692 ]
Smatch reports the following:drivers/net/wireless/mediatek/mt76/mt7615/mac.c:1865 mt7615_mac_adjust_sensitivity() warn: assigning (-110) to unsigned variable 'def_th' drivers/net/wireless/mediatek/mt76/mt7615/mac.c:1865 mt7615_mac_adjust_sensitivity() warn: assigning (-98) to unsigned variable 'def_th'
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +1 -1
@@ -1841,7 +1841,7 @@ mt7615_mac_adjust_sensitivity(struct mt7615_phy *phy,struct mt7615_dev *dev = phy->dev;int false_cca = ofdm ? phy->false_cca_ofdm : phy->false_cca_cck;bool ext_phy = phy != &dev->phy; -u16 def_th = ofdm ?-98 :-110 ; +s16 def_th = ofdm ?-98 :-110 ;bool update = false;s8 *sensitivity;int signal;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 111/343 power: supply: axp288_charger: Use acpi_quirk_skip_acpi_ac_and_battery()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 00d0566614b7bb7b226cb5a6895b0180ffe6915a ]
Normally the native AXP288 fg/charger drivers are preferred but one some devices the ACPI drivers should be used instead.
The ACPI battery/ac drivers use the acpi_quirk_skip_acpi_ac_and_battery() helper to determine if they should skip loading because native fuel-gauge/ charger drivers like the AXP288 drivers will be used.
The new acpi_quirk_skip_acpi_ac_and_battery() helper includes a list of exceptions for boards where the ACPI drivers should be used instead.
Use this new helper to avoid loading on such boards. Note this requires adding a Kconfig dependency on ACPI, this is not a problem because ACPI should be enabled on all boards with an AXP288 PMIC anyways.
--- drivers/power/supply/Kconfig | 2 +- drivers/power/supply/axp288_charger.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/power/supply/Kconfig +1 -1
@@ -351,7 +351,7 @@ config AXP20X_POWER config AXP288_CHARGER tristate "X-Powers AXP288 Charger" - depends on MFD_AXP20X && EXTCON_AXP288 && IOSF_MBI + depends on MFD_AXP20X && EXTCON_AXP288 && IOSF_MBI && ACPI help Say yes here to have support X-Power AXP288 power management IC (PMIC) integrated charger.
drivers/power/supply/axp288_charger.c +7 -0
@@ -838,6 +838,13 @@ static int axp288_charger_probe(struct platform_device *pdev)struct power_supply_config charger_cfg = {};unsigned int val; +/* +* Normally the native AXP288 fg/charger drivers are preferred but +* on some devices the ACPI drivers should be used instead. +*/ +if (!acpi_quirk_skip_acpi_ac_and_battery ()) +return -ENODEV ; +/* * On some devices the fuelgauge and charger parts of the axp288 are * not used, check that the fuelgauge is enabled (CC_CTRL != 0).
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 112/343 power: supply: axp288_fuel_gauge: Use acpi_quirk_skip_acpi_ac_and_battery()
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit da365db704d290fb4dc4cdbd41f60b0ecec1cc03 ]
Normally the native AXP288 fg/charger drivers are preferred but one some devices the ACPI drivers should be used instead.
The ACPI battery/ac drivers use the acpi_quirk_skip_acpi_ac_and_battery() helper to determine if they should skip loading because native fuel-gauge/ charger drivers like the AXP288 drivers will be used.
The new acpi_quirk_skip_acpi_ac_and_battery() helper includes a list of exceptions for boards where the ACPI drivers should be used instead.
Use this new helper to avoid loading on such boards. Note this requires adding a Kconfig dependency on ACPI, this is not a problem because ACPI should be enabled on all boards with an AXP288 PMIC anyways.
--- drivers/power/supply/Kconfig | 2 +- drivers/power/supply/axp288_fuel_gauge.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)
drivers/power/supply/Kconfig +1 -1
@@ -358,7 +358,7 @@ config AXP288_CHARGER config AXP288_FUEL_GAUGE tristate "X-Powers AXP288 Fuel Gauge" - depends on MFD_AXP20X && IIO && IOSF_MBI + depends on MFD_AXP20X && IIO && IOSF_MBI && ACPI help Say yes here to have support for X-Power power management IC (PMIC) Fuel Gauge. The device provides battery statistics and status
drivers/power/supply/axp288_fuel_gauge.c +8 -6
@@ -9,6 +9,7 @@* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#include <linux/acpi.h> #include <linux/dmi.h> #include <linux/module.h> #include <linux/kernel.h>
@@ -560,12 +561,6 @@ static const struct dmi_system_id axp288_no_battery_list[] = { DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"), }, }, - { -/* ECS EF20EA */ - .matches = { - DMI_MATCH(DMI_PRODUCT_NAME, "EF20EA"), - }, - }, {/* Intel Cherry Trail Compute Stick, Windows version */ .matches = {
@@ -624,6 +619,13 @@ static int axp288_fuel_gauge_probe(struct platform_device *pdev) };unsigned int val; +/* +* Normally the native AXP288 fg/charger drivers are preferred but +* on some devices the ACPI drivers should be used instead. +*/ +if (!acpi_quirk_skip_acpi_ac_and_battery ()) +return -ENODEV ; +if (dmi_check_system (axp288_no_battery_list))return -ENODEV ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 113/343 scsi: aha152x: Fix aha152x_setup() __setup handler return value
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit cc8294ec4738d25e2bb2d71f7d82a9bf7f4a157b ]
__setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; doing so just pollutes init's environment with strings that are not init arguments/parameters).
Return 1 from aha152x_setup() to indicate that the boot option has been handled.
--- drivers/scsi/aha152x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/aha152x.c +2 -4
@@ -3375,13 +3375,11 @@ static int __init aha152x_setup(char *str) setup[setup_count].synchronous = ints[0 ] >=6 ? ints[6 ] :1 ; setup[setup_count].delay = ints[0 ] >=7 ? ints[7 ] :DELAY_DEFAULT ; setup[setup_count].ext_trans = ints[0 ] >=8 ? ints[8 ] :0 ; -if (ints[0 ] >8 ) {/*}*/ +if (ints[0 ] >8 )printk (KERN_NOTICE "aha152x: usage: aha152x=<IOBASE>[,<IRQ>[,<SCSI ID>" "[,<RECONNECT>[,<PARITY>[,<SYNCHRONOUS>[,<DELAY>[,<EXT_TRANS>]]]]]]]\n" ); - }else { +else setup_count++; -return 0 ; - }return 1 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 114/343 scsi: hisi_sas: Free irq vectors in order for v3 HW
In reply to Greg Kroah-HartmanFrom: Qi Liu <[email protected]>
[ Upstream commit 554fb72ee34f4732c7f694f56c3c6e67790352a0 ]
If the driver probe fails to request the channel IRQ or fatal IRQ, the driver will free the IRQ vectors before freeing the IRQs in free_irq(), and this will cause a kernel BUG like this:
------------[ cut here ]------------ kernel BUG at drivers/pci/msi.c:369! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP Call trace: free_msi_irqs+0x118/0x13c pci_disable_msi+0xfc/0x120 pci_free_irq_vectors+0x24/0x3c hisi_sas_v3_probe+0x360/0x9d0 [hisi_sas_v3_hw] local_pci_probe+0x44/0xb0 work_for_cpu_fn+0x20/0x34 process_one_work+0x1d0/0x340 worker_thread+0x2e0/0x460 kthread+0x180/0x190 ret_from_fork+0x10/0x20 ---[ end trace b88990335b610c11 ]---
So we use devm_add_action() to control the order in which we free the vectors.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +11 -5
@@ -2398,17 +2398,25 @@ static irqreturn_t cq_interrupt_v3_hw(int irq_no, void *p)return IRQ_WAKE_THREAD ; } +static void hisi_sas_v3_free_vectors (void *data) +{ +struct pci_dev *pdev = data; + +pci_free_irq_vectors (pdev); +} +static int interrupt_preinit_v3_hw (struct hisi_hba *hisi_hba) {int vectors;int max_msi =HISI_SAS_MSI_COUNT_V3_HW , min_msi;struct Scsi_Host *shost = hisi_hba->shost; +struct pci_dev *pdev = hisi_hba->pci_dev;struct irq_affinity desc = { .pre_vectors =BASE_VECTORS_V3_HW , }; min_msi =MIN_AFFINE_VECTORS_V3_HW ; - vectors = pci_alloc_irq_vectors_affinity(hisi_hba->pci_dev, + vectors = pci_alloc_irq_vectors_affinity(pdev, min_msi, max_msi, PCI_IRQ_MSI | PCI_IRQ_AFFINITY,
@@ -2420,6 +2428,7 @@ static int interrupt_preinit_v3_hw(struct hisi_hba *hisi_hba) hisi_hba->cq_nvecs = vectors -BASE_VECTORS_V3_HW ; shost->nr_hw_queues = hisi_hba->cq_nvecs; +devm_add_action (&pdev->dev, hisi_sas_v3_free_vectors, pdev);return 0 ; }
@@ -4769,7 +4778,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) rc =scsi_add_host (shost, dev);if (rc) - goto err_out_free_irq_vectors; + goto err_out_debugfs; rc =sas_register_ha (sha);if (rc)
@@ -4800,8 +4809,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)sas_unregister_ha (sha); err_out_register_ha:scsi_remove_host (shost); -err_out_free_irq_vectors: -pci_free_irq_vectors (pdev); err_out_debugfs:debugfs_exit_v3_hw (hisi_hba); err_out_ha:
@@ -4825,7 +4832,6 @@ hisi_sas_v3_destroy_irqs(struct pci_dev *pdev, struct hisi_hba *hisi_hba)devm_free_irq (&pdev->dev,pci_irq_vector (pdev, nr), cq); } -pci_free_irq_vectors (pdev); }static void hisi_sas_v3_remove (struct pci_dev *pdev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 115/343 scsi: hisi_sas: Limit users changing debugfs BIST count value
In reply to Greg Kroah-HartmanFrom: Xiang Chen <[email protected]>
[ Upstream commit 286ce4c65fbdf5eb9d4d5f4e4997c4e32bf1b073 ]
Add a file operation for "cnt" file under bist directory, so users can only read "cnt" or clear "cnt" to zero, but cannot randomly modify.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 52 +++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +50 -2
@@ -3976,6 +3976,54 @@ static const struct file_operations debugfs_bist_phy_v3_hw_fops = { .owner = THIS_MODULE, }; +static ssize_t debugfs_bist_cnt_v3_hw_write (struct file *filp, +const char __user *buf, +size_t count,loff_t *ppos) +{ +struct seq_file *m = filp->private_data; +struct hisi_hba *hisi_hba = m->private; +unsigned int cnt; +int val; + +if (hisi_hba->debugfs_bist_enable) +return -EPERM ; + + val =kstrtouint_from_user (buf, count,0 , &cnt); +if (val) +return val; + +if (cnt) +return -EINVAL ; + + hisi_hba->debugfs_bist_cnt =0 ; +return count; +} + +static int debugfs_bist_cnt_v3_hw_show (struct seq_file *s,void *p) +{ +struct hisi_hba *hisi_hba = s->private; + +seq_printf (s,"%u\n" , hisi_hba->debugfs_bist_cnt); + +return 0 ; +} + +static int debugfs_bist_cnt_v3_hw_open (struct inode *inode, +struct file *filp) +{ +return single_open (filp, debugfs_bist_cnt_v3_hw_show, + inode->i_private); +} + +static const struct file_operations debugfs_bist_cnt_v3_hw_ops = { + .open = debugfs_bist_cnt_v3_hw_open, + .read = seq_read, + .write = debugfs_bist_cnt_v3_hw_write, + .llseek = seq_lseek, + .release = single_release, + .owner =THIS_MODULE , +}; + static const struct { int value; char *name;
@@ -4613,8 +4661,8 @@ static void debugfs_bist_init_v3_hw(struct hisi_hba *hisi_hba)debugfs_create_file ("phy_id" ,0600 , hisi_hba->debugfs_bist_dentry, hisi_hba, &debugfs_bist_phy_v3_hw_fops); -debugfs_create_u32 ("cnt" ,0600 , hisi_hba->debugfs_bist_dentry, - &hisi_hba->debugfs_bist_cnt); +debugfs_create_file ("cnt" ,0600 , hisi_hba->debugfs_bist_dentry, + hisi_hba, &debugfs_bist_cnt_v3_hw_ops); debugfs_create_file("loopback_mode", 0600, hisi_hba->debugfs_bist_dentry,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 116/343 net/smc: correct settings of RMB window update limit
In reply to Greg Kroah-HartmanFrom: Dust Li <[email protected]>
[ Upstream commit 6bf536eb5c8ca011d1ff57b5c5f7c57ceac06a37 ]
rmbe_update_limit is used to limit announcing receive window updating too frequently. RFC7609 request a minimal increase in the window size of 10% of the receive buffer space. But current implementation used:
min_t(int, rmbe_size / 10, SOCK_MIN_SNDBUF / 2)
and SOCK_MIN_SNDBUF / 2 == 2304 Bytes, which is almost always less then 10% of the receive buffer space.
This causes the receiver always sending CDC message to update its consumer cursor when it consumes more then 2K of data. And as a result, we may encounter something like "TCP silly window syndrome" when sending 2.5~8K message.
This patch fixes this using max(rmbe_size / 10, SOCK_MIN_SNDBUF / 2).
With this patch and SMC autocorking enabled, qperf 2K/4K/8K tcp_bw test shows 45%/75%/40% increase in throughput respectively.
--- net/smc/smc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/smc/smc_core.c +1 -1
@@ -1989,7 +1989,7 @@ static struct smc_buf_desc *smc_buf_get_slot(int compressed_bufsize,*/ static inline int smc_rmb_wnd_update_limit (int rmbe_size) { -return min_t (int, rmbe_size /10 ,SOCK_MIN_SNDBUF /2 ); +return max_t (int, rmbe_size /10 ,SOCK_MIN_SNDBUF /2 ); }/* map an rmb buf to a link */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 117/343 mips: ralink: fix a refcount leak in ill_acc_of_setup()
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
[ Upstream commit 4a0a1436053b17e50b7c88858fb0824326641793 ]
of_node_put(np) needs to be called when pdev == NULL.
--- arch/mips/ralink/ill_acc.c | 1 + 1 file changed, 1 insertion(+)
arch/mips/ralink/ill_acc.c +1 -0
@@ -61,6 +61,7 @@ static int __init ill_acc_of_setup(void) pdev =of_find_device_by_node (np);if (!pdev) {pr_err ("%pOFn: failed to lookup pdev\n" , np); +of_node_put (np);return -EINVAL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 118/343 iavf: stop leaking iavf_status as "errno" values
In reply to Greg Kroah-HartmanFrom: Mateusz Palczewski <[email protected]>
[ Upstream commit bae569d01a1f4929ce28093be80bbbbacbf1b127 ]
Several functions in the iAVF core files take status values of the enum iavf_status and convert them into integer values. This leads to confusion as functions return both Linux errno values and status codes intermixed. Reporting status codes as if they were "errno" values can lead to confusion when reviewing error logs. Additionally, it can lead to unexpected behavior if a return value is not interpreted properly.
Fix this by introducing iavf_status_to_errno, a switch that explicitly converts from the status codes into an appropriate error value. Also introduce a virtchnl_status_to_errno function for the one case where we were returning both virtchnl status codes and iavf_status codes in the same function.
--- drivers/net/ethernet/intel/iavf/iavf.h | 5 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 173 +++++++++++++++--- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 18 +- 3 files changed, 157 insertions(+), 39 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +4 -1
@@ -44,6 +44,9 @@#define DEFAULT_DEBUG_LEVEL_SHIFT 3#define PFX "iavf: " +int iavf_status_to_errno (enum iavf_status status); +int virtchnl_status_to_errno (enum virtchnl_status_code v_status); +/* VSI state flags shared with common code */ enum iavf_vsi_state_t { __IAVF_VSI_DOWN,
@@ -515,7 +518,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter);void iavf_del_vlans (struct iavf_adapter *adapter);void iavf_set_promiscuous (struct iavf_adapter *adapter,int flags);void iavf_request_stats (struct iavf_adapter *adapter); -void iavf_request_reset (struct iavf_adapter *adapter); +int iavf_request_reset (struct iavf_adapter *adapter);void iavf_get_hena (struct iavf_adapter *adapter);void iavf_set_hena (struct iavf_adapter *adapter);void iavf_set_rss_key (struct iavf_adapter *adapter);
drivers/net/ethernet/intel/iavf/iavf_main.c +143 -30
251 lines not on this page · raw message
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +10 -8
@@ -22,17 +22,17 @@ static int iavf_send_pf_msg(struct iavf_adapter *adapter, enum virtchnl_ops op, u8 *msg, u16 len) { struct iavf_hw *hw = &adapter->hw; -enum iavf_status err; +enum iavf_status status;if (adapter->flags &IAVF_FLAG_PF_COMMS_FAILED )return 0 ;/* nothing to see here, move along */ - err =iavf_aq_send_msg_to_pf (hw, op,0 , msg, len,NULL ); -if (err) -dev_dbg (&adapter->pdev->dev,"Unable to send opcode %d to PF, err %s, aq_err %s\n" , - op,iavf_stat_str (hw, err), + status =iavf_aq_send_msg_to_pf (hw, op,0 , msg, len,NULL ); +if (status) +dev_dbg (&adapter->pdev->dev,"Unable to send opcode %d to PF, status %s, aq_err %s\n" , + op,iavf_stat_str (hw, status),iavf_aq_str (hw, hw->aq.asq_last_status)); -return err; +return iavf_status_to_errno (status); }/**
@@ -1827,11 +1827,13 @@ void iavf_del_adv_rss_cfg(struct iavf_adapter *adapter)* * Request that the PF reset this VF. No response is expected. **/ -void iavf_request_reset (struct iavf_adapter *adapter) +int iavf_request_reset (struct iavf_adapter *adapter) { +int err;/* Don't check CURRENT_OP - this is always higher priority */ -iavf_send_pf_msg (adapter,VIRTCHNL_OP_RESET_VF ,NULL ,0 ); + err =iavf_send_pf_msg (adapter,VIRTCHNL_OP_RESET_VF ,NULL ,0 ); adapter->current_op =VIRTCHNL_OP_UNKNOWN ; +return err; }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 119/343 macvtap: advertise link netns via netlink
In reply to Greg Kroah-HartmanFrom: Sven Eckelmann <[email protected]>
[ Upstream commit a02192151b7dbf855084c38dca380d77c7658353 ]
Assign rtnl_link_ops->get_link_net() callback so that IFLA_LINK_NETNSID is added to rtnetlink messages. This fixes iproute2 which otherwise resolved the link interface to an interface in the wrong namespace.
Test commands:
ip netns add nst
ip link add dummy0 type dummy
ip link add link macvtap0 link dummy0 type macvtap ip link set macvtap0 netns nst
ip -netns nst link show macvtap0
Before:
10: macvtap0@gre0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 500
link/ether 5e:8f:ae:1d:60:50 brd ff:ff:ff:ff:ff:ff
After:
10: macvtap0@if2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 500
link/ether 5e:8f:ae:1d:60:50 brd ff:ff:ff:ff:ff:ff link-netnsid 0
--- drivers/net/macvtap.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/macvtap.c +6 -0
@@ -133,11 +133,17 @@ static void macvtap_setup(struct net_device *dev) dev->tx_queue_len =TUN_READQ_SIZE ; } +static struct net *macvtap_link_net (const struct net_device *dev) +{ +return dev_net (macvlan_dev_real_dev (dev)); +} +static struct rtnl_link_ops macvtap_link_ops__read_mostly = { .kind ="macvtap" , .setup = macvtap_setup, .newlink = macvtap_newlink, .dellink = macvtap_dellink, + .get_link_net = macvtap_link_net, .priv_size =sizeof (struct macvtap_dev ), };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 120/343 platform/x86: thinkpad_acpi: Add dual fan probe
In reply to Greg Kroah-HartmanFrom: Mark Pearson <[email protected]>
[ Upstream commit bf779aaf56ea23864e39e9862b3b3a8436236e07 ]
Instead of having quirks for systems that have a second fan it would be nice to detect this setup.
Unfortunately, confirmed by the Lenovo FW team, there is no way to retrieve this information from the EC or BIOS. Recommendation was to attempt to read the fan and if successful then assume a 2nd fan is present.
The fans are also supposed to spin up on boot for some time, so in theory we could check for a speed > 0. In testing this seems to hold true but as I couldn't test on all platforms I've avoided implementing this. It also breaks for the corner case where you load the module once the fans are idle.
Tested on P1G4, P1G3, X1C9 and T14 (no fans) and it works correctly. For the platforms with dual fans where it was confirmed to work I have removed the quirks. Potentially this could be done for all platforms but I've left untested platforms in for now. On these platforms the fans will be enabled and then detected - so no impact.
--- drivers/platform/x86/thinkpad_acpi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +12 -3
@@ -8699,10 +8699,7 @@ static const struct tpacpi_quirk fan_quirk_table[] __initconst = {TPACPI_Q_LNV3 ('N' ,'2' ,'N' ,TPACPI_FAN_2CTL ),/* P53 / P73 */ TPACPI_Q_LNV3 ('N' ,'2' ,'E' ,TPACPI_FAN_2CTL ),/* P1 / X1 Extreme (1st gen) */ TPACPI_Q_LNV3 ('N' ,'2' ,'O' ,TPACPI_FAN_2CTL ),/* P1 / X1 Extreme (2nd gen) */ -TPACPI_Q_LNV3 ('N' ,'2' ,'V' ,TPACPI_FAN_2CTL ),/* P1 / X1 Extreme (3nd gen) */ -TPACPI_Q_LNV3 ('N' ,'4' ,'0' ,TPACPI_FAN_2CTL ),/* P1 / X1 Extreme (4nd gen) */ TPACPI_Q_LNV3 ('N' ,'3' ,'0' ,TPACPI_FAN_2CTL ),/* P15 (1st gen) / P15v (1st gen) */ -TPACPI_Q_LNV3 ('N' ,'3' ,'2' ,TPACPI_FAN_2CTL ),/* X1 Carbon (9th gen) */ TPACPI_Q_LNV3 ('N' ,'3' ,'7' ,TPACPI_FAN_2CTL ),/* T15g (2nd gen) */ TPACPI_Q_LNV3('N', '1', 'O', TPACPI_FAN_NOFAN), /* X1 Tablet (2nd gen) */ };
@@ -8746,6 +8743,9 @@ static int __init fan_init(struct ibm_init_struct *iibm)* ThinkPad ECs supports the fan control register */ if (likely (acpi_ec_read (fan_status_offset, &fan_control_initial_status))) { +int res; +unsigned int speed; + fan_status_access_mode =TPACPI_FAN_RD_TPEC ;if (quirks &TPACPI_FAN_Q1 )fan_quirk1_setup ();
@@ -8758,6 +8758,15 @@ static int __init fan_init(struct ibm_init_struct *iibm) tp_features.second_fan_ctl =1 ;pr_info ("secondary fan control enabled\n" ); } +/* Try and probe the 2nd fan */ + res =fan2_get_speed (&speed); +if (res >=0 ) { +/* It responded - so let's assume it's there */ + tp_features.second_fan =1 ; + tp_features.second_fan_ctl =1 ; +pr_info ("secondary fan control detected & enabled\n" ); + } + }else {pr_err ("ThinkPad ACPI EC access misbehaving, fan status and control unavailable\n" );return -ENODEV ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 121/343 tuntap: add sanity checks about msg_controllen in sendmsg
In reply to Greg Kroah-HartmanFrom: Harold Huang <[email protected]>
[ Upstream commit 74a335a07a17d131b9263bfdbdcb5e40673ca9ca ]
In patch [1], tun_msg_ctl was added to allow pass batched xdp buffers to tun_sendmsg. Although we donot use msg_controllen in this path, we should check msg_controllen to make sure the caller pass a valid msg_ctl.
--- drivers/net/tap.c | 3 ++- drivers/net/tun.c | 3 ++- drivers/vhost/net.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap.c +2 -1
@@ -1198,7 +1198,8 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m,struct xdp_buff *xdp;int i; -if (ctl && (ctl->type ==TUN_MSG_PTR )) { +if (m->msg_controllen ==sizeof (struct tun_msg_ctl ) && + ctl && ctl->type ==TUN_MSG_PTR ) {for (i =0 ; i < ctl->num; i++) { xdp = &((struct xdp_buff *)ctl->ptr)[i];tap_get_user_xdp (q, xdp);
drivers/net/tun.c +2 -1
@@ -2489,7 +2489,8 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)if (!tun)return -EBADFD ; -if (ctl && (ctl->type ==TUN_MSG_PTR )) { +if (m->msg_controllen ==sizeof (struct tun_msg_ctl ) && + ctl && ctl->type ==TUN_MSG_PTR ) {struct tun_page tpage;int n = ctl->num;int flush =0 ;
drivers/vhost/net.c +1 -0
@@ -473,6 +473,7 @@ static void vhost_tx_batch(struct vhost_net *net, goto signal_used; msghdr->msg_control = &ctl; + msghdr->msg_controllen =sizeof (ctl); err = sock->ops->sendmsg (sock, msghdr,0 );if (unlikely (err <0 )) {vq_err (&nvq->vq,"Fail to batch sending packets\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 122/343 Bluetooth: mediatek: fix the conflict between mtk and msft vendor event
In reply to Greg Kroah-HartmanFrom: Sean Wang <[email protected]>
[ Upstream commit e4412654e260842e1a94ffe0d4026e8a6fd34246 ]
There is a conflict between MediaTek wmt event and msft vendor extension logic in the core layer since 145373cb1b1f ("Bluetooth: Add framework for Microsoft vendor extension") was introduced because we changed the type of mediatek wmt event to the type of msft vendor event in the driver.
But the purpose we reported mediatek event to the core layer is for the diagnostic purpose with that we are able to see the full packet trace via monitoring socket with btmon. Thus, it is harmless we keep the original type of mediatek vendor event here to avoid breaking the msft extension function especially they can be supported by Mediatek chipset like MT7921 , MT7922 devices and future devices.
--- drivers/bluetooth/btmtk.h | 1 + drivers/bluetooth/btmtksdio.c | 9 +-------- drivers/bluetooth/btusb.c | 8 -------- 3 files changed, 2 insertions(+), 16 deletions(-)
drivers/bluetooth/btmtk.h +1 -0
@@ -5,6 +5,7 @@#define FIRMWARE_MT7668 "mediatek/mt7668pr2h.bin"#define FIRMWARE_MT7961 "mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin" +#define HCI_EV_WMT 0xe4#define HCI_WMT_MAX_EVENT_SIZE 64#define BTMTK_WMT_REG_READ 0x2
drivers/bluetooth/btmtksdio.c +1 -8
@@ -370,13 +370,6 @@ static int btmtksdio_recv_event(struct hci_dev *hdev, struct sk_buff *skb)struct hci_event_hdr *hdr = (void *)skb->data;int err; -/* Fix up the vendor event id with 0xff for vendor specific instead -* of 0xe4 so that event send via monitoring socket can be parsed -* properly. -*/ -if (hdr->evt ==0xe4 ) - hdr->evt =HCI_EV_VENDOR ; -/* When someone waits for the WMT event, the skb is being cloned * and being processed the events from there then. */
@@ -392,7 +385,7 @@ static int btmtksdio_recv_event(struct hci_dev *hdev, struct sk_buff *skb)if (err <0 ) goto err_free_skb; -if (hdr->evt ==HCI_EV_VENDOR ) { +if (hdr->evt ==HCI_EV_WMT ) {if (test_and_clear_bit (BTMTKSDIO_TX_WAIT_VND_EVT , &bdev->tx_state)) {/* Barrier to sync with other CPUs */
drivers/bluetooth/btusb.c +0 -8
@@ -2254,7 +2254,6 @@ static void btusb_mtk_wmt_recv(struct urb *urb) {struct hci_dev *hdev = urb->context;struct btusb_data *data =hci_get_drvdata (hdev); -struct hci_event_hdr *hdr;struct sk_buff *skb;int err;
@@ -2274,13 +2273,6 @@ static void btusb_mtk_wmt_recv(struct urb *urb)hci_skb_pkt_type (skb) =HCI_EVENT_PKT ;skb_put_data (skb, urb->transfer_buffer, urb->actual_length); - hdr = (void *)skb->data; -/* Fix up the vendor event id with 0xff for vendor specific -* instead of 0xe4 so that event send via monitoring socket can -* be parsed properly. -*/ - hdr->evt =0xff ; -/* When someone waits for the WMT event, the skb is being cloned * and being processed the events from there then. */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 123/343 Bluetooth: Fix not checking for valid hdev on bt_dev_{info,warn,err,dbg}
In reply to Greg Kroah-HartmanFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 9b392e0e0b6d026da5a62bb79a08f32e27af858e ]
This fixes attemting to print hdev->name directly which causes them to print an error:
kernel: read_version:367: (efault): sock 000000006a3008f2
--- include/net/bluetooth/bluetooth.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
include/net/bluetooth/bluetooth.h +8 -6
@@ -204,19 +204,21 @@ void bt_err_ratelimited(const char *fmt, ...);#define BT_DBG (fmt, ...) pr_debug(fmt "\n", ##__VA_ARGS__)#endif +#define bt_dev_name (hdev) ((hdev) ? (hdev)->name : "null") +#define bt_dev_info (hdev, fmt, ...) \ - BT_INFO("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_INFO("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_warn (hdev, fmt, ...) \ - BT_WARN("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_WARN("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_err (hdev, fmt, ...) \ - BT_ERR("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_ERR("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_dbg (hdev, fmt, ...) \ - BT_DBG("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_DBG("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_warn_ratelimited (hdev, fmt, ...) \ - bt_warn_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + bt_warn_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_err_ratelimited (hdev, fmt, ...) \ - bt_err_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + bt_err_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)/* Connection and socket states */ enum {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 124/343 Bluetooth: use memset avoid memory leaks
In reply to Greg Kroah-HartmanFrom: Minghao Chi (CGEL ZTE) <[email protected]>
[ Upstream commit d3715b2333e9a21692ba16ef8645eda584a9515d ]
Use memset to initialize structs to prevent memory leaks in l2cap_ecred_connect
--- net/bluetooth/l2cap_core.c | 1 + 1 file changed, 1 insertion(+)
net/bluetooth/l2cap_core.c +1 -0
@@ -1436,6 +1436,7 @@ static void l2cap_ecred_connect(struct l2cap_chan *chan)l2cap_ecred_init (chan,0 ); +memset (&data,0 ,sizeof (data)); data.pdu.req.psm = chan->psm; data.pdu.req.mtu =cpu_to_le16 (chan->imtu); data.pdu.req.mps =cpu_to_le16 (chan->mps);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 125/343 bnxt_en: Eliminate unintended link toggle during FW reset
In reply to Greg Kroah-HartmanFrom: Michael Chan <[email protected]>
[ Upstream commit 7c492a2530c1f05441da541307c2534230dfd59b ]
If the flow control settings have been changed, a subsequent FW reset may cause the ethernet link to toggle unnecessarily. This link toggle will increase the down time by a few seconds.
The problem is caused by bnxt_update_phy_setting() detecting a false mismatch in the flow control settings between the stored software settings and the current FW settings after the FW reset. This mismatch is caused by the AUTONEG bit added to link_info->req_flow_ctrl in an inconsistent way in bnxt_set_pauseparam() in autoneg mode. The AUTONEG bit should not be added to link_info->req_flow_ctrl.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -3
@@ -2101,9 +2101,7 @@ static int bnxt_set_pauseparam(struct net_device *dev, } link_info->autoneg |=BNXT_AUTONEG_FLOW_CTRL ; -if (bp->hwrm_spec_code >=0x10201 ) - link_info->req_flow_ctrl = -PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE ; + link_info->req_flow_ctrl =0 ; }else {/* when transition from auto pause to force pause, * force a link change
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 126/343 PCI: endpoint: Fix misused goto label
In reply to Greg Kroah-HartmanFrom: Li Chen <[email protected]>
[ Upstream commit bf8d87c076f55b8b4dfdb6bc6c6b6dc0c2ccb487 ]
Fix a misused goto label jump since that can result in a memory leak.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-test.c +1 -1
@@ -451,7 +451,7 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test)if (!epf_test->dma_supported) {dev_err (dev,"Cannot transfer data using DMA\n" ); ret = -EINVAL ; - goto err_map_addr; + goto err_dma_map; } src_phys_addr = dma_map_single(dma_dev, buf, reg->size,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 127/343 MIPS: fix fortify panic when copying asm exception handlers
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit d17b66417308996e7e64b270a3c7f3c1fbd4cfc8 ]
With KCFLAGS="-O3", I was able to trigger a fortify-source memcpy() overflow panic on set_vi_srs_handler(). Although O3 level is not supported in the mainline, under some conditions that may've happened with any optimization settings, it's just a matter of inlining luck. The panic itself is correct, more precisely, 50/50 false-positive and not at the same time.
Quoted 1 line
From the one side, no real overflow happens. Exception handler
defined in asm just gets copied to some reserved places in the memory.
But the reason behind is that C code refers to that exception handler declares it as char, i.e. something of 1 byte length. It's obvious that the asm function itself is way more than 1 byte, so fortify logics thought we are going to past the symbol declared. The standard way to refer to asm symbols from C code which is not supposed to be called from C is to declare them as extern const u8[]. This is fully correct from any point of view, as any code itself is just a bunch of bytes (including 0 as it is for syms like _stext/_etext/etc.), and the exact size is not known at the moment of compilation.
Adjust the type of the except_vec_vi_*() and related variables. Make set_handler() take const as a second argument to avoid cast-away warnings and give a little more room for optimization.
--- arch/mips/include/asm/setup.h | 2 +- arch/mips/kernel/traps.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-)
arch/mips/include/asm/setup.h +1 -1
@@ -16,7 +16,7 @@ static inline void setup_8250_early_printk_port(unsigned long base, unsigned int reg_shift, unsigned int timeout) {}#endif -extern void set_handler (unsigned long offset,void *addr,unsigned long len); +void set_handler (unsigned long offset,const void *addr,unsigned long len);extern void set_uncached_handler (unsigned long offset,void *addr,unsigned long len);typedef void (*vi_handler_t )(void );
arch/mips/kernel/traps.c +11 -11
@@ -2091,19 +2091,19 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)* If no shadow set is selected then use the default handler * that does normal register saving and standard interrupt exit */ -extern char except_vec_vi, except_vec_vi_lui; -extern char except_vec_vi_ori, except_vec_vi_end; -extern char rollback_except_vec_vi; -char *vec_start =using_rollback_handler () ? - &rollback_except_vec_vi : &except_vec_vi; +extern const u8 except_vec_vi[], except_vec_vi_lui[]; +extern const u8 except_vec_vi_ori[], except_vec_vi_end[]; +extern const u8 rollback_except_vec_vi[]; +const u8 *vec_start =using_rollback_handler () ? + rollback_except_vec_vi : except_vec_vi;#if defined(CONFIG_CPU_MICROMIPS ) || defined(CONFIG_CPU_BIG_ENDIAN ) -const int lui_offset = &except_vec_vi_lui - vec_start +2 ; -const int ori_offset = &except_vec_vi_ori - vec_start +2 ; +const int lui_offset = except_vec_vi_lui - vec_start +2 ; +const int ori_offset = except_vec_vi_ori - vec_start +2 ;#else -const int lui_offset = &except_vec_vi_lui - vec_start; -const int ori_offset = &except_vec_vi_ori - vec_start; +const int lui_offset = except_vec_vi_lui - vec_start; +const int ori_offset = except_vec_vi_ori - vec_start;#endif -const int handler_len = &except_vec_vi_end - vec_start; +const int handler_len = except_vec_vi_end - vec_start;if (handler_len >VECTORSPACING ) {/*
@@ -2311,7 +2311,7 @@ void per_cpu_trap_init(bool is_boot_cpu) }/* Install CPU exception handler */ -void set_handler (unsigned long offset,void *addr,unsigned long size) +void set_handler (unsigned long offset,const void *addr,unsigned long size) {#ifdef CONFIG_CPU_MICROMIPS memcpy ((void *)(ebase + offset), ((unsigned char *)addr -1 ), size);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 128/343 powerpc/code-patching: Pre-map patch area
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 591b4b268435f00d2f0b81f786c2c7bd5ef66416 ]
Paul reported a warning with DEBUG_ATOMIC_SLEEP=y:
BUG: sleeping function called from invalid context at include/linux/sched/mm.h:256
in_atomic(): 0, irqs_disabled(): 1, non_block: 0, pid: 1, name: swapper/0
preempt_count: 0, expected: 0
...
Call Trace:
dump_stack_lvl+0xa0/0xec (unreliable)
__might_resched+0x2f4/0x310
kmem_cache_alloc+0x220/0x4b0
__pud_alloc+0x74/0x1d0
hash__map_kernel_page+0x2cc/0x390
do_patch_instruction+0x134/0x4a0
arch_jump_label_transform+0x64/0x78
__jump_label_update+0x148/0x180
static_key_enable_cpuslocked+0xd0/0x120
static_key_enable+0x30/0x50
check_kvm_guest+0x60/0x88
pSeries_smp_probe+0x54/0xb0
smp_prepare_cpus+0x3e0/0x430
kernel_init_freeable+0x20c/0x43c
kernel_init+0x30/0x1a0
ret_from_kernel_thread+0x5c/0x64Peter pointed out that this is because do_patch_instruction() has disabled interrupts, but then map_patch_area() calls map_kernel_page() then hash__map_kernel_page() which does a sleeping memory allocation.
We only see the warning in KVM guests with SMT enabled, which is not particularly common, or on other platforms if CONFIG_KPROBES is disabled, also not common. The reason we don't see it in most configurations is that another path that happens to have interrupts enabled has allocated the required page tables for us, eg. there's a path in kprobes init that does that. That's just pure luck though.
As Christophe suggested, the simplest solution is to do a dummy map/unmap when we initialise the patching, so that any required page table levels are pre-allocated before the first call to do_patch_instruction(). This works because the unmap doesn't free any page tables that were allocated by the map, it just clears the PTE, leaving the page table levels there for the next map.
--- arch/powerpc/lib/code-patching.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/powerpc/lib/code-patching.c +14 -0
@@ -43,9 +43,14 @@ int raw_patch_instruction(u32 *addr, ppc_inst_t instr)#ifdef CONFIG_STRICT_KERNEL_RWX static DEFINE_PER_CPU(struct vm_struct *, text_poke_area); +static int map_patch_area (void *addr,unsigned long text_poke_addr); +static void unmap_patch_area (unsigned long addr); +static int text_area_cpu_up (unsigned int cpu) {struct vm_struct *area; +unsigned long addr; +int err; area =get_vm_area (PAGE_SIZE ,VM_ALLOC );if (!area) {
@@ -53,6 +58,15 @@ static int text_area_cpu_up(unsigned int cpu) cpu);return -1 ; } + +// Map/unmap the area to ensure all page tables are pre-allocated + addr = (unsigned long )area->addr; + err =map_patch_area (empty_zero_page, addr); +if (err) +return err; + +unmap_patch_area (addr); +this_cpu_write (text_poke_area, area);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 129/343 powerpc/64e: Tie PPC_BOOK3E_64 to PPC_FSL_BOOK3E
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 1a76e520ee1831a81dabf8a9a58c6453f700026e ]
Since the IBM A2 CPU support was removed, see commit fb5a515704d7 ("powerpc: Remove platforms/wsp and associated pieces"), the only 64-bit Book3E CPUs we support are Freescale (NXP) ones.
However our Kconfig still allows configurating a kernel that has 64-bit Book3E support, but no Freescale CPU support enabled. Such a kernel would never boot, it doesn't know about any CPUs.
It also causes build errors, as reported by lkp, because PPC_BARRIER_NOSPEC is not enabled in such a configuration:
powerpc64-linux-ld: arch/powerpc/net/bpf_jit_comp64.o:(.toc+0x0):
undefined reference to `powerpc_security_features'
To fix this, force PPC_FSL_BOOK3E to be selected whenever we are building a 64-bit Book3E kernel.
--- arch/powerpc/platforms/Kconfig.cputype | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/platforms/Kconfig.cputype +2 -1
@@ -107,6 +107,7 @@ config PPC_BOOK3S_64 config PPC_BOOK3E_64 bool "Embedded processors" + select PPC_FSL_BOOK3E select PPC_FPU # Make it a choice ? select PPC_SMP_MUXED_IPI select PPC_DOORBELL
@@ -295,7 +296,7 @@ config FSL_BOOKE config PPC_FSL_BOOK3E bool select ARCH_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64 - select FSL_EMB_PERFMON + imply FSL_EMB_PERFMON select PPC_SMP_MUXED_IPI select PPC_DOORBELL select PPC_KUEP
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 130/343 powerpc/secvar: fix refcount leak in format_show()
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
[ Upstream commit d601fd24e6964967f115f036a840f4f28488f63f ]
Refcount leak will happen when format_show returns failure in multiple cases. Unified management of of_node_put can fix this problem.
--- arch/powerpc/kernel/secvar-sysfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/powerpc/kernel/secvar-sysfs.c +6 -3
@@ -26,15 +26,18 @@ static ssize_t format_show(struct kobject *kobj, struct kobj_attribute *attr,const char *format; node =of_find_compatible_node (NULL ,NULL ,"ibm,secvar-backend" ); -if (!of_device_is_available (node)) -return -ENODEV ; +if (!of_device_is_available (node)) { + rc = -ENODEV ; + goto out; + } rc =of_property_read_string (node,"format" , &format);if (rc) -return rc; + goto out; rc =sprintf (buf,"%s\n" , format); +out:of_node_put (node);return rc;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 131/343 scsi: libfc: Fix use after free in fc_exch_abts_resp()
In reply to Greg Kroah-HartmanFrom: Jianglei Nie <[email protected]>
[ Upstream commit 271add11994ba1a334859069367e04d2be2ebdd4 ]
fc_exch_release(ep) will decrease the ep's reference count. When the reference count reaches zero, it is freed. But ep is still used in the following code, which will lead to a use after free.
Return after the fc_exch_release() call to avoid use after free.
--- drivers/scsi/libfc/fc_exch.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/libfc/fc_exch.c +1 -0
@@ -1701,6 +1701,7 @@ static void fc_exch_abts_resp(struct fc_exch *ep, struct fc_frame *fp)if (cancel_delayed_work_sync (&ep->timeout_work)) {FC_EXCH_DBG (ep,"Exchange timer canceled due to ABTS response\n" );fc_exch_release (ep);/* release from pending timer hold */ +return ; }spin_lock_bh (&ep->ex_lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 132/343 platform/x86: x86-android-tablets: Depend on EFI and SPI
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 1e8aa2aa1274953e8e595f0630436744597d0d64 ]
The recently added support for Lenovo Yoga Tablet 2 tablets uses symbols from EFI and SPI add "depends on EFI && SPI" to the X86_ANDROID_TABLETS Kconfig entry.
--- drivers/platform/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/Kconfig +1 -1
@@ -1027,7 +1027,7 @@ config TOUCHSCREEN_DMI config X86_ANDROID_TABLETS tristate "X86 Android tablet support" - depends on I2C && SERIAL_DEV_BUS && ACPI && GPIOLIB + depends on I2C && SPI && SERIAL_DEV_BUS && ACPI && EFI && GPIOLIB help X86 tablets which ship with Android as (part of) the factory image typically have various problems with their DSDTs. The factory kernels
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 133/343 can: isotp: set default value for N_As to 50 micro seconds
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
[ Upstream commit 530e0d46c61314c59ecfdb8d3bcb87edbc0f85d3 ]
The N_As value describes the time a CAN frame needs on the wire when transmitted by the CAN controller. Even very short CAN FD frames need arround 100 usecs (bitrate 1Mbit/s, data bitrate 8Mbit/s).
Having N_As to be zero (the former default) leads to 'no CAN frame separation' when STmin is set to zero by the receiving node. This 'burst mode' should not be enabled by default as it could potentially dump a high number of CAN frames into the netdev queue from the soft hrtimer context. This does not affect the system stability but is just not nice and cooperative.
With this N_As/frame_txtime value the 'burst mode' is disabled by default.
As user space applications usually do not set the frame_txtime element of struct can_isotp_options the new in-kernel default is very likely overwritten with zero when the sockopt() CAN_ISOTP_OPTS is invoked. To make sure that a N_As value of zero is only set intentional the value '0' is now interpreted as 'do not change the current value'. When a frame_txtime of zero is required for testing purposes this CAN_ISOTP_FRAME_TXTIME_ZERO u32 value has to be set in frame_txtime.
--- include/uapi/linux/can/isotp.h | 28 ++++++++++++++++++++++------ net/can/isotp.c | 12 +++++++++++- 2 files changed, 33 insertions(+), 7 deletions(-)
include/uapi/linux/can/isotp.h +22 -6
@@ -137,20 +137,16 @@ struct can_isotp_ll_options {#define CAN_ISOTP_WAIT_TX_DONE 0x400/* wait for tx completion */ #define CAN_ISOTP_SF_BROADCAST 0x800/* 1-to-N functional addressing */ -/* default values */ +/* protocol machine default values */ #define CAN_ISOTP_DEFAULT_FLAGS 0#define CAN_ISOTP_DEFAULT_EXT_ADDRESS 0x00#define CAN_ISOTP_DEFAULT_PAD_CONTENT 0xCC/* prevent bit-stuffing */ -#define CAN_ISOTP_DEFAULT_FRAME_TXTIME 0 +#define CAN_ISOTP_DEFAULT_FRAME_TXTIME 50000/* 50 micro seconds */ #define CAN_ISOTP_DEFAULT_RECV_BS 0#define CAN_ISOTP_DEFAULT_RECV_STMIN 0x00#define CAN_ISOTP_DEFAULT_RECV_WFTMAX 0 -#define CAN_ISOTP_DEFAULT_LL_MTU CAN_MTU -#define CAN_ISOTP_DEFAULT_LL_TX_DL CAN_MAX_DLEN -#define CAN_ISOTP_DEFAULT_LL_TX_FLAGS 0 -/* * Remark on CAN_ISOTP_DEFAULT_RECV_* values: *
@@ -162,4 +158,24 @@ struct can_isotp_ll_options {* consistency and copied directly into the flow control (FC) frame. */ +/* link layer default values => make use of Classical CAN frames */ + +#define CAN_ISOTP_DEFAULT_LL_MTU CAN_MTU +#define CAN_ISOTP_DEFAULT_LL_TX_DL CAN_MAX_DLEN +#define CAN_ISOTP_DEFAULT_LL_TX_FLAGS 0 + +/* +* The CAN_ISOTP_DEFAULT_FRAME_TXTIME has become a non-zero value as +* it only makes sense for isotp implementation tests to run without +* a N_As value. As user space applications usually do not set the +* frame_txtime element of struct can_isotp_options the new in-kernel +* default is very likely overwritten with zero when the sockopt() +* CAN_ISOTP_OPTS is invoked. +* To make sure that a N_As value of zero is only set intentional the +* value '0' is now interpreted as 'do not change the current value'. +* When a frame_txtime of zero is required for testing purposes this +* CAN_ISOTP_FRAME_TXTIME_ZERO u32 value has to be set in frame_txtime. +*/ +#define CAN_ISOTP_FRAME_TXTIME_ZERO 0xFFFFFFFF +#endif /* !_UAPI_CAN_ISOTP_H */
net/can/isotp.c +11 -1
@@ -141,6 +141,7 @@ struct isotp_sock {struct can_isotp_options opt;struct can_isotp_fc_options rxfc, txfc;struct can_isotp_ll_options ll; +u32 frame_txtime;u32 force_tx_stmin;u32 force_rx_stmin;struct tpcon rx, tx;
@@ -360,7 +361,7 @@ static int isotp_rcv_fc(struct isotp_sock *so, struct canfd_frame *cf, int ae) so->tx_gap =ktime_set (0 ,0 );/* add transmission time for CAN frame N_As */ - so->tx_gap =ktime_add_ns (so->tx_gap, so->opt.frame_txtime); + so->tx_gap =ktime_add_ns (so->tx_gap, so->frame_txtime);/* add waiting time for consecutive frames N_Cs */ if (so->opt.flags &CAN_ISOTP_FORCE_TXSTMIN ) so->tx_gap = ktime_add_ns(so->tx_gap,
@@ -1247,6 +1248,14 @@ static int isotp_setsockopt_locked(struct socket *sock, int level, int optname,/* no separate rx_ext_address is given => use ext_address */ if (!(so->opt.flags &CAN_ISOTP_RX_EXT_ADDR )) so->opt.rx_ext_address = so->opt.ext_address; + +/* check for frame_txtime changes (0 => no changes) */ +if (so->opt.frame_txtime) { +if (so->opt.frame_txtime ==CAN_ISOTP_FRAME_TXTIME_ZERO ) + so->frame_txtime =0 ; +else + so->frame_txtime = so->opt.frame_txtime; + }break ;case CAN_ISOTP_RECV_FC :
@@ -1448,6 +1457,7 @@ static int isotp_init(struct sock *sk) so->opt.rxpad_content =CAN_ISOTP_DEFAULT_PAD_CONTENT ; so->opt.txpad_content =CAN_ISOTP_DEFAULT_PAD_CONTENT ; so->opt.frame_txtime =CAN_ISOTP_DEFAULT_FRAME_TXTIME ; + so->frame_txtime =CAN_ISOTP_DEFAULT_FRAME_TXTIME ; so->rxfc.bs =CAN_ISOTP_DEFAULT_RECV_BS ; so->rxfc.stmin =CAN_ISOTP_DEFAULT_RECV_STMIN ; so->rxfc.wftmax =CAN_ISOTP_DEFAULT_RECV_WFTMAX ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 134/343 can: etas_es58x: es58x_fd_rx_event_msg(): initialize rx_event_msg before calling es58x_check_msg_len()
In reply to Greg Kroah-HartmanFrom: Vincent Mailhol <[email protected]>
[ Upstream commit 7a8cd7c0ee823a1cc893ab3feaa23e4b602bfb9a ]
Function es58x_fd_rx_event() invokes the es58x_check_msg_len() macro:
| ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len);
While doing so, it dereferences an uninitialized
variable: *rx_event_msg.
This is actually harmless because es58x_check_msg_len() only uses preprocessor macros (sizeof() and __stringify()) on *rx_event_msg. c.f. [1].
Nonetheless, this pattern is confusing so the lines are reordered to make sure that rx_event_msg is correctly initialized.
This patch also fixes a false positive warning reported by cppcheck:
| cppcheck possible warnings: (new ones prefixed by >>, may not be real problems) | | In file included from drivers/net/can/usb/etas_es58x/es58x_fd.c: | >> drivers/net/can/usb/etas_es58x/es58x_fd.c:174:8: warning: Uninitialized variable: rx_event_msg [uninitvar] | ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); | ^
[1] https://elixir.bootlin.com/linux/v5.16/source/drivers/net/can/usb/etas_es58x/es58x_core.h#L467
--- drivers/net/can/usb/etas_es58x/es58x_fd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/can/usb/etas_es58x/es58x_fd.c +1 -2
@@ -172,12 +172,11 @@ static int es58x_fd_rx_event_msg(struct net_device *netdev,const struct es58x_fd_rx_event_msg *rx_event_msg;int ret; + rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; ret =es58x_check_msg_len (es58x_dev->dev, *rx_event_msg, msg_len);if (ret)return ret; - rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; -return es58x_rx_err_msg (netdev, rx_event_msg->error_code, rx_event_msg->event_code,get_unaligned_le64 (&rx_event_msg->timestamp));
Signature · 1 line
2.35.1