6.0.9-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 6.0.9-rc1 review
This is the start of the stable review cycle for the 6.0.9 release. There are 190 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 Wed, 16 Nov 2022 12:44:21 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.0.9-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.0.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.0.9-rc1
Takashi Iwai <[email protected]>
ALSA: memalloc: Try dma_alloc_noncontiguous() at first
Philip Yang <[email protected]>
drm/amdkfd: Migrate in CPU page fault use current mm
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Check return code of dma_async_device_register
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix impossible condition
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Don't allow CPU to reorder channel enable
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix completion of unissued descriptor in case of errors
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix descriptor handling when issuing it to hardware
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix concurrency over the active list
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Free the memset buf without holding the chan lock
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix concurrency over descriptor
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix concurrency problems by removing atc_complete_all()
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Protect atchan->status with the channel lock
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Do not call the complete callback on device_terminate_all
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix premature completion of desc in issue_pending
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Start transfer for cyclic channels in issue_pending
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Don't start transactions at tx_submit level
Tudor Ambarus <[email protected]>
dmaengine: at_hdmac: Fix at_lli struct definition
Oliver Hartkopp <[email protected]>
can: dev: fix skb drop check
Paolo Bonzini <[email protected]>
KVM: SVM: move guest vmsave/vmload back to assembly
Paolo Bonzini <[email protected]>
KVM: SVM: retrieve VMCB from assembly
Peter Gonda <[email protected]>
KVM: SVM: Only dump VMSA to klog at KERN_DEBUG level
Paolo Bonzini <[email protected]>
KVM: SVM: adjust register allocation for __svm_vcpu_run()
Paolo Bonzini <[email protected]>
KVM: SVM: replace regs argument of __svm_vcpu_run() with vcpu_svm
Paolo Bonzini <[email protected]>
KVM: x86: use a separate asm-offsets.c file
Like Xu <[email protected]>
KVM: x86/pmu: Do not speculatively query Intel GP PMCs that don't exist yet
Sean Christopherson <[email protected]>
KVM: x86/mmu: Block all page faults during kvm_zap_gfn_range()
Geert Uytterhoeven <[email protected]>
can: rcar_canfd: Add missing ECC error checks for channels 2-7
Oliver Hartkopp <[email protected]>
can: isotp: fix tx state handling for echo tx processing
Oliver Hartkopp <[email protected]>
can: j1939: j1939_send_one(): fix missing CAN header initialization
Peter Xu <[email protected]>
mm/shmem: use page_mapping() to detect page cache for uffd continue
Pankaj Gupta <[email protected]>
mm/memremap.c: map FS_DAX device memory as decrypted
SeongJae Park <[email protected]>
mm/damon/dbgfs: check if rm_contexts input is for a real context
Fenghua Yu <[email protected]>
dmaengine: idxd: Do not enable user type Work Queue without Shared Virtual Addressing
Vasily Gorbik <[email protected]>
mm: hugetlb_vmemmap: include missing linux/moduleparam.h
Naoya Horiguchi <[email protected]>
arch/x86/mm/hugetlbpage.c: pud_huge() returns 0 when using 2-level paging
Mika Westerberg <[email protected]>
spi: intel: Use correct mask for flash and protected regions
ZhangPeng <[email protected]>
udf: Fix a slab-out-of-bounds write bug in udf_find_entry()
Brian Norris <[email protected]>
mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI
Roger Quadros <[email protected]>
net: ethernet: ti: am65-cpsw: Fix segmentation fault at module unload
Johan Hovold <[email protected]>
phy: qcom-qmp-combo: fix NULL-deref on runtime resume
Jens Axboe <[email protected]>
io_uring: check for rollover of buffer ID when providing buffers
Johannes Thumshirn <[email protected]>
btrfs: zoned: initialize device's zone info for seeding
Johannes Thumshirn <[email protected]>
btrfs: zoned: clone zoned device info when cloning a device
Zhang Xiaoxu <[email protected]>
btrfs: selftests: fix wrong error check in btrfs_free_dummy_root()
Liu Shixin <[email protected]>
btrfs: fix match incorrectly in dev_args_match_device
Wen Gong <[email protected]>
wifi: ath11k: avoid deadlock during regulatory update in ath11k_regd_update()
Jorge Lopez <[email protected]>
platform/x86: hp_wmi: Fix rfkill causing soft blocked wifi
Felix Kuehling <[email protected]>
drm/amdkfd: Fix error handling in kfd_criu_restore_events
Felix Kuehling <[email protected]>
drm/amdkfd: Fix error handling in criu_checkpoint
Guchun Chen <[email protected]>
drm/amdgpu: disable BACO on special BEIGE_GOBY card
Christian König <[email protected]>
drm/amdgpu: workaround for TLB seq race
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Update SR watermarks for DCN314
Tim Huang <[email protected]>
drm/amd/pm: update SMU IP v13.0.4 msg interface header
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Fix reg timeout in enc314_enable_fifo
Matthew Auld <[email protected]>
drm/i915/dmabuf: fix sg_table handling in map_dma_buf
Ryusuke Konishi <[email protected]>
nilfs2: fix use-after-free bug of ns_writer on remount
Ryusuke Konishi <[email protected]>
nilfs2: fix deadlock in nilfs_count_free_blocks()
Shin'ichiro Kawasaki <[email protected]>
ata: libata-scsi: fix SYNCHRONIZE CACHE (16) command failure
Nathan Chancellor <[email protected]>
vmlinux.lds.h: Fix placement of '.data..decrypted' section
Jussi Laako <[email protected]>
ALSA: usb-audio: Add DSD support for Accuphase DAC-60
Takashi Iwai <[email protected]>
ALSA: usb-audio: Add quirk entry for M-Audio Micro
Takashi Iwai <[email protected]>
ALSA: usb-audio: Yet more regression for for the delayed card registration
Edson Juliano Drosdeck <[email protected]>
ALSA: hda/realtek: Add Positivo C6300 model quirk
Stefan Binding <[email protected]>
ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41
Ye Bin <[email protected]>
ALSA: hda: fix potential memleak in 'add_widget_node'
Xian Wang <[email protected]>
ALSA: hda/ca0132: add quirk for EVGA Z390 DARK
Evan Quan <[email protected]>
ALSA: hda/hdmi - enable runtime pm for more AMD display audio
Haibo Chen <[email protected]>
mmc: sdhci-esdhc-imx: use the correct host caps for MMC_CAP_8_BIT_DATA
Brian Norris <[email protected]>
mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI
Brian Norris <[email protected]>
mmc: sdhci_am654: Fix SDHCI_RESET_ALL for CQHCI
Brian Norris <[email protected]>
mmc: sdhci-brcmstb: Fix SDHCI_RESET_ALL for CQHCI
Brian Norris <[email protected]>
mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI
Brian Norris <[email protected]>
mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI
Ma Jun <[email protected]>
drm/amdgpu: Fix the lpfn checking condition in drm buddy
Jiaxun Yang <[email protected]>
MIPS: jump_label: Fix compat branch range check
Ard Biesheuvel <[email protected]>
arm64: efi: Fix handling of misaligned runtime regions and drop warning
Wei Yongjun <[email protected]>
eth: sp7021: drop free_netdev() from spl2sw_init_netdev()
Conor Dooley <[email protected]>
riscv: fix reserved memory setup
Jisheng Zhang <[email protected]>
riscv: vdso: fix build with llvm
Jisheng Zhang <[email protected]>
riscv: process: fix kernel info leakage
Chuang Wang <[email protected]>
net: macvlan: fix memory leaks of macvlan_common_newlink
Zhengchao Shao <[email protected]>
ethernet: tundra: free irq when alloc ring failed in tsi108_open()
Takashi Iwai <[email protected]>
ALSA: memalloc: Don't fall back for SG-buffer with IOMMU
Zhengchao Shao <[email protected]>
net: mv643xx_eth: disable napi when init rxq or txq failed in mv643xx_eth_open()
Zhengchao Shao <[email protected]>
ethernet: s2io: disable napi when start nic failed in s2io_card_up()
Antoine Tenart <[email protected]>
net: atlantic: macsec: clear encryption keys from the stack
Antoine Tenart <[email protected]>
net: phy: mscc: macsec: clear encryption keys when freeing a flow
Yang Yingliang <[email protected]>
stmmac: dwmac-loongson: fix missing of_node_put() while module exiting
Yang Yingliang <[email protected]>
stmmac: dwmac-loongson: fix missing pci_disable_device() in loongson_dwmac_probe()
Yang Yingliang <[email protected]>
stmmac: dwmac-loongson: fix missing pci_disable_msi() while module exiting
Zhengchao Shao <[email protected]>
cxgb4vf: shut down the adapter when t4vf_update_port_info() failed in cxgb4vf_open()
Wei Yongjun <[email protected]>
mctp: Fix an error handling path in mctp_init()
Tan, Tee Min <[email protected]>
stmmac: intel: Update PCH PTP clock rate from 200MHz to 204.8MHz
Zhengchao Shao <[email protected]>
net: cxgb3_main: disable napi when bind qsets failed in cxgb_up()
Zhengchao Shao <[email protected]>
net: cpsw: disable napi in cpsw_ndo_open()
Michal Jaron <[email protected]>
iavf: Fix VF driver counting VLAN 0 filters
Norbert Zulinski <[email protected]>
ice: Fix spurious interrupt during removal of trusted VF
Roi Dayan <[email protected]>
net/mlx5e: E-Switch, Fix comparing termination table instance
Jianbo Liu <[email protected]>
net/mlx5e: TC, Fix wrong rejection of packet-per-second policing
Roi Dayan <[email protected]>
net/mlx5e: Fix tc acts array not to be dependent on enum order
Maxim Mikityanskiy <[email protected]>
net/mlx5e: Add missing sanity checks for max TX WQE size
Shay Drory <[email protected]>
net/mlx5: fw_reset: Don't try to load device in case PCI isn't working
Chris Mi <[email protected]>
net/mlx5: E-switch, Set to legacy mode if failed to change switchdev mode
Roy Novich <[email protected]>
net/mlx5: Allow async trigger completion execution on single CPU systems
Vlad Buslov <[email protected]>
net/mlx5: Bridge, verify LAG state when adding bond to bridge
M Chetan Kumar <[email protected]>
net: wwan: iosm: fix invalid mux header type
M Chetan Kumar <[email protected]>
net: wwan: iosm: fix memory leak in ipc_pcie_read_bios_cfg
Zhengchao Shao <[email protected]>
net: nixge: disable napi when enable interrupts failed in nixge_open()
Eric Dumazet <[email protected]>
net: tun: call napi_schedule_prep() to ensure we own a napi
Zhengchao Shao <[email protected]>
net: marvell: prestera: fix memory leak in prestera_rxtx_switch_init()
Shigeru Yoshida <[email protected]>
netfilter: Cleanup nft_net->module_list from nf_tables_exit_net()
Ziyang Xuan <[email protected]>
netfilter: nfnetlink: fix potential dead lock in nfnetlink_rcv_msg()
Donglin Peng <[email protected]>
perf tools: Add the include/perf/ directory to .gitignore
James Clark <[email protected]>
perf test: Fix skipping branch stack sampling test
Athira Rajeev <[email protected]>
perf stat: Fix printing os->prefix in CSV metrics output
Namhyung Kim <[email protected]>
perf stat: Fix crash with --per-node --metric-only in CSV mode
Zhengchao Shao <[email protected]>
drivers: net: xgene: disable napi when register irq failed in xgene_enet_open()
Ratheesh Kannoth <[email protected]>
octeontx2-pf: Fix SQE threshold checking
Zhengchao Shao <[email protected]>
net: ethernet: mtk-star-emac: disable napi when connect and start PHY failed in mtk_star_enable()
Zhengchao Shao <[email protected]>
net: lapbether: fix issue of invalid opcode in lapbeth_open()
Amelie Delaunay <[email protected]>
dmaengine: stm32-dma: fix potential race between pause and resume
Yang Yingliang <[email protected]>
dmaengine: ti: k3-udma-glue: fix memory leak when register device fail
Christophe JAILLET <[email protected]>
dmaengine: mv_xor_v2: Fix a resource leak in mv_xor_v2_remove()
Martin Povišer <[email protected]>
dmaengine: apple-admac: Fix grabbing of channels in of_xlate
Fengqian Gao <[email protected]>
dmaengine: idxd: fix RO device state error after been disabled/reset
Xiaochen Shen <[email protected]>
dmaengine: idxd: Fix max batch size for Intel IAA
Dave Jiang <[email protected]>
dmanegine: idxd: reformat opcap output to match bitmap_parse() input
Doug Brown <[email protected]>
dmaengine: pxa_dma: use platform_get_irq_optional
Xin Long <[email protected]>
tipc: fix the msg->req tlv len check in tipc_nl_compat_name_table_dump_header
YueHaibing <[email protected]>
net: broadcom: Fix BCMGENET Kconfig
Miquel Raynal <[email protected]>
dt-bindings: net: tsnep: Fix typo on generic nvmem property
Rasmus Villemoes <[email protected]>
net: stmmac: dwmac-meson8b: fix meson8b_devm_clk_prepare_enable()
Niranjana Vishwanathapura <[email protected]>
drm/i915: Do not set cache_dirty for DGFX
Jouni Högander <[email protected]>
drm/i915/psr: Send update also on invalidate
Zhengchao Shao <[email protected]>
can: af_can: fix NULL pointer dereference in can_rx_register()
Alexander Potapenko <[email protected]>
ipv6: addrlabel: fix infoleak when sending struct ifaddrlblmsg to network
Andy Shevchenko <[email protected]>
platform/x86: p2sb: Don't fail if unknown CPU is found
Lu Wei <[email protected]>
tcp: prohibit TCP_REPAIR_OPTIONS if data was already sent
Yuan Can <[email protected]>
drm/vc4: Fix missing platform_unregister_drivers() call in vc4_drm_register()
HW He <[email protected]>
net: wwan: mhi: fix memory leak in mhi_mbim_dellink
HW He <[email protected]>
net: wwan: iosm: fix memory leak in ipc_wwan_dellink
Zhengchao Shao <[email protected]>
hamradio: fix issue of dev reference count leakage in bpq_device_event()
Zhengchao Shao <[email protected]>
net: lapbether: fix issue of dev reference count leakage in lapbeth_device_event()
Rafael Mendonca <[email protected]>
KVM: s390: pci: Fix allocation size of aift kzdev elements
Nico Boehr <[email protected]>
KVM: s390: pv: don't allow userspace to set the clock under PV
John Thomson <[email protected]>
phy: ralink: mt7621-pci: add sentinel to quirks table
Gaosheng Cui <[email protected]>
capabilities: fix undefined behavior in bit shift for CAP_TO_MASK
Sean Anderson <[email protected]>
net: fman: Unregister ethernet device on removal
Alex Barba <[email protected]>
bnxt_en: fix potentially incorrect return value for ndo_rx_flow_steer
Michael Chan <[email protected]>
bnxt_en: Fix possible crash in bnxt_hwrm_set_coal()
Wang Yufen <[email protected]>
net: tun: Fix memory leaks of napi_get_frags
Ratheesh Kannoth <[email protected]>
octeontx2-pf: NIX TX overwrites SQ_CTX_HW_S[SQ_INT]
Sabrina Dubroca <[email protected]>
macsec: clear encryption keys from the stack after setting up offload
Sabrina Dubroca <[email protected]>
macsec: fix detection of RXSCs when toggling offloading
Sabrina Dubroca <[email protected]>
macsec: fix secy->n_rx_sc accounting
Sabrina Dubroca <[email protected]>
macsec: delete new rxsc when offload fails
Jiri Benc <[email protected]>
net: gso: fix panic on frag_list with mixed head alloc types
Youlin Li <[email protected]>
bpf: Fix wrong reg type conversion in release_reference()
Kumar Kartikeya Dwivedi <[email protected]>
bpf: Add helper macro bpf_for_each_reg_in_vstate
Dexuan Cui <[email protected]>
PCI: hv: Fix the definition of vector in hv_compose_msi_msg()
Cong Wang <[email protected]>
bpf, sock_map: Move cancel_work_sync() out of sock lock
[email protected] <[email protected]>
drm/vc4: hdmi: Fix HSM clock too low on Pi4
Yang Yingliang <[email protected]>
HID: hyperv: fix possible memory leak in mousevsc_probe()
Pu Lehui <[email protected]>
bpftool: Fix NULL pointer dereference when pin {PROG, MAP, LINK} without FILE
Howard Hsu <[email protected]>
wifi: mac80211: Set TWT Information Frame Disabled bit as 1
Zhengchao Shao <[email protected]>
wifi: mac80211: fix general-protection-fault in ieee80211_subif_start_xmit()
Wang Yufen <[email protected]>
bpf, sockmap: Fix the sk->sk_forward_alloc warning of sk_stream_kill_queues
Kees Cook <[email protected]>
bpf, verifier: Fix memory leak in array reallocation for stack state
zhichao.liu <[email protected]>
spi: mediatek: Fix package division error
Yang Yingliang <[email protected]>
ALSA: arm: pxa: pxa2xx-ac97-lib: fix return value check of platform_get_irq()
Srinivas Kandagatla <[email protected]>
soundwire: qcom: check for outanding writes before doing a read
Srinivas Kandagatla <[email protected]>
soundwire: qcom: reinit broadcast completion
Arend van Spriel <[email protected]>
wifi: cfg80211: fix memory leak in query_regdb_file()
Johannes Berg <[email protected]>
wifi: cfg80211: silence a sparse RCU warning
Dan Carpenter <[email protected]>
phy: stm32: fix an error code in probe
Krzysztof Kozlowski <[email protected]>
hwspinlock: qcom: correct MMIO max register for newer SoCs
Jason Gerecke <[email protected]>
HID: wacom: Fix logic used for 3rd barrel switch emulation
Dan Williams <[email protected]>
cxl/region: Recycle region ids
Yang Li <[email protected]>
drm/amdkfd: Fix NULL pointer dereference in svm_migrate_to_ram()
Philip Yang <[email protected]>
drm/amdkfd: handle CPU fault on COW mapping
Dillon Varone <[email protected]>
drm/amd/display: Set memclk levels to be at least 1 for dcn32
Jun Lei <[email protected]>
drm/amd/display: Limit dcn32 to 1950Mhz display clock
Dillon Varone <[email protected]>
drm/amd/display: Acquire FCLK DPM levels on DCN32
Ville Syrjälä <[email protected]>
drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs
Ville Syrjälä <[email protected]>
drm/i915: Simplify intel_panel_add_edid_alt_fixed_modes()
Ville Syrjälä <[email protected]>
drm/i915: Allow more varied alternate fixed modes for panels
Hou Wenlong <[email protected]>
KVM: debugfs: Return retval of simple_attr_open() if it fails
Jason A. Donenfeld <[email protected]>
m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED
Jason Gunthorpe <[email protected]>
drm/i915/gvt: Add missing vfio_unregister_group_dev() call
Sanjay R Mehta <[email protected]>
thunderbolt: Add DP OUT resource when DP tunnel is discovered
-------------
Diffstat:
.../devicetree/bindings/net/engleder,tsnep.yaml | 2 +- Documentation/virt/kvm/devices/vm.rst | 3 + Makefile | 4 +- arch/arm64/kernel/efi.c | 52 ++++--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 9 +- arch/m68k/include/uapi/asm/bootinfo.h | 7 + arch/m68k/kernel/setup_mm.c | 12 ++ arch/m68k/virt/config.c | 11 -- arch/mips/kernel/jump_label.c | 2 +- arch/riscv/kernel/process.c | 2 + arch/riscv/kernel/setup.c | 1 + arch/riscv/kernel/vdso/Makefile | 2 +- arch/riscv/mm/init.c | 1 - arch/s390/kvm/kvm-s390.c | 26 ++-- arch/s390/kvm/kvm-s390.h | 1 - arch/s390/kvm/pci.c | 2 +- arch/x86/kernel/asm-offsets.c | 6 - arch/x86/kvm/.gitignore | 2 + arch/x86/kvm/Makefile | 12 ++ arch/x86/kvm/kvm-asm-offsets.c | 27 ++++ arch/x86/kvm/mmu/mmu.c | 4 +- arch/x86/kvm/svm/sev.c | 2 +- arch/x86/kvm/svm/svm.c | 14 +- arch/x86/kvm/svm/svm.h | 4 +- arch/x86/kvm/svm/vmenter.S | 134 +++++++++++------- arch/x86/kvm/vmx/vmenter.S | 2 +- arch/x86/kvm/x86.c | 14 +- arch/x86/mm/hugetlbpage.c | 4 + drivers/ata/libata-scsi.c | 3 + drivers/cxl/core/region.c | 20 +++ drivers/dma/apple-admac.c | 2 +- drivers/dma/at_hdmac.c | 153 ++++++++------------- drivers/dma/at_hdmac_regs.h | 10 +- drivers/dma/idxd/cdev.c | 18 +++ drivers/dma/idxd/device.c | 26 ++-- drivers/dma/idxd/idxd.h | 34 +++++ drivers/dma/idxd/init.c | 24 +++- drivers/dma/idxd/registers.h | 2 + drivers/dma/idxd/sysfs.c | 11 +- drivers/dma/mv_xor_v2.c | 1 + drivers/dma/pxa_dma.c | 4 +- drivers/dma/stm32-dma.c | 14 +- drivers/dma/ti/k3-udma-glue.c | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 15 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 34 ++--- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 49 ++++--- .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 32 ++--- .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 52 ++++--- .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 24 +++- .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 +- drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 15 +- .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h | 15 +- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_lvds.c | 3 +- drivers/gpu/drm/i915/display/intel_panel.c | 29 ++-- drivers/gpu/drm/i915/display/intel_panel.h | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 5 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 +- drivers/gpu/drm/i915/gvt/kvmgt.c | 3 + drivers/gpu/drm/vc4/vc4_drv.c | 7 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 21 ++- drivers/gpu/drm/vc4/vc4_hdmi.h | 1 + drivers/hid/hid-hyperv.c | 2 +- drivers/hid/wacom_wac.c | 11 +- drivers/hwspinlock/qcom_hwspinlock.c | 2 +- drivers/mmc/host/sdhci-brcmstb.c | 3 +- drivers/mmc/host/sdhci-cqhci.h | 24 ++++ drivers/mmc/host/sdhci-esdhc-imx.c | 7 +- drivers/mmc/host/sdhci-of-arasan.c | 3 +- drivers/mmc/host/sdhci-tegra.c | 3 +- drivers/mmc/host/sdhci_am654.c | 7 +- drivers/net/can/at91_can.c | 2 +- drivers/net/can/c_can/c_can_main.c | 2 +- drivers/net/can/can327.c | 2 +- drivers/net/can/cc770/cc770.c | 2 +- drivers/net/can/ctucanfd/ctucanfd_base.c | 2 +- drivers/net/can/dev/skb.c | 9 +- drivers/net/can/flexcan/flexcan-core.c | 2 +- drivers/net/can/grcan.c | 2 +- drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +- drivers/net/can/janz-ican3.c | 2 +- drivers/net/can/kvaser_pciefd.c | 2 +- drivers/net/can/m_can/m_can.c | 2 +- drivers/net/can/mscan/mscan.c | 2 +- drivers/net/can/pch_can.c | 2 +- drivers/net/can/peak_canfd/peak_canfd.c | 2 +- drivers/net/can/rcar/rcar_can.c | 2 +- drivers/net/can/rcar/rcar_canfd.c | 15 +- drivers/net/can/sja1000/sja1000.c | 2 +- drivers/net/can/slcan/slcan-core.c | 2 +- drivers/net/can/softing/softing_main.c | 2 +- drivers/net/can/spi/hi311x.c | 2 +- drivers/net/can/spi/mcp251x.c | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c | 2 +- drivers/net/can/sun4i_can.c | 2 +- drivers/net/can/ti_hecc.c | 2 +- drivers/net/can/usb/ems_usb.c | 2 +- drivers/net/can/usb/esd_usb.c | 2 +- drivers/net/can/usb/etas_es58x/es58x_core.c | 2 +- drivers/net/can/usb/gs_usb.c | 2 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +- drivers/net/can/usb/mcba_usb.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/can/usb/ucan.c | 2 +- drivers/net/can/usb/usb_8dev.c | 2 +- drivers/net/can/xilinx_can.c | 2 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 +- drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 2 + .../ethernet/aquantia/atlantic/macsec/macsec_api.c | 18 ++- drivers/net/ethernet/broadcom/Kconfig | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 1 + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/freescale/fman/mac.c | 9 ++ drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 + drivers/net/ethernet/intel/ice/ice_base.c | 2 +- drivers/net/ethernet/intel/ice/ice_lib.c | 25 ++++ drivers/net/ethernet/intel/ice/ice_lib.h | 1 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 5 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 1 + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 135 ++++++++++++++---- .../ethernet/marvell/octeontx2/nic/otx2_struct.h | 57 ++++++++ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 32 +++-- .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 1 + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 7 +- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 +- .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 31 +++++ .../ethernet/mellanox/mlx5/core/en/tc/act/act.c | 92 +++++-------- drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 24 +++- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 - drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 5 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 14 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 18 +-- .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 14 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 3 +- drivers/net/ethernet/neterion/s2io.c | 29 ++-- drivers/net/ethernet/ni/nixge.c | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 39 ++++-- .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 8 +- drivers/net/ethernet/sunplus/spl2sw_driver.c | 1 - drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 2 + drivers/net/ethernet/tundra/tsi108_eth.c | 5 +- drivers/net/hamradio/bpqether.c | 2 +- drivers/net/macsec.c | 23 ++-- drivers/net/macvlan.c | 4 +- drivers/net/phy/mscc/mscc_macsec.c | 1 + drivers/net/tun.c | 18 ++- drivers/net/wan/lapbether.c | 3 +- drivers/net/wireless/ath/ath11k/reg.c | 6 +- drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 8 ++ drivers/net/wwan/iosm/iosm_ipc_mux.h | 1 + drivers/net/wwan/iosm/iosm_ipc_pcie.c | 11 +- drivers/net/wwan/iosm/iosm_ipc_wwan.c | 1 + drivers/net/wwan/mhi_wwan_mbim.c | 1 + drivers/pci/controller/pci-hyperv.c | 22 ++- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2 +- drivers/phy/ralink/phy-mt7621-pci.c | 3 +- drivers/phy/st/phy-stm32-usbphyc.c | 2 + drivers/platform/x86/hp-wmi.c | 12 +- drivers/platform/x86/p2sb.c | 15 +- drivers/soundwire/qcom.c | 9 ++ drivers/spi/spi-intel.c | 8 +- drivers/spi/spi-mt65xx.c | 23 ++-- drivers/thunderbolt/tb.c | 28 ++++ fs/btrfs/disk-io.c | 4 +- fs/btrfs/tests/btrfs-tests.c | 2 +- fs/btrfs/volumes.c | 39 ++++-- fs/btrfs/volumes.h | 2 +- fs/btrfs/zoned.c | 40 ++++++ fs/btrfs/zoned.h | 11 ++ fs/nilfs2/segment.c | 15 +- fs/nilfs2/super.c | 2 - fs/nilfs2/the_nilfs.c | 2 - fs/udf/namei.c | 2 +- include/asm-generic/vmlinux.lds.h | 2 +- include/linux/bpf_verifier.h | 21 +++ include/linux/can/dev.h | 16 +++ include/linux/skmsg.h | 2 +- include/uapi/linux/capability.h | 2 +- include/uapi/linux/idxd.h | 1 + io_uring/kbuf.c | 2 + kernel/bpf/verifier.c | 148 ++++++-------------- mm/damon/dbgfs.c | 7 + mm/hugetlb_vmemmap.c | 1 + mm/memremap.c | 1 + mm/userfaultfd.c | 2 +- net/can/af_can.c | 2 +- net/can/isotp.c | 71 +++++----- net/can/j1939/main.c | 3 + net/core/skbuff.c | 36 ++--- net/core/skmsg.c | 7 +- net/core/sock_map.c | 7 +- net/ipv4/tcp.c | 2 +- net/ipv4/tcp_bpf.c | 8 +- net/ipv6/addrlabel.c | 1 + net/mac80211/s1g.c | 3 + net/mac80211/tx.c | 5 + net/mctp/af_mctp.c | 4 +- net/mctp/route.c | 2 +- net/netfilter/nf_tables_api.c | 3 +- net/netfilter/nfnetlink.c | 1 + net/tipc/netlink_compat.c | 2 +- net/wireless/reg.c | 12 +- net/wireless/scan.c | 4 +- sound/arm/pxa2xx-ac97-lib.c | 4 +- sound/core/memalloc.c | 15 +- sound/hda/hdac_sysfs.c | 4 +- sound/pci/hda/hda_intel.c | 3 + sound/pci/hda/patch_ca0132.c | 1 + sound/pci/hda/patch_realtek.c | 2 + sound/usb/card.c | 29 ++-- sound/usb/quirks-table.h | 4 + sound/usb/quirks.c | 1 + tools/bpf/bpftool/common.c | 3 + tools/perf/.gitignore | 1 + tools/perf/tests/shell/test_brstack.sh | 5 +- tools/perf/util/parse-branch-options.c | 4 +- tools/perf/util/stat-display.c | 6 +- virt/kvm/kvm_main.c | 13 +- 230 files changed, 1662 insertions(+), 944 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/190 thunderbolt: Add DP OUT resource when DP tunnel is discovered
From: Sanjay R Mehta <[email protected]>
commit b60e31bf18a7064032dbcb73dcb5b58f8a00a110 upstream.
If the boot firmware implements a connection manager of its own it may create a DisplayPort tunnel and will be handed off to Linux connection manager, but the DP OUT resource is not saved in the dp_resource list.
This patch adds tunnelled DP OUT port to the dp_resource list once the DP tunnel is discovered.
--- drivers/thunderbolt/tb.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/thunderbolt/tb.c +28 -0
@@ -105,6 +105,32 @@ static void tb_remove_dp_resources(struc } } +static void tb_discover_dp_resource (struct tb *tb,struct tb_port *port) +{ +struct tb_cm *tcm =tb_priv (tb); +struct tb_port *p; + +list_for_each_entry (p, &tcm->dp_resources, list) { +if (p == port) +return ; + } + +tb_port_dbg (port,"DP %s resource available discovered\n" , +tb_port_is_dpin (port) ?"IN" :"OUT" ); +list_add_tail (&port->list, &tcm->dp_resources); +} + +static void tb_discover_dp_resources (struct tb *tb) +{ +struct tb_cm *tcm =tb_priv (tb); +struct tb_tunnel *tunnel; + +list_for_each_entry (tunnel, &tcm->tunnel_list, list) { +if (tb_tunnel_is_dp (tunnel)) +tb_discover_dp_resource (tb, tunnel->dst_port); + } +} +static void tb_switch_discover_tunnels (struct tb_switch *sw,struct list_head *list,bool alloc_hopids)
@@ -1446,6 +1472,8 @@ static int tb_start(struct tb *tb)tb_scan_switch (tb->root_switch);/* Find out tunnels created by the boot firmware */ tb_discover_tunnels (tb); +/* Add DP resources from the DP tunnels created by the boot firmware */ +tb_discover_dp_resources (tb);/* * If the boot firmware did not create USB 3.x tunnels create them * now for the whole topology.
Greg Kroah-Hartman
maintainerPATCH 2/190 drm/i915/gvt: Add missing vfio_unregister_group_dev() call
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
commit f423fa1bc9fe1978e6b9f54927411b62cb43eb04 upstream.
When converting to directly create the vfio_device the mdev driver has to put a vfio_register_emulated_iommu_dev() in the probe() and a pairing vfio_unregister_group_dev() in the remove.
This was missed for gvt, add it.
--- drivers/gpu/drm/i915/gvt/kvmgt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/gvt/kvmgt.c +3 -0
@@ -1595,6 +1595,9 @@ static void intel_vgpu_remove(struct mdeif (WARN_ON_ONCE (vgpu->attached))return ; + +vfio_unregister_group_dev (&vgpu->vfio_device); +vfio_uninit_group_dev (&vgpu->vfio_device);intel_gvt_destroy_vgpu (vgpu); }
Greg Kroah-Hartman
maintainerPATCH 3/190 m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit dc63a086daee92c63e392e4e7cd7ed61f3693026 upstream.
This is useful on !virt platforms for kexec, so change things from BI_VIRT_RNG_SEED to be BI_RNG_SEED, and simply remove BI_VIRT_RNG_SEED because it only ever lasted one release, and nothing is broken by not having it. At the same time, keep a comment noting that it's been removed, so that ID isn't reused. In addition, we previously documented 2-byte alignment, but 4-byte alignment is actually necessary, so update that comment.
--- arch/m68k/include/uapi/asm/bootinfo-virt.h | 9 ++------- arch/m68k/include/uapi/asm/bootinfo.h | 7 +++++++ arch/m68k/kernel/setup_mm.c | 12 ++++++++++++ arch/m68k/virt/config.c | 11 ----------- 4 files changed, 21 insertions(+), 18 deletions(-)
arch/m68k/include/uapi/asm/bootinfo-virt.h +2 -7
@@ -13,13 +13,8 @@#define BI_VIRT_VIRTIO_BASE 0x8004#define BI_VIRT_CTRL_BASE 0x8005 -/* -* A random seed used to initialize the RNG. Record format: -* -* - length [ 2 bytes, 16-bit big endian ] -* - seed data [ `length` bytes, padded to preserve 2-byte alignment ] -*/ -#define BI_VIRT_RNG_SEED 0x8006 +/* No longer used -- replaced with BI_RNG_SEED -- but don't reuse this index: +* #define BI_VIRT_RNG_SEED 0x8006 */ #define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0)
arch/m68k/include/uapi/asm/bootinfo.h +7 -0
@@ -64,6 +64,13 @@ struct mem_info {/* (struct mem_info) */ #define BI_COMMAND_LINE 0x0007/* kernel command line parameters */ /* (string) */ +/* +* A random seed used to initialize the RNG. Record format: +* +* - length [ 2 bytes, 16-bit big endian ] +* - seed data [ `length` bytes, padded to preserve 4-byte struct alignment ] +*/ +#define BI_RNG_SEED 0x0008/*
arch/m68k/kernel/setup_mm.c +12 -0
@@ -25,6 +25,7 @@#include <linux/module.h> #include <linux/nvram.h> #include <linux/initrd.h> +#include <linux/random.h> #include <asm/bootinfo.h> #include <asm/byteorder.h>
@@ -151,6 +152,17 @@ static void __init m68k_parse_bootinfo(c sizeof(m68k_command_line));break ; +case BI_RNG_SEED : { +u16 len =be16_to_cpup (data); +add_bootloader_randomness (data +2 , len); +/* +* Zero the data to preserve forward secrecy, and zero the +* length to prevent kexec from using it. +*/ +memzero_explicit ((void *)data, len +2 ); +break ; + } +default :if (MACH_IS_AMIGA ) unknown =amiga_parse_bootinfo (record);
arch/m68k/virt/config.c +0 -11
@@ -2,7 +2,6 @@#include <linux/reboot.h> #include <linux/serial_core.h> -#include <linux/random.h> #include <clocksource/timer-goldfish.h> #include <asm/bootinfo.h>
@@ -93,16 +92,6 @@ int __init virt_parse_bootinfo(const str data +=4 ; virt_bi_data.virtio.irq =be32_to_cpup (data);break ; -case BI_VIRT_RNG_SEED : { -u16 len =be16_to_cpup (data); -add_bootloader_randomness (data +2 , len); -/* -* Zero the data to preserve forward secrecy, and zero the -* length to prevent kexec from using it. -*/ -memzero_explicit ((void *)data, len +2 ); -break ; - }default : unknown =1 ;break ;
Greg Kroah-Hartman
maintainerPATCH 4/190 KVM: debugfs: Return retval of simple_attr_open() if it fails
In reply to Greg Kroah-HartmanFrom: Hou Wenlong <[email protected]>
[ Upstream commit 180418e2eb33be5c8d0b703c843e0ebc045aef80 ]
Although simple_attr_open() fails only with -ENOMEM with current code base, it would be nicer to return retval of simple_attr_open() directly in kvm_debugfs_open().
No functional change intended.
Message-Id: <69d64d93accd1f33691b8a383ae555baee80f943.1665975828.git.houwenlong.hwl@antgroup.com>
--- virt/kvm/kvm_main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
virt/kvm/kvm_main.c +6 -7
@@ -5404,6 +5404,7 @@ static int kvm_debugfs_open(struct inode *inode, struct file *file, int (*get)(void *, u64 *), int (*set)(void *, u64), const char *fmt) { + int ret;struct kvm_stat_data *stat_data = (struct kvm_stat_data *) inode->i_private;
@@ -5415,15 +5416,13 @@ static int kvm_debugfs_open(struct inode *inode, struct file *file,if (!kvm_get_kvm_safe (stat_data->kvm))return -ENOENT ; -if (simple_attr_open (inode, file, get, -kvm_stats_debugfs_mode (stat_data->desc) &0222 - ? set :NULL , - fmt)) { + ret =simple_attr_open (inode, file, get, +kvm_stats_debugfs_mode (stat_data->desc) &0222 + ? set :NULL , fmt); +if (ret)kvm_put_kvm (stat_data->kvm); -return -ENOMEM ; - } -return 0 ; +return ret; }static int kvm_debugfs_release (struct inode *inode,struct file *file)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 5/190 drm/i915: Allow more varied alternate fixed modes for panels
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
[ Upstream commit a5810f551d0a8c83b4817b53a446bd115e7182ce ]
On some systems the panel reports alternate modes with different blanking periods. If the EDID reports them and VBT doesn't tell us otherwise then I can't really see why they should be rejected. So allow their use for the purposes of static DRRS.
For seamless DRRS we still require a much more exact match of course. But that logic only kicks in when selecting the downclock mode (or in the future when determining whether we can do a seamless refresh rate change due to a user modeset).
Stable-dep-of: 12caf46cf4fc ("drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs")
--- drivers/gpu/drm/i915/display/intel_panel.c | 25 ++++++---------------- 1 file changed, 6 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/display/intel_panel.c +6 -19
@@ -81,15 +81,14 @@ static bool is_alt_drrs_mode(const struct drm_display_mode *mode, mode->clock != preferred_mode->clock; } -static bool is_alt_vrr_mode (const struct drm_display_mode *mode, -const struct drm_display_mode *preferred_mode) +static bool is_alt_fixed_mode (const struct drm_display_mode *mode, +const struct drm_display_mode *preferred_mode) {return drm_mode_match (mode, preferred_mode,DRM_MODE_MATCH_FLAGS |DRM_MODE_MATCH_3D_FLAGS ) && mode->hdisplay == preferred_mode->hdisplay && - mode->vdisplay == preferred_mode->vdisplay && - mode->clock != preferred_mode->clock; + mode->vdisplay == preferred_mode->vdisplay; } const struct drm_display_mode *
@@ -172,19 +171,7 @@ int intel_panel_compute_config(struct intel_connector *connector,return 0 ; } -static bool is_alt_fixed_mode (const struct drm_display_mode *mode, -const struct drm_display_mode *preferred_mode, -bool has_vrr) -{ -/* is_alt_drrs_mode() is a subset of is_alt_vrr_mode() */ -if (has_vrr) -return is_alt_vrr_mode (mode, preferred_mode); -else -return is_alt_drrs_mode (mode, preferred_mode); -} - -static void intel_panel_add_edid_alt_fixed_modes (struct intel_connector *connector, -bool has_vrr) +static void intel_panel_add_edid_alt_fixed_modes (struct intel_connector *connector) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); const struct drm_display_mode *preferred_mode =
@@ -192,7 +179,7 @@ static void intel_panel_add_edid_alt_fixed_modes(struct intel_connector *connectstruct drm_display_mode *mode, *next;list_for_each_entry_safe (mode, next, &connector->base.probed_modes, head) { -if (!is_alt_fixed_mode (mode, preferred_mode, has_vrr)) +if (!is_alt_fixed_mode (mode, preferred_mode))continue ; drm_dbg_kms(&dev_priv->drm,
@@ -255,7 +242,7 @@ void intel_panel_add_edid_fixed_modes(struct intel_connector *connector, {intel_panel_add_edid_preferred_mode (connector);if (intel_panel_preferred_fixed_mode (connector) && (has_drrs || has_vrr)) -intel_panel_add_edid_alt_fixed_modes (connector, has_vrr); +intel_panel_add_edid_alt_fixed_modes (connector);intel_panel_destroy_probed_modes (connector); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 6/190 drm/i915: Simplify intel_panel_add_edid_alt_fixed_modes()
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
[ Upstream commit d372ec94a018c3a19dad71e2ee3478126394d9fc ]
Since commit a5810f551d0a ("drm/i915: Allow more varied alternate fixed modes for panels") intel_panel_add_edid_alt_fixed_modes() no longer considers vrr vs. drrs separately. So no reason to pass them as separate parameters either.
Stable-dep-of: 12caf46cf4fc ("drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs")
--- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_lvds.c | 3 +-- drivers/gpu/drm/i915/display/intel_panel.c | 4 ++-- drivers/gpu/drm/i915/display/intel_panel.h | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -5233,7 +5233,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, encoder->devdata, IS_ERR(edid) ? NULL : edid);intel_panel_add_edid_fixed_modes (intel_connector, - intel_connector->panel.vbt.drrs_type !=DRRS_TYPE_NONE , + intel_connector->panel.vbt.drrs_type !=DRRS_TYPE_NONE ||intel_vrr_is_capable (intel_connector));/* MSO requires information from the EDID */
drivers/gpu/drm/i915/display/intel_lvds.c +1 -2
@@ -972,8 +972,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)/* Try EDID first */ intel_panel_add_edid_fixed_modes (intel_connector, - intel_connector->panel.vbt.drrs_type !=DRRS_TYPE_NONE , - false); + intel_connector->panel.vbt.drrs_type !=DRRS_TYPE_NONE );/* Failed to get EDID, what about VBT? */ if (!intel_panel_preferred_fixed_mode (intel_connector))
drivers/gpu/drm/i915/display/intel_panel.c +2 -2
@@ -238,10 +238,10 @@ static void intel_panel_destroy_probed_modes(struct intel_connector *connector) }void intel_panel_add_edid_fixed_modes (struct intel_connector *connector, -bool has_drrs,bool has_vrr) +bool use_alt_fixed_modes) {intel_panel_add_edid_preferred_mode (connector); -if (intel_panel_preferred_fixed_mode (connector) && (has_drrs || has_vrr)) +if (intel_panel_preferred_fixed_mode (connector) && use_alt_fixed_modes)intel_panel_add_edid_alt_fixed_modes (connector);intel_panel_destroy_probed_modes (connector); }
drivers/gpu/drm/i915/display/intel_panel.h +1 -1
@@ -41,7 +41,7 @@ int intel_panel_fitting(struct intel_crtc_state *crtc_state,int intel_panel_compute_config (struct intel_connector *connector,struct drm_display_mode *adjusted_mode);void intel_panel_add_edid_fixed_modes (struct intel_connector *connector, -bool has_drrs,bool has_vrr); +bool use_alt_fixed_modes);void intel_panel_add_vbt_lfp_fixed_mode (struct intel_connector *connector);void intel_panel_add_vbt_sdvo_fixed_mode (struct intel_connector *connector); void intel_panel_add_encoder_fixed_mode(struct intel_connector *connector,
drivers/gpu/drm/i915/display/intel_sdvo.c +1 -1
@@ -2901,7 +2901,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)if (!intel_panel_preferred_fixed_mode (intel_connector)) {intel_ddc_get_modes (connector, &intel_sdvo->ddc); -intel_panel_add_edid_fixed_modes (intel_connector, false, false); +intel_panel_add_edid_fixed_modes (intel_connector, false); }intel_panel_init (intel_connector);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 7/190 drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs
In reply to Greg Kroah-HartmanFrom: Ville Syrjälä <[email protected]>
[ Upstream commit 12caf46cf4fc92b1c3884cb363ace2e12732fd2f ]
drm_mode_probed_add() is unhappy about being called w/o mode_config.mutex. Grab it during LVDS fixed mode setup to silence the WARNs.
--- drivers/gpu/drm/i915/display/intel_sdvo.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/display/intel_sdvo.c +4 -0
@@ -2900,8 +2900,12 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)intel_panel_add_vbt_sdvo_fixed_mode (intel_connector);if (!intel_panel_preferred_fixed_mode (intel_connector)) { +mutex_lock (&i915->drm.mode_config.mutex); +intel_ddc_get_modes (connector, &intel_sdvo->ddc);intel_panel_add_edid_fixed_modes (intel_connector, false); + +mutex_unlock (&i915->drm.mode_config.mutex); }intel_panel_init (intel_connector);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 8/190 drm/amd/display: Acquire FCLK DPM levels on DCN32
In reply to Greg Kroah-HartmanFrom: Dillon Varone <[email protected]>
[ Upstream commit d6170e418d1d3ae7e98cb6d96d1444e880131bbf ]
[Why & How]
Acquire FCLK DPM levels to properly construct DML clock limits. Further add new logic to keep number of indices for each clock in clk_mgr.
Stable-dep-of: e59843c4cdd6 ("drm/amd/display: Limit dcn32 to 1950Mhz display clock")
--- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 41 ++++++++++++------- .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 15 ++++++- 2 files changed, 41 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +27 -14
@@ -156,7 +156,7 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base) {struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base);unsigned int num_levels; -unsigned int num_dcfclk_levels, num_dtbclk_levels, num_dispclk_levels; +struct clk_limit_num_entries *num_entries_per_clk = &clk_mgr_base->bw_params->clk_table.num_entries_per_clk;memset (&(clk_mgr_base->clks),0 ,sizeof (struct dc_clocks )); clk_mgr_base->clks.p_state_change_support = true;
@@ -180,27 +180,28 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base)/* DCFCLK */ dcn32_init_single_clock (clk_mgr,PPCLK_DCFCLK , &clk_mgr_base->bw_params->clk_table.entries[0 ].dcfclk_mhz, - &num_levels); - num_dcfclk_levels = num_levels; + &num_entries_per_clk->num_dcfclk_levels);/* SOCCLK */ dcn32_init_single_clock (clk_mgr,PPCLK_SOCCLK , &clk_mgr_base->bw_params->clk_table.entries[0 ].socclk_mhz, - &num_levels); + &num_entries_per_clk->num_socclk_levels); +/* DTBCLK */ if (!clk_mgr->base.ctx->dc->debug.disable_dtb_ref_clk_switch)dcn32_init_single_clock (clk_mgr,PPCLK_DTBCLK , &clk_mgr_base->bw_params->clk_table.entries[0 ].dtbclk_mhz, - &num_levels); - num_dtbclk_levels = num_levels; + &num_entries_per_clk->num_dtbclk_levels);/* DISPCLK */ dcn32_init_single_clock (clk_mgr,PPCLK_DISPCLK , &clk_mgr_base->bw_params->clk_table.entries[0 ].dispclk_mhz, - &num_levels); - num_dispclk_levels = num_levels; + &num_entries_per_clk->num_dispclk_levels); + num_levels = num_entries_per_clk->num_dispclk_levels; -if (num_dcfclk_levels && num_dtbclk_levels && num_dispclk_levels) +if (num_entries_per_clk->num_dcfclk_levels && + num_entries_per_clk->num_dtbclk_levels && + num_entries_per_clk->num_dispclk_levels) clk_mgr->dpm_present = true;if (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz) {
@@ -370,7 +371,7 @@ static void dcn32_update_clocks(struct clk_mgr *clk_mgr_base,/* to disable P-State switching, set UCLK min = max */ if (!clk_mgr_base->clks.p_state_change_support)dcn32_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); + clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_memclk_levels -1 ].memclk_mhz); } if (should_update_pstate_support(safe_to_lower, fclk_p_state_change_support, clk_mgr_base->clks.fclk_p_state_change_support) &&
@@ -632,7 +633,7 @@ static void dcn32_set_hard_min_memclk(struct clk_mgr *clk_mgr_base, bool current khz_to_mhz_ceil(clk_mgr_base->clks.dramclk_khz)); else dcn32_smu_set_hard_min_by_freq(clk_mgr, PPCLK_UCLK, - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries - 1].memclk_mhz); + clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_memclk_levels - 1].memclk_mhz); }else {dcn32_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , clk_mgr_base->bw_params->clk_table.entries[0 ].memclk_mhz);
@@ -648,22 +649,34 @@ static void dcn32_set_hard_max_memclk(struct clk_mgr *clk_mgr_base)return ;dcn30_smu_set_hard_max_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); + clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries_per_clk.num_memclk_levels -1 ].memclk_mhz); }/* Get current memclk states, update bounding box */ static void dcn32_get_memclk_states_from_smu (struct clk_mgr *clk_mgr_base) {struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); +struct clk_limit_num_entries *num_entries_per_clk = &clk_mgr_base->bw_params->clk_table.num_entries_per_clk;unsigned int num_levels;if (!clk_mgr->smu_present)return ; -/* Refresh memclk states */ +/* Refresh memclk and fclk states */ dcn32_init_single_clock (clk_mgr,PPCLK_UCLK , &clk_mgr_base->bw_params->clk_table.entries[0 ].memclk_mhz, - &num_levels); + &num_entries_per_clk->num_memclk_levels); + +dcn32_init_single_clock (clk_mgr,PPCLK_FCLK , + &clk_mgr_base->bw_params->clk_table.entries[0 ].fclk_mhz, + &num_entries_per_clk->num_fclk_levels); + +if (num_entries_per_clk->num_memclk_levels >= num_entries_per_clk->num_fclk_levels) { + num_levels = num_entries_per_clk->num_memclk_levels; + }else { + num_levels = num_entries_per_clk->num_fclk_levels; + } + clk_mgr_base->bw_params->clk_table.num_entries = num_levels ? num_levels :1 ;if (clk_mgr->dpm_present && !num_levels)
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +14 -1
@@ -95,10 +95,23 @@ struct clk_limit_table_entry {unsigned int wck_ratio; }; +struct clk_limit_num_entries { +unsigned int num_dcfclk_levels; +unsigned int num_fclk_levels; +unsigned int num_memclk_levels; +unsigned int num_socclk_levels; +unsigned int num_dtbclk_levels; +unsigned int num_dispclk_levels; +unsigned int num_dppclk_levels; +unsigned int num_phyclk_levels; +unsigned int num_phyclk_d18_levels; +}; +/* This table is contiguous */ struct clk_limit_table {struct clk_limit_table_entry entries[MAX_NUM_DPM_LVL ]; -unsigned int num_entries; +struct clk_limit_num_entries num_entries_per_clk; +unsigned int num_entries;/* highest populated dpm level for back compatibility */ };struct wm_range_table_entry {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 9/190 drm/amd/display: Limit dcn32 to 1950Mhz display clock
In reply to Greg Kroah-HartmanFrom: Jun Lei <[email protected]>
[ Upstream commit e59843c4cdd68a369591630088171eeacce9859f ]
[why]
Hardware team recommends we limit dispclock to 1950Mhz for all DCN3.2.x
[how]
Limit to 1950 when initializing clocks.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +4 -4
@@ -157,6 +157,7 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base)struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base);unsigned int num_levels;struct clk_limit_num_entries *num_entries_per_clk = &clk_mgr_base->bw_params->clk_table.num_entries_per_clk; +unsigned int i;memset (&(clk_mgr_base->clks),0 ,sizeof (struct dc_clocks )); clk_mgr_base->clks.p_state_change_support = true;
@@ -205,18 +206,17 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base) clk_mgr->dpm_present = true;if (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz) { -unsigned int i; -for (i =0 ; i < num_levels; i++)if (clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz <khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz)) clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz =khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz); } +for (i =0 ; i < num_levels; i++) +if (clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz >1950 ) + clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz =1950 ;if (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz) { -unsigned int i; -for (i =0 ; i < num_levels; i++)if (clk_mgr_base->bw_params->clk_table.entries[i].dppclk_mhz <khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 10/190 drm/amd/display: Set memclk levels to be at least 1 for dcn32
In reply to Greg Kroah-HartmanFrom: Dillon Varone <[email protected]>
[ Upstream commit 6cb5cec16c380be4cf9776a8c23b72e9fe742fd1 ]
[Why]
Cannot report 0 memclk levels even when SMU does not provide any.
[How]
When memclk levels reported by SMU is 0, set levels to 1.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +3 -0
@@ -667,6 +667,9 @@ static void dcn32_get_memclk_states_from_smu(struct clk_mgr *clk_mgr_base) &clk_mgr_base->bw_params->clk_table.entries[0 ].memclk_mhz, &num_entries_per_clk->num_memclk_levels); +/* memclk must have at least one level */ + num_entries_per_clk->num_memclk_levels = num_entries_per_clk->num_memclk_levels ? num_entries_per_clk->num_memclk_levels :1 ; +dcn32_init_single_clock (clk_mgr,PPCLK_FCLK , &clk_mgr_base->bw_params->clk_table.entries[0 ].fclk_mhz, &num_entries_per_clk->num_fclk_levels);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 11/190 drm/amdkfd: handle CPU fault on COW mapping
In reply to Greg Kroah-HartmanFrom: Philip Yang <[email protected]>
[ Upstream commit e1f84eef313f4820cca068a238c645d0a38c6a9b ]
If CPU page fault in a page with zone_device_data svm_bo from another process, that means it is COW mapping in the child process and the range is migrated to VRAM by parent process. Migrate the parent process range back to system memory to recover the CPU page fault.
Stable-dep-of: 5b994354af3c ("drm/amdkfd: Fix NULL pointer dereference in svm_migrate_to_ram()")
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 42 ++++++++++++++++-------- 1 file changed, 29 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +29 -13
@@ -886,7 +886,7 @@ svm_migrate_to_vram(struct svm_range *prange, uint32_t best_loc,static vm_fault_t svm_migrate_to_ram (struct vm_fault *vmf) {unsigned long addr = vmf->address; -struct vm_area_struct *vma; +struct svm_range_bo *svm_bo;enum svm_work_list_ops op;struct svm_range *parent;struct svm_range *prange;
@@ -894,29 +894,42 @@ static vm_fault_t svm_migrate_to_ram(struct vm_fault *vmf)struct mm_struct *mm;int r =0 ; - vma = vmf->vma; - mm = vma->vm_mm; + svm_bo = vmf->page->zone_device_data; +if (!svm_bo) { +pr_debug ("failed get device page at addr 0x%lx\n" , addr); +return VM_FAULT_SIGBUS ; + } +if (!mmget_not_zero (svm_bo->eviction_fence->mm)) { +pr_debug ("addr 0x%lx of process mm is detroyed\n" , addr); +return VM_FAULT_SIGBUS ; + } + + mm = svm_bo->eviction_fence->mm; +if (mm != vmf->vma->vm_mm) +pr_debug ("addr 0x%lx is COW mapping in child process\n" , addr); - p =kfd_lookup_process_by_mm (vma->vm_mm); + p =kfd_lookup_process_by_mm (mm);if (!p) {pr_debug ("failed find process at fault address 0x%lx\n" , addr); -return VM_FAULT_SIGBUS ; + r =VM_FAULT_SIGBUS ; + goto out_mmput; }if (READ_ONCE (p->svms.faulting_task) == current) {pr_debug ("skipping ram migration\n" ); -kfd_unref_process (p); -return 0 ; + r =0 ; + goto out_unref_process; } - addr >>=PAGE_SHIFT ; +pr_debug ("CPU page fault svms 0x%p address 0x%lx\n" , &p->svms, addr); + addr >>=PAGE_SHIFT ;mutex_lock (&p->svms.lock); prange =svm_range_from_addr (&p->svms, addr, &parent);if (!prange) { -pr_debug ("cannot find svm range at 0x%lx\n" , addr); +pr_debug ("failed get range svms 0x%p addr 0x%lx\n" , &p->svms, addr); r = -EFAULT ; - goto out; + goto out_unlock_svms; }mutex_lock (&parent->migrate_mutex);
@@ -940,8 +953,8 @@ static vm_fault_t svm_migrate_to_ram(struct vm_fault *vmf) r =svm_migrate_vram_to_ram (prange, mm,KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU );if (r) -pr_debug ("failed %d migrate 0x%p [0x%lx 0x%lx] to ram\n" , r, - prange, prange->start, prange->last); +pr_debug ("failed %d migrate svms 0x%p range 0x%p [0x%lx 0x%lx]\n" , + r, prange->svms, prange, prange->start, prange->last);/* xnack on, update mapping on GPUs with ACCESS_IN_PLACE */ if (p->xnack_enabled && parent == prange)
@@ -955,9 +968,12 @@ static vm_fault_t svm_migrate_to_ram(struct vm_fault *vmf)if (prange != parent)mutex_unlock (&prange->migrate_mutex);mutex_unlock (&parent->migrate_mutex); -out: +out_unlock_svms:mutex_unlock (&p->svms.lock); +out_unref_process:kfd_unref_process (p); +out_mmput: +mmput (mm);pr_debug ("CPU fault svms 0x%p address 0x%lx done\n" , &p->svms, addr);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 12/190 drm/amdkfd: Fix NULL pointer dereference in svm_migrate_to_ram()
In reply to Greg Kroah-HartmanFrom: Yang Li <[email protected]>
[ Upstream commit 5b994354af3cab770bf13386469c5725713679af ]
./drivers/gpu/drm/amd/amdkfd/kfd_migrate.c:985:58-62: ERROR: p is NULL but dereferenced.
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +1 -3
@@ -971,12 +971,10 @@ static vm_fault_t svm_migrate_to_ram(struct vm_fault *vmf) out_unlock_svms:mutex_unlock (&p->svms.lock); out_unref_process: +pr_debug ("CPU fault svms 0x%p address 0x%lx done\n" , &p->svms, addr);kfd_unref_process (p); out_mmput:mmput (mm); - -pr_debug ("CPU fault svms 0x%p address 0x%lx done\n" , &p->svms, addr); -return r ?VM_FAULT_SIGBUS :0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 13/190 cxl/region: Recycle region ids
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
[ Upstream commit 8f401ec1c8975eabfe4c089de91cbe058deabf71 ]
At region creation time the next region-id is atomically cached so that there is predictability of region device names. If that region is destroyed and then a new one is created the region id increments. That ends up looking like a memory leak, or is otherwise surprising that identifiers roll forward even after destroying all previously created regions.
Try to reuse rather than free old region ids at region release time.
While this fixes a cosmetic issue, the needlessly advancing memory region-id gives the appearance of a memory leak, hence the "Fixes" tag, but no "Cc: stable" tag.
--- drivers/cxl/core/region.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/cxl/core/region.c +20 -0
@@ -1533,9 +1533,24 @@ static const struct attribute_group *region_groups[] = {static void cxl_region_release (struct device *dev) { +struct cxl_root_decoder *cxlrd =to_cxl_root_decoder (dev->parent);struct cxl_region *cxlr =to_cxl_region (dev); +int id =atomic_read (&cxlrd->region_id); + +/* +* Try to reuse the recently idled id rather than the cached +* next id to prevent the region id space from increasing +* unnecessarily. +*/ +if (cxlr->id < id) +if (atomic_try_cmpxchg (&cxlrd->region_id, &id, cxlr->id)) { +memregion_free (id); + goto out; + }memregion_free (cxlr->id); +out: +put_device (dev->parent);kfree (cxlr); }
@@ -1597,6 +1612,11 @@ static struct cxl_region *cxl_region_alloc(struct cxl_root_decoder *cxlrd, int idevice_initialize (dev);lockdep_set_class (&dev->mutex, &cxl_region_key); dev->parent = &cxlrd->cxlsd.cxld.dev; +/* +* Keep root decoder pinned through cxl_region_release to fixup +* region id allocations +*/ +get_device (dev->parent);device_set_pm_not_required (dev); dev->bus = &cxl_bus_type; dev->type = &cxl_region_type;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 14/190 HID: wacom: Fix logic used for 3rd barrel switch emulation
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
commit f77810f744139572a63e5a85ab6a8c10c2d44fb1 upstream.
When support was added for devices using an explicit 3rd barrel switch, the logic used by devices emulating this feature was broken. The 'if' statement / block that was introduced only handles the case where the button is pressed (i.e. 'barrelswitch' and 'barrelswitch2' are both set) but not the case where it is released (i.e. one or both being cleared). This results in a BTN_STYLUS3 "down" event being sent when the button is pressed, but no "up" event ever being sent afterwards.
This patch restores the previously-used logic for determining button states in the emulated case so that switches are reported correctly again.
--- drivers/hid/wacom_wac.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/hid/wacom_wac.c +6 -5
@@ -2522,11 +2522,12 @@ static void wacom_wac_pen_report(structif (!delay_pen_events (wacom_wac) && wacom_wac->tool[0 ]) {int id = wacom_wac->id[0 ]; -if (wacom_wac->features.quirks &WACOM_QUIRK_PEN_BUTTON3 && - wacom_wac->hid_data.barrelswitch & wacom_wac->hid_data.barrelswitch2) { - wacom_wac->hid_data.barrelswitch =0 ; - wacom_wac->hid_data.barrelswitch2 =0 ; - wacom_wac->hid_data.barrelswitch3 =1 ; +if (wacom_wac->features.quirks &WACOM_QUIRK_PEN_BUTTON3 ) { +int sw_state = wacom_wac->hid_data.barrelswitch | + (wacom_wac->hid_data.barrelswitch2 <<1 ); + wacom_wac->hid_data.barrelswitch = sw_state ==1 ; + wacom_wac->hid_data.barrelswitch2 = sw_state ==2 ; + wacom_wac->hid_data.barrelswitch3 = sw_state ==3 ; }input_report_key (input,BTN_STYLUS , wacom_wac->hid_data.barrelswitch);input_report_key (input,BTN_STYLUS2 , wacom_wac->hid_data.barrelswitch2);
Greg Kroah-Hartman
maintainerPATCH 15/190 hwspinlock: qcom: correct MMIO max register for newer SoCs
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 90cb380f9ceb811059340d06ff5fd0c0e93ecbe1 ]
Newer ARMv8 Qualcomm SoCs using 0x1000 register stride have maximum register 0x20000 (32 mutexes * 0x1000).
--- drivers/hwspinlock/qcom_hwspinlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwspinlock/qcom_hwspinlock.c +1 -1
@@ -121,7 +121,7 @@ static const struct regmap_config tcsr_mutex_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x40000, + .max_register = 0x20000, .fast_io = true, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 16/190 phy: stm32: fix an error code in probe
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit ca1c73628f5bd0c1ef6e46073cc3be2450605b06 ]
If "index > usbphyc->nphys" is true then this returns success but it should return -EINVAL.
--- drivers/phy/st/phy-stm32-usbphyc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/phy/st/phy-stm32-usbphyc.c +2 -0
@@ -710,6 +710,8 @@ static int stm32_usbphyc_probe(struct platform_device *pdev) ret =of_property_read_u32 (child,"reg" , &index);if (ret || index > usbphyc->nphys) {dev_err (&phy->dev,"invalid reg property: %d\n" , ret); +if (!ret) + ret = -EINVAL ; goto put_child; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 17/190 wifi: cfg80211: silence a sparse RCU warning
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
[ Upstream commit 03c0ad4b06c3566de624b4f4b78ac1a5d1e4c8e7 ]
All we're going to do with this pointer is assign it to another __rcu pointer, but sparse can't see that, so use rcu_access_pointer() to silence the warning here.
--- net/wireless/scan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/wireless/scan.c +3 -1
@@ -1674,7 +1674,9 @@ cfg80211_update_known_bss(struct cfg80211_registered_device *rdev,if (old ==rcu_access_pointer (known->pub.ies))rcu_assign_pointer (known->pub.ies, new->pub.beacon_ies); -cfg80211_update_hidden_bsses (known, new->pub.beacon_ies, old); +cfg80211_update_hidden_bsses (known, +rcu_access_pointer (new->pub.beacon_ies), + old);if (old)kfree_rcu ((struct cfg80211_bss_ies *)old, rcu_head);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 18/190 wifi: cfg80211: fix memory leak in query_regdb_file()
In reply to Greg Kroah-HartmanFrom: Arend van Spriel <[email protected]>
[ Upstream commit 57b962e627ec0ae53d4d16d7bd1033e27e67677a ]
In the function query_regdb_file() the alpha2 parameter is duplicated using kmemdup() and subsequently freed in regdb_fw_cb(). However, request_firmware_nowait() can fail without calling regdb_fw_cb() and thus leak memory.
--- net/wireless/reg.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/wireless/reg.c +9 -3
@@ -1084,6 +1084,8 @@ MODULE_FIRMWARE("regulatory.db");static int query_regdb_file (const char *alpha2) { +int err; +ASSERT_RTNL ();if (regdb)
@@ -1093,9 +1095,13 @@ static int query_regdb_file(const char *alpha2)if (!alpha2)return -ENOMEM ; -return request_firmware_nowait (THIS_MODULE , true,"regulatory.db" , - ®_pdev->dev,GFP_KERNEL , - (void *)alpha2, regdb_fw_cb); + err =request_firmware_nowait (THIS_MODULE , true,"regulatory.db" , + ®_pdev->dev,GFP_KERNEL , + (void *)alpha2, regdb_fw_cb); +if (err) +kfree (alpha2); + +return err; }int reg_reload_regdb (void )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 19/190 soundwire: qcom: reinit broadcast completion
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit f936fa7a954b262cb3908bbc8f01ba19dfaf9fbf ]
For some reason we never reinit the broadcast completion, there is a danger that broadcast commands could be treated as completed by driver from previous complete status.
Fix this by reinitializing the completion before sending a broadcast command.
--- drivers/soundwire/qcom.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soundwire/qcom.c +3 -0
@@ -344,6 +344,9 @@ static int qcom_swrm_cmd_fifo_wr_cmd(struct qcom_swrm_ctrl *swrm, u8 cmd_data,if (swrm_wait_for_wr_fifo_avail (swrm))return SDW_CMD_FAIL_OTHER ; +if (cmd_id ==SWR_BROADCAST_CMD_ID ) +reinit_completion (&swrm->broadcast); +/* Its assumed that write is okay as we do not get any status back */ swrm->reg_write (swrm,SWRM_CMD_FIFO_WR_CMD , val);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 20/190 soundwire: qcom: check for outanding writes before doing a read
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 49a467310dc4fae591a3547860ee04d8730780f4 ]
Reading will increase the fifo count, so check for outstanding cmd wrt. write fifo depth to avoid overflow as read will also increase write fifo cnt.
--- drivers/soundwire/qcom.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/soundwire/qcom.c +6 -0
@@ -380,6 +380,12 @@ static int qcom_swrm_cmd_fifo_rd_cmd(struct qcom_swrm_ctrl *swrm, val =swrm_get_packed_reg_val (&swrm->rcmd_id, len, dev_addr, reg_addr); +/* +* Check for outstanding cmd wrt. write fifo depth to avoid +* overflow as read will also increase write fifo cnt. +*/ +swrm_wait_for_wr_fifo_avail (swrm); +/* wait for FIFO RD to complete to avoid overflow */ usleep_range (100 ,105 ); swrm->reg_write (swrm,SWRM_CMD_FIFO_RD_CMD , val);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 21/190 ALSA: arm: pxa: pxa2xx-ac97-lib: fix return value check of platform_get_irq()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 46cf1954de3f324dc7f9472c12c3bd03b268a11b ]
platform_get_irq() returns negative error number on failure, fix the return value check in pxa2xx_ac97_hw_probe() and assign the error code to 'ret'.
--- sound/arm/pxa2xx-ac97-lib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/arm/pxa2xx-ac97-lib.c +3 -1
@@ -402,8 +402,10 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev) goto err_clk2; irq =platform_get_irq (dev,0 ); -if (!irq) +if (irq <0 ) { + ret = irq; goto err_irq; + } ret =request_irq (irq, pxa2xx_ac97_irq,0 ,"AC97" ,NULL );if (ret <0 )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 22/190 spi: mediatek: Fix package division error
In reply to Greg Kroah-HartmanFrom: zhichao.liu <[email protected]>
[ Upstream commit cf82d0ecb84e8ef9958721193f901609b408655b ]
Commit 7e963fb2a33ce ("spi: mediatek: add ipm design support for MT7986") makes a mistake on package dividing operation (one change is missing), need to fix it.
Background:
Ipm design is expanding the HW capability of dma (adjust package length from 1KB to 64KB), and using "dev_comp->ipm_support" flag to indicate it.
Issue description:
Ipm support patch (said above) is missing to handle remainder at package dividing operation.
One case, a transmission length is 65KB, is will divide to 1K (package length) * 65(package loop) in non-ipm desgin case, and will divide to 64K(package length) * 1(package loop) + 1K(remainder) in ipm design case. And the 1K remainder will be lost with the current SW flow, and the transmission will be failure. So, it should be fixed.
Solution:
Add "ipm_design" flag in function "mtk_spi_get_mult_delta()" to indicate HW capability, and modify the parameters corespondingly.
--- drivers/spi/spi-mt65xx.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/spi/spi-mt65xx.c +13 -10
@@ -551,14 +551,17 @@ static void mtk_spi_enable_transfer(struct spi_master *master)writel (cmd, mdata->base +SPI_CMD_REG ); } -static int mtk_spi_get_mult_delta (u32 xfer_len) +static int mtk_spi_get_mult_delta (struct mtk_spi *mdata,u32 xfer_len) { -u32 mult_delta; +u32 mult_delta =0 ; -if (xfer_len >MTK_SPI_PACKET_SIZE ) - mult_delta = xfer_len %MTK_SPI_PACKET_SIZE ; -else - mult_delta =0 ; +if (mdata->dev_comp->ipm_design) { +if (xfer_len >MTK_SPI_IPM_PACKET_SIZE ) + mult_delta = xfer_len %MTK_SPI_IPM_PACKET_SIZE ; + }else { +if (xfer_len >MTK_SPI_PACKET_SIZE ) + mult_delta = xfer_len %MTK_SPI_PACKET_SIZE ; + }return mult_delta; }
@@ -570,22 +573,22 @@ static void mtk_spi_update_mdata_len(struct spi_master *master)if (mdata->tx_sgl_len && mdata->rx_sgl_len) {if (mdata->tx_sgl_len > mdata->rx_sgl_len) { - mult_delta =mtk_spi_get_mult_delta (mdata->rx_sgl_len); + mult_delta =mtk_spi_get_mult_delta (mdata, mdata->rx_sgl_len); mdata->xfer_len = mdata->rx_sgl_len - mult_delta; mdata->rx_sgl_len = mult_delta; mdata->tx_sgl_len -= mdata->xfer_len; }else { - mult_delta =mtk_spi_get_mult_delta (mdata->tx_sgl_len); + mult_delta =mtk_spi_get_mult_delta (mdata, mdata->tx_sgl_len); mdata->xfer_len = mdata->tx_sgl_len - mult_delta; mdata->tx_sgl_len = mult_delta; mdata->rx_sgl_len -= mdata->xfer_len; } }else if (mdata->tx_sgl_len) { - mult_delta =mtk_spi_get_mult_delta (mdata->tx_sgl_len); + mult_delta =mtk_spi_get_mult_delta (mdata, mdata->tx_sgl_len); mdata->xfer_len = mdata->tx_sgl_len - mult_delta; mdata->tx_sgl_len = mult_delta; }else if (mdata->rx_sgl_len) { - mult_delta =mtk_spi_get_mult_delta (mdata->rx_sgl_len); + mult_delta =mtk_spi_get_mult_delta (mdata, mdata->rx_sgl_len); mdata->xfer_len = mdata->rx_sgl_len - mult_delta; mdata->rx_sgl_len = mult_delta; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 23/190 bpf, verifier: Fix memory leak in array reallocation for stack state
In reply to Greg Kroah-HartmanFrom: Kees Cook <[email protected]>
[ Upstream commit 42378a9ca55347102bbf86708776061d8fe3ece2 ]
If an error (NULL) is returned by krealloc(), callers of realloc_array() were setting their allocation pointers to NULL, but on error krealloc() does not touch the original allocation. This would result in a memory resource leak. Instead, free the old allocation on the error handling path.
The memory leak information is as follows as also reported by Zhengchao:
unreferenced object 0xffff888019801800 (size 256):
comm "bpf_repo", pid 6490, jiffies 4294959200 (age 17.170s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<00000000b211474b>] __kmalloc_node_track_caller+0x45/0xc0
[<0000000086712a0b>] krealloc+0x83/0xd0
[<00000000139aab02>] realloc_array+0x82/0xe2
[<00000000b1ca41d1>] grow_stack_state+0xfb/0x186
[<00000000cd6f36d2>] check_mem_access.cold+0x141/0x1341
[<0000000081780455>] do_check_common+0x5358/0xb350
[<0000000015f6b091>] bpf_check.cold+0xc3/0x29d
[<000000002973c690>] bpf_prog_load+0x13db/0x2240
[<00000000028d1644>] __sys_bpf+0x1605/0x4ce0
[<00000000053f29bd>] __x64_sys_bpf+0x75/0xb0
[<0000000056fedaf5>] do_syscall_64+0x35/0x80
[<000000002bd58261>] entry_SYSCALL_64_after_hwframe+0x63/0xcd--- kernel/bpf/verifier.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +7 -2
@@ -1011,12 +1011,17 @@ static void *copy_array(void *dst, const void *src, size_t n, size_t size, gfp_t*/ static void *realloc_array (void *arr,size_t old_n,size_t new_n,size_t size) { +void *new_arr; +if (!new_n || old_n == new_n) goto out; - arr =krealloc_array (arr, new_n, size,GFP_KERNEL ); -if (!arr) + new_arr =krealloc_array (arr, new_n, size,GFP_KERNEL ); +if (!new_arr) { +kfree (arr);return NULL ; + } + arr = new_arr;if (new_n > old_n)memset (arr + old_n * size,0 , (new_n - old_n) * size);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 24/190 bpf, sockmap: Fix the sk->sk_forward_alloc warning of sk_stream_kill_queues
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit 8ec95b94716a1e4d126edc3fb2bc426a717e2dba ]
When running test_sockmap selftests, the following warning appears:
WARNING: CPU: 2 PID: 197 at net/core/stream.c:205 sk_stream_kill_queues+0xd3/0xf0 Call Trace: <TASK> inet_csk_destroy_sock+0x55/0x110 tcp_rcv_state_process+0xd28/0x1380 ? tcp_v4_do_rcv+0x77/0x2c0 tcp_v4_do_rcv+0x77/0x2c0 __release_sock+0x106/0x130 __tcp_close+0x1a7/0x4e0 tcp_close+0x20/0x70 inet_release+0x3c/0x80 __sock_release+0x3a/0xb0 sock_close+0x14/0x20 __fput+0xa3/0x260 task_work_run+0x59/0xb0 exit_to_user_mode_prepare+0x1b3/0x1c0 syscall_exit_to_user_mode+0x19/0x50 do_syscall_64+0x48/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae
The root case is in commit 84472b436e76 ("bpf, sockmap: Fix more uncharged while msg has more_data"), where I used msg->sg.size to replace the tosend, causing breakage:
if (msg->apply_bytes && msg->apply_bytes < tosend)
tosend = psock->apply_bytes;--- net/ipv4/tcp_bpf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/ipv4/tcp_bpf.c +5 -3
@@ -278,7 +278,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, {bool cork = false, enospc =sk_msg_full (msg);struct sock *sk_redir; -u32 tosend, delta =0 ; +u32 tosend, origsize, sent, delta =0 ;u32 eval = __SK_NONE;int ret;
@@ -333,10 +333,12 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, cork = true; psock->cork =NULL ; } -sk_msg_return (sk, msg, msg->sg.size); +sk_msg_return (sk, msg, tosend);release_sock (sk); + origsize = msg->sg.size; ret =tcp_bpf_sendmsg_redir (sk_redir, msg, tosend, flags); + sent = origsize - msg->sg.size;if (eval == __SK_REDIRECT)sock_put (sk_redir);
@@ -375,7 +377,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, msg->sg.data[msg->sg.start].page_link && msg->sg.data[msg->sg.start].length) {if (eval == __SK_REDIRECT) -sk_mem_charge (sk, msg->sg.size); +sk_mem_charge (sk, tosend - sent); goto more_data; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 25/190 wifi: mac80211: fix general-protection-fault in ieee80211_subif_start_xmit()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 780854186946e0de2be192ee7fa5125666533b3a ]
When device is running and the interface status is changed, the gpf issue is triggered. The problem triggering process is as follows:
Thread A: Thread Bieee80211_runtime_change_iftype() process_one_work()
... ...
ieee80211_do_stop() ...
... ...
sdata->bss = NULL ...
... ieee80211_subif_start_xmit()
ieee80211_multicast_to_unicast
//!sdata->bss->multicast_to_unicast
cause gpf issueWhen the interface status is changed, the sending queue continues to send packets. After the bss is set to NULL, the bss is accessed. As a result, this causes a general-protection-fault issue.
The following is the stack information:
general protection fault, probably for non-canonical address 0xdffffc000000002f: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000178-0x000000000000017f] Workqueue: mld mld_ifc_work RIP: 0010:ieee80211_subif_start_xmit+0x25b/0x1310 Call Trace: <TASK> dev_hard_start_xmit+0x1be/0x990 __dev_queue_xmit+0x2c9a/0x3b60 ip6_finish_output2+0xf92/0x1520 ip6_finish_output+0x6af/0x11e0 ip6_output+0x1ed/0x540 mld_sendpack+0xa09/0xe70 mld_ifc_work+0x71c/0xdb0 process_one_work+0x9bf/0x1710 worker_thread+0x665/0x1080 kthread+0x2e4/0x3a0 ret_from_fork+0x1f/0x30 </TASK>
--- net/mac80211/tx.c | 5 +++++ 1 file changed, 5 insertions(+)
net/mac80211/tx.c +5 -0
@@ -4379,6 +4379,11 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,if (likely (!is_multicast_ether_addr (eth->h_dest))) goto normal; +if (unlikely (!ieee80211_sdata_running (sdata))) { +kfree_skb (skb); +return NETDEV_TX_OK ; + } +if (unlikely (ieee80211_multicast_to_unicast (skb, dev))) {struct sk_buff_head queue;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 26/190 wifi: mac80211: Set TWT Information Frame Disabled bit as 1
In reply to Greg Kroah-HartmanFrom: Howard Hsu <[email protected]>
[ Upstream commit 30ac96f7cc973bb850c718c9bbe1fdcedfbe826b ]
The TWT Information Frame Disabled bit of control field of TWT Setup frame shall be set to 1 since handling TWT Information frame is not supported by current mac80211 implementation.
--- net/mac80211/s1g.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/s1g.c +3 -0
@@ -112,6 +112,9 @@ ieee80211_s1g_rx_twt_setup(struct ieee80211_sub_if_data *sdata, goto out; } +/* TWT Information not supported yet */ + twt->control |=IEEE80211_TWT_CONTROL_RX_DISABLED ; +drv_add_twt_setup (sdata->local, sdata, &sta->sta, twt); out:ieee80211_s1g_send_twt_setup (sdata, mgmt->sa, sdata->vif.addr, twt);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 27/190 bpftool: Fix NULL pointer dereference when pin {PROG, MAP, LINK} without FILE
In reply to Greg Kroah-HartmanFrom: Pu Lehui <[email protected]>
[ Upstream commit 34de8e6e0e1f66e431abf4123934a2581cb5f133 ]
When using bpftool to pin {PROG, MAP, LINK} without FILE, segmentation fault will occur. The reson is that the lack of FILE will cause strlen to trigger NULL pointer dereference. The corresponding stacktrace is shown below:
do_pin
do_pin_any
do_pin_fd
mount_bpffs_for_pin
strlen(name) <- NULL pointer dereference
Fix it by adding validation to the common process.
--- tools/bpf/bpftool/common.c | 3 +++ 1 file changed, 3 insertions(+)
tools/bpf/bpftool/common.c +3 -0
@@ -300,6 +300,9 @@ int do_pin_any(int argc, char **argv, int (*get_fd)(int *, char ***))int err;int fd; +if (!REQ_ARGS (3 )) +return -EINVAL ; + fd =get_fd (&argc, &argv);if (fd <0 )return fd;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 28/190 HID: hyperv: fix possible memory leak in mousevsc_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit b5bcb94b0954a026bbd671741fdb00e7141f9c91 ]
If hid_add_device() returns error, it should call hid_destroy_device() to free hid_dev which is allocated in hid_allocate_device().
--- drivers/hid/hid-hyperv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/hid-hyperv.c +1 -1
@@ -499,7 +499,7 @@ static int mousevsc_probe(struct hv_device *device, ret =hid_add_device (hid_dev);if (ret) - goto probe_err1; + goto probe_err2; ret =hid_parse (hid_dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 29/190 drm/vc4: hdmi: Fix HSM clock too low on Pi4
In reply to Greg Kroah-HartmanFrom: [email protected] <[email protected]>
[ Upstream commit 3bc6a37f59f21a8bfaf74d0975b2eb0b2d52a065 ]
Commit ae71ab585c81 ("drm/vc4: hdmi: Enforce the minimum rate at runtime_resume") reintroduced the call to clk_set_min_rate in an attempt to fix the boot without a monitor connected on the RaspberryPi3.
However, that introduced a regression breaking the display output entirely (black screen but no vblank timeout) on the Pi4.
This is due to the fact that we now have in a typical modeset at boot, in vc4_hdmi_encoder_pre_crtc_configure(), we have a first call to clk_set_min_rate() asking for the minimum rate of the HSM clock for our given resolution, and then a call to pm_runtime_resume_and_get(). We will thus execute vc4_hdmi_runtime_resume() which, since the commit mentioned above, will call clk_set_min_rate() a second time with the absolute minimum rate we want to enforce on the HSM clock.
We're thus effectively erasing the minimum mandated by the mode we're trying to set. The fact that only the Pi4 is affected is due to the fact that it uses a different clock driver that tries to minimize the HSM clock at all time. It will thus lower the HSM clock rate to 120MHz on the second clk_set_min_rate() call.
The Pi3 doesn't use the same driver and will not change the frequency on the second clk_set_min_rate() call since it's still within the new boundaries and it doesn't have the code to minimize the clock rate as needed. So even though the boundaries are still off, the clock rate is still the right one for our given mode, so everything works.
There is a lot of moving parts, so I couldn't find any obvious solution:
- Reverting the original is not an option, as that would break the Pi3 again.
- We can't move the clk_set_min_rate() call in _pre_crtc_configure() since because, on the Pi3, the HSM clock has the CLK_SET_RATE_GATE flag which prevents the clock rate from being changed after it's been enabled. Our calls to clk_set_min_rate() can change it, so they need to be done before clk_prepare_enable().
- We can't remove the call to clk_prepare_enable() from the runtime_resume hook to put it into _pre_crtc_configure() either, since we need that clock to be enabled to access the registers, and we can't count on the fact that the display will be active in all situations (doing any CEC operation, or listing the modes while inactive are valid for example()).
- We can't drop the call to clk_set_min_rate() in _pre_crtc_configure() since we would need to still enforce the minimum rate for a given resolution, and runtime_resume doesn't have access to the current mode, if there's any.
- We can't copy the TMDS character rate into vc4_hdmi and reuse it since, because it's part of the KMS atomic state, it needs to be protected by a mutex. Unfortunately, some functions (CEC operations, mostly) can be reentrant (through the CEC framework) and still need a pm_runtime_get.
However, we can work around this issue by leveraging the fact that the clk_set_min_rate() calls set boundaries for its given struct clk, and that each different clk_get() call will return a different instance of struct clk. The clock framework will then aggregate the boundaries for each struct clk instances linked to a given clock, plus its hardware boundaries, and will use that.
We can thus get an extra HSM clock user for runtime_pm use only, and use our different clock instances depending on the context: runtime_pm will use its own to set the absolute minimum clock setup so that we never lock the CPU waiting for a register access, and the modeset part will set its requirement for the current resolution. And we let the CCF do the coordination.
It's not an ideal solution, but it's fairly unintrusive and doesn't really change any part of the logic so it looks like a rather safe fix.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 21 +++++++++++++++++---- drivers/gpu/drm/vc4/vc4_hdmi.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +17 -4
@@ -2712,9 +2712,16 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)DRM_ERROR ("Failed to get HDMI state machine clock\n" );return PTR_ERR (vc4_hdmi->hsm_clock); } + vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock; vc4_hdmi->cec_clock = vc4_hdmi->hsm_clock; + vc4_hdmi->hsm_rpm_clock =devm_clk_get (dev,"hdmi" ); +if (IS_ERR (vc4_hdmi->hsm_rpm_clock)) { +DRM_ERROR ("Failed to get HDMI state machine clock\n" ); +return PTR_ERR (vc4_hdmi->hsm_rpm_clock); + } +return 0 ; }
@@ -2796,6 +2803,12 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)return PTR_ERR (vc4_hdmi->hsm_clock); } + vc4_hdmi->hsm_rpm_clock =devm_clk_get (dev,"hdmi" ); +if (IS_ERR (vc4_hdmi->hsm_rpm_clock)) { +DRM_ERROR ("Failed to get HDMI state machine clock\n" ); +return PTR_ERR (vc4_hdmi->hsm_rpm_clock); + } + vc4_hdmi->pixel_bvb_clock =devm_clk_get (dev,"bvb" );if (IS_ERR (vc4_hdmi->pixel_bvb_clock)) {DRM_ERROR ("Failed to get pixel bvb clock\n" );
@@ -2859,7 +2872,7 @@ static int vc4_hdmi_runtime_suspend(struct device *dev) {struct vc4_hdmi *vc4_hdmi =dev_get_drvdata (dev); -clk_disable_unprepare (vc4_hdmi->hsm_clock); +clk_disable_unprepare (vc4_hdmi->hsm_rpm_clock);return 0 ; }
@@ -2877,11 +2890,11 @@ static int vc4_hdmi_runtime_resume(struct device *dev)* its frequency while the power domain is active so that it * keeps its rate. */ - ret =clk_set_min_rate (vc4_hdmi->hsm_clock,HSM_MIN_CLOCK_FREQ ); + ret =clk_set_min_rate (vc4_hdmi->hsm_rpm_clock,HSM_MIN_CLOCK_FREQ );if (ret)return ret; - ret =clk_prepare_enable (vc4_hdmi->hsm_clock); + ret =clk_prepare_enable (vc4_hdmi->hsm_rpm_clock);if (ret)return ret;
@@ -2894,7 +2907,7 @@ static int vc4_hdmi_runtime_resume(struct device *dev)* case, it will lead to a silent CPU stall. Let's make sure we * prevent such a case. */ - rate =clk_get_rate (vc4_hdmi->hsm_clock); + rate =clk_get_rate (vc4_hdmi->hsm_rpm_clock);if (!rate) { ret = -EINVAL ; goto err_disable_clk;
drivers/gpu/drm/vc4/vc4_hdmi.h +1 -0
@@ -171,6 +171,7 @@ struct vc4_hdmi {struct clk *cec_clock;struct clk *pixel_clock;struct clk *hsm_clock; +struct clk *hsm_rpm_clock;struct clk *audio_clock;struct clk *pixel_bvb_clock;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 30/190 bpf, sock_map: Move cancel_work_sync() out of sock lock
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
[ Upstream commit 8bbabb3fddcd0f858be69ed5abc9b470a239d6f2 ]
Stanislav reported a lockdep warning, which is caused by the cancel_work_sync() called inside sock_map_close(), as analyzed below by Jakub:
psock->work.func = sk_psock_backlog()
ACQUIRE psock->work_mutex
sk_psock_handle_skb()
skb_send_sock()
__skb_send_sock()
sendpage_unlocked()
kernel_sendpage()
sock->ops->sendpage = inet_sendpage()
sk->sk_prot->sendpage = tcp_sendpage()
ACQUIRE sk->sk_lock
tcp_sendpage_locked()
RELEASE sk->sk_lock RELEASE psock->work_mutex
sock_map_close()
ACQUIRE sk->sk_lock
sk_psock_stop()
sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED)
cancel_work_sync()
__cancel_work_timer()
__flush_work()
// wait for psock->work to finish RELEASE sk->sk_lock
We can move the cancel_work_sync() out of the sock lock protection, but still before saved_close() was called.
--- include/linux/skmsg.h | 2 +- net/core/skmsg.c | 7 ++----- net/core/sock_map.c | 7 ++++--- 3 files changed, 7 insertions(+), 9 deletions(-)
include/linux/skmsg.h +1 -1
@@ -376,7 +376,7 @@ static inline void sk_psock_report_error(struct sk_psock *psock, int err) }struct sk_psock *sk_psock_init (struct sock *sk,int node); -void sk_psock_stop (struct sk_psock *psock,bool wait); +void sk_psock_stop (struct sk_psock *psock);#if IS_ENABLED (CONFIG_BPF_STREAM_PARSER )int sk_psock_init_strp (struct sock *sk,struct sk_psock *psock);
net/core/skmsg.c +2 -5
@@ -803,16 +803,13 @@ static void sk_psock_link_destroy(struct sk_psock *psock) } } -void sk_psock_stop (struct sk_psock *psock,bool wait) +void sk_psock_stop (struct sk_psock *psock) {spin_lock_bh (&psock->ingress_lock);sk_psock_clear_state (psock,SK_PSOCK_TX_ENABLED );sk_psock_cork_free (psock);__sk_psock_zap_ingress (psock);spin_unlock_bh (&psock->ingress_lock); - -if (wait) -cancel_work_sync (&psock->work); }static void sk_psock_done_strp (struct sk_psock *psock);
@@ -850,7 +847,7 @@ void sk_psock_drop(struct sock *sk, struct sk_psock *psock)sk_psock_stop_verdict (sk, psock);write_unlock_bh (&sk->sk_callback_lock); -sk_psock_stop (psock, false); +sk_psock_stop (psock);INIT_RCU_WORK (&psock->rwork, sk_psock_destroy);queue_rcu_work (system_wq, &psock->rwork);
net/core/sock_map.c +4 -3
@@ -1596,7 +1596,7 @@ void sock_map_destroy(struct sock *sk) saved_destroy = psock->saved_destroy;sock_map_remove_links (sk, psock);rcu_read_unlock (); -sk_psock_stop (psock, false); +sk_psock_stop (psock);sk_psock_put (sk, psock);saved_destroy (sk); }
@@ -1619,9 +1619,10 @@ void sock_map_close(struct sock *sk, long timeout) saved_close = psock->saved_close;sock_map_remove_links (sk, psock);rcu_read_unlock (); -sk_psock_stop (psock, true); -sk_psock_put (sk, psock); +sk_psock_stop (psock);release_sock (sk); +cancel_work_sync (&psock->work); +sk_psock_put (sk, psock);saved_close (sk, timeout); }EXPORT_SYMBOL_GPL (sock_map_close);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 31/190 PCI: hv: Fix the definition of vector in hv_compose_msi_msg()
In reply to Greg Kroah-HartmanFrom: Dexuan Cui <[email protected]>
[ Upstream commit e70af8d040d2b7904dca93d942ba23fb722e21b1 ]
The local variable 'vector' must be u32 rather than u8: see the struct hv_msi_desc3.
'vector_count' should be u16 rather than u8: see struct hv_msi_desc, hv_msi_desc2 and hv_msi_desc3.
--- drivers/pci/controller/pci-hyperv.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/pci/controller/pci-hyperv.c +16 -6
@@ -1614,7 +1614,7 @@ static void hv_pci_compose_compl(void *context, struct pci_response *resp,static u32 hv_compose_msi_req_v1 (struct pci_create_interrupt *int_pkt,const struct cpumask *affinity, -u32 slot,u8 vector,u8 vector_count) +u32 slot,u8 vector,u16 vector_count) { int_pkt->message_type.type =PCI_CREATE_INTERRUPT_MESSAGE ; int_pkt->wslot.slot = slot;
@@ -1642,7 +1642,7 @@ static int hv_compose_msi_req_get_cpu(const struct cpumask *affinity)static u32 hv_compose_msi_req_v2 (struct pci_create_interrupt2 *int_pkt,const struct cpumask *affinity, -u32 slot,u8 vector,u8 vector_count) +u32 slot,u8 vector,u16 vector_count) {int cpu;
@@ -1661,7 +1661,7 @@ static u32 hv_compose_msi_req_v2(static u32 hv_compose_msi_req_v3 (struct pci_create_interrupt3 *int_pkt,const struct cpumask *affinity, -u32 slot,u32 vector,u8 vector_count) +u32 slot,u32 vector,u16 vector_count) {int cpu;
@@ -1701,7 +1701,12 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)struct compose_comp_ctxt comp;struct tran_int_desc *int_desc;struct msi_desc *msi_desc; -u8 vector, vector_count; +/* +* vector_count should be u16: see hv_msi_desc, hv_msi_desc2 +* and hv_msi_desc3. vector must be u32: see hv_msi_desc3. +*/ +u16 vector_count; +u32 vector; struct { struct pci_packet pci_pkt; union {
@@ -1767,6 +1772,11 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) vector_count =1 ; } +/* +* hv_compose_msi_req_v1 and v2 are for x86 only, meaning 'vector' +* can't exceed u8. Cast 'vector' down to u8 for v1/v2 explicitly +* for better readability. +*/ memset (&ctxt,0 ,sizeof (ctxt));init_completion (&comp.comp_pkt.host_event); ctxt.pci_pkt.completion_func = hv_pci_compose_compl;
@@ -1777,7 +1787,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) size =hv_compose_msi_req_v1 (&ctxt.int_pkts.v1, dest, hpdev->desc.win_slot.slot, - vector, + (u8 )vector, vector_count);break ;
@@ -1786,7 +1796,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) size =hv_compose_msi_req_v2 (&ctxt.int_pkts.v2, dest, hpdev->desc.win_slot.slot, - vector, + (u8 )vector, vector_count);break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 32/190 bpf: Add helper macro bpf_for_each_reg_in_vstate
In reply to Greg Kroah-HartmanFrom: Kumar Kartikeya Dwivedi <[email protected]>
[ Upstream commit b239da34203f49c40b5d656220c39647c3ff0b3c ]
For a lot of use cases in future patches, we will want to modify the state of registers part of some same 'group' (e.g. same ref_obj_id). It won't just be limited to releasing reference state, but setting a type flag dynamically based on certain actions, etc.
Hence, we need a way to easily pass a callback to the function that iterates over all registers in current bpf_verifier_state in all frames upto (and including) the curframe.
While in C++ we would be able to easily use a lambda to pass state and the callback together, sadly we aren't using C++ in the kernel. The next best thing to avoid defining a function for each case seems like statement expressions in GNU C. The kernel already uses them heavily, hence they can passed to the macro in the style of a lambda. The statement expression will then be substituted in the for loop bodies.
Variables __state and __reg are set to current bpf_func_state and reg for each invocation of the expression inside the passed in verifier state.
Then, convert mark_ptr_or_null_regs, clear_all_pkt_pointers, release_reference, find_good_pkt_pointers, find_equal_scalars to use bpf_for_each_reg_in_vstate.
Stable-dep-of: f1db20814af5 ("bpf: Fix wrong reg type conversion in release_reference()")
--- include/linux/bpf_verifier.h | 21 ++++++ kernel/bpf/verifier.c | 135 ++++++++--------------------------- 2 files changed, 49 insertions(+), 107 deletions(-)
include/linux/bpf_verifier.h +21 -0
@@ -348,6 +348,27 @@ struct bpf_verifier_state { iter < frame->allocated_stack /BPF_REG_SIZE ; \ iter++, reg = bpf_get_spilled_reg(iter, frame)) +/* Invoke __expr over regsiters in __vst, setting __state and __reg */ +#define bpf_for_each_reg_in_vstate (__vst, __state, __reg, __expr) \ + ({ \ + struct bpf_verifier_state *___vstate = __vst; \ + int ___i, ___j; \ + for (___i = 0; ___i <= ___vstate->curframe; ___i++) { \ + struct bpf_reg_state *___regs; \ + __state = ___vstate->frame[___i]; \ + ___regs = __state->regs; \ + for (___j = 0; ___j < MAX_BPF_REG; ___j++) { \ + __reg = &___regs[___j]; \ + (void)(__expr); \ + } \ + bpf_for_each_spilled_reg(___j, __state, __reg) { \ + if (!__reg) \ + continue; \ + (void)(__expr); \ + } \ + } \ + }) +/* linked list of verifier states used to prune search */ struct bpf_verifier_state_list {struct bpf_verifier_state state;
kernel/bpf/verifier.c +28 -107
213 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 33/190 bpf: Fix wrong reg type conversion in release_reference()
In reply to Greg Kroah-HartmanFrom: Youlin Li <[email protected]>
[ Upstream commit f1db20814af532f85e091231223e5e4818e8464b ]
Some helper functions will allocate memory. To avoid memory leaks, the verifier requires the eBPF program to release these memories by calling the corresponding helper functions.
When a resource is released, all pointer registers corresponding to the resource should be invalidated. The verifier use release_references() to do this job, by apply __mark_reg_unknown() to each relevant register.
It will give these registers the type of SCALAR_VALUE. A register that will contain a pointer value at runtime, but of type SCALAR_VALUE, which may allow the unprivileged user to get a kernel pointer by storing this register into a map.
Using __mark_reg_not_init() while NOT allow_ptr_leaks can mitigate this problem.
--- kernel/bpf/verifier.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +6 -2
@@ -6552,8 +6552,12 @@ static int release_reference(struct bpf_verifier_env *env,return err;bpf_for_each_reg_in_vstate (env->cur_state, state, reg, ({ -if (reg->ref_obj_id == ref_obj_id) -__mark_reg_unknown (env, reg); +if (reg->ref_obj_id == ref_obj_id) { +if (!env->allow_ptr_leaks) +__mark_reg_not_init (env, reg); +else +__mark_reg_unknown (env, reg); + } }));return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 34/190 net: gso: fix panic on frag_list with mixed head alloc types
In reply to Greg Kroah-HartmanFrom: Jiri Benc <[email protected]>
[ Upstream commit 9e4b7a99a03aefd37ba7bb1f022c8efab5019165 ]
Since commit 3dcbdb134f32 ("net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list"), it is allowed to change gso_size of a GRO packet. However, that commit assumes that "checking the first list_skb member suffices; i.e if either of the list_skb members have non head_frag head, then the first one has too".
It turns out this assumption does not hold. We've seen BUG_ON being hit in skb_segment when skbs on the frag_list had differing head_frag with the vmxnet3 driver. This happens because __netdev_alloc_skb and __napi_alloc_skb can return a skb that is page backed or kmalloced depending on the requested size. As the result, the last small skb in the GRO packet can be kmalloced.
There are three different locations where this can be fixed:
(1) We could check head_frag in GRO and not allow GROing skbs with different head_frag. However, that would lead to performance regression on normal forward paths with unmodified gso_size, where !head_frag in the last packet is not a problem.
(2) Set a flag in bpf_skb_net_grow and bpf_skb_net_shrink indicating that NETIF_F_SG is undesirable. That would need to eat a bit in sk_buff. Furthermore, that flag can be unset when all skbs on the frag_list are page backed. To retain good performance, bpf_skb_net_grow/shrink would have to walk the frag_list.
(3) Walk the frag_list in skb_segment when determining whether NETIF_F_SG should be cleared. This of course slows things down.
This patch implements (3). To limit the performance impact in skb_segment, the list is walked only for skbs with SKB_GSO_DODGY set that have gso_size changed. Normal paths thus will not hit it.
We could check only the last skb but since we need to walk the whole list anyway, let's stay on the safe side.
--- net/core/skbuff.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-)
net/core/skbuff.c +19 -17
@@ -4031,23 +4031,25 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,int i =0 ;int pos; -if (list_skb && !list_skb->head_frag &&skb_headlen (list_skb) && - (skb_shinfo (head_skb)->gso_type &SKB_GSO_DODGY )) { -/* gso_size is untrusted, and we have a frag_list with a linear -* non head_frag head. -* -* (we assume checking the first list_skb member suffices; -* i.e if either of the list_skb members have non head_frag -* head, then the first one has too). -* -* If head_skb's headlen does not fit requested gso_size, it -* means that the frag_list members do NOT terminate on exact -* gso_size boundaries. Hence we cannot perform skb_frag_t page -* sharing. Therefore we must fallback to copying the frag_list -* skbs; we do so by disabling SG. -*/ -if (mss !=GSO_BY_FRAGS && mss !=skb_headlen (head_skb)) - features &= ~NETIF_F_SG ; +if ((skb_shinfo (head_skb)->gso_type &SKB_GSO_DODGY ) && + mss !=GSO_BY_FRAGS && mss !=skb_headlen (head_skb)) { +struct sk_buff *check_skb; + +for (check_skb = list_skb; check_skb; check_skb = check_skb->next) { +if (skb_headlen (check_skb) && !check_skb->head_frag) { +/* gso_size is untrusted, and we have a frag_list with +* a linear non head_frag item. +* +* If head_skb's headlen does not fit requested gso_size, +* it means that the frag_list members do NOT terminate +* on exact gso_size boundaries. Hence we cannot perform +* skb_frag_t page sharing. Therefore we must fallback to +* copying the frag_list skbs; we do so by disabling SG. +*/ + features &= ~NETIF_F_SG ; +break ; + } + } }__skb_push (head_skb, doffset);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 35/190 macsec: delete new rxsc when offload fails
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 93a30947821c203d08865c4e17ea181c9668ce52 ]
Currently we get an inconsistent state:
- netlink returns the error to userspace
- the RXSC is installed but not offloaded
Then the device could get confused when we try to add an RXSA, because the RXSC isn't supposed to exist.
--- drivers/net/macsec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/macsec.c +2 -3
@@ -1904,7 +1904,6 @@ static int macsec_add_rxsc(struct sk_buff *skb, struct genl_info *info)struct macsec_rx_sc *rx_sc;struct nlattr *tb_rxsc[MACSEC_RXSC_ATTR_MAX +1 ];struct macsec_secy *secy; -bool was_active;int ret;if (!attrs[MACSEC_ATTR_IFINDEX ])
@@ -1932,7 +1931,6 @@ static int macsec_add_rxsc(struct sk_buff *skb, struct genl_info *info)return PTR_ERR (rx_sc); } - was_active = rx_sc->active;if (tb_rxsc[MACSEC_RXSC_ATTR_ACTIVE ]) rx_sc->active = !!nla_get_u8 (tb_rxsc[MACSEC_RXSC_ATTR_ACTIVE ]);
@@ -1959,7 +1957,8 @@ static int macsec_add_rxsc(struct sk_buff *skb, struct genl_info *info)return 0 ; cleanup: - rx_sc->active = was_active; +del_rx_sc (secy, sci); +free_rx_sc (rx_sc);rtnl_unlock ();return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 36/190 macsec: fix secy->n_rx_sc accounting
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 73a4b31c9d11f98ae3bc5286d5382930adb0e9c7 ]
secy->n_rx_sc is supposed to be the number of _active_ rxsc's within a secy. This is then used by macsec_send_sci to help decide if we should add the SCI to the header or not.
This logic is currently broken when we create a new RXSC and turn it off at creation, as create_rx_sc always sets ->active to true (and immediately uses that to increment n_rx_sc), and only later macsec_add_rxsc sets rx_sc->active.
--- drivers/net/macsec.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/macsec.c +8 -6
@@ -1427,7 +1427,8 @@ static struct macsec_rx_sc *del_rx_sc(struct macsec_secy *secy, sci_t sci)return NULL ; } -static struct macsec_rx_sc *create_rx_sc (struct net_device *dev,sci_t sci) +static struct macsec_rx_sc *create_rx_sc (struct net_device *dev,sci_t sci, +bool active) {struct macsec_rx_sc *rx_sc;struct macsec_dev *macsec;
@@ -1451,7 +1452,7 @@ static struct macsec_rx_sc *create_rx_sc(struct net_device *dev, sci_t sci) } rx_sc->sci = sci; - rx_sc->active = true; + rx_sc->active = active;refcount_set (&rx_sc->refcnt,1 ); secy = &macsec_priv (dev)->secy;
@@ -1904,6 +1905,7 @@ static int macsec_add_rxsc(struct sk_buff *skb, struct genl_info *info)struct macsec_rx_sc *rx_sc;struct nlattr *tb_rxsc[MACSEC_RXSC_ATTR_MAX +1 ];struct macsec_secy *secy; +bool active = true;int ret;if (!attrs[MACSEC_ATTR_IFINDEX ])
@@ -1925,15 +1927,15 @@ static int macsec_add_rxsc(struct sk_buff *skb, struct genl_info *info) secy = &macsec_priv (dev)->secy; sci =nla_get_sci (tb_rxsc[MACSEC_RXSC_ATTR_SCI ]); - rx_sc =create_rx_sc (dev, sci); +if (tb_rxsc[MACSEC_RXSC_ATTR_ACTIVE ]) + active =nla_get_u8 (tb_rxsc[MACSEC_RXSC_ATTR_ACTIVE ]); + + rx_sc =create_rx_sc (dev, sci, active);if (IS_ERR (rx_sc)) {rtnl_unlock ();return PTR_ERR (rx_sc); } -if (tb_rxsc[MACSEC_RXSC_ATTR_ACTIVE ]) - rx_sc->active = !!nla_get_u8 (tb_rxsc[MACSEC_RXSC_ATTR_ACTIVE ]); -if (macsec_is_offloaded (netdev_priv (dev))) {const struct macsec_ops *ops;struct macsec_context ctx;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 37/190 macsec: fix detection of RXSCs when toggling offloading
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit 80df4706357a5a06bbbc70273bf2611df1ceee04 ]
macsec_is_configured incorrectly uses secy->n_rx_sc to check if some RXSCs exist. secy->n_rx_sc only counts the number of active RXSCs, but there can also be inactive SCs as well, which may be stored in the driver (in case we're disabling offloading), or would have to be pushed to the device (in case we're trying to enable offloading).
As long as RXSCs active on creation and never turned off, the issue is not visible.
--- drivers/net/macsec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/macsec.c +1 -1
@@ -2599,7 +2599,7 @@ static bool macsec_is_configured(struct macsec_dev *macsec)struct macsec_tx_sc *tx_sc = &secy->tx_sc;int i; -if (secy->n_rx_sc >0 ) +if (secy->rx_sc)return true;for (i =0 ; i <MACSEC_NUM_AN ; i++)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 38/190 macsec: clear encryption keys from the stack after setting up offload
In reply to Greg Kroah-HartmanFrom: Sabrina Dubroca <[email protected]>
[ Upstream commit aaab73f8fba4fd38f4d2617440d541a1c334e819 ]
macsec_add_rxsa and macsec_add_txsa copy the key to an on-stack offloading context to pass it to the drivers, but leaves it there when it's done. Clear it with memzero_explicit as soon as it's not needed anymore.
--- drivers/net/macsec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/macsec.c +2 -0
@@ -1861,6 +1861,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info) secy->key_len); err =macsec_offload (ops->mdo_add_rxsa, &ctx); +memzero_explicit (ctx.sa.key, secy->key_len);if (err) goto cleanup; }
@@ -2103,6 +2104,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info) secy->key_len); err =macsec_offload (ops->mdo_add_txsa, &ctx); +memzero_explicit (ctx.sa.key, secy->key_len);if (err) goto cleanup; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 39/190 octeontx2-pf: NIX TX overwrites SQ_CTX_HW_S[SQ_INT]
In reply to Greg Kroah-HartmanFrom: Ratheesh Kannoth <[email protected]>
[ Upstream commit 51afe9026d0c63263abe9840e629f118d7405b36 ]
In scenarios where multiple errors have occurred for a SQ before SW starts handling error interrupt, SQ_CTX[OP_INT] may get overwritten leading to NIX_LF_SQ_OP_INT returning incorrect value.
To workaround this read LMT, MNQ and SQ individual error status registers to determine the cause of error.
--- .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 135 ++++++++++++++---- .../marvell/octeontx2/nic/otx2_struct.h | 57 ++++++++ 2 files changed, 162 insertions(+), 30 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +105 -30
@@ -15,6 +15,7 @@#include <net/ip.h> #include <linux/bpf.h> #include <linux/bpf_trace.h> +#include <linux/bitfield.h> #include "otx2_reg.h" #include "otx2_common.h"
@@ -1161,6 +1162,59 @@ int otx2_set_real_num_queues(struct net_device *netdev, }EXPORT_SYMBOL (otx2_set_real_num_queues); +static char *nix_sqoperr_e_str[NIX_SQOPERR_MAX ] = { +"NIX_SQOPERR_OOR" , +"NIX_SQOPERR_CTX_FAULT" , +"NIX_SQOPERR_CTX_POISON" , +"NIX_SQOPERR_DISABLED" , +"NIX_SQOPERR_SIZE_ERR" , +"NIX_SQOPERR_OFLOW" , +"NIX_SQOPERR_SQB_NULL" , +"NIX_SQOPERR_SQB_FAULT" , +"NIX_SQOPERR_SQE_SZ_ZERO" , +}; + +static char *nix_mnqerr_e_str[NIX_MNQERR_MAX ] = { +"NIX_MNQERR_SQ_CTX_FAULT" , +"NIX_MNQERR_SQ_CTX_POISON" , +"NIX_MNQERR_SQB_FAULT" , +"NIX_MNQERR_SQB_POISON" , +"NIX_MNQERR_TOTAL_ERR" , +"NIX_MNQERR_LSO_ERR" , +"NIX_MNQERR_CQ_QUERY_ERR" , +"NIX_MNQERR_MAX_SQE_SIZE_ERR" , +"NIX_MNQERR_MAXLEN_ERR" , +"NIX_MNQERR_SQE_SIZEM1_ZERO" , +}; + +static char *nix_snd_status_e_str[NIX_SND_STATUS_MAX ] = { +"NIX_SND_STATUS_GOOD" , +"NIX_SND_STATUS_SQ_CTX_FAULT" , +"NIX_SND_STATUS_SQ_CTX_POISON" , +"NIX_SND_STATUS_SQB_FAULT" , +"NIX_SND_STATUS_SQB_POISON" , +"NIX_SND_STATUS_HDR_ERR" , +"NIX_SND_STATUS_EXT_ERR" , +"NIX_SND_STATUS_JUMP_FAULT" , +"NIX_SND_STATUS_JUMP_POISON" , +"NIX_SND_STATUS_CRC_ERR" , +"NIX_SND_STATUS_IMM_ERR" , +"NIX_SND_STATUS_SG_ERR" , +"NIX_SND_STATUS_MEM_ERR" , +"NIX_SND_STATUS_INVALID_SUBDC" , +"NIX_SND_STATUS_SUBDC_ORDER_ERR" , +"NIX_SND_STATUS_DATA_FAULT" , +"NIX_SND_STATUS_DATA_POISON" , +"NIX_SND_STATUS_NPC_DROP_ACTION" , +"NIX_SND_STATUS_LOCK_VIOL" , +"NIX_SND_STATUS_NPC_UCAST_CHAN_ERR" , +"NIX_SND_STATUS_NPC_MCAST_CHAN_ERR" , +"NIX_SND_STATUS_NPC_MCAST_ABORT" , +"NIX_SND_STATUS_NPC_VTAG_PTR_ERR" , +"NIX_SND_STATUS_NPC_VTAG_SIZE_ERR" , +"NIX_SND_STATUS_SEND_STATS_ERR" , +}; +static irqreturn_t otx2_q_intr_handler (int irq,void *data) {struct otx2_nic *pf = data;
@@ -1194,46 +1248,67 @@ static irqreturn_t otx2_q_intr_handler(int irq, void *data)/* SQ */ for (qidx =0 ; qidx < pf->hw.tot_tx_queues; qidx++) { +u64 sq_op_err_dbg, mnq_err_dbg, snd_err_dbg; +u8 sq_op_err_code, mnq_err_code, snd_err_code; + +/* Below debug registers captures first errors corresponding to +* those registers. We don't have to check against SQ qid as +* these are fatal errors. +*/ + ptr =otx2_get_regaddr (pf,NIX_LF_SQ_OP_INT ); val =otx2_atomic64_add ((qidx <<44 ), ptr);otx2_write64 (pf,NIX_LF_SQ_OP_INT , (qidx <<44 ) | (val &NIX_SQINT_BITS )); -if (!(val & (NIX_SQINT_BITS |BIT_ULL (42 )))) -continue ; -if (val &BIT_ULL (42 )) {netdev_err (pf->netdev,"SQ%lld: error reading NIX_LF_SQ_OP_INT, NIX_LF_ERR_INT 0x%llx\n" , qidx,otx2_read64 (pf,NIX_LF_ERR_INT )); - }else { -if (val &BIT_ULL (NIX_SQINT_LMT_ERR )) { -netdev_err (pf->netdev,"SQ%lld: LMT store error NIX_LF_SQ_OP_ERR_DBG:0x%llx" , - qidx, -otx2_read64 (pf, -NIX_LF_SQ_OP_ERR_DBG )); -otx2_write64 (pf,NIX_LF_SQ_OP_ERR_DBG , -BIT_ULL (44 )); - } -if (val &BIT_ULL (NIX_SQINT_MNQ_ERR )) { -netdev_err (pf->netdev,"SQ%lld: Meta-descriptor enqueue error NIX_LF_MNQ_ERR_DGB:0x%llx\n" , - qidx, -otx2_read64 (pf,NIX_LF_MNQ_ERR_DBG )); -otx2_write64 (pf,NIX_LF_MNQ_ERR_DBG , -BIT_ULL (44 )); - } -if (val &BIT_ULL (NIX_SQINT_SEND_ERR )) { -netdev_err (pf->netdev,"SQ%lld: Send error, NIX_LF_SEND_ERR_DBG 0x%llx" , - qidx, -otx2_read64 (pf, -NIX_LF_SEND_ERR_DBG )); -otx2_write64 (pf,NIX_LF_SEND_ERR_DBG , -BIT_ULL (44 )); - } -if (val &BIT_ULL (NIX_SQINT_SQB_ALLOC_FAIL )) -netdev_err (pf->netdev,"SQ%lld: SQB allocation failed" , - qidx); + goto done; } + sq_op_err_dbg =otx2_read64 (pf,NIX_LF_SQ_OP_ERR_DBG ); +if (!(sq_op_err_dbg &BIT (44 ))) + goto chk_mnq_err_dbg; + + sq_op_err_code =FIELD_GET (GENMASK (7 ,0 ), sq_op_err_dbg); +netdev_err (pf->netdev,"SQ%lld: NIX_LF_SQ_OP_ERR_DBG(%llx) err=%s\n" , + qidx, sq_op_err_dbg, nix_sqoperr_e_str[sq_op_err_code]); + +otx2_write64 (pf,NIX_LF_SQ_OP_ERR_DBG ,BIT_ULL (44 )); + +if (sq_op_err_code ==NIX_SQOPERR_SQB_NULL ) + goto chk_mnq_err_dbg; + +/* Err is not NIX_SQOPERR_SQB_NULL, call aq function to read SQ structure. +* TODO: But we are in irq context. How to call mbox functions which does sleep +*/ + +chk_mnq_err_dbg: + mnq_err_dbg =otx2_read64 (pf,NIX_LF_MNQ_ERR_DBG ); +if (!(mnq_err_dbg &BIT (44 ))) + goto chk_snd_err_dbg; + + mnq_err_code =FIELD_GET (GENMASK (7 ,0 ), mnq_err_dbg); +netdev_err (pf->netdev,"SQ%lld: NIX_LF_MNQ_ERR_DBG(%llx) err=%s\n" , + qidx, mnq_err_dbg, nix_mnqerr_e_str[mnq_err_code]); +otx2_write64 (pf,NIX_LF_MNQ_ERR_DBG ,BIT_ULL (44 )); + +chk_snd_err_dbg: + snd_err_dbg =otx2_read64 (pf,NIX_LF_SEND_ERR_DBG ); +if (snd_err_dbg &BIT (44 )) { + snd_err_code =FIELD_GET (GENMASK (7 ,0 ), snd_err_dbg); +netdev_err (pf->netdev,"SQ%lld: NIX_LF_SND_ERR_DBG:0x%llx err=%s\n" , + qidx, snd_err_dbg, nix_snd_status_e_str[snd_err_code]); +otx2_write64 (pf,NIX_LF_SEND_ERR_DBG ,BIT_ULL (44 )); + } + +done: +/* Print values and reset */ +if (val &BIT_ULL (NIX_SQINT_SQB_ALLOC_FAIL )) +netdev_err (pf->netdev,"SQ%lld: SQB allocation failed" , + qidx); +schedule_work (&pf->reset_task); }
drivers/net/ethernet/marvell/octeontx2/nic/otx2_struct.h +57 -0
61 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 40/190 net: tun: Fix memory leaks of napi_get_frags
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit 1118b2049d77ca0b505775fc1a8d1909cf19a7ec ]
kmemleak reports after running test_progs:
unreferenced object 0xffff8881b1672dc0 (size 232):
comm "test_progs", pid 394388, jiffies 4354712116 (age 841.975s) hex dump (first 32 bytes):
e0 84 d7 a8 81 88 ff ff 80 2c 67 b1 81 88 ff ff .........,g.....
00 40 c5 9b 81 88 ff ff 00 00 00 00 00 00 00 00 .@..............
backtrace:
[<00000000c8f01748>] napi_skb_cache_get+0xd4/0x150
[<0000000041c7fc09>] __napi_build_skb+0x15/0x50
[<00000000431c7079>] __napi_alloc_skb+0x26e/0x540
[<000000003ecfa30e>] napi_get_frags+0x59/0x140
[<0000000099b2199e>] tun_get_user+0x183d/0x3bb0 [tun]
[<000000008a5adef0>] tun_chr_write_iter+0xc0/0x1b1 [tun]
[<0000000049993ff4>] do_iter_readv_writev+0x19f/0x320
[<000000008f338ea2>] do_iter_write+0x135/0x630
[<000000008a3377a4>] vfs_writev+0x12e/0x440
[<00000000a6b5639a>] do_writev+0x104/0x280
[<00000000ccf065d8>] do_syscall_64+0x3b/0x90
[<00000000d776e329>] entry_SYSCALL_64_after_hwframe+0x63/0xcdThe issue occurs in the following scenarios:tun_get_user()
napi_gro_frags()
napi_frags_finish()
case GRO_NORMAL:
gro_normal_one()
list_add_tail(&skb->list, &napi->rx_list);
<-- While napi->rx_count < READ_ONCE(gro_normal_batch),
<-- gro_normal_list() is not called, napi->rx_list is not empty <-- not ask to complete the gro work, will cause memory leaks in <-- following tun_napi_del()
...tun_napi_del()
netif_napi_del()
__netif_napi_del()
<-- &napi->rx_list is not empty, which caused memory leaksTo fix, add napi_complete() after napi_gro_frags().
--- drivers/net/tun.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/tun.c +1 -0
@@ -1977,6 +1977,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,local_bh_disable ();napi_gro_frags (&tfile->napi); +napi_complete (&tfile->napi);local_bh_enable ();mutex_unlock (&tfile->napi_mutex); }else if (tfile->napi_enabled) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 41/190 bnxt_en: Fix possible crash in bnxt_hwrm_set_coal()
In reply to Greg Kroah-HartmanFrom: Michael Chan <[email protected]>
[ Upstream commit 6d81ea3765dfa6c8a20822613c81edad1c4a16a0 ]
During the error recovery sequence, the rtnl_lock is not held for the entire duration and some datastructures may be freed during the sequence. Check for the BNXT_STATE_OPEN flag instead of netif_running() to ensure that the device is fully operational before proceeding to reconfigure the coalescing settings.
This will fix a possible crash like this:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 PGD 0 P4D 0 Oops: 0000 [#1] SMP NOPTI CPU: 10 PID: 181276 Comm: ethtool Kdump: loaded Tainted: G IOE --------- - - 4.18.0-348.el8.x86_64 #1 Hardware name: Dell Inc. PowerEdge R740/0F9N89, BIOS 2.3.10 08/15/2019 RIP: 0010:bnxt_hwrm_set_coal+0x1fb/0x2a0 [bnxt_en] Code: c2 66 83 4e 22 08 66 89 46 1c e8 10 cb 00 00 41 83 c6 01 44 39 b3 68 01 00 00 0f 8e a3 00 00 00 48 8b 93 c8 00 00 00 49 63 c6 <48> 8b 2c c2 48 8b 85 b8 02 00 00 48 85 c0 74 2e 48 8b 74 24 08 f6 RSP: 0018:ffffb11c8dcaba50 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff8d168a8b0ac0 RCX: 00000000000000c5 RDX: 0000000000000000 RSI: ffff8d162f72c000 RDI: ffff8d168a8b0b28 RBP: 0000000000000000 R08: b6e1f68a12e9a7eb R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000037 R12: ffff8d168a8b109c R13: ffff8d168a8b10aa R14: 0000000000000000 R15: ffffffffc01ac4e0 FS: 00007f3852e4c740(0000) GS:ffff8d24c0080000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000041b3ee003 CR4: 00000000007706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: ethnl_set_coalesce+0x3ce/0x4c0 genl_family_rcv_msg_doit.isra.15+0x10f/0x150 genl_family_rcv_msg+0xb3/0x160 ? coalesce_fill_reply+0x480/0x480 genl_rcv_msg+0x47/0x90 ? genl_family_rcv_msg+0x160/0x160 netlink_rcv_skb+0x4c/0x120 genl_rcv+0x24/0x40 netlink_unicast+0x196/0x230 netlink_sendmsg+0x204/0x3d0 sock_sendmsg+0x4c/0x50 __sys_sendto+0xee/0x160 ? syscall_trace_enter+0x1d3/0x2c0 ? __audit_syscall_exit+0x249/0x2a0 __x64_sys_sendto+0x24/0x30 do_syscall_64+0x5b/0x1a0 entry_SYSCALL_64_after_hwframe+0x65/0xca RIP: 0033:0x7f38524163bb
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -1
@@ -162,7 +162,7 @@ static int bnxt_set_coalesce(struct net_device *dev, } reset_coalesce: -if (netif_running (dev)) { +if (test_bit (BNXT_STATE_OPEN , &bp->state)) {if (update_stats) { rc =bnxt_close_nic (bp, true, false);if (!rc)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 42/190 bnxt_en: fix potentially incorrect return value for ndo_rx_flow_steer
In reply to Greg Kroah-HartmanFrom: Alex Barba <[email protected]>
[ Upstream commit 02597d39145bb0aa81d04bf39b6a913ce9a9d465 ]
In the bnxt_en driver ndo_rx_flow_steer returns '0' whenever an entry that we are attempting to steer is already found. This is not the correct behavior. The return code should be the value/index that corresponds to the entry. Returning zero all the time causes the RFS records to be incorrect unless entry '0' is the correct one. As flows migrate to different cores this can create entries that are not correct.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -12894,8 +12894,8 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,rcu_read_lock ();hlist_for_each_entry_rcu (fltr, head, hash) {if (bnxt_fltr_match (fltr, new_fltr)) { + rc = fltr->sw_id;rcu_read_unlock (); - rc =0 ; goto err_free; } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 43/190 net: fman: Unregister ethernet device on removal
In reply to Greg Kroah-HartmanFrom: Sean Anderson <[email protected]>
[ Upstream commit b7cbc6740bd6ad5d43345a2504f7e4beff0d709f ]
When the mac device gets removed, it leaves behind the ethernet device. This will result in a segfault next time the ethernet device accesses mac_dev. Remove the ethernet device when we get removed to prevent this. This is not completely reversible, since some resources aren't cleaned up properly, but that can be addressed later.
--- drivers/net/ethernet/freescale/fman/mac.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/freescale/fman/mac.c +9 -0
@@ -882,12 +882,21 @@ static int mac_probe(struct platform_device *_of_dev)return err; } +static int mac_remove (struct platform_device *pdev) +{ +struct mac_device *mac_dev =platform_get_drvdata (pdev); + +platform_device_unregister (mac_dev->priv->eth_dev); +return 0 ; +} +static struct platform_driver mac_driver = { .driver = { .name =KBUILD_MODNAME , .of_match_table = mac_match, }, .probe = mac_probe, + .remove = mac_remove, };builtin_platform_driver (mac_driver);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 44/190 capabilities: fix undefined behavior in bit shift for CAP_TO_MASK
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit 46653972e3ea64f79e7f8ae3aa41a4d3fdb70a13 ]
Shifting signed 32-bit value by 31 bits is undefined, so changing significant bit to unsigned. The UBSAN warning calltrace like below:
UBSAN: shift-out-of-bounds in security/commoncap.c:1252:2 left shift of 1 by 31 places cannot be represented in type 'int' Call Trace: <TASK> dump_stack_lvl+0x7d/0xa5 dump_stack+0x15/0x1b ubsan_epilogue+0xe/0x4e __ubsan_handle_shift_out_of_bounds+0x1e7/0x20c cap_task_prctl+0x561/0x6f0 security_task_prctl+0x5a/0xb0 __x64_sys_prctl+0x61/0x8f0 do_syscall_64+0x58/0x80 entry_SYSCALL_64_after_hwframe+0x63/0xcd </TASK>
--- include/uapi/linux/capability.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/capability.h +1 -1
@@ -426,7 +426,7 @@ struct vfs_ns_cap_data {*/ #define CAP_TO_INDEX (x) ((x) >> 5)/* 1 << 5 == bits in __u32 */ -#define CAP_TO_MASK (x) (1 << ((x) & 31))/* mask for indexed __u32 */ +#define CAP_TO_MASK (x) (1U << ((x) & 31))/* mask for indexed __u32 */ #endif /* _UAPI_LINUX_CAPABILITY_H */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 45/190 phy: ralink: mt7621-pci: add sentinel to quirks table
In reply to Greg Kroah-HartmanFrom: John Thomson <[email protected]>
[ Upstream commit 819b885cd886c193782891c4f51bbcab3de119a4 ]
With mt7621 soc_dev_attr fixed to register the soc as a device, kernel will experience an oops in soc_device_match_attr
This quirk test was introduced in the staging driver in commit 9445ccb3714c ("staging: mt7621-pci-phy: add quirks for 'E2' revision using 'soc_device_attribute'"). The staging driver was removed, and later re-added in commit d87da32372a0 ("phy: ralink: Add PHY driver for MT7621 PCIe PHY") for kernel 5.11
--- drivers/phy/ralink/phy-mt7621-pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/phy/ralink/phy-mt7621-pci.c +2 -1
@@ -280,7 +280,8 @@ static struct phy *mt7621_pcie_phy_of_xlate(struct device *dev, }static const struct soc_device_attribute mt7621_pci_quirks_match[] = { - { .soc_id ="mt7621" , .revision ="E2" } + { .soc_id ="mt7621" , .revision ="E2" }, + {/* sentinel */ } };static const struct regmap_config mt7621_pci_phy_regmap_config = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/190 KVM: s390: pv: dont allow userspace to set the clock under PV
In reply to Greg Kroah-HartmanFrom: Nico Boehr <[email protected]>
[ Upstream commit 6973091d1b50ab4042f6a2d495f59e9db3662ab8 ]
When running under PV, the guest's TOD clock is under control of the ultravisor and the hypervisor isn't allowed to change it. Hence, don't allow userspace to change the guest's TOD clock by returning -EOPNOTSUPP.
When userspace changes the guest's TOD clock, KVM updates its kvm.arch.epoch field and, in addition, the epoch field in all state descriptions of all VCPUs.
But, under PV, the ultravisor will ignore the epoch field in the state description and simply overwrite it on next SIE exit with the actual guest epoch. This leads to KVM having an incorrect view of the guest's TOD clock: it has updated its internal kvm.arch.epoch field, but the ultravisor ignores the field in the state description.
Whenever a guest is now waiting for a clock comparator, KVM will incorrectly calculate the time when the guest should wake up, possibly causing the guest to sleep for much longer than expected.
With this change, kvm_s390_set_tod() will now take the kvm->lock to be able to call kvm_s390_pv_is_protected(). Since kvm_s390_set_tod_clock() also takes kvm->lock, use __kvm_s390_set_tod_clock() instead.
The function kvm_s390_set_tod_clock is now unused, hence remove it. Update the documentation to indicate the TOD clock attr calls can now return -EOPNOTSUPP.
Message-Id: <[email protected]>
--- Documentation/virt/kvm/devices/vm.rst | 3 +++ arch/s390/kvm/kvm-s390.c | 26 +++++++++++++++++--------- arch/s390/kvm/kvm-s390.h | 1 - 3 files changed, 20 insertions(+), 10 deletions(-)
Documentation/virt/kvm/devices/vm.rst +3 -0
@@ -215,6 +215,7 @@ KVM_S390_VM_TOD_EXT). :Parameters: address of a buffer in user space to store the data (u8) to :Returns: -EFAULT if the given address is not accessible from kernel space; -EINVAL if setting the TOD clock extension to != 0 is not supported + -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor) 3.2. ATTRIBUTE: KVM_S390_VM_TOD_LOW -----------------------------------
@@ -224,6 +225,7 @@ the POP (u64). :Parameters: address of a buffer in user space to store the data (u64) to :Returns: -EFAULT if the given address is not accessible from kernel space + -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor) 3.3. ATTRIBUTE: KVM_S390_VM_TOD_EXT -----------------------------------
@@ -237,6 +239,7 @@ it, it is stored as 0 and not allowed to be set to a value != 0. (kvm_s390_vm_tod_clock) to :Returns: -EFAULT if the given address is not accessible from kernel space; -EINVAL if setting the TOD clock extension to != 0 is not supported + -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor) 4. GROUP: KVM_S390_VM_CRYPTO ============================
arch/s390/kvm/kvm-s390.c +17 -9
@@ -1207,6 +1207,8 @@ static int kvm_s390_vm_get_migration(struct kvm *kvm,return 0 ; } +static void __kvm_s390_set_tod_clock (struct kvm *kvm,const struct kvm_s390_vm_tod_clock *gtod); +static int kvm_s390_set_tod_ext (struct kvm *kvm,struct kvm_device_attr *attr) {struct kvm_s390_vm_tod_clock gtod;
@@ -1216,7 +1218,7 @@ static int kvm_s390_set_tod_ext(struct kvm *kvm, struct kvm_device_attr *attr)if (!test_kvm_facility (kvm,139 ) && gtod.epoch_idx)return -EINVAL ; -kvm_s390_set_tod_clock (kvm, >od); +__kvm_s390_set_tod_clock (kvm, >od);VM_EVENT (kvm,3 ,"SET: TOD extension: 0x%x, TOD base: 0x%llx" , gtod.epoch_idx, gtod.tod);
@@ -1247,7 +1249,7 @@ static int kvm_s390_set_tod_low(struct kvm *kvm, struct kvm_device_attr *attr) sizeof(gtod.tod)))return -EFAULT ; -kvm_s390_set_tod_clock (kvm, >od); +__kvm_s390_set_tod_clock (kvm, >od);VM_EVENT (kvm,3 ,"SET: TOD base: 0x%llx" , gtod.tod);return 0 ; }
@@ -1259,6 +1261,16 @@ static int kvm_s390_set_tod(struct kvm *kvm, struct kvm_device_attr *attr)if (attr->flags)return -EINVAL ; +mutex_lock (&kvm->lock); +/* +* For protected guests, the TOD is managed by the ultravisor, so trying +* to change it will never bring the expected results. +*/ +if (kvm_s390_pv_is_protected (kvm)) { + ret = -EOPNOTSUPP ; + goto out_unlock; + } +switch (attr->attr) {case KVM_S390_VM_TOD_EXT : ret =kvm_s390_set_tod_ext (kvm, attr);
@@ -1273,6 +1285,9 @@ static int kvm_s390_set_tod(struct kvm *kvm, struct kvm_device_attr *attr) ret = -ENXIO ;break ; } + +out_unlock: +mutex_unlock (&kvm->lock);return ret; }
@@ -4379,13 +4394,6 @@ static void __kvm_s390_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_tpreempt_enable (); } -void kvm_s390_set_tod_clock (struct kvm *kvm,const struct kvm_s390_vm_tod_clock *gtod) -{ -mutex_lock (&kvm->lock); -__kvm_s390_set_tod_clock (kvm, gtod); -mutex_unlock (&kvm->lock); -} -int kvm_s390_try_set_tod_clock (struct kvm *kvm,const struct kvm_s390_vm_tod_clock *gtod) {if (!mutex_trylock (&kvm->lock))
arch/s390/kvm/kvm-s390.h +0 -1
@@ -363,7 +363,6 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu);int kvm_s390_handle_sigp_pei (struct kvm_vcpu *vcpu);/* implemented in kvm-s390.c */ -void kvm_s390_set_tod_clock (struct kvm *kvm,const struct kvm_s390_vm_tod_clock *gtod);int kvm_s390_try_set_tod_clock (struct kvm *kvm,const struct kvm_s390_vm_tod_clock *gtod);long kvm_arch_fault_in_page (struct kvm_vcpu *vcpu,gpa_t gpa,int writable);int kvm_s390_store_status_unloaded (struct kvm_vcpu *vcpu,unsigned long addr);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 47/190 KVM: s390: pci: Fix allocation size of aift kzdev elements
In reply to Greg Kroah-HartmanFrom: Rafael Mendonca <[email protected]>
[ Upstream commit b6662e37772715447aeff2538444ff291e02ea31 ]
The 'kzdev' field of struct 'zpci_aift' is an array of pointers to 'kvm_zdev' structs. Allocate the proper size accordingly.
Reported by Coccinelle:
WARNING: Use correct pointer type argument for sizeof
Message-Id: <[email protected]>
--- arch/s390/kvm/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kvm/pci.c +1 -1
@@ -126,7 +126,7 @@ int kvm_s390_pci_aen_init(u8 nisc)return -EPERM ;mutex_lock (&aift->aift_lock); - aift->kzdev =kcalloc (ZPCI_NR_DEVICES ,sizeof (struct kvm_zdev ), + aift->kzdev =kcalloc (ZPCI_NR_DEVICES ,sizeof (struct kvm_zdev *),GFP_KERNEL );if (!aift->kzdev) { rc = -ENOMEM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 48/190 net: lapbether: fix issue of dev reference count leakage in lapbeth_device_event()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 531705a765493655472c993627106e19f7e5a6d2 ]
When following tests are performed, it will cause dev reference counting leakage.
a)ip link add bond2 type bond mode balance-rr
b)ip link set bond2 up
c)ifenslave -f bond2 rose1
d)ip link del bond2
When new bond device is created, the default type of the bond device is ether. And the bond device is up, lapbeth_device_event() receives the message and creates a new lapbeth device. In this case, the reference count value of dev is hold once. But after "ifenslave -f bond2 rose1" command is executed, the type of the bond device is changed to rose. When the bond device is unregistered, lapbeth_device_event() will not put the dev reference count.
--- drivers/net/wan/lapbether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wan/lapbether.c +1 -1
@@ -446,7 +446,7 @@ static int lapbeth_device_event(struct notifier_block *this,if (dev_net (dev) != &init_net)return NOTIFY_DONE ; -if (!dev_is_ethdev (dev)) +if (!dev_is_ethdev (dev) && !lapbeth_get_x25_dev (dev))return NOTIFY_DONE ;switch (event) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 49/190 hamradio: fix issue of dev reference count leakage in bpq_device_event()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 85cbaf032d3cd9f595152625eda5d4ecb1d6d78d ]
When following tests are performed, it will cause dev reference counting leakage.
a)ip link add bond2 type bond mode balance-rr
b)ip link set bond2 up
c)ifenslave -f bond2 rose1
d)ip link del bond2
When new bond device is created, the default type of the bond device is ether. And the bond device is up, bpq_device_event() receives the message and creates a new bpq device. In this case, the reference count value of dev is hold once. But after "ifenslave -f bond2 rose1" command is executed, the type of the bond device is changed to rose. When the bond device is unregistered, bpq_device_event() will not put the dev reference count.
--- drivers/net/hamradio/bpqether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/hamradio/bpqether.c +1 -1
@@ -533,7 +533,7 @@ static int bpq_device_event(struct notifier_block *this,if (!net_eq (dev_net (dev), &init_net))return NOTIFY_DONE ; -if (!dev_is_ethdev (dev)) +if (!dev_is_ethdev (dev) && !bpq_get_ax25_dev (dev))return NOTIFY_DONE ;switch (event) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/190 net: wwan: iosm: fix memory leak in ipc_wwan_dellink
In reply to Greg Kroah-HartmanFrom: HW He <[email protected]>
[ Upstream commit f25caaca424703d5a0607310f0452f978f1f78d9 ]
IOSM driver registers network device without setting the needs_free_netdev flag, and does NOT call free_netdev() when unregisters network device, which causes a memory leak.
This patch sets needs_free_netdev to true when registers network device, which makes netdev subsystem call free_netdev() automatically after unregister_netdevice().
--- drivers/net/wwan/iosm/iosm_ipc_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wwan/iosm/iosm_ipc_wwan.c +1 -0
@@ -168,6 +168,7 @@ static void ipc_wwan_setup(struct net_device *iosm_dev) iosm_dev->max_mtu =ETH_MAX_MTU ; iosm_dev->flags =IFF_POINTOPOINT |IFF_NOARP ; + iosm_dev->needs_free_netdev = true; iosm_dev->netdev_ops = &ipc_inm_ops; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 51/190 net: wwan: mhi: fix memory leak in mhi_mbim_dellink
In reply to Greg Kroah-HartmanFrom: HW He <[email protected]>
[ Upstream commit 668205b9c9f94d5ed6ab00cce9a46a654c2b5d16 ]
MHI driver registers network device without setting the needs_free_netdev flag, and does NOT call free_netdev() when unregisters network device, which causes a memory leak.
This patch sets needs_free_netdev to true when registers network device, which makes netdev subsystem call free_netdev() automatically after unregister_netdevice().
--- drivers/net/wwan/mhi_wwan_mbim.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wwan/mhi_wwan_mbim.c +1 -0
@@ -582,6 +582,7 @@ static void mhi_mbim_setup(struct net_device *ndev) ndev->min_mtu =ETH_MIN_MTU ; ndev->max_mtu =MHI_MAX_BUF_SZ - ndev->needed_headroom; ndev->tx_queue_len =1000 ; + ndev->needs_free_netdev = true; }static const struct wwan_ops mhi_mbim_wwan_ops = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 52/190 drm/vc4: Fix missing platform_unregister_drivers() call in vc4_drm_register()
In reply to Greg Kroah-HartmanFrom: Yuan Can <[email protected]>
[ Upstream commit cf53db768a8790fdaae2fa3a81322b080285f7e5 ]
A problem about modprobe vc4 failed is triggered with the following log given:
[ 420.327987] Error: Driver 'vc4_hvs' is already registered, aborting... [ 420.333904] failed to register platform driver vc4_hvs_driver [vc4]: -16 modprobe: ERROR: could not insert 'vc4': Device or resource busy
The reason is that vc4_drm_register() returns platform_driver_register() directly without checking its return value, if platform_driver_register() fails, it returns without unregistering all the vc4 drivers, resulting the vc4 can never be installed later.
A simple call graph is shown as below:
vc4_drm_register()
platform_register_drivers() # all vc4 drivers are registered platform_driver_register()
driver_register()
bus_add_driver()
priv = kzalloc(...) # OOM happened
# return without unregister drivers
Fixing this problem by checking the return value of platform_driver_register() and do platform_unregister_drivers() if error happened.
--- drivers/gpu/drm/vc4/vc4_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_drv.c +6 -1
@@ -476,7 +476,12 @@ static int __init vc4_drm_register(void)if (ret)return ret; -return platform_driver_register (&vc4_platform_driver); + ret =platform_driver_register (&vc4_platform_driver); +if (ret) +platform_unregister_drivers (component_drivers, +ARRAY_SIZE (component_drivers)); + +return ret; } static void __exit vc4_drm_unregister(void)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 53/190 tcp: prohibit TCP_REPAIR_OPTIONS if data was already sent
In reply to Greg Kroah-HartmanFrom: Lu Wei <[email protected]>
[ Upstream commit 0c175da7b0378445f5ef53904247cfbfb87e0b78 ]
If setsockopt with option name of TCP_REPAIR_OPTIONS and opt_code of TCPOPT_SACK_PERM is called to enable sack after data is sent and dupacks are received , it will trigger a warning in function tcp_verify_left_out() as follows:
============================================
WARNING: CPU: 8 PID: 0 at net/ipv4/tcp_input.c:2132 tcp_timeout_mark_lost+0x154/0x160 tcp_enter_loss+0x2b/0x290 tcp_retransmit_timer+0x50b/0x640 tcp_write_timer_handler+0x1c8/0x340 tcp_write_timer+0xe5/0x140 call_timer_fn+0x3a/0x1b0 __run_timers.part.0+0x1bf/0x2d0 run_timer_softirq+0x43/0xb0 __do_softirq+0xfd/0x373 __irq_exit_rcu+0xf6/0x140
The warning is caused in the following steps:
1. a socket named socketA is created
2. socketA enters repair mode without build a connection
3. socketA calls connect() and its state is changed to TCP_ESTABLISHED directly
4. socketA leaves repair mode
5. socketA calls sendmsg() to send data, packets_out and sack_outs(dup ack receives) increase
6. socketA enters repair mode again
7. socketA calls setsockopt with TCPOPT_SACK_PERM to enable sack
8. retransmit timer expires, it calls tcp_timeout_mark_lost(), lost_out increases
9. sack_outs + lost_out > packets_out triggers since lost_out and sack_outs increase repeatly
In function tcp_timeout_mark_lost(), tp->sacked_out will be cleared if Step7 not happen and the warning will not be triggered. As suggested by Denis and Eric, TCP_REPAIR_OPTIONS should be prohibited if data was already sent.
socket-tcp tests in CRIU has been tested as follows:
$ sudo ./test/zdtm.py run -t zdtm/static/socket-tcp* --keep-going \
--ignore-taintsocket-tcp* represent all socket-tcp tests in test/zdtm/static/.
--- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp.c +1 -1
@@ -3648,7 +3648,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname,case TCP_REPAIR_OPTIONS :if (!tp->repair) err = -EINVAL ; -else if (sk->sk_state ==TCP_ESTABLISHED ) +else if (sk->sk_state ==TCP_ESTABLISHED && !tp->bytes_sent) err =tcp_repair_options_est (sk, optval, optlen);else err = -EPERM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 54/190 platform/x86: p2sb: Dont fail if unknown CPU is found
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 53eb64c88f17b14b324fbdfd417f56c5d3fa6fee ]
We have accessing P2SB from a very few places for quite known hardware.
When a new SoC appears in intel-family.h it's not obvious that it needs to be added to p2sb.c as well. Instead, provide default BDF and refactor p2sb_get_devfn() to always succeed. If in the future we would need to exclude something, we may add a list of unsupported IDs.
Without this change the iTCO on Intel Comet Lake SoCs became unavailable:
i801_smbus 0000:00:1f.4: failed to create iTCO device
--- drivers/platform/x86/p2sb.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/platform/x86/p2sb.c +6 -9
@@ -19,26 +19,23 @@#define P2SBC 0xe0#define P2SBC_HIDE BIT(8) +#define P2SB_DEVFN_DEFAULT PCI_DEVFN(31, 1) +static const struct x86_cpu_id p2sb_cpu_ids[] = {X86_MATCH_INTEL_FAM6_MODEL (ATOM_GOLDMONT ,PCI_DEVFN (13 ,0 )), -X86_MATCH_INTEL_FAM6_MODEL (ATOM_GOLDMONT_D ,PCI_DEVFN (31 ,1 )), -X86_MATCH_INTEL_FAM6_MODEL (ATOM_SILVERMONT_D ,PCI_DEVFN (31 ,1 )), -X86_MATCH_INTEL_FAM6_MODEL (KABYLAKE ,PCI_DEVFN (31 ,1 )), -X86_MATCH_INTEL_FAM6_MODEL (KABYLAKE_L ,PCI_DEVFN (31 ,1 )), -X86_MATCH_INTEL_FAM6_MODEL (SKYLAKE ,PCI_DEVFN (31 ,1 )), -X86_MATCH_INTEL_FAM6_MODEL (SKYLAKE_L ,PCI_DEVFN (31 ,1 )), {} };static int p2sb_get_devfn (unsigned int *devfn) { +unsigned int fn =P2SB_DEVFN_DEFAULT ;const struct x86_cpu_id *id; id =x86_match_cpu (p2sb_cpu_ids); -if (!id) -return -ENODEV ; +if (id) + fn = (unsigned int )id->driver_data; - *devfn = (unsigned int )id->driver_data; + *devfn = fn;return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 55/190 ipv6: addrlabel: fix infoleak when sending struct ifaddrlblmsg to network
In reply to Greg Kroah-HartmanFrom: Alexander Potapenko <[email protected]>
[ Upstream commit c23fb2c82267638f9d206cb96bb93e1f93ad7828 ]
When copying a struct ifaddrlblmsg to the network, __ifal_reserved remained uninitialized, resulting in a 1-byte infoleak:
BUG: KMSAN: kernel-network-infoleak in __netdev_start_xmit ./include/linux/netdevice.h:4841 __netdev_start_xmit ./include/linux/netdevice.h:4841 netdev_start_xmit ./include/linux/netdevice.h:4857 xmit_one net/core/dev.c:3590 dev_hard_start_xmit+0x1dc/0x800 net/core/dev.c:3606 __dev_queue_xmit+0x17e8/0x4350 net/core/dev.c:4256 dev_queue_xmit ./include/linux/netdevice.h:3009 __netlink_deliver_tap_skb net/netlink/af_netlink.c:307 __netlink_deliver_tap+0x728/0xad0 net/netlink/af_netlink.c:325 netlink_deliver_tap net/netlink/af_netlink.c:338 __netlink_sendskb net/netlink/af_netlink.c:1263 netlink_sendskb+0x1d9/0x200 net/netlink/af_netlink.c:1272 netlink_unicast+0x56d/0xf50 net/netlink/af_netlink.c:1360 nlmsg_unicast ./include/net/netlink.h:1061 rtnl_unicast+0x5a/0x80 net/core/rtnetlink.c:758 ip6addrlbl_get+0xfad/0x10f0 net/ipv6/addrlabel.c:628 rtnetlink_rcv_msg+0xb33/0x1570 net/core/rtnetlink.c:6082 ... Uninit was created at: slab_post_alloc_hook+0x118/0xb00 mm/slab.h:742 slab_alloc_node mm/slub.c:3398 __kmem_cache_alloc_node+0x4f2/0x930 mm/slub.c:3437 __do_kmalloc_node mm/slab_common.c:954 __kmalloc_node_track_caller+0x117/0x3d0 mm/slab_common.c:975 kmalloc_reserve net/core/skbuff.c:437 __alloc_skb+0x27a/0xab0 net/core/skbuff.c:509 alloc_skb ./include/linux/skbuff.h:1267 nlmsg_new ./include/net/netlink.h:964 ip6addrlbl_get+0x490/0x10f0 net/ipv6/addrlabel.c:608 rtnetlink_rcv_msg+0xb33/0x1570 net/core/rtnetlink.c:6082 netlink_rcv_skb+0x299/0x550 net/netlink/af_netlink.c:2540 rtnetlink_rcv+0x26/0x30 net/core/rtnetlink.c:6109 netlink_unicast_kernel net/netlink/af_netlink.c:1319 netlink_unicast+0x9ab/0xf50 net/netlink/af_netlink.c:1345 netlink_sendmsg+0xebc/0x10f0 net/netlink/af_netlink.c:1921 ...
This patch ensures that the reserved field is always initialized.
--- net/ipv6/addrlabel.c | 1 + 1 file changed, 1 insertion(+)
net/ipv6/addrlabel.c +1 -0
@@ -437,6 +437,7 @@ static void ip6addrlbl_putmsg(struct nlmsghdr *nlh, {struct ifaddrlblmsg *ifal =nlmsg_data (nlh); ifal->ifal_family =AF_INET6 ; + ifal->__ifal_reserved =0 ; ifal->ifal_prefixlen = prefixlen; ifal->ifal_flags =0 ; ifal->ifal_index = ifindex;
Signature · 1 line
2.35.1
syzbot
syzbotRe: [PATCH 6.0 055/190] ipv6: addrlabel: fix infoleak when sending struct ifaddrlblmsg to network
I see the command but can't find the corresponding bug. The email is sent to [email protected] address but the HASH does not correspond to any known bug. Please double check the…
Quoted 73 lines
From: Alexander Potapenko <[email protected]>
[ Upstream commit
c23fb2c82267638f9d206cb96bb93e1f93ad7828]When copying a
struct ifaddrlblmsgto the network,__ifal_reservedremained uninitialized, resulting in a 1-byte infoleak:BUG: KMSAN: kernel-network-infoleak in __netdev_start_xmit ./include/linux/netdevice.h:4841 __netdev_start_xmit ./include/linux/netdevice.h:4841 netdev_start_xmit ./include/linux/netdevice.h:4857 xmit_one net/core/dev.c:3590 dev_hard_start_xmit+0x1dc/0x800 net/core/dev.c:3606 __dev_queue_xmit+0x17e8/0x4350 net/core/dev.c:4256 dev_queue_xmit ./include/linux/netdevice.h:3009 __netlink_deliver_tap_skb net/netlink/af_netlink.c:307 __netlink_deliver_tap+0x728/0xad0 net/netlink/af_netlink.c:325 netlink_deliver_tap net/netlink/af_netlink.c:338 __netlink_sendskb net/netlink/af_netlink.c:1263 netlink_sendskb+0x1d9/0x200 net/netlink/af_netlink.c:1272 netlink_unicast+0x56d/0xf50 net/netlink/af_netlink.c:1360 nlmsg_unicast ./include/net/netlink.h:1061 rtnl_unicast+0x5a/0x80 net/core/rtnetlink.c:758 ip6addrlbl_get+0xfad/0x10f0 net/ipv6/addrlabel.c:628 rtnetlink_rcv_msg+0xb33/0x1570 net/core/rtnetlink.c:6082 ... Uninit was created at: slab_post_alloc_hook+0x118/0xb00 mm/slab.h:742 slab_alloc_node mm/slub.c:3398 __kmem_cache_alloc_node+0x4f2/0x930 mm/slub.c:3437 __do_kmalloc_node mm/slab_common.c:954 __kmalloc_node_track_caller+0x117/0x3d0 mm/slab_common.c:975 kmalloc_reserve net/core/skbuff.c:437 __alloc_skb+0x27a/0xab0 net/core/skbuff.c:509 alloc_skb ./include/linux/skbuff.h:1267 nlmsg_new ./include/net/netlink.h:964 ip6addrlbl_get+0x490/0x10f0 net/ipv6/addrlabel.c:608 rtnetlink_rcv_msg+0xb33/0x1570 net/core/rtnetlink.c:6082 netlink_rcv_skb+0x299/0x550 net/netlink/af_netlink.c:2540 rtnetlink_rcv+0x26/0x30 net/core/rtnetlink.c:6109 netlink_unicast_kernel net/netlink/af_netlink.c:1319 netlink_unicast+0x9ab/0xf50 net/netlink/af_netlink.c:1345 netlink_sendmsg+0xebc/0x10f0 net/netlink/af_netlink.c:1921 ...This patch ensures that the reserved field is always initialized.
Fixes 2a8cc6c89039 ("[IPV6] ADDRCONF: Support RFC3484 configurable address selection policy table.")Signed-off-by Alexander Potapenko <[email protected]>Reviewed-by David Ahern <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- net/ipv6/addrlabel.c | 1 + 1 file changed, 1 insertion(+)net/ipv6/addrlabel.c +1
-0@@ -437,6 +437,7 @@ static void ip6addrlbl_putmsg(struct nlmsghdr *nlh, {struct ifaddrlblmsg *ifal =nlmsg_data (nlh); ifal->ifal_family =AF_INET6 ; + ifal->__ifal_reserved =0 ; ifal->ifal_prefixlen = prefixlen; ifal->ifal_flags =0 ; ifal->ifal_index = ifindex;Signature · 1 line
2.35.1
I see the command but can't find the corresponding bug. The email is sent to [email protected] address but the HASH does not correspond to any known bug. Please double check the address.
Greg Kroah-Hartman
maintainerPATCH 56/190 can: af_can: fix NULL pointer dereference in can_rx_register()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 8aa59e355949442c408408c2d836e561794c40a1 ]
It causes NULL pointer dereference when testing as following:
(a) use syscall(__NR_socket, 0x10ul, 3ul, 0) to create netlink socket.
(b) use syscall(__NR_sendmsg, ...) to create bond link device and vxcan link device, and bind vxcan device to bond device (can also use ifenslave command to bind vxcan device to bond device).
(c) use syscall(__NR_socket, 0x1dul, 3ul, 1) to create CAN socket.
(d) use syscall(__NR_bind, ...) to bind the bond device to CAN socket.
The bond device invokes the can-raw protocol registration interface to receive CAN packets. However, ml_priv is not allocated to the dev, dev_rcv_lists is assigned to NULL in can_rx_register(). In this case, it will occur the NULL pointer dereference issue.
The following is the stack information:
BUG: kernel NULL pointer dereference, address: 0000000000000008 PGD 122a4067 P4D 122a4067 PUD 1223c067 PMD 0 Oops: 0000 [#1] PREEMPT SMP RIP: 0010:can_rx_register+0x12d/0x1e0 Call Trace: <TASK> raw_enable_filters+0x8d/0x120 raw_enable_allfilters+0x3b/0x130 raw_bind+0x118/0x4f0 __sys_bind+0x163/0x1a0 __x64_sys_bind+0x1e/0x30 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x63/0xcd </TASK>
--- net/can/af_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/can/af_can.c +1 -1
@@ -451,7 +451,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id,/* insert new receiver (dev,canid,mask) -> (func,data) */ -if (dev && dev->type !=ARPHRD_CAN ) +if (dev && (dev->type !=ARPHRD_CAN || !can_get_ml_priv (dev)))return -ENODEV ;if (dev && !net_eq (net,dev_net (dev)))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 57/190 drm/i915/psr: Send update also on invalidate
In reply to Greg Kroah-HartmanFrom: Jouni Högander <[email protected]>
[ Upstream commit 4ff4ebac3f1378f4ba6e11fe5ad4a4ac590bb8a4 ]
Currently we are observing mouse cursor stuttering when using xrandr --scaling=1.2x1.2. X scaling/transformation seems to be doing fronbuffer rendering. When moving mouse cursor X seems to perform several invalidates and only one DirtyFB. I.e. it seems to be assuming updates are sent to panel while drawing is done.
Earlier we were disabling PSR in frontbuffer invalidate call back (when drawing in X started). PSR was re-enabled in frontbuffer flush callback (dirtyfb ioctl). This was working fine with X scaling/transformation. Now we are just enabling continuous full frame (cff) in PSR invalidate callback. Enabling cff doesn't trigger any updates. It just configures PSR to send full frame when updates are sent. I.e. there are no updates on screen before PSR flush callback is made. X seems to be doing several updates in frontbuffer before doing dirtyfb ioctl.
Fix this by sending single update on every invalidate callback.
--- drivers/gpu/drm/i915/display/intel_psr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_psr.c +4 -1
@@ -2188,8 +2188,11 @@ static void _psr_invalidate_handle(struct intel_dp *intel_dp)if (intel_dp->psr.psr2_sel_fetch_enabled) {u32 val; -if (intel_dp->psr.psr2_sel_fetch_cff_enabled) +if (intel_dp->psr.psr2_sel_fetch_cff_enabled) { +/* Send one update otherwise lag is observed in screen */ +intel_de_write (dev_priv,CURSURFLIVE (intel_dp->psr.pipe),0 );return ; + } val =man_trk_ctl_enable_bit_get (dev_priv) | man_trk_ctl_partial_frame_bit_get(dev_priv) |
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 58/190 drm/i915: Do not set cache_dirty for DGFX
In reply to Greg Kroah-HartmanFrom: Niranjana Vishwanathapura <[email protected]>
[ Upstream commit 19b168136395150a4a6e011f944eb30d3d85094b ]
Currently on DG1, which does not have LLC, we hit the below warning while rebinding an userptr invalidated object.
WARNING: CPU: 4 PID: 13008 at drivers/gpu/drm/i915/gem/i915_gem_pages.c:34 __i915_gem_object_set_pages+0x296/0x2d0 [i915] ... RIP: 0010:__i915_gem_object_set_pages+0x296/0x2d0 [i915] ... Call Trace: <TASK> i915_gem_userptr_get_pages+0x175/0x1a0 [i915] ____i915_gem_object_get_pages+0x32/0xb0 [i915] i915_gem_object_userptr_submit_init+0x286/0x470 [i915] eb_lookup_vmas+0x2ff/0xcf0 [i915] ? __intel_wakeref_get_first+0x55/0xb0 [i915] i915_gem_do_execbuffer+0x785/0x21d0 [i915] i915_gem_execbuffer2_ioctl+0xe7/0x3d0 [i915]
We shouldn't be setting the obj->cache_dirty for DGFX, fix it.
--- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +2 -2
@@ -369,14 +369,14 @@ __i915_gem_object_release_shmem(struct drm_i915_gem_object *obj,__start_cpu_write (obj);/* -* On non-LLC platforms, force the flush-on-acquire if this is ever +* On non-LLC igfx platforms, force the flush-on-acquire if this is ever * swapped-in. Our async flush path is not trust worthy enough yet(and * happens in the wrong order), and with some tricks it's conceivable * for userspace to change the cache-level to I915_CACHE_NONE after the * pages are swapped-in, and since execbuf binds the object before doing * the async flush, we have a race window. */ -if (!HAS_LLC (i915)) +if (!HAS_LLC (i915) && !IS_DGFX (i915)) obj->cache_dirty = true; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 59/190 net: stmmac: dwmac-meson8b: fix meson8b_devm_clk_prepare_enable()
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit ed4314f7729714d788698ade4f9905ee5378ebc0 ]
There are two problems with meson8b_devm_clk_prepare_enable(), introduced in commit a54dc4a49045 ("net: stmmac: dwmac-meson8b:
Make the clock enabling code re-usable"):
- It doesn't pass the clk argument, but instead always the rgmii_tx_clk of the device.
- It silently ignores the return value of devm_add_action_or_reset().
The former didn't become an actual bug until another user showed up in the next commit 9308c47640d5 ("net: stmmac: dwmac-meson8b: add support for the RX delay configuration"). The latter means the callers could end up with the clock not actually prepared/enabled.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +3 -5
@@ -272,11 +272,9 @@ static int meson8b_devm_clk_prepare_enable(struct meson8b_dwmac *dwmac,if (ret)return ret; -devm_add_action_or_reset (dwmac->dev, - (void (*)(void *))clk_disable_unprepare, - dwmac->rgmii_tx_clk); - -return 0 ; +return devm_add_action_or_reset (dwmac->dev, + (void (*)(void *))clk_disable_unprepare, + clk); }static int meson8b_init_rgmii_delays (struct meson8b_dwmac *dwmac)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/190 dt-bindings: net: tsnep: Fix typo on generic nvmem property
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit ec683f02a150b9c4428f08accd387c8c216ea0e5 ]
While working on the nvmem description I figured out this file had the "nvmem-cell-names" property name misspelled. Fix the typo, as "nvmem-cells-names" has never existed.
--- Documentation/devicetree/bindings/net/engleder,tsnep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/engleder,tsnep.yaml +1 -1
@@ -28,7 +28,7 @@ properties: nvmem-cells: true - nvmem-cells-names: true + nvmem-cell-names: true phy-connection-type: enum:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 61/190 net: broadcom: Fix BCMGENET Kconfig
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit 8d820bc9d12b8beebca836cceaf2bbe68216c2f8 ]
While BCMGENET select BROADCOM_PHY as y, but PTP_1588_CLOCK_OPTIONAL is m, kconfig warning and build errors:
WARNING: unmet direct dependencies detected for BROADCOM_PHY
Depends on [m]: NETDEVICES [=y] && PHYLIB [=y] && PTP_1588_CLOCK_OPTIONAL [=m]
Selected by [y]:
- BCMGENET [=y] && NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_BROADCOM [=y] && HAS_IOMEM [=y] && ARCH_BCM2835 [=y]
drivers/net/phy/broadcom.o: In function `bcm54xx_suspend':
broadcom.c:(.text+0x6ac): undefined reference to bcm_ptp_stop' drivers/net/phy/broadcom.o: In function bcm54xx_phy_probe':
broadcom.c:(.text+0x784): undefined reference to bcm_ptp_probe' drivers/net/phy/broadcom.o: In function bcm54xx_config_init':
broadcom.c:(.text+0xd4c): undefined reference to `bcm_ptp_config_init'
--- drivers/net/ethernet/broadcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/Kconfig +1 -1
@@ -77,7 +77,7 @@ config BCMGENET select BCM7XXX_PHY select MDIO_BCM_UNIMAC select DIMLIB - select BROADCOM_PHY if ARCH_BCM2835 + select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL) help This driver supports the built-in Ethernet MACs found in the Broadcom BCM7xxx Set Top Box family chipset.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 62/190 tipc: fix the msg->req tlv len check in tipc_nl_compat_name_table_dump_header
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
[ Upstream commit 1c075b192fe41030457cd4a5f7dea730412bca40 ]
This is a follow-up for commit 974cb0e3e7c9 ("tipc: fix uninit-value in tipc_nl_compat_name_table_dump") where it should have type casted sizeof(..) to int to work when TLV_GET_DATA_LEN() returns a negative value.
syzbot reported a call trace because of it:
BUG: KMSAN: uninit-value in ... tipc_nl_compat_name_table_dump+0x841/0xea0 net/tipc/netlink_compat.c:934 __tipc_nl_compat_dumpit+0xab2/0x1320 net/tipc/netlink_compat.c:238 tipc_nl_compat_dumpit+0x991/0xb50 net/tipc/netlink_compat.c:321 tipc_nl_compat_recv+0xb6e/0x1640 net/tipc/netlink_compat.c:1324 genl_family_rcv_msg_doit net/netlink/genetlink.c:731 [inline] genl_family_rcv_msg net/netlink/genetlink.c:775 [inline] genl_rcv_msg+0x103f/0x1260 net/netlink/genetlink.c:792 netlink_rcv_skb+0x3a5/0x6c0 net/netlink/af_netlink.c:2501 genl_rcv+0x3c/0x50 net/netlink/genetlink.c:803 netlink_unicast_kernel net/netlink/af_netlink.c:1319 [inline] netlink_unicast+0xf3b/0x1270 net/netlink/af_netlink.c:1345 netlink_sendmsg+0x1288/0x1440 net/netlink/af_netlink.c:1921 sock_sendmsg_nosec net/socket.c:714 [inline] sock_sendmsg net/socket.c:734 [inline]
--- net/tipc/netlink_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/netlink_compat.c +1 -1
@@ -880,7 +880,7 @@ static int tipc_nl_compat_name_table_dump_header(struct tipc_nl_compat_msg *msg) }; ntq = (struct tipc_name_table_query *)TLV_DATA (msg->req); -if (TLV_GET_DATA_LEN (msg->req) <sizeof (struct tipc_name_table_query )) +if (TLV_GET_DATA_LEN (msg->req) < (int )sizeof (struct tipc_name_table_query ))return -EINVAL ; depth =ntohl (ntq->depth);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 63/190 dmaengine: pxa_dma: use platform_get_irq_optional
In reply to Greg Kroah-HartmanFrom: Doug Brown <[email protected]>
[ Upstream commit b3d726cb8497c6b12106fd617d46eef11763ea86 ]
The first IRQ is required, but IRQs 1 through (nb_phy_chans - 1) are optional, because on some platforms (e.g. PXA168) there is a single IRQ shared between all channels.
This change inhibits a flood of "IRQ index # not found" messages at startup. Tested on a PXA168-based device.
--- drivers/dma/pxa_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/pxa_dma.c +2 -2
@@ -1247,14 +1247,14 @@ static int pxad_init_phys(struct platform_device *op,return -ENOMEM ;for (i =0 ; i < nb_phy_chans; i++) -if (platform_get_irq (op, i) >0 ) +if (platform_get_irq_optional (op, i) >0 ) nr_irq++;for (i =0 ; i < nb_phy_chans; i++) { phy = &pdev->phys[i]; phy->base = pdev->base; phy->idx = i; - irq =platform_get_irq (op, i); + irq =platform_get_irq_optional (op, i);if ((nr_irq >1 ) && (irq >0 )) ret = devm_request_irq(&op->dev, irq, pxad_chan_handler,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 64/190 dmanegine: idxd: reformat opcap output to match bitmap_parse() input
In reply to Greg Kroah-HartmanFrom: Dave Jiang <[email protected]>
[ Upstream commit a8563a33a5e26064061f2fb34215c97f0e2995f4 ]
To make input and output consistent and prepping for the per WQ operation configuration support, change the output of opcap display to match the input that is expected by bitmap_parse() helper function. The output will be a bitmap with field width as the number of bits using the %*pb format specifier for printk() family.
Stable-dep-of: e8dbd6445dd6 ("dmaengine: idxd: Fix max batch size for Intel IAA")
--- drivers/dma/idxd/idxd.h | 2 ++ drivers/dma/idxd/init.c | 20 ++++++++++++++++++++ drivers/dma/idxd/registers.h | 2 ++ drivers/dma/idxd/sysfs.c | 9 ++------- 4 files changed, 26 insertions(+), 7 deletions(-)
drivers/dma/idxd/idxd.h +2 -0
@@ -308,6 +308,8 @@ struct idxd_device {struct work_struct work;struct idxd_pmu *idxd_pmu; + +unsigned long *opcap_bmap; };/* IDXD software descriptor */
drivers/dma/idxd/init.c +20 -0
@@ -369,6 +369,19 @@ static void idxd_read_table_offsets(struct idxd_device *idxd)dev_dbg (dev,"IDXD Perfmon Offset: %#x\n" , idxd->perfmon_offset); } +static void multi_u64_to_bmap (unsigned long *bmap,u64 *val,int count) +{ +int i, j, nr; + +for (i =0 , nr =0 ; i < count; i++) { +for (j =0 ; j <BITS_PER_LONG_LONG ; j++) { +if (val[i] &BIT (j)) +set_bit (nr, bmap); + nr++; + } + } +} +static void idxd_read_caps (struct idxd_device *idxd) {struct device *dev = &idxd->pdev->dev;
@@ -427,6 +440,7 @@ static void idxd_read_caps(struct idxd_device *idxd) IDXD_OPCAP_OFFSET + i * sizeof(u64));dev_dbg (dev,"opcap[%d]: %#llx\n" , i, idxd->hw.opcap.bits[i]); } +multi_u64_to_bmap (idxd->opcap_bmap, &idxd->hw.opcap.bits[0 ],4 ); }static struct idxd_device *idxd_alloc (struct pci_dev *pdev,struct idxd_driver_data *data)
@@ -448,6 +462,12 @@ static struct idxd_device *idxd_alloc(struct pci_dev *pdev, struct idxd_driver_dif (idxd->id <0 )return NULL ; + idxd->opcap_bmap =bitmap_zalloc_node (IDXD_MAX_OPCAP_BITS ,GFP_KERNEL ,dev_to_node (dev)); +if (!idxd->opcap_bmap) { +ida_free (&idxd_ida, idxd->id); +return NULL ; + } +device_initialize (conf_dev); conf_dev->parent = dev; conf_dev->bus = &dsa_bus_type;
drivers/dma/idxd/registers.h +2 -0
@@ -90,6 +90,8 @@ struct opcap {u64 bits[4 ]; }; +#define IDXD_MAX_OPCAP_BITS 256U +#define IDXD_OPCAP_OFFSET 0x40#define IDXD_TABLE_OFFSET 0x60
drivers/dma/idxd/sysfs.c +2 -7
@@ -1177,14 +1177,8 @@ static ssize_t op_cap_show(struct device *dev, struct device_attribute *attr, char *buf) { struct idxd_device *idxd = confdev_to_idxd(dev); -int i, rc =0 ; - -for (i =0 ; i <4 ; i++) - rc +=sysfs_emit_at (buf, rc,"%#llx " , idxd->hw.opcap.bits[i]); - rc--; - rc +=sysfs_emit_at (buf, rc,"\n" ); -return rc; +return sysfs_emit (buf,"%*pb\n" ,IDXD_MAX_OPCAP_BITS , idxd->opcap_bmap); }static DEVICE_ATTR_RO (op_cap);
@@ -1408,6 +1402,7 @@ static void idxd_conf_device_release(struct device *dev)kfree (idxd->wqs);kfree (idxd->engines);ida_free (&idxd_ida, idxd->id); +bitmap_free (idxd->opcap_bmap);kfree (idxd); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/190 dmaengine: idxd: Fix max batch size for Intel IAA
In reply to Greg Kroah-HartmanFrom: Xiaochen Shen <[email protected]>
[ Upstream commit e8dbd6445dd6b38c4c50410a86f13158486ee99a ]
Quoted 1 line
From Intel IAA spec [1], Intel IAA does not support batch processing.
Two batch related default values for IAA are incorrect in current code:
(1) The max batch size of device is set during device initialization, that indicates batch is supported. It should be always 0 on IAA.
(2) The max batch size of work queue is set to WQ_DEFAULT_MAX_BATCH (32) as the default value regardless of Intel DSA or IAA device during work queue setup and cleanup. It should be always 0 on IAA.
Fix the issues by setting the max batch size of device and max batch size of work queue to 0 on IAA device, that means batch is not supported.
[1]: https://cdrdv2.intel.com/v1/dl/getContent/721858
--- drivers/dma/idxd/device.c | 6 +++--- drivers/dma/idxd/idxd.h | 32 ++++++++++++++++++++++++++++++++ drivers/dma/idxd/init.c | 4 ++-- drivers/dma/idxd/sysfs.c | 2 +- 4 files changed, 38 insertions(+), 6 deletions(-)
drivers/dma/idxd/device.c +3 -3
@@ -388,7 +388,7 @@ static void idxd_wq_disable_cleanup(struct idxd_wq *wq)clear_bit (WQ_FLAG_BLOCK_ON_FAULT , &wq->flags);memset (wq->name,0 ,WQ_NAME_SIZE ); wq->max_xfer_bytes =WQ_DEFAULT_MAX_XFER ; - wq->max_batch_size =WQ_DEFAULT_MAX_BATCH ; +idxd_wq_set_max_batch_size (idxd->data->type, wq,WQ_DEFAULT_MAX_BATCH ); }static void idxd_wq_device_reset_cleanup (struct idxd_wq *wq)
@@ -863,7 +863,7 @@ static int idxd_wq_config_write(struct idxd_wq *wq)/* bytes 12-15 */ wq->wqcfg->max_xfer_shift =ilog2 (wq->max_xfer_bytes); - wq->wqcfg->max_batch_shift =ilog2 (wq->max_batch_size); +idxd_wqcfg_set_max_batch_shift (idxd->data->type, wq->wqcfg,ilog2 (wq->max_batch_size));dev_dbg (dev,"WQ %d CFGs\n" , wq->id);for (i =0 ; i <WQCFG_STRIDES (idxd); i++) {
@@ -1031,7 +1031,7 @@ static int idxd_wq_load_config(struct idxd_wq *wq) wq->priority = wq->wqcfg->priority; wq->max_xfer_bytes =1ULL << wq->wqcfg->max_xfer_shift; - wq->max_batch_size =1ULL << wq->wqcfg->max_batch_shift; +idxd_wq_set_max_batch_size (idxd->data->type, wq,1U << wq->wqcfg->max_batch_shift);for (i =0 ; i <WQCFG_STRIDES (idxd); i++) { wqcfg_offset =WQCFG_OFFSET (idxd, wq->id, i);
drivers/dma/idxd/idxd.h +32 -0
@@ -542,6 +542,38 @@ static inline int idxd_wq_refcount(struct idxd_wq *wq)return wq->client_count; }; +/* +* Intel IAA does not support batch processing. +* The max batch size of device, max batch size of wq and +* max batch shift of wqcfg should be always 0 on IAA. +*/ +static inline void idxd_set_max_batch_size (int idxd_type,struct idxd_device *idxd, +u32 max_batch_size) +{ +if (idxd_type ==IDXD_TYPE_IAX ) + idxd->max_batch_size =0 ; +else + idxd->max_batch_size = max_batch_size; +} + +static inline void idxd_wq_set_max_batch_size (int idxd_type,struct idxd_wq *wq, +u32 max_batch_size) +{ +if (idxd_type ==IDXD_TYPE_IAX ) + wq->max_batch_size =0 ; +else + wq->max_batch_size = max_batch_size; +} + +static inline void idxd_wqcfg_set_max_batch_shift (int idxd_type,union wqcfg *wqcfg, +u32 max_batch_shift) +{ +if (idxd_type ==IDXD_TYPE_IAX ) + wqcfg->max_batch_shift =0 ; +else + wqcfg->max_batch_shift = max_batch_shift; +} +int __must_check __idxd_driver_register (struct idxd_device_driver *idxd_drv,struct module *module,const char *mod_name);#define idxd_driver_register (driver) \
drivers/dma/idxd/init.c +2 -2
@@ -177,7 +177,7 @@ static int idxd_setup_wqs(struct idxd_device *idxd)init_completion (&wq->wq_dead);init_completion (&wq->wq_resurrect); wq->max_xfer_bytes =WQ_DEFAULT_MAX_XFER ; - wq->max_batch_size =WQ_DEFAULT_MAX_BATCH ; +idxd_wq_set_max_batch_size (idxd->data->type, wq,WQ_DEFAULT_MAX_BATCH ); wq->enqcmds_retries =IDXD_ENQCMDS_RETRIES ; wq->wqcfg =kzalloc_node (idxd->wqcfg_size,GFP_KERNEL ,dev_to_node (dev));if (!wq->wqcfg) {
@@ -402,7 +402,7 @@ static void idxd_read_caps(struct idxd_device *idxd) idxd->max_xfer_bytes =1ULL << idxd->hw.gen_cap.max_xfer_shift;dev_dbg (dev,"max xfer size: %llu bytes\n" , idxd->max_xfer_bytes); - idxd->max_batch_size =1U << idxd->hw.gen_cap.max_batch_shift; +idxd_set_max_batch_size (idxd->data->type, idxd,1U << idxd->hw.gen_cap.max_batch_shift);dev_dbg (dev,"max batch size: %u\n" , idxd->max_batch_size);if (idxd->hw.gen_cap.config_en)set_bit (IDXD_FLAG_CONFIGURABLE , &idxd->flags);
drivers/dma/idxd/sysfs.c +1 -1
@@ -961,7 +961,7 @@ static ssize_t wq_max_batch_size_store(struct device *dev, struct device_attribuif (batch_size > idxd->max_batch_size)return -EINVAL ; - wq->max_batch_size = (u32 )batch_size; +idxd_wq_set_max_batch_size (idxd->data->type, wq, (u32 )batch_size);return count; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 66/190 dmaengine: idxd: fix RO device state error after been disabled/reset
In reply to Greg Kroah-HartmanFrom: Fengqian Gao <[email protected]>
[ Upstream commit 0b8c97a1d8c1bb6a853b8bb1778e8fef17b86fc9 ]
When IDXD is not configurable, that means its WQ, engine, and group configurations cannot be changed. But it can be disabled and its state should be set as disabled regardless it's configurable or not.
Fix this by setting device state IDXD_DEV_DISABLED for read-only device as well in idxd_device_clear_state().
--- drivers/dma/idxd/device.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/dma/idxd/device.c +14 -6
@@ -724,13 +724,21 @@ static void idxd_device_wqs_clear_state(struct idxd_device *idxd)void idxd_device_clear_state (struct idxd_device *idxd) { -if (!test_bit (IDXD_FLAG_CONFIGURABLE , &idxd->flags)) -return ; +/* IDXD is always disabled. Other states are cleared only when IDXD is configurable. */ +if (test_bit (IDXD_FLAG_CONFIGURABLE , &idxd->flags)) { +/* +* Clearing wq state is protected by wq lock. +* So no need to be protected by device lock. +*/ +idxd_device_wqs_clear_state (idxd); + +spin_lock (&idxd->dev_lock); +idxd_groups_clear_state (idxd); +idxd_engines_clear_state (idxd); + }else { +spin_lock (&idxd->dev_lock); + } -idxd_device_wqs_clear_state (idxd); -spin_lock (&idxd->dev_lock); -idxd_groups_clear_state (idxd); -idxd_engines_clear_state (idxd); idxd->state =IDXD_DEV_DISABLED ;spin_unlock (&idxd->dev_lock); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/190 dmaengine: apple-admac: Fix grabbing of channels in of_xlate
In reply to Greg Kroah-HartmanFrom: Martin Povišer <[email protected]>
[ Upstream commit 8454f880c24bca0d9d4bfb6ed4a4a5429a4d9b20 ]
The of_xlate callback is supposed to return the channel after already having 'grabbed' it for private use, so fill that in.
--- drivers/dma/apple-admac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/apple-admac.c +1 -1
@@ -490,7 +490,7 @@ static struct dma_chan *admac_dma_of_xlate(struct of_phandle_args *dma_spec,return NULL ; } -return &ad->channels[index].chan; +return dma_get_slave_channel (&ad->channels[index].chan); }static int admac_drain_reports (struct admac_data *ad,int channo)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 68/190 dmaengine: mv_xor_v2: Fix a resource leak in mv_xor_v2_remove()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 081195d17a0c4c636da2b869bd5809d42e8cbb13 ]
A clk_prepare_enable() call in the probe is not balanced by a corresponding clk_disable_unprepare() in the remove function.
Add the missing call.
--- drivers/dma/mv_xor_v2.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/mv_xor_v2.c +1 -0
@@ -893,6 +893,7 @@ static int mv_xor_v2_remove(struct platform_device *pdev)tasklet_kill (&xor_dev->irq_tasklet);clk_disable_unprepare (xor_dev->clk); +clk_disable_unprepare (xor_dev->reg_clk);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/190 dmaengine: ti: k3-udma-glue: fix memory leak when register device fail
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit ac2b9f34f02052709aea7b34bb2a165e1853eb41 ]
If device_register() fails, it should call put_device() to give up reference, the name allocated in dev_set_name() can be freed in callback function kobject_cleanup().
--- drivers/dma/ti/k3-udma-glue.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/dma/ti/k3-udma-glue.c +3 -0
@@ -299,6 +299,7 @@ struct k3_udma_glue_tx_channel *k3_udma_glue_request_tx_chn(struct device *dev, ret =device_register (&tx_chn->common.chan_dev);if (ret) {dev_err (dev,"Channel Device registration failed %d\n" , ret); +put_device (&tx_chn->common.chan_dev); tx_chn->common.chan_dev.parent =NULL ; goto err; }
@@ -917,6 +918,7 @@ k3_udma_glue_request_rx_chn_priv(struct device *dev, const char *name, ret =device_register (&rx_chn->common.chan_dev);if (ret) {dev_err (dev,"Channel Device registration failed %d\n" , ret); +put_device (&rx_chn->common.chan_dev); rx_chn->common.chan_dev.parent =NULL ; goto err; }
@@ -1048,6 +1050,7 @@ k3_udma_glue_request_remote_rx_chn(struct device *dev, const char *name, ret =device_register (&rx_chn->common.chan_dev);if (ret) {dev_err (dev,"Channel Device registration failed %d\n" , ret); +put_device (&rx_chn->common.chan_dev); rx_chn->common.chan_dev.parent =NULL ; goto err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/190 dmaengine: stm32-dma: fix potential race between pause and resume
In reply to Greg Kroah-HartmanFrom: Amelie Delaunay <[email protected]>
[ Upstream commit 140fd5e74a1cc7413df88c735fff5ec64d33c1d3 ]
When disabling dma channel, a TCF flag is set and as TCIE is enabled, an interrupt is raised.
On a busy system, the interrupt may have latency and the user can ask for dmaengine_resume while stm32-dma driver has not yet managed the complete pause (backup of registers to restore state in resume).
To avoid such a case, instead of waiting the interrupt to backup the registers, do it just after disabling the channel and discard Transfer Complete interrupt in case the channel is paused.
--- drivers/dma/stm32-dma.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/dma/stm32-dma.c +6 -8
@@ -663,6 +663,8 @@ static void stm32_dma_handle_chan_paused(struct stm32_dma_chan *chan) chan->chan_reg.dma_sndtr =stm32_dma_read (dmadev,STM32_DMA_SNDTR (chan->id)); + chan->status =DMA_PAUSED ; +dev_dbg (chan2dev (chan),"vchan %pK: paused\n" , &chan->vchan); }
@@ -775,9 +777,7 @@ static irqreturn_t stm32_dma_chan_irq(int irq, void *devid)if (status &STM32_DMA_TCI ) {stm32_dma_irq_clear (chan,STM32_DMA_TCI );if (scr &STM32_DMA_SCR_TCIE ) { -if (chan->status ==DMA_PAUSED && !(scr &STM32_DMA_SCR_EN )) -stm32_dma_handle_chan_paused (chan); -else +if (chan->status !=DMA_PAUSED )stm32_dma_handle_chan_done (chan, scr); } status &= ~STM32_DMA_TCI ;
@@ -824,13 +824,11 @@ static int stm32_dma_pause(struct dma_chan *c)return -EPERM ;spin_lock_irqsave (&chan->vchan.lock, flags); + ret =stm32_dma_disable_chan (chan); -/* -* A transfer complete flag is set to indicate the end of transfer due to the stream -* interruption, so wait for interrupt -*/ if (!ret) - chan->status =DMA_PAUSED ; +stm32_dma_handle_chan_paused (chan); +spin_unlock_irqrestore (&chan->vchan.lock, flags);return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/190 net: lapbether: fix issue of invalid opcode in lapbeth_open()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 3faf7e14ec0c3462c2d747fa6793b8645d1391df ]
If lapb_register() failed when lapb device goes to up for the first time, the NAPI is not disabled. As a result, the invalid opcode issue is reported when the lapb device goes to up for the second time.
The stack info is as follows:
[ 1958.311422][T11356] kernel BUG at net/core/dev.c:6442! [ 1958.312206][T11356] invalid opcode: 0000 [#1] PREEMPT SMP KASAN [ 1958.315979][T11356] RIP: 0010:napi_enable+0x16a/0x1f0 [ 1958.332310][T11356] Call Trace: [ 1958.332817][T11356] <TASK> [ 1958.336135][T11356] lapbeth_open+0x18/0x90 [ 1958.337446][T11356] __dev_open+0x258/0x490 [ 1958.341672][T11356] __dev_change_flags+0x4d4/0x6a0 [ 1958.345325][T11356] dev_change_flags+0x93/0x160 [ 1958.346027][T11356] devinet_ioctl+0x1276/0x1bf0 [ 1958.346738][T11356] inet_ioctl+0x1c8/0x2d0 [ 1958.349638][T11356] sock_ioctl+0x5d1/0x750 [ 1958.356059][T11356] __x64_sys_ioctl+0x3ec/0x1790 [ 1958.365594][T11356] do_syscall_64+0x35/0x80 [ 1958.366239][T11356] entry_SYSCALL_64_after_hwframe+0x46/0xb0 [ 1958.377381][T11356] </TASK>
--- drivers/net/wan/lapbether.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wan/lapbether.c +1 -0
@@ -325,6 +325,7 @@ static int lapbeth_open(struct net_device *dev) err =lapb_register (dev, &lapbeth_callbacks);if (err !=LAPB_OK ) { +napi_disable (&lapbeth->napi);pr_err ("lapb_register error: %d\n" , err);return -ENODEV ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/190 net: ethernet: mtk-star-emac: disable napi when connect and start PHY failed in mtk_star_enable()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit b0c09c7f08c2467b2089bdf4adb2fbbc2464f4a8 ]
When failed to connect to and start PHY in mtk_star_enable() for opening device, napi isn't disabled. When open mtk star device next time, it will reports a invalid opcode issue. Fix it. Only be compiled, not be tested.
--- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mediatek/mtk_star_emac.c +2 -0
@@ -1026,6 +1026,8 @@ static int mtk_star_enable(struct net_device *ndev)return 0 ; err_free_irq: +napi_disable (&priv->rx_napi); +napi_disable (&priv->tx_napi);free_irq (ndev->irq, ndev); err_free_skbs:mtk_star_free_rx_skbs (priv);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/190 octeontx2-pf: Fix SQE threshold checking
In reply to Greg Kroah-HartmanFrom: Ratheesh Kannoth <[email protected]>
[ Upstream commit f0dfc4c88ef39be0ba736aa0ce6119263fc19aeb ]
Current way of checking available SQE count which is based on HW updated SQB count could result in driver submitting an SQE even before CQE for the previously transmitted SQE at the same index is processed in NAPI resulting losing SKB pointers, hence a leak. Fix this by checking a consumer index which is updated once CQE is processed.
--- .../marvell/octeontx2/nic/otx2_common.c | 1 + .../marvell/octeontx2/nic/otx2_txrx.c | 32 +++++++++++-------- .../marvell/octeontx2/nic/otx2_txrx.h | 1 + 3 files changed, 21 insertions(+), 13 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1 -0
@@ -863,6 +863,7 @@ static int otx2_sq_init(struct otx2_nic *pfvf, u16 qidx, u16 sqb_aura) } sq->head =0 ; + sq->cons_head =0 ; sq->sqe_per_sqb = (pfvf->hw.sqb_size / sq->sqe_size) -1 ; sq->num_sqbs = (qset->sqe_cnt + sq->sqe_per_sqb) / sq->sqe_per_sqb;/* Set SQE threshold to 10% of total SQEs */
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c +19 -13
@@ -435,6 +435,7 @@ static int otx2_tx_napi_handler(struct otx2_nic *pfvf, struct otx2_cq_queue *cq, int budget) { int tx_pkts = 0, tx_bytes = 0, qidx; +struct otx2_snd_queue *sq;struct nix_cqe_tx_s *cqe;int processed_cqe =0 ;
@@ -445,6 +446,9 @@ static int otx2_tx_napi_handler(struct otx2_nic *pfvf,return 0 ; process_cqe: + qidx = cq->cq_idx - pfvf->hw.rx_queues; + sq = &pfvf->qset.sq[qidx]; +while (likely (processed_cqe < budget) && cq->pend_cqe) { cqe = (struct nix_cqe_tx_s *)otx2_get_next_cqe (cq);if (unlikely (!cqe)) {
@@ -452,18 +456,20 @@ static int otx2_tx_napi_handler(struct otx2_nic *pfvf,return 0 ;break ; } +if (cq->cq_type ==CQ_XDP ) { - qidx = cq->cq_idx - pfvf->hw.rx_queues; -otx2_xdp_snd_pkt_handler (pfvf, &pfvf->qset.sq[qidx], - cqe); +otx2_xdp_snd_pkt_handler (pfvf, sq, cqe); }else { -otx2_snd_pkt_handler (pfvf, cq, - &pfvf->qset.sq[cq->cint_idx], - cqe, budget, &tx_pkts, &tx_bytes); +otx2_snd_pkt_handler (pfvf, cq, sq, cqe, budget, + &tx_pkts, &tx_bytes); } + cqe->hdr.cqe_type =NIX_XQE_TYPE_INVALID ; processed_cqe++; cq->pend_cqe--; + + sq->cons_head++; + sq->cons_head &= (sq->sqe_cnt -1 ); }/* Free CQEs to HW */
@@ -972,17 +978,17 @@ bool otx2_sq_append_skb(struct net_device *netdev, struct otx2_snd_queue *sq, {struct netdev_queue *txq =netdev_get_tx_queue (netdev, qidx);struct otx2_nic *pfvf =netdev_priv (netdev); -int offset, num_segs, free_sqe; +int offset, num_segs, free_desc;struct nix_sqe_hdr_s *sqe_hdr; -/* Check if there is room for new SQE. -* 'Num of SQBs freed to SQ's pool - SQ's Aura count' -* will give free SQE count. +/* Check if there is enough room between producer +* and consumer index. */ - free_sqe = (sq->num_sqbs - *sq->aura_fc_addr) * sq->sqe_per_sqb; + free_desc = (sq->cons_head - sq->head -1 + sq->sqe_cnt) & (sq->sqe_cnt -1 ); +if (free_desc < sq->sqe_thresh) +return false; -if (free_sqe < sq->sqe_thresh || - free_sqe <otx2_get_sqe_count (pfvf, skb)) +if (free_desc <otx2_get_sqe_count (pfvf, skb))return false; num_segs =skb_shinfo (skb)->nr_frags +1 ;
drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h +1 -0
@@ -79,6 +79,7 @@ struct sg_list {struct otx2_snd_queue {u8 aura_id;u16 head; +u16 cons_head;u16 sqe_size;u32 sqe_cnt;u16 num_sqbs;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/190 drivers: net: xgene: disable napi when register irq failed in xgene_enet_open()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit ce9e57feeed81d17d5e80ed86f516ff0d39c3867 ]
When failed to register irq in xgene_enet_open() for opening device, napi isn't disabled. When open xgene device next time, it will reports a invalid opcode issue. Fix it. Only be compiled, not be tested.
--- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +3 -1
@@ -1004,8 +1004,10 @@ static int xgene_enet_open(struct net_device *ndev)xgene_enet_napi_enable (pdata); ret =xgene_enet_register_irq (ndev); -if (ret) +if (ret) { +xgene_enet_napi_disable (pdata);return ret; + }if (ndev->phydev) {phy_start (ndev->phydev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 75/190 perf stat: Fix crash with --per-node --metric-only in CSV mode
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit 84d1b2013272947ad9b13025df89226d8fa31cc5 ]
The following command will get segfault due to missing aggr_header_csv for AGGR_NODE:
$ sudo perf stat -a --per-node -x, --metric-only true
Committer testing:
Before this patch:
# perf stat -a --per-node -x, --metric-only true Segmentation fault (core dumped) #
After:
# gdb perf -bash: gdb: command not found # perf stat -a --per-node -x, --metric-only true node,Ghz,frontend cycles idle,backend cycles idle,insn per cycle,branch-misses of all branches, N0,32,0.335,2.10,0.65,0.69,0.03,1.92, #
--- tools/perf/util/stat-display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/stat-display.c +3 -1
@@ -556,7 +556,7 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int [AGGR_CORE] = 2, [AGGR_THREAD] = 1, [AGGR_UNSET] = 0, - [AGGR_NODE ] =0 , + [AGGR_NODE ] =1 , }; pm = config->metric_only ? print_metric_only_csv : print_metric_csv;
@@ -1126,6 +1126,7 @@ static int aggr_header_lens[] = { [AGGR_SOCKET] = 12, [AGGR_NONE] = 6, [AGGR_THREAD] = 24, + [AGGR_NODE] = 6, [AGGR_GLOBAL] = 0, };
@@ -1135,6 +1136,7 @@ static const char *aggr_header_csv[] = { [AGGR_SOCKET] = "socket,cpus", [AGGR_NONE] = "cpu,", [AGGR_THREAD] = "comm-pid,", + [AGGR_NODE] = "node,", [AGGR_GLOBAL] = "" };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/190 perf stat: Fix printing os->prefix in CSV metrics output
In reply to Greg Kroah-HartmanFrom: Athira Rajeev <[email protected]>
[ Upstream commit ad353b710c7493df3d4fc2d3a51819126bed2e81 ]
'perf stat' with CSV output option prints an extra empty string as first field in metrics output line. Sample output below:
# ./perf stat -x, --per-socket -a -C 1 ls S0,1,1.78,msec,cpu-clock,1785146,100.00,0.973,CPUs utilized S0,1,26,,context-switches,1781750,100.00,0.015,M/sec S0,1,1,,cpu-migrations,1780526,100.00,0.561,K/sec S0,1,1,,page-faults,1779060,100.00,0.561,K/sec S0,1,875807,,cycles,1769826,100.00,0.491,GHz S0,1,85281,,stalled-cycles-frontend,1767512,100.00,9.74,frontend cycles idle S0,1,576839,,stalled-cycles-backend,1766260,100.00,65.86,backend cycles idle S0,1,288430,,instructions,1762246,100.00,0.33,insn per cycle ====> ,S0,1,,,,,,,2.00,stalled cycles per insn
The above command line uses field separator as "," via "-x," option and per-socket option displays socket value as first field. But here the last line for "stalled cycles per insn" has "," in the beginning.
Sample output using interval mode:
# ./perf stat -I 1000 -x, --per-socket -a -C 1 ls 0.001813453,S0,1,1.87,msec,cpu-clock,1872052,100.00,0.002,CPUs utilized 0.001813453,S0,1,2,,context-switches,1868028,100.00,1.070,K/sec ------ 0.001813453,S0,1,85379,,instructions,1856754,100.00,0.32,insn per cycle ====> 0.001813453,,S0,1,,,,,,,1.34,stalled cycles per insn
Above result also has an extra CSV separator after the timestamp. Patch addresses extra field separator in the beginning of the metric output line.
The counter stats are displayed by function "perf_stat__print_shadow_stats" in code "util/stat-shadow.c". While printing the stats info for "stalled cycles per insn", function "new_line_csv" is used as new_line callback.
The new_line_csv function has check for "os->prefix" and if prefix is not null, it will be printed along with cvs separator.
Snippet from "new_line_csv":
if (os->prefix)
fprintf(os->fh, "%s%s", os->prefix, config->csv_sep);Here os->prefix gets printed followed by ","
which is the cvs separator. The os->prefix is
used in interval mode option ( -I ), to print
time stamp on every new line. But prefix is
already set to contain CSV separator when used
in interval mode for CSV option.
Reference: Function "static void print_interval"
Snippet:
sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, config->csv_sep);
Also if prefix is not assigned (if not used with -I option), it gets set to empty string.
Reference: function printout() in util/stat-display.c Snippet:
.prefix = prefix ? prefix : "",
Since prefix already set to contain cvs_sep in interval option, patch removes printing config->csv_sep in new_line_csv function to avoid printing extra field.
After the patch:
# ./perf stat -x, --per-socket -a -C 1 ls S0,1,2.04,msec,cpu-clock,2045202,100.00,1.013,CPUs utilized S0,1,2,,context-switches,2041444,100.00,979.289,/sec S0,1,0,,cpu-migrations,2040820,100.00,0.000,/sec S0,1,2,,page-faults,2040288,100.00,979.289,/sec S0,1,254589,,cycles,2036066,100.00,0.125,GHz S0,1,82481,,stalled-cycles-frontend,2032420,100.00,32.40,frontend cycles idle S0,1,113170,,stalled-cycles-backend,2031722,100.00,44.45,backend cycles idle S0,1,88766,,instructions,2030942,100.00,0.35,insn per cycle S0,1,,,,,,,1.27,stalled cycles per insn
--- tools/perf/util/stat-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/stat-display.c +1 -1
@@ -273,7 +273,7 @@ static void new_line_csv(struct perf_stat_config *config, void *ctx)fputc ('\n' , os->fh);if (os->prefix) -fprintf (os->fh,"%s%s" , os->prefix, config->csv_sep); +fprintf (os->fh,"%s" , os->prefix);aggr_printout (config, os->evsel, os->id, os->nr);for (i =0 ; i < os->nfields; i++)fputs (config->csv_sep, os->fh);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 77/190 perf test: Fix skipping branch stack sampling test
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
[ Upstream commit 20ebc4a649b82e6ad892684c76ea1e8dd786d336 ]
Commit f4a2aade6809c657 ("perf tests powerpc: Fix branch stack sampling test to include sanity check for branch filter") added a skip if certain branch options aren't available.
But the change added both -b (--branch-any) and --branch-filter options at the same time, which will always result in a failure on any platform because the arguments can't be used together.
Fix this by removing -b (--branch-any) and leaving --branch-filter which already specifies 'any'. Also add warning messages to the test and perf tool.
Output on x86 before this fix:
$ sudo ./perf test branch 108: Check branch stack sampling : Skip
After:
$ sudo ./perf test branch 108: Check branch stack sampling : Ok
--- tools/perf/tests/shell/test_brstack.sh | 5 ++++- tools/perf/util/parse-branch-options.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)
tools/perf/tests/shell/test_brstack.sh +4 -1
@@ -13,7 +13,10 @@ fi # skip the test if the hardware doesn't support branch stack sampling # and if the architecture doesn't support filter types: any,save_type,u -perf record -b -o- -B --branch-filter any,save_type,u true > /dev/null 2>&1 || exit 2 +if ! perf record -o- --no-buildid --branch-filter any,save_type,u -- true > /dev/null 2>&1 ; then + echo "skip: system doesn't support filter types: any,save_type,u" + exit 2 +fi TMPDIR=$(mktemp -d /tmp/__perf_test.program.XXXXX)
tools/perf/util/parse-branch-options.c +3 -1
@@ -101,8 +101,10 @@ parse_branch_stack(const struct option *opt, const char *str, int unset)/* * cannot set it twice, -b + --branch-filter for instance */ -if (*mode) +if (*mode) { +pr_err ("Error: Can't use --branch-any (-b) with --branch-filter (-j).\n" );return -1 ; + }return parse_branch_str (str, mode); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 78/190 perf tools: Add the include/perf/ directory to .gitignore
In reply to Greg Kroah-HartmanFrom: Donglin Peng <[email protected]>
[ Upstream commit 94d957ae513fc420d0a5a9bac815eb49ffebb56f ]
Commit 3af1dfdd51e06697 ("perf build: Move perf_dlfilters.h in the source tree") moved perf_dlfilters.h to the include/perf/ directory while include/perf is ignored because it has 'perf' in the name. Newly created files in the include/perf/ directory will be ignored.
Testing:
Before:
$ touch tools/perf/include/perf/junk $ git status | grep junk $ git check-ignore -v tools/perf/include/perf/junk tools/perf/.gitignore:6:perf tools/perf/include/perf/junk
After:
$ git status | grep junk tools/perf/include/perf/junk $ git check-ignore -v tools/perf/include/perf/junk
Add !include/perf/ to perf's .gitignore file.
--- tools/perf/.gitignore | 1 + 1 file changed, 1 insertion(+)
tools/perf/.gitignore +1 -0
@@ -4,6 +4,7 @@ PERF-GUI-VARS PERF-VERSION-FILE FEATURE-DUMP perf +!include/perf/ perf-read-vdso32 perf-read-vdsox32 perf-help
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/190 netfilter: nfnetlink: fix potential dead lock in nfnetlink_rcv_msg()
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 03832a32bf8ff0a8305d94ddd3979835a807248f ]
When type is NFNL_CB_MUTEX and -EAGAIN error occur in nfnetlink_rcv_msg(), it does not execute nfnl_unlock(). That would trigger potential dead lock.
--- net/netfilter/nfnetlink.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nfnetlink.c +1 -0
@@ -294,6 +294,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,nfnl_lock (subsys_id);if (nfnl_dereference_protected (subsys_id) != ss ||nfnetlink_find_client (type, ss) != nc) { +nfnl_unlock (subsys_id); err = -EAGAIN ;break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 80/190 netfilter: Cleanup nft_net->module_list from nf_tables_exit_net()
In reply to Greg Kroah-HartmanFrom: Shigeru Yoshida <[email protected]>
[ Upstream commit 03c1f1ef1584c981935fab2fa0c45d3e43e2c235 ]
syzbot reported a warning like below [1]:
WARNING: CPU: 3 PID: 9 at net/netfilter/nf_tables_api.c:10096 nf_tables_exit_net+0x71c/0x840 Modules linked in: CPU: 2 PID: 9 Comm: kworker/u8:0 Tainted: G W 6.1.0-rc3-00072-g8e5423e991e8 #47 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-1.fc36 04/01/2014 Workqueue: netns cleanup_net RIP: 0010:nf_tables_exit_net+0x71c/0x840 ... Call Trace: <TASK> ? __nft_release_table+0xfc0/0xfc0 ops_exit_list+0xb5/0x180 cleanup_net+0x506/0xb10 ? unregister_pernet_device+0x80/0x80 process_one_work+0xa38/0x1730 ? pwq_dec_nr_in_flight+0x2b0/0x2b0 ? rwlock_bug.part.0+0x90/0x90 ? _raw_spin_lock_irq+0x46/0x50 worker_thread+0x67e/0x10e0 ? process_one_work+0x1730/0x1730 kthread+0x2e5/0x3a0 ? kthread_complete_and_exit+0x40/0x40 ret_from_fork+0x1f/0x30 </TASK>
In nf_tables_exit_net(), there is a case where nft_net->commit_list is empty but nft_net->module_list is not empty. Such a case occurs with the following scenario:
1. nfnetlink_rcv_batch() is called
2. nf_tables_newset() returns -EAGAIN and NFNL_BATCH_FAILURE bit is set to status
3. nf_tables_abort() is called with NFNL_ABORT_AUTOLOAD (nft_net->commit_list is released, but nft_net->module_list is not because of NFNL_ABORT_AUTOLOAD flag)
4. Jump to replay label
5. netlink_skb_clone() fails and returns from the function (this is caused by fault injection in the reproducer of syzbot)
This patch fixes this issue by calling __nf_tables_abort() when nft_net->module_list is not empty in nf_tables_exit_net().
--- net/netfilter/nf_tables_api.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +2 -1
@@ -10090,7 +10090,8 @@ static void __net_exit nf_tables_exit_net(struct net *net)struct nftables_pernet *nft_net =nft_pernet (net);mutex_lock (&nft_net->commit_mutex); -if (!list_empty (&nft_net->commit_list)) +if (!list_empty (&nft_net->commit_list) || + !list_empty (&nft_net->module_list))__nf_tables_abort (net,NFNL_ABORT_NONE );__nft_release_tables (net);mutex_unlock (&nft_net->commit_mutex);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 81/190 net: marvell: prestera: fix memory leak in prestera_rxtx_switch_init()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 519b58bbfa825f042fcf80261cc18e1e35f85ffd ]
When prestera_sdma_switch_init() failed, the memory pointed to by sw->rxtx isn't released. Fix it. Only be compiled, not be tested.
--- drivers/net/ethernet/marvell/prestera/prestera_rxtx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/prestera/prestera_rxtx.c +6 -1
@@ -776,6 +776,7 @@ static netdev_tx_t prestera_sdma_xmit(struct prestera_sdma *sdma,int prestera_rxtx_switch_init (struct prestera_switch *sw) {struct prestera_rxtx *rxtx; +int err; rxtx =kzalloc (sizeof (*rxtx),GFP_KERNEL );if (!rxtx)
@@ -783,7 +784,11 @@ int prestera_rxtx_switch_init(struct prestera_switch *sw) sw->rxtx = rxtx; -return prestera_sdma_switch_init (sw); + err =prestera_sdma_switch_init (sw); +if (err) +kfree (rxtx); + +return err; }void prestera_rxtx_switch_fini (struct prestera_switch *sw)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 82/190 net: tun: call napi_schedule_prep() to ensure we own a napi
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 07d120aa33cc9d9115753d159f64d20c94458781 ]
A recent patch exposed another issue in napi_get_frags() caught by syzbot [1]
Before feeding packets to GRO, and calling napi_complete() we must first grab NAPI_STATE_SCHED.
[1]
WARNING: CPU: 0 PID: 3612 at net/core/dev.c:6076 napi_complete_done+0x45b/0x880 net/core/dev.c:6076 Modules linked in: CPU: 0 PID: 3612 Comm: syz-executor408 Not tainted 6.1.0-rc3-syzkaller-00175-g1118b2049d77 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 RIP: 0010:napi_complete_done+0x45b/0x880 net/core/dev.c:6076 Code: c1 ea 03 0f b6 14 02 4c 89 f0 83 e0 07 83 c0 03 38 d0 7c 08 84 d2 0f 85 24 04 00 00 41 89 5d 1c e9 73 fc ff ff e8 b5 53 22 fa <0f> 0b e9 82 fe ff ff e8 a9 53 22 fa 48 8b 5c 24 08 31 ff 48 89 de RSP: 0018:ffffc90003c4f920 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000000030 RCX: 0000000000000000 RDX: ffff8880251c0000 RSI: ffffffff875a58db RDI: 0000000000000007 RBP: 0000000000000001 R08: 0000000000000007 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000001 R12: ffff888072d02628 R13: ffff888072d02618 R14: ffff888072d02634 R15: 0000000000000000 FS: 0000555555f13300(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055c44d3892b8 CR3: 00000000172d2000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> napi_complete include/linux/netdevice.h:510 [inline] tun_get_user+0x206d/0x3a60 drivers/net/tun.c:1980 tun_chr_write_iter+0xdb/0x200 drivers/net/tun.c:2027 call_write_iter include/linux/fs.h:2191 [inline] do_iter_readv_writev+0x20b/0x3b0 fs/read_write.c:735 do_iter_write+0x182/0x700 fs/read_write.c:861 vfs_writev+0x1aa/0x630 fs/read_write.c:934 do_writev+0x133/0x2f0 fs/read_write.c:977 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f37021a3c19
--- drivers/net/tun.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/tun.c +13 -6
@@ -1967,18 +1967,25 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, skb_headlen(skb));if (unlikely (headlen >skb_headlen (skb))) { +WARN_ON_ONCE (1 ); + err = -ENOMEM ;dev_core_stats_rx_dropped_inc (tun->dev); +napi_busy:napi_free_frags (&tfile->napi);rcu_read_unlock ();mutex_unlock (&tfile->napi_mutex); -WARN_ON (1 ); -return -ENOMEM ; +return err; } -local_bh_disable (); -napi_gro_frags (&tfile->napi); -napi_complete (&tfile->napi); -local_bh_enable (); +if (likely (napi_schedule_prep (&tfile->napi))) { +local_bh_disable (); +napi_gro_frags (&tfile->napi); +napi_complete (&tfile->napi); +local_bh_enable (); + }else { + err = -EBUSY ; + goto napi_busy; + }mutex_unlock (&tfile->napi_mutex); }else if (tfile->napi_enabled) {struct sk_buff_head *queue = &tfile->sk.sk_write_queue;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/190 net: nixge: disable napi when enable interrupts failed in nixge_open()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit b06334919c7a068d54ba5b219c05e919d89943f7 ]
When failed to enable interrupts in nixge_open() for opening device, napi isn't disabled. When open nixge device next time, it will reports a invalid opcode issue. Fix it. Only be compiled, not be tested.
--- drivers/net/ethernet/ni/nixge.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/ni/nixge.c +1 -0
@@ -900,6 +900,7 @@ static int nixge_open(struct net_device *ndev) err_rx_irq:free_irq (priv->tx_irq, ndev); err_tx_irq: +napi_disable (&priv->napi);phy_stop (phy);phy_disconnect (phy);tasklet_kill (&priv->dma_err_tasklet);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/190 net: wwan: iosm: fix memory leak in ipc_pcie_read_bios_cfg
In reply to Greg Kroah-HartmanFrom: M Chetan Kumar <[email protected]>
[ Upstream commit d38a648d2d6cc7bee11c6f533ff9426a00c2a74c ]
ipc_pcie_read_bios_cfg() is using the acpi_evaluate_dsm() to obtain the wwan power state configuration from BIOS but is not freeing the acpi_object. The acpi_evaluate_dsm() returned acpi_object to be freed.
Free the acpi_object after use.
--- drivers/net/wwan/iosm/iosm_ipc_pcie.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/wwan/iosm/iosm_ipc_pcie.c +8 -3
@@ -232,6 +232,7 @@ static void ipc_pcie_config_init(struct iosm_pcie *ipc_pcie)*/ static enum ipc_pcie_sleep_state ipc_pcie_read_bios_cfg (struct device *dev) { +enum ipc_pcie_sleep_state sleep_state =IPC_PCIE_D0L12 ;union acpi_object *object;acpi_handle handle_acpi;
@@ -242,12 +243,16 @@ static enum ipc_pcie_sleep_state ipc_pcie_read_bios_cfg(struct device *dev) } object =acpi_evaluate_dsm (handle_acpi, &wwan_acpi_guid,0 ,3 ,NULL ); +if (!object) + goto default_ret; + +if (object->integer.value ==3 ) + sleep_state =IPC_PCIE_D3L2 ; -if (object && object->integer.value ==3 ) -return IPC_PCIE_D3L2 ; +kfree (object); default_ret: -return IPC_PCIE_D0L12 ; +return sleep_state; } static int ipc_pcie_probe(struct pci_dev *pci,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 85/190 net: wwan: iosm: fix invalid mux header type
In reply to Greg Kroah-HartmanFrom: M Chetan Kumar <[email protected]>
[ Upstream commit 02d2d2ea4a3bc2391f6ac31f6854da83e8a63829 ]
Data stall seen during peak DL throughput test & packets are dropped by mux layer due to invalid header type in datagram.
During initlization Mux aggregration protocol is set to default UL/DL size and TD count of Mux lite protocol. This configuration mismatch between device and driver is resulting in data stall/packet drops.
Override the UL/DL size and TD count for Mux aggregation protocol.
--- drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 8 ++++++++ drivers/net/wwan/iosm/iosm_ipc_mux.h | 1 + 2 files changed, 9 insertions(+)
drivers/net/wwan/iosm/iosm_ipc_imem_ops.c +8 -0
@@ -91,6 +91,14 @@ void ipc_imem_wwan_channel_init(struct iosm_imem *ipc_imem, }ipc_chnl_cfg_get (&chnl_cfg, ipc_imem->nr_of_channels); + +if (ipc_imem->mmio->mux_protocol ==MUX_AGGREGATION && + ipc_imem->nr_of_channels ==IPC_MEM_IP_CHL_ID_0 ) { + chnl_cfg.ul_nr_of_entries =IPC_MEM_MAX_TDS_MUX_AGGR_UL ; + chnl_cfg.dl_nr_of_entries =IPC_MEM_MAX_TDS_MUX_AGGR_DL ; + chnl_cfg.dl_buf_size =IPC_MEM_MAX_ADB_BUF_SIZE ; + } +ipc_imem_channel_init (ipc_imem,IPC_CTYPE_WWAN , chnl_cfg,IRQ_MOD_OFF );
drivers/net/wwan/iosm/iosm_ipc_mux.h +1 -0
@@ -10,6 +10,7 @@#define IPC_MEM_MAX_UL_DG_ENTRIES 100#define IPC_MEM_MAX_TDS_MUX_AGGR_UL 60 +#define IPC_MEM_MAX_TDS_MUX_AGGR_DL 60#define IPC_MEM_MAX_ADB_BUF_SIZE (16 * 1024)#define IPC_MEM_MAX_UL_ADB_BUF_SIZE IPC_MEM_MAX_ADB_BUF_SIZE
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/190 net/mlx5: Bridge, verify LAG state when adding bond to bridge
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit 15f8f168952f54d3c86d734dc764f20844e423ac ]
Mlx5 LAG is initialized asynchronously on a workqueue which means that for a brief moment after setting mlx5 UL representors as lower devices of a bond netdevice the LAG itself is not fully initialized in the driver. When adding such bond device to a bridge mlx5 bridge code will not consider it as offload-capable, skip creating necessary bookkeeping and fail any further bridge offload-related commands with it (setting VLANs, offloading FDBs, etc.). In order to make the error explicit during bridge initialization stage implement the code that detects such condition during NETDEV_PRECHANGEUPPER event and returns an error.
--- .../mellanox/mlx5/core/en/rep/bridge.c | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c +31 -0
@@ -164,6 +164,36 @@ static int mlx5_esw_bridge_port_changeupper(struct notifier_block *nb, void *ptrreturn err; } +static int +mlx5_esw_bridge_changeupper_validate_netdev (void *ptr) +{ +struct net_device *dev =netdev_notifier_info_to_dev (ptr); +struct netdev_notifier_changeupper_info *info = ptr; +struct net_device *upper = info->upper_dev; +struct net_device *lower; +struct list_head *iter; + +if (!netif_is_bridge_master (upper) || !netif_is_lag_master (dev)) +return 0 ; + +netdev_for_each_lower_dev (dev, lower, iter) { +struct mlx5_core_dev *mdev; +struct mlx5e_priv *priv; + +if (!mlx5e_eswitch_rep (lower)) +continue ; + + priv =netdev_priv (lower); + mdev = priv->mdev; +if (!mlx5_lag_is_active (mdev)) +return -EAGAIN ; +if (!mlx5_lag_is_shared_fdb (mdev)) +return -EOPNOTSUPP ; + } + +return 0 ; +} +static int mlx5_esw_bridge_switchdev_port_event (struct notifier_block *nb,unsigned long event,void *ptr) {
@@ -171,6 +201,7 @@ static int mlx5_esw_bridge_switchdev_port_event(struct notifier_block *nb,switch (event) {case NETDEV_PRECHANGEUPPER : + err =mlx5_esw_bridge_changeupper_validate_netdev (ptr);break ;case NETDEV_CHANGEUPPER :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/190 net/mlx5: Allow async trigger completion execution on single CPU systems
In reply to Greg Kroah-HartmanFrom: Roy Novich <[email protected]>
[ Upstream commit 2808b37b59288ad8f1897e3546c2296df3384b65 ]
For a single CPU system, the kernel thread executing mlx5_cmd_flush() never releases the CPU but calls down_trylock(&cmd→sem) in a busy loop. On a single processor system, this leads to a deadlock as the kernel thread which executes mlx5_cmd_invoke() never gets scheduled. Fix this, by adding the cond_resched() call to the loop, allow the command completion kernel thread to execute.
--- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/cmd.c +8 -3
@@ -1770,12 +1770,17 @@ void mlx5_cmd_flush(struct mlx5_core_dev *dev)struct mlx5_cmd *cmd = &dev->cmd;int i; -for (i =0 ; i < cmd->max_reg_cmds; i++) -while (down_trylock (&cmd->sem)) +for (i =0 ; i < cmd->max_reg_cmds; i++) { +while (down_trylock (&cmd->sem)) {mlx5_cmd_trigger_completions (dev); +cond_resched (); + } + } -while (down_trylock (&cmd->pages_sem)) +while (down_trylock (&cmd->pages_sem)) {mlx5_cmd_trigger_completions (dev); +cond_resched (); + }/* Unlock cmdif */ up (&cmd->pages_sem);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 88/190 net/mlx5: E-switch, Set to legacy mode if failed to change switchdev mode
In reply to Greg Kroah-HartmanFrom: Chris Mi <[email protected]>
[ Upstream commit e12de39c07a7872c1ac7250311bb60b74ff29f25 ]
No need to rollback to the other mode because probably will fail again. Just set to legacy mode and clear fdb table created flag. So that fdb table will not be cleared again.
--- .../net/ethernet/mellanox/mlx5/core/eswitch.c | 14 ++++++++------ .../mellanox/mlx5/core/eswitch_offloads.c | 18 +++--------------- 2 files changed, 11 insertions(+), 21 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +8 -6
@@ -1388,12 +1388,14 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw) esw->mode ==MLX5_ESWITCH_LEGACY ?"LEGACY" :"OFFLOADS" , esw->esw_funcs.num_vfs, esw->enabled_vports); - esw->fdb_table.flags &= ~MLX5_ESW_FDB_CREATED ; -if (esw->mode ==MLX5_ESWITCH_OFFLOADS ) -esw_offloads_disable (esw); -else if (esw->mode ==MLX5_ESWITCH_LEGACY ) -esw_legacy_disable (esw); -mlx5_esw_acls_ns_cleanup (esw); +if (esw->fdb_table.flags &MLX5_ESW_FDB_CREATED ) { + esw->fdb_table.flags &= ~MLX5_ESW_FDB_CREATED ; +if (esw->mode ==MLX5_ESWITCH_OFFLOADS ) +esw_offloads_disable (esw); +else if (esw->mode ==MLX5_ESWITCH_LEGACY ) +esw_legacy_disable (esw); +mlx5_esw_acls_ns_cleanup (esw); + }if (esw->mode ==MLX5_ESWITCH_OFFLOADS )devl_rate_nodes_destroy (devlink);
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +3 -15
@@ -2207,7 +2207,7 @@ static int esw_create_restore_table(struct mlx5_eswitch *esw)static int esw_offloads_start (struct mlx5_eswitch *esw,struct netlink_ext_ack *extack) { -int err, err1; +int err; esw->mode =MLX5_ESWITCH_OFFLOADS ; err =mlx5_eswitch_enable_locked (esw, esw->dev->priv.sriov.num_vfs);
@@ -2215,11 +2215,6 @@ static int esw_offloads_start(struct mlx5_eswitch *esw,NL_SET_ERR_MSG_MOD (extack,"Failed setting eswitch to offloads" ); esw->mode =MLX5_ESWITCH_LEGACY ; - err1 =mlx5_eswitch_enable_locked (esw,MLX5_ESWITCH_IGNORE_NUM_VFS ); -if (err1) { -NL_SET_ERR_MSG_MOD (extack, -"Failed setting eswitch back to legacy" ); - }mlx5_rescan_drivers (esw->dev); }if (esw->offloads.inline_mode ==MLX5_INLINE_MODE_NONE ) {
@@ -3272,19 +3267,12 @@ int esw_offloads_enable(struct mlx5_eswitch *esw)static int esw_offloads_stop (struct mlx5_eswitch *esw,struct netlink_ext_ack *extack) { -int err, err1; +int err; esw->mode =MLX5_ESWITCH_LEGACY ; err =mlx5_eswitch_enable_locked (esw,MLX5_ESWITCH_IGNORE_NUM_VFS ); -if (err) { +if (err)NL_SET_ERR_MSG_MOD (extack,"Failed setting eswitch to legacy" ); - esw->mode =MLX5_ESWITCH_OFFLOADS ; - err1 =mlx5_eswitch_enable_locked (esw,MLX5_ESWITCH_IGNORE_NUM_VFS ); -if (err1) { -NL_SET_ERR_MSG_MOD (extack, -"Failed setting eswitch back to offloads" ); - } - }return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 89/190 net/mlx5: fw_reset: Dont try to load device in case PCI isnt working
In reply to Greg Kroah-HartmanFrom: Shay Drory <[email protected]>
[ Upstream commit 7d167b4a4c810919ba1affd02fc6b7f40e7e6eeb ]
In case PCI reads fail after unload, there is no use in trying to load the device.
--- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +2 -1
@@ -152,7 +152,8 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev)mlx5_unload_one (dev);if (mlx5_health_wait_pci_up (dev))mlx5_core_err (dev,"reset reload flow aborted, PCI reads still not working\n" ); -mlx5_load_one (dev, false); +else +mlx5_load_one (dev, false);devlink_remote_reload_actions_performed (priv_to_devlink (dev),0 ,BIT (DEVLINK_RELOAD_ACTION_DRIVER_REINIT ) |BIT (DEVLINK_RELOAD_ACTION_FW_ACTIVATE ));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/190 net/mlx5e: Add missing sanity checks for max TX WQE size
In reply to Greg Kroah-HartmanFrom: Maxim Mikityanskiy <[email protected]>
[ Upstream commit f9c955b4fe5c8626d11b8a9b93ccc0ba77358fec ]
The commit cited below started using the firmware capability for the maximum TX WQE size. This commit adds an important check to verify that the driver doesn't attempt to exceed this capability, and also restores another check mistakenly removed in the cited commit (a WQE must not exceed the page size).
--- .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 24 ++++++++++++++++++- .../net/ethernet/mellanox/mlx5/core/en_main.c | 7 ++++++ .../net/ethernet/mellanox/mlx5/core/en_tx.c | 5 ++++ 3 files changed, 35 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +23 -1
@@ -11,6 +11,27 @@#define INL_HDR_START_SZ (sizeof(((struct mlx5_wqe_eth_seg *)NULL)->inline_hdr.start)) +/* IPSEC inline data includes: +* 1. ESP trailer: up to 255 bytes of padding, 1 byte for pad length, 1 byte for +* next header. +* 2. ESP authentication data: 16 bytes for ICV. +*/ +#define MLX5E_MAX_TX_IPSEC_DS DIV_ROUND_UP(sizeof(struct mlx5_wqe_inline_seg) + \ + 255 + 1 + 1 + 16, MLX5_SEND_WQE_DS) + +/* 366 should be big enough to cover all L2, L3 and L4 headers with possible +* encapsulations. +*/ +#define MLX5E_MAX_TX_INLINE_DS DIV_ROUND_UP(366 - INL_HDR_START_SZ + VLAN_HLEN, \ + MLX5_SEND_WQE_DS) + +/* Sync the calculation with mlx5e_sq_calc_wqe_attr. */ +#define MLX5E_MAX_TX_WQEBBS DIV_ROUND_UP(MLX5E_TX_WQE_EMPTY_DS_COUNT + \ + MLX5E_MAX_TX_INLINE_DS + \ + MLX5E_MAX_TX_IPSEC_DS + \ + MAX_SKB_FRAGS + 1, \ + MLX5_SEND_WQEBB_NUM_DS) +#define MLX5E_RX_ERR_CQE (cqe) (get_cqe_opcode(cqe) != MLX5_CQE_RESP_SEND) static inline
@@ -424,6 +445,8 @@ mlx5e_set_eseg_swp(struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg,static inline u16 mlx5e_stop_room_for_wqe (struct mlx5_core_dev *mdev,u16 wqe_size) { +WARN_ON_ONCE (PAGE_SIZE /MLX5_SEND_WQE_BB <mlx5e_get_max_sq_wqebbs (mdev)); +/* A WQE must not cross the page boundary, hence two conditions: * 1. Its size must not exceed the page size. * 2. If the WQE size is X, and the space remaining in a page is less
@@ -436,7 +459,6 @@ static inline u16 mlx5e_stop_room_for_wqe(struct mlx5_core_dev *mdev, u16 wqe_si"wqe_size %u is greater than max SQ WQEBBs %u" , wqe_size, mlx5e_get_max_sq_wqebbs(mdev)); -return MLX5E_STOP_ROOM (wqe_size); }
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +7 -0
@@ -5514,6 +5514,13 @@ int mlx5e_attach_netdev(struct mlx5e_priv *priv)if (priv->fs) priv->fs->state_destroy = !test_bit (MLX5E_STATE_DESTROYING , &priv->state); +/* Validate the max_wqe_size_sq capability. */ +if (WARN_ON_ONCE (mlx5e_get_max_sq_wqebbs (priv->mdev) <MLX5E_MAX_TX_WQEBBS )) { +mlx5_core_warn (priv->mdev,"MLX5E: Max SQ WQEBBs firmware capability: %u, needed %lu\n" , +mlx5e_get_max_sq_wqebbs (priv->mdev),MLX5E_MAX_TX_WQEBBS ); +return -EIO ; + } +/* max number of channels may have changed */ max_nch =mlx5e_calc_max_nch (priv->mdev, priv->netdev, profile);if (priv->channels.params.num_channels > max_nch) {
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +5 -0
@@ -304,6 +304,8 @@ static void mlx5e_sq_calc_wqe_attr(struct sk_buff *skb, const struct mlx5e_tx_atu16 ds_cnt_inl =0 ;u16 ds_cnt_ids =0 ; +/* Sync the calculation with MLX5E_MAX_TX_WQEBBS. */ +if (attr->insz) ds_cnt_ids =DIV_ROUND_UP (sizeof (struct mlx5_wqe_inline_seg ) + attr->insz,MLX5_SEND_WQE_DS );
@@ -316,6 +318,9 @@ static void mlx5e_sq_calc_wqe_attr(struct sk_buff *skb, const struct mlx5e_tx_at inl +=VLAN_HLEN ; ds_cnt_inl =DIV_ROUND_UP (inl,MLX5_SEND_WQE_DS ); +if (WARN_ON_ONCE (ds_cnt_inl >MLX5E_MAX_TX_INLINE_DS )) +netdev_warn (skb->dev,"ds_cnt_inl = %u > max %u\n" , ds_cnt_inl, + (u16 )MLX5E_MAX_TX_INLINE_DS ); ds_cnt += ds_cnt_inl; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/190 net/mlx5e: Fix tc acts array not to be dependent on enum order
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
[ Upstream commit 08912ea799cd2a43b8999457e316967fe4e2f327 ]
The tc acts array should not be dependent on kernel internal flow action id enum. Fix the array initialization.
--- .../mellanox/mlx5/core/en/tc/act/act.c | 92 +++++++------------ 1 file changed, 32 insertions(+), 60 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c +32 -60
@@ -6,70 +6,42 @@#include "en/tc_priv.h" #include "mlx5_core.h" -/* Must be aligned with enum flow_action_id. */ static struct mlx5e_tc_act *tc_acts_fdb[NUM_FLOW_ACTIONS ] = { - &mlx5e_tc_act_accept, - &mlx5e_tc_act_drop, - &mlx5e_tc_act_trap, - &mlx5e_tc_act_goto, - &mlx5e_tc_act_mirred, - &mlx5e_tc_act_mirred, - &mlx5e_tc_act_redirect_ingress, -NULL ,/* FLOW_ACTION_MIRRED_INGRESS, */ - &mlx5e_tc_act_vlan, - &mlx5e_tc_act_vlan, - &mlx5e_tc_act_vlan_mangle, - &mlx5e_tc_act_tun_encap, - &mlx5e_tc_act_tun_decap, - &mlx5e_tc_act_pedit, - &mlx5e_tc_act_pedit, - &mlx5e_tc_act_csum, -NULL ,/* FLOW_ACTION_MARK, */ - &mlx5e_tc_act_ptype, -NULL ,/* FLOW_ACTION_PRIORITY, */ -NULL ,/* FLOW_ACTION_WAKE, */ -NULL ,/* FLOW_ACTION_QUEUE, */ - &mlx5e_tc_act_sample, - &mlx5e_tc_act_police, - &mlx5e_tc_act_ct, -NULL ,/* FLOW_ACTION_CT_METADATA, */ - &mlx5e_tc_act_mpls_push, - &mlx5e_tc_act_mpls_pop, -NULL ,/* FLOW_ACTION_MPLS_MANGLE, */ -NULL ,/* FLOW_ACTION_GATE, */ -NULL ,/* FLOW_ACTION_PPPOE_PUSH, */ -NULL ,/* FLOW_ACTION_JUMP, */ -NULL ,/* FLOW_ACTION_PIPE, */ - &mlx5e_tc_act_vlan, - &mlx5e_tc_act_vlan, + [FLOW_ACTION_ACCEPT ] = &mlx5e_tc_act_accept, + [FLOW_ACTION_DROP ] = &mlx5e_tc_act_drop, + [FLOW_ACTION_TRAP ] = &mlx5e_tc_act_trap, + [FLOW_ACTION_GOTO ] = &mlx5e_tc_act_goto, + [FLOW_ACTION_REDIRECT ] = &mlx5e_tc_act_mirred, + [FLOW_ACTION_MIRRED ] = &mlx5e_tc_act_mirred, + [FLOW_ACTION_REDIRECT_INGRESS ] = &mlx5e_tc_act_redirect_ingress, + [FLOW_ACTION_VLAN_PUSH ] = &mlx5e_tc_act_vlan, + [FLOW_ACTION_VLAN_POP ] = &mlx5e_tc_act_vlan, + [FLOW_ACTION_VLAN_MANGLE ] = &mlx5e_tc_act_vlan_mangle, + [FLOW_ACTION_TUNNEL_ENCAP ] = &mlx5e_tc_act_tun_encap, + [FLOW_ACTION_TUNNEL_DECAP ] = &mlx5e_tc_act_tun_decap, + [FLOW_ACTION_MANGLE ] = &mlx5e_tc_act_pedit, + [FLOW_ACTION_ADD ] = &mlx5e_tc_act_pedit, + [FLOW_ACTION_CSUM ] = &mlx5e_tc_act_csum, + [FLOW_ACTION_PTYPE ] = &mlx5e_tc_act_ptype, + [FLOW_ACTION_SAMPLE ] = &mlx5e_tc_act_sample, + [FLOW_ACTION_POLICE ] = &mlx5e_tc_act_police, + [FLOW_ACTION_CT ] = &mlx5e_tc_act_ct, + [FLOW_ACTION_MPLS_PUSH ] = &mlx5e_tc_act_mpls_push, + [FLOW_ACTION_MPLS_POP ] = &mlx5e_tc_act_mpls_pop, + [FLOW_ACTION_VLAN_PUSH_ETH ] = &mlx5e_tc_act_vlan, + [FLOW_ACTION_VLAN_POP_ETH ] = &mlx5e_tc_act_vlan, }; -/* Must be aligned with enum flow_action_id. */ static struct mlx5e_tc_act *tc_acts_nic[NUM_FLOW_ACTIONS ] = { - &mlx5e_tc_act_accept, - &mlx5e_tc_act_drop, -NULL ,/* FLOW_ACTION_TRAP, */ - &mlx5e_tc_act_goto, - &mlx5e_tc_act_mirred_nic, -NULL ,/* FLOW_ACTION_MIRRED, */ -NULL ,/* FLOW_ACTION_REDIRECT_INGRESS, */ -NULL ,/* FLOW_ACTION_MIRRED_INGRESS, */ -NULL ,/* FLOW_ACTION_VLAN_PUSH, */ -NULL ,/* FLOW_ACTION_VLAN_POP, */ -NULL ,/* FLOW_ACTION_VLAN_MANGLE, */ -NULL ,/* FLOW_ACTION_TUNNEL_ENCAP, */ -NULL ,/* FLOW_ACTION_TUNNEL_DECAP, */ - &mlx5e_tc_act_pedit, - &mlx5e_tc_act_pedit, - &mlx5e_tc_act_csum, - &mlx5e_tc_act_mark, -NULL ,/* FLOW_ACTION_PTYPE, */ -NULL ,/* FLOW_ACTION_PRIORITY, */ -NULL ,/* FLOW_ACTION_WAKE, */ -NULL ,/* FLOW_ACTION_QUEUE, */ -NULL ,/* FLOW_ACTION_SAMPLE, */ -NULL ,/* FLOW_ACTION_POLICE, */ - &mlx5e_tc_act_ct, + [FLOW_ACTION_ACCEPT ] = &mlx5e_tc_act_accept, + [FLOW_ACTION_DROP ] = &mlx5e_tc_act_drop, + [FLOW_ACTION_GOTO ] = &mlx5e_tc_act_goto, + [FLOW_ACTION_REDIRECT ] = &mlx5e_tc_act_mirred_nic, + [FLOW_ACTION_MANGLE ] = &mlx5e_tc_act_pedit, + [FLOW_ACTION_ADD ] = &mlx5e_tc_act_pedit, + [FLOW_ACTION_CSUM ] = &mlx5e_tc_act_csum, + [FLOW_ACTION_MARK ] = &mlx5e_tc_act_mark, + [FLOW_ACTION_CT ] = &mlx5e_tc_act_ct, };/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 92/190 net/mlx5e: TC, Fix wrong rejection of packet-per-second policing
In reply to Greg Kroah-HartmanFrom: Jianbo Liu <[email protected]>
[ Upstream commit 9e06430841363a1d2932d546fdce1cc5edb3c2a0 ]
In the bellow commit, we added support for PPS policing without removing the check which block offload of such cases. Fix it by removing this check.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +0 -6
@@ -4739,12 +4739,6 @@ int mlx5e_policer_validate(const struct flow_action *action,return -EOPNOTSUPP ; } -if (act->police.rate_pkt_ps) { -NL_SET_ERR_MSG_MOD (extack, -"QoS offload not support packets per second" ); -return -EOPNOTSUPP ; - } -return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 93/190 net/mlx5e: E-Switch, Fix comparing termination table instance
In reply to Greg Kroah-HartmanFrom: Roi Dayan <[email protected]>
[ Upstream commit f4f4096b410e8d31c3f07f39de3b17d144edd53d ]
The pkt_reformat pointer being saved under flow_act and not dest attribute in the termination table instance. Fix the comparison pointers.
Also fix returning success if one pkt_reformat pointer is null and the other is not.
--- .../mellanox/mlx5/core/eswitch_offloads_termtbl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c +8 -6
@@ -30,9 +30,9 @@ mlx5_eswitch_termtbl_hash(struct mlx5_flow_act *flow_act, sizeof(dest->vport.num), hash); hash =jhash ((const void *)&dest->vport.vhca_id,sizeof (dest->vport.num), hash); -if (dest->vport.pkt_reformat) - hash =jhash (dest->vport.pkt_reformat, -sizeof (*dest->vport.pkt_reformat), +if (flow_act->pkt_reformat) + hash =jhash (flow_act->pkt_reformat, +sizeof (*flow_act->pkt_reformat), hash);return hash; }
@@ -53,9 +53,11 @@ mlx5_eswitch_termtbl_cmp(struct mlx5_flow_act *flow_act1,if (ret)return ret; -return dest1->vport.pkt_reformat && dest2->vport.pkt_reformat ? -memcmp (dest1->vport.pkt_reformat, dest2->vport.pkt_reformat, -sizeof (*dest1->vport.pkt_reformat)) :0 ; +if (flow_act1->pkt_reformat && flow_act2->pkt_reformat) +return memcmp (flow_act1->pkt_reformat, flow_act2->pkt_reformat, +sizeof (*flow_act1->pkt_reformat)); + +return !(flow_act1->pkt_reformat == flow_act2->pkt_reformat); } static int
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/190 ice: Fix spurious interrupt during removal of trusted VF
In reply to Greg Kroah-HartmanFrom: Norbert Zulinski <[email protected]>
[ Upstream commit f23df5220d2bf8d5e639f074b76f206a736d09e1 ]
Previously, during removal of trusted VF when VF is down there was number of spurious interrupt equal to number of queues on VF.
Add check if VF already has inactive queues. If VF is disabled and has inactive rx queues then do not disable rx queues. Add check in ice_vsi_stop_tx_ring if it's VF's vsi and if VF is disabled.
--- drivers/net/ethernet/intel/ice/ice_base.c | 2 +- drivers/net/ethernet/intel/ice/ice_lib.c | 25 +++++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_lib.h | 1 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 5 ++++- 4 files changed, 31 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_base.c +1 -1
@@ -959,7 +959,7 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,* associated to the queue to schedule NAPI handler */ q_vector = ring->q_vector; -if (q_vector) +if (q_vector && !(vsi->vf &&ice_is_vf_disabled (vsi->vf)))ice_trigger_sw_intr (hw, q_vector); status = ice_dis_vsi_txq(vsi->port_info, txq_meta->vsi_idx,
drivers/net/ethernet/intel/ice/ice_lib.c +25 -0
@@ -2222,6 +2222,31 @@ int ice_vsi_stop_xdp_tx_rings(struct ice_vsi *vsi)return ice_vsi_stop_tx_rings (vsi,ICE_NO_RESET ,0 , vsi->xdp_rings, vsi->num_xdp_txq); } +/** +* ice_vsi_is_rx_queue_active +* @vsi: the VSI being configured +* +* Return true if at least one queue is active. +*/ +bool ice_vsi_is_rx_queue_active (struct ice_vsi *vsi) +{ +struct ice_pf *pf = vsi->back; +struct ice_hw *hw = &pf->hw; +int i; + +ice_for_each_rxq (vsi, i) { +u32 rx_reg; +int pf_q; + + pf_q = vsi->rxq_map[i]; + rx_reg =rd32 (hw,QRX_CTRL (pf_q)); +if (rx_reg &QRX_CTRL_QENA_STAT_M ) +return true; + } + +return false; +} +/** * ice_vsi_is_vlan_pruning_ena - check if VLAN pruning is enabled or not * @vsi: VSI to check whether or not VLAN pruning is enabled.
drivers/net/ethernet/intel/ice/ice_lib.h +1 -0
@@ -127,4 +127,5 @@ u16 ice_vsi_num_non_zero_vlans(struct ice_vsi *vsi);bool ice_is_feature_supported (struct ice_pf *pf,enum ice_feature f);void ice_clear_feature_support (struct ice_pf *pf,enum ice_feature f);void ice_init_feature_support (struct ice_pf *pf); +bool ice_vsi_is_rx_queue_active (struct ice_vsi *vsi);#endif /* !_ICE_LIB_H_ */
drivers/net/ethernet/intel/ice/ice_vf_lib.c +4 -1
@@ -576,7 +576,10 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags)return -EINVAL ; }ice_vsi_stop_lan_tx_rings (vsi,ICE_NO_RESET , vf->vf_id); -ice_vsi_stop_all_rx_rings (vsi); + +if (ice_vsi_is_rx_queue_active (vsi)) +ice_vsi_stop_all_rx_rings (vsi); +dev_dbg (dev,"VF is already disabled, there is no need for resetting it, telling VM, all is fine %d\n" , vf->vf_id);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 95/190 iavf: Fix VF driver counting VLAN 0 filters
In reply to Greg Kroah-HartmanFrom: Michal Jaron <[email protected]>
[ Upstream commit 0e710a3ffd0caaf23b8791b041e8792f252f8e4f ]
VF driver mistakenly counts VLAN 0 filters, when no PF driver counts them.
Do not count VLAN 0 filters, when VLAN_V2 is engaged. Counting those filters in, will affect filters size by -1, when sending batched VLAN addition message.
--- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +2 -0
@@ -2438,6 +2438,8 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,list_for_each_entry (f, &adapter->vlan_filter_list, list) {if (f->is_new_vlan) { f->is_new_vlan = false; +if (!f->vlan.vid) +continue ;if (f->vlan.tpid ==ETH_P_8021Q )set_bit (f->vlan.vid, adapter->vsi.active_cvlans);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 96/190 net: cpsw: disable napi in cpsw_ndo_open()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 6d47b53fb3f363a74538a1dbd09954af3d8d4131 ]
When failed to create xdp rxqs or fill rx channels in cpsw_ndo_open() for opening device, napi isn't disabled. When open cpsw device next time, it will report a invalid opcode issue. Compiled tested only.
--- drivers/net/ethernet/ti/cpsw.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/ti/cpsw.c +2 -0
@@ -854,6 +854,8 @@ static int cpsw_ndo_open(struct net_device *ndev) err_cleanup:if (!cpsw->usage_count) { +napi_disable (&cpsw->napi_rx); +napi_disable (&cpsw->napi_tx);cpdma_ctlr_stop (cpsw->dma);cpsw_destroy_xdp_rxqs (cpsw); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 97/190 net: cxgb3_main: disable napi when bind qsets failed in cxgb_up()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit d75aed1428da787cbe42bc073d76f1354f364d92 ]
When failed to bind qsets in cxgb_up() for opening device, napi isn't disabled. When open cxgb3 device next time, it will trigger a BUG_ON() in napi_enable(). Compile tested only.
--- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +1 -0
@@ -1302,6 +1302,7 @@ static int cxgb_up(struct adapter *adap)if (ret <0 ) {CH_ERR (adap,"failed to bind qsets, err %d\n" , ret);t3_intr_disable (adap); +quiesce_rx (adap);free_irq_resources (adap); err = ret; goto out;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 98/190 stmmac: intel: Update PCH PTP clock rate from 200MHz to 204.8MHz
In reply to Greg Kroah-HartmanFrom: Tan, Tee Min <[email protected]>
[ Upstream commit dcea1a8107c04b9521dee1dd37971757a22db162 ]
Current Intel platform has an output of ~976ms interval when probed on 1 Pulse-per-Second(PPS) hardware pin.
The correct PTP clock frequency for PCH GbE should be 204.8MHz instead of 200MHz. PSE GbE PTP clock rate remains at 200MHz.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +9 -2
@@ -630,7 +630,6 @@ static int ehl_common_data(struct pci_dev *pdev, { plat->rx_queues_to_use =8 ; plat->tx_queues_to_use =8 ; - plat->clk_ptp_rate =200000000 ; plat->use_phy_wol =1 ; plat->safety_feat_cfg->tsoee =1 ;
@@ -655,6 +654,8 @@ static int ehl_sgmii_data(struct pci_dev *pdev, plat->serdes_powerup = intel_serdes_powerup; plat->serdes_powerdown = intel_serdes_powerdown; + plat->clk_ptp_rate =204800000 ; +return ehl_common_data (pdev, plat); }
@@ -668,6 +669,8 @@ static int ehl_rgmii_data(struct pci_dev *pdev, plat->bus_id =1 ; plat->phy_interface =PHY_INTERFACE_MODE_RGMII ; + plat->clk_ptp_rate =204800000 ; +return ehl_common_data (pdev, plat); }
@@ -684,6 +687,8 @@ static int ehl_pse0_common_data(struct pci_dev *pdev, plat->bus_id =2 ; plat->addr64 =32 ; + plat->clk_ptp_rate =200000000 ; +intel_mgbe_pse_crossts_adj (intel_priv,EHL_PSE_ART_MHZ );return ehl_common_data (pdev, plat);
@@ -723,6 +728,8 @@ static int ehl_pse1_common_data(struct pci_dev *pdev, plat->bus_id =3 ; plat->addr64 =32 ; + plat->clk_ptp_rate =200000000 ; +intel_mgbe_pse_crossts_adj (intel_priv,EHL_PSE_ART_MHZ );return ehl_common_data (pdev, plat);
@@ -758,7 +765,7 @@ static int tgl_common_data(struct pci_dev *pdev, { plat->rx_queues_to_use =6 ; plat->tx_queues_to_use =4 ; - plat->clk_ptp_rate =200000000 ; + plat->clk_ptp_rate =204800000 ; plat->speed_mode_2500 = intel_speed_mode_2500; plat->safety_feat_cfg->tsoee =1 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 99/190 mctp: Fix an error handling path in mctp_init()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit d4072058af4fd8fb4658e7452289042a406a9398 ]
If mctp_neigh_init() return error, the routes resources should be released in the error handling path. Otherwise some resources leak.
--- net/mctp/af_mctp.c | 4 +++- net/mctp/route.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
net/mctp/af_mctp.c +3 -1
@@ -665,12 +665,14 @@ static __init int mctp_init(void) rc =mctp_neigh_init ();if (rc) - goto err_unreg_proto; + goto err_unreg_routes;mctp_device_init ();return 0 ; +err_unreg_routes: +mctp_routes_exit (); err_unreg_proto:proto_unregister (&mctp_proto); err_unreg_sock:
net/mctp/route.c +1 -1
@@ -1400,7 +1400,7 @@ int __init mctp_routes_init(void)return register_pernet_subsys (&mctp_net_ops); } -void __exit mctp_routes_exit(void) +void mctp_routes_exit (void ) {unregister_pernet_subsys (&mctp_net_ops);rtnl_unregister (PF_MCTP ,RTM_DELROUTE );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 100/190 cxgb4vf: shut down the adapter when t4vf_update_port_info() failed in cxgb4vf_open()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit c6092ea1e6d7bd12acd881f6aa2b5054cd70e096 ]
When t4vf_update_port_info() failed in cxgb4vf_open(), resources applied during adapter goes up are not cleared. Fix it. Only be compiled, not be tested.
--- drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +1 -1
@@ -858,7 +858,7 @@ static int cxgb4vf_open(struct net_device *dev)*/ err =t4vf_update_port_info (pi);if (err <0 ) -return err; + goto err_unwind;/* * Note that this interface is up and start everything up ...
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 101/190 stmmac: dwmac-loongson: fix missing pci_disable_msi() while module exiting
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit f2d45fdf9a0ed2c94c01c422a0d0add8ffd42099 ]
pci_enable_msi() has been called in loongson_dwmac_probe(), so pci_disable_msi() needs be called in remove path and error path of probe().
--- .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +12 -1
@@ -125,6 +125,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idif (res.irq <0 ) {dev_err (&pdev->dev,"IRQ macirq not found\n" ); ret = -ENODEV ; + goto err_disable_msi; } res.wol_irq =of_irq_get_byname (np,"eth_wake_irq" );
@@ -137,9 +138,18 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idif (res.lpi_irq <0 ) {dev_err (&pdev->dev,"IRQ eth_lpi not found\n" ); ret = -ENODEV ; + goto err_disable_msi; } -return stmmac_dvr_probe (&pdev->dev, plat, &res); + ret =stmmac_dvr_probe (&pdev->dev, plat, &res); +if (ret) + goto err_disable_msi; + +return ret; + +err_disable_msi: +pci_disable_msi (pdev); +return ret; }static void loongson_dwmac_remove (struct pci_dev *pdev)
@@ -155,6 +165,7 @@ static void loongson_dwmac_remove(struct pci_dev *pdev)break ; } +pci_disable_msi (pdev);pci_disable_device (pdev); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 102/190 stmmac: dwmac-loongson: fix missing pci_disable_device() in loongson_dwmac_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit fe5b3ce8b4377e543960220f539b989a927afd8a ]
Add missing pci_disable_device() in the error path in loongson_dwmac_probe().
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +5 -2
@@ -97,7 +97,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idcontinue ; ret =pcim_iomap_regions (pdev,BIT (0 ),pci_name (pdev));if (ret) -return ret; + goto err_disable_device;break ; }
@@ -108,7 +108,8 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id phy_mode =device_get_phy_mode (&pdev->dev);if (phy_mode <0 ) {dev_err (&pdev->dev,"phy_mode not found\n" ); -return phy_mode; + ret = phy_mode; + goto err_disable_device; } plat->phy_interface = phy_mode;
@@ -149,6 +150,8 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id err_disable_msi:pci_disable_msi (pdev); +err_disable_device: +pci_disable_device (pdev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 103/190 stmmac: dwmac-loongson: fix missing of_node_put() while module exiting
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit 7f94d0498f9c763f37172c08059ae91804c3075a ]
The node returned by of_get_child_by_name() with refcount decremented, of_node_put() needs be called when finish using it. So add it in the error path in loongson_dwmac_probe() and in loongson_dwmac_remove().
--- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +14 -5
@@ -75,20 +75,24 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id plat->mdio_bus_data =devm_kzalloc (&pdev->dev,sizeof (*plat->mdio_bus_data),GFP_KERNEL ); -if (!plat->mdio_bus_data) -return -ENOMEM ; +if (!plat->mdio_bus_data) { + ret = -ENOMEM ; + goto err_put_node; + } plat->mdio_bus_data->needs_reset = true; } plat->dma_cfg =devm_kzalloc (&pdev->dev,sizeof (*plat->dma_cfg),GFP_KERNEL ); -if (!plat->dma_cfg) -return -ENOMEM ; +if (!plat->dma_cfg) { + ret = -ENOMEM ; + goto err_put_node; + }/* Enable pci device */ ret =pci_enable_device (pdev);if (ret) {dev_err (&pdev->dev,"%s: ERROR: failed to enable device\n" , __func__); -return ret; + goto err_put_node; }/* Get the base address of device */
@@ -152,13 +156,18 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_idpci_disable_msi (pdev); err_disable_device:pci_disable_device (pdev); +err_put_node: +of_node_put (plat->mdio_node);return ret; }static void loongson_dwmac_remove (struct pci_dev *pdev) { +struct net_device *ndev =dev_get_drvdata (&pdev->dev); +struct stmmac_priv *priv =netdev_priv (ndev);int i; +of_node_put (priv->plat->mdio_node);stmmac_dvr_remove (&pdev->dev);for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 104/190 net: phy: mscc: macsec: clear encryption keys when freeing a flow
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 1b16b3fdf675cca15a537572bac50cc5354368fc ]
Commit aaab73f8fba4 ("macsec: clear encryption keys from the stack after setting up offload") made sure to clean encryption keys from the stack after setting up offloading, but the MSCC PHY driver made a copy, kept it in the flow data and did not clear it when freeing a flow. Fix this.
--- drivers/net/phy/mscc/mscc_macsec.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/mscc/mscc_macsec.c +1 -0
@@ -632,6 +632,7 @@ static void vsc8584_macsec_free_flow(struct vsc8531_private *priv,list_del (&flow->list);clear_bit (flow->index, bitmap); +memzero_explicit (flow->key,sizeof (flow->key));kfree (flow); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 105/190 net: atlantic: macsec: clear encryption keys from the stack
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 879785def0f5e71d54399de0f8a5cb399db14171 ]
Commit aaab73f8fba4 ("macsec: clear encryption keys from the stack after setting up offload") made sure to clean encryption keys from the stack after setting up offloading, but the atlantic driver made a copy and did not clear it. Fix this.
[4 Fixes tags below, all part of the same series, no need to split this]
--- .../net/ethernet/aquantia/atlantic/aq_macsec.c | 2 ++ .../aquantia/atlantic/macsec/macsec_api.c | 18 +++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_macsec.c +2 -0
@@ -585,6 +585,7 @@ static int aq_update_txsa(struct aq_nic_s *nic, const unsigned int sc_idx, ret =aq_mss_set_egress_sakey_record (hw, &key_rec, sa_idx); +memzero_explicit (&key_rec,sizeof (key_rec));return ret; }
@@ -932,6 +933,7 @@ static int aq_update_rxsa(struct aq_nic_s *nic, const unsigned int sc_idx, ret =aq_mss_set_ingress_sakey_record (hw, &sa_key_record, sa_idx); +memzero_explicit (&sa_key_record,sizeof (sa_key_record));return ret; }
drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c +11 -7
@@ -757,6 +757,7 @@ set_ingress_sakey_record(struct aq_hw_s *hw, u16 table_index) {u16 packed_record[18 ]; +int ret;if (table_index >=NUMROWS_INGRESSSAKEYRECORD )return -EINVAL ;
@@ -789,9 +790,12 @@ set_ingress_sakey_record(struct aq_hw_s *hw, packed_record[16 ] = rec->key_len &0x3 ; -return set_raw_ingress_record (hw, packed_record,18 ,2 , -ROWOFFSET_INGRESSSAKEYRECORD + - table_index); + ret =set_raw_ingress_record (hw, packed_record,18 ,2 , +ROWOFFSET_INGRESSSAKEYRECORD + + table_index); + +memzero_explicit (packed_record,sizeof (packed_record)); +return ret; } int aq_mss_set_ingress_sakey_record(struct aq_hw_s *hw,
@@ -1739,14 +1743,14 @@ static int set_egress_sakey_record(struct aq_hw_s *hw, ret =set_raw_egress_record (hw, packed_record,8 ,2 ,ROWOFFSET_EGRESSSAKEYRECORD + table_index);if (unlikely (ret)) -return ret; + goto clear_key; ret =set_raw_egress_record (hw, packed_record +8 ,8 ,2 ,ROWOFFSET_EGRESSSAKEYRECORD + table_index -32 ); -if (unlikely (ret)) -return ret; -return 0 ; +clear_key: +memzero_explicit (packed_record,sizeof (packed_record)); +return ret; } int aq_mss_set_egress_sakey_record(struct aq_hw_s *hw,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 106/190 ethernet: s2io: disable napi when start nic failed in s2io_card_up()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit 0348c1ab980c1d43fb37b758d4b760990c066cb5 ]
When failed to start nic or add interrupt service routine in s2io_card_up() for opening device, napi isn't disabled. When open s2io device next time, it will trigger a BUG_ON()in napi_enable(). Compile tested only.
--- drivers/net/ethernet/neterion/s2io.c | 29 +++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/net/ethernet/neterion/s2io.c +20 -9
@@ -7128,9 +7128,8 @@ static int s2io_card_up(struct s2io_nic *sp)if (ret) {DBG_PRINT (ERR_DBG ,"%s: Out of memory in Open\n" , dev->name); -s2io_reset (sp); -free_rx_buffers (sp); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_fill_buff; }DBG_PRINT (INFO_DBG ,"Buf in ring:%d is %d:\n" , i, ring->rx_bufs_left);
@@ -7168,18 +7167,16 @@ static int s2io_card_up(struct s2io_nic *sp)/* Enable Rx Traffic and interrupts on the NIC */ if (start_nic (sp)) {DBG_PRINT (ERR_DBG ,"%s: Starting NIC failed\n" , dev->name); -s2io_reset (sp); -free_rx_buffers (sp); -return -ENODEV ; + ret = -ENODEV ; + goto err_out; }/* Add interrupt service routine */ if (s2io_add_isr (sp) !=0 ) {if (sp->config.intr_type ==MSI_X )s2io_rem_isr (sp); -s2io_reset (sp); -free_rx_buffers (sp); -return -ENODEV ; + ret = -ENODEV ; + goto err_out; }timer_setup (&sp->alarm_timer, s2io_alarm_handle,0 );
@@ -7199,6 +7196,20 @@ static int s2io_card_up(struct s2io_nic *sp) }return 0 ; + +err_out: +if (config->napi) { +if (config->intr_type ==MSI_X ) { +for (i =0 ; i < sp->config.rx_ring_num; i++) +napi_disable (&sp->mac_control.rings[i].napi); + }else { +napi_disable (&sp->napi); + } + } +err_fill_buff: +s2io_reset (sp); +free_rx_buffers (sp); +return ret; }/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 107/190 net: mv643xx_eth: disable napi when init rxq or txq failed in mv643xx_eth_open()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit f111606b63ff2282428ffbac0447c871eb957b6c ]
When failed to init rxq or txq in mv643xx_eth_open() for opening device, napi isn't disabled. When open mv643xx_eth device next time, it will trigger a BUG_ON() in napi_enable(). Compile tested only.
--- drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/marvell/mv643xx_eth.c +1 -0
@@ -2481,6 +2481,7 @@ static int mv643xx_eth_open(struct net_device *dev)for (i =0 ; i < mp->rxq_count; i++)rxq_deinit (mp->rxq + i); out: +napi_disable (&mp->napi);free_irq (dev->irq, dev);return err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 108/190 ALSA: memalloc: Dont fall back for SG-buffer with IOMMU
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 9736a325137b62499d2b4be3fc2d742b131f75da ]
When the non-contiguous page allocation for SG buffer allocation fails, the memalloc helper tries to fall back to the old page allocation methods. This would, however, result in the bogus page addresses when IOMMU is enabled. Usually in such a case, the fallback allocation should fail as well, but occasionally it succeeds and hitting a bad access.
The fallback was thought for non-IOMMU case, and as the error from dma_alloc_noncontiguous() with IOMMU essentially implies a fatal memory allocation error, we should return the error straightforwardly without fallback. This avoids the corner case like the above.
The patch also renames the local variable "dma_ops" with snd_ prefix for avoiding the name conflict.
--- sound/core/memalloc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
sound/core/memalloc.c +11 -9
@@ -9,6 +9,7 @@#include <linux/slab.h> #include <linux/mm.h> #include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/genalloc.h> #include <linux/highmem.h> #include <linux/vmalloc.h>
@@ -526,19 +527,20 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size)struct sg_table *sgt;void *p; - sgt =dma_alloc_noncontiguous (dmab->dev.dev, size, dmab->dev.dir, -DEFAULT_GFP ,0 ); -if (!sgt) {#ifdef CONFIG_SND_DMA_SGBUF +if (!get_dma_ops (dmab->dev.dev)) {if (dmab->dev.type ==SNDRV_DMA_TYPE_DEV_WC_SG ) dmab->dev.type =SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK ;else dmab->dev.type =SNDRV_DMA_TYPE_DEV_SG_FALLBACK ;return snd_dma_sg_fallback_alloc (dmab, size); -#else -return NULL ; -#endif } +#endif + + sgt =dma_alloc_noncontiguous (dmab->dev.dev, size, dmab->dev.dir, +DEFAULT_GFP ,0 ); +if (!sgt) +return NULL ; dmab->dev.need_sync =dma_need_sync (dmab->dev.dev,sg_dma_address (sgt->sgl));
@@ -874,7 +876,7 @@ static const struct snd_malloc_ops snd_dma_noncoherent_ops = {/* * Entry points */ -static const struct snd_malloc_ops *dma_ops[] = { +static const struct snd_malloc_ops *snd_dma_ops[] = { [SNDRV_DMA_TYPE_CONTINUOUS ] = &snd_dma_continuous_ops, [SNDRV_DMA_TYPE_VMALLOC ] = &snd_dma_vmalloc_ops, #ifdef CONFIG_HAS_DMA
@@ -900,7 +902,7 @@ static const struct snd_malloc_ops *snd_dma_get_ops(struct snd_dma_buffer *dmab)if (WARN_ON_ONCE (!dmab))return NULL ;if (WARN_ON_ONCE (dmab->dev.type <=SNDRV_DMA_TYPE_UNKNOWN || - dmab->dev.type >=ARRAY_SIZE (dma_ops))) + dmab->dev.type >=ARRAY_SIZE (snd_dma_ops)))return NULL ; -return dma_ops[dmab->dev.type]; +return snd_dma_ops[dmab->dev.type]; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 109/190 ethernet: tundra: free irq when alloc ring failed in tsi108_open()
In reply to Greg Kroah-HartmanFrom: Zhengchao Shao <[email protected]>
[ Upstream commit acce40037041f97baad18142bb253064491ebde3 ]
When alloc tx/rx ring failed in tsi108_open(), it doesn't free irq. Fix it.
--- drivers/net/ethernet/tundra/tsi108_eth.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/tundra/tsi108_eth.c +4 -1
@@ -1303,12 +1303,15 @@ static int tsi108_open(struct net_device *dev) data->rxring =dma_alloc_coherent (&data->pdev->dev, rxring_size, &data->rxdma,GFP_KERNEL ); -if (!data->rxring) +if (!data->rxring) { +free_irq (data->irq_num, dev);return -ENOMEM ; + } data->txring =dma_alloc_coherent (&data->pdev->dev, txring_size, &data->txdma,GFP_KERNEL );if (!data->txring) { +free_irq (data->irq_num, dev);dma_free_coherent (&data->pdev->dev, rxring_size, data->rxring, data->rxdma);return -ENOMEM ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 110/190 net: macvlan: fix memory leaks of macvlan_common_newlink
In reply to Greg Kroah-HartmanFrom: Chuang Wang <[email protected]>
[ Upstream commit 23569b5652ee8e8e55a12f7835f59af6f3cefc30 ]
kmemleak reports memory leaks in macvlan_common_newlink, as follows:
ip link add link eth0 name .. type macvlan mode source macaddr add <MAC-ADDR>
kmemleak reports:
unreferenced object 0xffff8880109bb140 (size 64):
comm "ip", pid 284, jiffies 4294986150 (age 430.108s) hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 b8 aa 5a 12 80 88 ff ff ..........Z.....
80 1b fa 0d 80 88 ff ff 1e ff ac af c7 c1 6b 6b ..............kk
backtrace:
[<ffffffff813e06a7>] kmem_cache_alloc_trace+0x1c7/0x300
[<ffffffff81b66025>] macvlan_hash_add_source+0x45/0xc0
[<ffffffff81b66a67>] macvlan_changelink_sources+0xd7/0x170
[<ffffffff81b6775c>] macvlan_common_newlink+0x38c/0x5a0
[<ffffffff81b6797e>] macvlan_newlink+0xe/0x20
[<ffffffff81d97f8f>] __rtnl_newlink+0x7af/0xa50
[<ffffffff81d98278>] rtnl_newlink+0x48/0x70
...In the scenario where the macvlan mode is configured as 'source', macvlan_changelink_sources() will be execured to reconfigure list of remote source mac addresses, at the same time, if register_netdevice() return an error, the resource generated by macvlan_changelink_sources() is not cleaned up.
Using this patch, in the case of an error, it will execute macvlan_flush_sources() to ensure that the resource is cleaned up.
--- drivers/net/macvlan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/macvlan.c +3 -1
@@ -1533,8 +1533,10 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,/* the macvlan port may be freed by macvlan_uninit when fail to register. * so we destroy the macvlan port only when it's valid. */ -if (create &&macvlan_port_get_rtnl (lowerdev)) +if (create &&macvlan_port_get_rtnl (lowerdev)) { +macvlan_flush_sources (port, vlan);macvlan_port_destroy (port->dev); + }return err; }EXPORT_SYMBOL_GPL (macvlan_common_newlink);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 111/190 riscv: process: fix kernel info leakage
In reply to Greg Kroah-HartmanFrom: Jisheng Zhang <[email protected]>
[ Upstream commit 6510c78490c490a6636e48b61eeaa6fb65981f4b ]
thread_struct's s[12] may contain random kernel memory content, which may be finally leaked to userspace. This is a security hole. Fix it by clearing the s[12] array in thread_struct when fork.
As for kthread case, it's better to clear the s[12] array as well.
--- arch/riscv/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+)
arch/riscv/kernel/process.c +2 -0
@@ -164,6 +164,8 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)unsigned long tls = args->tls;struct pt_regs *childregs =task_pt_regs (p); +memset (&p->thread.s,0 ,sizeof (p->thread.s)); +/* p->thread holds context to be restored by __switch_to() */ if (unlikely (args->fn)) {/* Kernel thread */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 112/190 riscv: vdso: fix build with llvm
In reply to Greg Kroah-HartmanFrom: Jisheng Zhang <[email protected]>
[ Upstream commit 50f4dd657a0fcf90aa8da8dc2794a8100ff4c37c ]
Even after commit 89fd4a1df829 ("riscv: jump_label: mark arguments as const to satisfy asm constraints"), building with CC_OPTIMIZE_FOR_SIZE
+ LLVM=1 can reproduce below build error:
CC arch/riscv/kernel/vdso/vgettimeofday.o
In file included from <built-in>:4:
In file included from lib/vdso/gettimeofday.c:5:
In file included from include/vdso/datapage.h:17:
In file included from include/vdso/processor.h:10:
In file included from arch/riscv/include/asm/vdso/processor.h:7:
In file included from include/linux/jump_label.h:112:arch/riscv/include/asm/jump_label.h:42:3: error:
invalid operand for inline asm constraint 'i'
" .option push \n\t"
^
1 error generated.
I think the problem is when "-Os" is passed as CFLAGS, it's removed by "CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os" which is introduced in commit e05d57dcb8c7 ("riscv: Fixup __vdso_gettimeofday broke dynamic ftrace"), thus no optimization at all for vgettimeofday.c arm64 does remove "-Os" as well, but it forces "-O2" after removing "-Os".
I compared the generated vgettimeofday.o with "-O2" and "-Os", I think no big performance difference. So let's tell the kbuild not to remove "-Os" rather than follow arm64 style.
vdso related performance can be improved a lot when building kernel with CC_OPTIMIZE_FOR_SIZE after this commit, ("-Os" VS no optimization)
--- arch/riscv/kernel/vdso/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/vdso/Makefile +1 -1
@@ -30,7 +30,7 @@ obj-y += vdso.o CPPFLAGS_vdso.lds += -P -C -U$(ARCH) # Disable -pg to prevent insert call site -CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os +CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) # Disable profiling and instrumentation for VDSO code GCOV_PROFILE := n
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 113/190 riscv: fix reserved memory setup
In reply to Greg Kroah-HartmanFrom: Conor Dooley <[email protected]>
[ Upstream commit 50e63dd8ed92045eb70a72d7ec725488320fb68b ]
Currently, RISC-V sets up reserved memory using the "early" copy of the device tree. As a result, when trying to get a reserved memory region using of_reserved_mem_lookup(), the pointer to reserved memory regions is using the early, pre-virtual-memory address which causes a kernel panic when trying to use the buffer's name:
Unable to handle kernel paging request at virtual address 00000000401c31ac Oops [#1] Modules linked in: CPU: 0 PID: 0 Comm: swapper Not tainted 6.0.0-rc1-00001-g0d9d6953d834 #1 Hardware name: Microchip PolarFire-SoC Icicle Kit (DT) epc : string+0x4a/0xea ra : vsnprintf+0x1e4/0x336 epc : ffffffff80335ea0 ra : ffffffff80338936 sp : ffffffff81203be0 gp : ffffffff812e0a98 tp : ffffffff8120de40 t0 : 0000000000000000 t1 : ffffffff81203e28 t2 : 7265736572203a46 s0 : ffffffff81203c20 s1 : ffffffff81203e28 a0 : ffffffff81203d22 a1 : 0000000000000000 a2 : ffffffff81203d08 a3 : 0000000081203d21 a4 : ffffffffffffffff a5 : 00000000401c31ac a6 : ffff0a00ffffff04 a7 : ffffffffffffffff s2 : ffffffff81203d08 s3 : ffffffff81203d00 s4 : 0000000000000008 s5 : ffffffff000000ff s6 : 0000000000ffffff s7 : 00000000ffffff00 s8 : ffffffff80d9821a s9 : ffffffff81203d22 s10: 0000000000000002 s11: ffffffff80d9821c t3 : ffffffff812f3617 t4 : ffffffff812f3617 t5 : ffffffff812f3618 t6 : ffffffff81203d08 status: 0000000200000100 badaddr: 00000000401c31ac cause: 000000000000000d [<ffffffff80338936>] vsnprintf+0x1e4/0x336 [<ffffffff80055ae2>] vprintk_store+0xf6/0x344 [<ffffffff80055d86>] vprintk_emit+0x56/0x192 [<ffffffff80055ed8>] vprintk_default+0x16/0x1e [<ffffffff800563d2>] vprintk+0x72/0x80 [<ffffffff806813b2>] _printk+0x36/0x50 [<ffffffff8068af48>] print_reserved_mem+0x1c/0x24 [<ffffffff808057ec>] paging_init+0x528/0x5bc [<ffffffff808031ae>] setup_arch+0xd0/0x592 [<ffffffff8080070e>] start_kernel+0x82/0x73c
early_init_fdt_scan_reserved_mem() takes no arguments as it operates on initial_boot_params, which is populated by early_init_dt_verify(). On RISC-V, early_init_dt_verify() is called twice. Once, directly, in setup_arch() if CONFIG_BUILTIN_DTB is not enabled and once indirectly, very early in the boot process, by parse_dtb() when it calls early_init_dt_scan_nodes().
This first call uses dtb_early_va to set initial_boot_params, which is not usable later in the boot process when early_init_fdt_scan_reserved_mem() is called. On arm64 for example, the corresponding call to early_init_dt_scan_nodes() uses fixmap addresses and doesn't suffer the same fate.
Move early_init_fdt_scan_reserved_mem() further along the boot sequence, after the direct call to early_init_dt_verify() in setup_arch() so that the names use the correct virtual memory addresses. The above supposed that CONFIG_BUILTIN_DTB was not set, but should work equally in the case where it is - unflatted_and_copy_device_tree() also updates initial_boot_params.
--- arch/riscv/kernel/setup.c | 1 + arch/riscv/mm/init.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
arch/riscv/kernel/setup.c +1 -0
@@ -283,6 +283,7 @@ void __init setup_arch(char **cmdline_p) else pr_err("No DTB found in kernel mappings\n");#endif +early_init_fdt_scan_reserved_mem ();misc_mem_init ();init_resources ();
arch/riscv/mm/init.c +0 -1
@@ -262,7 +262,6 @@ static void __init setup_bootmem(void)memblock_reserve (dtb_early_pa,fdt_totalsize (dtb_early_va)); } -early_init_fdt_scan_reserved_mem ();dma_contiguous_reserve (dma32_phys_limit);if (IS_ENABLED (CONFIG_64BIT ))hugetlb_cma_reserve (PUD_SHIFT -PAGE_SHIFT );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 114/190 eth: sp7021: drop free_netdev() from spl2sw_init_netdev()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit de91b3197d15172407608b2c357aab7ac1451e2b ]
It's not necessary to free netdev allocated with devm_alloc_etherdev() and using free_netdev() leads to double free.
--- drivers/net/ethernet/sunplus/spl2sw_driver.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/sunplus/spl2sw_driver.c +0 -1
@@ -286,7 +286,6 @@ static u32 spl2sw_init_netdev(struct platform_device *pdev, u8 *mac_addr,if (ret) {dev_err (&pdev->dev,"Failed to register net device \"%s\"!\n" , ndev->name); -free_netdev (ndev); *r_ndev =NULL ;return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 115/190 arm64: efi: Fix handling of misaligned runtime regions and drop warning
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 9b9eaee9828fe98b030cf43ac50065a54a2f5d52 upstream.
Currently, when mapping the EFI runtime regions in the EFI page tables, we complain about misaligned regions in a rather noisy way, using WARN().
Not only does this produce a lot of irrelevant clutter in the log, it is factually incorrect, as misaligned runtime regions are actually allowed by the EFI spec as long as they don't require conflicting memory types within the same 64k page.
So let's drop the warning, and tweak the code so that we
- take both the start and end of the region into account when checking for misalignment
- only revert to RWX mappings for non-code regions if misaligned code regions are also known to exist.
--- arch/arm64/kernel/efi.c | 52 +++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-)
arch/arm64/kernel/efi.c +34 -18
@@ -12,6 +12,14 @@#include <asm/efi.h> +static bool region_is_misaligned (const efi_memory_desc_t *md) +{ +if (PAGE_SIZE ==EFI_PAGE_SIZE ) +return false; +return !PAGE_ALIGNED (md->phys_addr) || + !PAGE_ALIGNED (md->num_pages <<EFI_PAGE_SHIFT ); +} +/* * Only regions of type EFI_RUNTIME_SERVICES_CODE need to be * executable, everything else can be mapped with the XN bits
@@ -25,14 +33,22 @@ static __init pteval_t create_mapping_prif (type ==EFI_MEMORY_MAPPED_IO )return PROT_DEVICE_nGnRE; -if (WARN_ONCE (!PAGE_ALIGNED (md->phys_addr), -"UEFI Runtime regions are not aligned to 64 KB -- buggy firmware?" )) +if (region_is_misaligned (md)) { +static bool __initdata code_is_misaligned; +/* -* If the region is not aligned to the page size of the OS, we -* can not use strict permissions, since that would also affect -* the mapping attributes of the adjacent regions. +* Regions that are not aligned to the OS page size cannot be +* mapped with strict permissions, as those might interfere +* with the permissions that are needed by the adjacent +* region's mapping. However, if we haven't encountered any +* misaligned runtime code regions so far, we can safely use +* non-executable permissions for non-code regions. */ -return pgprot_val (PAGE_KERNEL_EXEC ); + code_is_misaligned |= (type ==EFI_RUNTIME_SERVICES_CODE ); + +return code_is_misaligned ?pgprot_val (PAGE_KERNEL_EXEC ) + :pgprot_val (PAGE_KERNEL ); + }/* R-- */ if ((attr & (EFI_MEMORY_XP | EFI_MEMORY_RO)) ==
@@ -63,19 +79,16 @@ int __init efi_create_mapping(struct mm_bool page_mappings_only = (md->type ==EFI_RUNTIME_SERVICES_CODE || md->type ==EFI_RUNTIME_SERVICES_DATA ); -if (!PAGE_ALIGNED (md->phys_addr) || - !PAGE_ALIGNED (md->num_pages <<EFI_PAGE_SHIFT )) { -/* -* If the end address of this region is not aligned to page -* size, the mapping is rounded up, and may end up sharing a -* page frame with the next UEFI memory region. If we create -* a block entry now, we may need to split it again when mapping -* the next region, and support for that is going to be removed -* from the MMU routines. So avoid block mappings altogether in -* that case. -*/ +/* +* If this region is not aligned to the page size used by the OS, the +* mapping will be rounded outwards, and may end up sharing a page +* frame with an adjacent runtime memory region. Given that the page +* table descriptor covering the shared page will be rewritten when the +* adjacent region gets mapped, we must avoid block mappings here so we +* don't have to worry about splitting them when that happens. +*/ +if (region_is_misaligned (md)) page_mappings_only = true; - } create_pgd_mapping(mm, md->phys_addr, md->virt_addr, md->num_pages << EFI_PAGE_SHIFT,
@@ -102,6 +115,9 @@ int __init efi_set_mapping_permissions(sBUG_ON (md->type !=EFI_RUNTIME_SERVICES_CODE && md->type !=EFI_RUNTIME_SERVICES_DATA ); +if (region_is_misaligned (md)) +return 0 ; +/* * Calling apply_to_page_range() is only safe on regions that are * guaranteed to be mapped down to pages. Since we are only called
Greg Kroah-Hartman
maintainerPATCH 116/190 MIPS: jump_label: Fix compat branch range check
In reply to Greg Kroah-HartmanFrom: Jiaxun Yang <[email protected]>
commit 64ac0befe75bdfaffc396c2b4a0ed5ae6920eeee upstream.
Cast upper bound of branch range to long to do signed compare, avoid negative offset trigger this warning.
--- arch/mips/kernel/jump_label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/jump_label.c +1 -1
@@ -56,7 +56,7 @@ void arch_jump_label_transform(struct ju* The branch offset must fit in the instruction's 26 * bit field. */ -WARN_ON ((offset >=BIT (25 )) || +WARN_ON ((offset >= (long )BIT (25 )) || (offset < -(long )BIT (25 ))); insn.j_format.opcode = bc6_op;
Greg Kroah-Hartman
maintainerPATCH 117/190 drm/amdgpu: Fix the lpfn checking condition in drm buddy
In reply to Greg Kroah-HartmanFrom: Ma Jun <[email protected]>
commit e0b26b9482461e9528552f54fa662c2269f75b3f upstream.
Because the value of man->size is changed during suspend/resume process, use mgr->mm.size instead of man->size here for lpfn checking.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +1 -1
@@ -435,7 +435,7 @@ static int amdgpu_vram_mgr_new(struct ttif (place->flags &TTM_PL_FLAG_TOPDOWN ) vres->flags |=DRM_BUDDY_TOPDOWN_ALLOCATION ; -if (fpfn || lpfn != man->size) +if (fpfn || lpfn != mgr->mm.size)/* Allocate blocks in desired range */ vres->flags |=DRM_BUDDY_RANGE_ALLOCATION ;
Greg Kroah-Hartman
maintainerPATCH 118/190 mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit ebb5fd38f41132e6924cb33b647337f4a5d5360c upstream.
Several SDHCI drivers need to deactivate command queueing in their reset hook (see sdhci_cqhci_reset() / sdhci-pci-core.c, for example), and several more are coming.
Those reset implementations have some small subtleties (e.g., ordering of initialization of SDHCI vs. CQHCI might leave us resetting with a NULL ->cqe_private), and are often identical across different host drivers.
We also don't want to force a dependency between SDHCI and CQHCI, or vice versa; non-SDHCI drivers use CQHCI, and SDHCI drivers might support command queueing through some other means.
So, implement a small helper, to avoid repeating the same mistakes in different drivers. Simply stick it in a header, because it's so small it doesn't deserve its own module right now, and inlining to each driver is pretty reasonable.
This is marked for -stable, as it is an important prerequisite patch for several SDHCI controller bugfixes that follow.
--- drivers/mmc/host/sdhci-cqhci.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 drivers/mmc/host/sdhci-cqhci.h
drivers/mmc/host/sdhci-cqhci.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright 2022 The Chromium OS Authors +* +* Support that applies to the combination of SDHCI and CQHCI, while not +* expressing a dependency between the two modules. +*/ + +#ifndef __MMC_HOST_SDHCI_CQHCI_H__ +#define __MMC_HOST_SDHCI_CQHCI_H__ + +#include "cqhci.h" +#include "sdhci.h" + +static inline void sdhci_and_cqhci_reset (struct sdhci_host *host,u8 mask) +{ +if ((host->mmc->caps2 &MMC_CAP2_CQE ) && (mask &SDHCI_RESET_ALL ) && + host->mmc->cqe_private) +cqhci_deactivate (host->mmc); + +sdhci_reset (host, mask); +} + +#endif /* __MMC_HOST_SDHCI_CQHCI_H__ */
Greg Kroah-Hartman
maintainerPATCH 119/190 mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit 5d249ac37fc2396e8acc1adb0650cdacae5a990d upstream.
SDHCI_RESET_ALL resets will reset the hardware CQE state, but we aren't tracking that properly in software. When out of sync, we may trigger various timeouts.
It's not typical to perform resets while CQE is enabled, but one particular case I hit commonly enough: mmc_suspend() -> mmc_power_off(). Typically we will eventually deactivate CQE (cqhci_suspend() -> cqhci_deactivate()), but that's not guaranteed -- in particular, if we perform a partial (e.g., interrupted) system suspend.
The same bug was already found and fixed for two other drivers, in v5.7 and v5.9:
5cf583f1fb9c ("mmc: sdhci-msm: Deactivate CQE during SDHC reset") df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel
GLK-based controllers")
The latter is especially prescient, saying "other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by SDHCI_RESET_ALL."
So like these other patches, deactivate CQHCI when resetting the controller. Do this via the new sdhci_and_cqhci_reset() helper.
This patch depends on (and should not compile without) the patch entitled "mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI".
--- drivers/mmc/host/sdhci-of-arasan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-of-arasan.c +2 -1
@@ -25,6 +25,7 @@#include <linux/firmware/xlnx-zynqmp.h> #include "cqhci.h" +#include "sdhci-cqhci.h" #include "sdhci-pltfm.h" #define SDHCI_ARASAN_VENDOR_REGISTER 0x78
@@ -366,7 +367,7 @@ static void sdhci_arasan_reset(struct sdstruct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct sdhci_arasan_data *sdhci_arasan =sdhci_pltfm_priv (pltfm_host); -sdhci_reset (host, mask); +sdhci_and_cqhci_reset (host, mask);if (sdhci_arasan->quirks &SDHCI_ARASAN_QUIRK_FORCE_CDTEST ) { ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );
Greg Kroah-Hartman
maintainerPATCH 120/190 mmc: sdhci-brcmstb: Fix SDHCI_RESET_ALL for CQHCI
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit 56baa208f91061ff27ec2d93fbc483f624d373b4 upstream.
[[ NOTE: this is completely untested by the author, but included solely
because, as noted in commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers"), "other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by SDHCI_RESET_ALL." We've now seen the same bug on at least MSM, Arasan, and Intel hardware. ]]
SDHCI_RESET_ALL resets will reset the hardware CQE state, but we aren't tracking that properly in software. When out of sync, we may trigger various timeouts.
It's not typical to perform resets while CQE is enabled, but this may occur in some suspend or error recovery scenarios.
Include this fix by way of the new sdhci_and_cqhci_reset() helper.
I only patch the bcm7216 variant even though others potentially *could* provide the 'supports-cqe' property (and thus enable CQHCI), because d46ba2d17f90 ("mmc: sdhci-brcmstb: Add support for Command Queuing (CQE)") and some Broadcom folks confirm that only the 7216 variant actually supports it.
This patch depends on (and should not compile without) the patch entitled "mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI".
--- drivers/mmc/host/sdhci-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-brcmstb.c +2 -1
@@ -12,6 +12,7 @@#include <linux/bitops.h> #include <linux/delay.h> +#include "sdhci-cqhci.h" #include "sdhci-pltfm.h" #include "cqhci.h"
@@ -55,7 +56,7 @@ static void brcmstb_reset(struct sdhci_hstruct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct sdhci_brcmstb_priv *priv =sdhci_pltfm_priv (pltfm_host); -sdhci_reset (host, mask); +sdhci_and_cqhci_reset (host, mask);/* Reset will clear this, so re-enable it */ if (priv->flags &BRCMSTB_PRIV_FLAGS_GATE_CLOCK )
Greg Kroah-Hartman
maintainerPATCH 121/190 mmc: sdhci_am654: Fix SDHCI_RESET_ALL for CQHCI
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit 162503fd1c3a1d4e14dbe7f399c1d1bec1c8abbc upstream.
[[ NOTE: this is completely untested by the author, but included solely
because, as noted in commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers"), "other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by SDHCI_RESET_ALL." We've now seen the same bug on at least MSM, Arasan, and Intel hardware. ]]
SDHCI_RESET_ALL resets will reset the hardware CQE state, but we aren't tracking that properly in software. When out of sync, we may trigger various timeouts.
It's not typical to perform resets while CQE is enabled, but this may occur in some suspend or error recovery scenarios.
Include this fix by way of the new sdhci_and_cqhci_reset() helper.
This patch depends on (and should not compile without) the patch entitled "mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI".
--- drivers/mmc/host/sdhci_am654.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci_am654.c +4 -3
@@ -15,6 +15,7 @@#include <linux/sys_soc.h> #include "cqhci.h" +#include "sdhci-cqhci.h" #include "sdhci-pltfm.h" /* CTL_CFG Registers */
@@ -378,7 +379,7 @@ static void sdhci_am654_reset(struct sdhstruct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct sdhci_am654_data *sdhci_am654 =sdhci_pltfm_priv (pltfm_host); -sdhci_reset (host, mask); +sdhci_and_cqhci_reset (host, mask);if (sdhci_am654->quirks &SDHCI_AM654_QUIRK_FORCE_CDTEST ) { ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );
@@ -464,7 +465,7 @@ static struct sdhci_ops sdhci_am654_ops .set_clock = sdhci_am654_set_clock, .write_b = sdhci_am654_write_b, .irq = sdhci_am654_cqhci_irq, - .reset = sdhci_reset, + .reset = sdhci_and_cqhci_reset, };static const struct sdhci_pltfm_data sdhci_am654_pdata = {
@@ -494,7 +495,7 @@ static struct sdhci_ops sdhci_j721e_8bit .set_clock = sdhci_am654_set_clock, .write_b = sdhci_am654_write_b, .irq = sdhci_am654_cqhci_irq, - .reset = sdhci_reset, + .reset = sdhci_and_cqhci_reset, };static const struct sdhci_pltfm_data sdhci_j721e_8bit_pdata = {
Greg Kroah-Hartman
maintainerPATCH 122/190 mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit 836078449464e6af3b66ae6652dae79af176f21e upstream.
[[ NOTE: this is completely untested by the author, but included solely
because, as noted in commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers"), "other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by SDHCI_RESET_ALL." We've now seen the same bug on at least MSM, Arasan, and Intel hardware. ]]
SDHCI_RESET_ALL resets will reset the hardware CQE state, but we aren't tracking that properly in software. When out of sync, we may trigger various timeouts.
It's not typical to perform resets while CQE is enabled, but this may occur in some suspend or error recovery scenarios.
Include this fix by way of the new sdhci_and_cqhci_reset() helper.
This patch depends on (and should not compile without) the patch entitled "mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI".
--- drivers/mmc/host/sdhci-tegra.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-tegra.c +2 -1
@@ -28,6 +28,7 @@#include <soc/tegra/common.h> +#include "sdhci-cqhci.h" #include "sdhci-pltfm.h" #include "cqhci.h"
@@ -367,7 +368,7 @@ static void tegra_sdhci_reset(struct sdhconst struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;u32 misc_ctrl, clk_ctrl, pad_ctrl; -sdhci_reset (host, mask); +sdhci_and_cqhci_reset (host, mask);if (!(mask &SDHCI_RESET_ALL ))return ;
Greg Kroah-Hartman
maintainerPATCH 123/190 mmc: sdhci-esdhc-imx: use the correct host caps for MMC_CAP_8_BIT_DATA
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
commit f002f45a00ee14214d96b18b9a555fe2c56afb20 upstream.
MMC_CAP_8_BIT_DATA belongs to struct mmc_host, not struct sdhci_host. So correct it here.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +2 -2
@@ -1671,14 +1671,14 @@ static int sdhci_esdhc_imx_probe(structif (imx_data->socdata->flags &ESDHC_FLAG_ERR004536 ) host->quirks |=SDHCI_QUIRK_BROKEN_ADMA ; -if (host->caps &MMC_CAP_8_BIT_DATA && +if (host->mmc->caps &MMC_CAP_8_BIT_DATA && imx_data->socdata->flags &ESDHC_FLAG_HS400 ) host->mmc->caps2 |=MMC_CAP2_HS400 ;if (imx_data->socdata->flags &ESDHC_FLAG_BROKEN_AUTO_CMD23 ) host->quirks2 |=SDHCI_QUIRK2_ACMD23_BROKEN ; -if (host->caps &MMC_CAP_8_BIT_DATA && +if (host->mmc->caps &MMC_CAP_8_BIT_DATA && imx_data->socdata->flags &ESDHC_FLAG_HS400_ES ) { host->mmc->caps2 |=MMC_CAP2_HS400_ES ; host->mmc_host_ops.hs400_enhanced_strobe =
Greg Kroah-Hartman
maintainerPATCH 124/190 ALSA: hda/hdmi - enable runtime pm for more AMD display audio
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit fdcc4c22b7ab20e90b97f8bc6225d876b72b8f16 upstream.
We are able to power down the GPU and audio via the GPU driver so flag these asics as supporting runtime pm.
--- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/hda_intel.c +3 -0
@@ -2718,6 +2718,9 @@ static const struct pci_device_id azx_id { PCI_DEVICE(0x1002, 0xab28), .driver_data =AZX_DRIVER_ATIHDMI_NS |AZX_DCAPS_PRESET_ATI_HDMI_NS | AZX_DCAPS_PM_RUNTIME }, + { PCI_DEVICE(0x1002, 0xab30), + .driver_data =AZX_DRIVER_ATIHDMI_NS |AZX_DCAPS_PRESET_ATI_HDMI_NS | + AZX_DCAPS_PM_RUNTIME }, { PCI_DEVICE(0x1002, 0xab38), .driver_data =AZX_DRIVER_ATIHDMI_NS |AZX_DCAPS_PRESET_ATI_HDMI_NS | AZX_DCAPS_PM_RUNTIME },
Greg Kroah-Hartman
maintainerPATCH 125/190 ALSA: hda/ca0132: add quirk for EVGA Z390 DARK
In reply to Greg Kroah-HartmanFrom: Xian Wang <[email protected]>
commit 0c423e2ffa7edd3f8f9bcf17ce73fa9c7509b99e upstream.
The Z390 DARK mainboard uses a CA0132 audio controller. The quirk is needed to enable surround sound and 3.5mm headphone jack handling in the front audio connector as well as in the rear of the board when in stereo mode.
Page 97 of the linked manual contains instructions to setup the controller.
--- sound/pci/hda/patch_ca0132.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_ca0132.c +1 -0
@@ -1306,6 +1306,7 @@ static const struct snd_pci_quirk ca0132SND_PCI_QUIRK (0x1458 ,0xA026 ,"Gigabyte G1.Sniper Z97" ,QUIRK_R3DI ),SND_PCI_QUIRK (0x1458 ,0xA036 ,"Gigabyte GA-Z170X-Gaming 7" ,QUIRK_R3DI ),SND_PCI_QUIRK (0x3842 ,0x1038 ,"EVGA X99 Classified" ,QUIRK_R3DI ), +SND_PCI_QUIRK (0x3842 ,0x1055 ,"EVGA Z390 DARK" ,QUIRK_R3DI ),SND_PCI_QUIRK (0x1102 ,0x0013 ,"Recon3D" ,QUIRK_R3D ),SND_PCI_QUIRK (0x1102 ,0x0018 ,"Recon3D" ,QUIRK_R3D ), SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5),
Greg Kroah-Hartman
maintainerPATCH 126/190 ALSA: hda: fix potential memleak in add_widget_node
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
commit 9a5523f72bd2b0d66eef3d58810c6eb7b5ffc143 upstream.
As 'kobject_add' may allocated memory for 'kobject->name' when return error. And in this function, if call 'kobject_add' failed didn't free kobject. So call 'kobject_put' to recycling resources.
--- sound/hda/hdac_sysfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/hda/hdac_sysfs.c +3 -1
@@ -346,8 +346,10 @@ static int add_widget_node(struct kobjecreturn -ENOMEM ;kobject_init (kobj, &widget_ktype); err =kobject_add (kobj, parent,"%02x" , nid); -if (err <0 ) +if (err <0 ) { +kobject_put (kobj);return err; + } err =sysfs_create_group (kobj, group);if (err <0 ) {kobject_put (kobj);
Greg Kroah-Hartman
maintainerPATCH 127/190 ALSA: hda/realtek: Add quirk for ASUS Zenbook using CS35L41
In reply to Greg Kroah-HartmanFrom: Stefan Binding <[email protected]>
commit 8d06679b25fc6813eb2438fac7fa13f4f3c2ef37 upstream.
This Asus Zenbook laptop use Realtek HDA codec combined with 2xCS35L41 Amplifiers using I2C with Internal Boost.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9414,6 +9414,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1e8e ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1c52 ,"ASUS Zephyrus G15 2022" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1f11 ,"ASUS Zephyrus G14" ,ALC289_FIXUP_ASUS_GA401 ), +SND_PCI_QUIRK (0x1043 ,0x1f12 ,"ASUS UM5302" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x1043 ,0x1f92 ,"ASUS ROG Flow X16" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x3030 ,"ASUS ZN270IE" ,ALC256_FIXUP_ASUS_AIO_GPIO2 ), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
Greg Kroah-Hartman
maintainerPATCH 128/190 ALSA: hda/realtek: Add Positivo C6300 model quirk
In reply to Greg Kroah-HartmanFrom: Edson Juliano Drosdeck <[email protected]>
commit 79e28f2ab3440e08f5fbf65648b008341c37b496 upstream.
Positivo Master C6300 (1849:a233) require quirk for anabling headset-mic
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9619,6 +9619,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x511f ,"Thinkpad" ,ALC298_FIXUP_TPT470_DOCK ),SND_PCI_QUIRK (0x17aa ,0x9e54 ,"LENOVO NB" ,ALC269_FIXUP_LENOVO_EAPD ),SND_PCI_QUIRK (0x1849 ,0x1233 ,"ASRock NUC Box 1100" ,ALC233_FIXUP_NO_AUDIO_JACK ), +SND_PCI_QUIRK (0x1849 ,0xa233 ,"Positivo Master C6300" ,ALC269_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x19e5 ,0x3204 ,"Huawei MACH-WX9" ,ALC256_FIXUP_HUAWEI_MACH_WX9_PINS ),SND_PCI_QUIRK (0x19e5 ,0x320f ,"Huawei WRT-WX9 " ,ALC256_FIXUP_ASUS_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20),
Greg Kroah-Hartman
maintainerPATCH 129/190 ALSA: usb-audio: Yet more regression for for the delayed card registration
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 971cb608d1c5d95533a43b549bb8ec9637f10043 upstream.
Although we tried to fix the regression for the recent changes with the delayed card registration, it doesn't seem covering the all cases; e.g. on Roland EDIROL M-100FX, where the generic quirk for Roland devices is applied, it misses the card registration because the detection of the last interface (apparently for MIDI) fails.
This patch is an attempt to recover from those failures by calling the card register also at the error path for the secondary interfaces. The card register condition is also extended to match with the old check in the previous patch, too (i.e. the simple check of the interface number) for catching the probe with errors.
--- sound/usb/card.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
sound/usb/card.c +20 -9
@@ -742,6 +742,18 @@ get_alias_quirk(struct usb_device *dev,return NULL ; } +/* register card if we reach to the last interface or to the specified +* one given via option +*/ +static int try_to_register_card (struct snd_usb_audio *chip,int ifnum) +{ +if (check_delayed_register_option (chip) == ifnum || + chip->last_iface == ifnum || +usb_interface_claimed (usb_ifnum_to_if (chip->dev, chip->last_iface))) +return snd_card_register (chip->card); +return 0 ; +} +/* * probe the active usb device *
@@ -880,15 +892,9 @@ static int usb_audio_probe(struct usb_in chip->need_delayed_register = false;/* clear again */ } -/* register card if we reach to the last interface or to the specified -* one given via option -*/ -if (check_delayed_register_option (chip) == ifnum || -usb_interface_claimed (usb_ifnum_to_if (dev, chip->last_iface))) { - err =snd_card_register (chip->card); -if (err <0 ) - goto __error; - } + err =try_to_register_card (chip, ifnum); +if (err <0 ) + goto __error_no_register;if (chip->quirk_flags &QUIRK_FLAG_SHARE_MEDIA_DEVICE ) {/* don't want to fail when snd_media_device_create() fails */
@@ -907,6 +913,11 @@ static int usb_audio_probe(struct usb_inreturn 0 ; __error: +/* in the case of error in secondary interface, still try to register */ +if (chip) +try_to_register_card (chip, ifnum); + + __error_no_register:if (chip) {/* chip->active is inside the chip->card object, * decrement before memory is possibly returned.
Greg Kroah-Hartman
maintainerPATCH 130/190 ALSA: usb-audio: Add quirk entry for M-Audio Micro
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 2f01a612d4758b45f775dbb88a49cf534ba47275 upstream.
M-Audio Micro (0762:201a) defines the descriptor as vendor-specific, while the content seems class-compliant. Just overriding the probe makes the device working.
--- sound/usb/quirks-table.h | 4 ++++ 1 file changed, 4 insertions(+)
sound/usb/quirks-table.h +4 -0
@@ -2050,6 +2050,10 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { +/* M-Audio Micro */ +USB_DEVICE_VENDOR_SPEC (0x0763 ,0x201a ), +}, +{USB_DEVICE_VENDOR_SPEC (0x0763 ,0x2030 ), .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {/* .vendor_name = "M-Audio", */
Greg Kroah-Hartman
maintainerPATCH 131/190 ALSA: usb-audio: Add DSD support for Accuphase DAC-60
In reply to Greg Kroah-HartmanFrom: Jussi Laako <[email protected]>
commit 8cbd4725ffff3eface1f5f3397af02acad5b2831 upstream.
Accuphase DAC-60 option card supports native DSD up to DSD256, but doesn't have support for auto-detection. Explicitly enable DSD support for the correct altsetting.
--- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/quirks.c +1 -0
@@ -1913,6 +1913,7 @@ u64 snd_usb_interface_dsd_format_quirks(/* XMOS based USB DACs */ switch (chip->usb_id) {case USB_ID (0x1511 ,0x0037 ):/* AURALiC VEGA */ +case USB_ID (0x21ed ,0xd75a ):/* Accuphase DAC-60 option card */ case USB_ID (0x2522 ,0x0012 ):/* LH Labs VI DAC Infinity */ case USB_ID (0x2772 ,0x0230 ):/* Pro-Ject Pre Box S2 Digital */ if (fp->altsetting ==2 )
Greg Kroah-Hartman
maintainerPATCH 132/190 vmlinux.lds.h: Fix placement of .data..decrypted section
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 000f8870a47bdc36730357883b6aef42bced91ee upstream.
Commit d4c639990036 ("vmlinux.lds.h: Avoid orphan section with !SMP") fixed an orphan section warning by adding the '.data..decrypted' section to the linker script under the PERCPU_DECRYPTED_SECTION define but that placement introduced a panic with !SMP, as the percpu sections are not instantiated with that configuration so attempting to access variables defined with DEFINE_PER_CPU_DECRYPTED() will result in a page fault.
Move the '.data..decrypted' section to the DATA_MAIN define so that the variables in it are properly instantiated at boot time with CONFIG_SMP=n.
--- include/asm-generic/vmlinux.lds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/asm-generic/vmlinux.lds.h +1 -1
@@ -333,6 +333,7 @@#define DATA_DATA \ *(.xiptext) \ *(DATA_MAIN) \ + *(.data..decrypted) \ *(.ref.data) \ *(.data..shared_aligned)/* percpu related */ \ MEM_KEEP(init.data*) \
@@ -975,7 +976,6 @@#ifdef CONFIG_AMD_MEM_ENCRYPT #define PERCPU_DECRYPTED_SECTION \ . = ALIGN(PAGE_SIZE); \ - *(.data..decrypted) \ *(.data..percpu..decrypted) \ . = ALIGN(PAGE_SIZE);#else
Greg Kroah-Hartman
maintainerPATCH 133/190 ata: libata-scsi: fix SYNCHRONIZE CACHE (16) command failure
In reply to Greg Kroah-HartmanFrom: Shin'ichiro Kawasaki <[email protected]>
commit ea045fd344cb15c164e9ffc8b8cffb6883df8475 upstream.
SAT SCSI/ATA Translation specification requires SCSI SYNCHRONIZE CACHE
(10) and (16) commands both shall be translated to ATA flush command. Also, ZBC Zoned Block Commands specification mandates SYNCHRONIZE CACHE
(16) command support. However, libata translates only SYNCHRONIZE CACHE (10). This results in SYNCHRONIZE CACHE (16) command failures on SATA drives and then libata translation does not conform to ZBC. To avoid the failure, add support for SYNCHRONIZE CACHE (16).
--- drivers/ata/libata-scsi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/libata-scsi.c +3 -0
@@ -3266,6 +3266,7 @@ static unsigned int ata_scsiop_maint_in(case REPORT_LUNS :case REQUEST_SENSE :case SYNCHRONIZE_CACHE : +case SYNCHRONIZE_CACHE_16 :case REZERO_UNIT :case SEEK_6 :case SEEK_10 :
@@ -3924,6 +3925,7 @@ static inline ata_xlat_func_t ata_get_xlreturn ata_scsi_write_same_xlat;case SYNCHRONIZE_CACHE : +case SYNCHRONIZE_CACHE_16 :if (ata_try_flush_cache (dev))return ata_scsi_flush_xlat;break ;
@@ -4147,6 +4149,7 @@ void ata_scsi_simulate(struct ata_device* turning this into a no-op. */ case SYNCHRONIZE_CACHE : +case SYNCHRONIZE_CACHE_16 : fallthrough;/* no-op's, complete with success */
Greg Kroah-Hartman
maintainerPATCH 134/190 nilfs2: fix deadlock in nilfs_count_free_blocks()
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit 8ac932a4921a96ca52f61935dbba64ea87bbd5dc upstream.
A semaphore deadlock can occur if nilfs_get_block() detects metadata corruption while locating data blocks and a superblock writeback occurs at the same time:
task 1 task 2
------ ------
* A file operation *nilfs_truncate()
nilfs_get_block()
down_read(rwsem A) <--
nilfs_bmap_lookup_contig()
... generic_shutdown_super()
nilfs_put_super()
* Prepare to write superblock *
down_write(rwsem B) <--
nilfs_cleanup_super()
* Detect b-tree corruption * nilfs_set_log_cursor()
nilfs_bmap_convert_error() nilfs_count_free_blocks()
__nilfs_error() down_read(rwsem A) <--
nilfs_set_error()
down_write(rwsem B) <--
*** DEADLOCK ***Here, nilfs_get_block() readlocks rwsem A (= NILFS_MDT(dat_inode)->mi_sem) and then calls nilfs_bmap_lookup_contig(), but if it fails due to metadata corruption, __nilfs_error() is called from nilfs_bmap_convert_error() inside the lock section.
Since __nilfs_error() calls nilfs_set_error() unless the filesystem is read-only and nilfs_set_error() attempts to writelock rwsem B (= nilfs->ns_sem) to write back superblock exclusively, hierarchical lock acquisition occurs in the order rwsem A -> rwsem B.
Now, if another task starts updating the superblock, it may writelock rwsem B during the lock sequence above, and can deadlock trying to readlock rwsem A in nilfs_count_free_blocks().
However, there is actually no need to take rwsem A in nilfs_count_free_blocks() because it, within the lock section, only reads a single integer data on a shared struct with nilfs_sufile_get_ncleansegs(). This has been the case after commit aa474a220180 ("nilfs2: add local variable to cache the number of clean segments"), that is, even before this bug was introduced.
So, this resolves the deadlock problem by just not taking the semaphore in nilfs_count_free_blocks().
--- fs/nilfs2/the_nilfs.c | 2 -- 1 file changed, 2 deletions(-)
fs/nilfs2/the_nilfs.c +0 -2
@@ -690,9 +690,7 @@ int nilfs_count_free_blocks(struct the_n {unsigned long ncleansegs; -down_read (&NILFS_MDT (nilfs->ns_dat)->mi_sem); ncleansegs =nilfs_sufile_get_ncleansegs (nilfs->ns_sufile); -up_read (&NILFS_MDT (nilfs->ns_dat)->mi_sem); *nblocks = (sector_t )ncleansegs * nilfs->ns_blocks_per_segment;return 0 ; }
Re: [PATCH 6.0 134/190] nilfs2: fix deadlock in nilfs_count_free_blocks()
Hi!
Quoted 3 lines
From: Ryusuke Konishi <[email protected]>
commit
8ac932a4921a96ca52f61935dbba64ea87bbd5dcupstream.
...
Quoted 6 lines
However, there is actually no need to take rwsem A in
nilfs_count_free_blocks()because it, within the lock section, only reads a single integer data on a shared struct withnilfs_sufile_get_ncleansegs(). This has been the case after commitaa474a220180("nilfs2: add local variable to cache the number of clean segments"), that is, even before this bug was introduced.
Ok, but these days we have checkers that don't like reading variables unlocked, and compiler theoretically could do something funny.
So this should have READ/WRITE_ONCE annotations... this is incomplete, but should illustrate what is needed. Likely some helper for updating ncleansegs should be introduced.
Best regards,
Pavel
fs/nilfs2/sufile.c +4 -2
@@ -122,7 +122,7 @@ static void nilfs_sufile_mod_counter(struct buffer_head *header_bh,*/ unsigned long nilfs_sufile_get_ncleansegs (struct inode *sufile) { -return NILFS_SUI (sufile)->ncleansegs; +return READ_ONCE (NILFS_SUI (sufile)->ncleansegs); }/**
@@ -418,7 +418,9 @@ void nilfs_sufile_do_cancel_free(struct inode *sufile, __u64 segnum,kunmap_atomic (kaddr);nilfs_sufile_mod_counter (header_bh,-1 ,1 ); -NILFS_SUI (sufile)->ncleansegs--; +/* nilfs_sufile_get_ncleansegs() leads this without taking lock */ +WRITE_ONCE (NILFS_SUI (sufile)->ncleansegs, +READ_ONCE (NILFS_SUI (sufile)->ncleansegs) -1 );mark_buffer_dirty (su_bh);nilfs_mdt_mark_dirty (sufile);
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Re: [PATCH 6.0 134/190] nilfs2: fix deadlock in nilfs_count_free_blocks()
Hi,
Quoted 14 lines · Pavel Machek
Hi!
Quoted 3 lines
From: Ryusuke Konishi <[email protected]>
commit
8ac932a4921a96ca52f61935dbba64ea87bbd5dcupstream....
Quoted 6 lines
However, there is actually no need to take rwsem A in
nilfs_count_free_blocks()because it, within the lock section, only reads a single integer data on a shared struct withnilfs_sufile_get_ncleansegs(). This has been the case after commitaa474a220180("nilfs2: add local variable to cache the number of clean segments"), that is, even before this bug was introduced.
Quoted 6 lines
Ok, but these days we have checkers that don't like reading variables unlocked, and compiler theoretically could do something funny.
So this should have READ/WRITE_ONCE annotations... this is incomplete, but should illustrate what is needed. Likely some helper for updating ncleansegs should be introduced.
If the compiler omits an update in the middle, it's okay for nilfs_count_free_blocks() and other read-only callers.
In fact if I introduce such helper function like nilfs_sufile_set_ncleansegs() with WRITE_ONCE, I use nilfs_sufile_get_ncleansegs() first and nilfs_sufile_set_ncleansegs() last within functions that update the counter, rather than each time they increment or decrement it. But, I didn't see any point in using WRITE_ONCE/READ_ONCE like this.
Just be sure, the functions that update the counter are already exclusive with another semaphore (sufile->mi_sem), so updating it without the intermediate result won't break the counter.
If there's a real problem with some kind of checkers giving warnings as you mentioned, that's probably the real reason to apply those annotations.
I would like to deal with it for the mainline in that case.
Thanks,
Ryusuke Konishi
Quoted 32 lines
Best regards,
Pavelfs/nilfs2/sufile.c +4
-3@@ -122,7 +122,7 @@ static void nilfs_sufile_mod_counter(struct buffer_head *header_bh,*/ unsigned long nilfs_sufile_get_ncleansegs (struct inode *sufile) { -return NILFS_SUI (sufile)->ncleansegs; +return READ_ONCE (NILFS_SUI (sufile)->ncleansegs); }/** @@ -418,7 +418,9 @@ void nilfs_sufile_do_cancel_free(struct inode *sufile, __u64 segnum,kunmap_atomic (kaddr);nilfs_sufile_mod_counter (header_bh,-1 ,1 ); -NILFS_SUI (sufile)->ncleansegs--; +/* nilfs_sufile_get_ncleansegs() leads this without taking lock */ +WRITE_ONCE (NILFS_SUI (sufile)->ncleansegs, +READ_ONCE (NILFS_SUI (sufile)->ncleansegs) -1 );mark_buffer_dirty (su_bh);nilfs_mdt_mark_dirty (sufile); --DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerPATCH 135/190 nilfs2: fix use-after-free bug of ns_writer on remount
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit 8cccf05fe857a18ee26e20d11a8455a73ffd4efd upstream.
If a nilfs2 filesystem is downgraded to read-only due to metadata corruption on disk and is remounted read/write, or if emergency read-only remount is performed, detaching a log writer and synchronizing the filesystem can be done at the same time.
In these cases, use-after-free of the log writer (hereinafter nilfs->ns_writer) can happen as shown in the scenario below:
Task1 Task2
-------------------------------- ------------------------------
nilfs_construct_segment
nilfs_segctor_sync
init_wait
init_waitqueue_entry
add_wait_queue
schedule
nilfs_remount (R/W remount case)
nilfs_attach_log_writer
nilfs_detach_log_writer
nilfs_segctor_destroy
kfree
finish_wait
_raw_spin_lock_irqsave
__raw_spin_lock_irqsave
do_raw_spin_lock
debug_spin_lock_before <-- use-after-free
While Task1 is sleeping, nilfs->ns_writer is freed by Task2. After Task1 waked up, Task1 accesses nilfs->ns_writer which is already freed. This scenario diagram is based on the Shigeru Yoshida's post [1].
This patch fixes the issue by not detaching nilfs->ns_writer on remount so that this UAF race doesn't happen. Along with this change, this patch also inserts a few necessary read-only checks with superblock instance where only the ns_writer pointer was used to check if the filesystem is read-only.
--- fs/nilfs2/segment.c | 15 ++++++++------- fs/nilfs2/super.c | 2 -- 2 files changed, 8 insertions(+), 9 deletions(-)
fs/nilfs2/segment.c +8 -7
@@ -317,7 +317,7 @@ void nilfs_relax_pressure_in_lock(structstruct the_nilfs *nilfs = sb->s_fs_info;struct nilfs_sc_info *sci = nilfs->ns_writer; -if (!sci || !sci->sc_flush_request) +if (sb_rdonly (sb) ||unlikely (!sci) || !sci->sc_flush_request)return ;set_bit (NILFS_SC_PRIOR_FLUSH , &sci->sc_flags);
@@ -2243,7 +2243,7 @@ int nilfs_construct_segment(struct superstruct nilfs_transaction_info *ti;int err; -if (!sci) +if (sb_rdonly (sb) ||unlikely (!sci))return -EROFS ;/* A call inside transactions causes a deadlock. */
@@ -2282,7 +2282,7 @@ int nilfs_construct_dsync_segment(structstruct nilfs_transaction_info ti;int err =0 ; -if (!sci) +if (sb_rdonly (sb) ||unlikely (!sci))return -EROFS ;nilfs_transaction_lock (sb, &ti,0 );
@@ -2778,11 +2778,12 @@ int nilfs_attach_log_writer(struct superif (nilfs->ns_writer) {/* -* This happens if the filesystem was remounted -* read/write after nilfs_error degenerated it into a -* read-only mount. +* This happens if the filesystem is made read-only by +* __nilfs_error or nilfs_remount and then remounted +* read/write. In these cases, reuse the existing +* writer. */ -nilfs_detach_log_writer (sb); +return 0 ; } nilfs->ns_writer =nilfs_segctor_new (sb, root);
fs/nilfs2/super.c +0 -2
@@ -1133,8 +1133,6 @@ static int nilfs_remount(struct super_blif ((bool )(*flags &SB_RDONLY ) ==sb_rdonly (sb)) goto out;if (*flags &SB_RDONLY ) { -/* Shutting down log writer */ -nilfs_detach_log_writer (sb); sb->s_flags |=SB_RDONLY ;/*
Greg Kroah-Hartman
maintainerPATCH 136/190 drm/i915/dmabuf: fix sg_table handling in map_dma_buf
In reply to Greg Kroah-HartmanFrom: Matthew Auld <[email protected]>
commit f90daa975911961b65070ec72bd7dd8d448f9ef7 upstream.
We need to iterate over the original entries here for the sg_table, pulling out the struct page for each one, to be remapped. However currently this incorrectly iterates over the final dma mapped entries, which is likely just one gigantic sg entry if the iommu is enabled, leading to us only mapping the first struct page (and any physically contiguous pages following it), even if there is potentially lots more data to follow.
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +2 -2
@@ -40,13 +40,13 @@ static struct sg_table *i915_gem_map_dma goto err; } - ret =sg_alloc_table (st, obj->mm.pages->nents,GFP_KERNEL ); + ret =sg_alloc_table (st, obj->mm.pages->orig_nents,GFP_KERNEL );if (ret) goto err_free; src = obj->mm.pages->sgl; dst = st->sgl; -for (i =0 ; i < obj->mm.pages->nents; i++) { +for (i =0 ; i < obj->mm.pages->orig_nents; i++) {sg_set_page (dst,sg_page (src), src->length,0 ); dst =sg_next (dst); src =sg_next (src);
Greg Kroah-Hartman
maintainerPATCH 137/190 drm/amd/display: Fix reg timeout in enc314_enable_fifo
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
commit ce62198d8b62734a985d22652e75a649be052390 upstream.
[Why]
The link enablement sequence can end up resetting the encoder while the PHY symclk isn't yet on.
This means that waiting for symclk on will timeout, along with the reset bit never asserting high.
This causes unnecessary delay when enabling the link and produces a warning affecting multiple IGT tests.
[How]
Don't wait for the symclk to be on here because firmware already does.
Don't wait for reset if we know the symclk isn't on.
Split the reset into a helper function that checks the bit and decides whether or not a delay is sufficient.
--- .../dc/dcn314/dcn314_dio_stream_encoder.c | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c +18 -6
@@ -49,18 +49,30 @@#define CTX \ enc1->base.ctx +static void enc314_reset_fifo (struct stream_encoder *enc,bool reset) +{ +struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc); +uint32_t reset_val = reset ?1 :0 ; +uint32_t is_symclk_on; + +REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET , reset_val); +REG_GET (DIG_FE_CNTL ,DIG_SYMCLK_FE_ON , &is_symclk_on); + +if (is_symclk_on) +REG_WAIT (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET_DONE , reset_val,10 ,5000 ); +else +udelay (10 ); +}static void enc314_enable_fifo (struct stream_encoder *enc) {struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc); -/* TODO: Confirm if we need to wait for DIG_SYMCLK_FE_ON */ -REG_WAIT (DIG_FE_CNTL ,DIG_SYMCLK_FE_ON ,1 ,10 ,5000 );REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_READ_START_LEVEL ,0x7 ); -REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET ,1 ); -REG_WAIT (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET_DONE ,1 ,10 ,5000 ); -REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET ,0 ); -REG_WAIT (DIG_FIFO_CTRL0 ,DIG_FIFO_RESET_DONE ,0 ,10 ,5000 ); + +enc314_reset_fifo (enc, true); +enc314_reset_fifo (enc, false); +REG_UPDATE (DIG_FIFO_CTRL0 ,DIG_FIFO_ENABLE ,1 ); }
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 138/190 drm/amd/pm: update SMU IP v13.0.4 msg interface header
In reply to Greg Kroah-HartmanFrom: Tim Huang <[email protected]>
commit bc66c9ab162d2a633ee3eb864d7bc2369e79c1e4 upstream.
Some of the unused messages that were used earlier in development have been freed up as spare messages, no intended functional changes.
--- .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_4_ppsmc.h +7 -8
@@ -54,14 +54,14 @@#define PPSMC_MSG_TestMessage 0x01 ///< To check if PMFW is alive and responding. Requirement specified by PMFW team#define PPSMC_MSG_GetPmfwVersion 0x02 ///< Get PMFW version#define PPSMC_MSG_GetDriverIfVersion 0x03 ///< Get PMFW_DRIVER_IF version -#define PPSMC_MSG_EnableGfxOff 0x04 ///< Enable GFXOFF -#define PPSMC_MSG_DisableGfxOff 0x05 ///< Disable GFXOFF +#define PPSMC_MSG_SPARE0 0x04 ///< SPARE +#define PPSMC_MSG_SPARE1 0x05 ///< SPARE#define PPSMC_MSG_PowerDownVcn 0x06 ///< Power down VCN#define PPSMC_MSG_PowerUpVcn 0x07 ///< Power up VCN; VCN is power gated by default#define PPSMC_MSG_SetHardMinVcn 0x08 ///< For wireless display#define PPSMC_MSG_SetSoftMinGfxclk 0x09 ///< Set SoftMin for GFXCLK, argument is frequency in MHz -#define PPSMC_MSG_ActiveProcessNotify 0x0A ///< Needs update -#define PPSMC_MSG_ForcePowerDownGfx 0x0B ///< Force power down GFX, i.e. enter GFXOFF +#define PPSMC_MSG_SPARE2 0x0A ///< SPARE +#define PPSMC_MSG_SPARE3 0x0B ///< SPARE#define PPSMC_MSG_PrepareMp1ForUnload 0x0C ///< Prepare PMFW for GFX driver unload#define PPSMC_MSG_SetDriverDramAddrHigh 0x0D ///< Set high 32 bits of DRAM address for Driver table transfer#define PPSMC_MSG_SetDriverDramAddrLow 0x0E ///< Set low 32 bits of DRAM address for Driver table transfer
@@ -73,8 +73,7 @@#define PPSMC_MSG_SetSoftMinFclk 0x14 ///< Set hard min for FCLK#define PPSMC_MSG_SetSoftMinVcn 0x15 ///< Set soft min for VCN clocks (VCLK and DCLK) - -#define PPSMC_MSG_EnableGfxImu 0x16 ///< Needs update +#define PPSMC_MSG_EnableGfxImu 0x16 ///< Enable GFX IMU#define PPSMC_MSG_GetGfxclkFrequency 0x17 ///< Get GFX clock frequency#define PPSMC_MSG_GetFclkFrequency 0x18 ///< Get FCLK frequency
@@ -102,8 +101,8 @@#define PPSMC_MSG_SetHardMinIspxclkByFreq 0x2C ///< Set HardMin by frequency for ISPXCLK#define PPSMC_MSG_PowerDownUmsch 0x2D ///< Power down VCN.UMSCH (aka VSCH) scheduler#define PPSMC_MSG_PowerUpUmsch 0x2E ///< Power up VCN.UMSCH (aka VSCH) scheduler -#define PPSMC_Message_IspStutterOn_MmhubPgDis 0x2F ///< ISP StutterOn mmHub PgDis -#define PPSMC_Message_IspStutterOff_MmhubPgEn 0x30 ///< ISP StufferOff mmHub PgEn +#define PPSMC_MSG_IspStutterOn_MmhubPgDis 0x2F ///< ISP StutterOn mmHub PgDis +#define PPSMC_MSG_IspStutterOff_MmhubPgEn 0x30 ///< ISP StufferOff mmHub PgEn#define PPSMC_Message_Count 0x31 ///< Total number of PPSMC messages/** @}*/
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 139/190 drm/amd/display: Update SR watermarks for DCN314
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
commit 632d06985235d988c9d7e6eec8fa655be0761fd0 upstream.
[Why & How]
New values requested by hardware after fine-tuning. Update for all memory types.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 32 +++++----- drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 - 2 files changed, 18 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +16 -16
@@ -356,32 +356,32 @@ static struct wm_table ddr5_wm_table = { .wm_inst = WM_A, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 9, - .sr_enter_plus_exit_time_us = 11, + .sr_exit_time_us = 12.5, + .sr_enter_plus_exit_time_us = 14.5, .valid = true, }, { .wm_inst = WM_B, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 9, - .sr_enter_plus_exit_time_us = 11, + .sr_exit_time_us = 12.5, + .sr_enter_plus_exit_time_us = 14.5, .valid = true, }, { .wm_inst = WM_C, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 9, - .sr_enter_plus_exit_time_us = 11, + .sr_exit_time_us = 12.5, + .sr_enter_plus_exit_time_us = 14.5, .valid = true, }, { .wm_inst = WM_D, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.72, - .sr_exit_time_us = 9, - .sr_enter_plus_exit_time_us = 11, + .sr_exit_time_us = 12.5, + .sr_enter_plus_exit_time_us = 14.5, .valid = true, }, }
@@ -393,32 +393,32 @@ static struct wm_table lpddr5_wm_table = .wm_inst = WM_A, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 11.5, - .sr_enter_plus_exit_time_us = 14.5, + .sr_exit_time_us = 16.5, + .sr_enter_plus_exit_time_us = 18.5, .valid = true, }, { .wm_inst = WM_B, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 11.5, - .sr_enter_plus_exit_time_us = 14.5, + .sr_exit_time_us = 16.5, + .sr_enter_plus_exit_time_us = 18.5, .valid = true, }, { .wm_inst = WM_C, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 11.5, - .sr_enter_plus_exit_time_us = 14.5, + .sr_exit_time_us = 16.5, + .sr_enter_plus_exit_time_us = 18.5, .valid = true, }, { .wm_inst = WM_D, .wm_type = WM_TYPE_PSTATE_CHG, .pstate_latency_us = 11.65333, - .sr_exit_time_us = 11.5, - .sr_enter_plus_exit_time_us = 14.5, + .sr_exit_time_us = 16.5, + .sr_enter_plus_exit_time_us = 18.5, .valid = true, }, }
drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +2 -2
@@ -146,8 +146,8 @@ struct _vcs_dpi_soc_bounding_box_st dcn3 }, }, .num_states = 5, - .sr_exit_time_us = 9.0, - .sr_enter_plus_exit_time_us = 11.0, + .sr_exit_time_us = 16.5, + .sr_enter_plus_exit_time_us = 18.5, .sr_exit_z8_time_us = 442.0, .sr_enter_plus_exit_z8_time_us = 560.0, .writeback_latency_us = 12.0,
Greg Kroah-Hartman
maintainerPATCH 140/190 drm/amdgpu: workaround for TLB seq race
In reply to Greg Kroah-HartmanFrom: Christian König <[email protected]>
commit 77c092e054262b594614bad5e5f47e57c5d29639 upstream.
It can happen that we query the sequence value before the callback had a chance to run.
Workaround that by grabbing the fence lock and releasing it again. Should be replaced by hw handling soon.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +15 -0
@@ -485,6 +485,21 @@ void amdgpu_debugfs_vm_bo_info(struct am*/ static inline uint64_t amdgpu_vm_tlb_seq (struct amdgpu_vm *vm) { +unsigned long flags; +spinlock_t *lock; + +/* +* Workaround to stop racing between the fence signaling and handling +* the cb. The lock is static after initially setting it up, just make +* sure that the dma_fence structure isn't freed up. +*/ +rcu_read_lock (); + lock = vm->last_tlb_flush->lock; +rcu_read_unlock (); + +spin_lock_irqsave (lock, flags); +spin_unlock_irqrestore (lock, flags); +return atomic64_read (&vm->tlb_seq); }
Greg Kroah-Hartman
maintainerPATCH 141/190 drm/amdgpu: disable BACO on special BEIGE_GOBY card
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
commit 0c85c067c9d9d7a1b2cc2e01a236d5d0d4a872b5 upstream.
Still avoid intermittent failure.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +3 -1
@@ -376,7 +376,9 @@ static void sienna_cichlid_check_bxco_suif (((adev->pdev->device ==0x73A1 ) && (adev->pdev->revision ==0x00 )) || ((adev->pdev->device ==0x73BF ) && - (adev->pdev->revision ==0xCF ))) + (adev->pdev->revision ==0xCF )) || + ((adev->pdev->device ==0x7422 ) && + (adev->pdev->revision ==0x00 ))) smu_baco->platform_support = false; }
Greg Kroah-Hartman
maintainerPATCH 142/190 drm/amdkfd: Fix error handling in criu_checkpoint
In reply to Greg Kroah-HartmanFrom: Felix Kuehling <[email protected]>
commit b91c23e099f0b65d62159da13458c5eefa76083f upstream.
Checkpoint BOs last. That way we don't need to close dmabuf FDs if something else fails later. This avoids problematic access to user mode memory in the error handling code path.
criu_checkpoint_bos has its own error handling and cleanup that does not depend on access to user memory.
In the private data, keep BOs before the remaining objects. This is necessary to restore things in the correct order as restoring events depends on the events-page BO being restored first.
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 34 +++++++++++++------------------ 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +15 -19
@@ -1928,7 +1928,7 @@ static int criu_checkpoint(struct file * {int ret;uint32_t num_devices, num_bos, num_objects; -uint64_t priv_size, priv_offset =0 ; +uint64_t priv_size, priv_offset =0 , bo_priv_offset;if (!args->devices || !args->bos || !args->priv_data)return -EINVAL ;
@@ -1972,38 +1972,34 @@ static int criu_checkpoint(struct file *if (ret) goto exit_unlock; - ret =criu_checkpoint_bos (p, num_bos, (uint8_t __user *)args->bos, - (uint8_t __user *)args->priv_data, &priv_offset); -if (ret) - goto exit_unlock; +/* Leave room for BOs in the private data. They need to be restored +* before events, but we checkpoint them last to simplify the error +* handling. +*/ + bo_priv_offset = priv_offset; + priv_offset += num_bos *sizeof (struct kfd_criu_bo_priv_data );if (num_objects) { ret =kfd_criu_checkpoint_queues (p, (uint8_t __user *)args->priv_data, &priv_offset);if (ret) - goto close_bo_fds; + goto exit_unlock; ret =kfd_criu_checkpoint_events (p, (uint8_t __user *)args->priv_data, &priv_offset);if (ret) - goto close_bo_fds; + goto exit_unlock; ret =kfd_criu_checkpoint_svm (p, (uint8_t __user *)args->priv_data, &priv_offset);if (ret) - goto close_bo_fds; + goto exit_unlock; } -close_bo_fds: -if (ret) { -/* If IOCTL returns err, user assumes all FDs opened in criu_dump_bos are closed */ -uint32_t i; -struct kfd_criu_bo_bucket *bo_buckets = (struct kfd_criu_bo_bucket *) args->bos; - -for (i =0 ; i < num_bos; i++) { -if (bo_buckets[i].alloc_flags &KFD_IOC_ALLOC_MEM_FLAGS_VRAM ) -close_fd (bo_buckets[i].dmabuf_fd); - } - } +/* This must be the last thing in this function that can fail. +* Otherwise we leak dmabuf file descriptors. +*/ + ret =criu_checkpoint_bos (p, num_bos, (uint8_t __user *)args->bos, + (uint8_t __user *)args->priv_data, &bo_priv_offset); exit_unlock:mutex_unlock (&p->mutex);
Greg Kroah-Hartman
maintainerPATCH 143/190 drm/amdkfd: Fix error handling in kfd_criu_restore_events
In reply to Greg Kroah-HartmanFrom: Felix Kuehling <[email protected]>
commit 66f7903779fbbc620bf1040017e4833ef6a0b541 upstream.
mutex_unlock before the exit label because all the error code paths that jump there didn't take that lock. This fixes unbalanced locking errors in case of restore errors.
--- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_events.c +1 -2
@@ -506,6 +506,7 @@ int kfd_criu_restore_event(struct file * ret =create_other_event (p, ev, &ev_priv->event_id);break ; } +mutex_unlock (&p->event_mutex); exit:if (ret)
@@ -513,8 +514,6 @@ exit:kfree (ev_priv); -mutex_unlock (&p->event_mutex); -return ret; }
Greg Kroah-Hartman
maintainerPATCH 144/190 platform/x86: hp_wmi: Fix rfkill causing soft blocked wifi
In reply to Greg Kroah-HartmanFrom: Jorge Lopez <[email protected]>
commit 1598bfa8e1faa932de42e1ee7628a1c4c4263f0a upstream.
After upgrading BIOS to U82 01.02.01 Rev.A, the console is flooded strange char "^@" which printed out every second and makes login nearly impossible. Also the below messages were shown both in console and journal/dmesg every second:
usb 1-3: Device not responding to setup address. usb 1-3: device not accepting address 4, error -71 usb 1-3: device descriptor read/all, error -71 usb usb1-port3: unable to enumerate USB device
Wifi is soft blocked by checking rfkill. When unblocked manually, after few seconds it would be soft blocked again. So I was suspecting something triggered rfkill to soft block wifi. At the end it was fixed by removing hp_wmi module.
The root cause is the way hp-wmi driver handles command 1B on post-2009 BIOS. In pre-2009 BIOS, command 1Bh return 0x4 to indicate that BIOS no longer controls the power for the wireless devices.
--- drivers/platform/x86/hp-wmi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/platform/x86/hp-wmi.c +10 -2
@@ -1298,8 +1298,16 @@ static int __init hp_wmi_bios_setup(stru wwan_rfkill =NULL ; rfkill2_count =0 ; -if (hp_wmi_rfkill_setup (device)) -hp_wmi_rfkill2_setup (device); +/* +* In pre-2009 BIOS, command 1Bh return 0x4 to indicate that +* BIOS no longer controls the power for the wireless +* devices. All features supported by this command will no +* longer be supported. +*/ +if (!hp_wmi_bios_2009_later ()) { +if (hp_wmi_rfkill_setup (device)) +hp_wmi_rfkill2_setup (device); + } err =hp_wmi_hwmon_init ();
Greg Kroah-Hartman
maintainerPATCH 145/190 wifi: ath11k: avoid deadlock during regulatory update in ath11k_regd_update()
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
commit f45cb6b29cd36514e13f7519770873d8c0457008 upstream.
(cherry picked from commit d99884ad9e3673a12879bc2830f6e5a66cccbd78 in ath-next as users are seeing this bug more now, also cc stable)
Running this test in a loop it is easy to reproduce an rtnl deadlock:
iw reg set FI
ifconfig wlan0 down
What happens is that thread A (workqueue) tries to update the regulatory:
try to acquire the rtnl_lock of ar->regd_update_work
rtnl_lock+0x17/0x20
ath11k_regd_update+0x15a/0x260 [ath11k]
ath11k_regd_update_work+0x15/0x20 [ath11k]
process_one_work+0x228/0x670
worker_thread+0x4d/0x440
kthread+0x16d/0x1b0
ret_from_fork+0x22/0x30And thread B (ifconfig) tries to stop the interface:
try to cancel_work_sync(&ar->regd_update_work) in ath11k_mac_op_stop().
ifconfig 3109 [003] 2414.232506: probe:
ath11k_mac_op_stop: (ffffffffc14187a0)
drv_stop+0x30 ([mac80211])
ieee80211_do_stop+0x5d2 ([mac80211])
ieee80211_stop+0x3e ([mac80211])
__dev_close_many+0x9e ([kernel.kallsyms])
__dev_change_flags+0xbe ([kernel.kallsyms])
dev_change_flags+0x23 ([kernel.kallsyms])
devinet_ioctl+0x5e3 ([kernel.kallsyms])
inet_ioctl+0x197 ([kernel.kallsyms])
sock_do_ioctl+0x4d ([kernel.kallsyms])
sock_ioctl+0x264 ([kernel.kallsyms])
__x64_sys_ioctl+0x92 ([kernel.kallsyms])
do_syscall_64+0x3a ([kernel.kallsyms])
entry_SYSCALL_64_after_hwframe+0x63 ([kernel.kallsyms])
__GI___ioctl+0x7 (/lib/x86_64-linux-gnu/libc-2.23.so)The sequence of deadlock is:
1. Thread B calls rtnl_lock().
2. Thread A starts to run and calls rtnl_lock() from within ath11k_regd_update_work(), then enters wait state because the lock is owned by thread B.
3. Thread B continues to run and tries to call cancel_work_sync(&ar->regd_update_work), but thread A is in ath11k_regd_update_work() waiting for rtnl_lock(). So cancel_work_sync() forever waits for ath11k_regd_update_work() to finish and we have a deadlock.
Fix this by switching from using regulatory_set_wiphy_regd_sync() to regulatory_set_wiphy_regd(). Now cfg80211 will schedule another workqueue which handles the locking on it's own. So the ath11k workqueue can simply exit without taking any locks, avoiding the deadlock.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
--- drivers/net/wireless/ath/ath11k/reg.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/wireless/ath/ath11k/reg.c +1 -5
@@ -287,11 +287,7 @@ int ath11k_regd_update(struct ath11k *ar goto err; } -rtnl_lock (); -wiphy_lock (ar->hw->wiphy); - ret =regulatory_set_wiphy_regd_sync (ar->hw->wiphy, regd_copy); -wiphy_unlock (ar->hw->wiphy); -rtnl_unlock (); + ret =regulatory_set_wiphy_regd (ar->hw->wiphy, regd_copy);kfree (regd_copy);
Greg Kroah-Hartman
maintainerPATCH 146/190 btrfs: fix match incorrectly in dev_args_match_device
In reply to Greg Kroah-HartmanFrom: Liu Shixin <[email protected]>
commit 0fca385d6ebc3cabb20f67bcf8a71f1448bdc001 upstream.
syzkaller found a failed assertion:
assertion failed: (args->devid != (u64)-1) || args->missing, in fs/btrfs/volumes.c:6921
This can be triggered when we set devid to (u64)-1 by ioctl. In this case, the match of devid will be skipped and the match of device may succeed incorrectly.
Patch 562d7b1512f7 introduced this function which is used to match device. This function contains two matching scenarios, we can distinguish them by checking the value of args->missing rather than check whether args->devid and args->uuid is default value.
--- fs/btrfs/volumes.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
fs/btrfs/volumes.c +8 -8
@@ -6805,18 +6805,18 @@ static bool dev_args_match_fs_devices(costatic bool dev_args_match_device (const struct btrfs_dev_lookup_args *args,const struct btrfs_device *device) { -ASSERT ((args->devid != (u64)-1 ) || args->missing); +if (args->missing) { +if (test_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &device->dev_state) && + !device->bdev) +return true; +return false; + } -if ((args->devid != (u64)-1 ) && device->devid != args->devid) +if (device->devid != args->devid)return false;if (args->uuid &&memcmp (device->uuid, args->uuid,BTRFS_UUID_SIZE ) !=0 )return false; -if (!args->missing) -return true; -if (test_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &device->dev_state) && - !device->bdev) -return true; -return false; +return true; }/*
Greg Kroah-Hartman
maintainerPATCH 147/190 btrfs: selftests: fix wrong error check in btrfs_free_dummy_root()
In reply to Greg Kroah-HartmanFrom: Zhang Xiaoxu <[email protected]>
commit 9b2f20344d450137d015b380ff0c2e2a6a170135 upstream.
The btrfs_alloc_dummy_root() uses ERR_PTR as the error return value rather than NULL, if error happened, there will be a NULL pointer dereference:
BUG: KASAN: null-ptr-deref in btrfs_free_dummy_root+0x21/0x50 [btrfs] Read of size 8 at addr 000000000000002c by task insmod/258926 CPU: 2 PID: 258926 Comm: insmod Tainted: G W 6.1.0-rc2+ #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-1.fc33 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x34/0x44 kasan_report+0xb7/0x140 kasan_check_range+0x145/0x1a0 btrfs_free_dummy_root+0x21/0x50 [btrfs] btrfs_test_free_space_cache+0x1a8c/0x1add [btrfs] btrfs_run_sanity_tests+0x65/0x80 [btrfs] init_btrfs_fs+0xec/0x154 [btrfs] do_one_initcall+0x87/0x2a0 do_init_module+0xdf/0x320 load_module+0x3006/0x3390 __do_sys_finit_module+0x113/0x1b0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
--- fs/btrfs/tests/btrfs-tests.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/tests/btrfs-tests.c +1 -1
@@ -200,7 +200,7 @@ void btrfs_free_dummy_fs_info(struct btrvoid btrfs_free_dummy_root (struct btrfs_root *root) { -if (!root) +if (IS_ERR_OR_NULL (root))return ;/* Will be freed by btrfs_free_fs_roots */ if (WARN_ON (test_bit (BTRFS_ROOT_IN_RADIX , &root->state)))
Greg Kroah-Hartman
maintainerPATCH 148/190 btrfs: zoned: clone zoned device info when cloning a device
In reply to Greg Kroah-HartmanFrom: Johannes Thumshirn <[email protected]>
commit 21e61ec6d0bb786818490e926aa9aeb4de95ad0d upstream.
When cloning a btrfs_device, we're not cloning the associated btrfs_zoned_device_info structure of the device in case of a zoned filesystem.
Later on this leads to a NULL pointer dereference when accessing the device's zone_info for instance when setting a zone as active.
This was uncovered by fstests' testcase btrfs/161.
--- fs/btrfs/volumes.c | 12 ++++++++++++ fs/btrfs/zoned.c | 40 ++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 11 +++++++++++ 3 files changed, 63 insertions(+)
fs/btrfs/volumes.c +12 -0
@@ -1009,6 +1009,18 @@ static struct btrfs_fs_devices *clone_fsrcu_assign_pointer (device->name, name); } +if (orig_dev->zone_info) { +struct btrfs_zoned_device_info *zone_info; + + zone_info =btrfs_clone_dev_zone_info (orig_dev); +if (!zone_info) { +btrfs_free_device (device); + ret = -ENOMEM ; + goto error; + } + device->zone_info = zone_info; + } +list_add (&device->dev_list, &fs_devices->devices); device->fs_devices = fs_devices; fs_devices->num_devices++;
fs/btrfs/zoned.c +40 -0
@@ -639,6 +639,46 @@ void btrfs_destroy_dev_zone_info(struct device->zone_info =NULL ; } +struct btrfs_zoned_device_info *btrfs_clone_dev_zone_info (struct btrfs_device *orig_dev) +{ +struct btrfs_zoned_device_info *zone_info; + + zone_info =kmemdup (orig_dev->zone_info,sizeof (*zone_info),GFP_KERNEL ); +if (!zone_info) +return NULL ; + + zone_info->seq_zones =bitmap_zalloc (zone_info->nr_zones,GFP_KERNEL ); +if (!zone_info->seq_zones) + goto out; + +bitmap_copy (zone_info->seq_zones, orig_dev->zone_info->seq_zones, + zone_info->nr_zones); + + zone_info->empty_zones =bitmap_zalloc (zone_info->nr_zones,GFP_KERNEL ); +if (!zone_info->empty_zones) + goto out; + +bitmap_copy (zone_info->empty_zones, orig_dev->zone_info->empty_zones, + zone_info->nr_zones); + + zone_info->active_zones =bitmap_zalloc (zone_info->nr_zones,GFP_KERNEL ); +if (!zone_info->active_zones) + goto out; + +bitmap_copy (zone_info->active_zones, orig_dev->zone_info->active_zones, + zone_info->nr_zones); + zone_info->zone_cache =NULL ; + +return zone_info; + +out: +bitmap_free (zone_info->seq_zones); +bitmap_free (zone_info->empty_zones); +bitmap_free (zone_info->active_zones); +kfree (zone_info); +return NULL ; +} +int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone) {
fs/btrfs/zoned.h +11 -0
@@ -36,6 +36,7 @@ int btrfs_get_dev_zone(struct btrfs_deviint btrfs_get_dev_zone_info_all_devices (struct btrfs_fs_info *fs_info);int btrfs_get_dev_zone_info (struct btrfs_device *device,bool populate_cache);void btrfs_destroy_dev_zone_info (struct btrfs_device *device); +struct btrfs_zoned_device_info *btrfs_clone_dev_zone_info (struct btrfs_device *orig_dev);int btrfs_check_zoned_mode (struct btrfs_fs_info *fs_info);int btrfs_check_mountopts_zoned (struct btrfs_fs_info *info); int btrfs_sb_log_location_bdev(struct block_device *bdev, int mirror, int rw,
@@ -103,6 +104,16 @@ static inline int btrfs_get_dev_zone_infstatic inline void btrfs_destroy_dev_zone_info (struct btrfs_device *device) { } +/* +* In case the kernel is compiled without CONFIG_BLK_DEV_ZONED we'll never call +* into btrfs_clone_dev_zone_info() so it's safe to return NULL here. +*/ +static inline struct btrfs_zoned_device_info *btrfs_clone_dev_zone_info ( +struct btrfs_device *orig_dev) +{ +return NULL ; +} +static inline int btrfs_check_zoned_mode (const struct btrfs_fs_info *fs_info) {if (!btrfs_is_zoned (fs_info))
Greg Kroah-Hartman
maintainerPATCH 149/190 btrfs: zoned: initialize devices zone info for seeding
In reply to Greg Kroah-HartmanFrom: Johannes Thumshirn <[email protected]>
commit a8d1b1647bf8244a5f270538e9e636e2657fffa3 upstream.
When performing seeding on a zoned filesystem it is necessary to initialize each zoned device's btrfs_zoned_device_info structure, otherwise mounting the filesystem will cause a NULL pointer dereference.
This was uncovered by fstests' testcase btrfs/163.
--- fs/btrfs/disk-io.c | 4 +++- fs/btrfs/volumes.c | 11 +++++++++-- fs/btrfs/volumes.h | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-)
fs/btrfs/disk-io.c +3 -1
@@ -2544,7 +2544,9 @@ static int btrfs_read_roots(struct btrfs fs_info->dev_root = root; }/* Initialize fs_info for all devices in any case */ -btrfs_init_devices_late (fs_info); + ret =btrfs_init_devices_late (fs_info); +if (ret) + goto out;/* * This tree can share blocks with some other fs tree during relocation
fs/btrfs/volumes.c +9 -2
@@ -7643,10 +7643,11 @@ error:return ret; } -void btrfs_init_devices_late (struct btrfs_fs_info *fs_info) +int btrfs_init_devices_late (struct btrfs_fs_info *fs_info) {struct btrfs_fs_devices *fs_devices = fs_info->fs_devices, *seed_devs;struct btrfs_device *device; +int ret =0 ; fs_devices->fs_info = fs_info;
@@ -7655,12 +7656,18 @@ void btrfs_init_devices_late(struct btrf device->fs_info = fs_info;list_for_each_entry (seed_devs, &fs_devices->seed_list, seed_list) { -list_for_each_entry (device, &seed_devs->devices, dev_list) +list_for_each_entry (device, &seed_devs->devices, dev_list) { device->fs_info = fs_info; + ret =btrfs_get_dev_zone_info (device, false); +if (ret) +break ; + } seed_devs->fs_info = fs_info; }mutex_unlock (&fs_devices->device_list_mutex); + +return ret; } static u64 btrfs_dev_stats_value(const struct extent_buffer *eb,
fs/btrfs/volumes.h +1 -1
@@ -629,7 +629,7 @@ int find_free_dev_extent(struct btrfs_devoid btrfs_dev_stat_inc_and_print (struct btrfs_device *dev,int index);int btrfs_get_dev_stats (struct btrfs_fs_info *fs_info,struct btrfs_ioctl_get_dev_stats *stats); -void btrfs_init_devices_late (struct btrfs_fs_info *fs_info); +int btrfs_init_devices_late (struct btrfs_fs_info *fs_info);int btrfs_init_dev_stats (struct btrfs_fs_info *fs_info);int btrfs_run_dev_stats (struct btrfs_trans_handle *trans);void btrfs_rm_dev_replace_remove_srcdev (struct btrfs_device *srcdev);
Greg Kroah-Hartman
maintainerPATCH 150/190 io_uring: check for rollover of buffer ID when providing buffers
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 3851d25c75ed03117268a8feb34adca5a843a126 upstream.
We already check if the chosen starting offset for the buffer IDs fit within an unsigned short, as 65535 is the maximum value for a provided buffer. But if the caller asks to add N buffers at offset M, and M + N would exceed the size of the unsigned short, we simply add buffers with wrapping around the ID.
This is not necessarily a bug and could in fact be a valid use case, but it seems confusing and inconsistent with the initial check for starting offset. Let's check for wrap consistently, and error the addition if we do need to wrap.
--- io_uring/kbuf.c | 2 ++ 1 file changed, 2 insertions(+)
io_uring/kbuf.c +2 -0
@@ -346,6 +346,8 @@ int io_provide_buffers_prep(struct io_ki tmp =READ_ONCE (sqe->off);if (tmp >USHRT_MAX )return -E2BIG ; +if (tmp + p->nbufs >=USHRT_MAX ) +return -EINVAL ; p->bid = tmp;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 151/190 phy: qcom-qmp-combo: fix NULL-deref on runtime resume
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 04948e757148f870a31f4887ea2239403f516c3c upstream.
Commit fc64623637da ("phy: qcom-qmp-combo,usb: add support for separate PCS_USB region") started treating the PCS_USB registers as potentially separate from the PCS registers but used the wrong base when no PCS_USB offset has been provided.
Fix the PCS_USB base used at runtime resume to prevent dereferencing a NULL pointer on platforms that do not provide a PCS_USB offset (e.g. SC7180).
--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/phy/qualcomm/phy-qcom-qmp-combo.c +1 -1
@@ -1914,7 +1914,7 @@ static void qcom_qmp_phy_combo_enable_austatic void qcom_qmp_phy_combo_disable_autonomous_mode (struct qmp_phy *qphy) {const struct qmp_phy_cfg *cfg = qphy->cfg; -void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs_usb; +void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs;void __iomem *pcs_misc = qphy->pcs_misc;/* Disable i/o clamp_n on resume for normal mode */
Greg Kroah-Hartman
maintainerPATCH 152/190 net: ethernet: ti: am65-cpsw: Fix segmentation fault at module unload
In reply to Greg Kroah-HartmanFrom: Roger Quadros <[email protected]>
commit 1a0c016a4831ea29be09bbc8162d4a2a0690b4b8 upstream.
Move am65_cpsw_nuss_phylink_cleanup() call to after am65_cpsw_nuss_cleanup_ndev() so phylink is still valid to prevent the below Segmentation fault on module remove when first slave link is up.
[ 31.652944] Unable to handle kernel paging request at virtual address 00040008000005f4 [ 31.684627] Mem abort info: [ 31.687446] ESR = 0x0000000096000004 [ 31.704614] EC = 0x25: DABT (current EL), IL = 32 bits [ 31.720663] SET = 0, FnV = 0 [ 31.723729] EA = 0, S1PTW = 0 [ 31.740617] FSC = 0x04: level 0 translation fault [ 31.756624] Data abort info: [ 31.759508] ISV = 0, ISS = 0x00000004 [ 31.776705] CM = 0, WnR = 0 [ 31.779695] [00040008000005f4] address between user and kernel address ranges [ 31.808644] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP [ 31.814928] Modules linked in: wlcore_sdio wl18xx wlcore mac80211 libarc4 cfg80211 rfkill crct10dif_ce phy_gmii_sel ti_am65_cpsw_nuss(-) sch_fq_codel ipv6 [ 31.828776] CPU: 0 PID: 1026 Comm: modprobe Not tainted 6.1.0-rc2-00012-gfabfcf7dafdb-dirty #160 [ 31.837547] Hardware name: Texas Instruments AM625 (DT) [ 31.842760] pstate: 40000005 (nZcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 31.849709] pc : phy_stop+0x18/0xf8 [ 31.853202] lr : phylink_stop+0x38/0xf8 [ 31.857031] sp : ffff80000a0839f0 [ 31.860335] x29: ffff80000a0839f0 x28: ffff000000de1c80 x27: 0000000000000000 [ 31.867462] x26: 0000000000000000 x25: 0000000000000000 x24: ffff80000a083b98 [ 31.874589] x23: 0000000000000800 x22: 0000000000000001 x21: ffff000001bfba90 [ 31.881715] x20: ffff0000015ee000 x19: 0004000800000200 x18: 0000000000000000 [ 31.888842] x17: ffff800076c45000 x16: ffff800008004000 x15: 000058e39660b106 [ 31.895969] x14: 0000000000000144 x13: 0000000000000144 x12: 0000000000000000 [ 31.903095] x11: 000000000000275f x10: 00000000000009e0 x9 : ffff80000a0837d0 [ 31.910222] x8 : ffff000000de26c0 x7 : ffff00007fbd6540 x6 : ffff00007fbd64c0 [ 31.917349] x5 : ffff00007fbd0b10 x4 : ffff00007fbd0b10 x3 : ffff00007fbd3920 [ 31.924476] x2 : d0a07fcff8b8d500 x1 : 0000000000000000 x0 : 0004000800000200 [ 31.931603] Call trace: [ 31.934042] phy_stop+0x18/0xf8 [ 31.937177] phylink_stop+0x38/0xf8 [ 31.940657] am65_cpsw_nuss_ndo_slave_stop+0x28/0x1e0 [ti_am65_cpsw_nuss] [ 31.947452] __dev_close_many+0xa4/0x140 [ 31.951371] dev_close_many+0x84/0x128 [ 31.955115] unregister_netdevice_many+0x130/0x6d0 [ 31.959897] unregister_netdevice_queue+0x94/0xd8 [ 31.964591] unregister_netdev+0x24/0x38 [ 31.968504] am65_cpsw_nuss_cleanup_ndev.isra.0+0x48/0x70 [ti_am65_cpsw_nuss] [ 31.975637] am65_cpsw_nuss_remove+0x58/0xf8 [ti_am65_cpsw_nuss]
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +1 -1
@@ -2791,7 +2791,6 @@ static int am65_cpsw_nuss_remove(structif (ret <0 )return ret; -am65_cpsw_nuss_phylink_cleanup (common);am65_cpsw_unregister_devlink (common);am65_cpsw_unregister_notifiers (common);
@@ -2799,6 +2798,7 @@ static int am65_cpsw_nuss_remove(struct* dma_deconfigure(dev) before devres_release_all(dev) */ am65_cpsw_nuss_cleanup_ndev (common); +am65_cpsw_nuss_phylink_cleanup (common);of_platform_device_destroy (common->mdio_dev,NULL );
Greg Kroah-Hartman
maintainerPATCH 153/190 mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
commit fb1dec44c6750bb414f47b929c8c175a1a127c31 upstream.
[[ NOTE: this is completely untested by the author, but included solely
because, as noted in commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers"), "other drivers using CQHCI might benefit from a similar change, if they also have CQHCI reset by SDHCI_RESET_ALL." We've now seen the same bug on at least MSM, Arasan, and Intel hardware. ]]
SDHCI_RESET_ALL resets will reset the hardware CQE state, but we aren't tracking that properly in software. When out of sync, we may trigger various timeouts.
It's not typical to perform resets while CQE is enabled, but this may occur in some suspend or error recovery scenarios.
Include this fix by way of the new sdhci_and_cqhci_reset() helper.
This patch depends on (and should not compile without) the patch entitled "mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI".
--- drivers/mmc/host/sdhci-esdhc-imx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-esdhc-imx.c +2 -1
@@ -25,6 +25,7 @@#include <linux/of_device.h> #include <linux/pinctrl/consumer.h> #include <linux/pm_runtime.h> +#include "sdhci-cqhci.h" #include "sdhci-pltfm.h" #include "sdhci-esdhc.h" #include "cqhci.h"
@@ -1288,7 +1289,7 @@ static void esdhc_set_uhs_signaling(strustatic void esdhc_reset (struct sdhci_host *host,u8 mask) { -sdhci_reset (host, mask); +sdhci_and_cqhci_reset (host, mask);sdhci_writel (host, host->ier,SDHCI_INT_ENABLE );sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE );
Greg Kroah-Hartman
maintainerPATCH 154/190 udf: Fix a slab-out-of-bounds write bug in udf_find_entry()
In reply to Greg Kroah-HartmanFrom: ZhangPeng <[email protected]>
commit c8af247de385ce49afabc3bf1cf4fd455c94bfe8 upstream.
Syzbot reported a slab-out-of-bounds Write bug:
loop0: detected capacity change from 0 to 2048
==================================================================
BUG: KASAN: slab-out-of-bounds in udf_find_entry+0x8a5/0x14f0 fs/udf/namei.c:253 Write of size 105 at addr ffff8880123ff896 by task syz-executor323/3610 CPU: 0 PID: 3610 Comm: syz-executor323 Not tainted 6.1.0-rc2-syzkaller-00105-gb229b6ca5abb #0 Hardware name: Google Compute Engine/Google Compute Engine, BIOS Google 10/11/2022 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1b1/0x28e lib/dump_stack.c:106 print_address_description+0x74/0x340 mm/kasan/report.c:284 print_report+0x107/0x1f0 mm/kasan/report.c:395 kasan_report+0xcd/0x100 mm/kasan/report.c:495 kasan_check_range+0x2a7/0x2e0 mm/kasan/generic.c:189 memcpy+0x3c/0x60 mm/kasan/shadow.c:66 udf_find_entry+0x8a5/0x14f0 fs/udf/namei.c:253 udf_lookup+0xef/0x340 fs/udf/namei.c:309 lookup_open fs/namei.c:3391 [inline] open_last_lookups fs/namei.c:3481 [inline] path_openat+0x10e6/0x2df0 fs/namei.c:3710 do_filp_open+0x264/0x4f0 fs/namei.c:3740 do_sys_openat2+0x124/0x4e0 fs/open.c:1310 do_sys_open fs/open.c:1326 [inline] __do_sys_creat fs/open.c:1402 [inline] __se_sys_creat fs/open.c:1396 [inline] __x64_sys_creat+0x11f/0x160 fs/open.c:1396 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7ffab0d164d9 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89
f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007ffe1a7e6bb8 EFLAGS: 00000246 ORIG_RAX: 0000000000000055
RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007ffab0d164d9
RDX: 00007ffab0d164d9 RSI: 0000000000000000 RDI: 0000000020000180
RBP: 00007ffab0cd5a10 R08: 0000000000000000 R09: 0000000000000000
R10: 00005555573552c0 R11: 0000000000000246 R12: 00007ffab0cd5aa0
R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000
</TASK> Allocated by task 3610: kasan_save_stack mm/kasan/common.c:45 [inline] kasan_set_track+0x3d/0x60 mm/kasan/common.c:52 ____kasan_kmalloc mm/kasan/common.c:371 [inline] __kasan_kmalloc+0x97/0xb0 mm/kasan/common.c:380 kmalloc include/linux/slab.h:576 [inline] udf_find_entry+0x7b6/0x14f0 fs/udf/namei.c:243 udf_lookup+0xef/0x340 fs/udf/namei.c:309 lookup_open fs/namei.c:3391 [inline] open_last_lookups fs/namei.c:3481 [inline] path_openat+0x10e6/0x2df0 fs/namei.c:3710 do_filp_open+0x264/0x4f0 fs/namei.c:3740 do_sys_openat2+0x124/0x4e0 fs/open.c:1310 do_sys_open fs/open.c:1326 [inline] __do_sys_creat fs/open.c:1402 [inline] __se_sys_creat fs/open.c:1396 [inline] __x64_sys_creat+0x11f/0x160 fs/open.c:1396 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd The buggy address belongs to the object at ffff8880123ff800 which belongs to the cache kmalloc-256 of size 256
The buggy address is located 150 bytes inside of
256-byte region [ffff8880123ff800, ffff8880123ff900)
The buggy address belongs to the physical page:
page:ffffea000048ff80 refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x123fe
head:ffffea000048ff80 order:1 compound_mapcount:0 compound_pincount:0
flags: 0xfff00000010200(slab|head|node=0|zone=1|lastcpupid=0x7ff)
raw: 00fff00000010200 ffffea00004b8500 dead000000000003 ffff888012041b40 raw: 0000000000000000 0000000080100010 00000001ffffffff 0000000000000000 page dumped because: kasan: bad access detected page_owner tracks the page as allocated page last allocated via order 0, migratetype Unmovable, gfp_mask 0x0(), pid 1, tgid 1 (swapper/0), ts 1841222404, free_ts 0 create_dummy_stack mm/page_owner.c:67 [inline] register_early_stack+0x77/0xd0 mm/page_owner.c:83 init_page_owner+0x3a/0x731 mm/page_owner.c:93 kernel_init_freeable+0x41c/0x5d5 init/main.c:1629 kernel_init+0x19/0x2b0 init/main.c:1519
page_owner free stack trace missing
Memory state around the buggy address:
ffff8880123ff780: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff8880123ff800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
>ffff8880123ff880: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 06
^
ffff8880123ff900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff8880123ff980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
==================================================================Fix this by changing the memory size allocated for copy_name from UDF_NAME_LEN(254) to UDF_NAME_LEN_CS0(255), because the total length (lfi) of subsequent memcpy can be up to 255.
--- fs/udf/namei.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/udf/namei.c +1 -1
@@ -240,7 +240,7 @@ static struct fileIdentDesc *udf_find_en poffset - lfi); else {if (!copy_name) { - copy_name =kmalloc (UDF_NAME_LEN , + copy_name =kmalloc (UDF_NAME_LEN_CS0 ,GFP_NOFS );if (!copy_name) { fi =ERR_PTR (-ENOMEM );
Greg Kroah-Hartman
maintainerPATCH 155/190 spi: intel: Use correct mask for flash and protected regions
In reply to Greg Kroah-HartmanFrom: Mika Westerberg <[email protected]>
commit 92a66cbf6b30eda5719fbdfb24cd15fb341bba32 upstream.
The flash and protected region mask is actually 0x7fff (30:16 and 14:0) and not 0x3fff so fix this accordingly. While there use GENMASK() instead.
--- drivers/spi/spi-intel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/spi/spi-intel.c +4 -4
@@ -52,17 +52,17 @@#define FRACC 0x50#define FREG (n) (0x54 + ((n) * 4)) -#define FREG_BASE_MASK 0x3fff +#define FREG_BASE_MASK GENMASK(14, 0)#define FREG_LIMIT_SHIFT 16 -#define FREG_LIMIT_MASK (0x03fff << FREG_LIMIT_SHIFT) +#define FREG_LIMIT_MASK GENMASK(30, 16)/* Offset is from @ispi->pregs */ #define PR (n) ((n) * 4)#define PR_WPE BIT(31)#define PR_LIMIT_SHIFT 16 -#define PR_LIMIT_MASK (0x3fff << PR_LIMIT_SHIFT) +#define PR_LIMIT_MASK GENMASK(30, 16)#define PR_RPE BIT(15) -#define PR_BASE_MASK 0x3fff +#define PR_BASE_MASK GENMASK(14, 0)/* Offsets are from @ispi->sregs */ #define SSFSTS_CTL 0x00
Greg Kroah-Hartman
maintainerPATCH 156/190 arch/x86/mm/hugetlbpage.c: pud_huge() returns 0 when using 2-level paging
In reply to Greg Kroah-HartmanFrom: Naoya Horiguchi <[email protected]>
commit 1fdbed657a4726639c4f17841fd2a0fb646c746e upstream.
The following bug is reported to be triggered when starting X on x86-32 system with i915:
[ 225.777375] kernel BUG at mm/memory.c:2664! [ 225.777391] invalid opcode: 0000 [#1] PREEMPT SMP [ 225.777405] CPU: 0 PID: 2402 Comm: Xorg Not tainted 6.1.0-rc3-bdg+ #86 [ 225.777415] Hardware name: /8I865G775-G, BIOS F1 08/29/2006 [ 225.777421] EIP: __apply_to_page_range+0x24d/0x31c [ 225.777437] Code: ff ff 8b 55 e8 8b 45 cc e8 0a 11 ec ff 89 d8 83 c4 28 5b 5e 5f 5d c3 81 7d e0 a0 ef 96 c1 74 ad 8b 45 d0 e8 2d 83 49 00 eb a3 <0f> 0b 25 00 f0 ff ff 81 eb 00 00 00 40 01 c3 8b 45 ec 8b 00 e8 76 [ 225.777446] EAX: 00000001 EBX: c53a3b58 ECX: b5c00000 EDX: c258aa00 [ 225.777454] ESI: b5c00000 EDI: b5900000 EBP: c4b0fdb4 ESP: c4b0fd80 [ 225.777462] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 EFLAGS: 00010202 [ 225.777470] CR0: 80050033 CR2: b5900000 CR3: 053a3000 CR4: 000006d0 [ 225.777479] Call Trace: [ 225.777486] ? i915_memcpy_init_early+0x63/0x63 [i915] [ 225.777684] apply_to_page_range+0x21/0x27 [ 225.777694] ? i915_memcpy_init_early+0x63/0x63 [i915] [ 225.777870] remap_io_mapping+0x49/0x75 [i915] [ 225.778046] ? i915_memcpy_init_early+0x63/0x63 [i915] [ 225.778220] ? mutex_unlock+0xb/0xd [ 225.778231] ? i915_vma_pin_fence+0x6d/0xf7 [i915] [ 225.778420] vm_fault_gtt+0x2a9/0x8f1 [i915] [ 225.778644] ? lock_is_held_type+0x56/0xe7 [ 225.778655] ? lock_is_held_type+0x7a/0xe7 [ 225.778663] ? 0xc1000000 [ 225.778670] __do_fault+0x21/0x6a [ 225.778679] handle_mm_fault+0x708/0xb21 [ 225.778686] ? mt_find+0x21e/0x5ae [ 225.778696] exc_page_fault+0x185/0x705 [ 225.778704] ? doublefault_shim+0x127/0x127 [ 225.778715] handle_exception+0x130/0x130 [ 225.778723] EIP: 0xb700468a
Recently pud_huge() got aware of non-present entry by commit 3a194f3f8ad0 ("mm/hugetlb: make pud_huge() and follow_huge_pud() aware of non-present pud entry") to handle some special states of gigantic page. However, it's overlooked that pud_none() always returns false when running with 2-level paging, and as a result pud_huge() can return true pointlessly.
Introduce "#if CONFIG_PGTABLE_LEVELS > 2" to pud_huge() to deal with this.
--- arch/x86/mm/hugetlbpage.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/mm/hugetlbpage.c +4 -0
@@ -37,8 +37,12 @@ int pmd_huge(pmd_t pmd)*/ int pud_huge (pud_t pud) { +#if CONFIG_PGTABLE_LEVELS >2 return !pud_none (pud) && (pud_val (pud) & (_PAGE_PRESENT|_PAGE_PSE)) != _PAGE_PRESENT; +#else +return 0 ; +#endif }#ifdef CONFIG_HUGETLB_PAGE
Signature · 1 line
2.38.1
Greg Kroah-Hartman
maintainerPATCH 157/190 mm: hugetlb_vmemmap: include missing linux/moduleparam.h
In reply to Greg Kroah-HartmanFrom: Vasily Gorbik <[email protected]>
commit db5e8d84319bcdb51e1d3cfa42b410291d6d1cfa upstream.
The kernel test robot reported build failures with a 'randconfig' on s390:
Quoted 1 line
Quoted 1 line
mm/hugetlb_vmemmap.c:421:11: error: a function declaration without a
prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
core_param(hugetlb_free_vmemmap, vmemmap_optimize_enabled, bool, 0);
^--- mm/hugetlb_vmemmap.c | 1 + 1 file changed, 1 insertion(+)
mm/hugetlb_vmemmap.c +1 -0
@@ -11,6 +11,7 @@#define pr_fmt (fmt) "HugeTLB: " fmt#include <linux/pgtable.h> +#include <linux/moduleparam.h> #include <linux/bootmem_info.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h>
Greg Kroah-Hartman
maintainerPATCH 158/190 dmaengine: idxd: Do not enable user type Work Queue without Shared Virtual Addressing
In reply to Greg Kroah-HartmanFrom: Fenghua Yu <[email protected]>
commit 0ec8ce07394442d722806fe61b901a5b2b17249d upstream.
When the idxd_user_drv driver is bound to a Work Queue (WQ) device without IOMMU or with IOMMU Passthrough without Shared Virtual Addressing (SVA), the application gains direct access to physical memory via the device by programming physical address to a submitted descriptor. This allows direct userspace read and write access to arbitrary physical memory. This is inconsistent with the security goals of a good kernel API.
Unlike vfio_pci driver, the IDXD char device driver does not provide any ways to pin user pages and translate the address from user VA to IOVA or PA without IOMMU SVA. Therefore the application has no way to instruct the device to perform DMA function. This makes the char device not usable for normal application usage.
Since user type WQ without SVA cannot be used for normal application usage and presents the security issue, bind idxd_user_drv driver and enable user type WQ only when SVA is enabled (i.e. user PASID is enabled).
--- drivers/dma/idxd/cdev.c | 18 ++++++++++++++++++ include/uapi/linux/idxd.h | 1 + 2 files changed, 19 insertions(+)
drivers/dma/idxd/cdev.c +18 -0
@@ -312,6 +312,24 @@ static int idxd_user_drv_probe(struct idif (idxd->state !=IDXD_DEV_ENABLED )return -ENXIO ; +/* +* User type WQ is enabled only when SVA is enabled for two reasons: +* - If no IOMMU or IOMMU Passthrough without SVA, userspace +* can directly access physical address through the WQ. +* - The IDXD cdev driver does not provide any ways to pin +* user pages and translate the address from user VA to IOVA or +* PA without IOMMU SVA. Therefore the application has no way +* to instruct the device to perform DMA function. This makes +* the cdev not usable for normal application usage. +*/ +if (!device_user_pasid_enabled (idxd)) { + idxd->cmd_status =IDXD_SCMD_WQ_USER_NO_IOMMU ; +dev_dbg (&idxd->pdev->dev, +"User type WQ cannot be enabled without SVA.\n" ); + +return -EOPNOTSUPP ; + } +mutex_lock (&wq->wq_lock); wq->type =IDXD_WQT_USER ; rc =drv_enable_wq (wq);
include/uapi/linux/idxd.h +1 -0
@@ -29,6 +29,7 @@ enum idxd_scmd_stat {IDXD_SCMD_WQ_NO_SIZE =0x800e0000 ,IDXD_SCMD_WQ_NO_PRIV =0x800f0000 ,IDXD_SCMD_WQ_IRQ_ERR =0x80100000 , + IDXD_SCMD_WQ_USER_NO_IOMMU = 0x80110000, };#define IDXD_SCMD_SOFTERR_MASK 0x80000000
Greg Kroah-Hartman
maintainerPATCH 159/190 mm/damon/dbgfs: check if rm_contexts input is for a real context
In reply to Greg Kroah-HartmanFrom: SeongJae Park <[email protected]>
commit 1de09a7281edecfdba19b3a07417f6d65243ab5f upstream.
A user could write a name of a file under 'damon/' debugfs directory, which is not a user-created context, to 'rm_contexts' file. In the case, 'dbgfs_rm_context()' just assumes it's the valid DAMON context directory only if a file of the name exist. As a result, invalid memory access could happen as below. Fix the bug by checking if the given input is for a directory. This check can filter out non-context inputs because directories under 'damon/' debugfs directory can be created via only 'mk_contexts' file.
This bug has found by syzbot[1].
[1] https://lore.kernel.org/damon/[email protected]/
--- mm/damon/dbgfs.c | 7 +++++++ 1 file changed, 7 insertions(+)
mm/damon/dbgfs.c +7 -0
@@ -882,6 +882,7 @@ out:static int dbgfs_rm_context (char *name) {struct dentry *root, *dir, **new_dirs; +struct inode *inode;struct damon_ctx **new_ctxs;int i, j;int ret =0 ;
@@ -897,6 +898,12 @@ static int dbgfs_rm_context(char *name)if (!dir)return -ENOENT ; + inode =d_inode (dir); +if (!S_ISDIR (inode->i_mode)) { + ret = -EINVAL ; + goto out_dput; + } + new_dirs =kmalloc_array (dbgfs_nr_ctxs -1 ,sizeof (*dbgfs_dirs),GFP_KERNEL );if (!new_dirs) {
Greg Kroah-Hartman
maintainerPATCH 160/190 mm/memremap.c: map FS_DAX device memory as decrypted
In reply to Greg Kroah-HartmanFrom: Pankaj Gupta <[email protected]>
commit 867400af90f1f953ff9e10b1b87ecaf9369a7eb8 upstream.
virtio_pmem use devm_memremap_pages() to map the device memory. By default this memory is mapped as encrypted with SEV. Guest reboot changes the current encryption key and guest no longer properly decrypts the FSDAX device meta data.
Mark the corresponding device memory region for FSDAX devices (mapped with memremap_pages) as decrypted to retain the persistent memory property.
--- mm/memremap.c | 1 + 1 file changed, 1 insertion(+)
mm/memremap.c +1 -0
@@ -330,6 +330,7 @@ void *memremap_pages(struct dev_pagemapWARN (1 ,"File system DAX not supported\n" );return ERR_PTR (-EINVAL ); } + params.pgprot =pgprot_decrypted (params.pgprot);break ;case MEMORY_DEVICE_GENERIC :break ;
Greg Kroah-Hartman
maintainerPATCH 161/190 mm/shmem: use page_mapping() to detect page cache for uffd continue
In reply to Greg Kroah-HartmanFrom: Peter Xu <[email protected]>
commit 93b0d9178743a68723babe8448981f658aebc58e upstream.
mfill_atomic_install_pte() checks page->mapping to detect whether one page is used in the page cache. However as pointed out by Matthew, the page can logically be a tail page rather than always the head in the case of uffd minor mode with UFFDIO_CONTINUE. It means we could wrongly install one pte with shmem thp tail page assuming it's an anonymous page.
It's not that clear even for anonymous page, since normally anonymous pages also have page->mapping being setup with the anon vma. It's safe here only because the only such caller to mfill_atomic_install_pte() is always passing in a newly allocated page (mcopy_atomic_pte()), whose page->mapping is not yet setup. However that's not extremely obvious either.
For either of above, use page_mapping() instead.
--- mm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/userfaultfd.c +1 -1
@@ -64,7 +64,7 @@ int mfill_atomic_install_pte(struct mm_spte_t _dst_pte, *dst_pte;bool writable = dst_vma->vm_flags &VM_WRITE ;bool vm_shared = dst_vma->vm_flags &VM_SHARED ; -bool page_in_cache = page->mapping; +bool page_in_cache =page_mapping (page);spinlock_t *ptl;struct inode *inode;pgoff_t offset, max_off;