5.14.7-rc1 review
Greg Kroah-Hartman
maintainercover 5.14.7-rc1 review
This is the start of the stable review cycle for the 5.14.7 release. There are 168 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, 22 Sep 2021 16:38:49 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.14.7-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.14.7-rc1
Yoshihiro Shimoda <[email protected]>
net: renesas: sh_eth: Fix freeing wrong tx descriptor
Heiner Kallweit <[email protected]>
cxgb3: fix oops on module removal
Randy Dunlap <[email protected]>
mfd: lpc_sch: Rename GPIOBASE to prevent build error
Willem de Bruijn <[email protected]>
ip6_gre: Revert "ip6_gre: add validation for csum_start"
Michael Chan <[email protected]>
bnxt_en: Fix possible unintended driver initiated error recovery
Michael Chan <[email protected]>
bnxt_en: Fix asic.rev in devlink dev info command
Edwin Peer <[email protected]>
bnxt_en: fix stored FW_PSID version masks
Rafał Miłecki <[email protected]>
net: dsa: b53: Fix IMP port setup on BCM5301x
Willem de Bruijn <[email protected]>
ip_gre: validate csum_start only on pull
Christophe JAILLET <[email protected]>
iwlwifi: pnvm: Fix a memory leak in 'iwl_pnvm_get_from_fs()'
Dror Moshe <[email protected]>
iwlwifi: move get pnvm file name to a separate function
Dinghao Liu <[email protected]>
qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom
Eric Dumazet <[email protected]>
fq_codel: reject silly quantum parameters
Benjamin Hesmans <[email protected]>
netfilter: socket: icmp6: fix use-after-scope
Mat Martineau <[email protected]>
mptcp: Only send extra TCP acks in eligible socket states
Rafał Miłecki <[email protected]>
net: dsa: b53: Set correct number of ports in the DSA struct
Rafał Miłecki <[email protected]>
net: dsa: b53: Fix calculating number of switch ports
Ziyang Xuan <[email protected]>
net: hso: add failure handler for add_net_device
Matthieu Baerts <[email protected]>
selftests: mptcp: clean tmp files in simult_flows
Paolo Abeni <[email protected]>
mptcp: fix possible divide by zero
James Clark <[email protected]>
tools build: Fix feature detect clean for out of source builds
Linus Walleij <[email protected]>
net: dsa: tag_rtl4_a: Fix egress tags
Ming Lei <[email protected]>
io_uring: retry in case of short read on block device
Christophe JAILLET <[email protected]>
gpio: mpc8xxx: Use 'devm_gpiochip_add_data()' to simplify the code and avoid a leak
Christophe JAILLET <[email protected]>
gpio: mpc8xxx: Fix a potential double iounmap call in 'mpc8xxx_probe()'
Christophe JAILLET <[email protected]>
gpio: mpc8xxx: Fix a resources leak in the error handling path of 'mpc8xxx_probe()'
Arnaldo Carvalho de Melo <[email protected]>
perf bench inject-buildid: Handle writen() errors
Li Huafei <[email protected]>
perf unwind: Do not overwrite FEATURE_CHECK_LDFLAGS-libunwind-{x86,aarch64}Arnaldo Carvalho de Melo <[email protected]>
perf config: Fix caching and memory leak in perf_home_perfconfig()
Randy Dunlap <[email protected]>
ARC: export clear_user_page() for modules
Christophe JAILLET <[email protected]>
mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()'
Curtis Klein <[email protected]>
watchdog: Fix NULL pointer dereference when releasing cdev
Andy Shevchenko <[email protected]>
PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
Jakub Kicinski <[email protected]>
PCI/PTM: Remove error message at boot
Oliver Upton <[email protected]>
KVM: arm64: Handle PSCI resets before userspace touches vCPU state
Oliver Upton <[email protected]>
KVM: arm64: Fix read-side race on updates to vcpu reset state
Zhihao Cheng <[email protected]>
mtd: mtdconcat: Check _read, _write callbacks existence before assignment
Zhihao Cheng <[email protected]>
mtd: mtdconcat: Judge callback existence based on the master
Masami Hiramatsu <[email protected]>
tracing/boot: Fix a hist trigger dependency for boot time tracing
Matthias Schiffer <[email protected]>
mfd: tqmx86: Clear GPIO IRQ resource when no IRQ is set
Dan Carpenter <[email protected]>
PCI: Fix pci_dev_str_match_path() alloc while atomic bug
Anshuman Khandual <[email protected]>
KVM: arm64: Restrict IPA size to maximum 48 bits on 4K and 16K page size
Pavel Skripkin <[email protected]>
netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex
Rob Herring <[email protected]>
PCI: iproc: Fix BCMA probe resource handling
Rob Herring <[email protected]>
PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges'
Geert Uytterhoeven <[email protected]>
PCI: controller: PCI_IXP4XX should depend on ARCH_IXP4XX
Linus Walleij <[email protected]>
backlight: ktd253: Stabilize backlight
Hans de Goede <[email protected]>
mfd: axp20x: Update AXP288 volatile ranges
Russell King (Oracle) <[email protected]>
net: phylink: add suspend/resume support
zhaoxiao <[email protected]>
stmmac: dwmac-loongson:Fix missing return value
Yang Li <[email protected]>
NTB: perf: Fix an error code in perf_setup_inbuf()
Yang Li <[email protected]>
NTB: Fix an error code in ntb_msit_probe()
Yang Li <[email protected]>
ethtool: Fix an error code in cxgb2.c
Tetsuo Handa <[email protected]>
loop: reduce the loop_ctl_mutex scope
Vishal Aslot <[email protected]>
PCI: ibmphp: Fix double unmap of io_mem
Paolo Valente <[email protected]>
block, bfq: honor already-setup queue merges
Daniele Palmas <[email protected]>
net: usb: cdc_mbim: avoid altsetting toggling for Telit LN920
Tetsuo Handa <[email protected]>
flow: fix object-size-mismatch warning in flowi{4,6}_to_flowi_common()
Ryoga Saito <[email protected]>
Set fc_nlinfo in nh_create_ipv4, nh_create_ipv6
Smadar Fuks <[email protected]>
octeontx2-af: Add additional register check to rvu_poll_reg()
Jan Kiszka <[email protected]>
watchdog: Start watchdog in watchdog_set_last_hw_keepalive only if appropriate
George Cherian <[email protected]>
PCI: Add ACS quirks for Cavium multi-function devices
Kishon Vijay Abraham I <[email protected]>
PCI: j721e: Add PCIe support for AM64
Kishon Vijay Abraham I <[email protected]>
PCI: j721e: Add PCIe support for J7200
Nadeem Athani <[email protected]>
PCI: cadence: Add quirk flag to set minimum delay in LTSSM Detect.Quiet state
Kishon Vijay Abraham I <[email protected]>
PCI: cadence: Use bitfield for *quirk_retrain_flag* instead of bool
Masami Hiramatsu <[email protected]>
tracing/probes: Reject events which have the same name of existing one
Will Deacon <[email protected]>
KVM: arm64: Make hyp_panic() more robust when protected mode is enabled
Kenneth Lee <[email protected]>
riscv: fix the global name pfn_base confliction error
Dinghao Liu <[email protected]>
PCI: rcar: Fix runtime PM imbalance in rcar_pcie_ep_probe()
Marc Zyngier <[email protected]>
mfd: Don't use irq_create_mapping() to resolve a mapping
Christophe JAILLET <[email protected]>
PCI: tegra: Fix OF node reference leak
Om Prakash Singh <[email protected]>
PCI: tegra194: Fix MSI-X programming
Om Prakash Singh <[email protected]>
PCI: tegra194: Fix handling BME_CHGED event
Miklos Szeredi <[email protected]>
fuse: fix use after free in fuse_read_interrupt()
Wasim Khan <[email protected]>
PCI: Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms
Linus Walleij <[email protected]>
mfd: db8500-prcmu: Adjust map to reality
Bjorn Andersson <[email protected]>
remoteproc: qcom: wcnss: Fix race with iris probe
Miquel Raynal <[email protected]>
dt-bindings: mtd: gpmc: Fix the ECC bytes vs. OOB bytes equation
David Thompson <[email protected]>
mlxbf_gige: clear valid_polarity upon open
Vladimir Oltean <[email protected]>
net: dsa: flush switchdev workqueue before tearing down CPU/DSA ports
Yanfei Xu <[email protected]>
blkcg: fix memory leak in blk_iolatency_init
Daniel Wagner <[email protected]>
nvme: avoid race in shutdown namespace removal
Jiaran Zhang <[email protected]>
net: hns3: fix the exception when query imp info
Aleksander Jan Bajkowski <[email protected]>
net: dsa: lantiq_gswip: Add 200ms assert delay
Ansuel Smith <[email protected]>
net: dsa: qca8k: fix kernel panic with legacy mdio mapping
Dave Ertman <[email protected]>
ice: Correctly deal with PFs that do not support RDMA
Aya Levin <[email protected]>
net/mlx5e: Fix mutual exclusion between CQE compression and HW TS
Vitaly Kuznetsov <[email protected]>
Drivers: hv: vmbus: Fix kernel crash upon unbinding a device from uio_hv_generic driver
Joakim Zhang <[email protected]>
net: stmmac: platform: fix build warning when with !CONFIG_PM_SLEEP
Jiaran Zhang <[email protected]>
net: hns3: fix the timing issue of VF clearing interrupt sources
Yufeng Mo <[email protected]>
net: hns3: disable mac in flr process
Yufeng Mo <[email protected]>
net: hns3: change affinity_mask to numa node range
Yufeng Mo <[email protected]>
net: hns3: pad the short tunnel frame before sending to hardware
Edwin Peer <[email protected]>
bnxt_en: make bnxt_free_skbs() safe to call after bnxt_free_mem()
David Hildenbrand <[email protected]>
s390/pci_mmio: fully validate the VMA before calling follow_pte()
Ganesh Goudar <[email protected]>
powerpc/mce: Fix access error in mce handler
Nicholas Piggin <[email protected]>
powerpc/64s: system call rfscv workaround for TM bugs
Nicholas Piggin <[email protected]>
KVM: PPC: Book3S HV: Tolerate treclaim. in fake-suspend mode changing registers
Sukadev Bhattiprolu <[email protected]>
ibmvnic: check failover_pending in login response
David Heidelberg <[email protected]>
dt-bindings: arm: Fix Toradex compatible typo
Aya Levin <[email protected]>
udp_tunnel: Fix udp_tunnel_nic work-queue type
Shai Malin <[email protected]>
qed: Handle management FW error
Andrea Claudi <[email protected]>
selftest: net: fix typo in altname test
zhenggy <[email protected]>
tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()
Will Deacon <[email protected]>
x86/uaccess: Fix 32-bit __get_user_asm_u64() when CC_HAS_ASM_GOTO_OUTPUT=y
Vladimir Oltean <[email protected]>
net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup
Eric Dumazet <[email protected]>
net/af_unix: fix a data-race in unix_dgram_poll
Paolo Abeni <[email protected]>
vhost_net: fix OoB on sendmsg() failure.
Kortan <[email protected]>
gen_compile_commands: fix missing 'sys' package
Alex Elder <[email protected]>
net: ipa: initialize all filter table slots
Baptiste Lepers <[email protected]>
events: Reuse value read using READ_ONCE instead of re-reading it
Nicholas Piggin <[email protected]>
powerpc/64s: system call scv tabort fix for corrupt irq soft-mask state
Keith Busch <[email protected]>
nvme-tcp: fix io_work priority inversion
Paolo Abeni <[email protected]>
igc: fix tunnel offloading
Joakim Zhang <[email protected]>
net: stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume
Maor Gottlieb <[email protected]>
net/mlx5: Fix potential sleeping in atomic context
Saeed Mahameed <[email protected]>
net/mlx5: FWTrace, cancel work on alloc pd error flow
Michael Petlan <[email protected]>
perf machine: Initialize srcline string member in add_location struct
Lee Shawn C <[email protected]>
drm/i915/dp: return proper DPRX link training result
Chris Wilson <[email protected]>
rtc: cmos: Disable irq around direct invocation of cmos_interrupt()
Arnd Bergmann <[email protected]>
drm/rockchip: cdn-dp-core: Make cdn_dp_core_resume __maybe_unused
Hoang Le <[email protected]>
tipc: increase timeout in tipc_sk_enqueue()
Florian Fainelli <[email protected]>
r6040: Restore MDIO clock frequency after MAC reset
Xiyu Yang <[email protected]>
net/l2tp: Fix reference count leak in l2tp_udp_recv_core
Lin, Zhenpeng <[email protected]>
dccp: don't duplicate ccid when cloning dccp sock
Randy Dunlap <[email protected]>
ptp: dp83640: don't define PAGE0
Eric Dumazet <[email protected]>
net-caif: avoid user-triggerable WARN_ON(1)
Eli Cohen <[email protected]>
net/{mlx5|nfp|bnxt}: Remove unnecessary RTNL lock assert
王贇 <[email protected]>
net: remove the unnecessary check in cipso_v4_doi_free
Saeed Mahameed <[email protected]>
ethtool: Fix rxnfc copy to user buffer overflow
Xin Long <[email protected]>
tipc: fix an use-after-free issue in tipc_recvmsg
Tony Luck <[email protected]>
x86/mce: Avoid infinite loop for copy from user recovery
Mike Rapoport <[email protected]>
x86/mm: Fix kern_addr_valid() to cope with existing but not present entries
Jeff Moyer <[email protected]>
x86/pat: Pass valid address to sanitize_phys()
Dan Carpenter <[email protected]>
net: qrtr: revert check in qrtr_endpoint_post()
Alexander Egorenkov <[email protected]>
s390/sclp: fix Secure-IPL facility detection
Lucas Stach <[email protected]>
drm/etnaviv: add missing MMU context put when reaping MMU mapping
Lucas Stach <[email protected]>
drm/etnaviv: reference MMU context when setting up hardware state
Lucas Stach <[email protected]>
drm/etnaviv: fix MMU context leak on GPU reset
Lucas Stach <[email protected]>
drm/etnaviv: exec and MMU state is lost when resetting the GPU
Lucas Stach <[email protected]>
drm/etnaviv: keep MMU context across runtime suspend/resume
Lucas Stach <[email protected]>
drm/etnaviv: stop abusing mmu_context as FE running marker
Lucas Stach <[email protected]>
drm/etnaviv: put submit prev MMU context when it exists
Lucas Stach <[email protected]>
drm/etnaviv: return context from etnaviv_iommu_context_get
Kai-Heng Feng <[email protected]>
drm/i915/dp: Use max params for panels < eDP 1.4
Jens Axboe <[email protected]>
io_uring: allow retry for O_NONBLOCK if async is supported
Nirmoy Das <[email protected]>
drm/radeon: pass drm dev radeon_agp_head_init directly
James Zhu <[email protected]>
drm/amdkfd: separate kfd_iommu_resume from kfd_resume
Kenneth Feng <[email protected]>
drm/amd/pm: fix the issue of uploading powerplay table
James Zhu <[email protected]>
drm/amdgpu: move iommu_resume before ip init/resume
James Zhu <[email protected]>
drm/amdgpu: add amdgpu_amdkfd_resume_iommu
Christian König <[email protected]>
drm/amdgpu: fix use after free during BO move
Nirmoy Das <[email protected]>
drm/amdgpu: use IS_ERR for debugfs APIs
Ernst Sjöstrand <[email protected]>
drm/amd/amdgpu: Increase HWIP_MAX_INSTANCE to 10
Evan Quan <[email protected]>
drm/amd/pm: fix runpm hang when amdgpu loaded prior to sound driver
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Fix white screen page fault for gpuvm
Hersen Wu <[email protected]>
drm/amd/display: dsc mst 2 4K displays go dark with 2 lane HBR3
Harry Wentland <[email protected]>
drm/amd/display: Get backlight from PWM if DMCU is not initialized
Evan Quan <[email protected]>
PCI: Add AMD GPU multi-function power dependencies
Juergen Gross <[email protected]>
PM: base: power: don't try to use non-existing RTC for storing data
Mark Brown <[email protected]>
arm64/sve: Use correct size when reinitialising SVE state
Adrian Bunk <[email protected]>
bnx2x: Fix enabling network interfaces without VFs
Juergen Gross <[email protected]>
xen: fix usage of pmd_populate in mremap for pv guests
Juergen Gross <[email protected]>
xen: reset legacy rtc flag for PV domU
Jan Beulich <[email protected]>
swiotlb-xen: fix late init retry
Jan Beulich <[email protected]>
swiotlb-xen: avoid double free
Jens Axboe <[email protected]>
io_uring: ensure symmetry in handling iter types in loop_rw_iter()
-------------
Diffstat:
Documentation/devicetree/bindings/arm/tegra.yaml | 2 +- .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- Makefile | 4 +- arch/arc/mm/cache.c | 2 +- arch/arm64/kernel/fpsimd.c | 2 +- arch/arm64/kvm/arm.c | 8 ++ arch/arm64/kvm/handle_exit.c | 23 ++-- arch/arm64/kvm/hyp/nvhe/host.S | 21 +++- arch/arm64/kvm/reset.c | 24 +++-- arch/powerpc/kernel/interrupt.c | 43 ++++++++ arch/powerpc/kernel/interrupt_64.S | 41 ------- arch/powerpc/kernel/mce.c | 17 ++- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 36 ++++++- arch/riscv/include/asm/page.h | 4 +- arch/riscv/mm/init.c | 6 +- arch/s390/pci/pci_mmio.c | 4 +- arch/x86/include/asm/uaccess.h | 4 +- arch/x86/kernel/cpu/mce/core.c | 43 ++++++-- arch/x86/mm/init_64.c | 6 +- arch/x86/mm/pat/memtype.c | 7 +- arch/x86/xen/enlighten_pv.c | 7 ++ arch/x86/xen/mmu_pv.c | 7 +- block/bfq-iosched.c | 16 ++- block/blk-cgroup.c | 10 +- drivers/base/power/trace.c | 10 ++ drivers/block/loop.c | 75 ++++++++----- drivers/block/loop.h | 1 + drivers/gpio/gpio-mpc8xxx.c | 13 +-- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 10 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 18 ++-- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +++-- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 18 ++-- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 11 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 16 ++- .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 10 -- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 24 ++++- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 21 ++++ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 3 +- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 3 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 43 ++++---- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 4 + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 8 ++ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 4 +- drivers/gpu/drm/i915/display/intel_dp.c | 5 +- .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- drivers/gpu/drm/radeon/radeon_kms.c | 2 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- drivers/hv/ring_buffer.c | 1 + drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/axp20x.c | 3 +- drivers/mfd/db8500-prcmu.c | 14 ++- drivers/mfd/lpc_sch.c | 4 +- drivers/mfd/stmpe.c | 4 +- drivers/mfd/tc3589x.c | 2 +- drivers/mfd/tqmx86.c | 2 + drivers/mfd/wm8994-irq.c | 2 +- drivers/mtd/mtdconcat.c | 33 ++++-- drivers/mtd/nand/raw/cafe_nand.c | 4 +- drivers/net/dsa/b53/b53_common.c | 34 ++++-- drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/dsa/lantiq_gswip.c | 6 ++ drivers/net/dsa/qca8k.c | 30 ++++-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 38 +++++-- drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 6 +- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 3 - drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 1 + drivers/net/ethernet/chelsio/cxgb3/sge.c | 3 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 4 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 19 ++-- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- drivers/net/ethernet/ibm/ibmvnic.c | 8 ++ drivers/net/ethernet/intel/ice/ice.h | 2 + drivers/net/ethernet/intel/ice/ice_idc.c | 6 ++ drivers/net/ethernet/intel/igc/igc_main.c | 4 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 12 ++- .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 3 - .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 +- .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 7 ++ .../net/ethernet/netronome/nfp/flower/offload.c | 3 - drivers/net/ethernet/qlogic/qed/qed_mcp.c | 6 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 1 - drivers/net/ethernet/rdc/r6040.c | 9 +- drivers/net/ethernet/renesas/sh_eth.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 --- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 44 ++++++++ drivers/net/ipa/ipa_table.c | 3 +- drivers/net/phy/dp83640_reg.h | 2 +- drivers/net/phy/phylink.c | 82 ++++++++++++++ drivers/net/usb/cdc_mbim.c | 5 + drivers/net/usb/hso.c | 11 +- drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 19 ++-- drivers/net/wireless/intel/iwlwifi/fw/pnvm.h | 20 ++++ drivers/ntb/test/ntb_msi_test.c | 4 +- drivers/ntb/test/ntb_perf.c | 1 + drivers/nvme/host/core.c | 15 ++- drivers/nvme/host/tcp.c | 20 ++-- drivers/pci/controller/Kconfig | 1 + drivers/pci/controller/cadence/pci-j721e.c | 61 ++++++++++- drivers/pci/controller/cadence/pcie-cadence-ep.c | 4 + drivers/pci/controller/cadence/pcie-cadence-host.c | 3 + drivers/pci/controller/cadence/pcie-cadence.c | 16 +++ drivers/pci/controller/cadence/pcie-cadence.h | 17 ++- drivers/pci/controller/dwc/pcie-tegra194.c | 32 +++--- drivers/pci/controller/pci-tegra.c | 13 ++- drivers/pci/controller/pcie-iproc-bcma.c | 16 ++- drivers/pci/controller/pcie-rcar-ep.c | 4 +- drivers/pci/hotplug/TODO | 3 - drivers/pci/hotplug/ibmphp_ebda.c | 5 +- drivers/pci/of.c | 2 +- drivers/pci/pci.c | 2 +- drivers/pci/pcie/ptm.c | 4 +- drivers/pci/quirks.c | 58 +++++++++- drivers/remoteproc/qcom_wcnss.c | 49 +++------ drivers/remoteproc/qcom_wcnss.h | 4 +- drivers/remoteproc/qcom_wcnss_iris.c | 120 +++++++++++++-------- drivers/rtc/rtc-cmos.c | 2 + drivers/s390/char/sclp_early.c | 3 +- drivers/vhost/net.c | 11 +- drivers/video/backlight/ktd253-backlight.c | 75 +++++++++---- drivers/watchdog/watchdog_dev.c | 8 +- drivers/xen/swiotlb-xen.c | 5 +- fs/fuse/dev.c | 4 +- fs/io_uring.c | 33 ++++-- include/linux/pci.h | 5 +- include/linux/pci_ids.h | 3 +- include/linux/phylink.h | 3 + include/linux/sched.h | 1 + include/linux/skbuff.h | 2 +- include/net/dsa.h | 5 + include/net/flow.h | 4 +- include/uapi/linux/pkt_sched.h | 2 + kernel/events/core.c | 2 +- kernel/trace/trace_boot.c | 15 +-- kernel/trace/trace_kprobe.c | 6 +- kernel/trace/trace_probe.c | 25 +++++ kernel/trace/trace_probe.h | 1 + kernel/trace/trace_uprobe.c | 6 +- net/caif/chnl_net.c | 19 +--- net/dccp/minisocks.c | 2 + net/dsa/dsa.c | 5 + net/dsa/dsa2.c | 46 +++++--- net/dsa/dsa_priv.h | 1 + net/dsa/slave.c | 12 +-- net/dsa/tag_rtl4_a.c | 7 +- net/ethtool/ioctl.c | 2 +- net/ipv4/cipso_ipv4.c | 18 ++-- net/ipv4/ip_gre.c | 9 +- net/ipv4/nexthop.c | 2 + net/ipv4/tcp_input.c | 2 +- net/ipv4/udp_tunnel_nic.c | 2 +- net/ipv6/ip6_gre.c | 2 - net/ipv6/netfilter/nf_socket_ipv6.c | 4 +- net/l2tp/l2tp_core.c | 4 +- net/mptcp/pm_netlink.c | 10 +- net/mptcp/protocol.c | 97 ++++++++--------- net/mptcp/protocol.h | 1 + net/netfilter/nft_ct.c | 9 +- net/qrtr/qrtr.c | 2 +- net/sched/sch_fq_codel.c | 12 ++- net/tipc/socket.c | 10 +- net/unix/af_unix.c | 2 +- scripts/clang-tools/gen_compile_commands.py | 1 + tools/build/Makefile | 2 +- tools/perf/Makefile.config | 8 +- tools/perf/bench/inject-buildid.c | 52 +++++---- tools/perf/util/config.c | 5 +- tools/perf/util/machine.c | 1 + tools/testing/selftests/net/altnames.sh | 2 +- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 +- 188 files changed, 1562 insertions(+), 717 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/168 io_uring: ensure symmetry in handling iter types in loop_rw_iter()
From: Jens Axboe <[email protected]>
commit 16c8d2df7ec0eed31b7d3b61cb13206a7fb930cc upstream.
When setting up the next segment, we check what type the iter is and handle it accordingly. However, when incrementing and processed amount we do not, and both iter advance and addr/len are adjusted, regardless of type. Split the increment side just like we do on the setup side.
--- fs/io_uring.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/io_uring.c +6 -3
@@ -3107,12 +3107,15 @@ static ssize_t loop_rw_iter(int rw, stru ret = nr;break ; } +if (!iov_iter_is_bvec (iter)) { +iov_iter_advance (iter, nr); + }else { + req->rw.len -= nr; + req->rw.addr += nr; + } ret += nr;if (nr != iovec.iov_len)break ; - req->rw.len -= nr; - req->rw.addr += nr; -iov_iter_advance (iter, nr); }return ret;
Greg Kroah-Hartman
maintainerPATCH 2/168 swiotlb-xen: avoid double free
In reply to Greg Kroah-HartmanFrom: Jan Beulich <[email protected]>
commit ce6a80d1b2f923b1839655a1cda786293feaa085 upstream.
Of the two paths leading to the "error" label in xen_swiotlb_init() one didn't allocate anything, while the other did already free what was allocated.
--- drivers/xen/swiotlb-xen.c | 1 - 1 file changed, 1 deletion(-)
drivers/xen/swiotlb-xen.c +0 -1
@@ -216,7 +216,6 @@ error: goto retry; }pr_err ("%s (rc:%d)\n" ,xen_swiotlb_error (m_ret), rc); -free_pages ((unsigned long )start, order);return rc; }
Greg Kroah-Hartman
maintainerPATCH 3/168 swiotlb-xen: fix late init retry
In reply to Greg Kroah-HartmanFrom: Jan Beulich <[email protected]>
commit 4c092c59015f7adf0f07685f869edb96d997a756 upstream.
The commit referenced below removed the assignment of "bytes" from xen_swiotlb_init() without - like done for xen_swiotlb_init_early() - adding an assignment on the retry path, thus leading to excessively sized allocations upon retries.
--- drivers/xen/swiotlb-xen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/xen/swiotlb-xen.c +2 -2
@@ -211,8 +211,8 @@ error:if (repeat--) {/* Min is 2MB */ nslabs =max (1024UL , (nslabs >>1 )); -pr_info ("Lowering to %luMB\n" , - (nslabs <<IO_TLB_SHIFT ) >>20 ); + bytes = nslabs <<IO_TLB_SHIFT ; +pr_info ("Lowering to %luMB\n" , bytes >>20 ); goto retry; }pr_err ("%s (rc:%d)\n" ,xen_swiotlb_error (m_ret), rc);
Greg Kroah-Hartman
maintainerPATCH 4/168 xen: reset legacy rtc flag for PV domU
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit f68aa100d815b5b4467fd1c3abbe3b99d65fd028 upstream.
A Xen PV guest doesn't have a legacy RTC device, so reset the legacy RTC flag. Otherwise the following WARN splat will occur at boot:
[ 1.333404] WARNING: CPU: 1 PID: 1 at /home/gross/linux/head/drivers/rtc/rtc-mc146818-lib.c:25 mc146818_get_time+0x1be/0x210 [ 1.333404] Modules linked in: [ 1.333404] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G W 5.14.0-rc7-default+ #282 [ 1.333404] RIP: e030:mc146818_get_time+0x1be/0x210 [ 1.333404] Code: c0 64 01 c5 83 fd 45 89 6b 14 7f 06 83 c5 64 89 6b 14 41 83 ec 01 b8 02 00 00 00 44 89 63 10 5b 5d 41 5c 41 5d 41 5e 41 5f c3 <0f> 0b 48 c7 c7 30 0e ef 82 4c 89 e6 e8 71 2a 24 00 48 c7 c0 ff ff [ 1.333404] RSP: e02b:ffffc90040093df8 EFLAGS: 00010002 [ 1.333404] RAX: 00000000000000ff RBX: ffffc90040093e34 RCX: 0000000000000000 [ 1.333404] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 000000000000000d [ 1.333404] RBP: ffffffff82ef0e30 R08: ffff888005013e60 R09: 0000000000000000 [ 1.333404] R10: ffffffff82373e9b R11: 0000000000033080 R12: 0000000000000200 [ 1.333404] R13: 0000000000000000 R14: 0000000000000002 R15: ffffffff82cdc6d4 [ 1.333404] FS: 0000000000000000(0000) GS:ffff88807d440000(0000) knlGS:0000000000000000 [ 1.333404] CS: 10000e030 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1.333404] CR2: 0000000000000000 CR3: 000000000260a000 CR4: 0000000000050660 [ 1.333404] Call Trace: [ 1.333404] ? wakeup_sources_sysfs_init+0x30/0x30 [ 1.333404] ? rdinit_setup+0x2b/0x2b [ 1.333404] early_resume_init+0x23/0xa4 [ 1.333404] ? cn_proc_init+0x36/0x36 [ 1.333404] do_one_initcall+0x3e/0x200 [ 1.333404] kernel_init_freeable+0x232/0x28e [ 1.333404] ? rest_init+0xd0/0xd0 [ 1.333404] kernel_init+0x16/0x120 [ 1.333404] ret_from_fork+0x1f/0x30
--- arch/x86/xen/enlighten_pv.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/xen/enlighten_pv.c +7 -0
@@ -1215,6 +1215,11 @@ static void __init xen_dom0_set_legacy_f x86_platform.legacy.rtc =1 ; } +static void __init xen_domu_set_legacy_features (void ) +{ + x86_platform.legacy.rtc =0 ; +} +/* First C function to be called on Xen boot */ asmlinkage __visible void __init xen_start_kernel(void) {
@@ -1367,6 +1372,8 @@ asmlinkage __visible void __init xen_staadd_preferred_console ("xenboot" ,0 ,NULL );if (pci_xen) x86_init.pci.arch_init = pci_xen_init; + x86_platform.set_legacy_features = + xen_domu_set_legacy_features; }else { const struct dom0_vga_console_info *info = (void *)((char *)xen_start_info +
Greg Kroah-Hartman
maintainerPATCH 5/168 xen: fix usage of pmd_populate in mremap for pv guests
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit 36c9b5929b7094ea19a78827c0ede20d2e0e6c9c upstream.
Commit 0881ace292b662 ("mm/mremap: use pmd/pud_poplulate to update page table entries") introduced a regression when running as Xen PV guest.
Today pmd_populate() for Xen PV assumes that the PFN inserted is referencing a not yet used page table. In case of move_normal_pmd() this is not true, resulting in WARN splats like:
[34321.304270] ------------[ cut here ]------------ [34321.304277] WARNING: CPU: 0 PID: 23628 at arch/x86/xen/multicalls.c:102 xen_mc_flush+0x176/0x1a0 [34321.304288] Modules linked in: [34321.304291] CPU: 0 PID: 23628 Comm: apt-get Not tainted 5.14.1-20210906-doflr-mac80211debug+ #1 [34321.304294] Hardware name: MSI MS-7640/890FXA-GD70 (MS-7640) , BIOS V1.8B1 09/13/2010 [34321.304296] RIP: e030:xen_mc_flush+0x176/0x1a0 [34321.304300] Code: 89 45 18 48 c1 e9 3f 48 89 ce e9 20 ff ff ff e8 60 03 00 00 66 90 5b 5d 41 5c 41 5d c3 48 c7 45 18 ea ff ff ff be 01 00 00 00 <0f> 0b 8b 55 00 48 c7 c7 10 97 aa 82 31 db 49 c7 c5 38 97 aa 82 65 [34321.304303] RSP: e02b:ffffc90000a97c90 EFLAGS: 00010002 [34321.304305] RAX: ffff88807d416398 RBX: ffff88807d416350 RCX: ffff88807d416398 [34321.304306] RDX: 0000000000000001 RSI: 0000000000000001 RDI: deadbeefdeadf00d [34321.304308] RBP: ffff88807d416300 R08: aaaaaaaaaaaaaaaa R09: ffff888006160cc0 [34321.304309] R10: deadbeefdeadf00d R11: ffffea000026a600 R12: 0000000000000000 [34321.304310] R13: ffff888012f6b000 R14: 0000000012f6b000 R15: 0000000000000001 [34321.304320] FS: 00007f5071177800(0000) GS:ffff88807d400000(0000) knlGS:0000000000000000 [34321.304322] CS: 10000e030 DS: 0000 ES: 0000 CR0: 0000000080050033 [34321.304323] CR2: 00007f506f542000 CR3: 00000000160cc000 CR4: 0000000000000660 [34321.304326] Call Trace: [34321.304331] xen_alloc_pte+0x294/0x320 [34321.304334] move_pgt_entry+0x165/0x4b0 [34321.304339] move_page_tables+0x6fa/0x8d0 [34321.304342] move_vma.isra.44+0x138/0x500 [34321.304345] __x64_sys_mremap+0x296/0x410 [34321.304348] do_syscall_64+0x3a/0x80 [34321.304352] entry_SYSCALL_64_after_hwframe+0x44/0xae [34321.304355] RIP: 0033:0x7f507196301a [34321.304358] Code: 73 01 c3 48 8b 0d 76 0e 0c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 49 89 ca b8 19 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 46 0e 0c 00 f7 d8 64 89 01 48 [34321.304360] RSP: 002b:00007ffda1eecd38 EFLAGS: 00000246 ORIG_RAX: 0000000000000019 [34321.304362] RAX: ffffffffffffffda RBX: 000056205f950f30 RCX: 00007f507196301a [34321.304363] RDX: 0000000001a00000 RSI: 0000000001900000 RDI: 00007f506dc56000 [34321.304364] RBP: 0000000001a00000 R08: 0000000000000010 R09: 0000000000000004 [34321.304365] R10: 0000000000000001 R11: 0000000000000246 R12: 00007f506dc56060 [34321.304367] R13: 00007f506dc56000 R14: 00007f506dc56060 R15: 000056205f950f30 [34321.304368] ---[ end trace a19885b78fe8f33e ]--- [34321.304370] 1 of 2 multicall(s) failed: cpu 0 [34321.304371] call 2: op=12297829382473034410 arg=[aaaaaaaaaaaaaaaa] result=-22
Fix that by modifying xen_alloc_ptpage() to only pin the page table in case it wasn't pinned already.
--- arch/x86/xen/mmu_pv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/xen/mmu_pv.c +5 -2
@@ -1518,14 +1518,17 @@ static inline void xen_alloc_ptpage(struif (pinned) {struct page *page =pfn_to_page (pfn); -if (static_branch_likely (&xen_struct_pages_ready)) + pinned = false; +if (static_branch_likely (&xen_struct_pages_ready)) { + pinned =PagePinned (page);SetPagePinned (page); + }xen_mc_batch ();__set_pfn_prot (pfn,PAGE_KERNEL_RO ); -if (level ==PT_PTE &&USE_SPLIT_PTE_PTLOCKS ) +if (level ==PT_PTE &&USE_SPLIT_PTE_PTLOCKS && !pinned)__pin_pagetable_pfn (MMUEXT_PIN_L1_TABLE , pfn);xen_mc_issue (PARAVIRT_LAZY_MMU );
Greg Kroah-Hartman
maintainerPATCH 6/168 bnx2x: Fix enabling network interfaces without VFs
In reply to Greg Kroah-HartmanFrom: Adrian Bunk <[email protected]>
commit 52ce14c134a003fee03d8fc57442c05a55b53715 upstream.
This function is called to enable SR-IOV when available, not enabling interfaces without VFs was a regression.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +1 -1
@@ -1224,7 +1224,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp,/* SR-IOV capability was enabled but there are no VFs*/ if (iov->total ==0 ) { - err = -EINVAL ; + err =0 ; goto failed; }
Greg Kroah-Hartman
maintainerPATCH 7/168 arm64/sve: Use correct size when reinitialising SVE state
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
commit e35ac9d0b56e9efefaeeb84b635ea26c2839ea86 upstream.
When we need a buffer for SVE register state we call sve_alloc() to make sure that one is there. In order to avoid repeated allocations and frees we keep the buffer around unless we change vector length and just memset() it to ensure a clean register state. The function that deals with this takes the task to operate on as an argument, however in the case where we do a memset() we initialise using the SVE state size for the current task rather than the task passed as an argument.
This is only an issue in the case where we are setting the register state for a task via ptrace and the task being configured has a different vector length to the task tracing it. In the case where the buffer is larger in the traced process we will leak old state from the traced process to itself, in the case where the buffer is smaller in the traced process we will overflow the buffer and corrupt memory.
--- arch/arm64/kernel/fpsimd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/fpsimd.c +1 -1
@@ -511,7 +511,7 @@ size_t sve_state_size(struct task_structvoid sve_alloc (struct task_struct *task) {if (task->thread.sve_state) { -memset (task->thread.sve_state,0 ,sve_state_size (current)); +memset (task->thread.sve_state,0 ,sve_state_size (task));return ; }
Greg Kroah-Hartman
maintainerPATCH 8/168 PM: base: power: dont try to use non-existing RTC for storing data
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit 0560204b360a332c321124dbc5cdfd3364533a74 upstream.
If there is no legacy RTC device, don't try to use it for storing trace data across suspend/resume.
--- drivers/base/power/trace.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/base/power/trace.c +10 -0
@@ -13,6 +13,7 @@#include <linux/export.h> #include <linux/rtc.h> #include <linux/suspend.h> +#include <linux/init.h> #include <linux/mc146818rtc.h>
@@ -165,6 +166,9 @@ void generate_pm_trace(const void *traceconst char *file = *(const char **)(tracedata +2 );unsigned int user_hash_value, file_hash_value; +if (!x86_platform.legacy.rtc) +return ; + user_hash_value = user %USERHASH ; file_hash_value =hash_string (lineno, file,FILEHASH );set_magic_time (user_hash_value, file_hash_value, dev_hash_value);
@@ -267,6 +271,9 @@ static struct notifier_block pm_trace_nbstatic int __init early_resume_init (void ) { +if (!x86_platform.legacy.rtc) +return 0 ; + hash_value_early_read =read_magic_time ();register_pm_notifier (&pm_trace_nb);return 0 ;
@@ -277,6 +284,9 @@ static int __init late_resume_init(void)unsigned int val = hash_value_early_read;unsigned int user, file, dev; +if (!x86_platform.legacy.rtc) +return 0 ; + user = val %USERHASH ; val = val /USERHASH ; file = val %FILEHASH ;
Greg Kroah-Hartman
maintainerPATCH 9/168 PCI: Add AMD GPU multi-function power dependencies
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit 60b78ed088ebe1a872ee1320b6c5ad6ee2c4bd9a upstream.
Some AMD GPUs have built-in USB xHCI and USB Type-C UCSI controllers with power dependencies between the GPU and the other functions as in 6d2e369f0d4c ("PCI: Add NVIDIA GPU multi-function power dependencies").
Add device link support for the AMD integrated USB xHCI and USB Type-C UCSI controllers.
Without this, runtime power management, including GPU resume and temp and fan sensors don't work correctly.
Reported-at: https://gitlab.freedesktop.org/drm/amd/-/issues/1704
--- drivers/pci/quirks.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pci/quirks.c +7 -2
@@ -5350,7 +5350,7 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR PCI_CLASS_MULTIMEDIA_HD_AUDIO, 8, quirk_gpu_hda);/* -* Create device link for NVIDIA GPU with integrated USB xHCI Host +* Create device link for GPUs with integrated USB xHCI Host * controller to VGA. */ static void quirk_gpu_usb (struct pci_dev *usb)
@@ -5359,9 +5359,11 @@ static void quirk_gpu_usb(struct pci_dev }DECLARE_PCI_FIXUP_CLASS_FINAL (PCI_VENDOR_ID_NVIDIA ,PCI_ANY_ID ,PCI_CLASS_SERIAL_USB ,8 , quirk_gpu_usb); +DECLARE_PCI_FIXUP_CLASS_FINAL (PCI_VENDOR_ID_ATI ,PCI_ANY_ID , +PCI_CLASS_SERIAL_USB ,8 , quirk_gpu_usb);/* -* Create device link for NVIDIA GPU with integrated Type-C UCSI controller +* Create device link for GPUs with integrated Type-C UCSI controller * to VGA. Currently there is no class code defined for UCSI device over PCI * so using UNKNOWN class for now and it will be updated when UCSI * over PCI gets a class code.
@@ -5374,6 +5376,9 @@ static void quirk_gpu_usb_typec_ucsi(strDECLARE_PCI_FIXUP_CLASS_FINAL (PCI_VENDOR_ID_NVIDIA ,PCI_ANY_ID ,PCI_CLASS_SERIAL_UNKNOWN ,8 , quirk_gpu_usb_typec_ucsi); +DECLARE_PCI_FIXUP_CLASS_FINAL (PCI_VENDOR_ID_ATI ,PCI_ANY_ID , +PCI_CLASS_SERIAL_UNKNOWN ,8 , + quirk_gpu_usb_typec_ucsi);/* * Enable the NVIDIA GPU integrated HDA controller if the BIOS left it
Greg Kroah-Hartman
maintainerPATCH 10/168 drm/amd/display: Get backlight from PWM if DMCU is not initialized
In reply to Greg Kroah-HartmanFrom: Harry Wentland <[email protected]>
commit 9987fbb368038d41bfdcda2a3f7f4945d7daa9a5 upstream.
On Carrizo/Stoney systems we set backlight through panel_cntl, i.e. directly via the PWM registers, if DMCU is not initialized. We always read it back through ABM registers which leads to a mismatch and forces atomic_commit to program the backlight each time.
Instead make sure we use the same logic for backlight readback, i.e. read it from panel_cntl if DMCU is not initialized.
We also need to remove some extraneous and incorrect calculations at the end of dce_get_16_bit_backlight_from_pwm.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 16 ++++++++++++---- drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 10 ---------- 2 files changed, 12 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +12 -4
@@ -2578,13 +2578,21 @@ static struct abm *get_abm_from_stream_rint dc_link_get_backlight_level (const struct dc_link *link) { -struct abm *abm =get_abm_from_stream_res (link); +struct panel_cntl *panel_cntl = link->panel_cntl; +struct dc *dc = link->ctx->dc; +struct dmcu *dmcu = dc->res_pool->dmcu; +bool fw_set_brightness = true; -if (abm ==NULL || abm->funcs->get_current_backlight ==NULL ) -return DC_ERROR_UNEXPECTED ; +if (dmcu) + fw_set_brightness = dmcu->funcs->is_dmcu_initialized (dmcu); -return (int ) abm->funcs->get_current_backlight (abm); +if (!fw_set_brightness && panel_cntl->funcs->get_current_backlight) +return panel_cntl->funcs->get_current_backlight (panel_cntl); +else if (abm !=NULL && abm->funcs->get_current_backlight !=NULL ) +return (int ) abm->funcs->get_current_backlight (abm); +else +return DC_ERROR_UNEXPECTED ; }int dc_link_get_target_backlight_pwm (const struct dc_link *link)
drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c +0 -10
@@ -49,7 +49,6 @@static unsigned int dce_get_16_bit_backlight_from_pwm (struct panel_cntl *panel_cntl) {uint64_t current_backlight; -uint32_t round_result;uint32_t bl_period, bl_int_count;uint32_t bl_pwm, fractional_duty_cycle_en;uint32_t bl_period_mask, bl_pwm_mask;
@@ -84,15 +83,6 @@ static unsigned int dce_get_16_bit_backl current_backlight =div_u64 (current_backlight, bl_period); current_backlight = (current_backlight +1 ) >>1 ; - current_backlight = (uint64_t )(current_backlight) * bl_period; - - round_result = (uint32_t )(current_backlight &0xFFFFFFFF ); - - round_result = (round_result >> (bl_int_count-1 )) &1 ; - - current_backlight >>= bl_int_count; - current_backlight += round_result; -return (uint32_t )(current_backlight); }
Greg Kroah-Hartman
maintainerPATCH 11/168 drm/amd/display: dsc mst 2 4K displays go dark with 2 lane HBR3
In reply to Greg Kroah-HartmanFrom: Hersen Wu <[email protected]>
commit 90517c9838602846daa0feec7b37382fed61b001 upstream.
[Why]
call stack of amdgpu dsc mst pbn, slot num calculation is as below:
-compute_bpp_x16_from_target_bandwidth -decide_dsc_target_bpp_x16
-setup_dsc_config
-dc_dsc_compute_bandwidth_range -compute_mst_dsc_configs_for_link -compute_mst_dsc_configs_for_state
from pbn -> dsc target bpp_x16
bpp_x16 is calulated by compute_bpp_x16_from_target_bandwidth. Beside pixel clock and bpp, num_slices_h and bpp_increment_div will also affect bpp_x16.
from dsc target bpp_x16 -> pbn
within dm_update_mst_vcpi_slots_for_dsc,
pbn = drm_dp_calc_pbn_mode(clock, bpp_x16, true);
drm_dp_calc_pbn_mode(int clock, int bpp, bool dsc)
{
return DIV_ROUND_UP_ULL(mul_u32_u32(clock * (bpp / 16), 64 * 1006),
8 * 54 * 1000 * 1000); }
bpp / 16 trunc digits after decimal point. This will cause calculation delta. drm_dp_calc_pbn_mode does not have other informations, like num_slices_h, bpp_increment_div. therefore, it does not do revese calcuation properly from bpp_x16 to pbn.
pbn from drm_dp_calc_pbn_mode is less than pbn from compute_mst_dsc_configs_for_state. This cause not enough mst slot allocated to display. display could not visually light up.
[How]
pass pbn from compute_mst_dsc_configs_for_state to dm_update_mst_vcpi_slots_for_dsc
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++---- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 18 ++++----- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 11 +++++- 3 files changed, 34 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +16 -6
@@ -6778,14 +6778,15 @@ const struct drm_encoder_helper_funcs am#if defined(CONFIG_DRM_AMD_DC_DCN )static int dm_update_mst_vcpi_slots_for_dsc (struct drm_atomic_state *state, -struct dc_state *dc_state) +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {struct dc_stream_state *stream =NULL ;struct drm_connector *connector;struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j, clock, bpp; +int i, j, clock;int vcpi, pbn_div, pbn =0 ;for_each_new_connector_in_state (state, connector, new_con_state, i) {
@@ -6824,9 +6825,15 @@ static int dm_update_mst_vcpi_slots_for_ } pbn_div =dm_mst_get_pbn_divider (stream->link); - bpp = stream->timing.dsc_cfg.bits_per_pixel; clock = stream->timing.pix_clk_100hz /10 ; - pbn =drm_dp_calc_pbn_mode (clock, bpp, true); +/* pbn is calculated by compute_mst_dsc_configs_for_state*/ +for (j =0 ; j < dc_state->stream_count; j++) { +if (vars[j].aconnector == aconnector) { + pbn = vars[j].pbn; +break ; + } + } + vcpi = drm_dp_mst_atomic_enable_dsc(state, aconnector->port, pbn, pbn_div,
@@ -10208,6 +10215,9 @@ static int amdgpu_dm_atomic_check(structint ret, i;bool lock_and_validation_needed = false;struct dm_crtc_state *dm_old_crtc_state; +#if defined(CONFIG_DRM_AMD_DC_DCN ) +struct dsc_mst_fairness_vars vars[MAX_PIPES ]; +#endif trace_amdgpu_dm_atomic_check_begin (state);
@@ -10438,10 +10448,10 @@ static int amdgpu_dm_atomic_check(struct goto fail;#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state->context)) +if (!compute_mst_dsc_configs_for_state (state, dm_state->context, vars)) goto fail; - ret =dm_update_mst_vcpi_slots_for_dsc (state, dm_state->context); + ret =dm_update_mst_vcpi_slots_for_dsc (state, dm_state->context, vars);if (ret) goto fail;#endif
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +8 -10
@@ -495,12 +495,7 @@ struct dsc_mst_fairness_params {uint32_t num_slices_h;uint32_t num_slices_v;uint32_t bpp_overwrite; -}; - -struct dsc_mst_fairness_vars { -int pbn; -bool dsc_enabled; -int bpp_x16; +struct amdgpu_dm_connector *aconnector; };static int kbps_to_peak_pbn (int kbps)
@@ -727,12 +722,12 @@ static void try_disable_dsc(struct drm_astatic bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state,struct dc_state *dc_state, -struct dc_link *dc_link) +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars) {int i;struct dc_stream_state *stream;struct dsc_mst_fairness_params params[MAX_PIPES ]; -struct dsc_mst_fairness_vars vars[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int count =0 ;bool debugfs_overwrite = false;
@@ -753,6 +748,7 @@ static bool compute_mst_dsc_configs_for_ params[count].timing = &stream->timing; params[count].sink = stream->sink; aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; + params[count].aconnector = aconnector; params[count].port = aconnector->port; params[count].clock_force_enable = aconnector->dsc_settings.dsc_force_enable;if (params[count].clock_force_enable ==DSC_CLK_FORCE_ENABLE )
@@ -775,6 +771,7 @@ static bool compute_mst_dsc_configs_for_ }/* Try no compression */ for (i =0 ; i < count; i++) { + vars[i].aconnector = params[i].aconnector; vars[i].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i].dsc_enabled = false; vars[i].bpp_x16 =0 ;
@@ -828,7 +825,8 @@ static bool compute_mst_dsc_configs_for_ }bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state) +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;
@@ -859,7 +857,7 @@ bool compute_mst_dsc_configs_for_state(sreturn false;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link)) { +if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars)) {mutex_unlock (&aconnector->mst_mgr.lock);return false; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +10 -1
@@ -39,8 +39,17 @@ void dm_dp_create_fake_mst_encoders(struct amdgpu_device *adev);#if defined(CONFIG_DRM_AMD_DC_DCN ) + +struct dsc_mst_fairness_vars { +int pbn; +bool dsc_enabled; +int bpp_x16; +struct amdgpu_dm_connector *aconnector; +}; +bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state); +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);#endif #endif
Greg Kroah-Hartman
maintainerPATCH 12/168 drm/amd/display: Fix white screen page fault for gpuvm
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
commit a70939851f9ced298dc7d523374b8c4d05239caf upstream.
[Why]
The "base_addr_is_mc_addr" field was added for dcn3.1 support but pa_config was never updated to set it to false.
Uninitialized memory causes it to be set to true which results in address mistranslation and white screen.
[How]
Use memset to ensure all fields are initialized to 0 by default.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -0
@@ -998,6 +998,8 @@ static void mmhub_read_system_context(stuint32_t agp_base, agp_bot, agp_top;PHYSICAL_ADDRESS_LOC page_table_start, page_table_end, page_table_base; +memset (pa_config,0 ,sizeof (*pa_config)); + logical_addr_low =min (adev->gmc.fb_start, adev->gmc.agp_start) >>18 ; pt_base =amdgpu_gmc_pd_addr (adev->gart.bo);
Greg Kroah-Hartman
maintainerPATCH 13/168 drm/amd/pm: fix runpm hang when amdgpu loaded prior to sound driver
In reply to Greg Kroah-HartmanFrom: Evan Quan <[email protected]>
commit 8b514e898ee7f861eb8863c647d258f71053af40 upstream.
Current RUNPM mechanism relies on PMFW to master the timing for BACO in/exit. And that needs cooperation from sound driver for dstate change notification for function 1(audio). Otherwise(on sound driver missing), BACO cannot be kicked in correctly and hang will be observed on RUNPM exit.
By switching back to legacy message way on sound driver missing, we are able to fix the runpm hang observed for the scenario below:
amdgpu driver loaded -> runpm suspend kicked -> sound driver loaded
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 24 ++++++++++++++-- drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 21 ++++++++++++++ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + 4 files changed, 47 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +22 -2
@@ -2269,7 +2269,27 @@ static int navi10_baco_enter(struct smu_ {struct amdgpu_device *adev = smu->adev; -if (adev->in_runpm) +/* +* This aims the case below: +* amdgpu driver loaded -> runpm suspend kicked -> sound driver loaded +* +* For NAVI10 and later ASICs, we rely on PMFW to handle the runpm. To +* make that possible, PMFW needs to acknowledge the dstate transition +* process for both gfx(function 0) and audio(function 1) function of +* the ASIC. +* +* The PCI device's initial runpm status is RUNPM_SUSPENDED. So as the +* device representing the audio function of the ASIC. And that means +* even if the sound driver(snd_hda_intel) was not loaded yet, it's still +* possible runpm suspend kicked on the ASIC. However without the dstate +* transition notification from audio function, pmfw cannot handle the +* BACO in/exit correctly. And that will cause driver hang on runpm +* resuming. +* +* To address this, we revert to legacy message way(driver masters the +* timing for BACO in/exit) on sound driver missing. +*/ +if (adev->in_runpm &&smu_cmn_is_audio_func_enabled (adev))return smu_v11_0_baco_set_armd3_sequence (smu,BACO_SEQ_BACO );else return smu_v11_0_baco_enter (smu);
@@ -2279,7 +2299,7 @@ static int navi10_baco_exit(struct smu_c {struct amdgpu_device *adev = smu->adev; -if (adev->in_runpm) { +if (adev->in_runpm &&smu_cmn_is_audio_func_enabled (adev)) {/* Wait for PMFW handling for the Dstate change */ msleep (10 );return smu_v11_0_baco_set_armd3_sequence (smu,BACO_SEQ_ULPS );
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +2 -2
@@ -2133,7 +2133,7 @@ static int sienna_cichlid_baco_enter(str {struct amdgpu_device *adev = smu->adev; -if (adev->in_runpm) +if (adev->in_runpm &&smu_cmn_is_audio_func_enabled (adev))return smu_v11_0_baco_set_armd3_sequence (smu,BACO_SEQ_BACO );else return smu_v11_0_baco_enter (smu);
@@ -2143,7 +2143,7 @@ static int sienna_cichlid_baco_exit(stru {struct amdgpu_device *adev = smu->adev; -if (adev->in_runpm) { +if (adev->in_runpm &&smu_cmn_is_audio_func_enabled (adev)) {/* Wait for PMFW handling for the Dstate change */ msleep (10 );return smu_v11_0_baco_set_armd3_sequence (smu,BACO_SEQ_ULPS );
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +21 -0
@@ -1053,3 +1053,24 @@ int smu_cmn_set_mp1_state(struct smu_conreturn ret; } + +bool smu_cmn_is_audio_func_enabled (struct amdgpu_device *adev) +{ +struct pci_dev *p =NULL ; +bool snd_driver_loaded; + +/* +* If the ASIC comes with no audio function, we always assume +* it is "enabled". +*/ + p =pci_get_domain_bus_and_slot (pci_domain_nr (adev->pdev->bus), + adev->pdev->bus->number,1 ); +if (!p) +return true; + + snd_driver_loaded =pci_is_enabled (p) ? true : false; + +pci_dev_put (p); + +return snd_driver_loaded; +}
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +2 -0
@@ -110,5 +110,7 @@ void smu_cmn_init_soft_gpu_metrics(voidint smu_cmn_set_mp1_state (struct smu_context *smu,enum pp_mp1_state mp1_state); +bool smu_cmn_is_audio_func_enabled (struct amdgpu_device *adev); +#endif #endif
Greg Kroah-Hartman
maintainerPATCH 14/168 drm/amd/amdgpu: Increase HWIP_MAX_INSTANCE to 10
In reply to Greg Kroah-HartmanFrom: Ernst Sjöstrand <[email protected]>
commit 67a44e659888569a133a8f858c8230e9d7aad1d5 upstream.
Seems like newer cards can have even more instances now. Found by UBSAN: array-index-out-of-bounds in drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:318:29 index 8 is out of range for type 'uint32_t *[8]'
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -757,7 +757,7 @@ enum amd_hw_ip_block_type {MAX_HWIP }; -#define HWIP_MAX_INSTANCE 8 +#define HWIP_MAX_INSTANCE 10struct amd_powerplay {void *pp_handle;
Greg Kroah-Hartman
maintainerPATCH 15/168 drm/amdgpu: use IS_ERR for debugfs APIs
In reply to Greg Kroah-HartmanFrom: Nirmoy Das <[email protected]>
commit b04ce53eac2fc326290817a6f64a440b5bffd2e3 upstream.
debugfs APIs returns encoded error so useIS_ERR for checking return value.
v2: return PTR_ERR(ent)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 10 ++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +4 -6
@@ -1544,20 +1544,18 @@ int amdgpu_debugfs_init(struct amdgpu_destruct dentry *ent;int r, i; - - ent =debugfs_create_file ("amdgpu_preempt_ib" ,0600 , root, adev, &fops_ib_preempt); -if (!ent) { +if (IS_ERR (ent)) {DRM_ERROR ("unable to create amdgpu_preempt_ib debugsfs file\n" ); -return -EIO ; +return PTR_ERR (ent); } ent =debugfs_create_file ("amdgpu_force_sclk" ,0200 , root, adev, &fops_sclk_set); -if (!ent) { +if (IS_ERR (ent)) {DRM_ERROR ("unable to create amdgpu_set_sclk debugsfs file\n" ); -return -EIO ; +return PTR_ERR (ent); }/* Register debugfs entries for amdgpu_ttm */
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -2
@@ -428,8 +428,8 @@ int amdgpu_debugfs_ring_init(struct amdg ent =debugfs_create_file (name,S_IFREG |S_IRUGO , root, ring, &amdgpu_debugfs_ring_fops); -if (!ent) -return -ENOMEM ; +if (IS_ERR (ent)) +return PTR_ERR (ent);i_size_write (ent->d_inode, ring->ring_size +12 ); ring->ent = ent;
Greg Kroah-Hartman
maintainerPATCH 16/168 drm/amdgpu: fix use after free during BO move
In reply to Greg Kroah-HartmanFrom: Christian König <[email protected]>
commit c92db8d64f9e0313e7ecdc9500db93a5040c9370 upstream.
The memory backing old_mem is already freed at that point, move the check a bit more up.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +9 -9
@@ -513,6 +513,15 @@ static int amdgpu_bo_move(struct ttm_buf goto out; } +if (bo->type == ttm_bo_type_device && + new_mem->mem_type ==TTM_PL_VRAM && + old_mem->mem_type !=TTM_PL_VRAM ) { +/* amdgpu_bo_fault_reserve_notify will re-set this if the CPU +* accesses the BO after it's moved. +*/ + abo->flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; + } +if (adev->mman.buffer_funcs_enabled) { if (((old_mem->mem_type == TTM_PL_SYSTEM && new_mem->mem_type == TTM_PL_VRAM) ||
@@ -543,15 +552,6 @@ static int amdgpu_bo_move(struct ttm_bufreturn r; } -if (bo->type == ttm_bo_type_device && - new_mem->mem_type ==TTM_PL_VRAM && - old_mem->mem_type !=TTM_PL_VRAM ) { -/* amdgpu_bo_fault_reserve_notify will re-set this if the CPU -* accesses the BO after it's moved. -*/ - abo->flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED ; - } - out:/* update statistics */ atomic64_add (bo->base.size, &adev->num_bytes_moved);
Greg Kroah-Hartman
maintainerPATCH 17/168 drm/amdgpu: add amdgpu_amdkfd_resume_iommu
In reply to Greg Kroah-HartmanFrom: James Zhu <[email protected]>
commit 8066008482e533e91934bee49765bf8b4a7c40db upstream.
Add amdgpu_amdkfd_resume_iommu for amdgpu.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 10 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + 2 files changed, 11 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +10 -0
@@ -191,6 +191,16 @@ void amdgpu_amdkfd_suspend(struct amdgpukgd2kfd_suspend (adev->kfd.dev, run_pm); } +int amdgpu_amdkfd_resume_iommu (struct amdgpu_device *adev) +{ +int r =0 ; + +if (adev->kfd.dev) + r =kgd2kfd_resume_iommu (adev->kfd.dev); + +return r; +} +int amdgpu_amdkfd_resume (struct amdgpu_device *adev,bool run_pm) {int r =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -0
@@ -137,6 +137,7 @@ int amdgpu_amdkfd_init(void);void amdgpu_amdkfd_fini (void );void amdgpu_amdkfd_suspend (struct amdgpu_device *adev,bool run_pm); +int amdgpu_amdkfd_resume_iommu (struct amdgpu_device *adev);int amdgpu_amdkfd_resume (struct amdgpu_device *adev,bool run_pm);void amdgpu_amdkfd_interrupt (struct amdgpu_device *adev,const void *ih_ring_entry);
Greg Kroah-Hartman
maintainerPATCH 18/168 drm/amdgpu: move iommu_resume before ip init/resume
In reply to Greg Kroah-HartmanFrom: James Zhu <[email protected]>
commit f02abeb0779700c308e661a412451b38962b8a0b upstream.
Separate iommu_resume from kfd_resume, and move it before other amdgpu ip init/resume.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +12 -0
@@ -2342,6 +2342,10 @@ static int amdgpu_device_ip_init(structif (r) goto init_failed; + r =amdgpu_amdkfd_resume_iommu (adev); +if (r) + goto init_failed; + r =amdgpu_device_ip_hw_init_phase1 (adev);if (r) goto init_failed;
@@ -3096,6 +3100,10 @@ static int amdgpu_device_ip_resume(struc {int r; + r =amdgpu_amdkfd_resume_iommu (adev); +if (r) +return r; + r =amdgpu_device_ip_resume_phase1 (adev);if (r)return r;
@@ -4534,6 +4542,10 @@ int amdgpu_do_asic_reset(struct list_headev_warn (tmp_adev->dev,"asic atom init failed!" ); }else {dev_info (tmp_adev->dev,"GPU reset succeeded, trying to resume\n" ); + r =amdgpu_amdkfd_resume_iommu (tmp_adev); +if (r) + goto out; + r =amdgpu_device_ip_resume_phase1 (tmp_adev);if (r) goto out;
Greg Kroah-Hartman
maintainerPATCH 19/168 drm/amd/pm: fix the issue of uploading powerplay table
In reply to Greg Kroah-HartmanFrom: Kenneth Feng <[email protected]>
commit 5598d7c21a0bcab900f281dca4efbb1f80add0fe upstream.
fix the issue of uploading powerplay table due to the dependancy of rlc.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -1
@@ -1381,7 +1381,7 @@ static int smu_disable_dpms(struct smu_c*/ if (smu->uploading_custom_pp_table && (adev->asic_type >=CHIP_NAVI10 ) && - (adev->asic_type <=CHIP_DIMGREY_CAVEFISH )) + (adev->asic_type <=CHIP_BEIGE_GOBY ))return smu_disable_all_features_with_exception (smu, true,SMU_FEATURE_COUNT );
Greg Kroah-Hartman
maintainerPATCH 20/168 drm/amdkfd: separate kfd_iommu_resume from kfd_resume
In reply to Greg Kroah-HartmanFrom: James Zhu <[email protected]>
commit fefc01f042f44ede373ee66773b8238dd8fdcb55 upstream.
Separate kfd_iommu_resume from kfd_resume for fine-tuning of amdgpu device init/resume/reset/recovery sequence.
v2: squash in fix for !CONFIG_HSA_AMD
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 ++++++ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +6 -0
@@ -326,6 +326,7 @@ bool kgd2kfd_device_init(struct kfd_dev const struct kgd2kfd_shared_resources *gpu_resources);void kgd2kfd_device_exit (struct kfd_dev *kfd);void kgd2kfd_suspend (struct kfd_dev *kfd,bool run_pm); +int kgd2kfd_resume_iommu (struct kfd_dev *kfd);int kgd2kfd_resume (struct kfd_dev *kfd,bool run_pm);int kgd2kfd_pre_reset (struct kfd_dev *kfd);int kgd2kfd_post_reset (struct kfd_dev *kfd);
@@ -364,6 +365,11 @@ static inline void kgd2kfd_suspend(struc { } +static int __maybe_unused kgd2kfd_resume_iommu (struct kfd_dev *kfd) +{ +return 0 ; +} +static inline int kgd2kfd_resume (struct kfd_dev *kfd,bool run_pm) {return 0 ;
drivers/gpu/drm/amd/amdkfd/kfd_device.c +8 -4
@@ -1008,17 +1008,21 @@ int kgd2kfd_resume(struct kfd_dev *kfd,return ret; } -static int kfd_resume (struct kfd_dev *kfd) +int kgd2kfd_resume_iommu (struct kfd_dev *kfd) {int err =0 ; err =kfd_iommu_resume (kfd); -if (err) { +if (err)dev_err (kfd_device,"Failed to resume IOMMU for device %x:%x\n" , kfd->pdev->vendor, kfd->pdev->device); -return err; - } +return err; +} + +static int kfd_resume (struct kfd_dev *kfd) +{ +int err =0 ; err = kfd->dqm->ops.start (kfd->dqm);if (err) {
Greg Kroah-Hartman
maintainerPATCH 21/168 drm/radeon: pass drm dev radeon_agp_head_init directly
In reply to Greg Kroah-HartmanFrom: Nirmoy Das <[email protected]>
commit 93def70cf8b23de5049d101b7dd5367864694bd3 upstream.
Pass drm dev directly as rdev->ddev gets initialized later on at radeon_device_init().
--- drivers/gpu/drm/radeon/radeon_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_kms.c +1 -1
@@ -119,7 +119,7 @@ int radeon_driver_load_kms(struct drm_de#endif if (pci_find_capability (pdev,PCI_CAP_ID_AGP )) - rdev->agp =radeon_agp_head_init (rdev->ddev); + rdev->agp =radeon_agp_head_init (dev);if (rdev->agp) { rdev->agp->agp_mtrr = arch_phys_wc_add( rdev->agp->agp_info.aper_base,
Greg Kroah-Hartman
maintainerPATCH 22/168 io_uring: allow retry for O_NONBLOCK if async is supported
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 5d329e1286b0a040264e239b80257c937f6e685f upstream.
A common complaint is that using O_NONBLOCK files with io_uring can be a bit of a pain. Be a bit nicer and allow normal retry IFF the file does support async behavior. This makes it possible to use io_uring more reliably with O_NONBLOCK files, for use cases where it either isn't possible or feasible to modify the file flags.
--- fs/io_uring.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
fs/io_uring.c +11 -5
@@ -2683,7 +2683,8 @@ static bool io_file_supports_async(strucreturn __io_file_supports_async (req->file, rw); } -static int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe) +static int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe, +int rw) {struct io_ring_ctx *ctx = req->ctx;struct kiocb *kiocb = &req->rw.kiocb;
@@ -2705,8 +2706,13 @@ static int io_prep_rw(struct io_kiocb *rif (unlikely (ret))return ret; -/* don't allow async punt for O_NONBLOCK or RWF_NOWAIT */ -if ((kiocb->ki_flags &IOCB_NOWAIT ) || (file->f_flags &O_NONBLOCK )) +/* +* If the file is marked O_NONBLOCK, still allow retry for it if it +* supports async. Otherwise it's impossible to use O_NONBLOCK files +* reliably. If not, or it IOCB_NOWAIT is set, don't retry. +*/ +if ((kiocb->ki_flags &IOCB_NOWAIT ) || + ((file->f_flags &O_NONBLOCK ) && !io_file_supports_async (req, rw))) req->flags |=REQ_F_NOWAIT ; ioprio =READ_ONCE (sqe->ioprio);
@@ -3193,7 +3199,7 @@ static int io_read_prep(struct io_kiocb {if (unlikely (!(req->file->f_mode &FMODE_READ )))return -EBADF ; -return io_prep_rw (req, sqe); +return io_prep_rw (req, sqe,READ ); }/*
@@ -3382,7 +3388,7 @@ static int io_write_prep(struct io_kiocb {if (unlikely (!(req->file->f_mode &FMODE_WRITE )))return -EBADF ; -return io_prep_rw (req, sqe); +return io_prep_rw (req, sqe,WRITE ); }static int io_write (struct io_kiocb *req,unsigned int issue_flags)
Greg Kroah-Hartman
maintainerPATCH 23/168 drm/i915/dp: Use max params for panels < eDP 1.4
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit c8dead5751b81dfa6b10449b740ed1062ff670c5 upstream.
Users reported that after commit 2bbd6dba84d4 ("drm/i915: Try to use fast+narrow link on eDP again and fall back to the old max strategy on failure"), the screen starts to have wobbly effect.
Commit a5c936add6a2 ("drm/i915/dp: Use slow and wide link training for everything") doesn't help either, that means the affected eDP 1.2 panels only work with max params.
So use max params for panels < eDP 1.4 as Windows does to solve the issue.
v3:
- Do the eDP rev check in intel_edp_init_dpcd()
v2:
- Check eDP 1.4 instead of DPCD 1.1 to apply max params
--- drivers/gpu/drm/i915/display/intel_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp.c +4 -1
@@ -2453,11 +2453,14 @@ intel_edp_init_dpcd(struct intel_dp *int*/ if (drm_dp_dpcd_read (&intel_dp->aux,DP_EDP_DPCD_REV , intel_dp->edp_dpcd,sizeof (intel_dp->edp_dpcd)) == -sizeof (intel_dp->edp_dpcd)) +sizeof (intel_dp->edp_dpcd)) {drm_dbg_kms (&dev_priv->drm,"eDP DPCD: %*ph\n" , (int )sizeof (intel_dp->edp_dpcd), intel_dp->edp_dpcd); + intel_dp->use_max_params = intel_dp->edp_dpcd[0 ] <DP_EDP_14 ; + } +/* * This has to be called after intel_dp->edp_dpcd is filled, PSR checks * for SET_POWER_CAPABLE bit in intel_dp->edp_dpcd[1]
Greg Kroah-Hartman
maintainerPATCH 24/168 drm/etnaviv: return context from etnaviv_iommu_context_get
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 78edefc05e41352099ffb8f06f8d9b2d091e29cd upstream.
Being able to have the refcount manipulation in an assignment makes it much easier to parse the code.
--- drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 3 +-- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 +-- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 3 +-- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 ++---- drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 4 +++- 5 files changed, 8 insertions(+), 11 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_buffer.c +1 -2
@@ -397,8 +397,7 @@ void etnaviv_buffer_queue(struct etnavivif (switch_mmu_context) {struct etnaviv_iommu_context *old_context = gpu->mmu_context; -etnaviv_iommu_context_get (mmu_context); - gpu->mmu_context = mmu_context; + gpu->mmu_context =etnaviv_iommu_context_get (mmu_context);etnaviv_iommu_context_put (old_context); }
drivers/gpu/drm/etnaviv/etnaviv_gem.c +1 -2
@@ -303,8 +303,7 @@ struct etnaviv_vram_mapping *etnaviv_gemlist_del (&mapping->obj_node); } -etnaviv_iommu_context_get (mmu_context); - mapping->context = mmu_context; + mapping->context =etnaviv_iommu_context_get (mmu_context); mapping->use =1 ; ret = etnaviv_iommu_map_gem(mmu_context, etnaviv_obj,
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +1 -2
@@ -532,8 +532,7 @@ int etnaviv_ioctl_gem_submit(struct drm_ goto err_submit_objects; submit->ctx = file->driver_priv; -etnaviv_iommu_context_get (submit->ctx->mmu); - submit->mmu_context = submit->ctx->mmu; + submit->mmu_context =etnaviv_iommu_context_get (submit->ctx->mmu); submit->exec_state = args->exec_state; submit->flags = args->flags;
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2 -4
@@ -1365,12 +1365,10 @@ struct dma_fence *etnaviv_gpu_submit(str }if (!gpu->mmu_context) { -etnaviv_iommu_context_get (submit->mmu_context); - gpu->mmu_context = submit->mmu_context; + gpu->mmu_context =etnaviv_iommu_context_get (submit->mmu_context);etnaviv_gpu_start_fe_idleloop (gpu); }else { -etnaviv_iommu_context_get (gpu->mmu_context); - submit->prev_mmu_context = gpu->mmu_context; + submit->prev_mmu_context =etnaviv_iommu_context_get (gpu->mmu_context); }if (submit->nr_pmrs) {
drivers/gpu/drm/etnaviv/etnaviv_mmu.h +3 -1
@@ -105,9 +105,11 @@ void etnaviv_iommu_dump(struct etnaviv_istruct etnaviv_iommu_context *etnaviv_iommu_context_init (struct etnaviv_iommu_global *global,struct etnaviv_cmdbuf_suballoc *suballoc); -static inline void etnaviv_iommu_context_get (struct etnaviv_iommu_context *ctx) +static inline struct etnaviv_iommu_context * +etnaviv_iommu_context_get (struct etnaviv_iommu_context *ctx) {kref_get (&ctx->refcount); +return ctx; }void etnaviv_iommu_context_put (struct etnaviv_iommu_context *ctx); void etnaviv_iommu_restore(struct etnaviv_gpu *gpu,
Greg Kroah-Hartman
maintainerPATCH 25/168 drm/etnaviv: put submit prev MMU context when it exists
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit cda7532916f7bc860b36a1806cb8352e6f63dacb upstream.
The prev context is the MMU context at the time of the job queueing in hardware. As a job might be queued multiple times due to recovery after a GPU hang, we need to make sure to put the stale prev MMU context from a prior queuing, to avoid the reference and thus the MMU context leaking.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2 -0
@@ -1368,6 +1368,8 @@ struct dma_fence *etnaviv_gpu_submit(str gpu->mmu_context =etnaviv_iommu_context_get (submit->mmu_context);etnaviv_gpu_start_fe_idleloop (gpu); }else { +if (submit->prev_mmu_context) +etnaviv_iommu_context_put (submit->prev_mmu_context); submit->prev_mmu_context =etnaviv_iommu_context_get (gpu->mmu_context); }
Greg Kroah-Hartman
maintainerPATCH 26/168 drm/etnaviv: stop abusing mmu_context as FE running marker
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 23e0f5a57d0ecec86e1fc82194acd94aede21a46 upstream.
While the DMA frontend can only be active when the MMU context is set, the reverse isn't necessarily true, as the frontend can be stopped while the MMU state is kept. Stop treating mmu_context being set as a indication that the frontend is running and instead add a explicit property.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 10 ++++++++-- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +8 -2
@@ -569,6 +569,8 @@ static int etnaviv_hw_reset(struct etnav/* We rely on the GPU running, so program the clock */ etnaviv_gpu_update_clock (gpu); + gpu->fe_running = false; +return 0 ; }
@@ -631,6 +633,8 @@ void etnaviv_gpu_start_fe(struct etnaviv VIVS_MMUv2_SEC_COMMAND_CONTROL_ENABLE | VIVS_MMUv2_SEC_COMMAND_CONTROL_PREFETCH(prefetch)); } + + gpu->fe_running = true; }static void etnaviv_gpu_start_fe_idleloop (struct etnaviv_gpu *gpu)
@@ -1364,7 +1368,7 @@ struct dma_fence *etnaviv_gpu_submit(str goto out_unlock; } -if (!gpu->mmu_context) { +if (!gpu->fe_running) { gpu->mmu_context =etnaviv_iommu_context_get (submit->mmu_context);etnaviv_gpu_start_fe_idleloop (gpu); }else {
@@ -1573,7 +1577,7 @@ int etnaviv_gpu_wait_idle(struct etnavivstatic int etnaviv_gpu_hw_suspend (struct etnaviv_gpu *gpu) { -if (gpu->initialized && gpu->mmu_context) { +if (gpu->initialized && gpu->fe_running) {/* Replace the last WAIT with END */ mutex_lock (&gpu->lock);etnaviv_buffer_end (gpu);
@@ -1588,6 +1592,8 @@ static int etnaviv_gpu_hw_suspend(structetnaviv_iommu_context_put (gpu->mmu_context); gpu->mmu_context =NULL ; + + gpu->fe_running = false; } gpu->exec_state =-1 ;
drivers/gpu/drm/etnaviv/etnaviv_gpu.h +1 -0
@@ -101,6 +101,7 @@ struct etnaviv_gpu {struct workqueue_struct *wq;struct drm_gpu_scheduler sched;bool initialized; +bool fe_running;/* 'ring'-buffer: */ struct etnaviv_cmdbuf buffer;
Greg Kroah-Hartman
maintainerPATCH 27/168 drm/etnaviv: keep MMU context across runtime suspend/resume
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 8f3eea9d01d7b0f95b0fe04187c0059019ada85b upstream.
The MMU state may be kept across a runtime suspend/resume cycle, as we avoid a full hardware reset to keep the latency of the runtime PM small.
Don't pretend that the MMU state is lost in driver state. The MMU context is pushed out when new HW jobs with a different context are coming in. The only exception to this is when the GPU is unbound, in which case we need to make sure to also free the last active context.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3 -3
@@ -1590,9 +1590,6 @@ static int etnaviv_gpu_hw_suspend(struct*/ etnaviv_gpu_wait_idle (gpu,100 ); -etnaviv_iommu_context_put (gpu->mmu_context); - gpu->mmu_context =NULL ; - gpu->fe_running = false; }
@@ -1741,6 +1738,9 @@ static void etnaviv_gpu_unbind(struct deetnaviv_gpu_hw_suspend (gpu);#endif +if (gpu->mmu_context) +etnaviv_iommu_context_put (gpu->mmu_context); +if (gpu->initialized) {etnaviv_cmdbuf_free (&gpu->buffer);etnaviv_iommu_global_fini (gpu);
Greg Kroah-Hartman
maintainerPATCH 28/168 drm/etnaviv: exec and MMU state is lost when resetting the GPU
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 725cbc7884c37f3b4f1777bc1aea6432cded8ca5 upstream.
When the GPU is reset both the current exec state, as well as all MMU state is lost. Move the driver side state tracking into the reset function to keep hardware and software state from diverging.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2 -3
@@ -570,6 +570,8 @@ static int etnaviv_hw_reset(struct etnavetnaviv_gpu_update_clock (gpu); gpu->fe_running = false; + gpu->exec_state =-1 ; + gpu->mmu_context =NULL ;return 0 ; }
@@ -830,7 +832,6 @@ int etnaviv_gpu_init(struct etnaviv_gpu/* Now program the hardware */ mutex_lock (&gpu->lock);etnaviv_gpu_hw_init (gpu); - gpu->exec_state =-1 ;mutex_unlock (&gpu->lock);pm_runtime_mark_last_busy (gpu->dev);
@@ -1055,8 +1056,6 @@ void etnaviv_gpu_recover_hang(struct etnspin_unlock (&gpu->event_spinlock);etnaviv_gpu_hw_init (gpu); - gpu->exec_state =-1 ; - gpu->mmu_context =NULL ;mutex_unlock (&gpu->lock);pm_runtime_mark_last_busy (gpu->dev);
Greg Kroah-Hartman
maintainerPATCH 29/168 drm/etnaviv: fix MMU context leak on GPU reset
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit f978a5302f5566480c58ffae64a16d34456801bd upstream.
After a reset the GPU is no longer using the MMU context and may be restarted with a different context. While the mmu_state proeprly was cleared, the context wasn't unreferenced, leading to a memory leak.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2 -0
@@ -571,6 +571,8 @@ static int etnaviv_hw_reset(struct etnav gpu->fe_running = false; gpu->exec_state =-1 ; +if (gpu->mmu_context) +etnaviv_iommu_context_put (gpu->mmu_context); gpu->mmu_context =NULL ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 30/168 drm/etnaviv: reference MMU context when setting up hardware state
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit d6408538f091fb22d47f792d4efa58143d56c3fb upstream.
Move the refcount manipulation of the MMU context to the point where the hardware state is programmed. At that point it is also known if a previous MMU state is still there, or the state needs to be reprogrammed with a potentially different context.
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 24 ++++++++++++------------ drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 4 ++++ drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 8 ++++++++ 3 files changed, 24 insertions(+), 12 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +12 -12
@@ -641,17 +641,19 @@ void etnaviv_gpu_start_fe(struct etnaviv gpu->fe_running = true; } -static void etnaviv_gpu_start_fe_idleloop (struct etnaviv_gpu *gpu) +static void etnaviv_gpu_start_fe_idleloop (struct etnaviv_gpu *gpu, +struct etnaviv_iommu_context *context) { -u32 address =etnaviv_cmdbuf_get_va (&gpu->buffer, - &gpu->mmu_context->cmdbuf_mapping);u16 prefetch; +u32 address;/* setup the MMU */ -etnaviv_iommu_restore (gpu, gpu->mmu_context); +etnaviv_iommu_restore (gpu, context);/* Start command processor */ prefetch =etnaviv_buffer_init (gpu); + address =etnaviv_cmdbuf_get_va (&gpu->buffer, + &gpu->mmu_context->cmdbuf_mapping);etnaviv_gpu_start_fe (gpu, address, prefetch); }
@@ -1369,14 +1371,12 @@ struct dma_fence *etnaviv_gpu_submit(str goto out_unlock; } -if (!gpu->fe_running) { - gpu->mmu_context =etnaviv_iommu_context_get (submit->mmu_context); -etnaviv_gpu_start_fe_idleloop (gpu); - }else { -if (submit->prev_mmu_context) -etnaviv_iommu_context_put (submit->prev_mmu_context); - submit->prev_mmu_context =etnaviv_iommu_context_get (gpu->mmu_context); - } +if (!gpu->fe_running) +etnaviv_gpu_start_fe_idleloop (gpu, submit->mmu_context); + +if (submit->prev_mmu_context) +etnaviv_iommu_context_put (submit->prev_mmu_context); + submit->prev_mmu_context =etnaviv_iommu_context_get (gpu->mmu_context);if (submit->nr_pmrs) { gpu->event[event[1 ]].sync_point = &sync_point_perfmon_sample_pre;
drivers/gpu/drm/etnaviv/etnaviv_iommu.c +4 -0
@@ -92,6 +92,10 @@ static void etnaviv_iommuv1_restore(strustruct etnaviv_iommuv1_context *v1_context =to_v1_context (context);u32 pgtable; +if (gpu->mmu_context) +etnaviv_iommu_context_put (gpu->mmu_context); + gpu->mmu_context =etnaviv_iommu_context_get (context); +/* set base addresses */ gpu_write (gpu,VIVS_MC_MEMORY_BASE_ADDR_RA , context->global->memory_base);gpu_write (gpu,VIVS_MC_MEMORY_BASE_ADDR_FE , context->global->memory_base);
drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c +8 -0
@@ -172,6 +172,10 @@ static void etnaviv_iommuv2_restore_nonsif (gpu_read (gpu, VIVS_MMUv2_CONTROL) & VIVS_MMUv2_CONTROL_ENABLE)return ; +if (gpu->mmu_context) +etnaviv_iommu_context_put (gpu->mmu_context); + gpu->mmu_context =etnaviv_iommu_context_get (context); + prefetch =etnaviv_buffer_config_mmuv2 (gpu, (u32 )v2_context->mtlb_dma, (u32 )context->global->bad_page_dma);
@@ -192,6 +196,10 @@ static void etnaviv_iommuv2_restore_sec(if (gpu_read (gpu, VIVS_MMUv2_SEC_CONTROL) & VIVS_MMUv2_SEC_CONTROL_ENABLE)return ; +if (gpu->mmu_context) +etnaviv_iommu_context_put (gpu->mmu_context); + gpu->mmu_context =etnaviv_iommu_context_get (context); +gpu_write (gpu, VIVS_MMUv2_PTA_ADDRESS_LOW,lower_32_bits (context->global->v2.pta_dma)); gpu_write(gpu, VIVS_MMUv2_PTA_ADDRESS_HIGH,
Greg Kroah-Hartman
maintainerPATCH 31/168 drm/etnaviv: add missing MMU context put when reaping MMU mapping
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit f2faea8b64125852fa9acc6771c07fc0311a039b upstream.
When we forcefully evict a mapping from the the address space and thus the MMU context, the MMU context is leaked, as the mapping no longer points to it, so it doesn't get freed when the GEM object is destroyed. Add the mssing context put to fix the leak.
--- drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/etnaviv/etnaviv_mmu.c +1 -0
@@ -199,6 +199,7 @@ static int etnaviv_iommu_find_iova(struc*/ list_for_each_entry_safe (m, n, &list, scan_node) {etnaviv_iommu_remove_mapping (context, m); +etnaviv_iommu_context_put (m->context); m->context =NULL ;list_del_init (&m->mmu_node);list_del_init (&m->scan_node);
Greg Kroah-Hartman
maintainerPATCH 32/168 s390/sclp: fix Secure-IPL facility detection
In reply to Greg Kroah-HartmanFrom: Alexander Egorenkov <[email protected]>
commit d76b14f3971a0638b6cd0da289f8b48acee287d0 upstream.
Prevent out-of-range access if the returned SCLP SCCB response is smaller in size than the address of the Secure-IPL flag.
--- drivers/s390/char/sclp_early.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/s390/char/sclp_early.c +2 -1
@@ -45,13 +45,14 @@ static void __init sclp_early_facilities sclp.has_gisaf = !!(sccb->fac118 &0x08 ); sclp.has_hvs = !!(sccb->fac119 &0x80 ); sclp.has_kss = !!(sccb->fac98 &0x01 ); - sclp.has_sipl = !!(sccb->cbl &0x4000 );if (sccb->fac85 &0x02 ) S390_lowcore.machine_flags |=MACHINE_FLAG_ESOP ;if (sccb->fac91 &0x40 ) S390_lowcore.machine_flags |=MACHINE_FLAG_TLB_GUEST ;if (sccb->cpuoff >134 ) sclp.has_diag318 = !!(sccb->byte_134 &0x80 ); +if (sccb->cpuoff >137 ) + sclp.has_sipl = !!(sccb->cbl &0x4000 ); sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2; sclp.rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2; sclp.rzm <<=20 ;
Greg Kroah-Hartman
maintainerPATCH 33/168 net: qrtr: revert check in qrtr_endpoint_post()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit d2cabd2dc8da78faf9b690ea521d03776686c9fe upstream.
I tried to make this check stricter as a hardenning measure but it broke audo and wifi on these devices so revert it.
--- net/qrtr/qrtr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/qrtr/qrtr.c +1 -1
@@ -493,7 +493,7 @@ int qrtr_endpoint_post(struct qrtr_endpo goto err; } -if (!size || size &3 || len != size + hdrlen) +if (!size || len !=ALIGN (size,4 ) + hdrlen) goto err; if (cb->dst_port != QRTR_PORT_CTRL && cb->type != QRTR_TYPE_DATA &&
Greg Kroah-Hartman
maintainerPATCH 34/168 x86/pat: Pass valid address to sanitize_phys()
In reply to Greg Kroah-HartmanFrom: Jeff Moyer <[email protected]>
commit aeef8b5089b76852bd84889f2809e69a7cfb414e upstream.
The end address passed to memtype_reserve() is handed directly to sanitize_phys(). However, end is exclusive and sanitize_phys() expects an inclusive address. If end falls at the end of the physical address space, sanitize_phys() will return 0. This can result in drivers failing to load, and the following warning:
WARNING: CPU: 26 PID: 749 at arch/x86/mm/pat.c:354 reserve_memtype+0x262/0x450 reserve_memtype failed: [mem 0x3ffffff00000-0xffffffffffffffff], req uncached-minus Call Trace: [<ffffffffa427b1f2>] reserve_memtype+0x262/0x450 [<ffffffffa42764aa>] ioremap_nocache+0x1a/0x20 [<ffffffffc04620a1>] mpt3sas_base_map_resources+0x151/0xa60 [mpt3sas] [<ffffffffc0465555>] mpt3sas_base_attach+0xf5/0xa50 [mpt3sas] ---[ end trace 6d6eea4438db89ef ]--- ioremap reserve_memtype failed -22 mpt3sas_cm0: unable to map adapter memory! or resource not found mpt3sas_cm0: failure at drivers/scsi/mpt3sas/mpt3sas_scsih.c:10597/_scsih_probe()!
Fix this by passing the inclusive end address to sanitize_phys().
--- arch/x86/mm/pat/memtype.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/mm/pat/memtype.c +6 -1
@@ -583,7 +583,12 @@ int memtype_reserve(u64 start, u64 end,int err =0 ; start =sanitize_phys (start); - end =sanitize_phys (end); + +/* +* The end address passed into this function is exclusive, but +* sanitize_phys() expects an inclusive address. +*/ + end =sanitize_phys (end -1 ) +1 ;if (start >= end) {WARN (1 ,"%s failed: [mem %#010Lx-%#010Lx], req %s\n" , __func__, start, end -1 ,cattr_name (req_type));
Greg Kroah-Hartman
maintainerPATCH 35/168 x86/mm: Fix kern_addr_valid() to cope with existing but not present entries
In reply to Greg Kroah-HartmanFrom: Mike Rapoport <[email protected]>
commit 34b1999da935a33be6239226bfa6cd4f704c5c88 upstream.
Jiri Olsa reported a fault when running:
# cat /proc/kallsyms | grep ksys_read ffffffff8136d580 T ksys_read # objdump -d --start-address=0xffffffff8136d580 --stop-address=0xffffffff8136d590 /proc/kcore
/proc/kcore: file format elf64-x86-64
Segmentation fault
general protection fault, probably for non-canonical address 0xf887ffcbff000: 0000 [#1] SMP PTI CPU: 12 PID: 1079 Comm: objdump Not tainted 5.14.0-rc5qemu+ #508 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-4.fc34 04/01/2014 RIP: 0010:kern_addr_valid Call Trace: read_kcore ? rcu_read_lock_sched_held ? rcu_read_lock_sched_held ? rcu_read_lock_sched_held ? trace_hardirqs_on ? rcu_read_lock_sched_held ? lock_acquire ? lock_acquire ? rcu_read_lock_sched_held ? lock_acquire ? rcu_read_lock_sched_held ? rcu_read_lock_sched_held ? rcu_read_lock_sched_held ? lock_release ? _raw_spin_unlock ? __handle_mm_fault ? rcu_read_lock_sched_held ? lock_acquire ? rcu_read_lock_sched_held ? lock_release proc_reg_read ? vfs_read vfs_read ksys_read do_syscall_64 entry_SYSCALL_64_after_hwframe
The fault happens because kern_addr_valid() dereferences existent but not present PMD in the high kernel mappings.
Such PMDs are created when free_kernel_image_pages() frees regions larger than 2Mb. In this case, a part of the freed memory is mapped with PMDs and the set_memory_np_noalias() -> ... -> __change_page_attr() sequence will mark the PMD as not present rather than wipe it completely.
Have kern_addr_valid() check whether higher level page table entries are present before trying to dereference them to fix this issue and to avoid similar issues in the future.
Stable backporting note:
------------------------
Note that the stable marking is for all active stable branches because there could be cases where pagetable entries exist but are not valid - see 9a14aefc1d28 ("x86: cpa, fix lookup_address"), for example. So make sure to be on the safe side here and use pXY_present() accessors rather than pXY_none() which could #GP when accessing pages in the direct map.
Also see:
c40a56a7818c ("x86/mm/init: Remove freed kernel image areas from alias mapping")
for more info.
--- arch/x86/mm/init_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/x86/mm/init_64.c +3 -3
@@ -1433,18 +1433,18 @@ int kern_addr_valid(unsigned long addr)return 0 ; p4d =p4d_offset (pgd, addr); -if (p4d_none (*p4d)) +if (!p4d_present (*p4d))return 0 ; pud =pud_offset (p4d, addr); -if (pud_none (*pud)) +if (!pud_present (*pud))return 0 ;if (pud_large (*pud))return pfn_valid (pud_pfn (*pud)); pmd =pmd_offset (pud, addr); -if (pmd_none (*pmd)) +if (!pmd_present (*pmd))return 0 ;if (pmd_large (*pmd))
Greg Kroah-Hartman
maintainerPATCH 36/168 x86/mce: Avoid infinite loop for copy from user recovery
In reply to Greg Kroah-HartmanFrom: Tony Luck <[email protected]>
commit 81065b35e2486c024c7aa86caed452e1f01a59d4 upstream.
There are two cases for machine check recovery:
1) The machine check was triggered by ring3 (application) code. This is the simpler case. The machine check handler simply queues work to be executed on return to user. That code unmaps the page from all users and arranges to send a SIGBUS to the task that triggered the poison.
2) The machine check was triggered in kernel code that is covered by an exception table entry. In this case the machine check handler still queues a work entry to unmap the page, etc. but this will not be called right away because the #MC handler returns to the fix up code address in the exception table entry.
Problems occur if the kernel triggers another machine check before the return to user processes the first queued work item.
Specifically, the work is queued using the ->mce_kill_me callback structure in the task struct for the current thread. Attempting to queue a second work item using this same callback results in a loop in the linked list of work functions to call. So when the kernel does return to user, it enters an infinite loop processing the same entry for ever.
There are some legitimate scenarios where the kernel may take a second machine check before returning to the user.
1) Some code (e.g. futex) first tries a get_user() with page faults disabled. If this fails, the code retries with page faults enabled expecting that this will resolve the page fault.
2) Copy from user code retries a copy in byte-at-time mode to check whether any additional bytes can be copied.
On the other side of the fence are some bad drivers that do not check the return value from individual get_user() calls and may access multiple user addresses without noticing that some/all calls have failed.
Fix by adding a counter (current->mce_count) to keep track of repeated machine checks before task_work() is called. First machine check saves the address information and calls task_work_add(). Subsequent machine checks before that task_work call back is executed check that the address is in the same page as the first machine check (since the callback will offline exactly one page).
Expected worst case is four machine checks before moving on (e.g. one user access with page faults disabled, then a repeat to the same address with page faults enabled ... repeat in copy tail bytes). Just in case there is some code that loops forever enforce a limit of 10.
[ bp: Massage commit message, drop noinstr, fix typo, extend panic
messages. ]
--- arch/x86/kernel/cpu/mce/core.c | 45 ++++++++++++++++++++++++++++++----------- include/linux/sched.h | 1 2 files changed, 34 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/mce/core.c +33 -12
@@ -1253,6 +1253,9 @@ static void __mc_scan_banks(struct mce *static void kill_me_now (struct callback_head *ch) { + struct task_struct *p = container_of(ch, struct task_struct, mce_kill_me); + + p->mce_count =0 ;force_sig (SIGBUS ); }
@@ -1262,6 +1265,7 @@ static void kill_me_maybe(struct callbacint flags =MF_ACTION_REQUIRED ;int ret; + p->mce_count =0 ;pr_err ("Uncorrected hardware memory error in user-access at %llx" , p->mce_addr);if (!p->mce_ripv)
@@ -1290,17 +1294,34 @@ static void kill_me_maybe(struct callbac } } -static void queue_task_work (struct mce *m,int kill_current_task) +static void queue_task_work (struct mce *m,char *msg,int kill_current_task) { - current->mce_addr = m->addr; - current->mce_kflags = m->kflags; - current->mce_ripv = !!(m->mcgstatus &MCG_STATUS_RIPV ); - current->mce_whole_page =whole_page (m); - -if (kill_current_task) - current->mce_kill_me.func = kill_me_now; -else - current->mce_kill_me.func = kill_me_maybe; +int count = ++current->mce_count; + +/* First call, save all the details */ +if (count ==1 ) { + current->mce_addr = m->addr; + current->mce_kflags = m->kflags; + current->mce_ripv = !!(m->mcgstatus &MCG_STATUS_RIPV ); + current->mce_whole_page =whole_page (m); + +if (kill_current_task) + current->mce_kill_me.func = kill_me_now; +else + current->mce_kill_me.func = kill_me_maybe; + } + +/* Ten is likely overkill. Don't expect more than two faults before task_work() */ +if (count >10 ) +mce_panic ("Too many consecutive machine checks while accessing user data" , m, msg); + +/* Second or later call, make sure page address matches the one from first call */ +if (count >1 && (current->mce_addr >>PAGE_SHIFT ) != (m->addr >>PAGE_SHIFT )) +mce_panic ("Consecutive machine checks to different user pages" , m, msg); + +/* Do not call task_work_add() more than once */ +if (count >1 ) +return ;task_work_add (current, ¤t->mce_kill_me,TWA_RESUME ); }
@@ -1438,7 +1459,7 @@ noinstr void do_machine_check(struct pt_/* If this triggers there is no way to recover. Die hard. */ BUG_ON (!on_thread_stack () || !user_mode (regs)); -queue_task_work (&m, kill_current_task); +queue_task_work (&m, msg, kill_current_task); }else {/*
@@ -1456,7 +1477,7 @@ noinstr void do_machine_check(struct pt_ }if (m.kflags &MCE_IN_KERNEL_COPYIN ) -queue_task_work (&m, kill_current_task); +queue_task_work (&m, msg, kill_current_task); } out:mce_wrmsrl (MSR_IA32_MCG_STATUS ,0 );
include/linux/sched.h +1 -0
@@ -1394,6 +1394,7 @@ struct task_struct { mce_whole_page :1 , __mce_reserved : 62;struct callback_head mce_kill_me; +int mce_count;#endif #ifdef CONFIG_KRETPROBES
Greg Kroah-Hartman
maintainerPATCH 37/168 tipc: fix an use-after-free issue in tipc_recvmsg
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit cc19862ffe454a5b632ca202e5a51bfec9f89fd2 upstream.
syzbot reported an use-after-free crash:
BUG: KASAN: use-after-free in tipc_recvmsg+0xf77/0xf90 net/tipc/socket.c:1979 Call Trace: tipc_recvmsg+0xf77/0xf90 net/tipc/socket.c:1979 sock_recvmsg_nosec net/socket.c:943 [inline] sock_recvmsg net/socket.c:961 [inline] sock_recvmsg+0xca/0x110 net/socket.c:957 tipc_conn_rcv_from_sock+0x162/0x2f0 net/tipc/topsrv.c:398 tipc_conn_recv_work+0xeb/0x190 net/tipc/topsrv.c:421 process_one_work+0x98d/0x1630 kernel/workqueue.c:2276 worker_thread+0x658/0x11f0 kernel/workqueue.c:2422
As Hoang pointed out, it was caused by skb_cb->bytes_read still accessed after calling tsk_advance_rx_queue() to free the skb in tipc_recvmsg().
This patch is to fix it by accessing skb_cb->bytes_read earlier than calling tsk_advance_rx_queue().
--- net/tipc/socket.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/tipc/socket.c +5 -3
@@ -1979,10 +1979,12 @@ static int tipc_recvmsg(struct socket *stipc_node_distr_xmit (sock_net (sk), &xmitq); } -if (!skb_cb->bytes_read) -tsk_advance_rx_queue (sk); +if (skb_cb->bytes_read) + goto exit; + +tsk_advance_rx_queue (sk); -if (likely (!connected) || skb_cb->bytes_read) +if (likely (!connected)) goto exit;/* Send connection flow control advertisement when applicable */
Greg Kroah-Hartman
maintainerPATCH 38/168 ethtool: Fix rxnfc copy to user buffer overflow
In reply to Greg Kroah-HartmanFrom: Saeed Mahameed <[email protected]>
commit 9b29a161ef38040f000dcf9ccf78e34495edfd55 upstream.
In the cited commit, copy_to_user() got called with the wrong pointer, instead of passing the actual buffer ptr to copy from, a pointer to the pointer got passed, which causes a buffer overflow calltrace to pop up when executing "ethtool -x ethX".
Fix ethtool_rxnfc_copy_to_user() to use the rxnfc pointer as passed to the function, instead of a pointer to it.
This fixes below call trace:
[ 15.533533] ------------[ cut here ]------------ [ 15.539007] Buffer overflow detected (8 < 192)! [ 15.544110] WARNING: CPU: 3 PID: 1801 at include/linux/thread_info.h:200 copy_overflow+0x15/0x20 [ 15.549308] Modules linked in: [ 15.551449] CPU: 3 PID: 1801 Comm: ethtool Not tainted 5.14.0-rc2+ #1058 [ 15.553919] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014 [ 15.558378] RIP: 0010:copy_overflow+0x15/0x20 [ 15.560648] Code: e9 7c ff ff ff b8 a1 ff ff ff eb c4 66 0f 1f 84 00 00 00 00 00 55 48 89 f2 89 fe 48 c7 c7 88 55 78 8a 48 89 e5 e8 06 5c 1e 00 <0f> 0b 5d c3 0f 1f 80 00 00 00 00 0f 1f 44 00 00 55 48 89 e5 41 55 [ 15.565114] RSP: 0018:ffffad49c0523bd0 EFLAGS: 00010286 [ 15.566231] RAX: 0000000000000000 RBX: 00000000000000c0 RCX: 0000000000000000 [ 15.567616] RDX: 0000000000000001 RSI: ffffffff8a7912e7 RDI: 00000000ffffffff [ 15.569050] RBP: ffffad49c0523bd0 R08: ffffffff8ab2ae28 R09: 00000000ffffdfff [ 15.570534] R10: ffffffff8aa4ae40 R11: ffffffff8aa4ae40 R12: 0000000000000000 [ 15.571899] R13: 00007ffd4cc2a230 R14: ffffad49c0523c00 R15: 0000000000000000 [ 15.573584] FS: 00007f538112f740(0000) GS:ffff96d5bdd80000(0000) knlGS:0000000000000000 [ 15.575639] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 15.577092] CR2: 00007f5381226d40 CR3: 0000000013542000 CR4: 00000000001506e0 [ 15.578929] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 15.580695] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 15.582441] Call Trace: [ 15.582970] ethtool_rxnfc_copy_to_user+0x30/0x46 [ 15.583815] ethtool_get_rxnfc.cold+0x23/0x2b [ 15.584584] dev_ethtool+0x29c/0x25f0 [ 15.585286] ? security_netlbl_sid_to_secattr+0x77/0xd0 [ 15.586728] ? do_set_pte+0xc4/0x110 [ 15.587349] ? _raw_spin_unlock+0x18/0x30 [ 15.588118] ? __might_sleep+0x49/0x80 [ 15.588956] dev_ioctl+0x2c1/0x490 [ 15.589616] sock_ioctl+0x18e/0x330 [ 15.591143] __x64_sys_ioctl+0x41c/0x990 [ 15.591823] ? irqentry_exit_to_user_mode+0x9/0x20 [ 15.592657] ? irqentry_exit+0x33/0x40 [ 15.593308] ? exc_page_fault+0x32f/0x770 [ 15.593877] ? exit_to_user_mode_prepare+0x3c/0x130 [ 15.594775] do_syscall_64+0x35/0x80 [ 15.595397] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 15.596037] RIP: 0033:0x7f5381226d4b [ 15.596492] Code: 0f 1e fa 48 8b 05 3d b1 0c 00 64 c7 00 26 00 00 00 48 c7 c0 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 0d b1 0c 00 f7 d8 64 89 01 48 [ 15.598743] RSP: 002b:00007ffd4cc2a1f8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 15.599804] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f5381226d4b [ 15.600795] RDX: 00007ffd4cc2a350 RSI: 0000000000008946 RDI: 0000000000000003 [ 15.601712] RBP: 00007ffd4cc2a340 R08: 00007ffd4cc2a350 R09: 0000000000000001 [ 15.602751] R10: 00007f538128a990 R11: 0000000000000246 R12: 0000000000000000 [ 15.603882] R13: 00007ffd4cc2a350 R14: 00007ffd4cc2a4b0 R15: 0000000000000000 [ 15.605042] ---[ end trace 325cf185e2795048 ]---
--- net/ethtool/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/ioctl.c +1 -1
@@ -906,7 +906,7 @@ static int ethtool_rxnfc_copy_to_user(vo rule_buf); useraddr += offsetof(struct compat_ethtool_rxnfc , rule_locs); }else { - ret =copy_to_user (useraddr, &rxnfc, size); + ret =copy_to_user (useraddr, rxnfc, size); useraddr += offsetof(struct ethtool_rxnfc , rule_locs); }
Greg Kroah-Hartman
maintainerPATCH 39/168 net: remove the unnecessary check in cipso_v4_doi_free
In reply to Greg Kroah-HartmanFrom: 王贇 <[email protected]>
commit 9756e44fd4d283ebcc94df353642f322428b73de upstream.
The commit 733c99ee8be9 ("net: fix NULL pointer reference in cipso_v4_doi_free") was merged by a mistake, this patch try to cleanup the mess.
And we already have the commit e842cb60e8ac ("net: fix NULL pointer reference in cipso_v4_doi_free") which fixed the root cause of the issue mentioned in it's description.
--- net/ipv4/cipso_ipv4.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
net/ipv4/cipso_ipv4.c +8 -10
@@ -465,16 +465,14 @@ void cipso_v4_doi_free(struct cipso_v4_dif (!doi_def)return ; -if (doi_def->map.std) { -switch (doi_def->type) { -case CIPSO_V4_MAP_TRANS : -kfree (doi_def->map.std->lvl.cipso); -kfree (doi_def->map.std->lvl.local); -kfree (doi_def->map.std->cat.cipso); -kfree (doi_def->map.std->cat.local); -kfree (doi_def->map.std); -break ; - } +switch (doi_def->type) { +case CIPSO_V4_MAP_TRANS : +kfree (doi_def->map.std->lvl.cipso); +kfree (doi_def->map.std->lvl.local); +kfree (doi_def->map.std->cat.cipso); +kfree (doi_def->map.std->cat.local); +kfree (doi_def->map.std); +break ; }kfree (doi_def); }
Greg Kroah-Hartman
maintainerPATCH 40/168 net/{mlx5|nfp|bnxt}: Remove unnecessary RTNL lock assert
In reply to Greg Kroah-HartmanFrom: Eli Cohen <[email protected]>
commit 7c3a0a018e672a9723a79b128227272562300055 upstream.
Remove the assert from the callback priv lookup function since it does not require RTNL lock and is already protected by flow_indr_block_lock.
This will avoid warnings from being emitted to dmesg if the driver registers its callback after an ingress qdisc was created for a netdevice.
The warnings started after the following patch was merged:
commit 74fc4f828769 ("net: Fix offloading indirect devices dependency on qdisc order creation")
--- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 3 --- drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 3 --- drivers/net/ethernet/netronome/nfp/flower/offload.c | 3 --- 3 files changed, 9 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +0 -3
@@ -1870,9 +1870,6 @@ bnxt_tc_indr_block_cb_lookup(struct bnxt {struct bnxt_flower_indr_block_cb_priv *cb_priv; -/* All callback list access should be protected by RTNL. */ -ASSERT_RTNL (); -list_for_each_entry (cb_priv, &bp->tc_indr_block_list, list)if (cb_priv->tunnel_netdev == netdev)return cb_priv;
drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c +0 -3
@@ -300,9 +300,6 @@ mlx5e_rep_indr_block_priv_lookup(struct {struct mlx5e_rep_indr_block_priv *cb_priv; -/* All callback list access should be protected by RTNL. */ -ASSERT_RTNL (); -list_for_each_entry (cb_priv, &rpriv->uplink_priv.tc_indr_block_priv_list, list)
drivers/net/ethernet/netronome/nfp/flower/offload.c +0 -3
@@ -1766,9 +1766,6 @@ nfp_flower_indr_block_cb_priv_lookup(strstruct nfp_flower_indr_block_cb_priv *cb_priv;struct nfp_flower_priv *priv = app->priv; -/* All callback list access should be protected by RTNL. */ -ASSERT_RTNL (); -list_for_each_entry (cb_priv, &priv->indr_block_cb_priv, list)if (cb_priv->netdev == netdev)return cb_priv;
Greg Kroah-Hartman
maintainerPATCH 41/168 net-caif: avoid user-triggerable WARN_ON(1)
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 550ac9c1aaaaf51fd42e20d461f0b1cdbd55b3d2 upstream.
syszbot triggers this warning, which looks something we can easily prevent.
If we initialize priv->list_field in chnl_net_init(), then always use list_del_init(), we can remove robust_list_del() completely.
WARNING: CPU: 0 PID: 3233 at net/caif/chnl_net.c:67 robust_list_del net/caif/chnl_net.c:67 [inline] WARNING: CPU: 0 PID: 3233 at net/caif/chnl_net.c:67 chnl_net_uninit+0xc9/0x2e0 net/caif/chnl_net.c:375 Modules linked in: CPU: 0 PID: 3233 Comm: syz-executor.3 Not tainted 5.14.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:robust_list_del net/caif/chnl_net.c:67 [inline] RIP: 0010:chnl_net_uninit+0xc9/0x2e0 net/caif/chnl_net.c:375 Code: 89 eb e8 3a a3 ba f8 48 89 d8 48 c1 e8 03 42 80 3c 28 00 0f 85 bf 01 00 00 48 81 fb 00 14 4e 8d 48 8b 2b 75 d0 e8 17 a3 ba f8 <0f> 0b 5b 5d 41 5c 41 5d e9 0a a3 ba f8 4c 89 e3 e8 02 a3 ba f8 4c RSP: 0018:ffffc90009067248 EFLAGS: 00010202 RAX: 0000000000008780 RBX: ffffffff8d4e1400 RCX: ffffc9000fd34000 RDX: 0000000000040000 RSI: ffffffff88bb6e49 RDI: 0000000000000003 RBP: ffff88802cd9ee08 R08: 0000000000000000 R09: ffffffff8d0e6647 R10: ffffffff88bb6dc2 R11: 0000000000000000 R12: ffff88803791ae08 R13: dffffc0000000000 R14: 00000000e600ffce R15: ffff888073ed3480 FS: 00007fed10fa0700(0000) GS:ffff8880b9d00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b2c322000 CR3: 00000000164a6000 CR4: 00000000001506e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: register_netdevice+0xadf/0x1500 net/core/dev.c:10347 ipcaif_newlink+0x4c/0x260 net/caif/chnl_net.c:468 __rtnl_newlink+0x106d/0x1750 net/core/rtnetlink.c:3458 rtnl_newlink+0x64/0xa0 net/core/rtnetlink.c:3506 rtnetlink_rcv_msg+0x413/0xb80 net/core/rtnetlink.c:5572 netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2504 netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline] netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1340 netlink_sendmsg+0x86d/0xdb0 net/netlink/af_netlink.c:1929 sock_sendmsg_nosec net/socket.c:704 [inline] sock_sendmsg+0xcf/0x120 net/socket.c:724 __sys_sendto+0x21c/0x320 net/socket.c:2036 __do_sys_sendto net/socket.c:2048 [inline] __se_sys_sendto net/socket.c:2044 [inline] __x64_sys_sendto+0xdd/0x1b0 net/socket.c:2044 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+0x44/0xae
--- net/caif/chnl_net.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
net/caif/chnl_net.c +3 -16
@@ -53,20 +53,6 @@ struct chnl_net {enum caif_states state; }; -static void robust_list_del (struct list_head *delete_node) -{ -struct list_head *list_node; -struct list_head *n; -ASSERT_RTNL (); -list_for_each_safe (list_node, n, &chnl_net_list) { -if (list_node == delete_node) { -list_del (list_node); -return ; - } - } -WARN_ON (1 ); -} -static int chnl_recv_cb (struct cflayer *layr,struct cfpkt *pkt) {struct sk_buff *skb;
@@ -364,6 +350,7 @@ static int chnl_net_init(struct net_deviASSERT_RTNL (); priv =netdev_priv (dev);strncpy (priv->name, dev->name,sizeof (priv->name)); +INIT_LIST_HEAD (&priv->list_field);return 0 ; }
@@ -372,7 +359,7 @@ static void chnl_net_uninit(struct net_dstruct chnl_net *priv;ASSERT_RTNL (); priv =netdev_priv (dev); -robust_list_del (&priv->list_field); +list_del_init (&priv->list_field); }static const struct net_device_ops netdev_ops = {
@@ -537,7 +524,7 @@ static void __exit chnl_exit_module(voidrtnl_lock ();list_for_each_safe (list_node, _tmp, &chnl_net_list) { dev = list_entry(list_node, struct chnl_net, list_field); -list_del (list_node); +list_del_init (list_node);delete_device (dev); }rtnl_unlock ();
Greg Kroah-Hartman
maintainerPATCH 42/168 ptp: dp83640: dont define PAGE0
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
commit 7366c23ff492ad260776a3ee1aaabba9fc773a8b upstream.
Building dp83640.c on arch/parisc/ produces a build warning for PAGE0 being redefined. Since the macro is not used in the dp83640 driver, just make it a comment for documentation purposes.
In file included from ../drivers/net/phy/dp83640.c:23:../drivers/net/phy/dp83640_reg.h:8: warning: "PAGE0" redefined
8 | #define PAGE0 0x0000
from ../drivers/net/phy/dp83640.c:11:../arch/parisc/include/asm/page.h:187: note: this is the location of the previous definition
187 | #define PAGE0 ((struct zeropage *)__PAGE_OFFSET)
--- drivers/net/phy/dp83640_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/phy/dp83640_reg.h +1 -1
@@ -5,7 +5,7 @@#ifndef HAVE_DP83640_REGISTERS #define HAVE_DP83640_REGISTERS -#define PAGE0 0x0000 +/* #define PAGE0 0x0000 */ #define PHYCR2 0x001c/* PHY Control Register 2 */ #define PAGE4 0x0004
Greg Kroah-Hartman
maintainerPATCH 43/168 dccp: dont duplicate ccid when cloning dccp sock
In reply to Greg Kroah-HartmanFrom: Lin, Zhenpeng <[email protected]>
commit d9ea761fdd197351890418acd462c51f241014a7 upstream.
Commit 2677d2067731 ("dccp: don't free ccid2_hc_tx_sock ...") fixed a UAF but reintroduced CVE-2017-6074.
When the sock is cloned, two dccps_hc_tx_ccid will reference to the same ccid. So one can free the ccid object twice from two socks after cloning.
This issue was found by "Hadar Manor" as well and assigned with CVE-2020-16119, which was fixed in Ubuntu's kernel. So here I port the patch from Ubuntu to fix it.
The patch prevents cloned socks from referencing the same ccid.
--- net/dccp/minisocks.c | 2 ++ 1 file changed, 2 insertions(+)
net/dccp/minisocks.c +2 -0
@@ -94,6 +94,8 @@ struct sock *dccp_create_openreq_child(c newdp->dccps_role =DCCP_ROLE_SERVER ; newdp->dccps_hc_rx_ackvec =NULL ; newdp->dccps_service_list =NULL ; + newdp->dccps_hc_rx_ccid =NULL ; + newdp->dccps_hc_tx_ccid =NULL ; newdp->dccps_service = dreq->dreq_service; newdp->dccps_timestamp_echo = dreq->dreq_timestamp_echo; newdp->dccps_timestamp_time = dreq->dreq_timestamp_time;
Greg Kroah-Hartman
maintainerPATCH 44/168 net/l2tp: Fix reference count leak in l2tp_udp_recv_core
In reply to Greg Kroah-HartmanFrom: Xiyu Yang <[email protected]>
commit 9b6ff7eb666415e1558f1ba8a742f5db6a9954de upstream.
The reference count leak issue may take place in an error handling path. If both conditions of tunnel->version == L2TP_HDR_VER_3 and the return value of l2tp_v3_ensure_opt_in_linear is nonzero, the function would directly jump to label invalid, without decrementing the reference count of the l2tp_session object session increased earlier by l2tp_tunnel_get_session(). This may result in refcount leaks.
Fix this issue by decrease the reference count before jumping to the label invalid.
--- net/l2tp/l2tp_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/l2tp/l2tp_core.c +3 -1
@@ -869,8 +869,10 @@ static int l2tp_udp_recv_core(struct l2t }if (tunnel->version ==L2TP_HDR_VER_3 && -l2tp_v3_ensure_opt_in_linear (session, skb, &ptr, &optr)) +l2tp_v3_ensure_opt_in_linear (session, skb, &ptr, &optr)) { +l2tp_session_dec_refcount (session); goto invalid; + }l2tp_recv_common (session, skb, ptr, optr, hdrflags, length);l2tp_session_dec_refcount (session);
Greg Kroah-Hartman
maintainerPATCH 45/168 r6040: Restore MDIO clock frequency after MAC reset
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
commit e3f0cc1a945fcefec0c7c9d9dfd028a51daa1846 upstream.
A number of users have reported that they were not able to get the PHY to successfully link up, especially after commit c36757eb9dee ("net:
phy: consider AN_RESTART status when reading link status") where we stopped reading just BMSR, but we also read BMCR to determine the link status.
Andrius at NetBSD did a wonderful job at debugging the problem and found out that the MDIO bus clock frequency would be incorrectly set back to its default value which would prevent the MDIO bus controller from reading PHY registers properly. Back when we only read BMSR, if we read all 1s, we could falsely indicate a link status, though in general there is a cable plugged in, so this went unnoticed. After a second read of BMCR was added, a wrong read will lead to the inability to determine a link UP condition which is when it started to be visibly broken, even if it was long before that.
The fix consists in restoring the value of the MD_CSR register that was set prior to the MAC reset.
--- drivers/net/ethernet/rdc/r6040.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/net/ethernet/rdc/r6040.c +8 -1
@@ -119,6 +119,8 @@#define PHY_ST 0x8A/* PHY status register */ #define MAC_SM 0xAC/* MAC status machine */ #define MAC_SM_RST 0x0002/* MAC status machine reset */ +#define MD_CSC 0xb6/* MDC speed control register */ +#define MD_CSC_DEFAULT 0x0030#define MAC_ID 0xBE/* Identifier register */ #define TX_DCNT 0x80/* TX descriptor count */
@@ -355,8 +357,9 @@ static void r6040_reset_mac(struct r6040 {void __iomem *ioaddr = lp->base;int limit =MAC_DEF_TIMEOUT ; -u16 cmd; +u16 cmd, md_csc; + md_csc =ioread16 (ioaddr +MD_CSC );iowrite16 (MAC_RST , ioaddr +MCR1 );while (limit--) { cmd =ioread16 (ioaddr +MCR1 );
@@ -368,6 +371,10 @@ static void r6040_reset_mac(struct r6040iowrite16 (MAC_SM_RST , ioaddr +MAC_SM );iowrite16 (0 , ioaddr +MAC_SM );mdelay (5 ); + +/* Restore MDIO clock frequency */ +if (md_csc !=MD_CSC_DEFAULT ) +iowrite16 (md_csc, ioaddr +MD_CSC ); }static void r6040_init_mac_regs (struct net_device *dev)
Greg Kroah-Hartman
maintainerPATCH 46/168 tipc: increase timeout in tipc_sk_enqueue()
In reply to Greg Kroah-HartmanFrom: Hoang Le <[email protected]>
commit f4bb62e64c88c93060c051195d3bbba804e56945 upstream.
In tipc_sk_enqueue() we use hardcoded 2 jiffies to extract socket buffer from generic queue to particular socket. The 2 jiffies is too short in case there are other high priority tasks get CPU cycles for multiple jiffies update. As result, no buffer could be enqueued to particular socket.
To solve this, we switch to use constant timeout 20msecs. Then, the function will be expired between 2 jiffies (CONFIG_100HZ) and 20 jiffies (CONFIG_1000HZ).
--- net/tipc/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/socket.c +1 -1
@@ -2423,7 +2423,7 @@ static int tipc_sk_backlog_rcv(struct sostatic void tipc_sk_enqueue (struct sk_buff_head *inputq,struct sock *sk,u32 dport,struct sk_buff_head *xmitq) { -unsigned long time_limit = jiffies +2 ; +unsigned long time_limit = jiffies +usecs_to_jiffies (20000 );struct sk_buff *skb;unsigned int lim;atomic_t *dcnt;
Greg Kroah-Hartman
maintainerPATCH 47/168 drm/rockchip: cdn-dp-core: Make cdn_dp_core_resume __maybe_unused
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 040b8907ccf1c78d020aca29800036565d761d73 upstream.
With the new static annotation, the compiler warns when the functions are actually unused:
drivers/gpu/drm/rockchip/cdn-dp-core.c:1123:12: error: 'cdn_dp_resume' defined but not used [-Werror=unused-function]
1123 | static int cdn_dp_resume(struct device *dev)
| ^~~~~~~~~~~~~
Mark them __maybe_unused to suppress that warning as well.
[ Not so 'new' static annotations any more, and I removed the part of
the patch that added __maybe_unused to cdn_dp_suspend(), because it's used by the shutdown/remove code.
So only the resume function ends up possibly unused if CONFIG_PM isn't
set - Linus ]
--- drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-core.c +1 -1
@@ -1123,7 +1123,7 @@ static int cdn_dp_suspend(struct devicereturn ret; } -static int cdn_dp_resume (struct device *dev) +static __maybe_unused int cdn_dp_resume (struct device *dev) {struct cdn_dp_device *dp =dev_get_drvdata (dev);
Greg Kroah-Hartman
maintainerPATCH 48/168 rtc: cmos: Disable irq around direct invocation of cmos_interrupt()
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
commit 13be2efc390acd2a46a69a359f6efc00ca434599 upstream.
As previously noted in commit 66e4f4a9cc38 ("rtc: cmos: Use spin_lock_irqsave() in cmos_interrupt()"):
<4>[ 254.192378] WARNING: inconsistent lock state
<4>[ 254.192384] 5.12.0-rc1-CI-CI_DRM_9834+ #1 Not tainted
<4>[ 254.192396] --------------------------------
<4>[ 254.192400] inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
<4>[ 254.192409] rtcwake/5309 [HC0[0]:SC0[0]:HE1:SE1] takes:
<4>[ 254.192429] ffffffff8263c5f8 (rtc_lock){?...}-{2:2}, at: cmos_interrupt+0x18/0x100
<4>[ 254.192481] {IN-HARDIRQ-W} state was registered at:
<4>[ 254.192488] lock_acquire+0xd1/0x3d0
<4>[ 254.192504] _raw_spin_lock+0x2a/0x40
<4>[ 254.192519] cmos_interrupt+0x18/0x100
<4>[ 254.192536] rtc_handler+0x1f/0xc0
<4>[ 254.192553] acpi_ev_fixed_event_detect+0x109/0x13c
<4>[ 254.192574] acpi_ev_sci_xrupt_handler+0xb/0x28
<4>[ 254.192596] acpi_irq+0x13/0x30
<4>[ 254.192620] __handle_irq_event_percpu+0x43/0x2c0
<4>[ 254.192641] handle_irq_event_percpu+0x2b/0x70
<4>[ 254.192661] handle_irq_event+0x2f/0x50
<4>[ 254.192680] handle_fasteoi_irq+0x9e/0x150
<4>[ 254.192693] __common_interrupt+0x76/0x140
<4>[ 254.192715] common_interrupt+0x96/0xc0
<4>[ 254.192732] asm_common_interrupt+0x1e/0x40
<4>[ 254.192750] _raw_spin_unlock_irqrestore+0x38/0x60
<4>[ 254.192767] resume_irqs+0xba/0xf0
<4>[ 254.192786] dpm_resume_noirq+0x245/0x3d0
<4>[ 254.192811] suspend_devices_and_enter+0x230/0xaa0
<4>[ 254.192835] pm_suspend.cold.8+0x301/0x34a
<4>[ 254.192859] state_store+0x7b/0xe0
<4>[ 254.192879] kernfs_fop_write_iter+0x11d/0x1c0
<4>[ 254.192899] new_sync_write+0x11d/0x1b0
<4>[ 254.192916] vfs_write+0x265/0x390
<4>[ 254.192933] ksys_write+0x5a/0xd0
<4>[ 254.192949] do_syscall_64+0x33/0x80
<4>[ 254.192965] entry_SYSCALL_64_after_hwframe+0x44/0xae
<4>[ 254.192986] irq event stamp: 43775
<4>[ 254.192994] hardirqs last enabled at (43775): [<ffffffff81c00c42>] asm_sysvec_apic_timer_interrupt+0x12/0x20
<4>[ 254.193023] hardirqs last disabled at (43774): [<ffffffff81aa691a>] sysvec_apic_timer_interrupt+0xa/0xb0
<4>[ 254.193049] softirqs last enabled at (42548): [<ffffffff81e00342>] __do_softirq+0x342/0x48e
<4>[ 254.193074] softirqs last disabled at (42543): [<ffffffff810b45fd>] irq_exit_rcu+0xad/0xd0
<4>[ 254.193101]
other info that might help us debug this:
<4>[ 254.193107] Possible unsafe locking scenario:<4>[ 254.193112] CPU0
<4>[ 254.193117] ----
<4>[ 254.193121] lock(rtc_lock);
<4>[ 254.193137] <Interrupt>
<4>[ 254.193142] lock(rtc_lock);
<4>[ 254.193156]
*** DEADLOCK ***<4>[ 254.193161] 6 locks held by rtcwake/5309:
<4>[ 254.193174] #0: ffff888104861430 (sb_writers#5){.+.+}-{0:0}, at: ksys_write+0x5a/0xd0
<4>[ 254.193232] #1: ffff88810f823288 (&of->mutex){+.+.}-{3:3}, at: kernfs_fop_write_iter+0xe7/0x1c0
<4>[ 254.193282] #2: ffff888100cef3c0 (kn->active#285
<7>[ 254.192706] i915 0000:00:02.0: [drm:intel_modeset_setup_hw_state [i915]] [CRTC:51:pipe A] hw state readout: disabled
<4>[ 254.193307] ){.+.+}-{0:0}, at: kernfs_fop_write_iter+0xf0/0x1c0
<4>[ 254.193333] #3: ffffffff82649fa8 (system_transition_mutex){+.+.}-{3:3}, at: pm_suspend.cold.8+0xce/0x34a
<4>[ 254.193387] #4: ffffffff827a2108 (acpi_scan_lock){+.+.}-{3:3}, at: acpi_suspend_begin+0x47/0x70
<4>[ 254.193433] #5: ffff8881019ea178 (&dev->mutex){....}-{3:3}, at: device_resume+0x68/0x1e0
<4>[ 254.193485]
stack backtrace:
<4>[ 254.193492] CPU: 1 PID: 5309 Comm: rtcwake Not tainted 5.12.0-rc1-CI-CI_DRM_9834+ #1
<4>[ 254.193514] Hardware name: Google Soraka/Soraka, BIOS MrChromebox-4.10 08/25/2019
<4>[ 254.193524] Call Trace:
<4>[ 254.193536] dump_stack+0x7f/0xad
<4>[ 254.193567] mark_lock.part.47+0x8ca/0xce0
<4>[ 254.193604] __lock_acquire+0x39b/0x2590
<4>[ 254.193626] ? asm_sysvec_apic_timer_interrupt+0x12/0x20
<4>[ 254.193660] lock_acquire+0xd1/0x3d0
<4>[ 254.193677] ? cmos_interrupt+0x18/0x100
<4>[ 254.193716] _raw_spin_lock+0x2a/0x40
<4>[ 254.193735] ? cmos_interrupt+0x18/0x100
<4>[ 254.193758] cmos_interrupt+0x18/0x100
<4>[ 254.193785] cmos_resume+0x2ac/0x2d0
<4>[ 254.193813] ? acpi_pm_set_device_wakeup+0x1f/0x110
<4>[ 254.193842] ? pnp_bus_suspend+0x10/0x10
<4>[ 254.193864] pnp_bus_resume+0x5e/0x90
<4>[ 254.193885] dpm_run_callback+0x5f/0x240
<4>[ 254.193914] device_resume+0xb2/0x1e0
<4>[ 254.193942] ? pm_dev_err+0x25/0x25
<4>[ 254.193974] dpm_resume+0xea/0x3f0
<4>[ 254.194005] dpm_resume_end+0x8/0x10
<4>[ 254.194030] suspend_devices_and_enter+0x29b/0xaa0
<4>[ 254.194066] pm_suspend.cold.8+0x301/0x34a
<4>[ 254.194094] state_store+0x7b/0xe0
<4>[ 254.194124] kernfs_fop_write_iter+0x11d/0x1c0
<4>[ 254.194151] new_sync_write+0x11d/0x1b0
<4>[ 254.194183] vfs_write+0x265/0x390
<4>[ 254.194207] ksys_write+0x5a/0xd0
<4>[ 254.194232] do_syscall_64+0x33/0x80
<4>[ 254.194251] entry_SYSCALL_64_after_hwframe+0x44/0xae
<4>[ 254.194274] RIP: 0033:0x7f07d79691e7
<4>[ 254.194293] Code: 64 89 02 48 c7 c0 ff ff ff ff eb bb 0f 1f 80 00 00 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24
<4>[ 254.194312] RSP: 002b:00007ffd9cc2c768 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
<4>[ 254.194337] RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 00007f07d79691e7
<4>[ 254.194352] RDX: 0000000000000004 RSI: 0000556ebfc63590 RDI: 000000000000000b
<4>[ 254.194366] RBP: 0000556ebfc63590 R08: 0000000000000000 R09: 0000000000000004
<4>[ 254.194379] R10: 0000556ebf0ec2a6 R11: 0000000000000246 R12: 0000000000000004which breaks S3-resume on fi-kbl-soraka presumably as that's slow enough to trigger the alarm during the suspend.
--- drivers/rtc/rtc-cmos.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/rtc/rtc-cmos.c +2 -0
@@ -1053,7 +1053,9 @@ static void cmos_check_wkalrm(struct dev* ACK the rtc irq here */ if (t_now >= cmos->alarm_expires &&cmos_use_acpi_alarm ()) { +local_irq_disable ();cmos_interrupt (0 , (void *)cmos->rtc); +local_irq_enable ();return ; }
Greg Kroah-Hartman
maintainerPATCH 49/168 drm/i915/dp: return proper DPRX link training result
In reply to Greg Kroah-HartmanFrom: Lee Shawn C <[email protected]>
commit 9af4bf2171c1a9e3f2ebb21140c0e34e60b2a22a upstream.
After DPRX link training, intel_dp_link_train_phy() did not return the training result properly. If link training failed, i915 driver would not run into link train fallback function. And no hotplug uevent would be received by user space application.
--- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp_link_training.c +1 -1
@@ -848,7 +848,7 @@ intel_dp_link_train_all_phys(struct inte }if (ret) -intel_dp_link_train_phy (intel_dp, crtc_state,DP_PHY_DPRX ); + ret =intel_dp_link_train_phy (intel_dp, crtc_state,DP_PHY_DPRX );if (intel_dp->set_idle_link_train) intel_dp->set_idle_link_train (intel_dp, crtc_state);
Greg Kroah-Hartman
maintainerPATCH 50/168 perf machine: Initialize srcline string member in add_location struct
In reply to Greg Kroah-HartmanFrom: Michael Petlan <[email protected]>
commit 57f0ff059e3daa4e70a811cb1d31a49968262d20 upstream.
It's later supposed to be either a correct address or NULL. Without the initialization, it may contain an undefined value which results in the following segmentation fault:
# perf top --sort comm -g --ignore-callees=do_idle
terminates with:
#0 0x00007ffff56b7685 in __strlen_avx2 () from /lib64/libc.so.6
#1 0x00007ffff55e3802 in strdup () from /lib64/libc.so.6
#2 0x00005555558cb139 in hist_entry__init (callchain_size=<optimized out>, sample_self=true, template=0x7fffde7fb110, he=0x7fffd801c250) at util/hist.c:489
#3 hist_entry__new (template=template@entry=0x7fffde7fb110, sample_self=sample_self@entry=true) at util/hist.c:564
#4 0x00005555558cb4ba in hists__findnew_entry (hists=hists@entry=0x5555561d9e38, entry=entry@entry=0x7fffde7fb110, al=al@entry=0x7fffde7fb420,
sample_self=sample_self@entry=true) at util/hist.c:657
#5 0x00005555558cba1b in __hists__add_entry (hists=hists@entry=0x5555561d9e38, al=0x7fffde7fb420, sym_parent=<optimized out>, bi=bi@entry=0x0, mi=mi@entry=0x0,
sample=sample@entry=0x7fffde7fb4b0, sample_self=true, ops=0x0, block_info=0x0) at util/hist.c:288
#6 0x00005555558cbb70 in hists__add_entry (sample_self=true, sample=0x7fffde7fb4b0, mi=0x0, bi=0x0, sym_parent=<optimized out>, al=<optimized out>, hists=0x5555561d9e38)
at util/hist.c:1056
#7 iter_add_single_cumulative_entry (iter=0x7fffde7fb460, al=<optimized out>) at util/hist.c:1056
#8 0x00005555558cc8a4 in hist_entry_iter__add (iter=iter@entry=0x7fffde7fb460, al=al@entry=0x7fffde7fb420, max_stack_depth=<optimized out>, arg=arg@entry=0x7fffffff7db0)
at util/hist.c:1231
#9 0x00005555557cdc9a in perf_event__process_sample (machine=<optimized out>, sample=0x7fffde7fb4b0, evsel=<optimized out>, event=<optimized out>, tool=0x7fffffff7db0)
at builtin-top.c:842
#10 deliver_event (qe=<optimized out>, qevent=<optimized out>) at builtin-top.c:1202
#11 0x00005555558a9318 in do_flush (show_progress=false, oe=0x7fffffff80e0) at util/ordered-events.c:244
#12 __ordered_events__flush (oe=oe@entry=0x7fffffff80e0, how=how@entry=OE_FLUSH__TOP, timestamp=timestamp@entry=0) at util/ordered-events.c:323
#13 0x00005555558a9789 in __ordered_events__flush (timestamp=<optimized out>, how=<optimized out>, oe=<optimized out>) at util/ordered-events.c:339
#14 ordered_events__flush (how=OE_FLUSH__TOP, oe=0x7fffffff80e0) at util/ordered-events.c:341
#15 ordered_events__flush (oe=oe@entry=0x7fffffff80e0, how=how@entry=OE_FLUSH__TOP) at util/ordered-events.c:339
#16 0x00005555557cd631 in process_thread (arg=0x7fffffff7db0) at builtin-top.c:1114
#17 0x00007ffff7bb817a in start_thread () from /lib64/libpthread.so.0
#18 0x00007ffff5656dc3 in clone () from /lib64/libc.so.6If you look at the frame #2, the code is:
488 if (he->srcline) {
489 he->srcline = strdup(he->srcline);
490 if (he->srcline == NULL)
491 goto err_rawdata;
492 }
If he->srcline is not NULL (it is not NULL if it is uninitialized rubbish), it gets strdupped and strdupping a rubbish random string causes the problem.
Also, if you look at the commit 1fb7d06a509e, it adds the srcline property into the struct, but not initializing it everywhere needed.
Committer notes:
Now I see, when using --ignore-callees=do_idle we end up here at line 2189 in add_callchain_ip():
2181 if (al.sym != NULL) {
2182 if (perf_hpp_list.parent && !*parent &&
2183 symbol__match_regex(al.sym, &parent_regex))
2184 *parent = al.sym;
2185 else if (have_ignore_callees && root_al &&
2186 symbol__match_regex(al.sym, &ignore_callees_regex)) {
2187 /* Treat this symbol as the root,
2188 forgetting its callees. */
2189 *root_al = al;
2190 callchain_cursor_reset(cursor);
2191 }
2192 }
And the al that doesn't have the ->srcline field initialized will be copied to the root_al, so then, back to:
1211 int hist_entry_iter__add(struct hist_entry_iter *iter, struct addr_location *al,
1212 int max_stack_depth, void *arg)
1213 {
1214 int err, err2;
1215 struct map *alm = NULL;
1216
1217 if (al)
1218 alm = map__get(al->map);
1219
1220 err = sample__resolve_callchain(iter->sample, &callchain_cursor, &iter->parent,
1221 iter->evsel, al, max_stack_depth);
1222 if (err) {
1223 map__put(alm);
1224 return err;
1225 }
1226
1227 err = iter->ops->prepare_entry(iter, al);
1228 if (err)
1229 goto out;
1230
1231 err = iter->ops->add_single_entry(iter, al);
1232 if (err)
1233 goto out;
1234
That al at line 1221 is what hist_entry_iter__add() (called from sample__resolve_callchain()) saw as 'root_al', and then:
iter->ops->add_single_entry(iter, al);
will go on with al->srcline with a bogus value, I'll add the above sequence to the cset and apply, thanks!
--- tools/perf/util/machine.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/machine.c +1 -0
@@ -2149,6 +2149,7 @@ static int add_callchain_ip(struct threa al.filtered =0 ; al.sym =NULL ; + al.srcline =NULL ;if (!cpumode) {thread__find_cpumode_addr_location (thread, ip, &al); }else {
Greg Kroah-Hartman
maintainerPATCH 51/168 net/mlx5: FWTrace, cancel work on alloc pd error flow
In reply to Greg Kroah-HartmanFrom: Saeed Mahameed <[email protected]>
commit dfe6fd72b5f1878b16aa2c8603e031bbcd66b96d upstream.
Handle error flow on mlx5_core_alloc_pd() failure, read_fw_strings_work must be canceled.
--- drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c +2 -1
@@ -1007,7 +1007,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_t err =mlx5_core_alloc_pd (dev, &tracer->buff.pdn);if (err) {mlx5_core_warn (dev,"FWTracer: Failed to allocate PD %d\n" , err); -return err; + goto err_cancel_work; } err =mlx5_fw_tracer_create_mkey (tracer);
@@ -1031,6 +1031,7 @@ err_notifier_unregister:mlx5_core_destroy_mkey (dev, &tracer->buff.mkey); err_dealloc_pd:mlx5_core_dealloc_pd (dev, tracer->buff.pdn); +err_cancel_work:cancel_work_sync (&tracer->read_fw_strings_work);return err; }
Greg Kroah-Hartman
maintainerPATCH 52/168 net/mlx5: Fix potential sleeping in atomic context
In reply to Greg Kroah-HartmanFrom: Maor Gottlieb <[email protected]>
commit ee27e330a953595903979ffdb84926843595a9fe upstream.
Fixes the below flow of sleeping in atomic context by releasing the RCU lock before calling to free_match_list.
build_match_list() <- disables preempt
-> free_match_list()
-> tree_put_node()
-> down_write_ref_node() <- take write lock
--- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +2 -3
@@ -1682,14 +1682,13 @@ static int build_match_list(struct match curr_match =kmalloc (sizeof (*curr_match),GFP_ATOMIC );if (!curr_match) { +rcu_read_unlock ();free_match_list (match_head, ft_locked); - err = -ENOMEM ; - goto out; +return -ENOMEM ; } curr_match->g = g;list_add_tail (&curr_match->list, &match_head->list); } -out:rcu_read_unlock ();return err; }
Greg Kroah-Hartman
maintainerPATCH 53/168 net: stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume
In reply to Greg Kroah-HartmanFrom: Joakim Zhang <[email protected]>
commit 276aae377206d60b9b7b7df4586cd9f2a813f5d0 upstream.
commit 5f58591323bf ("net: stmmac: delete the eee_ctrl_timer after napi disabled"), this patch tries to fix system hang caused by eee_ctrl_timer, unfortunately, it only can resolve it for system reboot stress test. System hang also can be reproduced easily during system suspend/resume stess test when mount NFS on i.MX8MP EVK board.
In stmmac driver, eee feature is combined to phylink framework. When do system suspend, phylink_stop() would queue delayed work, it invokes stmmac_mac_link_down(), where to deactivate eee_ctrl_timer synchronizly. In above commit, try to fix issue by deactivating eee_ctrl_timer obviously, but it is not enough. Looking into eee_ctrl_timer expire callback stmmac_eee_ctrl_timer(), it could enable hareware eee mode again. What is unexpected is that LPI interrupt (MAC_Interrupt_Enable.LPIEN bit) is always asserted. This interrupt has chance to be issued when LPI state entry/exit from the MAC, and at that time, clock could have been already disabled. The result is that system hang when driver try to touch register from interrupt handler.
The reason why above commit can fix system hang issue in stmmac_release() is that, deactivate eee_ctrl_timer not just after napi disabled, further after irq freed.
In conclusion, hardware would generate LPI interrupt when clock has been disabled during suspend or resume, since hardware is in eee mode and LPI interrupt enabled.
Interrupts from MAC, MTL and DMA level are enabled and never been disabled when system suspend, so postpone clocks management from suspend stage to noirq suspend stage should be more safe.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 14 ----- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 44 ++++++++++++++++++ 2 files changed, 44 insertions(+), 14 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -14
@@ -7113,7 +7113,6 @@ int stmmac_suspend(struct device *dev)struct net_device *ndev =dev_get_drvdata (dev);struct stmmac_priv *priv =netdev_priv (ndev);u32 chan; -int ret;if (!ndev || !netif_running (ndev))return 0 ;
@@ -7155,13 +7154,6 @@ int stmmac_suspend(struct device *dev)stmmac_mac_set (priv, priv->ioaddr, false);pinctrl_pm_select_sleep_state (priv->device); -/* Disable clock in case of PWM is off */ -clk_disable_unprepare (priv->plat->clk_ptp_ref); - ret =pm_runtime_force_suspend (dev); -if (ret) { -mutex_unlock (&priv->lock); -return ret; - } }mutex_unlock (&priv->lock);
@@ -7237,12 +7229,6 @@ int stmmac_resume(struct device *dev) priv->irq_wake =0 ; }else {pinctrl_pm_select_default_state (priv->device); -/* enable the clk previously disabled */ - ret =pm_runtime_force_resume (dev); -if (ret) -return ret; -if (priv->plat->clk_ptp_ref) -clk_prepare_enable (priv->plat->clk_ptp_ref);/* reset the phy so that it's ready */ if (priv->mii)stmmac_mdio_reset (priv->mii);
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +44 -0
59 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 54/168 igc: fix tunnel offloading
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit 40ee363c844fcb6ae0f1f5cfea68aed7e268c2f4 upstream.
Checking tunnel offloading, it turns out that offloading doesn't work as expected. The following script allows to reproduce the issue. Call it as `testscript DEVICE LOCALIP REMOTEIP NETMASK'
=== SNIP ===
if [ $# -ne 4 ]
then
echo "Usage $0 DEVICE LOCALIP REMOTEIP NETMASK"
exit 1
fi
DEVICE="$1"
LOCAL_ADDRESS="$2"
REMOTE_ADDRESS="$3"
NWMASK="$4"
echo "Driver: $(ethtool -i ${DEVICE} | awk '/^driver:/{print $2}') " ethtool -k "${DEVICE}" | grep tx-udp
echo
echo "Set up NIC and tunnel..."
ip addr add "${LOCAL_ADDRESS}/${NWMASK}" dev "${DEVICE}" ip link set "${DEVICE}" up
sleep 2
ip link add vxlan1 type vxlan id 42 \
remote "${REMOTE_ADDRESS}" \
local "${LOCAL_ADDRESS}" \
dstport 0 \
dev "${DEVICE}"ip addr add fc00::1/64 dev vxlan1
ip link set vxlan1 up
sleep 2
rm -f vxlan.pcap
echo "Running tcpdump and iperf3..."
( nohup tcpdump -i any -w vxlan.pcap >/dev/null 2>&1 ) & sleep 2
iperf3 -c fc00::2 >/dev/null
pkill tcpdump
echo
echo -n "Max. Paket Size: "
tcpdump -r vxlan.pcap -nnle 2>/dev/null \
| grep "${LOCAL_ADDRESS}.*> ${REMOTE_ADDRESS}.*OTV" \
| awk '{print $8}' | awk -F ':' '{print $1}' \
| sort -n | tail -1echo
ip link del vxlan1
ip addr del ${LOCAL_ADDRESS}/${NWMASK} dev "${DEVICE}" === SNAP ===
The expected outcome is
Max. Paket Size: 64904
This is what you see on igb, the code igc has been taken from. However, on igc the output is
Max. Paket Size: 1516
so the GSO aggregate packets are segmented by the kernel before calling igc_xmit_frame. Inside the subsequent call to igc_tso, the check for skb_is_gso(skb) fails and the function returns prematurely.
It turns out that this occurs because the feature flags aren't set entirely correctly in igc_probe. In contrast to the original code from igb_probe, igc_probe neglects to set the flags required to allow tunnel offloading.
Setting the same flags as igb fixes the issue on igc.
--- drivers/net/ethernet/intel/igc/igc_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc_main.c +3 -1
@@ -5962,7 +5962,9 @@ static int igc_probe(struct pci_dev *pdeif (pci_using_dac) netdev->features |=NETIF_F_HIGHDMA ; - netdev->vlan_features |= netdev->features; + netdev->vlan_features |= netdev->features |NETIF_F_TSO_MANGLEID ; + netdev->mpls_features |=NETIF_F_HW_CSUM ; + netdev->hw_enc_features |= netdev->vlan_features;/* MTU range: 68 - 9216 */ netdev->min_mtu =ETH_MIN_MTU ;
Greg Kroah-Hartman
maintainerPATCH 55/168 nvme-tcp: fix io_work priority inversion
In reply to Greg Kroah-HartmanFrom: Keith Busch <[email protected]>
commit 70f437fb4395ad4d1d16fab9a1ad9fbc9fc0579b upstream.
Dispatching requests inline with the .queue_rq() call may block while holding the send_mutex. If the tcp io_work also happens to schedule, it may see the req_list is non-empty, leaving "pending" true and remaining in TASK_RUNNING. Since io_work is of higher scheduling priority, the .queue_rq task may not get a chance to run, blocking forward progress and leading to io timeouts.
Instead of checking for pending requests within io_work, let the queueing restart io_work outside the send_mutex lock if there is more work to be done.
--- drivers/nvme/host/tcp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvme/host/tcp.c +10 -10
@@ -273,6 +273,12 @@ static inline void nvme_tcp_send_all(str }while (ret >0 ); } +static inline bool nvme_tcp_queue_more (struct nvme_tcp_queue *queue) +{ +return !list_empty (&queue->send_list) || + !llist_empty (&queue->req_list) || queue->more_requests; +} +static inline void nvme_tcp_queue_request (struct nvme_tcp_request *req,bool sync,bool last) {
@@ -293,9 +299,10 @@ static inline void nvme_tcp_queue_requesnvme_tcp_send_all (queue); queue->more_requests = false;mutex_unlock (&queue->send_mutex); - }else if (last) { -queue_work_on (queue->io_cpu, nvme_tcp_wq, &queue->io_work); } + +if (last &&nvme_tcp_queue_more (queue)) +queue_work_on (queue->io_cpu, nvme_tcp_wq, &queue->io_work); }static void nvme_tcp_process_req_list (struct nvme_tcp_queue *queue)
@@ -893,12 +900,6 @@ done:read_unlock_bh (&sk->sk_callback_lock); } -static inline bool nvme_tcp_queue_more (struct nvme_tcp_queue *queue) -{ -return !list_empty (&queue->send_list) || - !llist_empty (&queue->req_list) || queue->more_requests; -} -static inline void nvme_tcp_done_send_req (struct nvme_tcp_queue *queue) { queue->request =NULL ;
@@ -1132,8 +1133,7 @@ static void nvme_tcp_io_work(struct work pending = true; else if (unlikely(result < 0)) break; - }else - pending = !llist_empty (&queue->req_list); + } result =nvme_tcp_try_recv (queue);if (result >0 )
Greg Kroah-Hartman
maintainerPATCH 56/168 powerpc/64s: system call scv tabort fix for corrupt irq soft-mask state
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
commit b871895b148256f1721bc565d803860242755a0b upstream.
If a system call is made with a transaction active, the kernel immediately aborts it and returns. scv system calls disable irqs even earlier in their interrupt handler, and tabort_syscall does not fix this up.
This can result in irq soft-mask state being messed up on the next kernel entry, and crashing at BUG_ON(arch_irq_disabled_regs(regs)) in the kernel exit handlers, or possibly worse.
This can't easily be fixed in asm because at this point an async irq may have hit, which is soft-masked and marked pending. The pending interrupt has to be replayed before returning to userspace. The fix is to move the tabort_syscall code to C in the main syscall handler, and just skip the system call but otherwise return as usual, which will take care of the pending irqs. This also does a bunch of other things including possible signal delivery to the process, but the doomed transaction should still be aborted when it is eventually returned to.
The sc system call path is changed to use the new C function as well to reduce code and path differences. This slows down how quickly system calls are aborted when called while a transaction is active, which could potentially impact TM performance. But making any system call is already bad for performance, and TM is on the way out, so go with simpler over faster.
--- arch/powerpc/kernel/interrupt.c | 30 +++++++++++++++++++++++++++ arch/powerpc/kernel/interrupt_64.S | 41 ------------------------------------- 2 files changed, 30 insertions(+), 41 deletions(-)
arch/powerpc/kernel/interrupt.c +30 -0
@@ -19,6 +19,7 @@#include <asm/switch_to.h> #include <asm/syscall.h> #include <asm/time.h> +#include <asm/tm.h> #include <asm/unistd.h> #if defined(CONFIG_PPC_ADV_DEBUG_REGS ) && defined(CONFIG_PPC32 )
@@ -138,6 +139,35 @@ notrace long system_call_exception(long*/ irq_soft_mask_regs_set_state (regs,IRQS_ENABLED ); +/* +* If the system call was made with a transaction active, doom it and +* return without performing the system call. Unless it was an +* unsupported scv vector, in which case it's treated like an illegal +* instruction. +*/ +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +if (unlikely (MSR_TM_TRANSACTIONAL (regs->msr)) && + !trap_is_unsupported_scv (regs)) { +/* Enable TM in the kernel, and disable EE (for scv) */ +hard_irq_disable (); +mtmsr (mfmsr () |MSR_TM ); + +/* tabort, this dooms the transaction, nothing else */ + asmvolatile (".long 0x7c00071d | ((%0) << 16)" + ::"r" (TM_CAUSE_SYSCALL |TM_CAUSE_PERSISTENT )); + +/* +* Userspace will never see the return value. Execution will +* resume after the tbegin. of the aborted transaction with the +* checkpointed register state. A context switch could occur +* or signal delivered to the process before resuming the +* doomed transaction context, but that should all be handled +* as expected. +*/ +return -ENOSYS ; + } +#endif // CONFIG_PPC_TRANSACTIONAL_MEM +local_irq_enable ();if (unlikely (current_thread_info ()->flags & _TIF_SYSCALL_DOTRACE)) {
arch/powerpc/kernel/interrupt_64.S +0 -41
65 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 57/168 events: Reuse value read using READ_ONCE instead of re-reading it
In reply to Greg Kroah-HartmanFrom: Baptiste Lepers <[email protected]>
commit b89a05b21f46150ac10a962aa50109250b56b03b upstream.
In perf_event_addr_filters_apply, the task associated with the event (event->ctx->task) is read using READ_ONCE at the beginning of the function, checked, and then re-read from event->ctx->task, voiding all guarantees of the checks. Reuse the value that was read by READ_ONCE to ensure the consistency of the task struct throughout the function.
--- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/events/core.c +1 -1
@@ -10192,7 +10192,7 @@ static void perf_event_addr_filters_applreturn ;if (ifh->nr_file_filters) { - mm =get_task_mm (event->ctx->task); + mm =get_task_mm (task);if (!mm) goto restart;
Greg Kroah-Hartman
maintainerPATCH 58/168 net: ipa: initialize all filter table slots
In reply to Greg Kroah-HartmanFrom: Alex Elder <[email protected]>
commit b5c102238cea985d8126b173d06b9e1de88037ee upstream.
There is an off-by-one problem in ipa_table_init_add(), when initializing filter tables.
In that function, the number of filter table entries is determined based on the number of set bits in the filter map. However that count does *not* include the extra "slot" in the filter table that holds the filter map itself. Meanwhile, ipa_table_addr() *does* include the filter map in the memory it returns, but because the count it's provided doesn't include it, it includes one too few table entries.
Fix this by including the extra slot for the filter map in the count computed in ipa_table_init_add().
Note: ipa_filter_reset_table() does not have this problem; it resets filter table entries one by one, but does not overwrite the filter bitmap.
--- drivers/net/ipa/ipa_table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ipa/ipa_table.c +2 -1
@@ -430,7 +430,8 @@ static void ipa_table_init_add(struct gs* table region determines the number of entries it has. */ if (filter) { - count =hweight32 (ipa->filter_map); +/* Include one extra "slot" to hold the filter map itself */ + count =1 +hweight32 (ipa->filter_map); hash_count = hash_mem->size ? count :0 ; }else { count = mem->size /sizeof (__le64);
Greg Kroah-Hartman
maintainerPATCH 59/168 gen_compile_commands: fix missing sys package
In reply to Greg Kroah-HartmanFrom: Kortan <[email protected]>
commit ec783c7cb2495c5a3b8ca10db8056d43c528f940 upstream.
We need to import the 'sys' package since the script has called sys.exit() method.
--- scripts/clang-tools/gen_compile_commands.py | 1 + 1 file changed, 1 insertion(+)
scripts/clang-tools/gen_compile_commands.py +1 -0
@@ -13,6 +13,7 @@ import logging import os import re import subprocess +import sys _DEFAULT_OUTPUT = 'compile_commands.json' _DEFAULT_LOG_LEVEL = 'WARNING'
Greg Kroah-Hartman
maintainerPATCH 60/168 vhost_net: fix OoB on sendmsg() failure.
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
commit 3c4cea8fa7f71f00c5279547043a84bc2a4d8b8c upstream.
If the sendmsg() call in vhost_tx_batch() fails, both the 'batched_xdp' and 'done_idx' indexes are left unchanged. If such failure happens when batched_xdp == VHOST_NET_BATCH, the next call to vhost_net_build_xdp() will access and write memory outside the xdp buffers area.
Since sendmsg() can only error with EBADFD, this change addresses the issue explicitly freeing the XDP buffers batch on error.
--- drivers/vhost/net.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/vhost/net.c +10 -1
@@ -467,7 +467,7 @@ static void vhost_tx_batch(struct vhost_ .num = nvq->batched_xdp, .ptr = nvq->xdp, }; -int err; +int i, err;if (nvq->batched_xdp ==0 ) goto signal_used;
@@ -476,6 +476,15 @@ static void vhost_tx_batch(struct vhost_ err = sock->ops->sendmsg (sock, msghdr,0 );if (unlikely (err <0 )) {vq_err (&nvq->vq,"Fail to batch sending packets\n" ); + +/* free pages owned by XDP; since this is an unlikely error path, +* keep it simple and avoid more complex bulk update for the +* used pages +*/ +for (i =0 ; i < nvq->batched_xdp; ++i) +put_page (virt_to_head_page (nvq->xdp[i].data)); + nvq->batched_xdp =0 ; + nvq->done_idx =0 ;return ; }
Greg Kroah-Hartman
maintainerPATCH 61/168 net/af_unix: fix a data-race in unix_dgram_poll
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
commit 04f08eb44b5011493d77b602fdec29ff0f5c6cd5 upstream.
syzbot reported another data-race in af_unix [1]
Lets change __skb_insert() to use WRITE_ONCE() when changing skb head qlen.
Also, change unix_dgram_poll() to use lockless version of unix_recvq_full()
It is verry possible we can switch all/most unix_recvq_full() to the lockless version, this will be done in a future kernel version.
[1] HEAD commit: 8596e589b787732c8346f0482919e83cc9362db1
BUG: KCSAN: data-race in skb_queue_tail / unix_dgram_poll
write to 0xffff88814eeb24e0 of 4 bytes by task 25815 on cpu 0:
__skb_insert include/linux/skbuff.h:1938 [inline] __skb_queue_before include/linux/skbuff.h:2043 [inline] __skb_queue_tail include/linux/skbuff.h:2076 [inline] skb_queue_tail+0x80/0xa0 net/core/skbuff.c:3264 unix_dgram_sendmsg+0xff2/0x1600 net/unix/af_unix.c:1850 sock_sendmsg_nosec net/socket.c:703 [inline] sock_sendmsg net/socket.c:723 [inline] ____sys_sendmsg+0x360/0x4d0 net/socket.c:2392 ___sys_sendmsg net/socket.c:2446 [inline] __sys_sendmmsg+0x315/0x4b0 net/socket.c:2532 __do_sys_sendmmsg net/socket.c:2561 [inline] __se_sys_sendmmsg net/socket.c:2558 [inline] __x64_sys_sendmmsg+0x53/0x60 net/socket.c:2558 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
read to 0xffff88814eeb24e0 of 4 bytes by task 25834 on cpu 1:
skb_queue_len include/linux/skbuff.h:1869 [inline] unix_recvq_full net/unix/af_unix.c:194 [inline] unix_dgram_poll+0x2bc/0x3e0 net/unix/af_unix.c:2777 sock_poll+0x23e/0x260 net/socket.c:1288 vfs_poll include/linux/poll.h:90 [inline] ep_item_poll fs/eventpoll.c:846 [inline] ep_send_events fs/eventpoll.c:1683 [inline] ep_poll fs/eventpoll.c:1798 [inline] do_epoll_wait+0x6ad/0xf00 fs/eventpoll.c:2226 __do_sys_epoll_wait fs/eventpoll.c:2238 [inline] __se_sys_epoll_wait fs/eventpoll.c:2233 [inline] __x64_sys_epoll_wait+0xf6/0x120 fs/eventpoll.c:2233 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
value changed: 0x0000001b -> 0x00000001
Reported by Kernel Concurrency Sanitizer on:
CPU: 1 PID: 25834 Comm: syz-executor.1 Tainted: G W 5.14.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
--- include/linux/skbuff.h | 2 +- net/unix/af_unix.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/skbuff.h +1 -1
@@ -1935,7 +1935,7 @@ static inline void __skb_insert(struct sWRITE_ONCE (newsk->prev, prev);WRITE_ONCE (next->prev, newsk);WRITE_ONCE (prev->next, newsk); - list->qlen++; +WRITE_ONCE (list->qlen, list->qlen +1 ); } static inline void __skb_queue_splice(const struct sk_buff_head *list,
net/unix/af_unix.c +1 -1
@@ -2774,7 +2774,7 @@ static __poll_t unix_dgram_poll(struct f other =unix_peer (sk);if (other &&unix_peer (other) != sk && -unix_recvq_full (other) && +unix_recvq_full_lockless (other) &&unix_dgram_peer_wake_me (sk, other)) writable =0 ;
Greg Kroah-Hartman
maintainerPATCH 62/168 net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
commit 6a52e73368038f47f6618623d75061dc263b26ae upstream.
DSA supports connecting to a phy-handle, and has a fallback to a non-OF based method of connecting to an internal PHY on the switch's own MDIO bus, if no phy-handle and no fixed-link nodes were present.
The -ENODEV error code from the first attempt (phylink_of_phy_connect) is what triggers the second attempt (phylink_connect_phy).
However, when the first attempt returns a different error code than -ENODEV, this results in an unbalance of calls to phylink_create and phylink_destroy by the time we exit the function. The phylink instance has leaked.
There are many other error codes that can be returned by phylink_of_phy_connect. For example, phylink_validate returns -EINVAL. So this is a practical issue too.
--- net/dsa/slave.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
net/dsa/slave.c +5 -7
@@ -1784,13 +1784,11 @@ static int dsa_slave_phy_setup(struct ne* use the switch internal MDIO bus instead */ ret =dsa_slave_phy_connect (slave_dev, dp->index, phy_flags); -if (ret) { -netdev_err (slave_dev, -"failed to connect to port %d: %d\n" , - dp->index, ret); -phylink_destroy (dp->pl); -return ret; - } + } +if (ret) { +netdev_err (slave_dev,"failed to connect to PHY: %pe\n" , +ERR_PTR (ret)); +phylink_destroy (dp->pl); }return ret;
Greg Kroah-Hartman
maintainerPATCH 63/168 x86/uaccess: Fix 32-bit __get_user_asm_u64() when CC_HAS_ASM_GOTO_OUTPUT=y
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit a69ae291e1cc2d08ae77c2029579c59c9bde5061 upstream.
Commit 865c50e1d279 ("x86/uaccess: utilize CONFIG_CC_HAS_ASM_GOTO_OUTPUT") added an optimised version of __get_user_asm() for x86 using 'asm goto'.
Like the non-optimised code, the 32-bit implementation of 64-bit get_user() expands to a pair of 32-bit accesses. Unlike the non-optimised code, the _original_ pointer is incremented to copy the high word instead of loading through a new pointer explicitly constructed to point at a 32-bit type. Consequently, if the pointer points at a 64-bit type then we end up loading the wrong data for the upper 32-bits.
This was observed as a mount() failure in Android targeting i686 after b0cfcdd9b967 ("d_path: make 'prepend()' fill up the buffer exactly on overflow") because the call to copy_from_kernel_nofault() from prepend_copy() ends up in __get_kernel_nofault() and casts the source pointer to a 'u64 __user *'. An attempt to mount at "/debug_ramdisk" therefore ends up failing trying to mount "/debumdismdisk".
Use the existing '__gu_ptr' source pointer to unsigned int for 32-bit __get_user_asm_u64() instead of the original pointer.
--- arch/x86/include/asm/uaccess.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/uaccess.h +2 -2
@@ -301,8 +301,8 @@ do { \unsigned int __gu_low, __gu_high; \ const unsigned int __user *__gu_ptr; \ __gu_ptr = (const void __user *)(ptr); \ -__get_user_asm (__gu_low, ptr,"l" ,"=r" , label); \ -__get_user_asm (__gu_high, ptr+1 ,"l" ,"=r" , label); \ +__get_user_asm (__gu_low, __gu_ptr,"l" ,"=r" , label); \ +__get_user_asm (__gu_high, __gu_ptr+1 ,"l" ,"=r" , label); \ (x) = ((unsigned long long )__gu_high <<32 ) | __gu_low; \ } while (0) #else
Greg Kroah-Hartman
maintainerPATCH 64/168 tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()
In reply to Greg Kroah-HartmanFrom: zhenggy <[email protected]>
commit 4f884f3962767877d7aabbc1ec124d2c307a4257 upstream.
Commit 10d3be569243 ("tcp-tso: do not split TSO packets at retransmit time") may directly retrans a multiple segments TSO/GSO packet without split, Since this commit, we can no longer assume that a retransmitted packet is a single segment.
This patch fixes the tp->undo_retrans accounting in tcp_sacktag_one() that use the actual segments(pcount) of the retransmitted packet.
Before that commit (10d3be569243), the assumption underlying the tp->undo_retrans-- seems correct.
--- net/ipv4/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_input.c +1 -1
@@ -1314,7 +1314,7 @@ static u8 tcp_sacktag_one(struct sock *sif (dup_sack && (sacked &TCPCB_RETRANS )) {if (tp->undo_marker && tp->undo_retrans >0 &&after (end_seq, tp->undo_marker)) - tp->undo_retrans--; + tp->undo_retrans =max_t (int,0 , tp->undo_retrans - pcount);if ((sacked &TCPCB_SACKED_ACKED ) &&before (start_seq, state->reord)) state->reord = start_seq;
Greg Kroah-Hartman
maintainerPATCH 65/168 selftest: net: fix typo in altname test
In reply to Greg Kroah-HartmanFrom: Andrea Claudi <[email protected]>
commit 1b704b27beb11ce147d64b21c914e57afbfb5656 upstream.
If altname deletion of the short alternative name fails, the error message printed is: "Failed to add short alternative name". This is obviously a typo, as we are testing altname deletion.
Fix this using a proper error message.
--- tools/testing/selftests/net/altnames.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/altnames.sh +1 -1
@@ -45,7 +45,7 @@ altnames_test() check_err $? "Got unexpected long alternative name from link show JSON" ip link property del $DUMMY_DEV altname $SHORT_NAME - check_err $? "Failed to add short alternative name" + check_err $? "Failed to delete short alternative name" ip -j -p link show $SHORT_NAME &>/dev/null check_fail $? "Unexpected success while trying to do link show with deleted short alternative name"
Greg Kroah-Hartman
maintainerPATCH 66/168 qed: Handle management FW error
In reply to Greg Kroah-HartmanFrom: Shai Malin <[email protected]>
commit 20e100f52730cd0db609e559799c1712b5f27582 upstream.
Handle MFW (management FW) error response in order to avoid a crash during recovery flows.
Changes from v1:
- Add "Fixes tag".
--- drivers/net/ethernet/qlogic/qed/qed_mcp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/qlogic/qed/qed_mcp.c +5 -1
@@ -3368,6 +3368,7 @@ qed_mcp_get_nvm_image_att(struct qed_hwf struct qed_nvm_image_att *p_image_att) {enum nvm_image_type type; +int rc;u32 i;/* Translate image_id into MFW definitions */
@@ -3396,7 +3397,10 @@ qed_mcp_get_nvm_image_att(struct qed_hwfreturn -EINVAL ; } -qed_mcp_nvm_info_populate (p_hwfn); + rc =qed_mcp_nvm_info_populate (p_hwfn); +if (rc) +return rc; +for (i =0 ; i < p_hwfn->nvm_info.num_images; i++)if (type == p_hwfn->nvm_info.image_att[i].image_type)break ;
Greg Kroah-Hartman
maintainerPATCH 67/168 udp_tunnel: Fix udp_tunnel_nic work-queue type
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
commit e50e711351bdc656a8e6ca1022b4293cae8dcd59 upstream.
Turn udp_tunnel_nic work-queue to an ordered work-queue. This queue holds the UDP-tunnel configuration commands of the different netdevs. When the netdevs are functions of the same NIC the order of execution may be crucial.
Problem example:
NIC with 2 PFs, both PFs declare offload quota of up to 3 UDP-ports.
$ifconfig eth2 1.1.1.1/16 up
$ip link add eth2_19503 type vxlan id 5049 remote 1.1.1.2 dev eth2 dstport 19053 $ip link set dev eth2_19503 up
$ip link add eth2_19504 type vxlan id 5049 remote 1.1.1.3 dev eth2 dstport 19054 $ip link set dev eth2_19504 up
$ip link add eth2_19505 type vxlan id 5049 remote 1.1.1.4 dev eth2 dstport 19055 $ip link set dev eth2_19505 up
$ip link add eth2_19506 type vxlan id 5049 remote 1.1.1.5 dev eth2 dstport 19056 $ip link set dev eth2_19506 up
NIC RX port offload infrastructure offloads the first 3 UDP-ports (on all devices which sets NETIF_F_RX_UDP_TUNNEL_PORT feature) and not UDP-port 19056. So both PFs gets this offload configuration.
$ip link set dev eth2_19504 down
This triggers udp-tunnel-core to remove the UDP-port 19504 from offload-ports-list and offload UDP-port 19056 instead.
In this scenario it is important that the UDP-port of 19504 will be removed from both PFs before trying to add UDP-port 19056. The NIC can stop offloading a UDP-port only when all references are removed. Otherwise the NIC may report exceeding of the offload quota.
--- net/ipv4/udp_tunnel_nic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/udp_tunnel_nic.c +1 -1
@@ -935,7 +935,7 @@ static int __init udp_tunnel_nic_init_mo {int err; - udp_tunnel_nic_workqueue =alloc_workqueue ("udp_tunnel_nic" ,0 ,0 ); + udp_tunnel_nic_workqueue =alloc_ordered_workqueue ("udp_tunnel_nic" ,0 );if (!udp_tunnel_nic_workqueue)return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 68/168 dt-bindings: arm: Fix Toradex compatible typo
In reply to Greg Kroah-HartmanFrom: David Heidelberg <[email protected]>
commit 55c21d57eafb7b379bb7b3e93baf9ca2695895b0 upstream.
Fix board compatible typo reported by dtbs_check.
--- Documentation/devicetree/bindings/arm/tegra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/tegra.yaml +1 -1
@@ -54,7 +54,7 @@ properties: - const: toradex,apalis_t30 - const: nvidia,tegra30 - items: - - const: toradex,apalis_t30-eval-v1.1 + - const: toradex,apalis_t30-v1.1-eval - const: toradex,apalis_t30-eval - const: toradex,apalis_t30-v1.1 - const: toradex,apalis_t30
Greg Kroah-Hartman
maintainerPATCH 69/168 ibmvnic: check failover_pending in login response
In reply to Greg Kroah-HartmanFrom: Sukadev Bhattiprolu <[email protected]>
commit 273c29e944bda9a20a30c26cfc34c9a3f363280b upstream.
If a failover occurs before a login response is received, the login response buffer maybe undefined. Check that there was no failover before accessing the login response buffer.
--- drivers/net/ethernet/ibm/ibmvnic.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/ibm/ibmvnic.c +8 -0
@@ -4700,6 +4700,14 @@ static int handle_login_rsp(union ibmvnireturn 0 ; } +if (adapter->failover_pending) { + adapter->init_done_rc = -EAGAIN ; +netdev_dbg (netdev,"Failover pending, ignoring login response\n" ); +complete (&adapter->init_done); +/* login response buffer will be released on reset */ +return 0 ; + } + netdev->mtu = adapter->req_mtu -ETH_HLEN ;netdev_dbg (adapter->netdev,"Login Response Buffer:\n" );
Greg Kroah-Hartman
maintainerPATCH 70/168 KVM: PPC: Book3S HV: Tolerate treclaim. in fake-suspend mode changing registers
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
commit 267cdfa21385d78c794768233678756e32b39ead upstream.
POWER9 DD2.2 and 2.3 hardware implements a "fake-suspend" mode where certain TM instructions executed in HV=0 mode cause softpatch interrupts so the hypervisor can emulate them and prevent problematic processor conditions. In this fake-suspend mode, the treclaim. instruction does not modify registers.
Unfortunately the rfscv instruction executed by the guest do not generate softpatch interrupts, which can cause the hypervisor to lose track of the fake-suspend mode, and it can execute this treclaim. while not in fake-suspend mode. This modifies GPRs and crashes the hypervisor.
It's not trivial to disable scv in the guest with HFSCR now, because they assume a POWER9 has scv available. So this fix saves and restores checkpointed registers across the treclaim.
--- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 36 ++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_hv_rmhandlers.S +34 -2
@@ -2578,7 +2578,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_P9_TM_HV_A /* The following code handles the fake_suspend = 1 case */ mflr r0 std r0, PPC_LR_STKOFF(r1) - stdu r1, -PPC_MIN_STKFRM(r1) + stdu r1, -TM_FRAME_SIZE(r1) /* Turn on TM. */ mfmsr r8
@@ -2593,10 +2593,42 @@ BEGIN_FTR_SECTION END_FTR_SECTION_IFSET(CPU_FTR_P9_TM_XER_SO_BUG) nop + /* + * It's possible that treclaim. may modify registers, if we have lost + * track of fake-suspend state in the guest due to it using rfscv. + * Save and restore registers in case this occurs. + */ + mfspr r3, SPRN_DSCR + mfspr r4, SPRN_XER + mfspr r5, SPRN_AMR + /* SPRN_TAR would need to be saved here if the kernel ever used it */ + mfcr r12 + SAVE_NVGPRS(r1) + SAVE_GPR(2, r1) + SAVE_GPR(3, r1) + SAVE_GPR(4, r1) + SAVE_GPR(5, r1) + stw r12, 8(r1) + std r1, HSTATE_HOST_R1(r13) + /* We have to treclaim here because that's the only way to do S->N */ li r3, TM_CAUSE_KVM_RESCHED TRECLAIM(R3) + GET_PACA(r13) + ld r1, HSTATE_HOST_R1(r13) + REST_GPR(2, r1) + REST_GPR(3, r1) + REST_GPR(4, r1) + REST_GPR(5, r1) + lwz r12, 8(r1) + REST_NVGPRS(r1) + mtspr SPRN_DSCR, r3 + mtspr SPRN_XER, r4 + mtspr SPRN_AMR, r5 + mtcr r12 + HMT_MEDIUM + /* * We were in fake suspend, so we are not going to save the * register state as the guest checkpointed state (since
@@ -2624,7 +2656,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_P9_TM_XER_ std r5, VCPU_TFHAR(r9) std r6, VCPU_TFIAR(r9) - addi r1, r1, PPC_MIN_STKFRM + addi r1, r1, TM_FRAME_SIZE ld r0, PPC_LR_STKOFF(r1) mtlr r0 blr
Greg Kroah-Hartman
maintainerPATCH 71/168 powerpc/64s: system call rfscv workaround for TM bugs
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
commit ae7aaecc3f2f78b76ab3a8d6178610f55aadfa56 upstream.
The rfscv instruction does not work correctly with the fake-suspend mode in POWER9, which can end up with the hypervisor restoring an incorrect checkpoint.
Work around this by setting the _TIF_RESTOREALL flag if a system call returns to a transaction active state, causing rfid to be used instead of rfscv to return, which will do the right thing. The contents of the registers are irrelevant because they will be overwritten in this case anyway.
--- arch/powerpc/kernel/interrupt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/powerpc/kernel/interrupt.c +13 -0
@@ -140,6 +140,19 @@ notrace long system_call_exception(longirq_soft_mask_regs_set_state (regs,IRQS_ENABLED );/* +* If system call is called with TM active, set _TIF_RESTOREALL to +* prevent RFSCV being used to return to userspace, because POWER9 +* TM implementation has problems with this instruction returning to +* transactional state. Final register values are not relevant because +* the transaction will be aborted upon return anyway. Or in the case +* of unsupported_scv SIGILL fault, the return state does not much +* matter because it's an edge case. +*/ +if (IS_ENABLED (CONFIG_PPC_TRANSACTIONAL_MEM ) && +unlikely (MSR_TM_TRANSACTIONAL (regs->msr))) +current_thread_info ()->flags |= _TIF_RESTOREALL; + +/* * If the system call was made with a transaction active, doom it and * return without performing the system call. Unless it was an * unsupported scv vector, in which case it's treated like an illegal
Greg Kroah-Hartman
maintainerPATCH 72/168 powerpc/mce: Fix access error in mce handler
In reply to Greg Kroah-HartmanFrom: Ganesh Goudar <[email protected]>
commit 3a1e92d0896e928ac2a5b58962d05a39afef2e23 upstream.
We queue an irq work for deferred processing of mce event in realmode mce handler, where translation is disabled. Queuing of the work may result in accessing memory outside RMO region, such access needs the translation to be enabled for an LPAR running with hash mmu else the kernel crashes.
After enabling translation in mce_handle_error() we used to leave it enabled to avoid crashing here, but now with the commit 74c3354bc1d89 ("powerpc/pseries/mce: restore msr before returning from handler") we are restoring the MSR to disable translation.
Hence to fix this enable the translation before queuing the work.
Without this change following trace is seen on injecting SLB multihit in an LPAR running with hash mmu.
Oops: Kernel access of bad area, sig: 11 [#1]
LE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=2048 NUMA pSeries
CPU: 5 PID: 1883 Comm: insmod Tainted: G OE 5.14.0-mce+ #137
NIP: c000000000735d60 LR: c000000000318640 CTR: 0000000000000000
REGS: c00000001ebff9a0 TRAP: 0300 Tainted: G OE (5.14.0-mce+)
MSR: 8000000000001003 <SF,ME,RI,LE> CR: 28008228 XER: 00000001
CFAR: c00000000031863c DAR: c00000027fa8fe08 DSISR: 40000000 IRQMASK: 0
...
NIP llist_add_batch+0x0/0x40
LR __irq_work_queue_local+0x70/0xc0
Call Trace:
0xc00000001ebffc0c (unreliable)
irq_work_queue+0x40/0x70
machine_check_queue_event+0xbc/0xd0
machine_check_early_common+0x16c/0x1f4--- arch/powerpc/kernel/mce.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
arch/powerpc/kernel/mce.c +15 -2
@@ -249,6 +249,7 @@ void machine_check_queue_event(void) {int index;struct machine_check_event evt; +unsigned long msr;if (!get_mce_event (&evt,MCE_EVENT_RELEASE ))return ;
@@ -262,8 +263,20 @@ void machine_check_queue_event(void)memcpy (&local_paca->mce_info->mce_event_queue[index], &evt,sizeof (evt)); -/* Queue irq work to process this event later. */ -irq_work_queue (&mce_event_process_work); +/* +* Queue irq work to process this event later. Before +* queuing the work enable translation for non radix LPAR, +* as irq_work_queue may try to access memory outside RMO +* region. +*/ +if (!radix_enabled () &&firmware_has_feature (FW_FEATURE_LPAR )) { + msr =mfmsr (); +mtmsr (msr |MSR_IR |MSR_DR ); +irq_work_queue (&mce_event_process_work); +mtmsr (msr); + }else { +irq_work_queue (&mce_event_process_work); + } } void mce_common_process_ue(struct pt_regs *regs,
Greg Kroah-Hartman
maintainerPATCH 73/168 s390/pci_mmio: fully validate the VMA before calling follow_pte()
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit a8b92b8c1eac8d655a97b1e90f4d83c25d9b9a18 upstream.
We should not walk/touch page tables outside of VMA boundaries when holding only the mmap sem in read mode. Evil user space can modify the VMA layout just before this function runs and e.g., trigger races with page table removal code since commit dd2283f2605e ("mm: mmap: zap pages with read mmap_sem in munmap").
find_vma() does not check if the address is >= the VMA start address; use vma_lookup() instead.
--- arch/s390/pci/pci_mmio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/pci/pci_mmio.c +2 -2
@@ -159,7 +159,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsmmap_read_lock (current->mm); ret = -EINVAL ; - vma =find_vma (current->mm, mmio_addr); + vma =vma_lookup (current->mm, mmio_addr);if (!vma) goto out_unlock_mmap;if (!(vma->vm_flags & (VM_IO |VM_PFNMAP )))
@@ -298,7 +298,7 @@ SYSCALL_DEFINE3(s390_pci_mmio_read, unsimmap_read_lock (current->mm); ret = -EINVAL ; - vma =find_vma (current->mm, mmio_addr); + vma =vma_lookup (current->mm, mmio_addr);if (!vma) goto out_unlock_mmap;if (!(vma->vm_flags & (VM_IO |VM_PFNMAP )))
Greg Kroah-Hartman
maintainerPATCH 74/168 bnxt_en: make bnxt_free_skbs() safe to call after bnxt_free_mem()
In reply to Greg Kroah-HartmanFrom: Edwin Peer <[email protected]>
commit 1affc01fdc6035189a5ab2a24948c9419ee0ecf2 upstream.
The call to bnxt_free_mem(..., false) in the bnxt_half_open_nic() error path will deallocate ring descriptor memory via bnxt_free_?x_rings(), but because irq_re_init is false, the ring info itself is not freed.
To simplify error paths, deallocation functions have generally been written to be safe when called on unallocated memory. It should always be safe to call dev_close(), which calls bnxt_free_skbs() a second time, even in this semi- allocated ring state.
Calling bnxt_free_skbs() a second time with the rings already freed will cause NULL pointer dereference. Fix it by checking the rings are valid before proceeding in bnxt_free_tx_skbs() and bnxt_free_one_rx_ring_skbs().
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +13 -0
@@ -2680,6 +2680,9 @@ static void bnxt_free_tx_skbs(struct bnxstruct bnxt_tx_ring_info *txr = &bp->tx_ring[i];int j; +if (!txr->tx_buf_ring) +continue ; +for (j =0 ; j < max_idx;) {struct bnxt_sw_tx_bd *tx_buf = &txr->tx_buf_ring[j];struct sk_buff *skb;
@@ -2764,6 +2767,9 @@ static void bnxt_free_one_rx_ring_skbs(s } skip_rx_tpa_free: +if (!rxr->rx_buf_ring) + goto skip_rx_buf_free; +for (i =0 ; i < max_idx; i++) {struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[i];dma_addr_t mapping = rx_buf->mapping;
@@ -2786,6 +2792,11 @@ skip_rx_tpa_free:kfree (data); } } + +skip_rx_buf_free: +if (!rxr->rx_agg_ring) + goto skip_rx_agg_free; +for (i =0 ; i < max_agg_idx; i++) {struct bnxt_sw_rx_agg_bd *rx_agg_buf = &rxr->rx_agg_ring[i];struct page *page = rx_agg_buf->page;
@@ -2802,6 +2813,8 @@ skip_rx_tpa_free:__free_page (page); } + +skip_rx_agg_free:if (rxr->rx_page) {__free_page (rxr->rx_page); rxr->rx_page =NULL ;
Greg Kroah-Hartman
maintainerPATCH 75/168 net: hns3: pad the short tunnel frame before sending to hardware
In reply to Greg Kroah-HartmanFrom: Yufeng Mo <[email protected]>
commit d18e81183b1cb9c309266cbbce9acd3e0c528d04 upstream.
The hardware cannot handle short tunnel frames below 65 bytes, and will cause vlan tag missing problem. So pads packet size to 65 bytes for tunnel frames to fix this bug.
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +6 -2
@@ -73,6 +73,7 @@ MODULE_PARM_DESC(tx_sgl, "Minimum number#define HNS3_OUTER_VLAN_TAG 2#define HNS3_MIN_TX_LEN 33U +#define HNS3_MIN_TUN_PKT_LEN 65U/* hns3_pci_tbl - PCI Device ID Table *
@@ -1425,8 +1426,11 @@ static int hns3_set_l2l3l4(struct sk_buf l4.tcp->doff);break ;case IPPROTO_UDP : -if (hns3_tunnel_csum_bug (skb)) -return skb_checksum_help (skb); +if (hns3_tunnel_csum_bug (skb)) { +int ret =skb_put_padto (skb,HNS3_MIN_TUN_PKT_LEN ); + +return ret ? ret :skb_checksum_help (skb); + }hns3_set_field (*type_cs_vlan_tso,HNS3_TXD_L4CS_B ,1 ); hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L4T_S,
Greg Kroah-Hartman
maintainerPATCH 76/168 net: hns3: change affinity_mask to numa node range
In reply to Greg Kroah-HartmanFrom: Yufeng Mo <[email protected]>
commit 1dc839ec09d3ab2a4156dc98328b8bc3586f2b70 upstream.
Currently, affinity_mask is set to a single cpu. As a result, irqbalance becomes invalid in SUBSET or EXACT mode. To solve this problem, change affinity_mask to numa node range. In this way, irqbalance can be performed on the cpu of the numa node.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +8 -6
@@ -1528,9 +1528,10 @@ static void hclge_init_kdump_kernel_confstatic int hclge_configure (struct hclge_dev *hdev) {struct hnae3_ae_dev *ae_dev =pci_get_drvdata (hdev->pdev); +const struct cpumask *cpumask = cpu_online_mask;struct hclge_cfg cfg;unsigned int i; -int ret; +int node, ret; ret =hclge_get_cfg (hdev, &cfg);if (ret)
@@ -1595,11 +1596,12 @@ static int hclge_configure(struct hclge_hclge_init_kdump_kernel_config (hdev); -/* Set the init affinity based on pci func number */ - i =cpumask_weight (cpumask_of_node (dev_to_node (&hdev->pdev->dev))); - i = i ?PCI_FUNC (hdev->pdev->devfn) % i :0 ; -cpumask_set_cpu (cpumask_local_spread (i,dev_to_node (&hdev->pdev->dev)), - &hdev->affinity_mask); +/* Set the affinity based on numa node */ + node =dev_to_node (&hdev->pdev->dev); +if (node !=NUMA_NO_NODE ) + cpumask =cpumask_of_node (node); + +cpumask_copy (&hdev->affinity_mask, cpumask);return ret; }
Greg Kroah-Hartman
maintainerPATCH 77/168 net: hns3: disable mac in flr process
In reply to Greg Kroah-HartmanFrom: Yufeng Mo <[email protected]>
commit b81d8948746520f989e86d66292ff72b5056114a upstream.
The firmware will not disable mac in flr process. Therefore, the driver needs to proactively disable mac during flr, which is the same as the function reset.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +3 -2
@@ -8120,11 +8120,12 @@ static void hclge_ae_stop(struct hnae3_hhclge_clear_arfs_rules (hdev);spin_unlock_bh (&hdev->fd_rule_lock); -/* If it is not PF reset, the firmware will disable the MAC, +/* If it is not PF reset or FLR, the firmware will disable the MAC, * so it only need to stop phy here. */ if (test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state) && - hdev->reset_type !=HNAE3_FUNC_RESET ) { + hdev->reset_type !=HNAE3_FUNC_RESET && + hdev->reset_type !=HNAE3_FLR_RESET ) {hclge_mac_stop_phy (hdev);hclge_update_link_status (hdev);return ;
Greg Kroah-Hartman
maintainerPATCH 78/168 net: hns3: fix the timing issue of VF clearing interrupt sources
In reply to Greg Kroah-HartmanFrom: Jiaran Zhang <[email protected]>
commit 427900d27d86b820c559037a984bd403f910860f upstream.
Currently, the VF does not clear the interrupt source immediately after receiving the interrupt. As a result, if the second interrupt task is triggered when processing the first interrupt task, clearing the interrupt source before exiting will clear the interrupt sources of the two tasks at the same time. As a result, no interrupt is triggered for the second task. The VF detects the missed message only when the next interrupt is generated.
Clearing it immediately after executing check_evt_cause ensures that:
1. Even if two interrupt tasks are triggered at the same time, they can be processed.
2. If the second task is triggered during the processing of the first task and the interrupt source is not cleared, the interrupt is reported after vector0 is enabled.
--- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +3 -3
@@ -2463,6 +2463,8 @@ static irqreturn_t hclgevf_misc_irq_handhclgevf_enable_vector (&hdev->misc_vector, false); event_cause =hclgevf_check_evt_cause (hdev, &clearval); +if (event_cause !=HCLGEVF_VECTOR0_EVENT_OTHER ) +hclgevf_clear_event_cause (hdev, clearval);switch (event_cause) {case HCLGEVF_VECTOR0_EVENT_RST :
@@ -2475,10 +2477,8 @@ static irqreturn_t hclgevf_misc_irq_handbreak ; } -if (event_cause !=HCLGEVF_VECTOR0_EVENT_OTHER ) { -hclgevf_clear_event_cause (hdev, clearval); +if (event_cause !=HCLGEVF_VECTOR0_EVENT_OTHER )hclgevf_enable_vector (&hdev->misc_vector, true); - }return IRQ_HANDLED ; }
Greg Kroah-Hartman
maintainerPATCH 79/168 net: stmmac: platform: fix build warning when with !CONFIG_PM_SLEEP
In reply to Greg Kroah-HartmanFrom: Joakim Zhang <[email protected]>
commit 2a48d96fd58a666ae231c3dd6fe4a458798ac645 upstream.
Use __maybe_unused for noirq_suspend()/noirq_resume() hooks to avoid build warning with !CONFIG_PM_SLEEP:
Quoted 1 line
Quoted 1 line
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:796:12: error: 'stmmac_pltfr_noirq_resume' defined but not used [-Werror=unused-function]
796 | static int stmmac_pltfr_noirq_resume(struct device *dev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 1 line
Quoted 1 line
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:775:12: error: 'stmmac_pltfr_noirq_suspend' defined but not used [-Werror=unused-function]
775 | static int stmmac_pltfr_noirq_suspend(struct device *dev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
--- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +2 -2
@@ -772,7 +772,7 @@ static int __maybe_unused stmmac_runtimereturn stmmac_bus_clks_config (priv, true); } -static int stmmac_pltfr_noirq_suspend (struct device *dev) +static int __maybe_unused stmmac_pltfr_noirq_suspend (struct device *dev) {struct net_device *ndev =dev_get_drvdata (dev);struct stmmac_priv *priv =netdev_priv (ndev);
@@ -793,7 +793,7 @@ static int stmmac_pltfr_noirq_suspend(streturn 0 ; } -static int stmmac_pltfr_noirq_resume (struct device *dev) +static int __maybe_unused stmmac_pltfr_noirq_resume (struct device *dev) {struct net_device *ndev =dev_get_drvdata (dev);struct stmmac_priv *priv =netdev_priv (ndev);
Greg Kroah-Hartman
maintainerPATCH 80/168 Drivers: hv: vmbus: Fix kernel crash upon unbinding a device from uio_hv_generic driver
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit f1940d4e9cbe6208e7e77e433c587af108152a17 ]
The following crash happens when a never-used device is unbound from uio_hv_generic driver:
kernel BUG at mm/slub.c:321!
invalid opcode: 0000 [#1] SMP PTI
CPU: 0 PID: 4001 Comm: bash Kdump: loaded Tainted: G X --------- --- 5.14.0-0.rc2.23.el9.x86_64 #1 Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS 090008 12/07/2018 RIP: 0010:__slab_free+0x1d5/0x3d0 ... Call Trace: ? pick_next_task_fair+0x18e/0x3b0 ? __cond_resched+0x16/0x40 ? vunmap_pmd_range.isra.0+0x154/0x1c0 ? __vunmap+0x22d/0x290 ? hv_ringbuffer_cleanup+0x36/0x40 [hv_vmbus] kfree+0x331/0x380 ? hv_uio_remove+0x43/0x60 [uio_hv_generic] hv_ringbuffer_cleanup+0x36/0x40 [hv_vmbus] vmbus_free_ring+0x21/0x60 [hv_vmbus] hv_uio_remove+0x4f/0x60 [uio_hv_generic] vmbus_remove+0x23/0x30 [hv_vmbus] __device_release_driver+0x17a/0x230 device_driver_detach+0x3c/0xa0 unbind_store+0x113/0x130
...
The problem appears to be that we free 'ring_info->pkt_buffer' twice:
first, when the device is unbound from in-kernel driver (netvsc in this case) and second from hv_uio_remove(). Normally, ring buffer is supposed to be re-initialized from hv_uio_open() but this happens when UIO device is being opened and this is not guaranteed to happen.
Generally, it is OK to call hv_ringbuffer_cleanup() twice for the same channel (which is being handed over between in-kernel drivers and UIO) even if we didn't call hv_ringbuffer_init() in between. We, however, need to avoid kfree() call for an already freed pointer.
--- drivers/hv/ring_buffer.c | 1 + 1 file changed, 1 insertion(+)
drivers/hv/ring_buffer.c +1 -0
@@ -245,6 +245,7 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)mutex_unlock (&ring_info->ring_buffer_mutex);kfree (ring_info->pkt_buffer); + ring_info->pkt_buffer =NULL ; ring_info->pkt_buffer_size =0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 81/168 net/mlx5e: Fix mutual exclusion between CQE compression and HW TS
In reply to Greg Kroah-HartmanFrom: Aya Levin <[email protected]>
[ Upstream commit c91c1da72b47fc4c5e353cdd9099ba94ae07d2fa ]
Some profiles of the driver don't support a dedicated PTP-RQ, hence can't support HW TS and CQE compression simultaneously. When HW TS is enabled the COE compression is disabled, and should be restored when the HW TS is turned off. Add rx_filter as an input to modifying CQE compression to enforce this restriction.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 ++++++----- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +1 -1
@@ -940,7 +940,7 @@ void mlx5e_set_rx_mode_work(struct work_struct *work);int mlx5e_hwstamp_set (struct mlx5e_priv *priv,struct ifreq *ifr);int mlx5e_hwstamp_get (struct mlx5e_priv *priv,struct ifreq *ifr); -int mlx5e_modify_rx_cqe_compression_locked (struct mlx5e_priv *priv,bool val); +int mlx5e_modify_rx_cqe_compression_locked (struct mlx5e_priv *priv,bool val,bool rx_filter);int mlx5e_vlan_rx_add_vid (struct net_device *dev,__always_unused __be16 proto,u16 vid);
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +6 -5
@@ -1882,7 +1882,7 @@ static int set_pflag_rx_cqe_based_moder(struct net_device *netdev, bool enable)return set_pflag_cqe_based_moder (netdev, enable, true); } -int mlx5e_modify_rx_cqe_compression_locked (struct mlx5e_priv *priv,bool new_val) +int mlx5e_modify_rx_cqe_compression_locked (struct mlx5e_priv *priv,bool new_val,bool rx_filter) {bool curr_val =MLX5E_GET_PFLAG (&priv->channels.params,MLX5E_PFLAG_RX_CQE_COMPRESS );struct mlx5e_params new_params;
@@ -1894,8 +1894,7 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_valif (curr_val == new_val)return 0 ; -if (new_val && !priv->profile->rx_ptp_support && - priv->tstamp.rx_filter !=HWTSTAMP_FILTER_NONE ) { +if (new_val && !priv->profile->rx_ptp_support && rx_filter) {netdev_err (priv->netdev,"Profile doesn't support enabling of CQE compression while hardware time-stamping is enabled.\n" );return -EINVAL ;
@@ -1903,7 +1902,7 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_val new_params = priv->channels.params;MLX5E_SET_PFLAG (&new_params,MLX5E_PFLAG_RX_CQE_COMPRESS , new_val); -if (priv->tstamp.rx_filter !=HWTSTAMP_FILTER_NONE ) +if (rx_filter) new_params.ptp_rx = new_val;if (new_params.ptp_rx == priv->channels.params.ptp_rx)
@@ -1926,12 +1925,14 @@ static int set_pflag_rx_cqe_compress(struct net_device *netdev, {struct mlx5e_priv *priv =netdev_priv (netdev);struct mlx5_core_dev *mdev = priv->mdev; +bool rx_filter;int err;if (!MLX5_CAP_GEN (mdev, cqe_compression))return -EOPNOTSUPP ; - err =mlx5e_modify_rx_cqe_compression_locked (priv, enable); + rx_filter = priv->tstamp.rx_filter !=HWTSTAMP_FILTER_NONE ; + err =mlx5e_modify_rx_cqe_compression_locked (priv, enable, rx_filter);if (err)return err;
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +2 -2
@@ -4004,14 +4004,14 @@ static int mlx5e_hwstamp_config_no_ptp_rx(struct mlx5e_priv *priv, bool rx_filteif (!rx_filter)/* Reset CQE compression to Admin default */ -return mlx5e_modify_rx_cqe_compression_locked (priv, rx_cqe_compress_def); +return mlx5e_modify_rx_cqe_compression_locked (priv, rx_cqe_compress_def, false);if (!MLX5E_GET_PFLAG (&priv->channels.params,MLX5E_PFLAG_RX_CQE_COMPRESS ))return 0 ;/* Disable CQE compression */ netdev_warn (priv->netdev,"Disabling RX cqe compression\n" ); - err =mlx5e_modify_rx_cqe_compression_locked (priv, false); + err =mlx5e_modify_rx_cqe_compression_locked (priv, false, true);if (err)netdev_err (priv->netdev,"Failed disabling cqe compression err=%d\n" , err);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 82/168 ice: Correctly deal with PFs that do not support RDMA
In reply to Greg Kroah-HartmanFrom: Dave Ertman <[email protected]>
[ Upstream commit bfe84435090a6c85271b02a42b1d83fef9ff7cc7 ]
There are two cases where the current PF does not support RDMA functionality. The first is if the NVM loaded on the device is set to not support RDMA (common_caps.rdma is false). The second is if the kernel bonding driver has included the current PF in an active link aggregate.
When the driver has determined that this PF does not support RDMA, then auxiliary devices should not be created on the auxiliary bus. Without a device on the auxiliary bus, even if the irdma driver is present, there will be no RDMA activity attempted on this PF.
Currently, in the reset flow, an attempt to create auxiliary devices is performed without regard to the ability of the PF. There needs to be a check in ice_aux_plug_dev (as the central point that creates auxiliary devices) to see if the PF is in a state to support the functionality.
When disabling and re-enabling RDMA due to the inclusion/removal of the PF in a link aggregate, we also need to set/clear the bit which controls auxiliary device creation so that a reset recovery in a link aggregate situation doesn't try to create auxiliary devices when it shouldn't.
--- drivers/net/ethernet/intel/ice/ice.h | 2 ++ drivers/net/ethernet/intel/ice/ice_idc.c | 6 ++++++ 2 files changed, 8 insertions(+)
drivers/net/ethernet/intel/ice/ice.h +2 -0
@@ -695,6 +695,7 @@ static inline void ice_set_rdma_cap(struct ice_pf *pf) {if (pf->hw.func_caps.common_cap.rdma && pf->num_rdma_msix) {set_bit (ICE_FLAG_RDMA_ENA , pf->flags); +set_bit (ICE_FLAG_AUX_ENA , pf->flags);ice_plug_aux_dev (pf); } }
@@ -707,5 +708,6 @@ static inline void ice_clear_rdma_cap(struct ice_pf *pf) {ice_unplug_aux_dev (pf);clear_bit (ICE_FLAG_RDMA_ENA , pf->flags); +clear_bit (ICE_FLAG_AUX_ENA , pf->flags); }#endif /* _ICE_H_ */
drivers/net/ethernet/intel/ice/ice_idc.c +6 -0
@@ -271,6 +271,12 @@ int ice_plug_aux_dev(struct ice_pf *pf)struct auxiliary_device *adev;int ret; +/* if this PF doesn't support a technology that requires auxiliary +* devices, then gracefully exit +*/ +if (!ice_is_aux_ena (pf)) +return 0 ; + iadev =kzalloc (sizeof (*iadev),GFP_KERNEL );if (!iadev)return -ENOMEM ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 83/168 net: dsa: qca8k: fix kernel panic with legacy mdio mapping
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit ce062a0adbfe933b1932235fdfd874c4c91d1bb0 ]
When the mdio legacy mapping is used the mii_bus priv registered by DSA refer to the dsa switch struct instead of the qca8k_priv struct and causes a kernel panic. Create dedicated function when the internal dedicated mdio driver is used to properly handle the 2 different implementation.
--- drivers/net/dsa/qca8k.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)
drivers/net/dsa/qca8k.c +22 -8
@@ -643,10 +643,8 @@ qca8k_mdio_busy_wait(struct mii_bus *bus, u32 reg, u32 mask) }static int -qca8k_mdio_write (struct mii_bus *salve_bus,int phy,int regnum,u16 data) +qca8k_mdio_write (struct mii_bus *bus,int phy,int regnum,u16 data) { -struct qca8k_priv *priv = salve_bus->priv; -struct mii_bus *bus = priv->bus;u16 r1, r2, page;u32 val;int ret;
@@ -682,10 +680,8 @@ exit: }static int -qca8k_mdio_read (struct mii_bus *salve_bus,int phy,int regnum) +qca8k_mdio_read (struct mii_bus *bus,int phy,int regnum) { -struct qca8k_priv *priv = salve_bus->priv; -struct mii_bus *bus = priv->bus;u16 r1, r2, page;u32 val;int ret;
@@ -726,6 +722,24 @@ exit:return ret; } +static int +qca8k_internal_mdio_write (struct mii_bus *slave_bus,int phy,int regnum,u16 data) +{ +struct qca8k_priv *priv = slave_bus->priv; +struct mii_bus *bus = priv->bus; + +return qca8k_mdio_write (bus, phy, regnum, data); +} + +static int +qca8k_internal_mdio_read (struct mii_bus *slave_bus,int phy,int regnum) +{ +struct qca8k_priv *priv = slave_bus->priv; +struct mii_bus *bus = priv->bus; + +return qca8k_mdio_read (bus, phy, regnum); +} +static int qca8k_phy_write (struct dsa_switch *ds,int port,int regnum,u16 data) {
@@ -775,8 +789,8 @@ qca8k_mdio_register(struct qca8k_priv *priv, struct device_node *mdio) bus->priv = (void *)priv; bus->name ="qca8k slave mii" ; - bus->read = qca8k_mdio_read; - bus->write = qca8k_mdio_write; + bus->read = qca8k_internal_mdio_read; + bus->write = qca8k_internal_mdio_write;snprintf (bus->id,MII_BUS_ID_SIZE ,"qca8k-%d" , ds->index);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 84/168 net: dsa: lantiq_gswip: Add 200ms assert delay
In reply to Greg Kroah-HartmanFrom: Aleksander Jan Bajkowski <[email protected]>
[ Upstream commit 111b64e35ea03d58c882832744f571a88bb2e2e2 ]
The delay is especially needed by the xRX300 and xRX330 SoCs. Without this patch, some phys are sometimes not properly detected.
The patch was tested on BT Home Hub 5A and D-Link DWR-966.
--- drivers/net/dsa/lantiq_gswip.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/dsa/lantiq_gswip.c +6 -0
@@ -1885,6 +1885,12 @@ static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gphreset_control_assert (gphy_fw->reset); +/* The vendor BSP uses a 200ms delay after asserting the reset line. +* Without this some users are observing that the PHY is not coming up +* on the MDIO bus. +*/ +msleep (200 ); + ret =request_firmware (&fw, gphy_fw->fw_name, dev);if (ret) { dev_err(dev, "failed to load firmware: %s, error: %i\n",
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 85/168 net: hns3: fix the exception when query imp info
In reply to Greg Kroah-HartmanFrom: Jiaran Zhang <[email protected]>
[ Upstream commit 472430a7b066f19afa1b55867d621b2d6d323e0d ]
When the command for querying imp info is issued to the firmware, if the firmware does not support the command, the returned value of bd num is 0.
Add protection mechanism before alloc memory to prevent apply for 0-length memory.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +4 -0
@@ -1710,6 +1710,10 @@ hclge_dbg_get_imp_stats_info(struct hclge_dev *hdev, char *buf, int len) } bd_num =le32_to_cpu (req->bd_num); +if (!bd_num) { +dev_err (&hdev->pdev->dev,"imp statistics bd number is 0!\n" ); +return -EINVAL ; + } desc_src =kcalloc (bd_num,sizeof (struct hclge_desc ),GFP_KERNEL );if (!desc_src)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 86/168 nvme: avoid race in shutdown namespace removal
In reply to Greg Kroah-HartmanFrom: Daniel Wagner <[email protected]>
[ Upstream commit 9edceaf43050f5ba1dd7d0011bcf68a736a17743 ]
When we remove the siblings entry, we update ns->head->list, hence we can't separate the removal and test for being empty. They have to be in the same critical section to avoid a race.
To avoid breaking the refcounting imbalance again, add a list empty check to nvme_find_ns_head.
--- drivers/nvme/host/core.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/nvme/host/core.c +7 -8
@@ -3496,7 +3496,9 @@ static struct nvme_ns_head *nvme_find_ns_head(struct nvme_subsystem *subsys,lockdep_assert_held (&subsys->lock);list_for_each_entry (h, &subsys->nsheads, entry) { -if (h->ns_id == nsid &&nvme_tryget_ns_head (h)) +if (h->ns_id != nsid) +continue ; +if (!list_empty (&h->list) &&nvme_tryget_ns_head (h))return h; }
@@ -3821,6 +3823,10 @@ static void nvme_ns_remove(struct nvme_ns *ns)mutex_lock (&ns->ctrl->subsys->lock);list_del_rcu (&ns->siblings); +if (list_empty (&ns->head->list)) { +list_del_init (&ns->head->entry); + last_path = true; + }mutex_unlock (&ns->ctrl->subsys->lock);synchronize_rcu ();/* guarantee not available in head->list */
@@ -3840,13 +3846,6 @@ static void nvme_ns_remove(struct nvme_ns *ns)list_del_init (&ns->list);up_write (&ns->ctrl->namespaces_rwsem); -/* Synchronize with nvme_init_ns_head() */ -mutex_lock (&ns->head->subsys->lock); -if (list_empty (&ns->head->list)) { -list_del_init (&ns->head->entry); - last_path = true; - } -mutex_unlock (&ns->head->subsys->lock);if (last_path)nvme_mpath_shutdown_disk (ns->head);nvme_put_ns (ns);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 87/168 blkcg: fix memory leak in blk_iolatency_init
In reply to Greg Kroah-HartmanFrom: Yanfei Xu <[email protected]>
[ Upstream commit 6f5ddde41069fcd1f0993ec76c9dbbf9d021fd4d ]
BUG: memory leak
unreferenced object 0xffff888129acdb80 (size 96):
comm "syz-executor.1", pid 12661, jiffies 4294962682 (age 15.220s)
hex dump (first 32 bytes):
20 47 c9 85 ff ff ff ff 20 d4 8e 29 81 88 ff ff G...... ..)....
01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff82264ec8>] kmalloc include/linux/slab.h:591 [inline]
[<ffffffff82264ec8>] kzalloc include/linux/slab.h:721 [inline]
[<ffffffff82264ec8>] blk_iolatency_init+0x28/0x190 block/blk-iolatency.c:724
[<ffffffff8225b8c4>] blkcg_init_queue+0xb4/0x1c0 block/blk-cgroup.c:1185
[<ffffffff822253da>] blk_alloc_queue+0x22a/0x2e0 block/blk-core.c:566
[<ffffffff8223b175>] blk_mq_init_queue_data block/blk-mq.c:3100 [inline]
[<ffffffff8223b175>] __blk_mq_alloc_disk+0x25/0xd0 block/blk-mq.c:3124
[<ffffffff826a9303>] loop_add+0x1c3/0x360 drivers/block/loop.c:2344
[<ffffffff826a966e>] loop_control_get_free drivers/block/loop.c:2501 [inline]
[<ffffffff826a966e>] loop_control_ioctl+0x17e/0x2e0 drivers/block/loop.c:2516
[<ffffffff81597eec>] vfs_ioctl fs/ioctl.c:51 [inline]
[<ffffffff81597eec>] __do_sys_ioctl fs/ioctl.c:874 [inline]
[<ffffffff81597eec>] __se_sys_ioctl fs/ioctl.c:860 [inline]
[<ffffffff81597eec>] __x64_sys_ioctl+0xfc/0x140 fs/ioctl.c:860
[<ffffffff843fa745>] do_syscall_x64 arch/x86/entry/common.c:50 [inline]
[<ffffffff843fa745>] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
[<ffffffff84600068>] entry_SYSCALL_64_after_hwframe+0x44/0xaeOnce blk_throtl_init() queue init failed, blkcg_iolatency_exit() will not be invoked for cleanup. That leads a memory leak. Swap the blk_throtl_init() and blk_iolatency_init() calls can solve this.
--- block/blk-cgroup.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
block/blk-cgroup.c +6 -4
@@ -1201,10 +1201,6 @@ int blkcg_init_queue(struct request_queue *q)if (preloaded)radix_tree_preload_end (); - ret =blk_iolatency_init (q); -if (ret) - goto err_destroy_all; - ret =blk_ioprio_init (q);if (ret) goto err_destroy_all;
@@ -1213,6 +1209,12 @@ int blkcg_init_queue(struct request_queue *q)if (ret) goto err_destroy_all; + ret =blk_iolatency_init (q); +if (ret) { +blk_throtl_exit (q); + goto err_destroy_all; + } +return 0 ; err_destroy_all:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 88/168 net: dsa: flush switchdev workqueue before tearing down CPU/DSA ports
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit a57d8c217aadac75530b8e7ffb3a3e1b7bfd0330 ]
Sometimes when unbinding the mv88e6xxx driver on Turris MOX, these error messages appear:
mv88e6085 d0032004.mdio-mii:12: port 1 failed to delete be:79:b4:9e:9e:96 vid 1 from fdb: -2 mv88e6085 d0032004.mdio-mii:12: port 1 failed to delete be:79:b4:9e:9e:96 vid 0 from fdb: -2 mv88e6085 d0032004.mdio-mii:12: port 1 failed to delete d8:58:d7:00:ca:6d vid 100 from fdb: -2 mv88e6085 d0032004.mdio-mii:12: port 1 failed to delete d8:58:d7:00:ca:6d vid 1 from fdb: -2 mv88e6085 d0032004.mdio-mii:12: port 1 failed to delete d8:58:d7:00:ca:6d vid 0 from fdb: -2
(and similarly for other ports)
What happens is that DSA has a policy "even if there are bugs, let's at least not leak memory" and dsa_port_teardown() clears the dp->fdbs and dp->mdbs lists, which are supposed to be empty.
But deleting that cleanup code, the warnings go away.
=> the FDB and MDB lists (used for refcounting on shared ports, aka CPU and DSA ports) will eventually be empty, but are not empty by the time we tear down those ports. Aka we are deleting them too soon.
The addresses that DSA complains about are host-trapped addresses: the local addresses of the ports, and the MAC address of the bridge device.
The problem is that offloading those entries happens from a deferred work item scheduled by the SWITCHDEV_FDB_DEL_TO_DEVICE handler, and this races with the teardown of the CPU and DSA ports where the refcounting is kept.
In fact, not only it races, but fundamentally speaking, if we iterate through the port list linearly, we might end up tearing down the shared ports even before we delete a DSA user port which has a bridge upper.
So as it turns out, we need to first tear down the user ports (and the unused ones, for no better place of doing that), then the shared ports (the CPU and DSA ports). In between, we need to ensure that all work items scheduled by our switchdev handlers (which only run for user ports, hence the reason why we tear them down first) have finished.
--- include/net/dsa.h | 5 +++++ net/dsa/dsa.c | 5 +++++ net/dsa/dsa2.c | 46 +++++++++++++++++++++++++++++++--------------- net/dsa/dsa_priv.h | 1 + 4 files changed, 42 insertions(+), 15 deletions(-)
include/net/dsa.h +5 -0
@@ -437,6 +437,11 @@ static inline bool dsa_port_is_user(struct dsa_port *dp)return dp->type ==DSA_PORT_TYPE_USER ; } +static inline bool dsa_port_is_unused (struct dsa_port *dp) +{ +return dp->type ==DSA_PORT_TYPE_UNUSED ; +} +static inline bool dsa_is_unused_port (struct dsa_switch *ds,int p) {return dsa_to_port (ds, p)->type ==DSA_PORT_TYPE_UNUSED ;
net/dsa/dsa.c +5 -0
@@ -345,6 +345,11 @@ bool dsa_schedule_work(struct work_struct *work)return queue_work (dsa_owq, work); } +void dsa_flush_workqueue (void ) +{ +flush_workqueue (dsa_owq); +} +int dsa_devlink_param_get (struct devlink *dl,u32 id,struct devlink_param_gset_ctx *ctx) {
net/dsa/dsa2.c +31 -15
69 lines not on this page · raw message
net/dsa/dsa_priv.h +1 -0
@@ -158,6 +158,7 @@ void dsa_tag_driver_put(const struct dsa_device_ops *ops);const struct dsa_device_ops *dsa_find_tagger_by_name (const char *buf);bool dsa_schedule_work (struct work_struct *work); +void dsa_flush_workqueue (void );const char *dsa_tag_protocol_to_str (const struct dsa_device_ops *ops);static inline int dsa_tag_protocol_overhead (const struct dsa_device_ops *ops)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 89/168 mlxbf_gige: clear valid_polarity upon open
In reply to Greg Kroah-HartmanFrom: David Thompson <[email protected]>
[ Upstream commit ee8a9600b5391f434905c46bec7f77d34505083e ]
The network interface managed by the mlxbf_gige driver can get into a problem state where traffic does not flow.
In this state, the interface will be up and enabled, but will stop processing received packets. This problem state will happen if three specific conditions occur:
1) driver has received more than (N * RxRingSize) packets but less than (N+1 * RxRingSize) packets, where N is an odd number
Note: the command "ethtool -g <interface>" will display the current receive ring size, which currently defaults to 128
2) the driver's interface was disabled via "ifconfig oob_net0 down" during the window described in #1.
3) the driver's interface is re-enabled via "ifconfig oob_net0 up"
This patch ensures that the driver's "valid_polarity" field is cleared during the open() method so that it always matches the receive polarity used by hardware. Without this fix, the driver needs to be unloaded and reloaded to correct this problem state.
--- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +7 -0
@@ -142,6 +142,13 @@ static int mlxbf_gige_open(struct net_device *netdev) err =mlxbf_gige_clean_port (priv);if (err) goto free_irqs; + +/* Clear driver's valid_polarity to match hardware, +* since the above call to clean_port() resets the +* receive polarity used by hardware. +*/ + priv->valid_polarity =0 ; + err =mlxbf_gige_rx_init (priv);if (err) goto free_irqs;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 90/168 dt-bindings: mtd: gpmc: Fix the ECC bytes vs. OOB bytes equation
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 778cb8e39f6ec252be50fc3850d66f3dcbd5dd5a ]
"PAGESIZE / 512" is the number of ECC chunks.
"ECC_BYTES" is the number of bytes needed to store a single ECC code. "2" is the space reserved by the bad block marker.
"2 + (PAGESIZE / 512) * ECC_BYTES" should of course be lower or equal than the total number of OOB bytes, otherwise it won't fit.
Fix the equation by substituting s/>=/<=/.
--- Documentation/devicetree/bindings/mtd/gpmc-nand.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mtd/gpmc-nand.txt +1 -1
@@ -122,7 +122,7 @@ on various other factors also like; so the device should have enough free bytes available its OOB/Spare area to accommodate ECC for entire page. In general following expression helps in determining if given device can accommodate ECC syndrome: - "2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE" + "2 + (PAGESIZE / 512) * ECC_BYTES" <= OOBSIZE" where OOBSIZE number of bytes in OOB/spare area PAGESIZE number of bytes in main-area of device page
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 91/168 remoteproc: qcom: wcnss: Fix race with iris probe
In reply to Greg Kroah-HartmanFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 1fcef985c8bdd542c43da0d87bd9d51980c3859b ]
The remoteproc driver is split between the responsibilities of getting the SoC-internal ARM core up and running and the external RF (aka "Iris") part configured.
In order to satisfy the regulator framework's need of a struct device * to look up supplies this was implemented as two different drivers, using of_platform_populate() in the remoteproc part to probe the iris part.
Unfortunately it's possible that the iris part probe defers on yet not available regulators and an attempt to start the remoteproc will have to be rejected, until this has been resolved. But there's no useful mechanism of knowing when this would be.
Instead replace the of_platform_populate() and the iris probe with a function that rolls its own struct device, with the relevant of_node associated that is enough to acquire regulators and clocks specified in the DT node and that may propagate the EPROBE_DEFER back to the wcnss device's probe.
--- drivers/remoteproc/qcom_wcnss.c | 49 +++-------- drivers/remoteproc/qcom_wcnss.h | 4 +- drivers/remoteproc/qcom_wcnss_iris.c | 120 +++++++++++++++++---------- 3 files changed, 89 insertions(+), 84 deletions(-)
drivers/remoteproc/qcom_wcnss.c +12 -37
@@ -142,18 +142,6 @@ static const struct wcnss_data pronto_v2_data = { .num_vregs = 1, }; -void qcom_wcnss_assign_iris (struct qcom_wcnss *wcnss, -struct qcom_iris *iris, -bool use_48mhz_xo) -{ -mutex_lock (&wcnss->iris_lock); - - wcnss->iris = iris; - wcnss->use_48mhz_xo = use_48mhz_xo; - -mutex_unlock (&wcnss->iris_lock); -} -static int wcnss_load (struct rproc *rproc,const struct firmware *fw) {struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;
@@ -639,12 +627,20 @@ static int wcnss_probe(struct platform_device *pdev) goto detach_pds; } + wcnss->iris =qcom_iris_probe (&pdev->dev, &wcnss->use_48mhz_xo); +if (IS_ERR (wcnss->iris)) { + ret =PTR_ERR (wcnss->iris); + goto detach_pds; + } + ret =rproc_add (rproc);if (ret) - goto detach_pds; + goto remove_iris; -return of_platform_populate (pdev->dev.of_node,NULL ,NULL , &pdev->dev); +return 0 ; +remove_iris: +qcom_iris_remove (wcnss->iris); detach_pds:wcnss_release_pds (wcnss); free_rproc:
@@ -657,7 +653,7 @@ static int wcnss_remove(struct platform_device *pdev) {struct qcom_wcnss *wcnss =platform_get_drvdata (pdev); -of_platform_depopulate (&pdev->dev); +qcom_iris_remove (wcnss->iris);rproc_del (wcnss->rproc);
@@ -686,28 +682,7 @@ static struct platform_driver wcnss_driver = { }, }; -static int __init wcnss_init (void ) -{ -int ret; - - ret =platform_driver_register (&wcnss_driver); -if (ret) -return ret; - - ret =platform_driver_register (&qcom_iris_driver); -if (ret) -platform_driver_unregister (&wcnss_driver); - -return ret; -} -module_init (wcnss_init); - -static void __exit wcnss_exit(void) -{ -platform_driver_unregister (&qcom_iris_driver); -platform_driver_unregister (&wcnss_driver); -} -module_exit (wcnss_exit); +module_platform_driver (wcnss_driver);MODULE_DESCRIPTION ("Qualcomm Peripheral Image Loader for Wireless Subsystem" );MODULE_LICENSE ("GPL v2" );
drivers/remoteproc/qcom_wcnss.h +2 -2
@@ -17,9 +17,9 @@ struct wcnss_vreg_info { bool super_turbo; }; +struct qcom_iris *qcom_iris_probe (struct device *parent,bool *use_48mhz_xo); +void qcom_iris_remove (struct qcom_iris *iris);int qcom_iris_enable (struct qcom_iris *iris);void qcom_iris_disable (struct qcom_iris *iris); -void qcom_wcnss_assign_iris (struct qcom_wcnss *wcnss,struct qcom_iris *iris,bool use_48mhz_xo); -#endif
drivers/remoteproc/qcom_wcnss_iris.c +75 -45
166 lines not on this page · raw message
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 92/168 mfd: db8500-prcmu: Adjust map to reality
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit ec343111c056ec3847800302f6dbc57281f833fa ]
These are the actual frequencies reported by the PLL, so let's report these. The roundoffs are inappropriate, we should round to the frequency that the clock will later report.
Drop some whitespace at the same time.
--- drivers/mfd/db8500-prcmu.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/mfd/db8500-prcmu.c +6 -8
@@ -1622,22 +1622,20 @@ static long round_clock_rate(u8 clock, unsigned long rate) }static const unsigned long db8500_armss_freqs[] = { -200000000 , -400000000 , -800000000 , +199680000 , +399360000 , +798720000 ,998400000 };/* The DB8520 has slightly higher ARMSS max frequency */ static const unsigned long db8520_armss_freqs[] = { -200000000 , -400000000 , -800000000 , +199680000 , +399360000 , +798720000 ,1152000000 }; - -static long round_armss_rate (unsigned long rate) {unsigned long freq =0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 93/168 PCI: Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms
In reply to Greg Kroah-HartmanFrom: Wasim Khan <[email protected]>
[ Upstream commit d08c8b855140e9f5240b3ffd1b8b9d435675e281 ]
Root Ports in NXP LX2xx0 and LX2xx2, where each Root Port is a Root Complex with unique segment numbers, do provide isolation features to disable peer transactions and validate bus numbers in requests, but do not provide an actual PCIe ACS capability.
Add ACS quirks for NXP LX2xx0 A/C/E/N and LX2xx2 A/C/E/N platforms.
LX2xx0A : without security features + CAN-FD
LX2160A (0x8d81) - 16 cores
LX2120A (0x8da1) - 12 cores
LX2080A (0x8d83) - 8 coresLX2xx0C : security features + CAN-FD
LX2160C (0x8d80) - 16 cores
LX2120C (0x8da0) - 12 cores
LX2080C (0x8d82) - 8 coresLX2xx0E : security features + CAN
LX2160E (0x8d90) - 16 cores
LX2120E (0x8db0) - 12 cores
LX2080E (0x8d92) - 8 coresLX2xx0N : without security features + CAN
LX2160N (0x8d91) - 16 cores
LX2120N (0x8db1) - 12 cores
LX2080N (0x8d93) - 8 coresLX2xx2A : without security features + CAN-FD
LX2162A (0x8d89) - 16 cores
LX2122A (0x8da9) - 12 cores
LX2082A (0x8d8b) - 8 coresLX2xx2C : security features + CAN-FD
LX2162C (0x8d88) - 16 cores
LX2122C (0x8da8) - 12 cores
LX2082C (0x8d8a) - 8 coresLX2xx2E : security features + CAN
LX2162E (0x8d98) - 16 cores
LX2122E (0x8db8) - 12 cores
LX2082E (0x8d9a) - 8 coresLX2xx2N : without security features + CAN
LX2162N (0x8d99) - 16 cores
LX2122N (0x8db9) - 12 cores
LX2082N (0x8d9b) - 8 cores[bhelgaas: put PCI_VENDOR_ID_NXP definition next to PCI_VENDOR_ID_FREESCALE as a clue that they share the same Device ID namespace]
--- drivers/pci/quirks.c | 45 +++++++++++++++++++++++++++++++++++++++++ include/linux/pci_ids.h | 3 ++- 2 files changed, 47 insertions(+), 1 deletion(-)
drivers/pci/quirks.c +45 -0
@@ -4616,6 +4616,18 @@ static int pci_quirk_qcom_rp_acs(struct pci_dev *dev, u16 acs_flags) PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); } +/* +* Each of these NXP Root Ports is in a Root Complex with a unique segment +* number and does provide isolation features to disable peer transactions +* and validate bus numbers in requests, but does not provide an ACS +* capability. +*/ +static int pci_quirk_nxp_rp_acs (struct pci_dev *dev,u16 acs_flags) +{ +return pci_acs_ctrl_enabled (acs_flags, +PCI_ACS_SV |PCI_ACS_RR |PCI_ACS_CR |PCI_ACS_UF ); +} +static int pci_quirk_al_acs (struct pci_dev *dev,u16 acs_flags) {if (pci_pcie_type (dev) !=PCI_EXP_TYPE_ROOT_PORT )
@@ -4862,6 +4874,39 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_ZHAOXIN, 0x3038, pci_quirk_mf_endpoint_acs }, { PCI_VENDOR_ID_ZHAOXIN, 0x3104, pci_quirk_mf_endpoint_acs }, { PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs }, +/* NXP root ports, xx=16, 12, or 08 cores */ +/* LX2xx0A : without security features + CAN-FD */ + { PCI_VENDOR_ID_NXP, 0x8d81, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8da1, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d83, pci_quirk_nxp_rp_acs }, +/* LX2xx0C : security features + CAN-FD */ + { PCI_VENDOR_ID_NXP, 0x8d80, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8da0, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d82, pci_quirk_nxp_rp_acs }, +/* LX2xx0E : security features + CAN */ + { PCI_VENDOR_ID_NXP, 0x8d90, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8db0, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d92, pci_quirk_nxp_rp_acs }, +/* LX2xx0N : without security features + CAN */ + { PCI_VENDOR_ID_NXP, 0x8d91, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8db1, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d93, pci_quirk_nxp_rp_acs }, +/* LX2xx2A : without security features + CAN-FD */ + { PCI_VENDOR_ID_NXP, 0x8d89, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8da9, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d8b, pci_quirk_nxp_rp_acs }, +/* LX2xx2C : security features + CAN-FD */ + { PCI_VENDOR_ID_NXP, 0x8d88, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8da8, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d8a, pci_quirk_nxp_rp_acs }, +/* LX2xx2E : security features + CAN */ + { PCI_VENDOR_ID_NXP, 0x8d98, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8db8, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d9a, pci_quirk_nxp_rp_acs }, +/* LX2xx2N : without security features + CAN */ + { PCI_VENDOR_ID_NXP, 0x8d99, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8db9, pci_quirk_nxp_rp_acs }, + { PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs },/* Zhaoxin Root/Downstream Ports */ { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, { 0 }
include/linux/pci_ids.h +2 -1
@@ -2451,7 +2451,8 @@#define PCI_VENDOR_ID_TDI 0x192E#define PCI_DEVICE_ID_TDI_EHCI 0x0101 -#define PCI_VENDOR_ID_FREESCALE 0x1957 +#define PCI_VENDOR_ID_FREESCALE 0x1957/* duplicate: NXP */ +#define PCI_VENDOR_ID_NXP 0x1957/* duplicate: FREESCALE */ #define PCI_DEVICE_ID_MPC8308 0xc006#define PCI_DEVICE_ID_MPC8315E 0x00b4#define PCI_DEVICE_ID_MPC8315 0x00b5
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 94/168 fuse: fix use after free in fuse_read_interrupt()
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
[ Upstream commit e1e71c168813564be0f6ea3d6740a059ca42d177 ]
There is a potential race between fuse_read_interrupt() and fuse_request_end().
TASK1
in fuse_read_interrupt(): delete req->intr_entry (while holding fiq->lock)
TASK2
in fuse_request_end(): req->intr_entry is empty -> skip fiq->lock wake up TASK3
TASK3
request is freed
TASK1
in fuse_read_interrupt(): dereference req->in.h.unique ***BAM***
Fix by always grabbing fiq->lock if the request was ever interrupted (FR_INTERRUPTED set) thereby serializing with concurrent fuse_read_interrupt() calls.
FR_INTERRUPTED is set before the request is queued on fiq->interrupts. Dequeing the request is done with list_del_init() but FR_INTERRUPTED is not cleared in this case.
--- fs/fuse/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/fuse/dev.c +2 -2
@@ -288,10 +288,10 @@ void fuse_request_end(struct fuse_req *req)/* * test_and_set_bit() implies smp_mb() between bit -* changing and below intr_entry check. Pairs with +* changing and below FR_INTERRUPTED check. Pairs with * smp_mb() from queue_interrupt(). */ -if (!list_empty (&req->intr_entry)) { +if (test_bit (FR_INTERRUPTED , &req->flags)) {spin_lock (&fiq->lock);list_del_init (&req->intr_entry);spin_unlock (&fiq->lock);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 95/168 PCI: tegra194: Fix handling BME_CHGED event
In reply to Greg Kroah-HartmanFrom: Om Prakash Singh <[email protected]>
[ Upstream commit ceb1412c1c8ca5b28c4252bdb15f2f1f17b4a1b0 ]
In tegra_pcie_ep_hard_irq(), APPL_INTR_STATUS_L0 is stored in val and again APPL_INTR_STATUS_L1_0_0 is also stored in val. So when execution reaches "if (val & APPL_INTR_STATUS_L0_PCI_CMD_EN_INT)", val is not correct.
--- drivers/pci/controller/dwc/pcie-tegra194.c | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/pci/controller/dwc/pcie-tegra194.c +15 -15
@@ -497,19 +497,19 @@ static irqreturn_t tegra_pcie_ep_hard_irq(int irq, void *arg)struct tegra_pcie_dw *pcie = arg;struct dw_pcie_ep *ep = &pcie->pci.ep;int spurious =1 ; -u32 val, tmp; +u32 status_l0, status_l1, link_status; - val =appl_readl (pcie,APPL_INTR_STATUS_L0 ); -if (val &APPL_INTR_STATUS_L0_LINK_STATE_INT ) { - val =appl_readl (pcie,APPL_INTR_STATUS_L1_0_0 ); -appl_writel (pcie, val,APPL_INTR_STATUS_L1_0_0 ); + status_l0 =appl_readl (pcie,APPL_INTR_STATUS_L0 ); +if (status_l0 &APPL_INTR_STATUS_L0_LINK_STATE_INT ) { + status_l1 =appl_readl (pcie,APPL_INTR_STATUS_L1_0_0 ); +appl_writel (pcie, status_l1,APPL_INTR_STATUS_L1_0_0 ); -if (val &APPL_INTR_STATUS_L1_0_0_HOT_RESET_DONE ) +if (status_l1 &APPL_INTR_STATUS_L1_0_0_HOT_RESET_DONE )pex_ep_event_hot_rst_done (pcie); -if (val &APPL_INTR_STATUS_L1_0_0_RDLH_LINK_UP_CHGED ) { - tmp =appl_readl (pcie,APPL_LINK_STATUS ); -if (tmp &APPL_LINK_STATUS_RDLH_LINK_UP ) { +if (status_l1 &APPL_INTR_STATUS_L1_0_0_RDLH_LINK_UP_CHGED ) { + link_status =appl_readl (pcie,APPL_LINK_STATUS ); +if (link_status &APPL_LINK_STATUS_RDLH_LINK_UP ) {dev_dbg (pcie->dev,"Link is up with Host\n" );dw_pcie_ep_linkup (ep); }
@@ -518,11 +518,11 @@ static irqreturn_t tegra_pcie_ep_hard_irq(int irq, void *arg) spurious =0 ; } -if (val &APPL_INTR_STATUS_L0_PCI_CMD_EN_INT ) { - val =appl_readl (pcie,APPL_INTR_STATUS_L1_15 ); -appl_writel (pcie, val,APPL_INTR_STATUS_L1_15 ); +if (status_l0 &APPL_INTR_STATUS_L0_PCI_CMD_EN_INT ) { + status_l1 =appl_readl (pcie,APPL_INTR_STATUS_L1_15 ); +appl_writel (pcie, status_l1,APPL_INTR_STATUS_L1_15 ); -if (val &APPL_INTR_STATUS_L1_15_CFG_BME_CHGED ) +if (status_l1 &APPL_INTR_STATUS_L1_15_CFG_BME_CHGED )return IRQ_WAKE_THREAD ; spurious =0 ;
@@ -530,8 +530,8 @@ static irqreturn_t tegra_pcie_ep_hard_irq(int irq, void *arg)if (spurious) {dev_warn (pcie->dev,"Random interrupt (STATUS = 0x%08X)\n" , - val); -appl_writel (pcie, val,APPL_INTR_STATUS_L0 ); + status_l0); +appl_writel (pcie, status_l0,APPL_INTR_STATUS_L0 ); }return IRQ_HANDLED ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 96/168 PCI: tegra194: Fix MSI-X programming
In reply to Greg Kroah-HartmanFrom: Om Prakash Singh <[email protected]>
[ Upstream commit 43537cf7e351264a1f05ed42ad402942bfc9140e ]
Lower order MSI-X address is programmed in MSIX_ADDR_MATCH_HIGH_OFF DBI register instead of higher order address. This patch fixes this programming mistake.
--- drivers/pci/controller/dwc/pcie-tegra194.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-tegra194.c +1 -1
@@ -1763,7 +1763,7 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie) val = (ep->msi_mem_phys &MSIX_ADDR_MATCH_LOW_OFF_MASK ); val |=MSIX_ADDR_MATCH_LOW_OFF_EN ;dw_pcie_writel_dbi (pci,MSIX_ADDR_MATCH_LOW_OFF , val); - val = (lower_32_bits (ep->msi_mem_phys) &MSIX_ADDR_MATCH_HIGH_OFF_MASK ); + val = (upper_32_bits (ep->msi_mem_phys) &MSIX_ADDR_MATCH_HIGH_OFF_MASK );dw_pcie_writel_dbi (pci,MSIX_ADDR_MATCH_HIGH_OFF , val); ret =dw_pcie_ep_init_complete (ep);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 97/168 PCI: tegra: Fix OF node reference leak
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit eff21f5da308265678e7e59821795e606f3e560f ]
Commit 9e38e690ace3 ("PCI: tegra: Fix OF node reference leak") has fixed some node reference leaks in this function but missed some of them.
In fact, having 'port' referenced in the 'rp' structure is not enough to prevent the leak, until 'rp' is actually added in the 'pcie->ports' list.
Add the missing 'goto err_node_put' accordingly.
--- drivers/pci/controller/pci-tegra.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/pci/controller/pci-tegra.c +8 -5
@@ -2193,13 +2193,15 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie) rp->np = port; rp->base =devm_pci_remap_cfg_resource (dev, &rp->regs); -if (IS_ERR (rp->base)) -return PTR_ERR (rp->base); +if (IS_ERR (rp->base)) { + err =PTR_ERR (rp->base); + goto err_node_put; + } label =devm_kasprintf (dev,GFP_KERNEL ,"pex-reset-%u" , index);if (!label) { -dev_err (dev,"failed to create reset GPIO label\n" ); -return -ENOMEM ; + err = -ENOMEM ; + goto err_node_put; }/*
@@ -2217,7 +2219,8 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie) }else {dev_err (dev,"failed to get reset GPIO: %ld\n" ,PTR_ERR (rp->reset_gpio)); -return PTR_ERR (rp->reset_gpio); + err =PTR_ERR (rp->reset_gpio); + goto err_node_put; } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 98/168 mfd: Dont use irq_create_mapping() to resolve a mapping
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 9ff80e2de36d0554e3a6da18a171719fe8663c17 ]
Although irq_create_mapping() is able to deal with duplicate mappings, it really isn't supposed to be a substitute for irq_find_mapping(), and can result in allocations that take place in atomic context if the mapping didn't exist.
Fix the handful of MFD drivers that use irq_create_mapping() in interrupt context by using irq_find_mapping() instead.
--- drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/stmpe.c | 4 ++-- drivers/mfd/tc3589x.c | 2 +- drivers/mfd/wm8994-irq.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/ab8500-core.c +1 -1
@@ -485,7 +485,7 @@ static int ab8500_handle_hierarchical_line(struct ab8500 *ab8500,if (line ==AB8540_INT_GPIO43F || line ==AB8540_INT_GPIO44F ) line +=1 ; -handle_nested_irq (irq_create_mapping (ab8500->domain, line)); +handle_nested_irq (irq_find_mapping (ab8500->domain, line)); }return 0 ;
drivers/mfd/stmpe.c +2 -2
@@ -1095,7 +1095,7 @@ static irqreturn_t stmpe_irq(int irq, void *data)if (variant->id_val ==STMPE801_ID || variant->id_val ==STMPE1600_ID ) { -int base =irq_create_mapping (stmpe->domain,0 ); +int base =irq_find_mapping (stmpe->domain,0 );handle_nested_irq (base);return IRQ_HANDLED ;
@@ -1123,7 +1123,7 @@ static irqreturn_t stmpe_irq(int irq, void *data)while (status) {int bit =__ffs (status);int line = bank *8 + bit; -int nestedirq =irq_create_mapping (stmpe->domain, line); +int nestedirq =irq_find_mapping (stmpe->domain, line);handle_nested_irq (nestedirq); status &= ~(1 << bit);
drivers/mfd/tc3589x.c +1 -1
@@ -187,7 +187,7 @@ again:while (status) {int bit =__ffs (status); -int virq =irq_create_mapping (tc3589x->domain, bit); +int virq =irq_find_mapping (tc3589x->domain, bit);handle_nested_irq (virq); status &= ~(1 << bit);
drivers/mfd/wm8994-irq.c +1 -1
@@ -154,7 +154,7 @@ static irqreturn_t wm8994_edge_irq(int irq, void *data)struct wm8994 *wm8994 = data;while (gpio_get_value_cansleep (wm8994->pdata.irq_gpio)) -handle_nested_irq (irq_create_mapping (wm8994->edge_irq,0 )); +handle_nested_irq (irq_find_mapping (wm8994->edge_irq,0 ));return IRQ_HANDLED ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 99/168 PCI: rcar: Fix runtime PM imbalance in rcar_pcie_ep_probe()
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 1e29cd9983eba1b596bc07f94d81d728007f8a25 ]
pm_runtime_get_sync() will increase the runtime PM counter even it returns an error. Thus a pairing decrement is needed to prevent refcount leak. Fix this by replacing this API with pm_runtime_resume_and_get(), which will not change the runtime PM counter on error.
--- drivers/pci/controller/pcie-rcar-ep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-rcar-ep.c +2 -2
@@ -492,9 +492,9 @@ static int rcar_pcie_ep_probe(struct platform_device *pdev) pcie->dev = dev;pm_runtime_enable (dev); - err =pm_runtime_get_sync (dev); + err =pm_runtime_resume_and_get (dev);if (err <0 ) { -dev_err (dev,"pm_runtime_get_sync failed\n" ); +dev_err (dev,"pm_runtime_resume_and_get failed\n" ); goto err_pm_disable; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 100/168 riscv: fix the global name pfn_base confliction error
In reply to Greg Kroah-HartmanFrom: Kenneth Lee <[email protected]>
[ Upstream commit fb31f0a499332a053477ed57312b214e42476e6d ]
RISCV uses a global variable pfn_base for page/pfn translation. But this is a common name and will be used elsewhere. In those cases, the page-pfn macros which refer to this name will be referred to the local/input variable instead. (such as in vfio_pin_pages_remote). This make everything wrong.
This patch changes the name from pfn_base to riscv_pfn_base to fix this problem.
--- arch/riscv/include/asm/page.h | 4 ++-- arch/riscv/mm/init.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/riscv/include/asm/page.h +2 -2
@@ -79,8 +79,8 @@ typedef struct page *pgtable_t;#endif #ifdef CONFIG_MMU -extern unsigned long pfn_base; -#define ARCH_PFN_OFFSET (pfn_base) +extern unsigned long riscv_pfn_base; +#define ARCH_PFN_OFFSET (riscv_pfn_base)#else #define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT)#endif /* CONFIG_MMU */
arch/riscv/mm/init.c +3 -3
@@ -234,8 +234,8 @@ static struct pt_alloc_ops _pt_ops __initdata;#define pt_ops _pt_ops#endif -unsigned long pfn_base__ro_after_init ; -EXPORT_SYMBOL (pfn_base); +unsigned long riscv_pfn_base__ro_after_init ; +EXPORT_SYMBOL (riscv_pfn_base); pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
@@ -579,7 +579,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) kernel_map.va_kernel_pa_offset = kernel_map.virt_addr - kernel_map.phys_addr;#endif - pfn_base =PFN_DOWN (kernel_map.phys_addr); + riscv_pfn_base =PFN_DOWN (kernel_map.phys_addr);/* * Enforce boot alignment requirements of RV32 and
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 101/168 KVM: arm64: Make hyp_panic() more robust when protected mode is enabled
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
[ Upstream commit ccac96977243d7916053550f62e6489760ad0adc ]
When protected mode is enabled, the host is unable to access most parts of the EL2 hypervisor image, including 'hyp_physvirt_offset' and the contents of the hypervisor's '.rodata.str' section. Unfortunately, nvhe_hyp_panic_handler() tries to read from both of these locations when handling a BUG() triggered at EL2; the former for converting the ELR to a physical address and the latter for displaying the name of the source file where the BUG() occurred.
Hack the EL2 panic asm to pass both physical and virtual ELR values to the host and utilise the newly introduced CONFIG_NVHE_EL2_DEBUG so that we disable stage-2 protection for the host before returning to the EL1 panic handler. If the debug option is not enabled, display the address instead of the source file:line information.
--- arch/arm64/kvm/handle_exit.c | 23 ++++++++++++++--------- arch/arm64/kvm/hyp/nvhe/host.S | 21 +++++++++++++++++---- 2 files changed, 31 insertions(+), 13 deletions(-)
arch/arm64/kvm/handle_exit.c +14 -9
@@ -292,11 +292,12 @@ void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index)kvm_handle_guest_serror (vcpu,kvm_vcpu_get_esr (vcpu)); } -void __noreturn __cold nvhe_hyp_panic_handler (u64 esr,u64 spsr,u64 elr, +void __noreturn __cold nvhe_hyp_panic_handler (u64 esr,u64 spsr, +u64 elr_virt,u64 elr_phys,u64 par,uintptr_t vcpu,u64 far,u64 hpfar) { -u64 elr_in_kimg =__phys_to_kimg (__hyp_pa (elr)); -u64 hyp_offset = elr_in_kimg -kaslr_offset () - elr; +u64 elr_in_kimg =__phys_to_kimg (elr_phys); +u64 hyp_offset = elr_in_kimg -kaslr_offset () - elr_virt;u64 mode = spsr &PSR_MODE_MASK ;/*
@@ -309,20 +310,24 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, u64 elr,kvm_err ("Invalid host exception to nVHE hyp!\n" ); }else if (ESR_ELx_EC (esr) == ESR_ELx_EC_BRK64 && (esr & ESR_ELx_BRK64_ISS_COMMENT_MASK) ==BUG_BRK_IMM ) { -struct bug_entry *bug =find_bug (elr_in_kimg);const char *file =NULL ;unsigned int line =0 ;/* All hyp bugs, including warnings, are treated as fatal. */ -if (bug) -bug_get_file_line (bug, &file, &line); +if (!is_protected_kvm_enabled () || +IS_ENABLED (CONFIG_NVHE_EL2_DEBUG )) { +struct bug_entry *bug =find_bug (elr_in_kimg); + +if (bug) +bug_get_file_line (bug, &file, &line); + }if (file)kvm_err ("nVHE hyp BUG at: %s:%u!\n" , file, line);else -kvm_err ("nVHE hyp BUG at: %016llx!\n" , elr + hyp_offset); +kvm_err ("nVHE hyp BUG at: %016llx!\n" , elr_virt + hyp_offset); }else { -kvm_err ("nVHE hyp panic at: %016llx!\n" , elr + hyp_offset); +kvm_err ("nVHE hyp panic at: %016llx!\n" , elr_virt + hyp_offset); }/*
@@ -334,5 +339,5 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, u64 elr,kvm_err ("Hyp Offset: 0x%llx\n" , hyp_offset);panic ("HYP panic:\nPS:%08llx PC:%016llx ESR:%08llx\nFAR:%016llx HPFAR:%016llx PAR:%016llx\nVCPU:%016lx\n" , - spsr, elr, esr, far, hpfar, par, vcpu); + spsr, elr_virt, esr, far, hpfar, par, vcpu); }
arch/arm64/kvm/hyp/nvhe/host.S +17 -4
@@ -7,6 +7,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> +#include <asm/kvm_arm.h> #include <asm/kvm_asm.h> #include <asm/kvm_mmu.h>
@@ -85,12 +86,24 @@ SYM_FUNC_START(__hyp_do_panic) mov x29, x0 +#ifdef CONFIG_NVHE_EL2_DEBUG + /* Ensure host stage-2 is disabled */ + mrs x0, hcr_el2 + bic x0, x0, #HCR_VM + msr hcr_el2, x0 + isb + tlbi vmalls12e1 + dsb nsh +#endif + /* Load the panic arguments into x0-7 */ mrs x0, esr_el2 - get_vcpu_ptr x4, x5 - mrs x5, far_el2 - mrs x6, hpfar_el2 - mov x7, xzr // Unused argument + mov x4, x3 + mov x3, x2 + hyp_pa x3, x6 + get_vcpu_ptr x5, x6 + mrs x6, far_el2 + mrs x7, hpfar_el2 /* Enter the host, conditionally restoring the host context. */ cbz x29, __host_enter_without_restoring
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 102/168 tracing/probes: Reject events which have the same name of existing one
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 8e242060c6a4947e8ae7d29794af6a581db08841 ]
Since kprobe_events and uprobe_events only check whether the other same-type probe event has the same name or not, if the user gives the same name of the existing tracepoint event (or the other type of probe events), it silently fails to create the tracefs entry (but registered.) as below.
/sys/kernel/tracing # ls events/task/task_rename
enable filter format hist id trigger/sys/kernel/tracing # echo p:task/task_rename vfs_read >> kprobe_events
[ 113.048508] Could not create tracefs 'task_rename' directory
/sys/kernel/tracing # cat kprobe_events
p:task/task_rename vfs_read
To fix this issue, check whether the existing events have the same name or not in trace_probe_register_event_call(). If exists, it rejects to register the new event.
--- kernel/trace/trace_kprobe.c | 6 +++++- kernel/trace/trace_probe.c | 25 +++++++++++++++++++++++++ kernel/trace/trace_probe.h | 1 + kernel/trace/trace_uprobe.c | 6 +++++- 4 files changed, 36 insertions(+), 2 deletions(-)
kernel/trace/trace_kprobe.c +5 -1
@@ -647,7 +647,11 @@ static int register_trace_kprobe(struct trace_kprobe *tk)/* Register new event */ ret =register_kprobe_event (tk);if (ret) { -pr_warn ("Failed to register probe event(%d)\n" , ret); +if (ret == -EEXIST ) { +trace_probe_log_set_index (0 ); +trace_probe_log_err (0 ,EVENT_EXIST ); + }else +pr_warn ("Failed to register probe event(%d)\n" , ret); goto end; }
kernel/trace/trace_probe.c +25 -0
@@ -1029,11 +1029,36 @@ error:return ret; } +static struct trace_event_call * +find_trace_event_call (const char *system,const char *event_name) +{ +struct trace_event_call *tp_event; +const char *name; + +list_for_each_entry (tp_event, &ftrace_events, list) { +if (!tp_event->class->system || +strcmp (system, tp_event->class->system)) +continue ; + name =trace_event_name (tp_event); +if (!name ||strcmp (event_name, name)) +continue ; +return tp_event; + } + +return NULL ; +} +int trace_probe_register_event_call (struct trace_probe *tp) {struct trace_event_call *call =trace_probe_event_call (tp);int ret; +lockdep_assert_held (&event_mutex); + +if (find_trace_event_call (trace_probe_group_name (tp), +trace_probe_name (tp))) +return -EEXIST ; + ret =register_trace_event (&call->event);if (!ret)return -ENODEV ;
kernel/trace/trace_probe.h +1 -0
@@ -399,6 +399,7 @@ extern int traceprobe_define_arg_fields(struct trace_event_call *event_call,C (NO_EVENT_NAME ,"Event name is not specified" ), \C (EVENT_TOO_LONG ,"Event name is too long" ), \C (BAD_EVENT_NAME ,"Event name must follow the same rules as C identifiers" ), \ +C (EVENT_EXIST ,"Given group/event name is already used by another event" ), \C (RETVAL_ON_PROBE ,"$retval is not available on probe" ), \C (BAD_STACK_NUM ,"Invalid stack number" ), \ C(BAD_ARG_NUM, "Invalid argument number"), \
kernel/trace/trace_uprobe.c +5 -1
@@ -514,7 +514,11 @@ static int register_trace_uprobe(struct trace_uprobe *tu) ret =register_uprobe_event (tu);if (ret) { -pr_warn ("Failed to register probe event(%d)\n" , ret); +if (ret == -EEXIST ) { +trace_probe_log_set_index (0 ); +trace_probe_log_err (0 ,EVENT_EXIST ); + }else +pr_warn ("Failed to register probe event(%d)\n" , ret); goto end; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 103/168 PCI: cadence: Use bitfield for *quirk_retrain_flag* instead of bool
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit f4455748b2126a9ba2bcc9cfb2fbcaa08de29bb2 ]
No functional change. As we are intending to add additional 1-bit members in struct j721e_pcie_data/struct cdns_pcie_rc, use bitfields instead of bool since it takes less space. As discussed in [1], the preference is to use bitfileds instead of bool inside structures.
--- drivers/pci/controller/cadence/pci-j721e.c | 2 +- drivers/pci/controller/cadence/pcie-cadence.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/pci/controller/cadence/pci-j721e.c +1 -1
@@ -66,7 +66,7 @@ enum j721e_pcie_mode {struct j721e_pcie_data {enum j721e_pcie_mode mode; -bool quirk_retrain_flag; +unsigned int quirk_retrain_flag:1 ; };static inline u32 j721e_pcie_user_readl (struct j721e_pcie *pcie,u32 offset)
drivers/pci/controller/cadence/pcie-cadence.h +1 -1
@@ -303,7 +303,7 @@ struct cdns_pcie_rc {u32 vendor_id;u32 device_id;bool avail_ib_bar[CDNS_PCIE_RP_MAX_IB ]; -bool quirk_retrain_flag; + unsigned int quirk_retrain_flag:1; };/**
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 104/168 PCI: cadence: Add quirk flag to set minimum delay in LTSSM Detect.Quiet state
In reply to Greg Kroah-HartmanFrom: Nadeem Athani <[email protected]>
[ Upstream commit 09c24094b2e3a15ef3fc44f54a191b3db522fb11 ]
PCIe fails to link up if SERDES lanes not used by PCIe are assigned to another protocol. For example, link training fails if lanes 2 and 3 are assigned to another protocol while lanes 0 and 1 are used for PCIe to form a two lane link. This failure is due to an incorrect tie-off on an internal status signal indicating electrical idle.
Status signals going from SERDES to PCIe Controller are tied-off when a lane is not assigned to PCIe. Signal indicating electrical idle is incorrectly tied-off to a state that indicates non-idle. As a result, PCIe sees unused lanes to be out of electrical idle and this causes LTSSM to exit Detect.Quiet state without waiting for 12ms timeout to occur. If a receiver is not detected on the first receiver detection attempt in Detect.Active state, LTSSM goes back to Detect.Quiet and again moves forward to Detect.Active state without waiting for 12ms as required by PCIe base specification. Since wait time in Detect.Quiet is skipped, multiple receiver detect operations are performed back-to-back without allowing time for capacitance on the transmit lines to discharge. This causes subsequent receiver detection to always fail even if a receiver gets connected eventually.
Add a quirk flag "quirk_detect_quiet_flag" to program the minimum time the LTSSM should wait on entering Detect.Quiet state here. This has to be set for J7200 as it has an incorrect tie-off on unused lanes.
--- drivers/pci/controller/cadence/pcie-cadence-ep.c | 4 ++++ .../pci/controller/cadence/pcie-cadence-host.c | 3 +++ drivers/pci/controller/cadence/pcie-cadence.c | 16 ++++++++++++++++ drivers/pci/controller/cadence/pcie-cadence.h | 15 +++++++++++++++ 4 files changed, 38 insertions(+)
drivers/pci/controller/cadence/pcie-cadence-ep.c +4 -0
@@ -623,6 +623,10 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) ep->irq_pci_addr =CDNS_PCIE_EP_IRQ_PCI_ADDR_NONE ;/* Reserve region 0 for IRQs */ set_bit (0 , &ep->ob_region_map); + +if (ep->quirk_detect_quiet_flag) +cdns_pcie_detect_quiet_min_delay_set (&ep->pcie); +spin_lock_init (&ep->lock);return 0 ;
drivers/pci/controller/cadence/pcie-cadence-host.c +3 -0
@@ -498,6 +498,9 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc)return PTR_ERR (rc->cfg_base); rc->cfg_res = res; +if (rc->quirk_detect_quiet_flag) +cdns_pcie_detect_quiet_min_delay_set (&rc->pcie); + ret =cdns_pcie_start_link (pcie);if (ret) {dev_err (dev,"Failed to start link\n" );
drivers/pci/controller/cadence/pcie-cadence.c +16 -0
@@ -7,6 +7,22 @@#include "pcie-cadence.h" +void cdns_pcie_detect_quiet_min_delay_set (struct cdns_pcie *pcie) +{ +u32 delay =0x3 ; +u32 ltssm_control_cap; + +/* +* Set the LTSSM Detect Quiet state min. delay to 2ms. +*/ + ltssm_control_cap =cdns_pcie_readl (pcie,CDNS_PCIE_LTSSM_CONTROL_CAP ); + ltssm_control_cap = ((ltssm_control_cap & + ~CDNS_PCIE_DETECT_QUIET_MIN_DELAY_MASK ) | +CDNS_PCIE_DETECT_QUIET_MIN_DELAY (delay)); + +cdns_pcie_writel (pcie,CDNS_PCIE_LTSSM_CONTROL_CAP , ltssm_control_cap); +} +void cdns_pcie_set_outbound_region (struct cdns_pcie *pcie,u8 busnr,u8 fn,u32 r,bool is_io,u64 cpu_addr,u64 pci_addr,size_t size)
drivers/pci/controller/cadence/pcie-cadence.h +15 -0
@@ -189,6 +189,14 @@/* AXI link down register */ #define CDNS_PCIE_AT_LINKDOWN (CDNS_PCIE_AT_BASE + 0x0824) +/* LTSSM Capabilities register */ +#define CDNS_PCIE_LTSSM_CONTROL_CAP (CDNS_PCIE_LM_BASE + 0x0054) +#define CDNS_PCIE_DETECT_QUIET_MIN_DELAY_MASK GENMASK(2, 1) +#define CDNS_PCIE_DETECT_QUIET_MIN_DELAY_SHIFT 1 +#define CDNS_PCIE_DETECT_QUIET_MIN_DELAY (delay) \ + (((delay) << CDNS_PCIE_DETECT_QUIET_MIN_DELAY_SHIFT) & \ + CDNS_PCIE_DETECT_QUIET_MIN_DELAY_MASK) +enum cdns_pcie_rp_bar {RP_BAR_UNDEFINED =-1 ,RP_BAR0 ,
@@ -295,6 +303,7 @@ struct cdns_pcie {* @avail_ib_bar: Satus of RP_BAR0, RP_BAR1 and RP_NO_BAR if it's free or * available * @quirk_retrain_flag: Retrain link as quirk for PCIe Gen2 +* @quirk_detect_quiet_flag: LTSSM Detect Quiet min delay set as quirk */ struct cdns_pcie_rc {struct cdns_pcie pcie;
@@ -304,6 +313,7 @@ struct cdns_pcie_rc {u32 device_id;bool avail_ib_bar[CDNS_PCIE_RP_MAX_IB ]; unsigned int quirk_retrain_flag:1; + unsigned int quirk_detect_quiet_flag:1; };/**
@@ -334,6 +344,7 @@ struct cdns_pcie_epf {* registers fields (RMW) accessible by both remote RC and EP to * minimize time between read and write * @epf: Structure to hold info about endpoint function +* @quirk_detect_quiet_flag: LTSSM Detect Quiet min delay set as quirk */ struct cdns_pcie_ep {struct cdns_pcie pcie;
@@ -348,6 +359,7 @@ struct cdns_pcie_ep {/* protect writing to PCI_STATUS while raising legacy interrupts */ spinlock_t lock;struct cdns_pcie_epf *epf; + unsigned int quirk_detect_quiet_flag:1; };
@@ -508,6 +520,9 @@ static inline int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) return 0; }#endif + +void cdns_pcie_detect_quiet_min_delay_set (struct cdns_pcie *pcie); +void cdns_pcie_set_outbound_region (struct cdns_pcie *pcie,u8 busnr,u8 fn,u32 r,bool is_io,u64 cpu_addr,u64 pci_addr,size_t size);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 105/168 PCI: j721e: Add PCIe support for J7200
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit f1de58802f0fff364cf49f5e47d1be744baa434f ]
J7200 has the same PCIe IP as in J721E with minor changes in the wrapper. J7200 allows byte access of bridge configuration space registers and the register field for LINK_DOWN interrupt is different. J7200 also requires "quirk_detect_quiet_flag" to be set. Configure these changes as part of driver data applicable only to J7200.
--- drivers/pci/controller/cadence/pci-j721e.c | 40 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-)
drivers/pci/controller/cadence/pci-j721e.c +36 -4
@@ -27,6 +27,7 @@#define STATUS_REG_SYS_2 0x508#define STATUS_CLR_REG_SYS_2 0x708#define LINK_DOWN BIT(1) +#define J7200_LINK_DOWN BIT(10)#define J721E_PCIE_USER_CMD_STATUS 0x4#define LINK_TRAINING_ENABLE BIT(0)
@@ -57,6 +58,7 @@ struct j721e_pcie {struct cdns_pcie *cdns_pcie;void __iomem *user_cfg_base;void __iomem *intd_cfg_base; +u32 linkdown_irq_regfield; };enum j721e_pcie_mode {
@@ -67,6 +69,9 @@ enum j721e_pcie_mode {struct j721e_pcie_data {enum j721e_pcie_mode mode;unsigned int quirk_retrain_flag:1 ; +unsigned int quirk_detect_quiet_flag:1 ; +u32 linkdown_irq_regfield; +unsigned int byte_access_allowed:1 ; };static inline u32 j721e_pcie_user_readl (struct j721e_pcie *pcie,u32 offset)
@@ -98,12 +103,12 @@ static irqreturn_t j721e_pcie_link_irq_handler(int irq, void *priv)u32 reg; reg =j721e_pcie_intd_readl (pcie,STATUS_REG_SYS_2 ); -if (!(reg &LINK_DOWN )) +if (!(reg & pcie->linkdown_irq_regfield))return IRQ_NONE ;dev_err (dev,"LINK DOWN!\n" ); -j721e_pcie_intd_writel (pcie,STATUS_CLR_REG_SYS_2 ,LINK_DOWN ); +j721e_pcie_intd_writel (pcie,STATUS_CLR_REG_SYS_2 , pcie->linkdown_irq_regfield);return IRQ_HANDLED ; }
@@ -112,7 +117,7 @@ static void j721e_pcie_config_link_irq(struct j721e_pcie *pcie)u32 reg; reg =j721e_pcie_intd_readl (pcie,ENABLE_REG_SYS_2 ); - reg |=LINK_DOWN ; + reg |= pcie->linkdown_irq_regfield;j721e_pcie_intd_writel (pcie,ENABLE_REG_SYS_2 , reg); }
@@ -284,10 +289,25 @@ static struct pci_ops cdns_ti_pcie_host_ops = {static const struct j721e_pcie_data j721e_pcie_rc_data = { .mode =PCI_MODE_RC , .quirk_retrain_flag = true, + .byte_access_allowed = false, + .linkdown_irq_regfield =LINK_DOWN , };static const struct j721e_pcie_data j721e_pcie_ep_data = { .mode =PCI_MODE_EP , + .linkdown_irq_regfield =LINK_DOWN , +}; + +static const struct j721e_pcie_data j7200_pcie_rc_data = { + .mode =PCI_MODE_RC , + .quirk_detect_quiet_flag = true, + .linkdown_irq_regfield =J7200_LINK_DOWN , + .byte_access_allowed = true, +}; + +static const struct j721e_pcie_data j7200_pcie_ep_data = { + .mode =PCI_MODE_EP , + .quirk_detect_quiet_flag = true, };static const struct of_device_id of_j721e_pcie_match[] = {
@@ -299,6 +319,14 @@ static const struct of_device_id of_j721e_pcie_match[] = { .compatible = "ti,j721e-pcie-ep", .data = &j721e_pcie_ep_data, }, + { + .compatible = "ti,j7200-pcie-host", + .data = &j7200_pcie_rc_data, + }, + { + .compatible = "ti,j7200-pcie-ep", + .data = &j7200_pcie_ep_data, + }, {}, };
@@ -332,6 +360,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) pcie->dev = dev; pcie->mode = mode; + pcie->linkdown_irq_regfield = data->linkdown_irq_regfield; base =devm_platform_ioremap_resource_byname (pdev,"intd_cfg" );if (IS_ERR (base))
@@ -391,9 +420,11 @@ static int j721e_pcie_probe(struct platform_device *pdev) goto err_get_sync; } - bridge->ops = &cdns_ti_pcie_host_ops; +if (!data->byte_access_allowed) + bridge->ops = &cdns_ti_pcie_host_ops; rc =pci_host_bridge_priv (bridge); rc->quirk_retrain_flag = data->quirk_retrain_flag; + rc->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag; cdns_pcie = &rc->pcie; cdns_pcie->dev = dev;
@@ -459,6 +490,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) ret = -ENOMEM ; goto err_get_sync; } + ep->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag; cdns_pcie = &ep->pcie; cdns_pcie->dev = dev;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 106/168 PCI: j721e: Add PCIe support for AM64
In reply to Greg Kroah-HartmanFrom: Kishon Vijay Abraham I <[email protected]>
[ Upstream commit c8a375a8e15ac31293d7fda08008d6da8f5df3db ]
AM64 has the same PCIe IP as in J7200 with certain erratas not applicable (quirk_detect_quiet_flag). Add support for "ti,am64-pcie-host" compatible and "ti,am64-pcie-ep" compatible that is specific to AM64.
--- drivers/pci/controller/cadence/pci-j721e.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/pci/controller/cadence/pci-j721e.c +19 -0
@@ -310,6 +310,17 @@ static const struct j721e_pcie_data j7200_pcie_ep_data = { .quirk_detect_quiet_flag = true, }; +static const struct j721e_pcie_data am64_pcie_rc_data = { + .mode =PCI_MODE_RC , + .linkdown_irq_regfield =J7200_LINK_DOWN , + .byte_access_allowed = true, +}; + +static const struct j721e_pcie_data am64_pcie_ep_data = { + .mode =PCI_MODE_EP , + .linkdown_irq_regfield =J7200_LINK_DOWN , +}; +static const struct of_device_id of_j721e_pcie_match[] = { { .compatible ="ti,j721e-pcie-host" ,
@@ -327,6 +338,14 @@ static const struct of_device_id of_j721e_pcie_match[] = { .compatible = "ti,j7200-pcie-ep", .data = &j7200_pcie_ep_data, }, + { + .compatible = "ti,am64-pcie-host", + .data = &am64_pcie_rc_data, + }, + { + .compatible = "ti,am64-pcie-ep", + .data = &am64_pcie_ep_data, + }, {}, };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 107/168 PCI: Add ACS quirks for Cavium multi-function devices
In reply to Greg Kroah-HartmanFrom: George Cherian <[email protected]>
[ Upstream commit 32837d8a8f63eb95dcb9cd005524a27f06478832 ]
Some Cavium endpoints are implemented as multi-function devices without ACS capability, but they actually don't support peer-to-peer transactions.
Add ACS quirks to declare DMA isolation for the following devices:
- BGX device found on Octeon-TX (8xxx)
- CGX device found on Octeon-TX2 (9xxx)
- RPM device found on Octeon-TX3 (10xxx)
--- drivers/pci/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/pci/quirks.c +4 -0
@@ -4854,6 +4854,10 @@ static const struct pci_dev_acs_enabled { { 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R *//* Cavium ThunderX */ { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, +/* Cavium multi-function devices */ + { PCI_VENDOR_ID_CAVIUM, 0xA026, pci_quirk_mf_endpoint_acs }, + { PCI_VENDOR_ID_CAVIUM, 0xA059, pci_quirk_mf_endpoint_acs }, + { PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },/* APM X-Gene */ { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, /* Ampere Computing */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 108/168 watchdog: Start watchdog in watchdog_set_last_hw_keepalive only if appropriate
In reply to Greg Kroah-HartmanFrom: Jan Kiszka <[email protected]>
[ Upstream commit dbe80cf471f940db3063197b7adb1169f89be9ed ]
We must not pet a running watchdog when handle_boot_enabled is off because this will kick off automatic triggering before userland is running, defeating the purpose of the handle_boot_enabled control. Furthermore, don't ping in case watchdog_set_last_hw_keepalive was called incorrectly when the hardware watchdog is actually not running.
Fixed: cef9572e9af3 ("watchdog: add support for adjusting last known HW keepalive time")
--- drivers/watchdog/watchdog_dev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/watchdog/watchdog_dev.c +4 -1
@@ -1172,7 +1172,10 @@ int watchdog_set_last_hw_keepalive(struct watchdog_device *wdd, wd_data->last_hw_keepalive =ktime_sub (now,ms_to_ktime (last_ping_ms)); -return __watchdog_ping (wdd); +if (watchdog_hw_running (wdd) && handle_boot_enabled) +return __watchdog_ping (wdd); + +return 0 ; }EXPORT_SYMBOL_GPL (watchdog_set_last_hw_keepalive);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 109/168 octeontx2-af: Add additional register check to rvu_poll_reg()
In reply to Greg Kroah-HartmanFrom: Smadar Fuks <[email protected]>
[ Upstream commit 21274aa1781941884599a97ab59be7f8f36af98c ]
Check one more time before exiting the API with an error. Fix API to poll at least twice, in case there are other high priority tasks and this API doesn't get CPU cycles for multiple jiffies update.
In addition, increase timeout from usecs_to_jiffies(10000) to usecs_to_jiffies(20000), to prevent the case that for CONFIG_100HZ timeout will be a single jiffies.
A single jiffies results actual timeout that can be any time between 1usec and 10msec. To solve this, a value of usecs_to_jiffies(20000) ensures that timeout is 2 jiffies.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +11 -1
@@ -92,7 +92,8 @@ static void rvu_setup_hw_capabilities(struct rvu *rvu)*/ int rvu_poll_reg (struct rvu *rvu,u64 block,u64 offset,u64 mask,bool zero) { -unsigned long timeout = jiffies +usecs_to_jiffies (10000 ); +unsigned long timeout = jiffies +usecs_to_jiffies (20000 ); +bool twice = false;void __iomem *reg;u64 reg_val;
@@ -107,6 +108,15 @@ again:usleep_range (1 ,5 ); goto again; } +/* In scenarios where CPU is scheduled out before checking +* 'time_before' (above) and gets scheduled in such that +* jiffies are beyond timeout value, then check again if HW is +* done with the operation in the meantime. +*/ +if (!twice) { + twice = true; + goto again; + }return -EBUSY ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 110/168 Set fc_nlinfo in nh_create_ipv4, nh_create_ipv6
In reply to Greg Kroah-HartmanFrom: Ryoga Saito <[email protected]>
[ Upstream commit 9aca491e0dccf8a9d84a5b478e5eee3c6ea7803b ]
This patch fixes kernel NULL pointer dereference when creating nexthop which is bound with SRv6 decapsulation. In the creation of nexthop, __seg6_end_dt_vrf_build is called. __seg6_end_dt_vrf_build expects fc_lninfo in fib6_config is set correctly, but it isn't set in nh_create_ipv6, which causes kernel crash.
Here is steps to reproduce kernel crash:
1. modprobe vrf
2. ip -6 nexthop add encap seg6local action End.DT4 vrftable 1 dev eth0
We got the following message:
[ 901.370336] BUG: kernel NULL pointer dereference, address: 0000000000000ba0 [ 901.371658] #PF: supervisor read access in kernel mode [ 901.372672] #PF: error_code(0x0000) - not-present page [ 901.373672] PGD 0 P4D 0 [ 901.374248] Oops: 0000 [#1] SMP PTI [ 901.374944] CPU: 0 PID: 8593 Comm: ip Not tainted 5.14-051400-generic #202108310811-Ubuntu [ 901.376404] Hardware name: Red Hat KVM, BIOS 1.11.1-4.module_el8.2.0+320+13f867d7 04/01/2014 [ 901.377907] RIP: 0010:vrf_ifindex_lookup_by_table_id+0x19/0x90 [vrf] [ 901.379182] Code: c1 e9 72 ff ff ff e8 96 49 01 c2 66 0f 1f 44 00 00 0f 1f 44 00 00 55 48 89 e5 41 56 41 55 41 89 f5 41 54 53 8b 05 47 4c 00 00 <48> 8b 97 a0 0b 00 00 48 8b 1c c2 e8 57 27 53 c1 4c 8d a3 88 00 00 [ 901.382652] RSP: 0018:ffffbf2d02043590 EFLAGS: 00010282 [ 901.383746] RAX: 000000000000000b RBX: ffff990808255e70 RCX: ffffbf2d02043aa8 [ 901.385436] RDX: 0000000000000001 RSI: 0000000000000001 RDI: 0000000000000000 [ 901.386924] RBP: ffffbf2d020435b0 R08: 00000000000000c0 R09: ffff990808255e40 [ 901.388537] R10: ffffffff83b08c90 R11: 0000000000000009 R12: 0000000000000000 [ 901.389937] R13: 0000000000000001 R14: 0000000000000000 R15: 000000000000000b [ 901.391226] FS: 00007fe49381f740(0000) GS:ffff99087dc00000(0000) knlGS:0000000000000000 [ 901.392737] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 901.393803] CR2: 0000000000000ba0 CR3: 000000000e3e8003 CR4: 0000000000770ef0 [ 901.395122] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 901.396496] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 901.397833] PKRU: 55555554 [ 901.398578] Call Trace: [ 901.399144] l3mdev_ifindex_lookup_by_table_id+0x3b/0x70 [ 901.400179] __seg6_end_dt_vrf_build+0x34/0xd0 [ 901.401067] seg6_end_dt4_build+0x16/0x20 [ 901.401904] seg6_local_build_state+0x271/0x430 [ 901.402797] lwtunnel_build_state+0x81/0x130 [ 901.403645] fib_nh_common_init+0x82/0x100 [ 901.404465] ? sock_def_readable+0x4b/0x80 [ 901.405285] fib6_nh_init+0x115/0x7c0 [ 901.406033] nh_create_ipv6.isra.0+0xe1/0x140 [ 901.406932] rtm_new_nexthop+0x3b7/0xeb0 [ 901.407828] rtnetlink_rcv_msg+0x152/0x3a0 [ 901.408663] ? rtnl_calcit.isra.0+0x130/0x130 [ 901.409535] netlink_rcv_skb+0x55/0x100 [ 901.410319] rtnetlink_rcv+0x15/0x20 [ 901.411026] netlink_unicast+0x1a8/0x250 [ 901.411813] netlink_sendmsg+0x238/0x470 [ 901.412602] ? _copy_from_user+0x2b/0x60 [ 901.413394] sock_sendmsg+0x65/0x70 [ 901.414112] ____sys_sendmsg+0x218/0x290 [ 901.414929] ? copy_msghdr_from_user+0x5c/0x90 [ 901.415814] ___sys_sendmsg+0x81/0xc0 [ 901.416559] ? fsnotify_destroy_marks+0x27/0xf0 [ 901.417447] ? call_rcu+0xa4/0x230 [ 901.418153] ? kmem_cache_free+0x23f/0x410 [ 901.418972] ? dentry_free+0x37/0x70 [ 901.419705] ? mntput_no_expire+0x4c/0x260 [ 901.420574] __sys_sendmsg+0x62/0xb0 [ 901.421297] __x64_sys_sendmsg+0x1f/0x30 [ 901.422057] do_syscall_64+0x5c/0xc0 [ 901.422756] ? syscall_exit_to_user_mode+0x27/0x50 [ 901.423675] ? __x64_sys_close+0x12/0x40 [ 901.424462] ? do_syscall_64+0x69/0xc0 [ 901.425219] ? irqentry_exit_to_user_mode+0x9/0x20 [ 901.426149] ? irqentry_exit+0x19/0x30 [ 901.426901] ? exc_page_fault+0x89/0x160 [ 901.427709] ? asm_exc_page_fault+0x8/0x30 [ 901.428536] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 901.429514] RIP: 0033:0x7fe493945747 [ 901.430248] Code: 64 89 02 48 c7 c0 ff ff ff ff eb bb 0f 1f 80 00 00 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 [ 901.433549] RSP: 002b:00007ffe9932cf68 EFLAGS: 00000246 ORIG_RAX: 000000000000002e [ 901.434981] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007fe493945747 [ 901.436303] RDX: 0000000000000000 RSI: 00007ffe9932cfe0 RDI: 0000000000000003 [ 901.437607] RBP: 00000000613053f7 R08: 0000000000000001 R09: 00007ffe9932d07c [ 901.438990] R10: 000055f4a903a010 R11: 0000000000000246 R12: 0000000000000001 [ 901.440340] R13: 0000000000000001 R14: 000055f4a802b163 R15: 000055f4a8042020 [ 901.441630] Modules linked in: vrf nls_utf8 isofs nls_iso8859_1 dm_multipath scsi_dh_rdac scsi_dh_emc scsi_dh_alua intel_rapl_msr intel_rapl_common isst_if_mbox_msr isst_if_common nfit rapl input_leds joydev serio_raw qemu_fw_cfg mac_hid sch_fq_codel drm virtio_rng ip_tables x_tables autofs4 btrfs blake2b_generic zstd_compress raid10 raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c raid1 raid0 multipath linear crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel crypto_simd virtio_net net_failover cryptd psmouse virtio_blk failover i2c_piix4 pata_acpi floppy [ 901.450808] CR2: 0000000000000ba0 [ 901.451514] ---[ end trace c27b934b99ade304 ]--- [ 901.452403] RIP: 0010:vrf_ifindex_lookup_by_table_id+0x19/0x90 [vrf] [ 901.453626] Code: c1 e9 72 ff ff ff e8 96 49 01 c2 66 0f 1f 44 00 00 0f 1f 44 00 00 55 48 89 e5 41 56 41 55 41 89 f5 41 54 53 8b 05 47 4c 00 00 <48> 8b 97 a0 0b 00 00 48 8b 1c c2 e8 57 27 53 c1 4c 8d a3 88 00 00 [ 901.456910] RSP: 0018:ffffbf2d02043590 EFLAGS: 00010282 [ 901.457912] RAX: 000000000000000b RBX: ffff990808255e70 RCX: ffffbf2d02043aa8 [ 901.459238] RDX: 0000000000000001 RSI: 0000000000000001 RDI: 0000000000000000 [ 901.460552] RBP: ffffbf2d020435b0 R08: 00000000000000c0 R09: ffff990808255e40 [ 901.461882] R10: ffffffff83b08c90 R11: 0000000000000009 R12: 0000000000000000 [ 901.463208] R13: 0000000000000001 R14: 0000000000000000 R15: 000000000000000b [ 901.464529] FS: 00007fe49381f740(0000) GS:ffff99087dc00000(0000) knlGS:0000000000000000 [ 901.466058] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 901.467189] CR2: 0000000000000ba0 CR3: 000000000e3e8003 CR4: 0000000000770ef0 [ 901.468515] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 901.469858] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 901.471139] PKRU: 55555554
--- net/ipv4/nexthop.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv4/nexthop.c +2 -0
@@ -2490,6 +2490,7 @@ static int nh_create_ipv4(struct net *net, struct nexthop *nh, .fc_gw4 = cfg->gw.ipv4, .fc_gw_family = cfg->gw.ipv4 ? AF_INET : 0, .fc_flags = cfg->nh_flags, + .fc_nlinfo = cfg->nlinfo, .fc_encap = cfg->nh_encap, .fc_encap_type = cfg->nh_encap_type, };
@@ -2528,6 +2529,7 @@ static int nh_create_ipv6(struct net *net, struct nexthop *nh, .fc_ifindex = cfg->nh_ifindex, .fc_gateway = cfg->gw.ipv6, .fc_flags = cfg->nh_flags, + .fc_nlinfo = cfg->nlinfo, .fc_encap = cfg->nh_encap, .fc_encap_type = cfg->nh_encap_type, .fc_is_fdb = cfg->nh_fdb,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 111/168 flow: fix object-size-mismatch warning in flowi{4,6}_to_flowi_common()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit b9edbfe1adecfc48fd11061dce68afb03d6adbdc ]
Commit 3df98d79215ace13 ("lsm,selinux: pass flowi_common instead of flowi to the LSM hooks") introduced flowi{4,6}_to_flowi_common() functions which cause UBSAN warning when building with LLVM 11.0.1 on Ubuntu 21.04.
================================================================================
UBSAN: object-size-mismatch in ./include/net/flow.h:197:33 member access within address ffffc9000109fbd8 with insufficient space for an object of type 'struct flowi' CPU: 2 PID: 7410 Comm: systemd-resolve Not tainted 5.14.0 #51 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 02/27/2020 Call Trace: dump_stack_lvl+0x103/0x171 ubsan_type_mismatch_common+0x1de/0x390 __ubsan_handle_type_mismatch_v1+0x41/0x50 udp_sendmsg+0xda2/0x1300 ? ip_skb_dst_mtu+0x1f0/0x1f0 ? sock_rps_record_flow+0xe/0x200 ? inet_send_prepare+0x2d/0x90 sock_sendmsg+0x49/0x80 ____sys_sendmsg+0x269/0x370 __sys_sendmsg+0x15e/0x1d0 ? syscall_enter_from_user_mode+0xf0/0x1b0 do_syscall_64+0x3d/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f7081a50497 Code: 0c 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 RSP: 002b:00007ffc153870f8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e RAX: ffffffffffffffda RBX: 000000000000000c RCX: 00007f7081a50497 RDX: 0000000000000000 RSI: 00007ffc15387140 RDI: 000000000000000c RBP: 00007ffc15387140 R08: 0000563f29a5e4fc R09: 000000000000cd28 R10: 0000563f29a68a30 R11: 0000000000000246 R12: 000000000000000c R13: 0000000000000001 R14: 0000563f29a68a30 R15: 0000563f29a5e50c ================================================================================
I don't think we need to call flowi{4,6}_to_flowi() from these functions because the first member of "struct flowi4" and "struct flowi6" is
struct flowi_common __fl_common;
while the first member of "struct flowi" is
union {
struct flowi_common __fl_common;
struct flowi4 ip4;
struct flowi6 ip6;
struct flowidn dn;
} u;which should point to the same address without access to "struct flowi".
--- include/net/flow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/flow.h +2 -2
@@ -194,7 +194,7 @@ static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)static inline struct flowi_common *flowi4_to_flowi_common (struct flowi4 *fl4) { -return &(flowi4_to_flowi (fl4)->u.__fl_common); +return &(fl4->__fl_common); }static inline struct flowi *flowi6_to_flowi (struct flowi6 *fl6)
@@ -204,7 +204,7 @@ static inline struct flowi *flowi6_to_flowi(struct flowi6 *fl6)static inline struct flowi_common *flowi6_to_flowi_common (struct flowi6 *fl6) { -return &(flowi6_to_flowi (fl6)->u.__fl_common); +return &(fl6->__fl_common); }static inline struct flowi *flowidn_to_flowi (struct flowidn *fldn)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 112/168 net: usb: cdc_mbim: avoid altsetting toggling for Telit LN920
In reply to Greg Kroah-HartmanFrom: Daniele Palmas <[email protected]>
[ Upstream commit aabbdc67f3485b5db27ab4eba01e5fbf1ffea62c ]
Add quirk CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE for Telit LN920 0x1061 composition in order to avoid bind error.
--- drivers/net/usb/cdc_mbim.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/usb/cdc_mbim.c +5 -0
@@ -654,6 +654,11 @@ static const struct usb_device_id mbim_devs[] = { .driver_info = (unsigned long)&cdc_mbim_info_avoid_altsetting_toggle, }, +/* Telit LN920 */ + { USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x1061, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), + .driver_info = (unsigned long )&cdc_mbim_info_avoid_altsetting_toggle, + }, + /* default entry */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), .driver_info = (unsigned long)&cdc_mbim_info_zlp,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 113/168 block, bfq: honor already-setup queue merges
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit 2d52c58b9c9bdae0ca3df6a1eab5745ab3f7d80b ]
The function bfq_setup_merge prepares the merging between two bfq_queues, say bfqq and new_bfqq. To this goal, it assigns bfqq->new_bfqq = new_bfqq. Then, each time some I/O for bfqq arrives, the process that generated that I/O is disassociated from bfqq and associated with new_bfqq (merging is actually a redirection). In this respect, bfq_setup_merge increases new_bfqq->ref in advance, adding the number of processes that are expected to be associated with new_bfqq.
Unfortunately, the stable-merging mechanism interferes with this setup. After bfqq->new_bfqq has been set by bfq_setup_merge, and before all the expected processes have been associated with bfqq->new_bfqq, bfqq may happen to be stably merged with a different queue than the current bfqq->new_bfqq. In this case, bfqq->new_bfqq gets changed. So, some of the processes that have been already accounted for in the ref counter of the previous new_bfqq will not be associated with that queue. This creates an unbalance, because those references will never be decremented.
This commit fixes this issue by reestablishing the previous, natural
behaviour: once bfqq->new_bfqq has been set, it will not be changed until all expected redirections have occurred.
--- block/bfq-iosched.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
block/bfq-iosched.c +13 -3
@@ -2662,6 +2662,15 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq)* are likely to increase the throughput. */ bfqq->new_bfqq = new_bfqq; +/* +* The above assignment schedules the following redirections: +* each time some I/O for bfqq arrives, the process that +* generated that I/O is disassociated from bfqq and +* associated with new_bfqq. Here we increases new_bfqq->ref +* in advance, adding the number of processes that are +* expected to be associated with new_bfqq as they happen to +* issue I/O. +*/ new_bfqq->ref += process_refs;return new_bfqq; }
@@ -2724,6 +2733,10 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, {struct bfq_queue *in_service_bfqq, *new_bfqq; +/* if a merge has already been setup, then proceed with that first */ +if (bfqq->new_bfqq) +return bfqq->new_bfqq; +/* * Check delayed stable merge for rotational or non-queueing * devs. For this branch to be executed, bfqq must not be
@@ -2825,9 +2838,6 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq,if (bfq_too_late_for_merging (bfqq))return NULL ; -if (bfqq->new_bfqq) -return bfqq->new_bfqq; -if (!io_struct ||unlikely (bfqq == &bfqd->oom_bfqq))return NULL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 114/168 PCI: ibmphp: Fix double unmap of io_mem
In reply to Greg Kroah-HartmanFrom: Vishal Aslot <[email protected]>
[ Upstream commit faa2e05ad0dccf37f995bcfbb8d1980d66c02c11 ]
ebda_rsrc_controller() calls iounmap(io_mem) on the error path. Its caller, ibmphp_access_ebda(), also calls iounmap(io_mem) on good and error paths.
Remove the iounmap(io_mem) invocation from ebda_rsrc_controller().
--- drivers/pci/hotplug/TODO | 3 --- drivers/pci/hotplug/ibmphp_ebda.c | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/pci/hotplug/TODO +0 -3
@@ -40,9 +40,6 @@ ibmphp: * The return value of pci_hp_register() is not checked. -* iounmap(io_mem) is called in the error path of ebda_rsrc_controller() - and once more in the error path of its caller ibmphp_access_ebda(). - * The various slot data structures are difficult to follow and need to be simplified. A lot of functions are too large and too complex, they need to be broken up into smaller, manageable pieces. Negative examples are
drivers/pci/hotplug/ibmphp_ebda.c +1 -4
@@ -714,8 +714,7 @@ static int __init ebda_rsrc_controller(void)/* init hpc structure */ hpc_ptr =alloc_ebda_hpc (slot_num, bus_num);if (!hpc_ptr) { - rc = -ENOMEM ; - goto error_no_hpc; +return -ENOMEM ; } hpc_ptr->ctlr_id = ctlr_id; hpc_ptr->ctlr_relative_id = ctlr;
@@ -910,8 +909,6 @@ error:kfree (tmp_slot); error_no_slot:free_ebda_hpc (hpc_ptr); -error_no_hpc: -iounmap (io_mem);return rc; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 115/168 loop: reduce the loop_ctl_mutex scope
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 1c500ad706383f1a6609e63d0b5d1723fd84dab9 ]
syzbot is reporting circular locking problem at __loop_clr_fd() [1], for commit a160c6159d4a0cf8 ("block: add an optional probe callback to major_names") is calling the module's probe function with major_names_lock held.
Fortunately, since commit 990e78116d38059c ("block: loop: fix deadlock between open and remove") stopped holding loop_ctl_mutex in lo_open(), current role of loop_ctl_mutex is to serialize access to loop_index_idr and loop_add()/loop_remove(); in other words, management of id for IDR. To avoid holding loop_ctl_mutex during whole add/remove operation, use a bool flag to indicate whether the loop device is ready for use.
loop_unregister_transfer() which is called from cleanup_cryptoloop() currently has possibility of use-after-free problem due to lack of serialization between kfree() from loop_remove() from loop_control_remove() and mutex_lock() from unregister_transfer_cb(). But since lo->lo_encryption should be already NULL when this function is called due to module unload, and commit 222013f9ac30b9ce ("cryptoloop: add a deprecation warning") indicates that we will remove this function shortly, this patch updates this function to emit warning instead of checking lo->lo_encryption.
Holding loop_ctl_mutex in loop_exit() is pointless, for all users must close /dev/loop-control and /dev/loop$num (in order to drop module's refcount to 0) before loop_exit() starts, and nobody can open /dev/loop-control or /dev/loop$num afterwards.
--- drivers/block/loop.c | 75 +++++++++++++++++++++++++++++--------------- drivers/block/loop.h | 1 + 2 files changed, 50 insertions(+), 26 deletions(-)
drivers/block/loop.c +49 -26
@@ -2113,18 +2113,6 @@ int loop_register_transfer(struct loop_func_table *funcs)return 0 ; } -static int unregister_transfer_cb (int id,void *ptr,void *data) -{ -struct loop_device *lo = ptr; -struct loop_func_table *xfer = data; - -mutex_lock (&lo->lo_mutex); -if (lo->lo_encryption == xfer) -loop_release_xfer (lo); -mutex_unlock (&lo->lo_mutex); -return 0 ; -} -int loop_unregister_transfer (int number) {unsigned int n = number;
@@ -2132,9 +2120,20 @@ int loop_unregister_transfer(int number)if (n ==0 || n >=MAX_LO_CRYPT || (xfer = xfer_funcs[n]) ==NULL )return -EINVAL ; +/* +* This function is called from only cleanup_cryptoloop(). +* Given that each loop device that has a transfer enabled holds a +* reference to the module implementing it we should never get here +* with a transfer that is set (unless forced module unloading is +* requested). Thus, check module's refcount and warn if this is +* not a clean unloading. +*/ +#ifdef CONFIG_MODULE_UNLOAD +if (xfer->owner &&module_refcount (xfer->owner) !=-1 ) +pr_err ("Danger! Unregistering an in use transfer function.\n" ); +#endif xfer_funcs[n] =NULL ; -idr_for_each (&loop_index_idr, &unregister_transfer_cb, xfer);return 0 ; }
@@ -2325,8 +2324,9 @@ static int loop_add(int i) }else { err =idr_alloc (&loop_index_idr, lo,0 ,0 ,GFP_KERNEL ); } +mutex_unlock (&loop_ctl_mutex);if (err <0 ) - goto out_unlock; + goto out_free_dev; i = err; err = -ENOMEM ;
@@ -2392,15 +2392,19 @@ static int loop_add(int i) disk->private_data = lo; disk->queue = lo->lo_queue;sprintf (disk->disk_name,"loop%d" , i); +/* Make this loop device reachable from pathname. */ add_disk (disk); +/* Show this loop device. */ +mutex_lock (&loop_ctl_mutex); + lo->idr_visible = true;mutex_unlock (&loop_ctl_mutex);return i; out_cleanup_tags:blk_mq_free_tag_set (&lo->tag_set); out_free_idr: +mutex_lock (&loop_ctl_mutex);idr_remove (&loop_index_idr, i); -out_unlock:mutex_unlock (&loop_ctl_mutex); out_free_dev:kfree (lo);
@@ -2410,9 +2414,14 @@ out:static void loop_remove (struct loop_device *lo) { +/* Make this loop device unreachable from pathname. */ del_gendisk (lo->lo_disk);blk_cleanup_disk (lo->lo_disk);blk_mq_free_tag_set (&lo->tag_set); +mutex_lock (&loop_ctl_mutex); +idr_remove (&loop_index_idr, lo->lo_number); +mutex_unlock (&loop_ctl_mutex); +/* There is no route which can find this loop device. */ mutex_destroy (&lo->lo_mutex);kfree (lo); }
@@ -2436,31 +2445,40 @@ static int loop_control_remove(int idx)return -EINVAL ; } +/* Hide this loop device for serialization. */ ret =mutex_lock_killable (&loop_ctl_mutex);if (ret)return ret; - lo =idr_find (&loop_index_idr, idx); -if (!lo) { +if (!lo || !lo->idr_visible) ret = -ENODEV ; - goto out_unlock_ctrl; - } +else + lo->idr_visible = false; +mutex_unlock (&loop_ctl_mutex); +if (ret) +return ret; +/* Check whether this loop device can be removed. */ ret =mutex_lock_killable (&lo->lo_mutex);if (ret) - goto out_unlock_ctrl; + goto mark_visible;if (lo->lo_state != Lo_unbound ||atomic_read (&lo->lo_refcnt) >0 ) {mutex_unlock (&lo->lo_mutex); ret = -EBUSY ; - goto out_unlock_ctrl; + goto mark_visible; } +/* Mark this loop device no longer open()-able. */ lo->lo_state = Lo_deleting;mutex_unlock (&lo->lo_mutex); -idr_remove (&loop_index_idr, lo->lo_number);loop_remove (lo); -out_unlock_ctrl: +return 0 ; + +mark_visible: +/* Show this loop device again. */ +mutex_lock (&loop_ctl_mutex); + lo->idr_visible = true;mutex_unlock (&loop_ctl_mutex);return ret; }
@@ -2474,7 +2492,8 @@ static int loop_control_get_free(int idx)if (ret)return ret;idr_for_each_entry (&loop_index_idr, lo, id) { -if (lo->lo_state == Lo_unbound) +/* Hitting a race results in creating a new loop device which is harmless. */ +if (lo->idr_visible &&data_race (lo->lo_state) == Lo_unbound) goto found; }mutex_unlock (&loop_ctl_mutex);
@@ -2590,10 +2609,14 @@ static void __exit loop_exit(void)unregister_blkdev (LOOP_MAJOR ,"loop" );misc_deregister (&loop_misc); -mutex_lock (&loop_ctl_mutex); +/* +* There is no need to use loop_ctl_mutex here, for nobody else can +* access loop_index_idr when this module is unloading (unless forced +* module unloading is requested). If this is not a clean unloading, +* we have no means to avoid kernel crash. +*/ idr_for_each_entry (&loop_index_idr, lo, id)loop_remove (lo); -mutex_unlock (&loop_ctl_mutex);idr_destroy (&loop_index_idr); }
drivers/block/loop.h +1 -0
@@ -68,6 +68,7 @@ struct loop_device {struct blk_mq_tag_set tag_set;struct gendisk *lo_disk;struct mutex lo_mutex; +bool idr_visible; };struct loop_cmd {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 116/168 ethtool: Fix an error code in cxgb2.c
In reply to Greg Kroah-HartmanFrom: Yang Li <[email protected]>
[ Upstream commit 7db8263a12155c7ae4ad97e850f1e499c73765fc ]
When adapter->registered_device_map is NULL, the value of err is uncertain, we set err to -EINVAL to avoid ambiguity.
Clean up smatch warning:drivers/net/ethernet/chelsio/cxgb/cxgb2.c:1114 init_one() warn: missing error code 'err'
--- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/chelsio/cxgb/cxgb2.c +1 -0
@@ -1107,6 +1107,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (!adapter->registered_device_map) {pr_err ("%s: could not register any net devices\n" ,pci_name (pdev)); + err = -EINVAL ; goto out_release_adapter_res; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 117/168 NTB: Fix an error code in ntb_msit_probe()
In reply to Greg Kroah-HartmanFrom: Yang Li <[email protected]>
[ Upstream commit 319f83ac98d7afaabab84ce5281a819a358b9895 ]
When the value of nm->isr_ctx is false, the value of ret is 0. So, we set ret to -ENOMEM to indicate this error.
Clean up smatch warning:drivers/ntb/test/ntb_msi_test.c:373 ntb_msit_probe() warn: missing error code 'ret'.
--- drivers/ntb/test/ntb_msi_test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ntb/test/ntb_msi_test.c +3 -1
@@ -369,8 +369,10 @@ static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb)if (ret) goto remove_dbgfs; -if (!nm->isr_ctx) +if (!nm->isr_ctx) { + ret = -ENOMEM ; goto remove_dbgfs; + }ntb_link_enable (ntb,NTB_SPEED_AUTO ,NTB_WIDTH_AUTO );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 118/168 NTB: perf: Fix an error code in perf_setup_inbuf()
In reply to Greg Kroah-HartmanFrom: Yang Li <[email protected]>
[ Upstream commit 0097ae5f7af5684f961a5f803ff7ad3e6f933668 ]
When the function IS_ALIGNED() returns false, the value of ret is 0. So, we set ret to -EINVAL to indicate this error.
Clean up smatch warning:drivers/ntb/test/ntb_perf.c:602 perf_setup_inbuf() warn: missing error code 'ret'.
--- drivers/ntb/test/ntb_perf.c | 1 + 1 file changed, 1 insertion(+)
drivers/ntb/test/ntb_perf.c +1 -0
@@ -598,6 +598,7 @@ static int perf_setup_inbuf(struct perf_peer *peer)return -ENOMEM ; }if (!IS_ALIGNED (peer->inbuf_xlat, xlat_align)) { + ret = -EINVAL ;dev_err (&perf->ntb->dev,"Unaligned inbuf allocated\n" ); goto err_free_inbuf; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 119/168 stmmac: dwmac-loongson:Fix missing return value
In reply to Greg Kroah-HartmanFrom: zhaoxiao <[email protected]>
[ Upstream commit 5289de5929d1758a95477a4d160195397ccffa7b ]
Add the return value when phy_mode < 0.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -1
@@ -109,8 +109,10 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id plat->bus_id =pci_dev_id (pdev); phy_mode =device_get_phy_mode (&pdev->dev); -if (phy_mode <0 ) +if (phy_mode <0 ) {dev_err (&pdev->dev,"phy_mode not found\n" ); +return phy_mode; + } plat->phy_interface = phy_mode; plat->interface =PHY_INTERFACE_MODE_GMII ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 120/168 net: phylink: add suspend/resume support
In reply to Greg Kroah-HartmanFrom: Russell King (Oracle) <[email protected]>
[ Upstream commit f97493657c6372eeefe70faadd214bf31488c44e ]
Joakim Zhang reports that Wake-on-Lan with the stmmac ethernet driver broke when moving the incorrect handling of mac link state out of mac_config(). This reason this breaks is because the stmmac's WoL is handled by the MAC rather than the PHY, and phylink doesn't cater for that scenario.
This patch adds the necessary phylink code to handle suspend/resume events according to whether the MAC still needs a valid link or not. This is the barest minimum for this support.
--- drivers/net/phy/phylink.c | 82 +++++++++++++++++++++++++++++++++++++++ include/linux/phylink.h | 3 ++ 2 files changed, 85 insertions(+)
drivers/net/phy/phylink.c +82 -0
@@ -33,6 +33,7 @@enum {PHYLINK_DISABLE_STOPPED ,PHYLINK_DISABLE_LINK , +PHYLINK_DISABLE_MAC_WOL , };/**
@@ -1281,6 +1282,9 @@ EXPORT_SYMBOL_GPL(phylink_start);* network device driver's &struct net_device_ops ndo_stop() method. The * network device's carrier state should not be changed prior to calling this * function. +* +* This will synchronously bring down the link if the link is not already +* down (in other words, it will trigger a mac_link_down() method call.) */ void phylink_stop (struct phylink *pl) {
@@ -1300,6 +1304,84 @@ void phylink_stop(struct phylink *pl) }EXPORT_SYMBOL_GPL (phylink_stop); +/** +* phylink_suspend() - handle a network device suspend event +* @pl: a pointer to a &struct phylink returned from phylink_create() +* @mac_wol: true if the MAC needs to receive packets for Wake-on-Lan +* +* Handle a network device suspend event. There are several cases: +* - If Wake-on-Lan is not active, we can bring down the link between +* the MAC and PHY by calling phylink_stop(). +* - If Wake-on-Lan is active, and being handled only by the PHY, we +* can also bring down the link between the MAC and PHY. +* - If Wake-on-Lan is active, but being handled by the MAC, the MAC +* still needs to receive packets, so we can not bring the link down. +*/ +void phylink_suspend (struct phylink *pl,bool mac_wol) +{ +ASSERT_RTNL (); + +if (mac_wol && (!pl->netdev || pl->netdev->wol_enabled)) { +/* Wake-on-Lan enabled, MAC handling */ +mutex_lock (&pl->state_mutex); + +/* Stop the resolver bringing the link up */ +__set_bit (PHYLINK_DISABLE_MAC_WOL , &pl->phylink_disable_state); + +/* Disable the carrier, to prevent transmit timeouts, +* but one would hope all packets have been sent. This +* also means phylink_resolve() will do nothing. +*/ +netif_carrier_off (pl->netdev); + +/* We do not call mac_link_down() here as we want the +* link to remain up to receive the WoL packets. +*/ +mutex_unlock (&pl->state_mutex); + }else { +phylink_stop (pl); + } +} +EXPORT_SYMBOL_GPL (phylink_suspend); + +/** +* phylink_resume() - handle a network device resume event +* @pl: a pointer to a &struct phylink returned from phylink_create() +* +* Undo the effects of phylink_suspend(), returning the link to an +* operational state. +*/ +void phylink_resume (struct phylink *pl) +{ +ASSERT_RTNL (); + +if (test_bit (PHYLINK_DISABLE_MAC_WOL , &pl->phylink_disable_state)) { +/* Wake-on-Lan enabled, MAC handling */ + +/* Call mac_link_down() so we keep the overall state balanced. +* Do this under the state_mutex lock for consistency. This +* will cause a "Link Down" message to be printed during +* resume, which is harmless - the true link state will be +* printed when we run a resolve. +*/ +mutex_lock (&pl->state_mutex); +phylink_link_down (pl); +mutex_unlock (&pl->state_mutex); + +/* Re-apply the link parameters so that all the settings get +* restored to the MAC. +*/ +phylink_mac_initial_config (pl, true); + +/* Re-enable and re-resolve the link parameters */ +clear_bit (PHYLINK_DISABLE_MAC_WOL , &pl->phylink_disable_state); +phylink_run_resolve (pl); + }else { +phylink_start (pl); + } +} +EXPORT_SYMBOL_GPL (phylink_resume); +/** * phylink_ethtool_get_wol() - get the wake on lan parameters for the PHY * @pl: a pointer to a &struct phylink returned from phylink_create()
include/linux/phylink.h +3 -0
@@ -451,6 +451,9 @@ void phylink_mac_change(struct phylink *, bool up);void phylink_start (struct phylink *);void phylink_stop (struct phylink *); +void phylink_suspend (struct phylink *pl,bool mac_wol); +void phylink_resume (struct phylink *pl); +void phylink_ethtool_get_wol (struct phylink *,struct ethtool_wolinfo *);int phylink_ethtool_set_wol (struct phylink *,struct ethtool_wolinfo *);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 121/168 mfd: axp20x: Update AXP288 volatile ranges
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit f949a9ebce7a18005266b859a17f10c891bb13d7 ]
On Cherry Trail devices with an AXP288 PMIC the external SD-card slot used the AXP's DLDO2 as card-voltage and either DLDO3 or GPIO1LDO (GPIO1 pin in low noise LDO mode) as signal-voltage.
These regulators are turned on/off and in case of the signal-voltage also have their output-voltage changed by the _PS0 and _PS3 power- management ACPI methods on the MMC-controllers ACPI fwnode as well as by the _DSM ACPI method for changing the signal voltage.
The AML code implementing these methods is directly accessing the PMIC through ACPI I2C OpRegion accesses, instead of using the special PMIC OpRegion handled by drivers/acpi/pmic/intel_pmic_xpower.c .
This means that the contents of the involved PMIC registers can change without the change being made through the regmap interface, so regmap should not cache the contents of these registers.
Mark the regulator power on/off, the regulator voltage control and the GPIO1 control registers as volatile, to avoid regmap caching them.
Specifically this fixes an issue on some models where the i915 driver toggles another LDO using the same on/off register on/off through MIPI sequences (through intel_soc_pmic_exec_mipi_pmic_seq_element()) which then writes back a cached on/off register-value where the card-voltage is off causing the external sdcard slot to stop working when the screen goes blank, or comes back on again.
The regulator register-range now marked volatile also includes the buck regulator control registers. This is done on purpose these are normally not touched by the AML code, but they are updated directly by the SoC's PUNIT which means that they may also change without going through regmap.
Note the AXP288 PMIC is only used on Bay- and Cherry-Trail platforms, so even though this is an ACPI specific problem there is no need to make the new volatile ranges conditional since these platforms always use ACPI.
--- drivers/mfd/axp20x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mfd/axp20x.c +2 -1
@@ -125,12 +125,13 @@ static const struct regmap_range axp288_writeable_ranges[] = {static const struct regmap_range axp288_volatile_ranges[] = {regmap_reg_range (AXP20X_PWR_INPUT_STATUS ,AXP288_POWER_REASON ), +regmap_reg_range (AXP22X_PWR_OUT_CTRL1 ,AXP22X_ALDO3_V_OUT ),regmap_reg_range (AXP288_BC_GLOBAL ,AXP288_BC_GLOBAL ),regmap_reg_range (AXP288_BC_DET_STAT ,AXP20X_VBUS_IPSOUT_MGMT ),regmap_reg_range (AXP20X_CHRG_BAK_CTRL ,AXP20X_CHRG_BAK_CTRL ),regmap_reg_range (AXP20X_IRQ1_EN ,AXP20X_IPSOUT_V_HIGH_L ),regmap_reg_range (AXP20X_TIMER_CTRL ,AXP20X_TIMER_CTRL ), -regmap_reg_range (AXP22X_GPIO_STATE ,AXP22X_GPIO_STATE ), +regmap_reg_range (AXP20X_GPIO1_CTRL ,AXP22X_GPIO_STATE ),regmap_reg_range (AXP288_RT_BATT_V_H ,AXP288_RT_BATT_V_L ),regmap_reg_range (AXP20X_FG_RES ,AXP288_FG_CC_CAP_REG ), };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 122/168 backlight: ktd253: Stabilize backlight
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit daa37361518bf2d1f591bbdaa7c68b2a43d7af48 ]
Remove interrupt disablement during backlight setting. It is way to dangerous and makes platforms instable by having it miss vblank IRQs leading to the graphics derailing.
The code is using ndelay() which is not available on platforms such as ARM and will result in 32 * udelay(1) which is substantial.
Add some code to detect if an interrupt occurs during the tight loop and in that case just redo it from the top.
--- drivers/video/backlight/ktd253-backlight.c | 75 ++++++++++++++++------ 1 file changed, 55 insertions(+), 20 deletions(-)
drivers/video/backlight/ktd253-backlight.c +55 -20
@@ -25,6 +25,7 @@#define KTD253_T_LOW_NS (200 + 10)/* Additional 10ns as safety factor */ #define KTD253_T_HIGH_NS (200 + 10)/* Additional 10ns as safety factor */ +#define KTD253_T_OFF_CRIT_NS 100000/* 100 us, now it doesn't look good */ #define KTD253_T_OFF_MS 3struct ktd253_backlight {
@@ -34,13 +35,50 @@ struct ktd253_backlight {u16 ratio; }; +static void ktd253_backlight_set_max_ratio (struct ktd253_backlight *ktd253) +{ +gpiod_set_value_cansleep (ktd253->gpiod,1 ); +ndelay (KTD253_T_HIGH_NS ); +/* We always fall back to this when we power on */ +} + +static int ktd253_backlight_stepdown (struct ktd253_backlight *ktd253) +{ +/* +* These GPIO operations absolutely can NOT sleep so no _cansleep +* suffixes, and no using GPIO expanders on slow buses for this! +* +* The maximum number of cycles of the loop is 32 so the time taken +* should nominally be: +* (T_LOW_NS + T_HIGH_NS + loop_time) * 32 +* +* Architectures do not always support ndelay() and we will get a few us +* instead. If we get to a critical time limit an interrupt has likely +* occured in the low part of the loop and we need to restart from the +* top so we have the backlight in a known state. +*/ +u64 ns; + + ns =ktime_get_ns (); +gpiod_set_value (ktd253->gpiod,0 ); +ndelay (KTD253_T_LOW_NS ); +gpiod_set_value (ktd253->gpiod,1 ); + ns =ktime_get_ns () - ns; +if (ns >=KTD253_T_OFF_CRIT_NS ) { +dev_err (ktd253->dev,"PCM on backlight took too long (%llu ns)\n" , ns); +return -EAGAIN ; + } +ndelay (KTD253_T_HIGH_NS ); +return 0 ; +} +static int ktd253_backlight_update_status (struct backlight_device *bl) {struct ktd253_backlight *ktd253 =bl_get_data (bl);int brightness =backlight_get_brightness (bl);u16 target_ratio;u16 current_ratio = ktd253->ratio; -unsigned long flags; +int ret;dev_dbg (ktd253->dev,"new brightness/ratio: %d/32\n" , brightness);
@@ -62,37 +100,34 @@ static int ktd253_backlight_update_status(struct backlight_device *bl) }if (current_ratio ==0 ) { -gpiod_set_value_cansleep (ktd253->gpiod,1 ); -ndelay (KTD253_T_HIGH_NS ); -/* We always fall back to this when we power on */ +ktd253_backlight_set_max_ratio (ktd253); current_ratio =KTD253_MAX_RATIO ; } -/* -* WARNING: -* The loop to set the correct current level is performed -* with interrupts disabled as it is timing critical. -* The maximum number of cycles of the loop is 32 -* so the time taken will be (T_LOW_NS + T_HIGH_NS + loop_time) * 32, -*/ -local_irq_save (flags);while (current_ratio != target_ratio) {/* * These GPIO operations absolutely can NOT sleep so no * _cansleep suffixes, and no using GPIO expanders on * slow buses for this! */ -gpiod_set_value (ktd253->gpiod,0 ); -ndelay (KTD253_T_LOW_NS ); -gpiod_set_value (ktd253->gpiod,1 ); -ndelay (KTD253_T_HIGH_NS ); -/* After 1/32 we loop back to 32/32 */ -if (current_ratio ==KTD253_MIN_RATIO ) + ret =ktd253_backlight_stepdown (ktd253); +if (ret == -EAGAIN ) { +/* +* Something disturbed the backlight setting code when +* running so we need to bring the PWM back to a known +* state. This shouldn't happen too much. +*/ +gpiod_set_value_cansleep (ktd253->gpiod,0 ); +msleep (KTD253_T_OFF_MS ); +ktd253_backlight_set_max_ratio (ktd253); + current_ratio =KTD253_MAX_RATIO ; + }else if (current_ratio ==KTD253_MIN_RATIO ) { +/* After 1/32 we loop back to 32/32 */ current_ratio =KTD253_MAX_RATIO ; -else + }else { current_ratio--; + } } -local_irq_restore (flags); ktd253->ratio = current_ratio;dev_dbg (ktd253->dev,"new ratio set to %d/32\n" , target_ratio);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 123/168 PCI: controller: PCI_IXP4XX should depend on ARCH_IXP4XX
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 9f1168cf263aab0474300f7118107f8ef73e7423 ]
The Intel IXP4xx PCI controller is only present on Intel IXP4xx XScale-based network processor SoCs.
Add a dependency on ARCH_IXP4XX, to prevent asking the user about this driver when configuring a kernel without support for the XScale processor family.
--- drivers/pci/controller/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/pci/controller/Kconfig +1 -0
@@ -40,6 +40,7 @@ config PCI_FTPCI100 config PCI_IXP4XX bool "Intel IXP4xx PCI controller" depends on ARM && OF + depends on ARCH_IXP4XX || COMPILE_TEST default ARCH_IXP4XX help Say Y here if you want support for the PCI host controller found
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 124/168 PCI: of: Dont fail devm_pci_alloc_host_bridge() on missing ranges
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit d277f6e88c88729b1d57d40bbfb00d0bfc961972 ]
Commit 669cbc708122 ("PCI: Move DT resource setup into devm_pci_alloc_host_bridge()") made devm_pci_alloc_host_bridge() fail on any DT resource parsing errors, but Broadcom iProc uses devm_pci_alloc_host_bridge() on BCMA bus devices that don't have DT resources. In particular, there is no 'ranges' property. Fix iProc by making 'ranges' optional.
If 'ranges' is required by a platform, there's going to be more errors latter on if it is missing.
--- drivers/pci/of.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/of.c +1 -1
@@ -310,7 +310,7 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,/* Check for ranges property */ err =of_pci_range_parser_init (&parser, dev_node);if (err) - goto failed; +return 0 ;dev_dbg (dev,"Parsing ranges property...\n" );for_each_of_pci_range (&parser, &range) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 125/168 PCI: iproc: Fix BCMA probe resource handling
In reply to Greg Kroah-HartmanFrom: Rob Herring <[email protected]>
[ Upstream commit aeaea8969b402e0081210cc9144404d13996efed ]
In commit 7ef1c871da16 ("PCI: iproc: Use pci_parse_request_of_pci_ranges()"), calling devm_request_pci_bus_resources() was dropped from the common iProc probe code, but is still needed for BCMA bus probing. Without it, there will be lots of warnings like this:
pci 0000:00:00.0: BAR 8: no space for [mem size 0x00c00000] pci 0000:00:00.0: BAR 8: failed to assign [mem size 0x00c00000]
Add back calling devm_request_pci_bus_resources() and adding the resources to pci_host_bridge.windows for BCMA bus probe.
--- drivers/pci/controller/pcie-iproc-bcma.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/pci/controller/pcie-iproc-bcma.c +6 -10
@@ -35,7 +35,6 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) {struct device *dev = &bdev->dev;struct iproc_pcie *pcie; -LIST_HEAD (resources);struct pci_host_bridge *bridge;int ret;
@@ -60,19 +59,16 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) pcie->mem.end = bdev->addr_s[0 ] +SZ_128M -1 ; pcie->mem.name ="PCIe MEM space" ; pcie->mem.flags =IORESOURCE_MEM ; -pci_add_resource (&resources, &pcie->mem); +pci_add_resource (&bridge->windows, &pcie->mem); + ret =devm_request_pci_bus_resources (dev, &bridge->windows); +if (ret) +return ret; pcie->map_irq = iproc_pcie_bcma_map_irq; - ret =iproc_pcie_setup (pcie, &resources); -if (ret) { -dev_err (dev,"PCIe controller setup failed\n" ); -pci_free_resource_list (&resources); -return ret; - } -bcma_set_drvdata (bdev, pcie); -return 0 ; + +return iproc_pcie_setup (pcie, &bridge->windows); }static void iproc_pcie_bcma_remove (struct bcma_device *bdev)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 126/168 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex
In reply to Greg Kroah-HartmanFrom: Pavel Skripkin <[email protected]>
[ Upstream commit e3245a7b7b34bd2e97f744fd79463add6e9d41f4 ]
Syzbot hit use-after-free in nf_tables_dump_sets. The problem was in missing lock protection for nft_ct_pcpu_template_refcnt.
Before commit f102d66b335a ("netfilter: nf_tables: use dedicated mutex to guard transactions") all transactions were serialized by global mutex, but then global mutex was changed to local per netnamespace commit_mutex.
This change causes use-after-free bug, when 2 netnamespaces concurently changing nft_ct_pcpu_template_refcnt without proper locking. Fix it by adding nft_ct_pcpu_mutex and protect all nft_ct_pcpu_template_refcnt changes with it.
--- net/netfilter/nft_ct.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/netfilter/nft_ct.c +8 -1
@@ -41,6 +41,7 @@ struct nft_ct_helper_obj {#ifdef CONFIG_NF_CONNTRACK_ZONES static DEFINE_PER_CPU(struct nf_conn *, nft_ct_pcpu_template);static unsigned int nft_ct_pcpu_template_refcnt__read_mostly ; +static DEFINE_MUTEX (nft_ct_pcpu_mutex);#endif static u64 nft_ct_get_eval_counter(const struct nf_conn_counter *c,
@@ -525,8 +526,10 @@ static void __nft_ct_set_destroy(const struct nft_ctx *ctx, struct nft_ct *priv)#endif #ifdef CONFIG_NF_CONNTRACK_ZONES case NFT_CT_ZONE : +mutex_lock (&nft_ct_pcpu_mutex);if (--nft_ct_pcpu_template_refcnt ==0 )nft_ct_tmpl_put_pcpu (); +mutex_unlock (&nft_ct_pcpu_mutex);break ;#endif default :
@@ -564,9 +567,13 @@ static int nft_ct_set_init(const struct nft_ctx *ctx,#endif #ifdef CONFIG_NF_CONNTRACK_ZONES case NFT_CT_ZONE : -if (!nft_ct_tmpl_alloc_pcpu ()) +mutex_lock (&nft_ct_pcpu_mutex); +if (!nft_ct_tmpl_alloc_pcpu ()) { +mutex_unlock (&nft_ct_pcpu_mutex);return -ENOMEM ; + } nft_ct_pcpu_template_refcnt++; +mutex_unlock (&nft_ct_pcpu_mutex); len =sizeof (u16);break ;#endif
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 127/168 KVM: arm64: Restrict IPA size to maximum 48 bits on 4K and 16K page size
In reply to Greg Kroah-HartmanFrom: Anshuman Khandual <[email protected]>
[ Upstream commit 5e5df9571c319fb107d7a523cc96fcc99961ee70 ]
Even though ID_AA64MMFR0.PARANGE reports 52 bit PA size support, it cannot be enabled as guest IPA size on 4K or 16K page size configurations. Hence kvm_ipa_limit must be restricted to 48 bits. This change achieves required IPA capping.
Before the commit c9b69a0cf0b4 ("KVM: arm64: Don't constrain maximum IPA size based on host configuration"), the problem here would have been just latent via PHYS_MASK_SHIFT (which earlier in turn capped kvm_ipa_limit), which remains capped at 48 bits on 4K and 16K configs.
--- arch/arm64/kvm/reset.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/kvm/reset.c +8 -0
@@ -317,6 +317,14 @@ int kvm_set_ipa_limit(void) mmfr0 =read_sanitised_ftr_reg (SYS_ID_AA64MMFR0_EL1 ); parange =cpuid_feature_extract_unsigned_field (mmfr0,ID_AA64MMFR0_PARANGE_SHIFT ); +/* +* IPA size beyond 48 bits could not be supported +* on either 4K or 16K page size. Hence let's cap +* it to 48 bits, in case it's reported as larger +* on the system. +*/ +if (PAGE_SIZE !=SZ_64K ) + parange =min (parange, (unsigned int )ID_AA64MMFR0_PARANGE_48 );/* * Check with ARMv8.5-GTG that our PAGE_SIZE is supported at
Signature · 8 lines
2.30.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Greg Kroah-Hartman
maintainerPATCH 128/168 PCI: Fix pci_dev_str_match_path() alloc while atomic bug
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 7eb6ea4148579b85540a41d57bcec315b8af8ff8 ]
pci_dev_str_match_path() is often called with a spinlock held so the allocation has to be atomic. The call tree is:
pci_specified_resource_alignment() <-- takes spin_lock();
pci_dev_str_match()
pci_dev_str_match_path()--- drivers/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci.c +1 -1
@@ -265,7 +265,7 @@ static int pci_dev_str_match_path(struct pci_dev *dev, const char *path, *endptr =strchrnul (path,';' ); - wpath =kmemdup_nul (path, *endptr - path,GFP_KERNEL ); + wpath =kmemdup_nul (path, *endptr - path,GFP_ATOMIC );if (!wpath)return -ENOMEM ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 129/168 mfd: tqmx86: Clear GPIO IRQ resource when no IRQ is set
In reply to Greg Kroah-HartmanFrom: Matthias Schiffer <[email protected]>
[ Upstream commit a946506c48f3bd09363c9d2b0a178e55733bcbb6 ]
The driver was registering IRQ 0 when no IRQ was set. This leads to warnings with newer kernels.
Clear the resource flags, so no resource is registered at all in this case.
--- drivers/mfd/tqmx86.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mfd/tqmx86.c +2 -0
@@ -209,6 +209,8 @@ static int tqmx86_probe(struct platform_device *pdev)/* Assumes the IRQ resource is first. */ tqmx_gpio_resources[0 ].start = gpio_irq; + }else { + tqmx_gpio_resources[0 ].flags =0 ; } ocores_platfom_data.clock_khz =tqmx86_board_id_to_clk_rate (board_id);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 130/168 tracing/boot: Fix a hist trigger dependency for boot time tracing
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit 6fe7c745f2acb73e4cc961d7f91125eef5a8861f ]
Fixes a build error when CONFIG_HIST_TRIGGERS=n with boot-time tracing. Since the trigger_process_regex() is defined only when CONFIG_HIST_TRIGGERS=y, if it is disabled, the 'actions' event option also must be disabled.
--- kernel/trace/trace_boot.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
kernel/trace/trace_boot.c +9 -6
@@ -205,12 +205,15 @@ trace_boot_init_one_event(struct trace_array *tr, struct xbc_node *gnode,pr_err ("Failed to apply filter: %s\n" , buf); } -xbc_node_for_each_array_value (enode,"actions" , anode, p) { -if (strlcpy (buf, p,ARRAY_SIZE (buf)) >=ARRAY_SIZE (buf)) -pr_err ("action string is too long: %s\n" , p); -else if (trigger_process_regex (file, buf) <0 ) -pr_err ("Failed to apply an action: %s\n" , buf); - } +if (IS_ENABLED (CONFIG_HIST_TRIGGERS )) { +xbc_node_for_each_array_value (enode,"actions" , anode, p) { +if (strlcpy (buf, p,ARRAY_SIZE (buf)) >=ARRAY_SIZE (buf)) +pr_err ("action string is too long: %s\n" , p); +else if (trigger_process_regex (file, buf) <0 ) +pr_err ("Failed to apply an action: %s\n" , buf); + } + }else if (xbc_node_find_value (enode,"actions" ,NULL )) +pr_err ("Failed to apply event actions because CONFIG_HIST_TRIGGERS is not set.\n" );if (xbc_node_find_value (enode,"enable" ,NULL )) {if (trace_event_enable_disable (file,1 ,0 ) <0 )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 131/168 mtd: mtdconcat: Judge callback existence based on the master
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit f9e109a209a8e01e16f37e1252304f1eb3908be4 ]
Since commit 46b5889cc2c5("mtd: implement proper partition handling") applied, mtd partition device won't hold some callback functions, such as _block_isbad, _block_markbad, etc. Besides, function mtd_block_isbad() will get mtd device's master mtd device, then invokes master mtd device's callback function. So, following process may result mtd_block_isbad() always return 0, even though mtd device has bad blocks:
1. Split a mtd device into 3 partitions: PA, PB, PC
[ Each mtd partition device won't has callback function _block_isbad(). ]
2. Concatenate PA and PB as a new mtd device PN
[ mtd_concat_create() finds out each subdev has no callback function _block_isbad(), so PN won't be assigned callback function concat_block_isbad(). ]
Then, mtd_block_isbad() checks "!master->_block_isbad" is true, will always return 0.
Reproducer:
// reproduce.c
static int __init init_diy_module(void)
{
struct mtd_info *mtd[2];
struct mtd_info *mtd_combine = NULL;
mtd[0] = get_mtd_device_nm("NAND simulator partition 0");
if (!mtd[0]) {
pr_err("cannot find mtd1\n");
return -EINVAL;
}
mtd[1] = get_mtd_device_nm("NAND simulator partition 1");
if (!mtd[1]) {
pr_err("cannot find mtd2\n");
return -EINVAL;
}
put_mtd_device(mtd[0]);
put_mtd_device(mtd[1]);
mtd_combine = mtd_concat_create(mtd, 2, "Combine mtd");
if (mtd_combine == NULL) {
pr_err("combine failed\n");
return -EINVAL;
}
mtd_device_register(mtd_combine, NULL, 0);
pr_info("Combine success\n");
return 0;
}1. ID="0x20,0xac,0x00,0x15"
2. modprobe nandsim id_bytes=$ID parts=50,100 badblocks=100
3. insmod reproduce.ko
4. flash_erase /dev/mtd3 0 0
libmtd: error!: MEMERASE64 ioctl failed for eraseblock 100 (mtd3) error 5 (Input/output error)
// Should be "flash_erase: Skipping bad block at 00c80000"
--- drivers/mtd/mtdconcat.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-)
drivers/mtd/mtdconcat.c +19 -8
@@ -641,6 +641,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to cint i;size_t size;struct mtd_concat *concat; +struct mtd_info *subdev_master =NULL ;uint32_t max_erasesize, curr_erasesize;int num_erase_region;int max_writebufsize =0 ;
@@ -679,17 +680,19 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c concat->mtd.subpage_sft = subdev[0 ]->subpage_sft; concat->mtd.oobsize = subdev[0 ]->oobsize; concat->mtd.oobavail = subdev[0 ]->oobavail; -if (subdev[0 ]->_writev) + + subdev_master =mtd_get_master (subdev[0 ]); +if (subdev_master->_writev) concat->mtd._writev = concat_writev; -if (subdev[0 ]->_read_oob) +if (subdev_master->_read_oob) concat->mtd._read_oob = concat_read_oob; -if (subdev[0 ]->_write_oob) +if (subdev_master->_write_oob) concat->mtd._write_oob = concat_write_oob; -if (subdev[0 ]->_block_isbad) +if (subdev_master->_block_isbad) concat->mtd._block_isbad = concat_block_isbad; -if (subdev[0 ]->_block_markbad) +if (subdev_master->_block_markbad) concat->mtd._block_markbad = concat_block_markbad; -if (subdev[0 ]->_panic_write) +if (subdev_master->_panic_write) concat->mtd._panic_write = concat_panic_write; concat->mtd.ecc_stats.badblocks = subdev[0 ]->ecc_stats.badblocks;
@@ -721,14 +724,22 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c subdev[i]->flags &MTD_WRITEABLE ; } + subdev_master =mtd_get_master (subdev[i]); concat->mtd.size += subdev[i]->size; concat->mtd.ecc_stats.badblocks += subdev[i]->ecc_stats.badblocks;if (concat->mtd.writesize != subdev[i]->writesize || concat->mtd.subpage_sft != subdev[i]->subpage_sft || concat->mtd.oobsize != subdev[i]->oobsize || - !concat->mtd._read_oob != !subdev[i]->_read_oob || - !concat->mtd._write_oob != !subdev[i]->_write_oob) { + !concat->mtd._read_oob != !subdev_master->_read_oob || + !concat->mtd._write_oob != !subdev_master->_write_oob) { +/* +* Check against subdev[i] for data members, because +* subdev's attributes may be different from master +* mtd device. Check against subdev's master mtd +* device for callbacks, because the existence of +* subdev's callbacks is decided by master mtd device. +*/ kfree (concat);printk ("Incompatible OOB or ECC data on \"%s\"\n" , subdev[i]->name);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 132/168 mtd: mtdconcat: Check _read, _write callbacks existence before assignment
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit a89d69a44e282be95ae76125dddc79515541efeb ]
Since 2431c4f5b46c3 ("mtd: Implement mtd_{read,write}() as wrappers around mtd_{read,write}_oob()") don't allow _write|_read and _write_oob|_read_oob existing at the same time, we should check the existence of callbacks "_read and _write" from subdev's master device (We can trust master device since it has been registered) before assigning, otherwise following warning occurs while making concatenated device:
WARNING: CPU: 2 PID: 6728 at drivers/mtd/mtdcore.c:595 add_mtd_device+0x7f/0x7b0
--- drivers/mtd/mtdconcat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/mtd/mtdconcat.c +4 -2
@@ -694,6 +694,10 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c concat->mtd._block_markbad = concat_block_markbad;if (subdev_master->_panic_write) concat->mtd._panic_write = concat_panic_write; +if (subdev_master->_read) + concat->mtd._read = concat_read; +if (subdev_master->_write) + concat->mtd._write = concat_write; concat->mtd.ecc_stats.badblocks = subdev[0 ]->ecc_stats.badblocks;
@@ -755,8 +759,6 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c concat->mtd.name = name; concat->mtd._erase = concat_erase; - concat->mtd._read = concat_read; - concat->mtd._write = concat_write; concat->mtd._sync = concat_sync; concat->mtd._lock = concat_lock; concat->mtd._unlock = concat_unlock;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 133/168 KVM: arm64: Fix read-side race on updates to vcpu reset state
In reply to Greg Kroah-HartmanFrom: Oliver Upton <[email protected]>
[ Upstream commit 6654f9dfcb88fea3b9affc180dc3c04333d0f306 ]
KVM correctly serializes writes to a vCPU's reset state, however since we do not take the KVM lock on the read side it is entirely possible to read state from two different reset requests.
Cure the race for now by taking the KVM lock when reading the reset_state structure.
--- arch/arm64/kvm/reset.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/arm64/kvm/reset.c +10 -6
@@ -210,10 +210,16 @@ static bool vcpu_allowed_register_width(struct kvm_vcpu *vcpu)*/ int kvm_reset_vcpu (struct kvm_vcpu *vcpu) { +struct vcpu_reset_state reset_state;int ret;bool loaded;u32 pstate; +mutex_lock (&vcpu->kvm->lock); + reset_state = vcpu->arch.reset_state; +WRITE_ONCE (vcpu->arch.reset_state.reset, false); +mutex_unlock (&vcpu->kvm->lock); +/* Reset PMU outside of the non-preemptible section */ kvm_pmu_vcpu_reset (vcpu);
@@ -276,8 +282,8 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)* Additional reset state handling that PSCI may have imposed on us. * Must be done after all the sys_reg reset. */ -if (vcpu->arch.reset_state.reset) { -unsigned long target_pc = vcpu->arch.reset_state.pc; +if (reset_state.reset) { +unsigned long target_pc = reset_state.pc;/* Gracefully handle Thumb2 entry point */ if (vcpu_mode_is_32bit (vcpu) && (target_pc &1 )) {
@@ -286,13 +292,11 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) }/* Propagate caller endianness */ -if (vcpu->arch.reset_state.be) +if (reset_state.be)kvm_vcpu_set_be (vcpu); *vcpu_pc (vcpu) = target_pc; -vcpu_set_reg (vcpu,0 , vcpu->arch.reset_state.r0); - - vcpu->arch.reset_state.reset = false; +vcpu_set_reg (vcpu,0 , reset_state.r0); }/* Reset timer */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 134/168 KVM: arm64: Handle PSCI resets before userspace touches vCPU state
In reply to Greg Kroah-HartmanFrom: Oliver Upton <[email protected]>
[ Upstream commit 6826c6849b46aaa91300201213701eb861af4ba0 ]
The CPU_ON PSCI call takes a payload that KVM uses to configure a destination vCPU to run. This payload is non-architectural state and not exposed through any existing UAPI. Effectively, we have a race between CPU_ON and userspace saving/restoring a guest: if the target vCPU isn't ran again before the VMM saves its state, the requested PC and context ID are lost. When restored, the target vCPU will be runnable and start executing at its old PC.
We can avoid this race by making sure the reset payload is serviced before userspace can access a vCPU's state.
--- arch/arm64/kvm/arm.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/kvm/arm.c +8 -0
@@ -1220,6 +1220,14 @@ long kvm_arch_vcpu_ioctl(struct file *filp,if (copy_from_user (®, argp,sizeof (reg)))break ; +/* +* We could owe a reset due to PSCI. Handle the pending reset +* here to ensure userspace register accesses are ordered after +* the reset. +*/ +if (kvm_check_request (KVM_REQ_VCPU_RESET , vcpu)) +kvm_reset_vcpu (vcpu); +if (ioctl ==KVM_SET_ONE_REG ) r =kvm_arm_set_reg (vcpu, ®);else
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 135/168 PCI/PTM: Remove error message at boot
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit ff3a52ab9cab01a53b168dc667fe789f56b90aa9 ]
Since 39850ed51062 ("PCI/PTM: Save/restore Precision Time Measurement Capability for suspend/resume"), devices that have PTM capability but don't enable it see this message on calls to pci_save_state():
no suspend buffer for PTM
Drop the message, it's perfectly fine not to use a capability.
--- drivers/pci/pcie/ptm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pci/pcie/ptm.c +1 -3
@@ -60,10 +60,8 @@ void pci_save_ptm_state(struct pci_dev *dev)return ; save_state =pci_find_saved_ext_cap (dev,PCI_EXT_CAP_ID_PTM ); -if (!save_state) { -pci_err (dev,"no suspend buffer for PTM\n" ); +if (!save_state)return ; - } cap = (u16 *)&save_state->cap.data[0 ];pci_read_config_word (dev, ptm +PCI_PTM_CTRL , cap);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 136/168 PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
[ Upstream commit 817f9916a6e96ae43acdd4e75459ef4f92d96eb1 ]
The CONFIG_PCI=y case got a new parameter long time ago. Sync the stub as well.
--- include/linux/pci.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/pci.h +3 -2
@@ -1740,8 +1740,9 @@ static inline void pci_disable_device(struct pci_dev *dev) { }static inline int pcim_enable_device (struct pci_dev *pdev) {return -EIO ; }static inline int pci_assign_resource (struct pci_dev *dev,int i) {return -EBUSY ; } -static inline int __pci_register_driver (struct pci_driver *drv, -struct module *owner) +static inline int __must_check __pci_register_driver (struct pci_driver *drv, +struct module *owner, +const char *mod_name) {return 0 ; }static inline int pci_register_driver (struct pci_driver *drv) {return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 137/168 watchdog: Fix NULL pointer dereference when releasing cdev
In reply to Greg Kroah-HartmanFrom: Curtis Klein <[email protected]>
[ Upstream commit c7b178dae139f8857edc50888cfbf251cd974a38 ]
watchdog_hrtimer_pretimeout_stop needs the watchdog device to have a valid pointer to the watchdog core data to stop the pretimeout hrtimer. Therefore it needs to be called before the pointers are cleared in watchdog_cdev_unregister.
--- drivers/watchdog/watchdog_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/watchdog/watchdog_dev.c +2 -1
@@ -1096,6 +1096,8 @@ static void watchdog_cdev_unregister(struct watchdog_device *wdd)watchdog_stop (wdd); } +watchdog_hrtimer_pretimeout_stop (wdd); +mutex_lock (&wd_data->lock); wd_data->wdd =NULL ; wdd->wd_data =NULL ;
@@ -1103,7 +1105,6 @@ static void watchdog_cdev_unregister(struct watchdog_device *wdd)hrtimer_cancel (&wd_data->timer);kthread_cancel_work_sync (&wd_data->work); -watchdog_hrtimer_pretimeout_stop (wdd);put_device (&wd_data->dev); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 138/168 mtd: rawnand: cafe: Fix a resource leak in the error handling path of cafe_nand_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 6b430c7595e4eb95fae8fb54adc3c3ce002e75ae ]
A successful 'init_rs_non_canonical()' call should be balanced by a corresponding 'free_rs()' call in the error handling path of the probe, as already done in the remove function.
Update the error handling path accordingly.
--- drivers/mtd/nand/raw/cafe_nand.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/nand/raw/cafe_nand.c +3 -1
@@ -751,7 +751,7 @@ static int cafe_nand_probe(struct pci_dev *pdev, "CAFE NAND", mtd);if (err) {dev_warn (&pdev->dev,"Could not register IRQ %d\n" , pdev->irq); - goto out_ior; + goto out_free_rs; }/* Disable master reset, enable NAND clock */
@@ -795,6 +795,8 @@ static int cafe_nand_probe(struct pci_dev *pdev,/* Disable NAND IRQ in global IRQ mask register */ cafe_writel (cafe, ~1 &cafe_readl (cafe,GLOBAL_IRQ_MASK ),GLOBAL_IRQ_MASK );free_irq (pdev->irq, mtd); + out_free_rs: +free_rs (cafe->rs); out_ior:pci_iounmap (pdev, cafe->mmio); out_free_mtd:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 139/168 ARC: export clear_user_page() for modules
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 6b5ff0405e4190f23780362ea324b250bc495683 ]
0day bot reports a build error:
ERROR: modpost: "clear_user_page" [drivers/media/v4l2-core/videobuf-dma-sg.ko] undefined!
so export it in arch/arc/ to fix the build error.
In most ARCHes, clear_user_page() is a macro. OTOH, in a few ARCHes it is a function and needs to be exported. PowerPC exported it in 2004. It looks like nds32 and nios2 still need to have it exported.
--- arch/arc/mm/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/mm/cache.c +1 -1
@@ -1123,7 +1123,7 @@ void clear_user_page(void *to, unsigned long u_vaddr, struct page *page)clear_page (to);clear_bit (PG_dc_clean, &page->flags); } - +EXPORT_SYMBOL (clear_user_page);/********************************************************************** * Explicit Cache flush request from user space via syscall
Signature · 9 lines
2.30.2 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Greg Kroah-Hartman
maintainerPATCH 140/168 perf config: Fix caching and memory leak in perf_home_perfconfig()
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 261f491133aecb943ccfdc3b3794e2d775607a87 ]
Acaict, perf_home_perfconfig() is supposed to cache the result of home_perfconfig, which returns the default location of perfconfig for the user, given the HOME environment variable.
However, the current implementation calls home_perfconfig every time perf_home_perfconfig() is called (so no caching is actually performed), replacing the previous pointer, thus also causing a memory leak.
This patch adds a check of whether either config or failed is set and, in that case, directly returns config without calling home_perfconfig at each invocation.
--- tools/perf/util/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/config.c +4 -1
@@ -581,7 +581,10 @@ const char *perf_home_perfconfig(void)static const char *config;static bool failed; - config = failed ?NULL :home_perfconfig (); +if (failed || config) +return config; + + config =home_perfconfig ();if (!config) failed = true;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 141/168 perf unwind: Do not overwrite FEATURE_CHECK_LDFLAGS-libunwind-{x86,aarch64}
In reply to Greg Kroah-HartmanFrom: Li Huafei <[email protected]>
[ Upstream commit cdf32b44678c382a31dc183d9a767306915cda7b ]
When setting LIBUNWIND_DIR, we first set
FEATURE_CHECK_LDFLAGS-libunwind-{aarch64,x86} = -L$(LIBUNWIND_DIR)/lib.
<committer note>
This happens a bit before, the overwritting, in:
libunwind_arch_set_flags = $(eval $(libunwind_arch_set_flags_code))
define libunwind_arch_set_flags_code
FEATURE_CHECK_CFLAGS-libunwind-$(1) = -I$(LIBUNWIND_DIR)/include
FEATURE_CHECK_LDFLAGS-libunwind-$(1) = -L$(LIBUNWIND_DIR)/lib
endef
ifdef LIBUNWIND_DIR
LIBUNWIND_CFLAGS = -I$(LIBUNWIND_DIR)/include
LIBUNWIND_LDFLAGS = -L$(LIBUNWIND_DIR)/lib
LIBUNWIND_ARCHS = x86 x86_64 arm aarch64 debug-frame-arm debug-frame-aarch64
$(foreach libunwind_arch,$(LIBUNWIND_ARCHS),$(call libunwind_arch_set_flags,$(libunwind_arch)))
endifLook at that 'foreach' on all the LIBUNWIND_ARCHS. </>
After commit 5c4d7c82c0dc ("perf unwind: Do not put libunwind-{x86,aarch64} in FEATURE_TESTS_BASIC"), FEATURE_CHECK_LDFLAGS-libunwind-{x86,aarch64} is overwritten. As a result, the remote libunwind libraries cannot be searched from $(LIBUNWIND_DIR)/lib directory during feature check tests. Fix it with variable appending.
Before this patch:
perf$ make VF=1 LIBUNWIND_DIR=/opt/libunwind_aarch64
BUILD: Doing 'make -j16' parallel build
<SNIP>
...
... libopencsd: [ OFF ]
... libunwind-x86: [ OFF ]
... libunwind-x86_64: [ OFF ]
... libunwind-arm: [ OFF ]
... libunwind-aarch64: [ OFF ]
... libunwind-debug-frame: [ OFF ]
... libunwind-debug-frame-arm: [ OFF ]
... libunwind-debug-frame-aarch64: [ OFF ]
... cxx: [ OFF ]
<SNIP>
perf$ cat ../build/feature/test-libunwind-aarch64.make.output /usr/bin/ld: cannot find -lunwind-aarch64 /usr/bin/ld: cannot find -lunwind-aarch64
collect2: error: ld returned 1 exit status
After this patch:
perf$ make VF=1 LIBUNWIND_DIR=/opt/libunwind_aarch64
BUILD: Doing 'make -j16' parallel build
<SNIP>
... libopencsd: [ OFF ]
... libunwind-x86: [ OFF ]
... libunwind-x86_64: [ OFF ]
... libunwind-arm: [ OFF ]
... libunwind-aarch64: [ on ]
... libunwind-debug-frame: [ OFF ]
... libunwind-debug-frame-arm: [ OFF ]
... libunwind-debug-frame-aarch64: [ OFF ]
... cxx: [ OFF ]
<SNIP>
perf$ cat ../build/feature/test-libunwind-aarch64.make.output
perf$ ldd ./perf
linux-vdso.so.1 (0x00007ffdf07da000)
libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f30953dc000)
librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f30951d4000)
libm.so.6 => /lib/x86_64-linux-gnu/libm.so.6 (0x00007f3094e36000)
libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f3094c32000)
libelf.so.1 => /usr/lib/x86_64-linux-gnu/libelf.so.1 (0x00007f3094a18000)
libdw.so.1 => /usr/lib/x86_64-linux-gnu/libdw.so.1 (0x00007f30947cc000)
libunwind-x86_64.so.8 => /usr/lib/x86_64-linux-gnu/libunwind-x86_64.so.8 (0x00007f30945ad000)
libunwind.so.8 => /usr/lib/x86_64-linux-gnu/libunwind.so.8 (0x00007f3094392000)
liblzma.so.5 => /lib/x86_64-linux-gnu/liblzma.so.5 (0x00007f309416c000)
libunwind-aarch64.so.8 => not found
libslang.so.2 => /lib/x86_64-linux-gnu/libslang.so.2 (0x00007f3093c8a000)
libpython2.7.so.1.0 => /usr/local/lib/libpython2.7.so.1.0 (0x00007f309386b000)
libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 (0x00007f309364e000)
libnuma.so.1 => /usr/lib/x86_64-linux-gnu/libnuma.so.1 (0x00007f3093443000)
libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f3093052000)
/lib64/ld-linux-x86-64.so.2 (0x00007f3096097000)
libbz2.so.1.0 => /lib/x86_64-linux-gnu/libbz2.so.1.0 (0x00007f3092e42000)
libutil.so.1 => /lib/x86_64-linux-gnu/libutil.so.1 (0x00007f3092c3f000)--- tools/perf/Makefile.config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/Makefile.config +4 -4
@@ -133,10 +133,10 @@ FEATURE_CHECK_LDFLAGS-libunwind = $(LIBUNWIND_LDFLAGS) $(LIBUNWIND_LIBS) FEATURE_CHECK_CFLAGS-libunwind-debug-frame = $(LIBUNWIND_CFLAGS) FEATURE_CHECK_LDFLAGS-libunwind-debug-frame = $(LIBUNWIND_LDFLAGS) $(LIBUNWIND_LIBS) -FEATURE_CHECK_LDFLAGS-libunwind-arm = -lunwind -lunwind-arm -FEATURE_CHECK_LDFLAGS-libunwind-aarch64 = -lunwind -lunwind-aarch64 -FEATURE_CHECK_LDFLAGS-libunwind-x86 = -lunwind -llzma -lunwind-x86 -FEATURE_CHECK_LDFLAGS-libunwind-x86_64 = -lunwind -llzma -lunwind-x86_64 +FEATURE_CHECK_LDFLAGS-libunwind-arm += -lunwind -lunwind-arm +FEATURE_CHECK_LDFLAGS-libunwind-aarch64 += -lunwind -lunwind-aarch64 +FEATURE_CHECK_LDFLAGS-libunwind-x86 += -lunwind -llzma -lunwind-x86 +FEATURE_CHECK_LDFLAGS-libunwind-x86_64 += -lunwind -llzma -lunwind-x86_64 FEATURE_CHECK_LDFLAGS-libcrypto = -lcrypto
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 142/168 perf bench inject-buildid: Handle writen() errors
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit edf7b4a2d85e37a1ee77156bddaed4aa6af9c5e1 ]
The build on fedora:35 and fedora:rawhide with clang is failing with:
49 41.00 fedora:35 : FAIL clang version 13.0.0 (Fedora 13.0.0~rc1-1.fc35)
bench/inject-buildid.c:351:6: error: variable 'len' set but not used [-Werror,-Wunused-but-set-variable]
u64 len = 0;
^
1 error generated.
make[3]: *** [/git/perf-5.14.0-rc7/tools/build/Makefile.build:139: bench] Error 2
50 41.11 fedora:rawhide : FAIL clang version 13.0.0 (Fedora 13.0.0~rc1-1.fc35)
bench/inject-buildid.c:351:6: error: variable 'len' set but not used [-Werror,-Wunused-but-set-variable]
u64 len = 0;
^
1 error generated.
make[3]: *** [/git/perf-5.14.0-rc7/tools/build/Makefile.build:139: bench] Error 2That 'len' variable is not used at all, so just make sure all the synthesize_RECORD() routines return ssize_t to propagate the writen() return, as it may fail, ditch the 'ret' var and bail out if those routines fail.
--- tools/perf/bench/inject-buildid.c | 52 ++++++++++++++++++------------- 1 file changed, 30 insertions(+), 22 deletions(-)
tools/perf/bench/inject-buildid.c +30 -22
@@ -133,7 +133,7 @@ static u64 dso_map_addr(struct bench_dso *dso)return 0x400000ULL + dso->ino *8192ULL ; } -static u32 synthesize_attr (struct bench_data *data) +static ssize_t synthesize_attr (struct bench_data *data) {union perf_event event;
@@ -151,7 +151,7 @@ static u32 synthesize_attr(struct bench_data *data)return writen (data->input_pipe[1 ], &event, event.header.size); } -static u32 synthesize_fork (struct bench_data *data) +static ssize_t synthesize_fork (struct bench_data *data) {union perf_event event;
@@ -169,8 +169,7 @@ static u32 synthesize_fork(struct bench_data *data)return writen (data->input_pipe[1 ], &event, event.header.size); } -static u32 synthesize_mmap (struct bench_data *data,struct bench_dso *dso, -u64 timestamp) +static ssize_t synthesize_mmap (struct bench_data *data,struct bench_dso *dso,u64 timestamp) {union perf_event event;size_t len = offsetof(struct perf_record_mmap2 , filename);
@@ -198,23 +197,25 @@ static u32 synthesize_mmap(struct bench_data *data, struct bench_dso *dso,if (len >sizeof (event.mmap2)) {/* write mmap2 event first */ -writen (data->input_pipe[1 ], &event, len - bench_id_hdr_size); +if (writen (data->input_pipe[1 ], &event, len - bench_id_hdr_size) <0 ) +return -1 ;/* zero-fill sample id header */ memset (id_hdr_ptr,0 , bench_id_hdr_size);/* put timestamp in the right position */ ts_idx = (bench_id_hdr_size /sizeof (u64)) -2 ; id_hdr_ptr[ts_idx] = timestamp; -writen (data->input_pipe[1 ], id_hdr_ptr, bench_id_hdr_size); - }else { - ts_idx = (len /sizeof (u64)) -2 ; - id_hdr_ptr[ts_idx] = timestamp; -writen (data->input_pipe[1 ], &event, len); +if (writen (data->input_pipe[1 ], id_hdr_ptr, bench_id_hdr_size) <0 ) +return -1 ; + +return len; } -return len; + + ts_idx = (len /sizeof (u64)) -2 ; + id_hdr_ptr[ts_idx] = timestamp; +return writen (data->input_pipe[1 ], &event, len); } -static u32 synthesize_sample (struct bench_data *data,struct bench_dso *dso, -u64 timestamp) +static ssize_t synthesize_sample (struct bench_data *data,struct bench_dso *dso,u64 timestamp) {union perf_event event;struct perf_sample sample = {
@@ -233,7 +234,7 @@ static u32 synthesize_sample(struct bench_data *data, struct bench_dso *dso,return writen (data->input_pipe[1 ], &event, event.header.size); } -static u32 synthesize_flush (struct bench_data *data) +static ssize_t synthesize_flush (struct bench_data *data) {struct perf_event_header header = { .size =sizeof (header),
@@ -348,14 +349,16 @@ static int inject_build_id(struct bench_data *data, u64 *max_rss)int status;unsigned int i, k;struct rusage rusage; -u64 len =0 ;/* this makes the child to run */ if (perf_header__write_pipe (data->input_pipe[1 ]) <0 )return -1 ; - len +=synthesize_attr (data); - len +=synthesize_fork (data); +if (synthesize_attr (data) <0 ) +return -1 ; + +if (synthesize_fork (data) <0 ) +return -1 ;for (i =0 ; i < nr_mmaps; i++) {int idx =rand () % (nr_dsos -1 );
@@ -363,13 +366,18 @@ static int inject_build_id(struct bench_data *data, u64 *max_rss)u64 timestamp =rand () %1000000 ;pr_debug2 (" [%d] injecting: %s\n" , i+1 , dso->name); - len +=synthesize_mmap (data, dso, timestamp); +if (synthesize_mmap (data, dso, timestamp) <0 ) +return -1 ; -for (k =0 ; k < nr_samples; k++) - len +=synthesize_sample (data, dso, timestamp + k *1000 ); +for (k =0 ; k < nr_samples; k++) { +if (synthesize_sample (data, dso, timestamp + k *1000 ) <0 ) +return -1 ; + } -if ((i +1 ) %10 ==0 ) - len +=synthesize_flush (data); +if ((i +1 ) %10 ==0 ) { +if (synthesize_flush (data) <0 ) +return -1 ; + } }/* this makes the child to finish */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 143/168 gpio: mpc8xxx: Fix a resources leak in the error handling path of mpc8xxx_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 555bda42b0c1a5ffb72d3227c043e8afde778f1f ]
Commit 698b8eeaed72 ("gpio/mpc8xxx: change irq handler from chained to normal") has introduced a new 'goto err;' at the very end of the function, but has not updated the error handling path accordingly.
Add the now missing 'irq_domain_remove()' call which balances a previous 'irq_domain_create_linear() call.
--- drivers/gpio/gpio-mpc8xxx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-mpc8xxx.c +2 -0
@@ -416,6 +416,8 @@ static int mpc8xxx_probe(struct platform_device *pdev)return 0 ; err: +if (mpc8xxx_gc->irq) +irq_domain_remove (mpc8xxx_gc->irq);iounmap (mpc8xxx_gc->regs);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 144/168 gpio: mpc8xxx: Fix a potential double iounmap call in mpc8xxx_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 7d6588931ccd4c09e70a08175cf2e0cf7fc3b869 ]
Commit 76c47d1449fc ("gpio: mpc8xxx: Add ACPI support") has switched to a managed version when dealing with 'mpc8xxx_gc->regs'. So the corresponding 'iounmap()' call in the error handling path and in the remove should be removed to avoid a double unmap.
This also allows some simplification in the probe. All the error handling paths related to managed resources can be direct returns and a NULL check in what remains in the error handling path can be removed.
--- drivers/gpio/gpio-mpc8xxx.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/gpio/gpio-mpc8xxx.c +4 -7
@@ -332,7 +332,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) mpc8xxx_gc->regs +GPIO_DIR ,NULL , BGPIOF_BIG_ENDIAN);if (ret) - goto err; +return ret;dev_dbg (&pdev->dev,"GPIO registers are LITTLE endian\n" ); }else { ret = bgpio_init(gc, &pdev->dev, 4,
@@ -342,7 +342,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)BGPIOF_BIG_ENDIAN | BGPIOF_BIG_ENDIAN_BYTE_ORDER);if (ret) - goto err; +return ret;dev_dbg (&pdev->dev,"GPIO registers are BIG endian\n" ); }
@@ -384,7 +384,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"GPIO chip registration failed with status %d\n" , ret); - goto err; +return ret; } mpc8xxx_gc->irqn =platform_get_irq (pdev,0 );
@@ -416,9 +416,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)return 0 ; err: -if (mpc8xxx_gc->irq) -irq_domain_remove (mpc8xxx_gc->irq); -iounmap (mpc8xxx_gc->regs); +irq_domain_remove (mpc8xxx_gc->irq);return ret; }
@@ -432,7 +430,6 @@ static int mpc8xxx_remove(struct platform_device *pdev) }gpiochip_remove (&mpc8xxx_gc->gc); -iounmap (mpc8xxx_gc->regs);return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 145/168 gpio: mpc8xxx: Use devm_gpiochip_add_data() to simplify the code and avoid a leak
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 889a1b3f35db6ba5ba6a0c23a3a55594570b6a17 ]
If an error occurs after a 'gpiochip_add_data()' call it must be undone by a corresponding 'gpiochip_remove()' as already done in the remove function.
To simplify the code a fix a leak in the error handling path of the probe, use the managed version instead (i.e. 'devm_gpiochip_add_data()')
--- drivers/gpio/gpio-mpc8xxx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpio/gpio-mpc8xxx.c +1 -3
@@ -380,7 +380,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) is_acpi_node(fwnode)) gc->write_reg (mpc8xxx_gc->regs +GPIO_IBE ,0xffffffff ); - ret =gpiochip_add_data (gc, mpc8xxx_gc); + ret =devm_gpiochip_add_data (&pdev->dev, gc, mpc8xxx_gc);if (ret) {dev_err (&pdev->dev,"GPIO chip registration failed with status %d\n" , ret);
@@ -429,8 +429,6 @@ static int mpc8xxx_remove(struct platform_device *pdev)irq_domain_remove (mpc8xxx_gc->irq); } -gpiochip_remove (&mpc8xxx_gc->gc); -return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 146/168 io_uring: retry in case of short read on block device
In reply to Greg Kroah-HartmanFrom: Ming Lei <[email protected]>
[ Upstream commit 7db304375e11741e5940f9bc549155035bfb4dc1 ]
In case of buffered reading from block device, when short read happens, we should retry to read more, otherwise the IO will be completed partially, for example, the following fio expects to read 2MB, but it can only read 1M or less bytes:
fio --name=onessd --filename=/dev/nvme0n1 --filesize=2M \ --rw=randread --bs=2M --direct=0 --overwrite=0 --numjobs=1 \ --iodepth=1 --time_based=0 --runtime=2 --ioengine=io_uring \ --registerfiles --fixedbufs --gtod_reduce=1 --group_reporting
Fix the issue by allowing short read retry for block device, which sets FMODE_BUF_RASYNC really.
--- fs/io_uring.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/io_uring.c +7 -1
@@ -3286,6 +3286,12 @@ static inline int io_iter_do_read(struct io_kiocb *req, struct iov_iter *iter)return -EINVAL ; } +static bool need_read_all (struct io_kiocb *req) +{ +return req->flags &REQ_F_ISREG || +S_ISBLK (file_inode (req->file)->i_mode); +} +static int io_read (struct io_kiocb *req,unsigned int issue_flags) {struct iovec inline_vecs[UIO_FASTIOV ], *iovec = inline_vecs;
@@ -3340,7 +3346,7 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags) }else if (ret == -EIOCBQUEUED ) { goto out_free; }else if (ret <=0 || ret == io_size || !force_nonblock || - (req->flags &REQ_F_NOWAIT ) || !(req->flags &REQ_F_ISREG )) { + (req->flags &REQ_F_NOWAIT ) || !need_read_all (req)) {/* read all, failed, already did sync or don't want to retry */ goto done; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 147/168 net: dsa: tag_rtl4_a: Fix egress tags
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 0e90dfa7a8d817db755c7b5d89d77b9c485e4180 ]
I noticed that only port 0 worked on the RTL8366RB since we started to use custom tags.
It turns out that the format of egress custom tags is actually different from ingress custom tags. While the lower bits just contain the port number in ingress tags, egress tags need to indicate destination port by setting the bit for the corresponding port.
It was working on port 0 because port 0 added 0x00 as port number in the lower bits, and if you do this the packet appears at all ports, including the intended port. Ooops.
Fix this and all ports work again. Use the define for shifting the "type A" into place while we're at it.
Tested on the D-Link DIR-685 by sending traffic to each of the ports in turn. It works.
--- net/dsa/tag_rtl4_a.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/dsa/tag_rtl4_a.c +4 -3
@@ -54,9 +54,10 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, p = (__be16 *)tag; *p =htons (RTL4_A_ETHERTYPE ); - out = (RTL4_A_PROTOCOL_RTL8366RB <<12 ) | (2 <<8 ); -/* The lower bits is the port number */ - out |= (u8 )dp->index; + out = (RTL4_A_PROTOCOL_RTL8366RB <<RTL4_A_PROTOCOL_SHIFT ) | (2 <<8 ); +/* The lower bits indicate the port number */ + out |=BIT (dp->index); + p = (__be16 *)(tag +2 ); *p =htons (out);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 148/168 tools build: Fix feature detect clean for out of source builds
In reply to Greg Kroah-HartmanFrom: James Clark <[email protected]>
[ Upstream commit 8af52e69772d053bc7caab12ad1c59f18ef2e3e2 ]
Currently the clean target when using O= isn't cleaning the feature detect output. This is because O= and OUTPUT= are set to canonical paths. For example in tools/perf/Makefile:
FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O))
This means that OUTPUT ends in a / and most usages prepend it to a file without adding an extra /. This line that was changed adds an extra / before the 'feature' folder but not to the end, resulting in a clean command like this:
rm -f /tmp/build//featuretest-all.bin ...
After the change the clean command looks like this:
rm -f /tmp/build/feature/test-all.bin ...
--- tools/build/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/build/Makefile +1 -1
@@ -32,7 +32,7 @@ all: $(OUTPUT)fixdep # Make sure there's anything to clean, # feature contains check for existing OUTPUT -TMP_O := $(if $(OUTPUT),$(OUTPUT)/feature,./) +TMP_O := $(if $(OUTPUT),$(OUTPUT)feature/,./) clean: $(call QUIET_CLEAN, fixdep)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 149/168 mptcp: fix possible divide by zero
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 1094c6fe7280e17e0e87934add5ad2585e990def ]
Florian noted that if mptcp_alloc_tx_skb() allocation fails in __mptcp_push_pending(), we can end-up invoking mptcp_push_release()/tcp_push() with a zero mss, causing a divide by 0 error.
This change addresses the issue refactoring the skb allocation code checking if skb collapsing will happen for sure and doing the skb allocation only after such check. Skb allocation will now happen only after the call to tcp_send_mss() which correctly initializes mss_now.
As side bonuses we now fill the skb tx cache only when needed, and this also clean-up a bit the output path.
v1 -> v2:
- use lockdep_assert_held_once() - Jakub
- fix indentation - Jakub
--- net/mptcp/protocol.c | 76 ++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 41 deletions(-)
net/mptcp/protocol.c +35 -41
@@ -994,6 +994,13 @@ static void mptcp_wmem_uncharge(struct sock *sk, int size) msk->wmem_reserved += size; } +static void __mptcp_mem_reclaim_partial (struct sock *sk) +{ +lockdep_assert_held_once (&sk->sk_lock.slock); +__mptcp_update_wmem (sk); +sk_mem_reclaim_partial (sk); +} +static void mptcp_mem_reclaim_partial (struct sock *sk) {struct mptcp_sock *msk =mptcp_sk (sk);
@@ -1069,12 +1076,8 @@ static void __mptcp_clean_una(struct sock *sk) } out: -if (cleaned) { -if (tcp_under_memory_pressure (sk)) { -__mptcp_update_wmem (sk); -sk_mem_reclaim_partial (sk); - } - } +if (cleaned &&tcp_under_memory_pressure (sk)) +__mptcp_mem_reclaim_partial (sk);if (snd_una ==READ_ONCE (msk->snd_nxt)) {if (msk->timer_ival && !mptcp_data_fin_enabled (msk))
@@ -1154,6 +1157,7 @@ struct mptcp_sendmsg_info {u16 limit;u16 sent;unsigned int flags; +bool data_lock_held; }; static int mptcp_check_allowed_size(struct mptcp_sock *msk, u64 data_seq,
@@ -1225,17 +1229,17 @@ static bool __mptcp_alloc_tx_skb(struct sock *sk, struct sock *ssk, gfp_t gfp)return false; } -static bool mptcp_must_reclaim_memory (struct sock *sk,struct sock *ssk) +static bool mptcp_alloc_tx_skb (struct sock *sk,struct sock *ssk,bool data_lock_held) { -return !ssk->sk_tx_skb_cache && -tcp_under_memory_pressure (sk); -} +gfp_t gfp = data_lock_held ?GFP_ATOMIC : sk->sk_allocation; -static bool mptcp_alloc_tx_skb (struct sock *sk,struct sock *ssk) -{ -if (unlikely (mptcp_must_reclaim_memory (sk, ssk))) -mptcp_mem_reclaim_partial (sk); -return __mptcp_alloc_tx_skb (sk, ssk, sk->sk_allocation); +if (unlikely (tcp_under_memory_pressure (sk))) { +if (data_lock_held) +__mptcp_mem_reclaim_partial (sk); +else +mptcp_mem_reclaim_partial (sk); + } +return __mptcp_alloc_tx_skb (sk, ssk, gfp); }/* note: this always recompute the csum on the whole skb, even
@@ -1259,7 +1263,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,bool zero_window_probe = false;struct mptcp_ext *mpext =NULL ;struct sk_buff *skb, *tail; -bool can_collapse = false; +bool must_collapse = false;int size_bias =0 ;int avail_size;size_t ret =0 ;
@@ -1279,16 +1283,24 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,* SSN association set here */ mpext =skb_ext_find (skb,SKB_EXT_MPTCP ); - can_collapse = (info->size_goal - skb->len >0 ) && -mptcp_skb_can_collapse_to (data_seq, skb, mpext); -if (!can_collapse) { +if (!mptcp_skb_can_collapse_to (data_seq, skb, mpext)) {TCP_SKB_CB (skb)->eor =1 ; - }else { + goto alloc_skb; + } + + must_collapse = (info->size_goal - skb->len >0 ) && + (skb_shinfo (skb)->nr_frags < sysctl_max_skb_frags); +if (must_collapse) { size_bias = skb->len; avail_size = info->size_goal - skb->len; } } +alloc_skb: +if (!must_collapse && !ssk->sk_tx_skb_cache && + !mptcp_alloc_tx_skb (sk, ssk, info->data_lock_held)) +return 0 ; +/* Zero window and all data acked? Probe. */ avail_size =mptcp_check_allowed_size (msk, data_seq, avail_size);if (avail_size ==0 ) {
@@ -1318,7 +1330,6 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,if (skb == tail) {TCP_SKB_CB (tail)->tcp_flags &= ~TCPHDR_PSH ; mpext->data_len += ret; -WARN_ON_ONCE (!can_collapse);WARN_ON_ONCE (zero_window_probe); goto out; }
@@ -1470,15 +1481,6 @@ static void __mptcp_push_pending(struct sock *sk, unsigned int flags)if (ssk != prev_ssk || !prev_ssk)lock_sock (ssk); -/* keep it simple and always provide a new skb for the -* subflow, even if we will not use it when collapsing -* on the pending one -*/ -if (!mptcp_alloc_tx_skb (sk, ssk)) { -mptcp_push_release (sk, ssk, &info); - goto out; - } - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info);if (ret <=0 ) {mptcp_push_release (sk, ssk, &info);
@@ -1512,7 +1514,9 @@ out:static void __mptcp_subflow_push_pending (struct sock *sk,struct sock *ssk) {struct mptcp_sock *msk =mptcp_sk (sk); -struct mptcp_sendmsg_info info; +struct mptcp_sendmsg_info info = { + .data_lock_held = true, + };struct mptcp_data_frag *dfrag;struct sock *xmit_ssk;int len, copied =0 ;
@@ -1538,13 +1542,6 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) goto out; } -if (unlikely (mptcp_must_reclaim_memory (sk, ssk))) { -__mptcp_update_wmem (sk); -sk_mem_reclaim_partial (sk); - } -if (!__mptcp_alloc_tx_skb (sk, ssk,GFP_ATOMIC )) - goto out; - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info);if (ret <=0 ) goto out;
@@ -2296,9 +2293,6 @@ static void __mptcp_retrans(struct sock *sk) info.sent =0 ; info.limit =READ_ONCE (msk->csum_enabled) ? dfrag->data_len : dfrag->already_sent;while (info.sent < info.limit) { -if (!mptcp_alloc_tx_skb (sk, ssk)) -break ; - ret =mptcp_sendmsg_frag (sk, ssk, dfrag, &info);if (ret <=0 )break ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 150/168 selftests: mptcp: clean tmp files in simult_flows
In reply to Greg Kroah-HartmanFrom: Matthieu Baerts <[email protected]>
[ Upstream commit bfd862a7e9318dd906844807a713d27cdd1a72b1 ]
'$cin' and '$sin' variables are local to a function: they are then not available from the cleanup trap.
Instead, we need to use '$large' and '$small' that are not local and defined just before setting the trap.
Without this patch, running this script in a loop might cause a:
write: No space left on device
issue.
--- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/simult_flows.sh +2 -2
@@ -22,8 +22,8 @@ usage() { cleanup() { - rm -f "$cin" "$cout" - rm -f "$sin" "$sout" + rm -f "$cout" "$sout" + rm -f "$large" "$small" rm -f "$capout" local netns
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 151/168 net: hso: add failure handler for add_net_device
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit ecdc28defc46af476566fffd9e5cb4495a2f176e ]
If the network devices connected to the system beyond HSO_MAX_NET_DEVICES. add_net_device() in hso_create_net_device() will be failed for the network_table is full. It will lead to business failure which rely on network_table, for example, hso_suspend() and hso_resume(). It will also lead to memory leak because resource release process can not search the hso_device object from network_table in hso_free_interface().
Add failure handler for add_net_device() in hso_create_net_device() to solve the above problems.
--- drivers/net/usb/hso.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/usb/hso.c +8 -3
@@ -2536,13 +2536,17 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,if (!hso_net->mux_bulk_tx_buf) goto err_free_tx_urb; -add_net_device (hso_dev); + result =add_net_device (hso_dev); +if (result) { +dev_err (&interface->dev,"Failed to add net device\n" ); + goto err_free_tx_buf; + }/* registering our net device */ result =register_netdev (net);if (result) {dev_err (&interface->dev,"Failed to register device\n" ); - goto err_free_tx_buf; + goto err_rmv_ndev; }hso_log_port (hso_dev);
@@ -2551,8 +2555,9 @@ static struct hso_device *hso_create_net_device(struct usb_interface *interface,return hso_dev; -err_free_tx_buf: +err_rmv_ndev:remove_net_device (hso_dev); +err_free_tx_buf:kfree (hso_net->mux_bulk_tx_buf); err_free_tx_urb:usb_free_urb (hso_net->mux_bulk_tx_urb);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 152/168 net: dsa: b53: Fix calculating number of switch ports
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit cdb067d31c0fe4cce98b9d15f1f2ef525acaa094 ]
It isn't true that CPU port is always the last one. Switches BCM5301x have 9 ports (port 6 being inactive) and they use port 5 as CPU by default (depending on design some other may be CPU ports too).
A more reliable way of determining number of ports is to check for the last set bit in the "enabled_ports" bitfield.
This fixes b53 internal state, it will allow providing accurate info to the DSA and is required to fix BCM5301x support.
--- drivers/net/dsa/b53/b53_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/dsa/b53/b53_common.c +1 -2
@@ -2612,9 +2612,8 @@ static int b53_switch_init(struct b53_device *dev) dev->cpu_port =5 ; } -/* cpu port is always last */ - dev->num_ports = dev->cpu_port +1 ; dev->enabled_ports |=BIT (dev->cpu_port); + dev->num_ports =fls (dev->enabled_ports);/* Include non standard CPU port built-in PHYs to be probed */ if (is539x (dev) ||is531x5 (dev)) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 153/168 net: dsa: b53: Set correct number of ports in the DSA struct
In reply to Greg Kroah-HartmanFrom: Rafał Miłecki <[email protected]>
[ Upstream commit d12e1c4649883e8ca5e8ff341e1948b3b6313259 ]
Setting DSA_MAX_PORTS caused DSA to call b53 callbacks (e.g. b53_disable_port() during dsa_register_switch()) for invalid (non-existent) ports. That made b53 modify unrelated registers and is one of reasons for a broken BCM5301x support.
This problem exists for years but DSA_MAX_PORTS usage has changed few times. It seems the most accurate to reference commit dropping dsa_switch_alloc() in the Fixes tag.
--- drivers/net/dsa/b53/b53_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/dsa/b53/b53_common.c +2 -1
@@ -2615,6 +2615,8 @@ static int b53_switch_init(struct b53_device *dev) dev->enabled_ports |=BIT (dev->cpu_port); dev->num_ports =fls (dev->enabled_ports); + dev->ds->num_ports = min_t(unsigned int, dev->num_ports, DSA_MAX_PORTS); +/* Include non standard CPU port built-in PHYs to be probed */ if (is539x (dev) ||is531x5 (dev)) {for (i =0 ; i < dev->num_ports; i++) {
@@ -2659,7 +2661,6 @@ struct b53_device *b53_switch_alloc(struct device *base,return NULL ; ds->dev = base; - ds->num_ports =DSA_MAX_PORTS ; dev =devm_kzalloc (base,sizeof (*dev),GFP_KERNEL );if (!dev)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 154/168 mptcp: Only send extra TCP acks in eligible socket states
In reply to Greg Kroah-HartmanFrom: Mat Martineau <[email protected]>
[ Upstream commit 340fa6667a696338e707cd5531a9631093d1be29 ]
Recent changes exposed a bug where specifically-timed requests to the path manager netlink API could trigger a divide-by-zero in __tcp_select_window(), as syzkaller does:
divide error: 0000 [#1] SMP KASAN NOPTI
CPU: 0 PID: 9667 Comm: syz-executor.0 Not tainted 5.14.0-rc6+ #3 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:__tcp_select_window+0x509/0xa60 net/ipv4/tcp_output.c:3016 Code: 44 89 ff e8 c9 29 e9 fd 45 39 e7 0f 8d 20 ff ff ff e8 db 28 e9 fd 44 89 e3 e9 13 ff ff ff e8 ce 28 e9 fd 44 89 e0 44 89 e3 99 <f7> 7c 24 04 29 d3 e9 fc fe ff ff e8 b7 28 e9 fd 44 89 f1 48 89 ea RSP: 0018:ffff888031ccf020 EFLAGS: 00010216 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000040000 RDX: 0000000000000000 RSI: ffff88811532c080 RDI: 0000000000000002 RBP: 0000000000000000 R08: ffffffff835807c2 R09: 0000000000000000 R10: 0000000000000004 R11: ffffed1020b92441 R12: 0000000000000000 R13: 1ffff11006399e08 R14: 0000000000000000 R15: 0000000000000000 FS: 00007fa4c8344700(0000) GS:ffff88811ae00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b2f424000 CR3: 000000003e4e2003 CR4: 0000000000770ef0 PKRU: 55555554 Call Trace: tcp_select_window net/ipv4/tcp_output.c:264 [inline] __tcp_transmit_skb+0xc00/0x37a0 net/ipv4/tcp_output.c:1351 __tcp_send_ack.part.0+0x3ec/0x760 net/ipv4/tcp_output.c:3972 __tcp_send_ack net/ipv4/tcp_output.c:3978 [inline] tcp_send_ack+0x7d/0xa0 net/ipv4/tcp_output.c:3978 mptcp_pm_nl_addr_send_ack+0x1ab/0x380 net/mptcp/pm_netlink.c:654 mptcp_pm_remove_addr+0x161/0x200 net/mptcp/pm.c:58 mptcp_nl_remove_id_zero_address+0x197/0x460 net/mptcp/pm_netlink.c:1328 mptcp_nl_cmd_del_addr+0x98b/0xd40 net/mptcp/pm_netlink.c:1359 genl_family_rcv_msg_doit.isra.0+0x225/0x340 net/netlink/genetlink.c:731 genl_family_rcv_msg net/netlink/genetlink.c:775 [inline] genl_rcv_msg+0x341/0x5b0 net/netlink/genetlink.c:792 netlink_rcv_skb+0x148/0x430 net/netlink/af_netlink.c:2504 genl_rcv+0x24/0x40 net/netlink/genetlink.c:803 netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline] netlink_unicast+0x537/0x750 net/netlink/af_netlink.c:1340 netlink_sendmsg+0x846/0xd80 net/netlink/af_netlink.c:1929 sock_sendmsg_nosec net/socket.c:704 [inline] sock_sendmsg+0x14e/0x190 net/socket.c:724 ____sys_sendmsg+0x709/0x870 net/socket.c:2403 ___sys_sendmsg+0xff/0x170 net/socket.c:2457 __sys_sendmsg+0xe5/0x1b0 net/socket.c:2486 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x38/0x90 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae
mptcp_pm_nl_addr_send_ack() was attempting to send a TCP ACK on the first subflow in the MPTCP socket's connection list without validating that the subflow was in a suitable connection state. To address this, always validate subflow state when sending extra ACKs on subflows for address advertisement or subflow priority change.
--- net/mptcp/pm_netlink.c | 10 ++-------- net/mptcp/protocol.c | 21 ++++++++++++--------- net/mptcp/protocol.h | 1 + 3 files changed, 15 insertions(+), 17 deletions(-)
net/mptcp/pm_netlink.c +2 -8
@@ -540,7 +540,6 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk) subflow =list_first_entry_or_null (&msk->conn_list,typeof (*subflow), node);if (subflow) {struct sock *ssk =mptcp_subflow_tcp_sock (subflow); -bool slow;spin_unlock_bh (&msk->pm.lock); pr_debug("send ack for %s%s%s",
@@ -548,9 +547,7 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)mptcp_pm_should_add_signal_ipv6 (msk) ?" [ipv6]" :"" , mptcp_pm_should_add_signal_port(msk) ? " [port]" : ""); - slow =lock_sock_fast (ssk); -tcp_send_ack (ssk); -unlock_sock_fast (ssk, slow); +mptcp_subflow_send_ack (ssk);spin_lock_bh (&msk->pm.lock); } }
@@ -567,7 +564,6 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,struct sock *ssk =mptcp_subflow_tcp_sock (subflow);struct sock *sk = (struct sock *)msk;struct mptcp_addr_info local; -bool slow;local_address ((struct sock_common *)ssk, &local);if (!addresses_equal (&local, addr, addr->port))
@@ -580,9 +576,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,spin_unlock_bh (&msk->pm.lock);pr_debug ("send ack for mp_prio" ); - slow =lock_sock_fast (ssk); -tcp_send_ack (ssk); -unlock_sock_fast (ssk, slow); +mptcp_subflow_send_ack (ssk);spin_lock_bh (&msk->pm.lock);return 0 ;
net/mptcp/protocol.c +12 -9
@@ -427,19 +427,22 @@ static bool tcp_can_send_ack(const struct sock *ssk) (TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_TIME_WAIT | TCPF_CLOSE | TCPF_LISTEN)); } +void mptcp_subflow_send_ack (struct sock *ssk) +{ +bool slow; + + slow =lock_sock_fast (ssk); +if (tcp_can_send_ack (ssk)) +tcp_send_ack (ssk); +unlock_sock_fast (ssk, slow); +} +static void mptcp_send_ack (struct mptcp_sock *msk) {struct mptcp_subflow_context *subflow; -mptcp_for_each_subflow (msk, subflow) { -struct sock *ssk =mptcp_subflow_tcp_sock (subflow); -bool slow; - - slow =lock_sock_fast (ssk); -if (tcp_can_send_ack (ssk)) -tcp_send_ack (ssk); -unlock_sock_fast (ssk, slow); - } +mptcp_for_each_subflow (msk, subflow) +mptcp_subflow_send_ack (mptcp_subflow_tcp_sock (subflow)); }static void mptcp_subflow_cleanup_rbuf (struct sock *ssk)
net/mptcp/protocol.h +1 -0
@@ -560,6 +560,7 @@ void __init mptcp_subflow_init(void);void mptcp_subflow_shutdown (struct sock *sk,struct sock *ssk,int how);void mptcp_close_ssk (struct sock *sk,struct sock *ssk,struct mptcp_subflow_context *subflow); +void mptcp_subflow_send_ack (struct sock *ssk);void mptcp_subflow_reset (struct sock *ssk);void mptcp_sock_graft (struct sock *sk,struct socket *parent);struct socket *__mptcp_nmpc_socket (const struct mptcp_sock *msk);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 155/168 netfilter: socket: icmp6: fix use-after-scope
In reply to Greg Kroah-HartmanFrom: Benjamin Hesmans <[email protected]>
[ Upstream commit 730affed24bffcd1eebd5903171960f5ff9f1f22 ]
Bug reported by KASAN:
BUG: KASAN: use-after-scope in inet6_ehashfn (net/ipv6/inet6_hashtables.c:40) Call Trace:
(...)inet6_ehashfn (net/ipv6/inet6_hashtables.c:40) (...)nf_sk_lookup_slow_v6 (net/ipv6/netfilter/nf_socket_ipv6.c:91 net/ipv6/netfilter/nf_socket_ipv6.c:146)
It seems that this bug has already been fixed by Eric Dumazet in the past in:
commit 78296c97ca1f ("netfilter: xt_socket: fix a stack corruption bug")
But a variant of the same issue has been introduced in
commit d64d80a2cde9 ("netfilter: x_tables: don't extract flow keys on early demuxed sks in socket match")
daddr and saddr potentially hold a reference to ipv6_var that is no longer in scope when the call to nf_socket_get_sock_v6 is made.
--- net/ipv6/netfilter/nf_socket_ipv6.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/ipv6/netfilter/nf_socket_ipv6.c +1 -3
@@ -99,7 +99,7 @@ struct sock *nf_sk_lookup_slow_v6(struct net *net, const struct sk_buff *skb, {__be16 dport, sport;const struct in6_addr *daddr =NULL , *saddr =NULL ; -struct ipv6hdr *iph =ipv6_hdr (skb); +struct ipv6hdr *iph =ipv6_hdr (skb), ipv6_var;struct sk_buff *data_skb =NULL ;int doff =0 ;int thoff =0 , tproto;
@@ -129,8 +129,6 @@ struct sock *nf_sk_lookup_slow_v6(struct net *net, const struct sk_buff *skb, thoff +sizeof (*hp); }else if (tproto ==IPPROTO_ICMPV6 ) { -struct ipv6hdr ipv6_var; -if (extract_icmp6_fields (skb, thoff, &tproto, &saddr, &daddr, &sport, &dport, &ipv6_var))return NULL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 156/168 fq_codel: reject silly quantum parameters
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit c7c5e6ff533fe1f9afef7d2fa46678987a1335a7 ]
syzbot found that forcing a big quantum attribute would crash hosts fast, essentially using this:
tc qd replace dev eth0 root fq_codel quantum 4294967295
This is because fq_codel_dequeue() would have to loop ~2^31 times in :
if (flow->deficit <= 0) {
flow->deficit += q->quantum;
list_move_tail(&flow->flowchain, &q->old_flows);
goto begin;
}SFQ max quantum is 2^19 (half a megabyte) Lets adopt a max quantum of one megabyte for FQ_CODEL.
--- include/uapi/linux/pkt_sched.h | 2 ++ net/sched/sch_fq_codel.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
include/uapi/linux/pkt_sched.h +2 -0
@@ -827,6 +827,8 @@ struct tc_codel_xstats {/* FQ_CODEL */ +#define FQ_CODEL_QUANTUM_MAX (1 << 20) +enum {TCA_FQ_CODEL_UNSPEC ,TCA_FQ_CODEL_TARGET ,
net/sched/sch_fq_codel.c +10 -2
@@ -369,6 +369,7 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt, {struct fq_codel_sched_data *q =qdisc_priv (sch);struct nlattr *tb[TCA_FQ_CODEL_MAX +1 ]; +u32 quantum =0 ;int err;if (!opt)
@@ -386,6 +387,13 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt, q->flows_cnt > 65536)return -EINVAL ; } +if (tb[TCA_FQ_CODEL_QUANTUM ]) { + quantum =max (256U ,nla_get_u32 (tb[TCA_FQ_CODEL_QUANTUM ])); +if (quantum >FQ_CODEL_QUANTUM_MAX ) { +NL_SET_ERR_MSG (extack,"Invalid quantum" ); +return -EINVAL ; + } + }sch_tree_lock (sch);if (tb[TCA_FQ_CODEL_TARGET ]) {
@@ -412,8 +420,8 @@ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt,if (tb[TCA_FQ_CODEL_ECN ]) q->cparams.ecn = !!nla_get_u32 (tb[TCA_FQ_CODEL_ECN ]); -if (tb[TCA_FQ_CODEL_QUANTUM ]) - q->quantum =max (256U ,nla_get_u32 (tb[TCA_FQ_CODEL_QUANTUM ])); +if (quantum) + q->quantum = quantum;if (tb[TCA_FQ_CODEL_DROP_BATCH_SIZE ]) q->drop_batch_size =max (1U ,nla_get_u32 (tb[TCA_FQ_CODEL_DROP_BATCH_SIZE ]));
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 157/168 qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit 9ddbc2a00d7f63fa9748f4278643193dac985f2d ]
Previous commit 68233c583ab4 removes the qlcnic_rom_lock() in qlcnic_pinit_from_rom(), but remains its corresponding unlock function, which is odd. I'm not very sure whether the lock is missing, or the unlock is redundant. This bug is suggested by a static analysis tool, please advise.
--- drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +0 -1
@@ -439,7 +439,6 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter)QLCWR32 (adapter,QLCNIC_CRB_PEG_NET_4 +0x3c ,1 );msleep (20 ); -qlcnic_rom_unlock (adapter);/* big hammer don't reset CAM block on reset */ QLCWR32 (adapter,QLCNIC_ROMUSB_GLB_SW_RESET ,0xfeffffff );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 158/168 iwlwifi: move get pnvm file name to a separate function
In reply to Greg Kroah-HartmanFrom: Dror Moshe <[email protected]>
[ Upstream commit b05c1d14a177eaffe3aa7fa18b39df3a3e1f3a47 ]
Move code that generates the pnvm file name to a separate function, so that it can be reused.
--- drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 13 ++----------- drivers/net/wireless/intel/iwlwifi/fw/pnvm.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/pnvm.c +2 -11
@@ -230,19 +230,10 @@ static int iwl_pnvm_parse(struct iwl_trans *trans, const u8 *data,static int iwl_pnvm_get_from_fs (struct iwl_trans *trans,u8 **data,size_t *len) {const struct firmware *pnvm; -char pnvm_name[64 ]; +char pnvm_name[MAX_PNVM_NAME ];int ret; -/* -* The prefix unfortunately includes a hyphen at the end, so -* don't add the dot here... -*/ -snprintf (pnvm_name,sizeof (pnvm_name),"%spnvm" , - trans->cfg->fw_name_pre); - -/* ...but replace the hyphen with the dot here. */ -if (strlen (trans->cfg->fw_name_pre) <sizeof (pnvm_name)) - pnvm_name[strlen (trans->cfg->fw_name_pre) -1 ] ='.' ; +iwl_pnvm_get_fs_name (trans, pnvm_name,sizeof (pnvm_name)); ret =firmware_request_nowarn (&pnvm, pnvm_name, trans->dev);if (ret) {
drivers/net/wireless/intel/iwlwifi/fw/pnvm.h +20 -0
@@ -12,7 +12,27 @@#define MVM_UCODE_PNVM_TIMEOUT (HZ / 4) +#define MAX_PNVM_NAME 64 +int iwl_pnvm_load (struct iwl_trans *trans,struct iwl_notif_wait_data *notif_wait); +static inline +void iwl_pnvm_get_fs_name (struct iwl_trans *trans, +u8 *pnvm_name,size_t max_len) +{ +int pre_len; + +/* +* The prefix unfortunately includes a hyphen at the end, so +* don't add the dot here... +*/ +snprintf (pnvm_name, max_len,"%spnvm" , trans->cfg->fw_name_pre); + +/* ...but replace the hyphen with the dot here. */ + pre_len =strlen (trans->cfg->fw_name_pre); +if (pre_len < max_len && pre_len >0 ) + pnvm_name[pre_len -1 ] ='.' ; +} +#endif /* __IWL_PNVM_H__ */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 159/168 iwlwifi: pnvm: Fix a memory leak in iwl_pnvm_get_from_fs()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 45010c080e6e7434fcae73212b0087a03590049f ]
A firmware is requested but never released in this function. This leads to a memory leak in the normal execution path.
Add the missing 'release_firmware()' call.
Also introduce a temp variable (new_len) in order to keep the value of 'pnvm->size' after the firmware has been released.
--- drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/fw/pnvm.c +5 -1
@@ -231,6 +231,7 @@ static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len) {const struct firmware *pnvm;char pnvm_name[MAX_PNVM_NAME ]; +size_t new_len;int ret;iwl_pnvm_get_fs_name (trans, pnvm_name,sizeof (pnvm_name));
@@ -242,11 +243,14 @@ static int iwl_pnvm_get_from_fs(struct iwl_trans *trans, u8 **data, size_t *len)return ret; } + new_len = pnvm->size; *data =kmemdup (pnvm->data, pnvm->size,GFP_KERNEL ); +release_firmware (pnvm); +if (!*data)return -ENOMEM ; - *len = pnvm->size; + *len = new_len;return 0 ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 160/168 ip_gre: validate csum_start only on pull
In reply to Greg Kroah-HartmanFrom: Willem de Bruijn <[email protected]>
[ Upstream commit 8a0ed250f911da31a2aef52101bc707846a800ff ]
The GRE tunnel device can pull existing outer headers in ipge_xmit. This is a rare path, apparently unique to this device. The below commit ensured that pulling does not move skb->data beyond csum_start.
But it has a false positive if ip_summed is not CHECKSUM_PARTIAL and thus csum_start is irrelevant.
Refine to exclude this. At the same time simplify and strengthen the test.
Simplify, by moving the check next to the offending pull, making it more self documenting and removing an unnecessary branch from other code paths.
Strengthen, by also ensuring that the transport header is correct and therefore the inner headers will be after skb_reset_inner_headers. The transport header is set to csum_start in skb_partial_csum_set.
--- net/ipv4/ip_gre.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv4/ip_gre.c +6 -3
@@ -473,8 +473,6 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev,static int gre_handle_offloads (struct sk_buff *skb,bool csum) { -if (csum &&skb_checksum_start (skb) < skb->data) -return -EINVAL ;return iptunnel_handle_offloads (skb, csum ?SKB_GSO_GRE_CSUM :SKB_GSO_GRE ); }
@@ -632,15 +630,20 @@ static netdev_tx_t ipgre_xmit(struct sk_buff *skb, }if (dev->header_ops) { +const int pull_len = tunnel->hlen +sizeof (struct iphdr ); +if (skb_cow_head (skb,0 )) goto free_skb; tnl_params = (const struct iphdr *)skb->data; +if (pull_len >skb_transport_offset (skb)) + goto free_skb; +/* Pull skb since ip_tunnel_xmit() needs skb->data pointing * to gre header. */ -skb_pull (skb, tunnel->hlen +sizeof (struct iphdr )); +skb_pull (skb, pull_len);skb_reset_mac_header (skb); }else {if (skb_cow_head (skb, dev->needed_headroom))
Signature · 1 line
2.30.2