5.15.71-rc1 review
Subsystems (4)
Greg Kroah-Hartman
maintainercover 5.15.71-rc1 review
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +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.15.71-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.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.71-rc1
Jan Kara <[email protected]>
ext4: use locality group preallocation for small closed files
Jan Kara <[email protected]>
ext4: make directory inode spreading reflect flexbg size
Jan Kara <[email protected]>
ext4: avoid unnecessary spreading of allocations among groups
Jan Kara <[email protected]>
ext4: make mballoc try target group first even with mb_optimize_scan
Theodore Ts'o <[email protected]>
ext4: limit the number of retries after discarding preallocations blocks
Luís Henriques <[email protected]>
ext4: fix bug in extents parsing when eh_entries == 0 and eh_depth > 0
Dan Williams <[email protected]>
devdax: Fix soft-reservation memory description
Trond Myklebust <[email protected]>
NFSv4: Fixes for nfs4_inode_return_delegation()
Alex Deucher <[email protected]>
drm/amdgpu: don't register a dirty callback for non-atomic
Asmaa Mnebhi <[email protected]>
i2c: mlxbf: Fix frequency calculation
Asmaa Mnebhi <[email protected]>
i2c: mlxbf: prevent stack overflow in mlxbf_i2c_smbus_start_transaction()
Asmaa Mnebhi <[email protected]>
i2c: mlxbf: incorrect base address passed during io write
Uwe Kleine-König <[email protected]>
i2c: imx: If pm_runtime_get_sync() returned 1 device access is possible
Tetsuo Handa <[email protected]>
workqueue: don't skip lockdep work dependency in cancel_work_sync()
Li Jinlin <[email protected]>
fsdax: Fix infinite loop in dax_iomap_rw()
Nathan Huckleberry <[email protected]>
drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
Nathan Chancellor <[email protected]>
drm/amd/display: Mark dml30's UseMinimumDCFCLK() as noinline for stack usage
Nathan Chancellor <[email protected]>
drm/amd/display: Reduce number of arguments of dml31's CalculateFlipSchedule()
Nathan Chancellor <[email protected]>
drm/amd/display: Reduce number of arguments of dml31's CalculateWatermarksAndDRAMSpeedChangeSupport()
Yao Wang1 <[email protected]>
drm/amd/display: Limit user regamma to a valid value
Hamza Mahfooz <[email protected]>
drm/amdgpu: use dirty framebuffer helper
Guchun Chen <[email protected]>
drm/amd/pm: disable BACO entry/exit completely on several sienna cichlid cards
Linus Walleij <[email protected]>
gpio: ixp4xx: Make irqchip immutable
Hans de Goede <[email protected]>
drm/gma500: Fix BUG: sleeping function called from invalid context errors
Vitaly Kuznetsov <[email protected]>
Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region
Jingwen Chen <[email protected]>
drm/amd/amdgpu: fixing read wrong pf2vf data in SRIOV
Stefan Haberland <[email protected]>
s390/dasd: fix Oops in dasd_alias_get_start_dev due to missing pavgroup
Ilpo Järvinen <[email protected]>
serial: tegra-tcu: Use uart_xmit_advance(), fixes icount.tx accounting
Ilpo Järvinen <[email protected]>
serial: tegra: Use uart_xmit_advance(), fixes icount.tx accounting
Ilpo Järvinen <[email protected]>
serial: Create uart_xmit_advance()
Lukas Wunner <[email protected]>
serial: fsl_lpuart: Reset prior to registration
David Matlack <[email protected]>
KVM: x86/mmu: Fold rmap_recycle into rmap_add
Hangbin Liu <[email protected]>
selftests: forwarding: add shebang for sch_red.sh
Jakub Kicinski <[email protected]>
bnxt: prevent skb UAF after handing over to PTP worker
Hangyu Hua <[email protected]>
net: sched: fix possible refcount leak in tc_new_tfilter()
Sean Anderson <[email protected]>
net: sunhme: Fix packet reception for len < RX_COPY_THRESHOLD
Jonathan Toppins <[email protected]>
bonding: fix NULL deref in bond_rr_gen_slave_id
Wen Gu <[email protected]>
net/smc: Stop the CLC flow if no link to map buffers on
Nícolas F. R. A. Prado <[email protected]>
drm/mediatek: dsi: Move mtk_dsi_stop() call back to mtk_dsi_poweroff()
Namhyung Kim <[email protected]>
perf tools: Honor namespace when synthesizing build-ids
Adrian Hunter <[email protected]>
perf kcore_copy: Do not check /proc/modules is unchanged
Lieven Hey <[email protected]>
perf jit: Include program header in ELF files
Namhyung Kim <[email protected]>
perf stat: Fix BPF program section name
Marc Kleine-Budde <[email protected]>
can: gs_usb: gs_can_open(): fix race dev->can.state condition
Geert Uytterhoeven <[email protected]>
net: sh_eth: Fix PHY state warning splat during system resume
Geert Uytterhoeven <[email protected]>
net: ravb: Fix PHY state warning splat during system resume
Florian Westphal <[email protected]>
netfilter: ebtables: fix memory leak when blob is malformed
Tetsuo Handa <[email protected]>
netfilter: nf_tables: fix percpu memory leak at nf_tables_addchain()
Tetsuo Handa <[email protected]>
netfilter: nf_tables: fix nft_counters_enabled underflow at nf_tables_addchain()
Vladimir Oltean <[email protected]>
net/sched: taprio: make qdisc_leaf() see the per-netdev-queue pfifo child qdiscs
Vladimir Oltean <[email protected]>
net/sched: taprio: avoid disabling offload when it was never enabled
Vladimir Oltean <[email protected]>
net: enetc: deny offload of tc-based TSN features on VF interfaces
Vladimir Oltean <[email protected]>
net: enetc: move enetc_set_psfp() out of the common enetc_set_features()
Jason A. Donenfeld <[email protected]>
wireguard: netlink: avoid variable-sized memcpy on sockaddr
Jason A. Donenfeld <[email protected]>
wireguard: ratelimiter: disable timings test by default
Alex Elder <[email protected]>
net: ipa: properly limit modem routing table use
Liang He <[email protected]>
of: mdio: Add of_node_put() when breaking out of for_each_xx
Randy Dunlap <[email protected]>
drm/hisilicon: Add depends on MMU
Javier Martinez Canillas <[email protected]>
drm/hisilicon/hibmc: Allow to be built if COMPILE_TEST is enabled
Íñigo Huguet <[email protected]>
sfc: fix null pointer dereference in efx_hard_start_xmit
Íñigo Huguet <[email protected]>
sfc: fix TX channel offset when using legacy interrupts
Michal Jaron <[email protected]>
i40e: Fix set max_tx_rate when it is lower than 1 Mbps
Michal Jaron <[email protected]>
i40e: Fix VF set max MTU size
Michal Jaron <[email protected]>
iavf: Fix set max MTU size with port VLAN and jumbo frames
David Thompson <[email protected]>
mlxbf_gige: clear MDIO gateway lock after read
Norbert Zulinski <[email protected]>
iavf: Fix bad page state
Christian Lamparter <[email protected]>
um: fix default console kernel parameter
Serge Semin <[email protected]>
MIPS: Loongson32: Fix PHY-mode being left unspecified
Randy Dunlap <[email protected]>
MIPS: lantiq: export clk_get_io() for lantiq_wdt.ko
Heiko Schocher <[email protected]>
drm/panel: simple: Fix innolux_g121i1_l01 bus_format
Benjamin Poirier <[email protected]>
net: team: Unsync device addresses on ndo_stop
Benjamin Poirier <[email protected]>
net: bonding: Unsync device addresses on ndo_stop
Benjamin Poirier <[email protected]>
net: bonding: Share lacpdu_mcast_addr definition
Sreekanth Reddy <[email protected]>
scsi: mpt3sas: Fix return value check of dma_get_required_mask()
Rafael Mendonca <[email protected]>
scsi: qla2xxx: Fix memory leak in __qlt_24xx_handle_abts()
Ioana Ciornei <[email protected]>
net: phy: aquantia: wait for the suspend/resume operations to finish
Ludovic Cintrat <[email protected]>
net: core: fix flow symmetric hash
Lu Wei <[email protected]>
ipvlan: Fix out-of-bound bugs caused by unset skb->mac_header
Brett Creeley <[email protected]>
iavf: Fix cached head and tail value for iavf_get_tx_pending
Dave Ertman <[email protected]>
ice: Don't double unplug aux on peer initiated reset
Pablo Neira Ayuso <[email protected]>
netfilter: nfnetlink_osf: fix possible bogus match in nf_osf_find()
David Leadbeater <[email protected]>
netfilter: nf_conntrack_irc: Tighten matching on DCC message
Igor Ryzhov <[email protected]>
netfilter: nf_conntrack_sip: fix ct_sip_walk_headers
Fabio Estevam <[email protected]>
arm64: dts: rockchip: Remove 'enable-active-low' from rk3399-puma
Liang He <[email protected]>
dmaengine: ti: k3-udma-private: Fix refcount leak bug in of_xudma_dev_get()
zain wang <[email protected]>
arm64: dts: rockchip: Set RK3399-Gru PCLK_EDP to 24 MHz
AngeloGioacchino Del Regno <[email protected]>
drm/mediatek: dsi: Add atomic {destroy,duplicate}_state, reset callbacks
Jagan Teki <[email protected]>
arm64: dts: rockchip: Fix typo in lisense text for PX30.Core
Brian Norris <[email protected]>
arm64: dts: rockchip: Pull up wlan wake# on Gru-Bob
Cristian Marussi <[email protected]>
firmware: arm_scmi: Fix the asynchronous reset requests
Cristian Marussi <[email protected]>
firmware: arm_scmi: Harden accesses to the reset domains
Dave Chinner <[email protected]>
xfs: validate inode fork size against fork format
Brian Foster <[email protected]>
xfs: fix xfs_ifree() error handling to not leak perag ref
Dave Chinner <[email protected]>
xfs: reorder iunlink remove operation in xfs_ifree
Will Deacon <[email protected]>
vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment
Sergey Shtylyov <[email protected]>
arm64: topology: fix possible overflow in amu_fie_setup()
Sean Christopherson <[email protected]>
KVM: x86: Inject #UD on emulated XSETBV if XSAVES isn't enabled
Maurizio Lombardi <[email protected]>
mm: slub: fix flush_cpu_slab()/__free_slab() invocations in task context.
Chao Yu <[email protected]>
mm/slub: fix to return errno if kmalloc() fails
Haiyang Zhang <[email protected]>
net: mana: Add rmb after checking owner bits
Marc Kleine-Budde <[email protected]>
can: flexcan: flexcan_mailbox_read() fix return value for drop = true
Peter Collingbourne <[email protected]>
kasan: call kasan_malloc() from __kmalloc_*track_caller()
Al Viro <[email protected]>
riscv: fix a nasty sigreturn bug...
Meng Li <[email protected]>
gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
Andy Shevchenko <[email protected]>
gpio: mockup: Fix potential resource leakage when register a chip
Bartosz Golaszewski <[email protected]>
gpio: mockup: fix NULL pointer dereference when removing debugfs
Felix Fietkau <[email protected]>
wifi: mt76: fix reading current per-tid starting sequence number for aggregation
Ard Biesheuvel <[email protected]>
efi: libstub: check Shim mode using MokSBStateRT
Ard Biesheuvel <[email protected]>
efi: x86: Wipe setup_data on pure EFI boot
Gil Fine <[email protected]>
thunderbolt: Add support for Intel Maple Ridge single port controller
William Wu <[email protected]>
usb: dwc3: core: leave default DMA if the controller does not support 64-bit DMA
Johan Hovold <[email protected]>
media: flexcop-usb: fix endpoint type check
Filipe Manana <[email protected]>
btrfs: fix hang during unmount when stopping a space reclaim worker
Filipe Manana <[email protected]>
btrfs: fix hang during unmount when stopping block group reclaim worker
Yi Liu <[email protected]>
iommu/vt-d: Check correct capability for sagaw determination
Callum Osmotherly <[email protected]>
ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5530 laptop
Luke D. Jones <[email protected]>
ALSA: hda/realtek: Add quirk for ASUS GA503R laptop
Luke D. Jones <[email protected]>
ALSA: hda/realtek: Add pincfg for ASUS G533Z HP jack
Luke D. Jones <[email protected]>
ALSA: hda/realtek: Add pincfg for ASUS G513 HP jack
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Re-arrange quirk table entries
Callum Osmotherly <[email protected]>
ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5570 laptop
huangwenhui <[email protected]>
ALSA: hda/realtek: Add quirk for Huawei WRT-WX9
Kai Vehmanen <[email protected]>
ALSA: hda: add Intel 5 Series / 3400 PCI DID
Mohan Kumar <[email protected]>
ALSA: hda/tegra: set depop delay for tegra
Takashi Iwai <[email protected]>
ALSA: core: Fix double-free at snd_card_new()
Takashi Iwai <[email protected]>
Revert "ALSA: usb-audio: Split endpoint setups for hw_params and prepare"
jerry meng <[email protected]>
USB: serial: option: add Quectel RM520N
Carl Yin(殷张成) <[email protected]>
USB: serial: option: add Quectel BG95 0x0203 composition
Alan Stern <[email protected]>
USB: core: Fix RST error in hub.c
Phil Auld <[email protected]>
drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
Greg Kroah-Hartman <[email protected]>
Revert "usb: gadget: udc-xilinx: replace memcpy with memcpy_toio"
Greg Kroah-Hartman <[email protected]>
Revert "usb: add quirks for Lenovo OneLink+ Dock"
Piyush Mehta <[email protected]>
usb: gadget: udc-xilinx: replace memcpy with memcpy_toio
Jean-Francois Le Fillatre <[email protected]>
usb: add quirks for Lenovo OneLink+ Dock
Michael Ellerman <[email protected]>
powerpc/rtas: Fix RTAS MSR[HV] handling for Cell
Nicholas Piggin <[email protected]>
powerpc/rtas: Move rtas entry assembly into its own file
Marcus Folkesson <[email protected]>
iio: adc: mcp3911: correct "microchip,device-addr" property
Jonathan Cameron <[email protected]>
iio:adc:mcp3911: Switch to generic firmware properties.
Wesley Cheng <[email protected]>
usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Don't modify GEVNTCOUNT in pullup()
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Refactor pullup()
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Prevent repeat pullup()
Wesley Cheng <[email protected]>
usb: dwc3: Issue core soft reset before enabling run/stop
Wesley Cheng <[email protected]>
usb: dwc3: gadget: Avoid starting DWC3 gadget during UDC unbind
Larry Finger <[email protected]>
staging: r8188eu: Add Rosewill USB-N150 Nano to device tables
Candy Febriyanto <[email protected]>
staging: r8188eu: Remove support for devices with 8188FU chipset (0bda:f179)
Alex Deucher <[email protected]>
drm/amdgpu: make sure to init common IP before gmc
Victor Skvortsov <[email protected]>
drm/amdgpu: Separate vf2pf work item init from virt data exchange
-------------
Diffstat:
Makefile | 4 +- .../boot/dts/rockchip/px30-engicam-px30-core.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 5 + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 9 + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 - arch/arm64/kernel/topology.c | 2 +- arch/mips/lantiq/clk.c | 1 + arch/mips/loongson32/common/platform.c | 16 +- arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/entry_32.S | 49 --- arch/powerpc/kernel/entry_64.S | 150 -------- arch/powerpc/kernel/rtas_entry.S | 202 ++++++++++ arch/riscv/kernel/signal.c | 2 + arch/um/kernel/um_arch.c | 2 +- arch/x86/kvm/emulate.c | 3 + arch/x86/kvm/mmu/mmu.c | 40 +- arch/x86/kvm/x86.c | 1 + drivers/dax/hmem/device.c | 1 + drivers/dma/ti/k3-udma-private.c | 6 +- drivers/firmware/arm_scmi/reset.c | 10 +- drivers/firmware/efi/libstub/secureboot.c | 8 +- drivers/firmware/efi/libstub/x86-stub.c | 7 + drivers/gpio/gpio-ixp4xx.c | 17 +- drivers/gpio/gpio-mockup.c | 6 +- drivers/gpio/gpiolib-cdev.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 18 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 42 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 3 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 420 +++++---------------- .../drm/amd/display/modules/color/color_gamma.c | 4 + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 11 + drivers/gpu/drm/gma500/gma_display.c | 11 +- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 3 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 24 +- drivers/gpu/drm/panel/panel-simple.c | 2 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +- drivers/hv/vmbus_drv.c | 10 +- drivers/i2c/busses/i2c-imx.c | 2 +- drivers/i2c/busses/i2c-mlxbf.c | 68 ++-- drivers/iio/adc/mcp3911.c | 16 +- drivers/iommu/intel/iommu.c | 2 +- drivers/media/usb/b2c2/flexcop-usb.c | 2 +- drivers/net/bonding/bond_3ad.c | 5 +- drivers/net/bonding/bond_main.c | 72 ++-- drivers/net/can/flexcan.c | 10 +- drivers/net/can/usb/gs_usb.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +- drivers/net/ethernet/freescale/enetc/Makefile | 1 - drivers/net/ethernet/freescale/enetc/enetc.c | 53 +-- drivers/net/ethernet/freescale/enetc/enetc.h | 12 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 32 +- drivers/net/ethernet/freescale/enetc/enetc_qos.c | 23 ++ drivers/net/ethernet/freescale/enetc/enetc_vf.c | 17 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 32 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 20 + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 9 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 7 +- drivers/net/ethernet/intel/ice/ice_main.c | 2 - .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 6 + drivers/net/ethernet/microsoft/mana/gdma_main.c | 10 + drivers/net/ethernet/renesas/ravb_main.c | 2 + drivers/net/ethernet/renesas/sh_eth.c | 2 + drivers/net/ethernet/sfc/efx_channels.c | 2 +- drivers/net/ethernet/sfc/tx.c | 2 +- drivers/net/ethernet/sun/sunhme.c | 4 +- drivers/net/ipa/ipa_qmi.c | 8 +- drivers/net/ipa/ipa_qmi_msg.c | 8 +- drivers/net/ipa/ipa_qmi_msg.h | 37 +- drivers/net/ipa/ipa_table.c | 2 - drivers/net/ipa/ipa_table.h | 3 + drivers/net/ipvlan/ipvlan_core.c | 6 +- drivers/net/mdio/of_mdio.c | 1 + drivers/net/phy/aquantia_main.c | 53 ++- drivers/net/team/team.c | 24 +- drivers/net/wireguard/netlink.c | 13 +- drivers/net/wireguard/selftest/ratelimiter.c | 25 +- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- drivers/s390/block/dasd_alias.c | 9 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- drivers/scsi/qla2xxx/qla_target.c | 4 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 2 +- drivers/thunderbolt/icm.c | 1 + drivers/thunderbolt/nhi.h | 1 + drivers/tty/serial/fsl_lpuart.c | 9 +- drivers/tty/serial/serial-tegra.c | 5 +- drivers/tty/serial/tegra-tcu.c | 2 +- drivers/usb/core/hub.c | 2 +- drivers/usb/dwc3/core.c | 17 +- drivers/usb/dwc3/core.h | 4 + drivers/usb/dwc3/gadget.c | 81 ++-- drivers/usb/serial/option.c | 6 + fs/btrfs/disk-io.c | 42 ++- fs/dax.c | 3 + fs/ext4/extents.c | 4 + fs/ext4/ialloc.c | 2 +- fs/ext4/mballoc.c | 69 ++-- fs/nfs/delegation.c | 10 +- fs/xfs/libxfs/xfs_inode_buf.c | 35 +- fs/xfs/xfs_inode.c | 22 +- include/asm-generic/vmlinux.lds.h | 3 +- include/linux/cpumask.h | 5 +- include/linux/serial_core.h | 17 + include/net/bond_3ad.h | 2 - include/net/bonding.h | 3 + kernel/workqueue.c | 6 +- mm/slub.c | 18 +- net/bridge/netfilter/ebtables.c | 4 +- net/core/flow_dissector.c | 5 +- net/netfilter/nf_conntrack_irc.c | 34 +- net/netfilter/nf_conntrack_sip.c | 4 +- net/netfilter/nf_tables_api.c | 8 +- net/netfilter/nfnetlink_osf.c | 4 +- net/sched/cls_api.c | 1 + net/sched/sch_taprio.c | 18 +- net/smc/smc_core.c | 5 +- sound/core/init.c | 10 +- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_hdmi.c | 1 + sound/pci/hda/patch_realtek.c | 32 +- sound/usb/endpoint.c | 23 +- sound/usb/endpoint.h | 6 +- sound/usb/pcm.c | 14 +- tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- tools/perf/util/genelf.c | 14 + tools/perf/util/genelf.h | 4 + tools/perf/util/symbol-elf.c | 7 +- tools/perf/util/synthetic-events.c | 17 +- tools/testing/selftests/net/forwarding/sch_red.sh | 1 + 130 files changed, 1280 insertions(+), 1051 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/148 drm/amdgpu: Separate vf2pf work item init from virt data exchange
From: Victor Skvortsov <[email protected]>
[ Upstream commit 892deb48269c65376f3eeb5b4c032ff2c2979bd7 ]
We want to be able to call virt data exchange conditionally after gmc sw init to reserve bad pages as early as possible. Since this is a conditional call, we will need
to call it again unconditionally later in the init sequence.
Refactor the data exchange function so it can be called multiple times without re-initializing the work item.
v2: Cleaned up the code. Kept the original call to init_exchange_data() inside early init to initialize the work item, afterwards call exchange_data() when needed.
Reviewed By: Shaoyun.liu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 36 ++++++++++++++-------- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + 3 files changed, 30 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -1
@@ -2390,6 +2390,10 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)/* need to do gmc hw init early so we can allocate gpu mem */ if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC ) { +/* Try to reserve bad pages early */ +if (amdgpu_sriov_vf (adev)) +amdgpu_virt_exchange_data (adev); + r =amdgpu_device_vram_scratch_init (adev);if (r) {DRM_ERROR ("amdgpu_vram_scratch_init failed %d\n" , r);
@@ -2421,7 +2425,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) }if (amdgpu_sriov_vf (adev)) -amdgpu_virt_init_data_exchange (adev); +amdgpu_virt_exchange_data (adev); r =amdgpu_ib_pool_init (adev);if (r) {
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +24 -12
@@ -614,17 +614,35 @@ void amdgpu_virt_fini_data_exchange(struct amdgpu_device *adev)void amdgpu_virt_init_data_exchange (struct amdgpu_device *adev) { -uint64_t bp_block_offset =0 ; -uint32_t bp_block_size =0 ; -struct amd_sriov_msg_pf2vf_info *pf2vf_v2 =NULL ; - adev->virt.fw_reserve.p_pf2vf =NULL ; adev->virt.fw_reserve.p_vf2pf =NULL ; adev->virt.vf2pf_update_interval_ms =0 ; -if (adev->mman.fw_vram_usage_va !=NULL ) { +if (adev->bios !=NULL ) { adev->virt.vf2pf_update_interval_ms =2000 ; + adev->virt.fw_reserve.p_pf2vf = + (struct amd_sriov_msg_pf2vf_info_header *) + (adev->bios + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB <<10 )); + +amdgpu_virt_read_pf2vf_data (adev); + } + +if (adev->virt.vf2pf_update_interval_ms !=0 ) { +INIT_DELAYED_WORK (&adev->virt.vf2pf_work, amdgpu_virt_update_vf2pf_work_item); +schedule_delayed_work (&(adev->virt.vf2pf_work),msecs_to_jiffies (adev->virt.vf2pf_update_interval_ms)); + } +} + + +void amdgpu_virt_exchange_data (struct amdgpu_device *adev) +{ +uint64_t bp_block_offset =0 ; +uint32_t bp_block_size =0 ; +struct amd_sriov_msg_pf2vf_info *pf2vf_v2 =NULL ; + +if (adev->mman.fw_vram_usage_va !=NULL ) { + adev->virt.fw_reserve.p_pf2vf = (struct amd_sriov_msg_pf2vf_info_header *) (adev->mman.fw_vram_usage_va + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB <<10 ));
@@ -655,16 +673,10 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev) (adev->bios + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB <<10 ));amdgpu_virt_read_pf2vf_data (adev); - -return ; - } - -if (adev->virt.vf2pf_update_interval_ms !=0 ) { -INIT_DELAYED_WORK (&adev->virt.vf2pf_work, amdgpu_virt_update_vf2pf_work_item); -schedule_delayed_work (&(adev->virt.vf2pf_work), adev->virt.vf2pf_update_interval_ms); } } +void amdgpu_detect_virtualization (struct amdgpu_device *adev) {uint32_t reg;
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +1 -0
@@ -308,6 +308,7 @@ int amdgpu_virt_alloc_mm_table(struct amdgpu_device *adev);void amdgpu_virt_free_mm_table (struct amdgpu_device *adev);void amdgpu_virt_release_ras_err_handler_data (struct amdgpu_device *adev);void amdgpu_virt_init_data_exchange (struct amdgpu_device *adev); +void amdgpu_virt_exchange_data (struct amdgpu_device *adev);void amdgpu_virt_fini_data_exchange (struct amdgpu_device *adev);void amdgpu_detect_virtualization (struct amdgpu_device *adev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 2/148 drm/amdgpu: make sure to init common IP before gmc
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit a8671493d2074950553da3cf07d1be43185ef6c6 ]
Move common IP init before GMC init so that HDP gets remapped before GMC init which uses it.
This fixes the Unsupported Request error reported through AER during driver load. The error happens as a write happens to the remap offset before real remapping is done.
The error was unnoticed before and got visible because of the commit referenced below. This doesn't fix anything in the commit below, rather fixes the issue in amdgpu exposed by the commit. The reference is only to associate this commit with below one so that both go together.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +11 -3
@@ -2388,8 +2388,16 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) } adev->ip_blocks[i].status.sw = true; -/* need to do gmc hw init early so we can allocate gpu mem */ -if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC ) { +if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_COMMON ) { +/* need to do common hw init early so everything is set up for gmc */ + r = adev->ip_blocks[i].version->funcs->hw_init ((void *)adev); +if (r) { +DRM_ERROR ("hw_init %d failed %d\n" , i, r); + goto init_failed; + } + adev->ip_blocks[i].status.hw = true; + }else if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC ) { +/* need to do gmc hw init early so we can allocate gpu mem */ /* Try to reserve bad pages early */ if (amdgpu_sriov_vf (adev))amdgpu_virt_exchange_data (adev);
@@ -3037,8 +3045,8 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev)int i, r;static enum amd_ip_block_type ip_order[] = { -AMD_IP_BLOCK_TYPE_GMC ,AMD_IP_BLOCK_TYPE_COMMON , +AMD_IP_BLOCK_TYPE_GMC ,AMD_IP_BLOCK_TYPE_PSP ,AMD_IP_BLOCK_TYPE_IH , };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 3/148 staging: r8188eu: Remove support for devices with 8188FU chipset (0bda:f179)
In reply to Greg Kroah-HartmanFrom: Candy Febriyanto <[email protected]>
[ Upstream commit 6723b283c44a3fdf9f922ae9788aab38bd909211 ]
The new r8188eu driver doesn't actually support devices with vendor ID 0bda and product ID f179[0][1][2], remove the ID so owners of these devices don't have to blacklist the staging driver.
[0] https://github.com/lwfinger/rtl8188eu/issues/366#issuecomment-888511731
[1] https://github.com/lwfinger/rtl8188eu/issues/385
[2] https://github.com/lwfinger/rtl8188eu/issues/385#issuecomment-973013539
Stable-dep-of: e01f5c8d6af2 ("staging: r8188eu: Add Rosewill USB-N150 Nano to device tables")
--- drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/r8188eu/os_dep/usb_intf.c +0 -1
@@ -30,7 +30,6 @@ static struct usb_device_id rtw_usb_id_tbl[] = {/*=== Realtek demoboard ===*/ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8179)}, /* 8188EUS */ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0179)}, /* 8188ETV */ - {USB_DEVICE(USB_VENDER_ID_REALTEK, 0xf179)}, /* 8188FU *//*=== Customer ID ===*/ /****** 8188EUS ********/ {USB_DEVICE(0x07B8, 0x8179)}, /* Abocom - Abocom */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 4/148 staging: r8188eu: Add Rosewill USB-N150 Nano to device tables
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
[ Upstream commit e01f5c8d6af231b3b09e23c1fe8a4057cdcc4e42 ]
This device is reported as using the RTL8188EUS chip.
It has the improbable USB ID of 0bda:ffef, which normally would belong to Realtek, but this ID works for the reporter.
--- drivers/staging/r8188eu/os_dep/usb_intf.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/r8188eu/os_dep/usb_intf.c +1 -0
@@ -30,6 +30,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {/*=== Realtek demoboard ===*/ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8179)}, /* 8188EUS */ {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0179)}, /* 8188ETV */ + {USB_DEVICE(USB_VENDER_ID_REALTEK, 0xffef)}, /* Rosewill USB-N150 Nano *//*=== Customer ID ===*/ /****** 8188EUS ********/ {USB_DEVICE(0x07B8, 0x8179)}, /* Abocom - Abocom */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 5/148 usb: dwc3: gadget: Avoid starting DWC3 gadget during UDC unbind
In reply to Greg Kroah-HartmanFrom: Wesley Cheng <[email protected]>
[ Upstream commit 8217f07a50236779880f13e87f99224cd9117f83 ]
There is a race present where the DWC3 runtime resume runs in parallel to the UDC unbind sequence. This will eventually lead to a possible scenario where we are enabling the run/stop bit, without a valid composition defined.
Thread#1 (handling UDC unbind):usb_gadget_remove_driver()
-->usb_gadget_disconnect()
-->dwc3_gadget_pullup(0)
--> continue UDC unbind sequence
-->Thread#2 is running in parallel here
Thread#2 (handing next cable connect)__dwc3_set_mode()
-->pm_runtime_get_sync()
-->dwc3_gadget_resume()
-->dwc->gadget_driver is NOT NULL yet
-->dwc3_gadget_run_stop(1)
--> _dwc3gadget_start()...
Fix this by tracking the pullup disable routine, and avoiding resuming of the DWC3 gadget. Once the UDC is re-binded, that will trigger the pullup enable routine, which would handle enabling the DWC3 gadget.
Stable-dep-of: 040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop")
--- drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/gadget.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +2 -0
@@ -1028,6 +1028,7 @@ struct dwc3_scratchpad_array {* @tx_fifo_resize_max_num: max number of fifos allocated during txfifo resize * @hsphy_interface: "utmi" or "ulpi" * @connected: true when we're connected to a host, false otherwise +* @softconnect: true when gadget connect is called, false when disconnect runs * @delayed_status: true when gadget driver asks for delayed status * @ep0_bounced: true when we used bounce buffer * @ep0_expect_in: true when we expect a DATA IN transfer
@@ -1247,6 +1248,7 @@ struct dwc3 {const char *hsphy_interface; unsigned connected:1; + unsigned softconnect:1; unsigned delayed_status:1; unsigned ep0_bounced:1; unsigned ep0_expect_in:1;
drivers/usb/dwc3/gadget.c +2 -2
@@ -2442,7 +2442,7 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)int ret; is_on = !!is_on; - + dwc->softconnect = is_on;/* * Per databook, when we want to stop the gadget, if a control transfer * is still in process, complete it and get the core into setup phase.
@@ -4421,7 +4421,7 @@ int dwc3_gadget_resume(struct dwc3 *dwc) {int ret; -if (!dwc->gadget_driver) +if (!dwc->gadget_driver || !dwc->softconnect)return 0 ; ret =__dwc3_gadget_start (dwc);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 6/148 usb: dwc3: Issue core soft reset before enabling run/stop
In reply to Greg Kroah-HartmanFrom: Wesley Cheng <[email protected]>
[ Upstream commit 0066472de157439d58454f4a55786f1045ea5681 ]
It is recommended by the Synopsis databook to issue a DCTL.CSftReset when reconnecting from a device-initiated disconnect routine. This resolves issues with enumeration during fast composition switching cases, which result in an unknown device on the host.
Stable-dep-of: 040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop")
--- drivers/usb/dwc3/core.c | 4 +--- drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/gadget.c | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-)
drivers/usb/dwc3/core.c +1 -3
@@ -114,8 +114,6 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode) dwc->current_dr_role = mode; } -static int dwc3_core_soft_reset (struct dwc3 *dwc); -static void __dwc3_set_mode (struct work_struct *work) {struct dwc3 *dwc =work_to_dwc (work);
@@ -265,7 +263,7 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type)* dwc3_core_soft_reset - Issues core soft reset and PHY reset * @dwc: pointer to our context structure */ -static int dwc3_core_soft_reset (struct dwc3 *dwc) +int dwc3_core_soft_reset (struct dwc3 *dwc) {u32 reg;int retries =1000 ;
drivers/usb/dwc3/core.h +2 -0
@@ -1510,6 +1510,8 @@ bool dwc3_has_imod(struct dwc3 *dwc);int dwc3_event_buffers_setup (struct dwc3 *dwc);void dwc3_event_buffers_cleanup (struct dwc3 *dwc); +int dwc3_core_soft_reset (struct dwc3 *dwc); +#if IS_ENABLED (CONFIG_USB_DWC3_HOST ) ||IS_ENABLED (CONFIG_USB_DWC3_DUAL_ROLE )int dwc3_host_init (struct dwc3 *dwc);void dwc3_host_exit (struct dwc3 *dwc);
drivers/usb/dwc3/gadget.c +11 -0
@@ -2515,6 +2515,17 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) dwc->ev_buf->length; } }else { +/* +* In the Synopsys DWC_usb31 1.90a programming guide section +* 4.1.9, it specifies that for a reconnect after a +* device-initiated disconnect requires a core soft reset +* (DCTL.CSftRst) before enabling the run/stop bit. +*/ +spin_unlock_irqrestore (&dwc->lock, flags); +dwc3_core_soft_reset (dwc); +spin_lock_irqsave (&dwc->lock, flags); + +dwc3_event_buffers_setup (dwc);__dwc3_gadget_start (dwc); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 7/148 usb: dwc3: gadget: Prevent repeat pullup()
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
[ Upstream commit 69e131d1ac4e52a59ec181ab4f8aa8c48cd8fb64 ]
Don't do soft-disconnect if it's previously done. Likewise, don't do soft-connect if the device is currently connected and running. It would break normal operation.
Currently the caller of pullup() (udc's sysfs soft_connect) only checks if it had initiated disconnect to prevent repeating soft-disconnect. It doesn't check for soft-connect. To be safe, let's keep the check here regardless whether the udc core is fixed.
Stable-dep-of: 040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop")
--- drivers/usb/dwc3/gadget.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/dwc3/gadget.c +4 -0
@@ -2442,6 +2442,10 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)int ret; is_on = !!is_on; + +if (dwc->pullups_connected == is_on) +return 0 ; + dwc->softconnect = is_on;/* * Per databook, when we want to stop the gadget, if a control transfer
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 8/148 usb: dwc3: gadget: Refactor pullup()
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
[ Upstream commit 861c010a2ee1bc4a66d23f0da4aa22e75d8eaa24 ]
Move soft-disconnect sequence out of dwc3_gadget_pullup(). No functional change here.
Stable-dep-of: 040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop")
--- drivers/usb/dwc3/gadget.c | 65 ++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 29 deletions(-)
drivers/usb/dwc3/gadget.c +36 -29
@@ -2435,6 +2435,40 @@ static void dwc3_gadget_disable_irq(struct dwc3 *dwc);static void __dwc3_gadget_stop (struct dwc3 *dwc);static int __dwc3_gadget_start (struct dwc3 *dwc); +static int dwc3_gadget_soft_disconnect (struct dwc3 *dwc) +{ +u32 count; + + dwc->connected = false; + +/* +* In the Synopsys DesignWare Cores USB3 Databook Rev. 3.30a +* Section 4.1.8 Table 4-7, it states that for a device-initiated +* disconnect, the SW needs to ensure that it sends "a DEPENDXFER +* command for any active transfers" before clearing the RunStop +* bit. +*/ +dwc3_stop_active_transfers (dwc); +__dwc3_gadget_stop (dwc); + +/* +* In the Synopsys DesignWare Cores USB3 Databook Rev. 3.30a +* Section 1.3.4, it mentions that for the DEVCTRLHLT bit, the +* "software needs to acknowledge the events that are generated +* (by writing to GEVNTCOUNTn) while it is waiting for this bit +* to be set to '1'." +*/ + count =dwc3_readl (dwc->regs,DWC3_GEVNTCOUNT (0 )); + count &=DWC3_GEVNTCOUNT_MASK ; +if (count >0 ) { +dwc3_writel (dwc->regs,DWC3_GEVNTCOUNT (0 ), count); + dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) % + dwc->ev_buf->length; + } + +return dwc3_gadget_run_stop (dwc, false, false); +} +static int dwc3_gadget_pullup (struct usb_gadget *g,int is_on) {struct dwc3 *dwc =gadget_to_dwc (g);
@@ -2491,33 +2525,7 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)spin_lock_irqsave (&dwc->lock, flags);if (!is_on) { -u32 count; - - dwc->connected = false; -/* -* In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a -* Section 4.1.8 Table 4-7, it states that for a device-initiated -* disconnect, the SW needs to ensure that it sends "a DEPENDXFER -* command for any active transfers" before clearing the RunStop -* bit. -*/ -dwc3_stop_active_transfers (dwc); -__dwc3_gadget_stop (dwc); - -/* -* In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a -* Section 1.3.4, it mentions that for the DEVCTRLHLT bit, the -* "software needs to acknowledge the events that are generated -* (by writing to GEVNTCOUNTn) while it is waiting for this bit -* to be set to '1'." -*/ - count =dwc3_readl (dwc->regs,DWC3_GEVNTCOUNT (0 )); - count &=DWC3_GEVNTCOUNT_MASK ; -if (count >0 ) { -dwc3_writel (dwc->regs,DWC3_GEVNTCOUNT (0 ), count); - dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) % - dwc->ev_buf->length; - } + ret =dwc3_gadget_soft_disconnect (dwc); }else {/* * In the Synopsys DWC_usb31 1.90a programming guide section
@@ -2531,9 +2539,8 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)dwc3_event_buffers_setup (dwc);__dwc3_gadget_start (dwc); + ret =dwc3_gadget_run_stop (dwc, true, false); } - - ret =dwc3_gadget_run_stop (dwc, is_on, false);spin_unlock_irqrestore (&dwc->lock, flags);enable_irq (dwc->irq_gadget);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 9/148 usb: dwc3: gadget: Dont modify GEVNTCOUNT in pullup()
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
[ Upstream commit 8f8034f493b5eb1ad21ff392fd30c0cf9e71f73f ]
If the GEVNTCOUNT indicates events in the event buffer, the driver needs to acknowledge them before the controller can halt. Simply let the interrupt handler acknowledges the remaining event generated by the controller while polling for DSTS.DEVCTLHLT. This avoids disabling irq and taking care of race condition between the interrupt handlers and pullup().
Stable-dep-of: 040f2dbd2010 ("usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop")
--- drivers/usb/dwc3/gadget.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-)
drivers/usb/dwc3/gadget.c +8 -27
@@ -2437,8 +2437,9 @@ static int __dwc3_gadget_start(struct dwc3 *dwc);static int dwc3_gadget_soft_disconnect (struct dwc3 *dwc) { -u32 count; +unsigned long flags; +spin_lock_irqsave (&dwc->lock, flags); dwc->connected = false;/*
@@ -2450,29 +2451,21 @@ static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc)*/ dwc3_stop_active_transfers (dwc);__dwc3_gadget_stop (dwc); +spin_unlock_irqrestore (&dwc->lock, flags);/* -* In the Synopsys DesignWare Cores USB3 Databook Rev. 3.30a -* Section 1.3.4, it mentions that for the DEVCTRLHLT bit, the -* "software needs to acknowledge the events that are generated -* (by writing to GEVNTCOUNTn) while it is waiting for this bit -* to be set to '1'." +* Note: if the GEVNTCOUNT indicates events in the event buffer, the +* driver needs to acknowledge them before the controller can halt. +* Simply let the interrupt handler acknowledges and handle the +* remaining event generated by the controller while polling for +* DSTS.DEVCTLHLT. */ - count =dwc3_readl (dwc->regs,DWC3_GEVNTCOUNT (0 )); - count &=DWC3_GEVNTCOUNT_MASK ; -if (count >0 ) { -dwc3_writel (dwc->regs,DWC3_GEVNTCOUNT (0 ), count); - dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) % - dwc->ev_buf->length; - } -return dwc3_gadget_run_stop (dwc, false, false); }static int dwc3_gadget_pullup (struct usb_gadget *g,int is_on) {struct dwc3 *dwc =gadget_to_dwc (g); -unsigned long flags;int ret; is_on = !!is_on;
@@ -2516,14 +2509,6 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)return 0 ; } -/* -* Synchronize and disable any further event handling while controller -* is being enabled/disabled. -*/ -disable_irq (dwc->irq_gadget); - -spin_lock_irqsave (&dwc->lock, flags); -if (!is_on) { ret =dwc3_gadget_soft_disconnect (dwc); }else {
@@ -2533,16 +2518,12 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)* device-initiated disconnect requires a core soft reset * (DCTL.CSftRst) before enabling the run/stop bit. */ -spin_unlock_irqrestore (&dwc->lock, flags);dwc3_core_soft_reset (dwc); -spin_lock_irqsave (&dwc->lock, flags);dwc3_event_buffers_setup (dwc);__dwc3_gadget_start (dwc); ret =dwc3_gadget_run_stop (dwc, true, false); } -spin_unlock_irqrestore (&dwc->lock, flags); -enable_irq (dwc->irq_gadget);pm_runtime_put (dwc->dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 10/148 usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop
In reply to Greg Kroah-HartmanFrom: Wesley Cheng <[email protected]>
[ Upstream commit 040f2dbd2010c43f33ad27249e6dac48456f4d99 ]
Relocate the pullups_connected check until after it is ensured that there are no runtime PM transitions. If another context triggered the DWC3 core's runtime resume, it may have already enabled the Run/Stop. Do not re-run the entire pullup sequence again, as it may issue a core soft reset while Run/Stop is already set.
This patch depends on
commit 69e131d1ac4e ("usb: dwc3: gadget: Prevent repeat pullup()")
--- drivers/usb/dwc3/gadget.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/dwc3/gadget.c +5 -3
@@ -2470,9 +2470,6 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) is_on = !!is_on; -if (dwc->pullups_connected == is_on) -return 0 ; - dwc->softconnect = is_on;/* * Per databook, when we want to stop the gadget, if a control transfer
@@ -2509,6 +2506,11 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)return 0 ; } +if (dwc->pullups_connected == is_on) { +pm_runtime_put (dwc->dev); +return 0 ; + } +if (!is_on) { ret =dwc3_gadget_soft_disconnect (dwc); }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 11/148 iio:adc:mcp3911: Switch to generic firmware properties.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 4efc1c614d334883cce09c38aa3fe74d3fb0bbf0 ]
This allows use of the driver with other types of firmware such as ACPI PRP0001 based probing.
Also part of a general attempt to remove direct use of of_ specific accessors from IIO.
Added an include for mod_devicetable.h whilst here to cover the struct of_device_id definition.
Stable-dep-of: cfbd76d5c9c4 ("iio: adc: mcp3911: correct "microchip,device-addr" property")
--- drivers/iio/adc/mcp3911.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/iio/adc/mcp3911.c +6 -3
@@ -10,6 +10,8 @@#include <linux/err.h> #include <linux/iio/iio.h> #include <linux/module.h> +#include <linux/mod_devicetable.h> +#include <linux/property.h> #include <linux/regulator/consumer.h> #include <linux/spi/spi.h>
@@ -209,12 +211,13 @@ static const struct iio_info mcp3911_info = { .write_raw = mcp3911_write_raw, }; -static int mcp3911_config (struct mcp3911 *adc,struct device_node *of_node) +static int mcp3911_config (struct mcp3911 *adc) { +struct device *dev = &adc->spi->dev;u32 configreg;int ret; -of_property_read_u32 (of_node,"device-addr" , &adc->dev_addr); +device_property_read_u32 (dev,"device-addr" , &adc->dev_addr);if (adc->dev_addr >3 ) { dev_err(&adc->spi->dev, "invalid device address (%i). Must be in range 0-3.\n",
@@ -298,7 +301,7 @@ static int mcp3911_probe(struct spi_device *spi) } } - ret =mcp3911_config (adc, spi->dev.of_node); + ret =mcp3911_config (adc);if (ret) goto clk_disable;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 12/148 iio: adc: mcp3911: correct "microchip,device-addr" property
In reply to Greg Kroah-HartmanFrom: Marcus Folkesson <[email protected]>
[ Upstream commit cfbd76d5c9c449739bb74288d982bccf9ff822f4 ]
Go for the right property name that is documented in the bindings.
--- drivers/iio/adc/mcp3911.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/iio/adc/mcp3911.c +8 -1
@@ -217,7 +217,14 @@ static int mcp3911_config(struct mcp3911 *adc)u32 configreg;int ret; -device_property_read_u32 (dev,"device-addr" , &adc->dev_addr); + ret =device_property_read_u32 (dev,"microchip,device-addr" , &adc->dev_addr); + +/* +* Fallback to "device-addr" due to historical mismatch between +* dt-bindings and implementation +*/ +if (ret) +device_property_read_u32 (dev,"device-addr" , &adc->dev_addr);if (adc->dev_addr >3 ) { dev_err(&adc->spi->dev, "invalid device address (%i). Must be in range 0-3.\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 13/148 powerpc/rtas: Move rtas entry assembly into its own file
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 838ee286ecc9a3c76e6bd8f5aaad0c8c5c66b9ca ]
This makes working on the code a bit easier.
Stable-dep-of: 91926d8b7e71 ("powerpc/rtas: Fix RTAS MSR[HV] handling for Cell")
--- arch/powerpc/kernel/Makefile | 2 +- arch/powerpc/kernel/entry_32.S | 49 -------- arch/powerpc/kernel/entry_64.S | 150 ----------------------- arch/powerpc/kernel/rtas_entry.S | 198 +++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+), 200 deletions(-) create mode 100644 arch/powerpc/kernel/rtas_entry.S
arch/powerpc/kernel/Makefile +1 -1
@@ -69,7 +69,7 @@ obj-$(CONFIG_PPC_BOOK3S_IDLE) += idle_book3s.o procfs-y := proc_powerpc.o obj-$(CONFIG_PROC_FS) += $(procfs-y) rtaspci-$(CONFIG_PPC64)-$(CONFIG_PCI) := rtas_pci.o -obj-$(CONFIG_PPC_RTAS) += rtas.o rtas-rtc.o $(rtaspci-y-y) +obj-$(CONFIG_PPC_RTAS) += rtas_entry.o rtas.o rtas-rtc.o $(rtaspci-y-y) obj-$(CONFIG_PPC_RTAS_DAEMON) += rtasd.o obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
arch/powerpc/kernel/entry_32.S +0 -49
52 lines not on this page · raw message
arch/powerpc/kernel/entry_64.S +0 -150
156 lines not on this page · raw message
arch/powerpc/kernel/rtas_entry.S new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 14/148 powerpc/rtas: Fix RTAS MSR[HV] handling for Cell
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 91926d8b7e71aaf5f84f0cf208fc5a8b7a761050 ]
The semi-recent changes to MSR handling when entering RTAS (firmware) cause crashes on IBM Cell machines. An example trace:
kernel tried to execute user page (2fff01a8) - exploit attempt? (uid: 0)
BUG: Unable to handle kernel instruction fetch
Faulting instruction address: 0x2fff01a8
Oops: Kernel access of bad area, sig: 11 [#1]
BE PAGE_SIZE=64K MMU=Hash SMP NR_CPUS=4 NUMA Cell
Modules linked in:
CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 6.0.0-rc2-00433-gede0a8d3307a #207
NIP: 000000002fff01a8 LR: 0000000000032608 CTR: 0000000000000000
REGS: c0000000015236b0 TRAP: 0400 Tainted: G W (6.0.0-rc2-00433-gede0a8d3307a)
MSR: 0000000008001002 <ME,RI> CR: 00000000 XER: 20000000
...
NIP 0x2fff01a8
LR 0x32608
Call Trace:
0xc00000000143c5f8 (unreliable)
.rtas_call+0x224/0x320
.rtas_get_boot_time+0x70/0x150
.read_persistent_clock64+0x114/0x140
.read_persistent_wall_and_boot_offset+0x24/0x80
.timekeeping_init+0x40/0x29c
.start_kernel+0x674/0x8f0
start_here_common+0x1c/0x50Unlike PAPR platforms where RTAS is only used in guests, on the IBM Cell machines Linux runs with MSR[HV] set but also uses RTAS, provided by SLOF.
Fix it by copying the MSR[HV] bit from the MSR value we've just read using mfmsr into the value used for RTAS.
It seems like we could also fix it using an #ifdef CELL to set MSR[HV], but that doesn't work because it's possible to build a single kernel image that runs on both Cell native and pseries.
--- arch/powerpc/kernel/rtas_entry.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/rtas_entry.S +4 -0
@@ -125,8 +125,12 @@ __enter_rtas: * its critical regions (as specified in PAPR+ section 7.2.1). MSR[S] * is not impacted by RFI_TO_KERNEL (only urfid can unset it). So if * MSR[S] is set, it will remain when entering RTAS. + * If we're in HV mode, RTAS must also run in HV mode, so extract MSR_HV + * from the saved MSR value and insert into the value RTAS will use. */ + extrdi r0, r6, 1, 63 - MSR_HV_LG LOAD_REG_IMMEDIATE(r6, MSR_ME | MSR_RI) + insrdi r6, r0, 1, 63 - MSR_HV_LG li r0,0 mtmsrd r0,1 /* disable RI before using SRR0/1 */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 15/148 usb: add quirks for Lenovo OneLink+ Dock
In reply to Greg Kroah-HartmanFrom: Jean-Francois Le Fillatre <[email protected]>
[ Upstream commit 3d5f70949f1b1168fbb17d06eb5c57e984c56c58 ]
The Lenovo OneLink+ Dock contains two VL812 USB3.0 controllers:
17ef:1018 upstream
17ef:1019 downstream
Those two controllers both have problems with some USB3.0 devices, particularly self-powered ones. Typical error messages include:
Timeout while waiting for setup device command
device not accepting address X, error -62
unable to enumerate USB device
By process of elimination the controllers themselves were identified as the cause of the problem. Through trial and error the issue was solved by using USB_QUIRK_RESET_RESUME for both chips.
--- drivers/usb/core/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/core/quirks.c +4 -0
@@ -437,6 +437,10 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1532, 0x0116), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + /* Lenovo ThinkPad OneLink+ Dock twin hub controllers (VIA Labs VL812) */ + { USB_DEVICE(0x17ef, 0x1018), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x17ef, 0x1019), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Lenovo USB-C to Ethernet Adapter RTL8153-04 */ { USB_DEVICE(0x17ef, 0x720c), .driver_info = USB_QUIRK_NO_LPM },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 16/148 usb: gadget: udc-xilinx: replace memcpy with memcpy_toio
In reply to Greg Kroah-HartmanFrom: Piyush Mehta <[email protected]>
[ Upstream commit 8cb339f1c1f04baede9d54c1e40ac96247a6393b ]
For ARM processor, unaligned access to device memory is not allowed. Method memcpy does not take care of alignment.
USB detection failure with the unaligned address of memory access, with below kernel crash. To fix the unaligned address the kernel panic issue, replace memcpy with memcpy_toio method.
Kernel crash:
Unable to handle kernel paging request at virtual address ffff80000c05008a
Mem abort info:
ESR = 0x96000061
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x21: alignment fault
Data abort info:
ISV = 0, ISS = 0x00000061
CM = 0, WnR = 1
swapper pgtable: 4k pages, 48-bit VAs, pgdp=000000000143b000 [ffff80000c05008a] pgd=100000087ffff003, p4d=100000087ffff003, pud=100000087fffe003, pmd=1000000800bcc003, pte=00680000a0010713
Internal error: Oops: 96000061 [#1] SMP Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.15.19-xilinx-v2022.1 #1 Hardware name: ZynqMP ZCU102 Rev1.0 (DT) pstate: 200000c5 (nzCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : __memcpy+0x30/0x260 lr : __xudc_ep0_queue+0xf0/0x110
sp : ffff800008003d00
x29: ffff800008003d00 x28: ffff800009474e80 x27: 00000000000000a0
x26: 0000000000000100 x25: 0000000000000012 x24: ffff000800bc8080
x23: 0000000000000001 x22: 0000000000000012 x21: ffff000800bc8080
x20: 0000000000000012 x19: ffff000800bc8080 x18: 0000000000000000
x17: ffff800876482000 x16: ffff800008004000 x15: 0000000000004000
x14: 00001f09785d0400 x13: 0103020101005567 x12: 0781400000000200
x11: 00000000c5672a10 x10: 00000000000008d0 x9 : ffff800009463cf0 x8 : ffff8000094757b0 x7 : 0201010055670781 x6 : 4000000002000112 x5 : ffff80000c05009a x4 : ffff000800a15012 x3 : ffff00080362ad80 x2 : 0000000000000012 x1 : ffff000800a15000 x0 : ffff80000c050088
Call trace: __memcpy+0x30/0x260 xudc_ep0_queue+0x3c/0x60 usb_ep_queue+0x38/0x44 composite_ep0_queue.constprop.0+0x2c/0xc0 composite_setup+0x8d0/0x185c configfs_composite_setup+0x74/0xb0 xudc_irq+0x570/0xa40 __handle_irq_event_percpu+0x58/0x170 handle_irq_event+0x60/0x120 handle_fasteoi_irq+0xc0/0x220 handle_domain_irq+0x60/0x90 gic_handle_irq+0x74/0xa0 call_on_irq_stack+0x2c/0x60 do_interrupt_handler+0x54/0x60 el1_interrupt+0x30/0x50 el1h_64_irq_handler+0x18/0x24 el1h_64_irq+0x78/0x7c arch_cpu_idle+0x18/0x2c do_idle+0xdc/0x15c cpu_startup_entry+0x28/0x60 rest_init+0xc8/0xe0 arch_call_rest_init+0x10/0x1c start_kernel+0x694/0x6d4 __primary_switched+0xa4/0xac
--- drivers/usb/gadget/udc/udc-xilinx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/usb/gadget/udc/udc-xilinx.c +8 -8
@@ -496,11 +496,11 @@ static int xudc_eptxrx(struct xusb_ep *ep, struct xusb_req *req,/* Get the Buffer address and copy the transmit data.*/ eprambase = (u32 __force *)(udc->addr + ep->rambase);if (ep->is_in) { -memcpy (eprambase, bufferptr, bytestosend); +memcpy_toio (eprambase, bufferptr, bytestosend); udc->write_fn (udc->addr, ep->offset +XUSB_EP_BUF0COUNT_OFFSET , bufferlen); }else { -memcpy (bufferptr, eprambase, bytestosend); +memcpy_toio (bufferptr, eprambase, bytestosend); }/* * Enable the buffer for transmission.
@@ -514,11 +514,11 @@ static int xudc_eptxrx(struct xusb_ep *ep, struct xusb_req *req, eprambase = (u32 __force *)(udc->addr + ep->rambase + ep->ep_usb.maxpacket);if (ep->is_in) { -memcpy (eprambase, bufferptr, bytestosend); +memcpy_toio (eprambase, bufferptr, bytestosend); udc->write_fn (udc->addr, ep->offset +XUSB_EP_BUF1COUNT_OFFSET , bufferlen); }else { -memcpy (bufferptr, eprambase, bytestosend); +memcpy_toio (bufferptr, eprambase, bytestosend); }/* * Enable the buffer for transmission.
@@ -1020,7 +1020,7 @@ static int __xudc_ep0_queue(struct xusb_ep *ep0, struct xusb_req *req) udc->addr); length = req->usb_req.actual =min_t (u32, length,EP0_MAX_PACKET ); -memcpy (corebuf, req->usb_req.buf, length); +memcpy_toio (corebuf, req->usb_req.buf, length); udc->write_fn (udc->addr,XUSB_EP_BUF0COUNT_OFFSET , length); udc->write_fn (udc->addr,XUSB_BUFFREADY_OFFSET ,1 ); }else {
@@ -1746,7 +1746,7 @@ static void xudc_handle_setup(struct xusb_udc *udc)/* Load up the chapter 9 command buffer.*/ ep0rambase = (u32 __force *) (udc->addr +XUSB_SETUP_PKT_ADDR_OFFSET ); -memcpy (&setup, ep0rambase,8 ); +memcpy_toio (&setup, ep0rambase,8 ); udc->setup = setup; udc->setup.wValue =cpu_to_le16 (setup.wValue);
@@ -1833,7 +1833,7 @@ static void xudc_ep0_out(struct xusb_udc *udc) (ep0->rambase << 2)); buffer = req->usb_req.buf + req->usb_req.actual; req->usb_req.actual = req->usb_req.actual + bytes_to_rx; -memcpy (buffer, ep0rambase, bytes_to_rx); +memcpy_toio (buffer, ep0rambase, bytes_to_rx);if (req->usb_req.length == req->usb_req.actual) {/* Data transfer completed get ready for Status stage */
@@ -1909,7 +1909,7 @@ static void xudc_ep0_in(struct xusb_udc *udc) (ep0->rambase << 2)); buffer = req->usb_req.buf + req->usb_req.actual; req->usb_req.actual = req->usb_req.actual + length; -memcpy (ep0rambase, buffer, length); +memcpy_toio (ep0rambase, buffer, length); } udc->write_fn (udc->addr,XUSB_EP_BUF0COUNT_OFFSET , count); udc->write_fn (udc->addr,XUSB_BUFFREADY_OFFSET ,1 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 17/148 Revert "usb: add quirks for Lenovo OneLink+ Dock"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit 58bfe7d8e31014d7ce246788df99c56e3cfe6c68 ]
This reverts commit 3d5f70949f1b1168fbb17d06eb5c57e984c56c58.
The quirk does not work properly, more work is needed to determine what should be done here.
--- drivers/usb/core/quirks.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/usb/core/quirks.c +0 -4
@@ -437,10 +437,6 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1532, 0x0116), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, - /* Lenovo ThinkPad OneLink+ Dock twin hub controllers (VIA Labs VL812) */ - { USB_DEVICE(0x17ef, 0x1018), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x17ef, 0x1019), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Lenovo USB-C to Ethernet Adapter RTL8153-04 */ { USB_DEVICE(0x17ef, 0x720c), .driver_info = USB_QUIRK_NO_LPM },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 18/148 Revert "usb: gadget: udc-xilinx: replace memcpy with memcpy_toio"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
[ Upstream commit fe0a2ac7c627b064c479ad0c3b25e531d342e048 ]
This reverts commit 8cb339f1c1f04baede9d54c1e40ac96247a6393b as it throws up a bunch of sparse warnings as reported by the kernel test robot.
--- drivers/usb/gadget/udc/udc-xilinx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/usb/gadget/udc/udc-xilinx.c +8 -8
@@ -496,11 +496,11 @@ static int xudc_eptxrx(struct xusb_ep *ep, struct xusb_req *req,/* Get the Buffer address and copy the transmit data.*/ eprambase = (u32 __force *)(udc->addr + ep->rambase);if (ep->is_in) { -memcpy_toio (eprambase, bufferptr, bytestosend); +memcpy (eprambase, bufferptr, bytestosend); udc->write_fn (udc->addr, ep->offset +XUSB_EP_BUF0COUNT_OFFSET , bufferlen); }else { -memcpy_toio (bufferptr, eprambase, bytestosend); +memcpy (bufferptr, eprambase, bytestosend); }/* * Enable the buffer for transmission.
@@ -514,11 +514,11 @@ static int xudc_eptxrx(struct xusb_ep *ep, struct xusb_req *req, eprambase = (u32 __force *)(udc->addr + ep->rambase + ep->ep_usb.maxpacket);if (ep->is_in) { -memcpy_toio (eprambase, bufferptr, bytestosend); +memcpy (eprambase, bufferptr, bytestosend); udc->write_fn (udc->addr, ep->offset +XUSB_EP_BUF1COUNT_OFFSET , bufferlen); }else { -memcpy_toio (bufferptr, eprambase, bytestosend); +memcpy (bufferptr, eprambase, bytestosend); }/* * Enable the buffer for transmission.
@@ -1020,7 +1020,7 @@ static int __xudc_ep0_queue(struct xusb_ep *ep0, struct xusb_req *req) udc->addr); length = req->usb_req.actual =min_t (u32, length,EP0_MAX_PACKET ); -memcpy_toio (corebuf, req->usb_req.buf, length); +memcpy (corebuf, req->usb_req.buf, length); udc->write_fn (udc->addr,XUSB_EP_BUF0COUNT_OFFSET , length); udc->write_fn (udc->addr,XUSB_BUFFREADY_OFFSET ,1 ); }else {
@@ -1746,7 +1746,7 @@ static void xudc_handle_setup(struct xusb_udc *udc)/* Load up the chapter 9 command buffer.*/ ep0rambase = (u32 __force *) (udc->addr +XUSB_SETUP_PKT_ADDR_OFFSET ); -memcpy_toio (&setup, ep0rambase,8 ); +memcpy (&setup, ep0rambase,8 ); udc->setup = setup; udc->setup.wValue =cpu_to_le16 (setup.wValue);
@@ -1833,7 +1833,7 @@ static void xudc_ep0_out(struct xusb_udc *udc) (ep0->rambase << 2)); buffer = req->usb_req.buf + req->usb_req.actual; req->usb_req.actual = req->usb_req.actual + bytes_to_rx; -memcpy_toio (buffer, ep0rambase, bytes_to_rx); +memcpy (buffer, ep0rambase, bytes_to_rx);if (req->usb_req.length == req->usb_req.actual) {/* Data transfer completed get ready for Status stage */
@@ -1909,7 +1909,7 @@ static void xudc_ep0_in(struct xusb_udc *udc) (ep0->rambase << 2)); buffer = req->usb_req.buf + req->usb_req.actual; req->usb_req.actual = req->usb_req.actual + length; -memcpy_toio (ep0rambase, buffer, length); +memcpy (ep0rambase, buffer, length); } udc->write_fn (udc->addr,XUSB_EP_BUF0COUNT_OFFSET , count); udc->write_fn (udc->addr,XUSB_BUFFREADY_OFFSET ,1 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 19/148 drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
In reply to Greg Kroah-HartmanFrom: Phil Auld <[email protected]>
commit d7f06bdd6ee87fbefa05af5f57361d85e7715b11 upstream.
As PAGE_SIZE is unsigned long, -1 > PAGE_SIZE when NR_CPUS <= 3. This leads to very large file sizes:
topology$ ls -l
total 0
-r--r--r-- 1 root root 18446744073709551615 Sep 5 11:59 core_cpus -r--r--r-- 1 root root 4096 Sep 5 11:59 core_cpus_list -r--r--r-- 1 root root 4096 Sep 5 10:58 core_id -r--r--r-- 1 root root 18446744073709551615 Sep 5 10:10 core_siblings -r--r--r-- 1 root root 4096 Sep 5 11:59 core_siblings_list -r--r--r-- 1 root root 18446744073709551615 Sep 5 11:59 die_cpus -r--r--r-- 1 root root 4096 Sep 5 11:59 die_cpus_list -r--r--r-- 1 root root 4096 Sep 5 11:59 die_id -r--r--r-- 1 root root 18446744073709551615 Sep 5 11:59 package_cpus -r--r--r-- 1 root root 4096 Sep 5 11:59 package_cpus_list -r--r--r-- 1 root root 4096 Sep 5 10:58 physical_package_id -r--r--r-- 1 root root 18446744073709551615 Sep 5 10:10 thread_siblings -r--r--r-- 1 root root 4096 Sep 5 11:59 thread_siblings_list
Adjust the inequality to catch the case when NR_CPUS is configured to a small value.
--- include/linux/cpumask.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/cpumask.h +3 -2
@@ -1057,9 +1057,10 @@ cpumap_print_list_to_buf(char *buf, cons* cover a worst-case of every other cpu being on one of two nodes for a * very large NR_CPUS. * -* Use PAGE_SIZE as a minimum for smaller configurations. +* Use PAGE_SIZE as a minimum for smaller configurations while avoiding +* unsigned comparison to -1. */ -#define CPUMAP_FILE_MAX_BYTES ((((NR_CPUS * 9)/32 - 1) > PAGE_SIZE) \ +#define CPUMAP_FILE_MAX_BYTES (((NR_CPUS * 9)/32 > PAGE_SIZE) \ ? (NR_CPUS * 9)/32 - 1 : PAGE_SIZE)#define CPULIST_FILE_MAX_BYTES (((NR_CPUS * 7)/2 > PAGE_SIZE) ? (NR_CPUS * 7)/2 : PAGE_SIZE)
Greg Kroah-Hartman
maintainerPATCH 20/148 USB: core: Fix RST error in hub.c
In reply to Greg Kroah-HartmanFrom: Alan Stern <[email protected]>
commit 766a96dc558385be735a370db867e302c8f22153 upstream.
A recent commit added an invalid RST expression to a kerneldoc comment in hub.c. The fix is trivial.
--- drivers/usb/core/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/hub.c +1 -1
@@ -6044,7 +6044,7 @@ re_enumerate_no_bos:* * Return: The same as for usb_reset_and_verify_device(). * However, if a reset is already in progress (for instance, if a -* driver doesn't have pre_ or post_reset() callbacks, and while +* driver doesn't have pre_reset() or post_reset() callbacks, and while * being unbound or re-bound during the ongoing reset its disconnect() * or probe() routine tries to perform a second, nested reset), the * routine returns -EINPROGRESS.
Greg Kroah-Hartman
maintainerPATCH 21/148 USB: serial: option: add Quectel BG95 0x0203 composition
In reply to Greg Kroah-HartmanFrom: Carl Yin(殷张成) <[email protected]>
commit f8f67eff6847f9b8d753fa029723bcc54296055a upstream.
Add support for the following Quectel BG95 composition:
0x0203: Diag + GNSS + Modem + ECM
usb-devices output:
T: Bus=01 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=0203 Rev= 0.00 S: Manufacturer=Quectel, Incorporated S: Product=Quectel LPWA Module S: SerialNumber=71d3a21b C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA A: FirstIf#= 3 IfCount= 2 Cls=02(comm.) Sub=00 Prot=00 I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=60 Driver=option E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=option E: Ad=83(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether E: Ad=85(I) Atr=03(Int.) MxPS= 64 Ivl=2ms I: If#= 4 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether I:* If#= 4 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -1138,6 +1138,8 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff), .driver_info = NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, + { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0203, 0xff), /* BG95-M3 */ + .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
Greg Kroah-Hartman
maintainerPATCH 22/148 USB: serial: option: add Quectel RM520N
In reply to Greg Kroah-HartmanFrom: jerry meng <[email protected]>
commit d640c4cb8f2f933c0ca896541f9de7fb1ae245f4 upstream.
add support for Quectel RM520N which is based on Qualcomm SDX62 chip.
0x0801: DIAG + NMEA + AT + MODEM + RMNET
T: Bus=03 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 10 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=2c7c ProdID=0801 Rev= 5.04 S: Manufacturer=Quectel S: Product=RM520N-GL S: SerialNumber=384af524 C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=option E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms E: Ad=8e(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=0f(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -256,6 +256,7 @@ static void option_instat_callback(struc#define QUECTEL_PRODUCT_EM060K 0x030b#define QUECTEL_PRODUCT_EM12 0x0512#define QUECTEL_PRODUCT_RM500Q 0x0800 +#define QUECTEL_PRODUCT_RM520N 0x0801#define QUECTEL_PRODUCT_EC200S_CN 0x6002#define QUECTEL_PRODUCT_EC200T 0x6026#define QUECTEL_PRODUCT_RM500K 0x7001
@@ -1161,6 +1162,9 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10), .driver_info = ZLP }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
Greg Kroah-Hartman
maintainerPATCH 23/148 Revert "ALSA: usb-audio: Split endpoint setups for hw_params and prepare"
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 79764ec772bc1346441ae1c4b1f3bd1991d634e8 upstream.
This reverts commit ff878b408a03bef5d610b7e2302702e16a53636e.
Unfortunately the recent fix seems bringing another regressions with PulseAudio / pipewire, at least for Steinberg and MOTU devices.
As a temporary solution, do a straight revert. The issue for Android will be revisited again later by another different fix (if any).
--- sound/usb/endpoint.c | 23 ++++++++++++++--------- sound/usb/endpoint.h | 6 ++---- sound/usb/pcm.c | 14 ++++---------- 3 files changed, 20 insertions(+), 23 deletions(-)
sound/usb/endpoint.c +14 -9
@@ -731,8 +731,7 @@ bool snd_usb_endpoint_compatible(struct* The endpoint needs to be closed via snd_usb_endpoint_close() later. * * Note that this function doesn't configure the endpoint. The substream -* needs to set it up later via snd_usb_endpoint_set_params() and -* snd_usb_endpoint_prepare(). +* needs to set it up later via snd_usb_endpoint_configure(). */ struct snd_usb_endpoint * snd_usb_endpoint_open(struct snd_usb_audio *chip,
@@ -1255,13 +1254,12 @@ out_of_memory:/* * snd_usb_endpoint_set_params: configure an snd_usb_endpoint * -* It's called either from hw_params callback. * Determine the number of URBs to be used on this endpoint. * An endpoint must be configured before it can be started. * An endpoint that is already running can not be reconfigured. */ -int snd_usb_endpoint_set_params (struct snd_usb_audio *chip, -struct snd_usb_endpoint *ep) +static int snd_usb_endpoint_set_params (struct snd_usb_audio *chip, +struct snd_usb_endpoint *ep) {const struct audioformat *fmt = ep->cur_audiofmt;int err;
@@ -1317,18 +1315,18 @@ int snd_usb_endpoint_set_params(struct s }/* -* snd_usb_endpoint_prepare: Prepare the endpoint +* snd_usb_endpoint_configure: Configure the endpoint * * This function sets up the EP to be fully usable state. -* It's called either from prepare callback. +* It's called either from hw_params or prepare callback. * The function checks need_setup flag, and performs nothing unless needed, * so it's safe to call this multiple times. * * This returns zero if unchanged, 1 if the configuration has changed, * or a negative error code. */ -int snd_usb_endpoint_prepare (struct snd_usb_audio *chip, -struct snd_usb_endpoint *ep) +int snd_usb_endpoint_configure (struct snd_usb_audio *chip, +struct snd_usb_endpoint *ep) {bool iface_first;int err =0 ;
@@ -1350,6 +1348,9 @@ int snd_usb_endpoint_prepare(struct snd_if (err <0 ) goto unlock; } + err =snd_usb_endpoint_set_params (chip, ep); +if (err <0 ) + goto unlock; goto done; }
@@ -1377,6 +1378,10 @@ int snd_usb_endpoint_prepare(struct snd_if (err <0 ) goto unlock; + err =snd_usb_endpoint_set_params (chip, ep); +if (err <0 ) + goto unlock; + err =snd_usb_select_mode_quirk (chip, ep->cur_audiofmt);if (err <0 ) goto unlock;
sound/usb/endpoint.h +2 -4
@@ -17,10 +17,8 @@ snd_usb_endpoint_open(struct snd_usb_aud bool is_sync_ep);void snd_usb_endpoint_close (struct snd_usb_audio *chip,struct snd_usb_endpoint *ep); -int snd_usb_endpoint_set_params (struct snd_usb_audio *chip, -struct snd_usb_endpoint *ep); -int snd_usb_endpoint_prepare (struct snd_usb_audio *chip, -struct snd_usb_endpoint *ep); +int snd_usb_endpoint_configure (struct snd_usb_audio *chip, +struct snd_usb_endpoint *ep);int snd_usb_endpoint_get_clock_rate (struct snd_usb_audio *chip,int clock); bool snd_usb_endpoint_compatible(struct snd_usb_audio *chip,
sound/usb/pcm.c +4 -10
@@ -443,17 +443,17 @@ static int configure_endpoints(struct snif (stop_endpoints (subs, false))sync_pending_stops (subs);if (subs->sync_endpoint) { - err =snd_usb_endpoint_prepare (chip, subs->sync_endpoint); + err =snd_usb_endpoint_configure (chip, subs->sync_endpoint);if (err <0 )return err; } - err =snd_usb_endpoint_prepare (chip, subs->data_endpoint); + err =snd_usb_endpoint_configure (chip, subs->data_endpoint);if (err <0 )return err;snd_usb_set_format_quirk (subs, subs->cur_audiofmt); }else {if (subs->sync_endpoint) { - err =snd_usb_endpoint_prepare (chip, subs->sync_endpoint); + err =snd_usb_endpoint_configure (chip, subs->sync_endpoint);if (err <0 )return err; }
@@ -551,13 +551,7 @@ static int snd_usb_hw_params(struct snd_ subs->cur_audiofmt = fmt;mutex_unlock (&chip->mutex); -if (subs->sync_endpoint) { - ret =snd_usb_endpoint_set_params (chip, subs->sync_endpoint); -if (ret <0 ) - goto unlock; - } - - ret =snd_usb_endpoint_set_params (chip, subs->data_endpoint); + ret =configure_endpoints (chip, subs); unlock:if (ret <0 )
Greg Kroah-Hartman
maintainerPATCH 24/148 ALSA: core: Fix double-free at snd_card_new()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit c3afa2a402d1ecefa59f88d55d9e765f52f75bd9 upstream.
During the code change to add the support for devres-managed card instance, we put an explicit kfree(card) call at the error path in snd_card_new(). This is needed for the early error path before the card is initialized with the device, but is rather superfluous and causes a double-free at the error path after the card instance is initialized, as the destructor of the card object already contains a kfree() call.
This patch fixes the double-free situation by removing the superfluous kfree(). Meanwhile we need to call kfree() explicitly for the early error path, so it's added there instead.
--- sound/core/init.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
sound/core/init.c +5 -5
@@ -178,10 +178,8 @@ int snd_card_new(struct device *parent,return -ENOMEM ; err =snd_card_init (card, parent, idx, xid, module, extra_size); -if (err <0 ) { -kfree (card); -return err; - } +if (err <0 ) +return err;/* card is freed by error handler */ *card_ret = card;return 0 ;
@@ -231,7 +229,7 @@ int snd_devm_card_new(struct device *par card->managed = true; err =snd_card_init (card, parent, idx, xid, module, extra_size);if (err <0 ) { -devres_free (card); +devres_free (card);/* in managed mode, we need to free manually */ return err; }
@@ -293,6 +291,8 @@ static int snd_card_init(struct snd_cardmutex_unlock (&snd_card_mutex);dev_err (parent,"cannot find the slot for index %d (range 0-%i), error: %d\n" , idx, snd_ecards_limit -1 , err); +if (!card->managed) +kfree (card);/* manually free here, as no destructor called */ return err; }set_bit (idx, snd_cards_lock);/* lock it */
Greg Kroah-Hartman
maintainerPATCH 25/148 ALSA: hda/tegra: set depop delay for tegra
In reply to Greg Kroah-HartmanFrom: Mohan Kumar <[email protected]>
commit 3c4d8c24fb6c44f426e447b04800b0ed61a7b5ae upstream.
Reduce the suspend time by setting depop delay to 10ms for tegra.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -3868,6 +3868,7 @@ static int patch_tegra_hdmi(struct hda_cif (err)return err; + codec->depop_delay =10 ; codec->patch_ops.build_pcms = tegra_hdmi_build_pcms; spec = codec->spec; spec->chmap.ops.chmap_cea_alloc_validate_get_type =
Greg Kroah-Hartman
maintainerPATCH 26/148 ALSA: hda: add Intel 5 Series / 3400 PCI DID
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
commit 4d40ceef4745536289012670103c59264e0fb3ec upstream.
Handle 0x3b57 variant with same AZX_DCAPS_INTEL_PCH_NOPM capabilities as 0x3b56. In practise this allow use of HDMI/DP display audio via i915.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2519,6 +2519,8 @@ static const struct pci_device_id azx_id/* 5 Series/3400 */ { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, + { PCI_DEVICE(0x8086, 0x3b57), + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, /* Poulsbo */ { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
Greg Kroah-Hartman
maintainerPATCH 27/148 ALSA: hda/realtek: Add quirk for Huawei WRT-WX9
In reply to Greg Kroah-HartmanFrom: huangwenhui <[email protected]>
commit cbcdf8c4d35cd74aee8581eb2f0453e0ecab7b05 upstream.
Fixes headphone and headset microphone detection on Huawei WRT-WX9.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9205,6 +9205,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x9e54 ,"LENOVO NB" ,ALC269_FIXUP_LENOVO_EAPD ),SND_PCI_QUIRK (0x1849 ,0x1233 ,"ASRock NUC Box 1100" ,ALC233_FIXUP_NO_AUDIO_JACK ),SND_PCI_QUIRK (0x19e5 ,0x3204 ,"Huawei MACH-WX9" ,ALC256_FIXUP_HUAWEI_MACH_WX9_PINS ), +SND_PCI_QUIRK (0x19e5 ,0x320f ,"Huawei WRT-WX9 " ,ALC256_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1b35 ,0x1235 ,"CZC B20" ,ALC269_FIXUP_CZC_B20 ),SND_PCI_QUIRK (0x1b35 ,0x1236 ,"CZC TMI" ,ALC269_FIXUP_CZC_TMI ), SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101),
Greg Kroah-Hartman
maintainerPATCH 28/148 ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5570 laptop
In reply to Greg Kroah-HartmanFrom: Callum Osmotherly <[email protected]>
commit bdc9b7396f7d4d6533e70fd8d5472f505b5ef58f upstream.
The Dell Precision 5570 uses the same 4-speakers-on-ALC289 just like the previous Precision 5560. I replicated that patch onto this one, and can confirm that the audio is much better (the woofers are now working); I've tested it on my Dell Precision 5570.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8831,6 +8831,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1028 ,0x0a9d ,"Dell Latitude 5430" ,ALC269_FIXUP_DELL4_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x0a9e ,"Dell Latitude 5430" ,ALC269_FIXUP_DELL4_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x0b19 ,"Dell XPS 15 9520" ,ALC289_FIXUP_DUAL_SPK ), +SND_PCI_QUIRK (0x1028 ,0x0b1a ,"Dell Precision 5570" ,ALC289_FIXUP_DUAL_SPK ),SND_PCI_QUIRK (0x1028 ,0x164a ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x164b ,"Dell" ,ALC293_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
Greg Kroah-Hartman
maintainerPATCH 29/148 ALSA: hda/realtek: Re-arrange quirk table entries
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit b16c8f229a58eaddfc58aab447253464abd3c85e upstream.
A few entries have been mistakenly inserted in wrong positions without considering the SSID ordering. Place them at right positions.
--- sound/pci/hda/patch_realtek.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/pci/hda/patch_realtek.c +3 -3
@@ -8984,10 +8984,11 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x13b0 ,"ASUS Z550SA" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x1427 ,"Asus Zenbook UX31E" ,ALC269VB_FIXUP_ASUS_ZENBOOK ),SND_PCI_QUIRK (0x1043 ,0x1517 ,"Asus Zenbook UX31A" ,ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A ), +SND_PCI_QUIRK (0x1043 ,0x1662 ,"ASUS GV301QH" ,ALC294_FIXUP_ASUS_DUAL_SPK ), +SND_PCI_QUIRK (0x1043 ,0x16b2 ,"ASUS GU603" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x16e3 ,"ASUS UX50" ,ALC269_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1043 ,0x1740 ,"ASUS UX430UA" ,ALC295_FIXUP_ASUS_DACS ),SND_PCI_QUIRK (0x1043 ,0x17d1 ,"ASUS UX431FL" ,ALC294_FIXUP_ASUS_DUAL_SPK ), -SND_PCI_QUIRK (0x1043 ,0x1662 ,"ASUS GV301QH" ,ALC294_FIXUP_ASUS_DUAL_SPK ),SND_PCI_QUIRK (0x1043 ,0x1881 ,"ASUS Zephyrus S/M" ,ALC294_FIXUP_ASUS_GX502_PINS ),SND_PCI_QUIRK (0x1043 ,0x18b1 ,"Asus MJ401TA" ,ALC256_FIXUP_ASUS_HEADSET_MIC ), SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC),
@@ -9003,13 +9004,12 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1bbd ,"ASUS Z550MA" ,ALC255_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x1c23 ,"Asus X55U" ,ALC269_FIXUP_LIMIT_INT_MIC_BOOST ),SND_PCI_QUIRK (0x1043 ,0x1ccd ,"ASUS X555UB" ,ALC256_FIXUP_ASUS_MIC ), +SND_PCI_QUIRK (0x1043 ,0x1d42 ,"ASUS Zephyrus G14 2022" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1d4e ,"ASUS TM420" ,ALC256_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x1e11 ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA502 ),SND_PCI_QUIRK (0x1043 ,0x1e51 ,"ASUS Zephyrus M15" ,ALC294_FIXUP_ASUS_GU502_PINS ),SND_PCI_QUIRK (0x1043 ,0x1e8e ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1f11 ,"ASUS Zephyrus G14" ,ALC289_FIXUP_ASUS_GA401 ), -SND_PCI_QUIRK (0x1043 ,0x1d42 ,"ASUS Zephyrus G14 2022" ,ALC289_FIXUP_ASUS_GA401 ), -SND_PCI_QUIRK (0x1043 ,0x16b2 ,"ASUS GU603" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x3030 ,"ASUS ZN270IE" ,ALC256_FIXUP_ASUS_AIO_GPIO2 ),SND_PCI_QUIRK (0x1043 ,0x831a ,"ASUS P901" ,ALC269_FIXUP_STEREO_DMIC ), SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
Greg Kroah-Hartman
maintainerPATCH 30/148 ALSA: hda/realtek: Add pincfg for ASUS G513 HP jack
In reply to Greg Kroah-HartmanFrom: Luke D. Jones <[email protected]>
commit c611e659044168e7abcbae8ba1ea833521498fbb upstream.
Fixes up the pincfg for ASUS ROG Strix G513 headphone and mic combo jack
[ Fixed the position in the quirk table by tiwai ]
--- sound/pci/hda/patch_realtek.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/pci/hda/patch_realtek.c +11 -0
@@ -6879,6 +6879,7 @@ enum {ALC294_FIXUP_ASUS_GU502_HP ,ALC294_FIXUP_ASUS_GU502_PINS ,ALC294_FIXUP_ASUS_GU502_VERBS , +ALC294_FIXUP_ASUS_G513_PINS ,ALC285_FIXUP_HP_GPIO_LED ,ALC285_FIXUP_HP_MUTE_LED , ALC236_FIXUP_HP_GPIO_LED,
@@ -8206,6 +8207,15 @@ static const struct hda_fixup alc269_fix .type = HDA_FIXUP_FUNC, .v.func = alc294_fixup_gu502_hp, }, + [ALC294_FIXUP_ASUS_G513_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x19 ,0x03a11050 },/* front HP mic */ + {0x1a ,0x03a11c30 },/* rear external mic */ + {0x21 ,0x03211420 },/* front HP out */ + { } + }, + }, [ALC294_FIXUP_ASUS_COEF_1B] = { .type = HDA_FIXUP_VERBS, .v.verbs = (const struct hda_verb []) {
@@ -9008,6 +9018,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1d4e ,"ASUS TM420" ,ALC256_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x1e11 ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA502 ),SND_PCI_QUIRK (0x1043 ,0x1e51 ,"ASUS Zephyrus M15" ,ALC294_FIXUP_ASUS_GU502_PINS ), +SND_PCI_QUIRK (0x1043 ,0x1e5e ,"ASUS ROG Strix G513" ,ALC294_FIXUP_ASUS_G513_PINS ),SND_PCI_QUIRK (0x1043 ,0x1e8e ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1f11 ,"ASUS Zephyrus G14" ,ALC289_FIXUP_ASUS_GA401 ), SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
Greg Kroah-Hartman
maintainerPATCH 31/148 ALSA: hda/realtek: Add pincfg for ASUS G533Z HP jack
In reply to Greg Kroah-HartmanFrom: Luke D. Jones <[email protected]>
commit bc2c23549ccd7105eb6ff0d4f0ac519285628673 upstream.
Fixes up the pincfg for ASUS ROG Strix G15 (G533Z) headphone combo jack
[ Fixed the position in the quirk table by tiwai ]
--- sound/pci/hda/patch_realtek.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
sound/pci/hda/patch_realtek.c +11 -0
@@ -6880,6 +6880,7 @@ enum {ALC294_FIXUP_ASUS_GU502_PINS ,ALC294_FIXUP_ASUS_GU502_VERBS ,ALC294_FIXUP_ASUS_G513_PINS , +ALC285_FIXUP_ASUS_G533Z_PINS ,ALC285_FIXUP_HP_GPIO_LED ,ALC285_FIXUP_HP_MUTE_LED , ALC236_FIXUP_HP_GPIO_LED,
@@ -8216,6 +8217,15 @@ static const struct hda_fixup alc269_fix { } }, }, + [ALC285_FIXUP_ASUS_G533Z_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x14, 0x90170120 }, + { } + }, + .chained = true, + .chain_id = ALC294_FIXUP_ASUS_G513_PINS, + }, [ALC294_FIXUP_ASUS_COEF_1B] = { .type = HDA_FIXUP_VERBS, .v.verbs = (const struct hda_verb[]) {
@@ -9013,6 +9023,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1b13 ,"Asus U41SV" ,ALC269_FIXUP_INV_DMIC ),SND_PCI_QUIRK (0x1043 ,0x1bbd ,"ASUS Z550MA" ,ALC255_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x1c23 ,"Asus X55U" ,ALC269_FIXUP_LIMIT_INT_MIC_BOOST ), +SND_PCI_QUIRK (0x1043 ,0x1c92 ,"ASUS ROG Strix G15" ,ALC285_FIXUP_ASUS_G533Z_PINS ),SND_PCI_QUIRK (0x1043 ,0x1ccd ,"ASUS X555UB" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x1d42 ,"ASUS Zephyrus G14 2022" ,ALC289_FIXUP_ASUS_GA401 ), SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE),
Greg Kroah-Hartman
maintainerPATCH 32/148 ALSA: hda/realtek: Add quirk for ASUS GA503R laptop
In reply to Greg Kroah-HartmanFrom: Luke D. Jones <[email protected]>
commit ba1f818053b0668a1ce2fe86b840e81b592cc560 upstream.
The ASUS G15 2022 (GA503R) series laptop has the same node-to-DAC pairs as early models and the G14, this includes bass speakers which are by default mapped incorrectly to the 0x06 node.
Add a quirk to use the same DAC pairs as the G14.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9031,6 +9031,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1e51 ,"ASUS Zephyrus M15" ,ALC294_FIXUP_ASUS_GU502_PINS ),SND_PCI_QUIRK (0x1043 ,0x1e5e ,"ASUS ROG Strix G513" ,ALC294_FIXUP_ASUS_G513_PINS ),SND_PCI_QUIRK (0x1043 ,0x1e8e ,"ASUS Zephyrus G15" ,ALC289_FIXUP_ASUS_GA401 ), +SND_PCI_QUIRK (0x1043 ,0x1c52 ,"ASUS Zephyrus G15 2022" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x1f11 ,"ASUS Zephyrus G14" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x3030 ,"ASUS ZN270IE" ,ALC256_FIXUP_ASUS_AIO_GPIO2 ), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
Greg Kroah-Hartman
maintainerPATCH 33/148 ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5530 laptop
In reply to Greg Kroah-HartmanFrom: Callum Osmotherly <[email protected]>
commit 1885ff13d4c42910b37a0e3f7c2f182520f4eed1 upstream.
Just as with the 5570 (and the other Dell laptops), this enables the two subwoofer speakers on the Dell Precision 5530 together with the main ones, significantly increasing the audio quality. I've tested this myself on a 5530 and can confirm it's working as expected.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8836,6 +8836,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1028 ,0x0871 ,"Dell Precision 3630" ,ALC255_FIXUP_DELL_HEADSET_MIC ),SND_PCI_QUIRK (0x1028 ,0x0872 ,"Dell Precision 3630" ,ALC255_FIXUP_DELL_HEADSET_MIC ),SND_PCI_QUIRK (0x1028 ,0x0873 ,"Dell Precision 3930" ,ALC255_FIXUP_DUMMY_LINEOUT_VERB ), +SND_PCI_QUIRK (0x1028 ,0x087d ,"Dell Precision 5530" ,ALC289_FIXUP_DUAL_SPK ),SND_PCI_QUIRK (0x1028 ,0x08ad ,"Dell WYSE AIO" ,ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x08ae ,"Dell WYSE NB" ,ALC225_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
Greg Kroah-Hartman
maintainerPATCH 34/148 iommu/vt-d: Check correct capability for sagaw determination
In reply to Greg Kroah-HartmanFrom: Yi Liu <[email protected]>
commit 154897807050c1161cb2660e502fc0470d46b986 upstream.
Check 5-level paging capability for 57 bits address width instead of checking 1GB large page capability.
--- drivers/iommu/intel/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/iommu.c +1 -1
@@ -539,7 +539,7 @@ static unsigned long __iommu_calculate_s {unsigned long fl_sagaw, sl_sagaw; - fl_sagaw =BIT (2 ) | (cap_fl1gp_support (iommu->cap) ?BIT (3 ) :0 ); + fl_sagaw =BIT (2 ) | (cap_5lp_support (iommu->cap) ?BIT (3 ) :0 ); sl_sagaw =cap_sagaw (iommu->cap);/* Second level only. */
Greg Kroah-Hartman
maintainerPATCH 35/148 btrfs: fix hang during unmount when stopping block group reclaim worker
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit 8a1f1e3d1eecf9d2359a2709e276743a67e145db upstream.
During early unmount, at close_ctree(), we try to stop the block group reclaim task with cancel_work_sync(), but that may hang if the block group reclaim task is currently at btrfs_relocate_block_group() waiting for the flag BTRFS_FS_UNFINISHED_DROPS to be cleared from fs_info->flags. During unmount we only clear that flag later, after trying to stop the block group reclaim task.
Fix that by clearing BTRFS_FS_UNFINISHED_DROPS before trying to stop the block group reclaim task and after setting BTRFS_FS_CLOSING_START, so that if the reclaim task is waiting on that bit, it will stop immediately after being woken, because it sees the filesystem is closing (with a call to btrfs_fs_closing()), and then returns immediately with -EINTR.
--- fs/btrfs/disk-io.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/btrfs/disk-io.c +11 -6
@@ -4298,6 +4298,17 @@ void __cold close_ctree(struct btrfs_fs_set_bit (BTRFS_FS_CLOSING_START , &fs_info->flags);/* +* If we had UNFINISHED_DROPS we could still be processing them, so +* clear that bit and wake up relocation so it can stop. +* We must do this before stopping the block group reclaim task, because +* at btrfs_relocate_block_group() we wait for this bit, and after the +* wait we stop with -EINTR if btrfs_fs_closing() returns non-zero - we +* have just set BTRFS_FS_CLOSING_START, so btrfs_fs_closing() will +* return 1. +*/ +btrfs_wake_unfinished_drop (fs_info); + +/* * We may have the reclaim task running and relocating a data block group, * in which case it may create delayed iputs. So stop it before we park * the cleaner kthread otherwise we can get new delayed iputs after
@@ -4315,12 +4326,6 @@ void __cold close_ctree(struct btrfs_fs_*/ kthread_park (fs_info->cleaner_kthread); -/* -* If we had UNFINISHED_DROPS we could still be processing them, so -* clear that bit and wake up relocation so it can stop. -*/ -btrfs_wake_unfinished_drop (fs_info); -/* wait for the qgroup rescan worker to stop */ btrfs_qgroup_wait_for_completion (fs_info, false);
Greg Kroah-Hartman
maintainerPATCH 36/148 btrfs: fix hang during unmount when stopping a space reclaim worker
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
commit a362bb864b8db4861977d00bd2c3222503ccc34b upstream.
Often when running generic/562 from fstests we can hang during unmount, resulting in a trace like this:
Sep 07 11:52:00 debian9 unknown: run fstests generic/562 at 2022-09-07 11:52:00 Sep 07 11:55:32 debian9 kernel: INFO: task umount:49438 blocked for more than 120 seconds. Sep 07 11:55:32 debian9 kernel: Not tainted 6.0.0-rc2-btrfs-next-122 #1 Sep 07 11:55:32 debian9 kernel: "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. Sep 07 11:55:32 debian9 kernel: task:umount state:D stack: 0 pid:49438 ppid: 25683 flags:0x00004000 Sep 07 11:55:32 debian9 kernel: Call Trace: Sep 07 11:55:32 debian9 kernel: <TASK> Sep 07 11:55:32 debian9 kernel: __schedule+0x3c8/0xec0 Sep 07 11:55:32 debian9 kernel: ? rcu_read_lock_sched_held+0x12/0x70 Sep 07 11:55:32 debian9 kernel: schedule+0x5d/0xf0 Sep 07 11:55:32 debian9 kernel: schedule_timeout+0xf1/0x130 Sep 07 11:55:32 debian9 kernel: ? lock_release+0x224/0x4a0 Sep 07 11:55:32 debian9 kernel: ? lock_acquired+0x1a0/0x420 Sep 07 11:55:32 debian9 kernel: ? trace_hardirqs_on+0x2c/0xd0 Sep 07 11:55:32 debian9 kernel: __wait_for_common+0xac/0x200 Sep 07 11:55:32 debian9 kernel: ? usleep_range_state+0xb0/0xb0 Sep 07 11:55:32 debian9 kernel: __flush_work+0x26d/0x530 Sep 07 11:55:32 debian9 kernel: ? flush_workqueue_prep_pwqs+0x140/0x140 Sep 07 11:55:32 debian9 kernel: ? trace_clock_local+0xc/0x30 Sep 07 11:55:32 debian9 kernel: __cancel_work_timer+0x11f/0x1b0 Sep 07 11:55:32 debian9 kernel: ? close_ctree+0x12b/0x5b3 [btrfs] Sep 07 11:55:32 debian9 kernel: ? __trace_bputs+0x10b/0x170 Sep 07 11:55:32 debian9 kernel: close_ctree+0x152/0x5b3 [btrfs] Sep 07 11:55:32 debian9 kernel: ? evict_inodes+0x166/0x1c0 Sep 07 11:55:32 debian9 kernel: generic_shutdown_super+0x71/0x120 Sep 07 11:55:32 debian9 kernel: kill_anon_super+0x14/0x30 Sep 07 11:55:32 debian9 kernel: btrfs_kill_super+0x12/0x20 [btrfs] Sep 07 11:55:32 debian9 kernel: deactivate_locked_super+0x2e/0xa0 Sep 07 11:55:32 debian9 kernel: cleanup_mnt+0x100/0x160 Sep 07 11:55:32 debian9 kernel: task_work_run+0x59/0xa0 Sep 07 11:55:32 debian9 kernel: exit_to_user_mode_prepare+0x1a6/0x1b0 Sep 07 11:55:32 debian9 kernel: syscall_exit_to_user_mode+0x16/0x40 Sep 07 11:55:32 debian9 kernel: do_syscall_64+0x48/0x90 Sep 07 11:55:32 debian9 kernel: entry_SYSCALL_64_after_hwframe+0x63/0xcd Sep 07 11:55:32 debian9 kernel: RIP: 0033:0x7fcde59a57a7 Sep 07 11:55:32 debian9 kernel: RSP: 002b:00007ffe914217c8 EFLAGS: 00000246 ORIG_RAX: 00000000000000a6 Sep 07 11:55:32 debian9 kernel: RAX: 0000000000000000 RBX: 00007fcde5ae8264 RCX: 00007fcde59a57a7 Sep 07 11:55:32 debian9 kernel: RDX: 0000000000000000 RSI: 0000000000000000 RDI: 000055b57556cdd0 Sep 07 11:55:32 debian9 kernel: RBP: 000055b57556cba0 R08: 0000000000000000 R09: 00007ffe91420570 Sep 07 11:55:32 debian9 kernel: R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 Sep 07 11:55:32 debian9 kernel: R13: 000055b57556cdd0 R14: 000055b57556ccb8 R15: 0000000000000000 Sep 07 11:55:32 debian9 kernel: </TASK>
What happens is the following:
1) The cleaner kthread tries to start a transaction to delete an unused block group, but the metadata reservation can not be satisfied right away, so a reservation ticket is created and it starts the async metadata reclaim task (fs_info->async_reclaim_work);
2) Writeback for all the filler inodes with an i_size of 2K starts (generic/562 creates a lot of 2K files with the goal of filling metadata space). We try to create an inline extent for them, but we fail when trying to insert the inline extent with -ENOSPC (at cow_file_range_inline()) - since this is not critical, we fallback to non-inline mode (back to cow_file_range()), reserve extents, create extent maps and create the ordered extents;
3) An unmount starts, enters close_ctree();
4) The async reclaim task is flushing stuff, entering the flush states one by one, until it reaches RUN_DELAYED_IPUTS. There it runs all current delayed iputs.
After running the delayed iputs and before calling btrfs_wait_on_delayed_iputs(), one or more ordered extents complete, and btrfs_add_delayed_iput() is called for each one through btrfs_finish_ordered_io() -> btrfs_put_ordered_extent(). This results in bumping fs_info->nr_delayed_iputs from 0 to some positive value.
So the async reclaim task blocks at btrfs_wait_on_delayed_iputs() waiting for fs_info->nr_delayed_iputs to become 0;
5) The current transaction is committed by the transaction kthread, we then start unpinning extents and end up calling btrfs_try_granting_tickets() through unpin_extent_range(), since we released some space. This results in satisfying the ticket created by the cleaner kthread at step 1, waking up the cleaner kthread;
6) At close_ctree() we ask the cleaner kthread to park;
7) The cleaner kthread starts the transaction, deletes the unused block group, and then calls kthread_should_park(), which returns true, so it parks. And at this point we have the delayed iputs added by the completion of the ordered extents still pending;
8) Then later at close_ctree(), when we call:
cancel_work_sync(&fs_info->async_reclaim_work);
We hang forever, since the cleaner was parked and no one else can run delayed iputs after that, while the reclaim task is waiting for the remaining delayed iputs to be completed.
Fix this by waiting for all ordered extents to complete and running the delayed iputs before attempting to stop the async reclaim tasks. Note that we can not wait for ordered extents with btrfs_wait_ordered_roots() (or other similar functions) because that waits for the BTRFS_ORDERED_COMPLETE flag to be set on an ordered extent, but the delayed iput is added after that, when doing the final btrfs_put_ordered_extent(). So instead wait for the work queues used for executing ordered extent completion to be empty, which works because we do the final put on an ordered extent at btrfs_finish_ordered_io() (while we are in the unmount context).
--- fs/btrfs/disk-io.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
fs/btrfs/disk-io.c +25 -0
@@ -4348,6 +4348,31 @@ void __cold close_ctree(struct btrfs_fs_/* clear out the rbtree of defraggable inodes */ btrfs_cleanup_defrag_inodes (fs_info); +/* +* After we parked the cleaner kthread, ordered extents may have +* completed and created new delayed iputs. If one of the async reclaim +* tasks is running and in the RUN_DELAYED_IPUTS flush state, then we +* can hang forever trying to stop it, because if a delayed iput is +* added after it ran btrfs_run_delayed_iputs() and before it called +* btrfs_wait_on_delayed_iputs(), it will hang forever since there is +* no one else to run iputs. +* +* So wait for all ongoing ordered extents to complete and then run +* delayed iputs. This works because once we reach this point no one +* can either create new ordered extents nor create delayed iputs +* through some other means. +* +* Also note that btrfs_wait_ordered_roots() is not safe here, because +* it waits for BTRFS_ORDERED_COMPLETE to be set on an ordered extent, +* but the delayed iput for the respective inode is made only when doing +* the final btrfs_put_ordered_extent() (which must happen at +* btrfs_finish_ordered_io() when we are unmounting). +*/ +btrfs_flush_workqueue (fs_info->endio_write_workers); +/* Ordered extents for free space inodes. */ +btrfs_flush_workqueue (fs_info->endio_freespace_worker); +btrfs_run_delayed_iputs (fs_info); +cancel_work_sync (&fs_info->async_reclaim_work);cancel_work_sync (&fs_info->async_data_reclaim_work);cancel_work_sync (&fs_info->preempt_reclaim_work);
Greg Kroah-Hartman
maintainerPATCH 37/148 media: flexcop-usb: fix endpoint type check
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit 763679f0eeff0185fc431498849bbc1c24460875 upstream.
Commit d725d20e81c2 ("media: flexcop-usb: sanity checking of endpoint type") tried to add an endpoint type sanity check for the single isochronous endpoint but instead broke the driver by checking the wrong descriptor or random data beyond the last endpoint descriptor.
Make sure to check the right endpoint descriptor.
--- drivers/media/usb/b2c2/flexcop-usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/usb/b2c2/flexcop-usb.c +1 -1
@@ -511,7 +511,7 @@ static int flexcop_usb_init(struct flexcif (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints <1 )return -ENODEV ; -if (!usb_endpoint_is_isoc_in (&fc_usb->uintf->cur_altsetting->endpoint[1 ].desc)) +if (!usb_endpoint_is_isoc_in (&fc_usb->uintf->cur_altsetting->endpoint[0 ].desc))return -ENODEV ;switch (fc_usb->udev->speed) {
Greg Kroah-Hartman
maintainerPATCH 38/148 usb: dwc3: core: leave default DMA if the controller does not support 64-bit DMA
In reply to Greg Kroah-HartmanFrom: William Wu <[email protected]>
commit 91062e663b261815573ce00967b1895a99e668df upstream.
On some DWC3 controllers (e.g. Rockchip SoCs), the DWC3 core doesn't support 64-bit DMA address width. In this case, this driver should use the default 32-bit mask. Otherwise, the DWC3 controller will break if it runs on above 4GB physical memory environment.
This patch reads the DWC_USB3_AWIDTH bits of GHWPARAMS0 which used for the DMA address width, and only configure 64-bit DMA mask if the DWC_USB3_AWIDTH is 64.
--- drivers/usb/dwc3/core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/usb/dwc3/core.c +7 -6
@@ -1570,12 +1570,6 @@ static int dwc3_probe(struct platform_dedwc3_get_properties (dwc); -if (!dwc->sysdev_is_parent) { - ret =dma_set_mask_and_coherent (dwc->sysdev,DMA_BIT_MASK (64 )); -if (ret) -return ret; - } - dwc->reset =devm_reset_control_array_get_optional_shared (dev);if (IS_ERR (dwc->reset))return PTR_ERR (dwc->reset);
@@ -1612,6 +1606,13 @@ static int dwc3_probe(struct platform_deplatform_set_drvdata (pdev, dwc);dwc3_cache_hwparams (dwc); +if (!dwc->sysdev_is_parent && +DWC3_GHWPARAMS0_AWIDTH (dwc->hwparams.hwparams0) ==64 ) { + ret =dma_set_mask_and_coherent (dwc->sysdev,DMA_BIT_MASK (64 )); +if (ret) + goto disable_clks; + } +spin_lock_init (&dwc->lock);mutex_init (&dwc->mutex);
Greg Kroah-Hartman
maintainerPATCH 39/148 thunderbolt: Add support for Intel Maple Ridge single port controller
In reply to Greg Kroah-HartmanFrom: Gil Fine <[email protected]>
commit 14c7d905283744809e6b82efae2f490660a11cda upstream.
Add support for Maple Ridge discrete USB4 host controller from Intel which has a single USB4 port (versus the already supported dual port Maple Ridge USB4 host controller).
--- drivers/thunderbolt/icm.c | 1 + drivers/thunderbolt/nhi.h | 1 + 2 files changed, 2 insertions(+)
drivers/thunderbolt/icm.c +1 -0
@@ -2522,6 +2522,7 @@ struct tb *icm_probe(struct tb_nhi *nhi) tb->cm_ops = &icm_icl_ops;break ; +case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI :case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI : icm->is_supported = icm_tgl_is_supported; icm->get_mode = icm_ar_get_mode;
drivers/thunderbolt/nhi.h +1 -0
@@ -55,6 +55,7 @@ extern const struct tb_nhi_ops icl_nhi_o* need for the PCI quirk anymore as we will use ICM also on Apple * hardware. */ +#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI 0x1134#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI 0x1137#define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_NHI 0x157d#define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_BRIDGE 0x157e
Greg Kroah-Hartman
maintainerPATCH 40/148 efi: x86: Wipe setup_data on pure EFI boot
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 63bf28ceb3ebbe76048c3fb2987996ca1ae64f83 upstream.
When booting the x86 kernel via EFI using the LoadImage/StartImage boot services [as opposed to the deprecated EFI handover protocol], the setup header is taken from the image directly, and given that EFI's LoadImage has no Linux/x86 specific knowledge regarding struct bootparams or struct setup_header, any absolute addresses in the setup header must originate from the file and not from a prior loading stage.
Since we cannot generally predict where LoadImage() decides to load an image (*), such absolute addresses must be treated as suspect: even if a prior boot stage intended to make them point somewhere inside the [signed] image, there is no way to validate that, and if they point at an arbitrary location in memory, the setup_data nodes will not be covered by any signatures or TPM measurements either, and could be made to contain an arbitrary sequence of SETUP_xxx nodes, which could interfere quite badly with the early x86 boot sequence.
(*) Note that, while LoadImage() does take a buffer/size tuple in addition to a device path, which can be used to provide the image contents directly, it will re-allocate such images, as the memory footprint of an image is generally larger than the PE/COFF file representation.
--- drivers/firmware/efi/libstub/x86-stub.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/firmware/efi/libstub/x86-stub.c +7 -0
@@ -414,6 +414,13 @@ efi_status_t __efiapi efi_pe_entry(efi_h hdr->ramdisk_image =0 ; hdr->ramdisk_size =0 ; +/* +* Disregard any setup data that was provided by the bootloader: +* setup_data could be pointing anywhere, and we have no way of +* authenticating or validating the payload. +*/ + hdr->setup_data =0 ; +efi_stub_entry (handle, sys_table_arg, boot_params);/* not reached */
Greg Kroah-Hartman
maintainerPATCH 41/148 efi: libstub: check Shim mode using MokSBStateRT
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
commit 5f56a74cc0a6d9b9f8ba89cea29cd7c4774cb2b1 upstream.
We currently check the MokSBState variable to decide whether we should treat UEFI secure boot as being disabled, even if the firmware thinks otherwise. This is used by shim to indicate that it is not checking signatures on boot images. In the kernel, we use this to relax lockdown policies.
However, in cases where shim is not even being used, we don't want this variable to interfere with lockdown, given that the variable may be non-volatile and therefore persist across a reboot. This means setting it once will persistently disable lockdown checks on a given system.
So switch to the mirrored version of this variable, called MokSBStateRT, which is supposed to be volatile, and this is something we can check.
--- drivers/firmware/efi/libstub/secureboot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/firmware/efi/libstub/secureboot.c +4 -4
@@ -14,7 +14,7 @@/* SHIM variables */ static const efi_guid_t shim_guid =EFI_SHIM_LOCK_GUID ; -static const efi_char16_t shim_MokSBState_name[] =L"MokSBState" ; +static const efi_char16_t shim_MokSBState_name[] =L"MokSBStateRT" ;static efi_status_t get_var (efi_char16_t *name,efi_guid_t *vendor,u32 *attr,unsigned long *data_size,void *data)
@@ -43,8 +43,8 @@ enum efi_secureboot_mode efi_get_secureb/* * See if a user has put the shim into insecure mode. If so, and if the -* variable doesn't have the runtime attribute set, we might as well -* honor that. +* variable doesn't have the non-volatile attribute set, we might as +* well honor that. */ size =sizeof (moksbstate); status = get_efi_var(shim_MokSBState_name, &shim_guid,
@@ -53,7 +53,7 @@ enum efi_secureboot_mode efi_get_secureb/* If it fails, we don't care why. Default to secure */ if (status !=EFI_SUCCESS ) goto secure_boot_enabled; -if (!(attr &EFI_VARIABLE_RUNTIME_ACCESS ) && moksbstate ==1 ) +if (!(attr &EFI_VARIABLE_NON_VOLATILE ) && moksbstate ==1 )return efi_secureboot_mode_disabled; secure_boot_enabled:
Greg Kroah-Hartman
maintainerPATCH 42/148 wifi: mt76: fix reading current per-tid starting sequence number for aggregation
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
commit c3a510e2b53785df31d882a773c4c0780b4c825f upstream.
The code was accidentally shifting register values down by tid % 32 instead of (tid * field_size) % 32.
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +1 -1
@@ -1038,7 +1038,7 @@ u32 mt7615_mac_get_sta_tid_sn(struct mt7 offset %=32 ; val =mt76_rr (dev, addr); - val >>= (tid %32 ); + val >>= offset;if (offset >20 ) { addr +=4 ;
Greg Kroah-Hartman
maintainerPATCH 43/148 gpio: mockup: fix NULL pointer dereference when removing debugfs
In reply to Greg Kroah-HartmanFrom: Bartosz Golaszewski <[email protected]>
commit b7df41a6f79dfb18ba2203f8c5f0e9c0b9b57f68 upstream.
We now remove the device's debugfs entries when unbinding the driver. This now causes a NULL-pointer dereference on module exit because the platform devices are unregistered *after* the global debugfs directory has been recursively removed. Fix it by unregistering the devices first.
--- drivers/gpio/gpio-mockup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-mockup.c +1 -1
@@ -618,9 +618,9 @@ static int __init gpio_mockup_init(void) static void __exit gpio_mockup_exit(void) { +gpio_mockup_unregister_pdevs ();debugfs_remove_recursive (gpio_mockup_dbg_dir);platform_driver_unregister (&gpio_mockup_driver); -gpio_mockup_unregister_pdevs (); }module_init (gpio_mockup_init);
Greg Kroah-Hartman
maintainerPATCH 44/148 gpio: mockup: Fix potential resource leakage when register a chip
In reply to Greg Kroah-HartmanFrom: Andy Shevchenko <[email protected]>
commit 02743c4091ccfb246f5cdbbe3f44b152d5d12933 upstream.
If creation of software node fails, the locally allocated string array is left unfreed. Free it on error path.
--- drivers/gpio/gpio-mockup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpio/gpio-mockup.c +3 -1
@@ -554,8 +554,10 @@ static int __init gpio_mockup_register_c } fwnode =fwnode_create_software_node (properties,NULL ); -if (IS_ERR (fwnode)) +if (IS_ERR (fwnode)) { +kfree_strarray (line_names, ngpio);return PTR_ERR (fwnode); + } pdevinfo.name ="gpio-mockup" ; pdevinfo.id = idx;
Greg Kroah-Hartman
maintainerPATCH 45/148 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
In reply to Greg Kroah-HartmanFrom: Meng Li <[email protected]>
commit 69bef19d6b9700e96285f4b4e28691cda3dcd0d1 upstream.
When running gpio test on nxp-ls1028 platform with below command gpiomon --num-events=3 --rising-edge gpiochip1 25 There will be a warning trace as below:
Call trace: free_irq+0x204/0x360 lineevent_free+0x64/0x70 gpio_ioctl+0x598/0x6a0 __arm64_sys_ioctl+0xb4/0x100 invoke_syscall+0x5c/0x130
......el0t_64_sync+0x1a0/0x1a4
The reason of this issue is that calling request_threaded_irq() function failed, and then lineevent_free() is invoked to release the resource. Since the lineevent_state::irq was already set, so the subsequent invocation of free_irq() would trigger the above warning call trace. To fix this issue, set the lineevent_state::irq after the IRQ register successfully.
--- drivers/gpio/gpiolib-cdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib-cdev.c +3 -2
@@ -1784,7 +1784,6 @@ static int lineevent_create(struct gpio_ ret = -ENODEV ; goto out_free_le; } - le->irq = irq;if (eflags &GPIOEVENT_REQUEST_RISING_EDGE ) irqflags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?
@@ -1798,7 +1797,7 @@ static int lineevent_create(struct gpio_init_waitqueue_head (&le->wait);/* Request a thread to read the events */ - ret = request_threaded_irq(le->irq, + ret = request_threaded_irq(irq, lineevent_irq_handler, lineevent_irq_thread, irqflags,
@@ -1807,6 +1806,8 @@ static int lineevent_create(struct gpio_if (ret) goto out_free_le; + le->irq = irq; + fd =get_unused_fd_flags (O_RDONLY |O_CLOEXEC );if (fd <0 ) { ret = fd;
Greg Kroah-Hartman
maintainerPATCH 46/148 riscv: fix a nasty sigreturn bug...
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 762df359aa5849e010ef04c3ed79d57588ce17d9 upstream.
riscv has an equivalent of arm bug fixed by 653d48b22166 ("arm: fix really nasty sigreturn bug"); if signal gets caught by an interrupt that hits when we have the right value in a0 (-513), *and* another signal gets delivered upon sigreturn() (e.g. included into the blocked mask for the first signal and posted while the handler had been running), the syscall restart logics will see regs->cause equal to EXC_SYSCALL (we are in a syscall, after all) and a0 already restored to its original value (-513, which happens to be -ERESTARTNOINTR) and assume that we need to apply the usual syscall restart logics.
--- arch/riscv/kernel/signal.c | 2 ++ 1 file changed, 2 insertions(+)
arch/riscv/kernel/signal.c +2 -0
@@ -121,6 +121,8 @@ SYSCALL_DEFINE0(rt_sigreturn)if (restore_altstack (&frame->uc.uc_stack)) goto badframe; + regs->cause =-1UL ; +return regs->a0; badframe:
Greg Kroah-Hartman
maintainerPATCH 47/148 kasan: call kasan_malloc() from __kmalloc_*track_caller()
In reply to Greg Kroah-HartmanFrom: Peter Collingbourne <[email protected]>
commit 5373b8a09d6e037ee0587cb5d9fe4cc09077deeb upstream.
We were failing to call kasan_malloc() from __kmalloc_*track_caller() which was causing us to sometimes fail to produce KASAN error reports for allocations made using e.g. devm_kcalloc(), as the KASAN poison was not being initialized. Fix it.
--- mm/slub.c | 4 ++++ 1 file changed, 4 insertions(+)
mm/slub.c +4 -0
@@ -4920,6 +4920,8 @@ void *__kmalloc_track_caller(size_t size/* Honor the call site pointer we received. */ trace_kmalloc (caller, ret, size, s->size, gfpflags); + ret =kasan_kmalloc (s, ret, size, gfpflags); +return ret; }EXPORT_SYMBOL (__kmalloc_track_caller);
@@ -4951,6 +4953,8 @@ void *__kmalloc_node_track_caller(size_t/* Honor the call site pointer we received. */ trace_kmalloc_node (caller, ret, size, s->size, gfpflags, node); + ret =kasan_kmalloc (s, ret, size, gfpflags); +return ret; }EXPORT_SYMBOL (__kmalloc_node_track_caller);
Greg Kroah-Hartman
maintainerPATCH 48/148 can: flexcan: flexcan_mailbox_read() fix return value for drop = true
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit a09721dd47c8468b3f2fdd73f40422699ffe26dd upstream.
The following happened on an i.MX25 using flexcan with many packets on the bus:
The rx-offload queue reached a length more than skb_queue_len_max. In can_rx_offload_offload_one() the drop variable was set to true which made the call to .mailbox_read() (here: flexcan_mailbox_read()) to _always_ return ERR_PTR(-ENOBUFS) and drop the rx'ed CAN frame. So can_rx_offload_offload_one() returned ERR_PTR(-ENOBUFS), too.
can_rx_offload_irq_offload_fifo() looks as follows:
| while (1) {
| skb = can_rx_offload_offload_one(offload, 0);
| if (IS_ERR(skb))
| continue;
| if (!skb)
| break;
| ...
| }The flexcan driver wrongly always returns ERR_PTR(-ENOBUFS) if drop is requested, even if there is no CAN frame pending. As the i.MX25 is a single core CPU, while the rx-offload processing is active, there is no thread to process packets from the offload queue. So the queue doesn't get any shorter and this results is a tight loop.
Instead of always returning ERR_PTR(-ENOBUFS) if drop is requested, return NULL if no CAN frame is pending.
Changes since v1: https://lore.kernel.org/all/[email protected]
- don't break in can_rx_offload_irq_offload_fifo() in case of an error,
return NULL in flexcan_mailbox_read() in case of no pending CAN frame
instead
--- drivers/net/can/flexcan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/can/flexcan.c +5 -5
@@ -1036,11 +1036,6 @@ static struct sk_buff *flexcan_mailbox_ru32 reg_ctrl, reg_id, reg_iflag1;int i; -if (unlikely (drop)) { - skb =ERR_PTR (-ENOBUFS ); - goto mark_as_read; - } - mb =flexcan_get_mb (priv, n);if (priv->devtype_data.quirks &FLEXCAN_QUIRK_USE_RX_MAILBOX ) {
@@ -1069,6 +1064,11 @@ static struct sk_buff *flexcan_mailbox_r reg_ctrl = priv->read (&mb->can_ctrl); } +if (unlikely (drop)) { + skb =ERR_PTR (-ENOBUFS ); + goto mark_as_read; + } +if (reg_ctrl &FLEXCAN_MB_CNT_EDL ) skb =alloc_canfd_skb (offload->dev, &cfd);else
Greg Kroah-Hartman
maintainerPATCH 49/148 net: mana: Add rmb after checking owner bits
In reply to Greg Kroah-HartmanFrom: Haiyang Zhang <[email protected]>
commit 6fd2c68da55c552f86e401ebe40c4a619025ef69 upstream.
Per GDMA spec, rmb is necessary after checking owner_bits, before reading EQ or CQ entries.
Add rmb in these two places to comply with the specs.
--- drivers/net/ethernet/microsoft/mana/gdma_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/microsoft/mana/gdma_main.c +10 -0
@@ -368,6 +368,11 @@ static void mana_gd_process_eq_events(vobreak ; } +/* Per GDMA spec, rmb is necessary after checking owner_bits, before +* reading eqe. +*/ +rmb (); +mana_gd_process_eqe (eq); eq->head++;
@@ -1096,6 +1101,11 @@ static int mana_gd_read_cqe(struct gdma_if (WARN_ON_ONCE (owner_bits != new_bits))return -1 ; +/* Per GDMA spec, rmb is necessary after checking owner_bits, before +* reading completion info +*/ +rmb (); + comp->wq_num = cqe->cqe_info.wq_num; comp->is_sq = cqe->cqe_info.is_sq;memcpy (comp->cqe_data, cqe->cqe_data,GDMA_COMP_DATA_SIZE );
Greg Kroah-Hartman
maintainerPATCH 50/148 mm/slub: fix to return errno if kmalloc() fails
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
commit 7e9c323c52b379d261a72dc7bd38120a761a93cd upstream.
In create_unique_id(), kmalloc(, GFP_KERNEL) can fail due to out-of-memory, if it fails, return errno correctly rather than triggering panic via BUG_ON();
kernel BUG at mm/slub.c:5893!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP Call trace: sysfs_slab_add+0x258/0x260 mm/slub.c:5973 __kmem_cache_create+0x60/0x118 mm/slub.c:4899 create_cache mm/slab_common.c:229 [inline] kmem_cache_create_usercopy+0x19c/0x31c mm/slab_common.c:335 kmem_cache_create+0x1c/0x28 mm/slab_common.c:390 f2fs_kmem_cache_create fs/f2fs/f2fs.h:2766 [inline] f2fs_init_xattr_caches+0x78/0xb4 fs/f2fs/xattr.c:808 f2fs_fill_super+0x1050/0x1e0c fs/f2fs/super.c:4149 mount_bdev+0x1b8/0x210 fs/super.c:1400 f2fs_mount+0x44/0x58 fs/f2fs/super.c:4512 legacy_get_tree+0x30/0x74 fs/fs_context.c:610 vfs_get_tree+0x40/0x140 fs/super.c:1530 do_new_mount+0x1dc/0x4e4 fs/namespace.c:3040 path_mount+0x358/0x914 fs/namespace.c:3370 do_mount fs/namespace.c:3383 [inline] __do_sys_mount fs/namespace.c:3591 [inline] __se_sys_mount fs/namespace.c:3568 [inline] __arm64_sys_mount+0x2f8/0x408 fs/namespace.c:3568
--- mm/slub.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
mm/slub.c +4 -1
@@ -5869,7 +5869,8 @@ static char *create_unique_id(struct kmechar *name =kmalloc (ID_STR_LENGTH ,GFP_KERNEL );char *p = name; -BUG_ON (!name); +if (!name) +return ERR_PTR (-ENOMEM ); *p++ =':' ;/*
@@ -5927,6 +5928,8 @@ static int sysfs_slab_add(struct kmem_ca* for the symlinks. */ name =create_unique_id (s); +if (IS_ERR (name)) +return PTR_ERR (name); } s->kobj.kset = kset;
Greg Kroah-Hartman
maintainerPATCH 51/148 mm: slub: fix flush_cpu_slab()/__free_slab() invocations in task context.
In reply to Greg Kroah-HartmanFrom: Maurizio Lombardi <[email protected]>
commit e45cc288724f0cfd497bb5920bcfa60caa335729 upstream.
Commit 5a836bf6b09f ("mm: slub: move flush_cpu_slab() invocations __free_slab() invocations out of IRQ context") moved all flush_cpu_slab() invocations to the global workqueue to avoid a problem related with deactivate_slab()/__free_slab() being called from an IRQ context on PREEMPT_RT kernels.
When the flush_all_cpu_locked() function is called from a task context it may happen that a workqueue with WQ_MEM_RECLAIM bit set ends up flushing the global workqueue, this will cause a dependency issue.
workqueue: WQ_MEM_RECLAIM nvme-delete-wq:nvme_delete_ctrl_work [nvme_core]
is flushing !WQ_MEM_RECLAIM events:flush_cpu_slab
WARNING: CPU: 37 PID: 410 at kernel/workqueue.c:2637 check_flush_dependency+0x10a/0x120 Workqueue: nvme-delete-wq nvme_delete_ctrl_work [nvme_core] RIP: 0010:check_flush_dependency+0x10a/0x120[ 453.262125] Call Trace: __flush_work.isra.0+0xbf/0x220 ? __queue_work+0x1dc/0x420 flush_all_cpus_locked+0xfb/0x120 __kmem_cache_shutdown+0x2b/0x320 kmem_cache_destroy+0x49/0x100 bioset_exit+0x143/0x190 blk_release_queue+0xb9/0x100 kobject_cleanup+0x37/0x130 nvme_fc_ctrl_free+0xc6/0x150 [nvme_fc] nvme_free_ctrl+0x1ac/0x2b0 [nvme_core]
Fix this bug by creating a workqueue for the flush operation with the WQ_MEM_RECLAIM bit set.
--- mm/slub.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
mm/slub.c +8 -1
@@ -308,6 +308,11 @@ static inline void stat(const struct kme*/ static nodemask_t slab_nodes; +/* +* Workqueue used for flush_cpu_slab(). +*/ +static struct workqueue_struct *flushwq; +/******************************************************************** * Core slab cache functions *******************************************************************/
@@ -2688,7 +2693,7 @@ static void flush_all_cpus_locked(structINIT_WORK (&sfw->work, flush_cpu_slab); sfw->skip = false; sfw->s = s; -schedule_work_on (cpu, &sfw->work); +queue_work_on (cpu, flushwq, &sfw->work); }for_each_online_cpu (cpu) {
@@ -4850,6 +4855,8 @@ void __init kmem_cache_init(void)void __init kmem_cache_init_late (void ) { + flushwq =alloc_workqueue ("slub_flushwq" ,WQ_MEM_RECLAIM ,0 ); +WARN_ON (!flushwq); } struct kmem_cache *
Greg Kroah-Hartman
maintainerPATCH 52/148 KVM: x86: Inject #UD on emulated XSETBV if XSAVES isnt enabled
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 50b2d49bafa16e6311ab2da82f5aafc5f9ada99b upstream.
Inject #UD when emulating XSETBV if CR4.OSXSAVE is not set. This also covers the "XSAVE not supported" check, as setting CR4.OSXSAVE=1 #GPs if XSAVE is not supported (and userspace gets to keep the pieces if it forces incoherent vCPU state).
Add a comment to kvm_emulate_xsetbv() to call out that the CPU checks CR4.OSXSAVE before checking for intercepts. AMD'S APM implies that #UD has priority (says that intercepts are checked before #GP exceptions), while Intel's SDM says nothing about interception priority. However, testing on hardware shows that both AMD and Intel CPUs prioritize the #UD over interception.
Message-Id: <[email protected]>
--- arch/x86/kvm/emulate.c | 3 +++ arch/x86/kvm/x86.c | 1 + 2 files changed, 4 insertions(+)
arch/x86/kvm/emulate.c +3 -0
@@ -4122,6 +4122,9 @@ static int em_xsetbv(struct x86_emulate_ {u32 eax, ecx, edx; +if (!(ctxt->ops->get_cr (ctxt,4 ) &X86_CR4_OSXSAVE )) +return emulate_ud (ctxt); + eax =reg_read (ctxt,VCPU_REGS_RAX ); edx =reg_read (ctxt,VCPU_REGS_RDX ); ecx =reg_read (ctxt,VCPU_REGS_RCX );
arch/x86/kvm/x86.c +1 -0
@@ -1021,6 +1021,7 @@ static int __kvm_set_xcr(struct kvm_vcpuint kvm_emulate_xsetbv (struct kvm_vcpu *vcpu) { +/* Note, #UD due to CR4.OSXSAVE=0 has priority over the intercept. */ if (static_call (kvm_x86_get_cpl)(vcpu) !=0 ||__kvm_set_xcr (vcpu,kvm_rcx_read (vcpu),kvm_read_edx_eax (vcpu))) {kvm_inject_gp (vcpu,0 );
Greg Kroah-Hartman
maintainerPATCH 53/148 arm64: topology: fix possible overflow in amu_fie_setup()
In reply to Greg Kroah-HartmanFrom: Sergey Shtylyov <[email protected]>
commit d4955c0ad77dbc684fc716387070ac24801b8bca upstream.
cpufreq_get_hw_max_freq() returns max frequency in kHz as *unsigned int*, while freq_inv_set_max_ratio() gets passed this frequency in Hz as 'u64'. Multiplying max frequency by 1000 can potentially result in overflow -- multiplying by 1000ULL instead should avoid that...
Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool.
--- arch/arm64/kernel/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/topology.c +1 -1
@@ -249,7 +249,7 @@ static void amu_fie_setup(const struct cfor_each_cpu (cpu, cpus) {if (!freq_counters_valid (cpu) ||freq_inv_set_max_ratio (cpu, -cpufreq_get_hw_max_freq (cpu) *1000 , +cpufreq_get_hw_max_freq (cpu) *1000ULL ,arch_timer_get_rate ()))return ; }
Greg Kroah-Hartman
maintainerPATCH 54/148 vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 13b0566962914e167cb3238fbe29ced618f07a27 upstream.
Due to undocumented, hysterical raisins on x86, the CFI jump-table sections in .text are needlessly aligned to PMD_SIZE in the vmlinux linker script. When compiling a CFI-enabled arm64 kernel with a 64KiB page-size, a PMD maps 512MiB of virtual memory and so the .text section increases to a whopping 940MiB and blows the final Image up to 960MiB. Others report a link failure.
Since the CFI jump-table requires only instruction alignment, reduce the alignment directives to function alignment for parity with other parts of the .text section. This reduces the size of the .text section for the aforementioned 64KiB page size arm64 kernel to 19MiB for a much more reasonable total Image size of 39MiB.
--- include/asm-generic/vmlinux.lds.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/asm-generic/vmlinux.lds.h +1 -2
@@ -549,10 +549,9 @@*/ #ifdef CONFIG_CFI_CLANG #define TEXT_CFI_JT \ - . = ALIGN(PMD_SIZE); \ + ALIGN_FUNCTION(); \ __cfi_jt_start = .; \ *(.text..L.cfi.jumptable .text..L.cfi.jumptable.*) \ - . = ALIGN(PMD_SIZE); \ __cfi_jt_end = .;#else #define TEXT_CFI_JT
Greg Kroah-Hartman
maintainerPATCH 55/148 xfs: reorder iunlink remove operation in xfs_ifree
In reply to Greg Kroah-HartmanFrom: Dave Chinner <[email protected]>
[ Upstream commit 9a5280b312e2e7898b6397b2ca3cfd03f67d7be1 ]
The O_TMPFILE creation implementation creates a specific order of operations for inode allocation/freeing and unlinked list modification. Currently both are serialised by the AGI, so the order doesn't strictly matter as long as the are both in the same transaction.
However, if we want to move the unlinked list insertions largely out from under the AGI lock, then we have to be concerned about the order in which we do unlinked list modification operations. O_TMPFILE creation tells us this order is inode allocation/free, then unlinked list modification.
Change xfs_ifree() to use this same ordering on unlinked list removal. This way we always guarantee that when we enter the iunlinked list removal code from this path, we already have the AGI locked and we don't have to worry about lock nesting AGI reads inside unlink list locks because it's already locked and attached to the transaction.
We can do this safely as the inode freeing and unlinked list removal are done in the same transaction and hence are atomic operations with respect to log recovery.
--- fs/xfs/xfs_inode.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
fs/xfs/xfs_inode.c +13 -11
@@ -2599,14 +2599,13 @@ xfs_ifree_cluster( }/* -* This is called to return an inode to the inode free list. -* The inode should already be truncated to 0 length and have -* no pages associated with it. This routine also assumes that -* the inode is already a part of the transaction. +* This is called to return an inode to the inode free list. The inode should +* already be truncated to 0 length and have no pages associated with it. This +* routine also assumes that the inode is already a part of the transaction. * -* The on-disk copy of the inode will have been added to the list -* of unlinked inodes in the AGI. We need to remove the inode from -* that list atomically with respect to freeing it here. +* The on-disk copy of the inode will have been added to the list of unlinked +* inodes in the AGI. We need to remove the inode from that list atomically with +* respect to freeing it here. */ int xfs_ifree(
@@ -2628,13 +2627,16 @@ xfs_ifree( pag =xfs_perag_get (mp,XFS_INO_TO_AGNO (mp, ip->i_ino));/* -* Pull the on-disk inode from the AGI unlinked list. +* Free the inode first so that we guarantee that the AGI lock is going +* to be taken before we remove the inode from the unlinked list. This +* makes the AGI lock -> unlinked list modification order the same as +* used in O_TMPFILE creation. */ - error =xfs_iunlink_remove (tp, pag, ip); + error =xfs_difree (tp, pag, ip->i_ino, &xic);if (error) - goto out; +return error; - error =xfs_difree (tp, pag, ip->i_ino, &xic); + error =xfs_iunlink_remove (tp, pag, ip);if (error) goto out;
Greg Kroah-Hartman
maintainerPATCH 56/148 xfs: fix xfs_ifree() error handling to not leak perag ref
In reply to Greg Kroah-HartmanFrom: Brian Foster <[email protected]>
[ Upstream commit 6f5097e3367a7c0751e165e4c15bc30511a4ba38 ]
For some reason commit 9a5280b312e2e ("xfs: reorder iunlink remove operation in xfs_ifree") replaced a jump to the exit path in the event of an xfs_difree() error with a direct return, which skips releasing the perag reference acquired at the top of the function. Restore the original code to drop the reference on error.
--- fs/xfs/xfs_inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/xfs/xfs_inode.c +1 -1
@@ -2634,7 +2634,7 @@ xfs_ifree(*/ error =xfs_difree (tp, pag, ip->i_ino, &xic);if (error) -return error; + goto out; error =xfs_iunlink_remove (tp, pag, ip);if (error)
Greg Kroah-Hartman
maintainerPATCH 57/148 xfs: validate inode fork size against fork format
In reply to Greg Kroah-HartmanFrom: Dave Chinner <[email protected]>
[ Upstream commit 1eb70f54c445fcbb25817841e774adb3d912f3e8 ]
xfs_repair catches fork size/format mismatches, but the in-kernel verifier doesn't, leading to null pointer failures when attempting to perform operations on the fork. This can occur in the xfs_dir_is_empty() where the in-memory fork format does not match the size and so the fork data pointer is accessed incorrectly.
Note: this causes new failures in xfs/348 which is testing mode vs ftype mismatches. We now detect a regular file that has been changed to a directory or symlink mode as being corrupt because the data fork is for a symlink or directory should be in local form when there are only 3 bytes of data in the data fork. Hence the inode verify for the regular file now fires w/ -EFSCORRUPTED because the inode fork format does not match the format the corrupted mode says it should be in.
--- fs/xfs/libxfs/xfs_inode_buf.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)
fs/xfs/libxfs/xfs_inode_buf.c +26 -9
@@ -337,19 +337,36 @@ xfs_dinode_verify_fork( int whichfork) {uint32_t di_nextents =XFS_DFORK_NEXTENTS (dip, whichfork); +mode_t mode =be16_to_cpu (dip->di_mode); +uint32_t fork_size =XFS_DFORK_SIZE (dip, mp, whichfork); +uint32_t fork_format =XFS_DFORK_FORMAT (dip, whichfork); -switch (XFS_DFORK_FORMAT (dip, whichfork)) { +/* +* For fork types that can contain local data, check that the fork +* format matches the size of local data contained within the fork. +* +* For all types, check that when the size says the should be in extent +* or btree format, the inode isn't claiming it is in local format. +*/ +if (whichfork ==XFS_DATA_FORK ) { +if (S_ISDIR (mode) ||S_ISLNK (mode)) { +if (be64_to_cpu (dip->di_size) <= fork_size && + fork_format !=XFS_DINODE_FMT_LOCAL ) +return __this_address; + } + +if (be64_to_cpu (dip->di_size) > fork_size && + fork_format ==XFS_DINODE_FMT_LOCAL ) +return __this_address; + } + +switch (fork_format) {case XFS_DINODE_FMT_LOCAL :/* -* no local regular files yet +* No local regular files yet. */ -if (whichfork ==XFS_DATA_FORK ) { -if (S_ISREG (be16_to_cpu (dip->di_mode))) -return __this_address; -if (be64_to_cpu (dip->di_size) > -XFS_DFORK_SIZE (dip, mp, whichfork)) -return __this_address; - } +if (S_ISREG (mode) && whichfork ==XFS_DATA_FORK ) +return __this_address;if (di_nextents)return __this_address;break ;
Greg Kroah-Hartman
maintainerPATCH 58/148 firmware: arm_scmi: Harden accesses to the reset domains
In reply to Greg Kroah-HartmanFrom: Cristian Marussi <[email protected]>
[ Upstream commit e9076ffbcaed5da6c182b144ef9f6e24554af268 ]
Accessing reset domains descriptors by the index upon the SCMI drivers requests through the SCMI reset operations interface can potentially lead to out-of-bound violations if the SCMI driver misbehave.
Add an internal consistency check before any such domains descriptors accesses.
Stable-dep-of: b75c83d9b961 ("firmware: arm_scmi: Fix the asynchronous reset requests")
--- drivers/firmware/arm_scmi/reset.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/firmware/arm_scmi/reset.c +5 -1
@@ -152,8 +152,12 @@ static int scmi_domain_reset(const struct scmi_protocol_handle *ph, u32 domain,struct scmi_xfer *t;struct scmi_msg_reset_domain_reset *dom;struct scmi_reset_info *pi = ph->get_priv (ph); -struct reset_dom_info *rdom = pi->dom_info + domain; +struct reset_dom_info *rdom; +if (domain >= pi->num_domains) +return -EINVAL ; + + rdom = pi->dom_info + domain;if (rdom->async_reset) flags |=ASYNCHRONOUS_RESET ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 59/148 firmware: arm_scmi: Fix the asynchronous reset requests
In reply to Greg Kroah-HartmanFrom: Cristian Marussi <[email protected]>
[ Upstream commit b75c83d9b961fd3abf7310f8d36d5e6e9f573efb ]
SCMI Reset protocol specification allows the asynchronous reset request only when an autonomous reset action is specified. Reset requests based on explicit assert/deassert of signals should not be served asynchronously.
Current implementation will instead issue an asynchronous request in any case, as long as the reset domain had advertised to support asynchronous resets.
Avoid requesting the asynchronous resets when the reset action is not of the autonomous type, even if the target reset domain does, in general, support the asynchronous requests.
--- drivers/firmware/arm_scmi/reset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/arm_scmi/reset.c +2 -2
@@ -158,7 +158,7 @@ static int scmi_domain_reset(const struct scmi_protocol_handle *ph, u32 domain,return -EINVAL ; rdom = pi->dom_info + domain; -if (rdom->async_reset) +if (rdom->async_reset && flags &AUTONOMOUS_RESET ) flags |=ASYNCHRONOUS_RESET ; ret = ph->xops->xfer_get_init (ph,RESET ,sizeof (*dom),0 , &t);
@@ -170,7 +170,7 @@ static int scmi_domain_reset(const struct scmi_protocol_handle *ph, u32 domain, dom->flags =cpu_to_le32 (flags); dom->reset_state =cpu_to_le32 (state); -if (rdom->async_reset) +if (flags &ASYNCHRONOUS_RESET ) ret = ph->xops->do_xfer_with_response (ph, t);else ret = ph->xops->do_xfer (ph, t);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/148 arm64: dts: rockchip: Pull up wlan wake# on Gru-Bob
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
[ Upstream commit e5467359a725de90b6b8d0dd865500f6373828ca ]
The Gru-Bob board does not have a pull-up resistor on its WLAN_HOST_WAKE# pin, but Kevin does. The production/vendor kernel specified the pin configuration correctly as a pull-up, but this didn't get ported correctly to upstream.
This means Bob's WLAN_HOST_WAKE# pin is floating, causing inconsistent wakeup behavior.
Note that bt_host_wake_l has a similar dynamic, but apparently the upstream choice was to redundantly configure both internal and external pull-up on Kevin (see the "Kevin has an external pull up" comment in rk3399-gru.dtsi). This doesn't cause any functional problem, although it's perhaps wasteful.
--- arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 5 +++++ arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 1 + 2 files changed, 6 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts +5 -0
@@ -87,3 +87,8 @@ h1_int_od_l: h1-int-od-l { }; }; }; + +&wlan_host_wake_l { + /* Kevin has an external pull up, but Bob does not. */ + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; +};
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +1 -0
@@ -395,6 +395,7 @@ wifi_perst_l: wifi-perst-l { }; wlan_host_wake_l: wlan-host-wake-l { + /* Kevin has an external pull up, but Bob does not */ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 61/148 arm64: dts: rockchip: Fix typo in lisense text for PX30.Core
In reply to Greg Kroah-HartmanFrom: Jagan Teki <[email protected]>
[ Upstream commit 4a00c43818dcc19be97250d4c3c4a1e2f1ed4f9d ]
Fix the Amarula Solutions typo mistake in lisense text added in Engicam PX30.Core SoM dtsi.
--- arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/px30-engicam-px30-core.dtsi +2 -2
@@ -2,8 +2,8 @@ /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd * Copyright (c) 2020 Engicam srl - * Copyright (c) 2020 Amarula Solutons - * Copyright (c) 2020 Amarula Solutons(India) + * Copyright (c) 2020 Amarula Solutions + * Copyright (c) 2020 Amarula Solutions(India) */ #include <dt-bindings/gpio/gpio.h>
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 62/148 drm/mediatek: dsi: Add atomic {destroy,duplicate}_state, reset callbacks
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit eeda05b5e92f51d9a09646ecb493f0a1e872a6ef ]
Add callbacks for atomic_destroy_state, atomic_duplicate_state and atomic_reset to restore functionality of the DSI driver: this solves vblank timeouts when another bridge is present in the chain.
Tested bridge chain: DSI <=> ANX7625 => aux-bus panel
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/mediatek/mtk_dsi.c +3 -0
@@ -796,10 +796,13 @@ static void mtk_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge,static const struct drm_bridge_funcs mtk_dsi_bridge_funcs = { .attach = mtk_dsi_bridge_attach, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_disable = mtk_dsi_bridge_atomic_disable, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, .atomic_enable = mtk_dsi_bridge_atomic_enable, .atomic_pre_enable = mtk_dsi_bridge_atomic_pre_enable, .atomic_post_disable = mtk_dsi_bridge_atomic_post_disable, + .atomic_reset = drm_atomic_helper_bridge_reset, .mode_set = mtk_dsi_bridge_mode_set, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 63/148 arm64: dts: rockchip: Set RK3399-Gru PCLK_EDP to 24 MHz
In reply to Greg Kroah-HartmanFrom: zain wang <[email protected]>
[ Upstream commit 8123437cf46ea5a0f6ca5cb3c528d8b6db97b9c2 ]
We've found the AUX channel to be less reliable with PCLK_EDP at a higher rate (typically 25 MHz). This is especially important on systems with PSR-enabled panels (like Gru-Kevin), since we make heavy, constant use of AUX.
According to Rockchip, using any rate other than 24 MHz can cause "problems between syncing the PHY an PCLK", which leads to all sorts of unreliabilities around register operations.
--- arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +8 -0
@@ -237,6 +237,14 @@ &cdn_dp { &edp { status = "okay"; + /* + * eDP PHY/clk don't sync reliably at anything other than 24 MHz. Only + * set this here, because rk3399-gru.dtsi ensures we can generate this + * off GPLL=600MHz, whereas some other RK3399 boards may not. + */ + assigned-clocks = <&cru PCLK_EDP>; + assigned-clock-rates = <24000000>; + ports { edp_out: port@1 { reg = <1>;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 64/148 dmaengine: ti: k3-udma-private: Fix refcount leak bug in of_xudma_dev_get()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit f9fdb0b86f087c2b7f6c6168dd0985a3c1eda87e ]
We should call of_node_put() for the reference returned by of_parse_phandle() in fail path or when it is not used anymore. Here we only need to move the of_node_put() before the check.
--- drivers/dma/ti/k3-udma-private.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dma/ti/k3-udma-private.c +3 -3
@@ -31,14 +31,14 @@ struct udma_dev *of_xudma_dev_get(struct device_node *np, const char *property) } pdev =of_find_device_by_node (udma_node); +if (np != udma_node) +of_node_put (udma_node); +if (!pdev) {pr_debug ("UDMA device not found\n" );return ERR_PTR (-EPROBE_DEFER ); } -if (np != udma_node) -of_node_put (udma_node); - ud =platform_get_drvdata (pdev);if (!ud) {pr_debug ("UDMA has not been probed\n" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/148 arm64: dts: rockchip: Remove enable-active-low from rk3399-puma
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit a994b34b9abb9c08ee09e835b4027ff2147f9d94 ]
The 'enable-active-low' property is not a valid one.
Only 'enable-active-high' is valid, and when this property is absent the gpio regulator will act as active low by default.
Remove the invalid 'enable-active-low' property.
--- arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +0 -1
@@ -62,7 +62,6 @@ vcc3v3_sys: vcc3v3-sys { vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; - enable-active-low; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; regulator-name = "vcc5v0_host";
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 66/148 netfilter: nf_conntrack_sip: fix ct_sip_walk_headers
In reply to Greg Kroah-HartmanFrom: Igor Ryzhov <[email protected]>
[ Upstream commit 39aebedeaaa95757f5c1f2ddb5f43fdddbf478ca ]
ct_sip_next_header and ct_sip_get_header return an absolute value of matchoff, not a shift from current dataoff. So dataoff should be assigned matchoff, not incremented by it.
This issue can be seen in the scenario when there are multiple Contact headers and the first one is using a hostname and other headers use IP addresses. In this case, ct_sip_walk_headers will work as follows:
The first ct_sip_get_header call to will find the first Contact header but will return -1 as the header uses a hostname. But matchoff will be changed to the offset of this header. After that, dataoff should be set to matchoff, so that the next ct_sip_get_header call find the next Contact header. But instead of assigning dataoff to matchoff, it is incremented by it, which is not correct, as matchoff is an absolute value of the offset. So on the next call to the ct_sip_get_header, dataoff will be incorrect, and the next Contact header may not be found at all.
--- net/netfilter/nf_conntrack_sip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_conntrack_sip.c +2 -2
@@ -477,7 +477,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,return ret;if (ret ==0 )break ; - dataoff += *matchoff; + dataoff = *matchoff; } *in_header =0 ; }
@@ -489,7 +489,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,break ;if (ret ==0 )return ret; - dataoff += *matchoff; + dataoff = *matchoff; }if (in_header)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/148 netfilter: nf_conntrack_irc: Tighten matching on DCC message
In reply to Greg Kroah-HartmanFrom: David Leadbeater <[email protected]>
[ Upstream commit e8d5dfd1d8747b56077d02664a8838c71ced948e ]
CTCP messages should only be at the start of an IRC message, not anywhere within it.
While the helper only decodes packes in the ORIGINAL direction, its possible to make a client send a CTCP message back by empedding one into a PING request. As-is, thats enough to make the helper believe that it saw a CTCP message.
--- net/netfilter/nf_conntrack_irc.c | 34 ++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-)
net/netfilter/nf_conntrack_irc.c +28 -6
@@ -151,15 +151,37 @@ static int help(struct sk_buff *skb, unsigned int protoff, data = ib_ptr; data_limit = ib_ptr + skb->len - dataoff; -/* strlen("\1DCC SENT t AAAAAAAA P\1\n")=24 -* 5+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=14 */ -while (data < data_limit - (19 +MINMATCHLEN )) { -if (memcmp (data,"\1DCC " ,5 )) { +/* Skip any whitespace */ +while (data < data_limit -10 ) { +if (*data ==' ' || *data =='\r' || *data =='\n' ) + data++; +else +break ; + } + +/* strlen("PRIVMSG x ")=10 */ +if (data < data_limit -10 ) { +if (strncasecmp ("PRIVMSG " , data,8 )) + goto out; + data +=8 ; + } + +/* strlen(" :\1DCC SENT t AAAAAAAA P\1\n")=26 +* 7+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=26 +*/ +while (data < data_limit - (21 +MINMATCHLEN )) { +/* Find first " :", the start of message */ +if (memcmp (data," :" ,2 )) { data++;continue ; } + data +=2 ; + +/* then check that place only for the DCC command */ +if (memcmp (data,"\1DCC " ,5 )) + goto out; data +=5 ; -/* we have at least (19+MINMATCHLEN)-5 bytes valid data left */ +/* we have at least (21+MINMATCHLEN)-(2+5) bytes valid data left */ iph =ip_hdr (skb); pr_debug("DCC found in master %pI4:%u %pI4:%u\n",
@@ -175,7 +197,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,pr_debug ("DCC %s detected\n" , dccprotos[i]);/* we have at least -* (19+MINMATCHLEN)-5-dccprotos[i].matchlen bytes valid +* (21+MINMATCHLEN)-7-dccprotos[i].matchlen bytes valid * data left (== 14/13 bytes) */ if (parse_dcc (data, data_limit, &dcc_ip, &dcc_port, &addr_beg_p, &addr_end_p)) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 68/148 netfilter: nfnetlink_osf: fix possible bogus match in nf_osf_find()
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
[ Upstream commit 559c36c5a8d730c49ef805a72b213d3bba155cc8 ]
nf_osf_find() incorrectly returns true on mismatch, this leads to copying uninitialized memory area in nft_osf which can be used to leak stale kernel stack data to userspace.
--- net/netfilter/nfnetlink_osf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/nfnetlink_osf.c +3 -1
@@ -269,6 +269,7 @@ bool nf_osf_find(const struct sk_buff *skb,struct nf_osf_hdr_ctx ctx;const struct tcphdr *tcp;struct tcphdr _tcph; +bool found = false;memset (&ctx,0 ,sizeof (ctx));
@@ -283,10 +284,11 @@ bool nf_osf_find(const struct sk_buff *skb, data->genre = f->genre; data->version = f->version; + found = true;break ; } -return true; +return found; }EXPORT_SYMBOL_GPL (nf_osf_find);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/148 ice: Dont double unplug aux on peer initiated reset
In reply to Greg Kroah-HartmanFrom: Dave Ertman <[email protected]>
[ Upstream commit 23c619190318376769ad7b61504c2ea0703fb783 ]
In the IDC callback that is accessed when the aux drivers request a reset, the function to unplug the aux devices is called. This function is also called in the ice_prepare_for_reset function. This double call is causing a "scheduling while atomic" BUG.
[ 662.676430] ice 0000:4c:00.0 rocep76s0: cqp opcode = 0x1 maj_err_code = 0xffff min_err_code = 0x8003
[ 662.676609] ice 0000:4c:00.0 rocep76s0: [Modify QP Cmd Error][op_code=8] status=-29 waiting=1 completion_err=1 maj=0xffff min=0x8003
[ 662.815006] ice 0000:4c:00.0 rocep76s0: ICE OICR event notification: oicr = 0x10000003
[ 662.815014] ice 0000:4c:00.0 rocep76s0: critical PE Error, GLPE_CRITERR=0x00011424
[ 662.815017] ice 0000:4c:00.0 rocep76s0: Requesting a reset
[ 662.815475] BUG: scheduling while atomic: swapper/37/0/0x00010002
[ 662.815475] BUG: scheduling while atomic: swapper/37/0/0x00010002 [ 662.815477] Modules linked in: rpcsec_gss_krb5 auth_rpcgss nfsv4 dns_resolver nfs lockd grace fscache netfs rfkill 8021q garp mrp stp llc vfat fat rpcrdma intel_rapl_msr intel_rapl_common sunrpc i10nm_edac rdma_ucm nfit ib_srpt libnvdimm ib_isert iscsi_target_mod x86_pkg_temp_thermal intel_powerclamp coretemp target_core_mod snd_hda_intel ib_iser snd_intel_dspcfg libiscsi snd_intel_sdw_acpi scsi_transport_iscsi kvm_intel iTCO_wdt rdma_cm snd_hda_codec kvm iw_cm ipmi_ssif iTCO_vendor_support snd_hda_core irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel snd_hwdep snd_seq snd_seq_device rapl snd_pcm snd_timer isst_if_mbox_pci pcspkr isst_if_mmio irdma intel_uncore idxd acpi_ipmi joydev isst_if_common snd mei_me idxd_bus ipmi_si soundcore i2c_i801 mei ipmi_devintf i2c_smbus i2c_ismt ipmi_msghandler acpi_power_meter acpi_pad rv(OE) ib_uverbs ib_cm ib_core xfs libcrc32c ast i2c_algo_bit drm_vram_helper drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm_ttm_helpe r ttm [ 662.815546] nvme nvme_core ice drm crc32c_intel i40e t10_pi wmi pinctrl_emmitsburg dm_mirror dm_region_hash dm_log dm_mod fuse [ 662.815557] Preemption disabled at: [ 662.815558] [<0000000000000000>] 0x0 [ 662.815563] CPU: 37 PID: 0 Comm: swapper/37 Kdump: loaded Tainted: G S OE 5.17.1 #2 [ 662.815566] Hardware name: Intel Corporation D50DNP/D50DNP, BIOS SE5C6301.86B.6624.D18.2111021741 11/02/2021 [ 662.815568] Call Trace: [ 662.815572] <IRQ> [ 662.815574] dump_stack_lvl+0x33/0x42 [ 662.815581] __schedule_bug.cold.147+0x7d/0x8a [ 662.815588] __schedule+0x798/0x990 [ 662.815595] schedule+0x44/0xc0 [ 662.815597] schedule_preempt_disabled+0x14/0x20 [ 662.815600] __mutex_lock.isra.11+0x46c/0x490 [ 662.815603] ? __ibdev_printk+0x76/0xc0 [ib_core] [ 662.815633] device_del+0x37/0x3d0 [ 662.815639] ice_unplug_aux_dev+0x1a/0x40 [ice] [ 662.815674] ice_schedule_reset+0x3c/0xd0 [ice] [ 662.815693] irdma_iidc_event_handler.cold.7+0xb6/0xd3 [irdma] [ 662.815712] ? bitmap_find_next_zero_area_off+0x45/0xa0 [ 662.815719] ice_send_event_to_aux+0x54/0x70 [ice] [ 662.815741] ice_misc_intr+0x21d/0x2d0 [ice] [ 662.815756] __handle_irq_event_percpu+0x4c/0x180 [ 662.815762] handle_irq_event_percpu+0xf/0x40 [ 662.815764] handle_irq_event+0x34/0x60 [ 662.815766] handle_edge_irq+0x9a/0x1c0 [ 662.815770] __common_interrupt+0x62/0x100 [ 662.815774] common_interrupt+0xb4/0xd0 [ 662.815779] </IRQ> [ 662.815780] <TASK> [ 662.815780] asm_common_interrupt+0x1e/0x40 [ 662.815785] RIP: 0010:cpuidle_enter_state+0xd6/0x380 [ 662.815789] Code: 49 89 c4 0f 1f 44 00 00 31 ff e8 65 d7 95 ff 45 84 ff 74 12 9c 58 f6 c4 02 0f 85 64 02 00 00 31 ff e8 ae c5 9c ff fb 45 85 f6 <0f> 88 12 01 00 00 49 63 d6 4c 2b 24 24 48 8d 04 52 48 8d 04 82 49 [ 662.815791] RSP: 0018:ff2c2c4f18edbe80 EFLAGS: 00000202 [ 662.815793] RAX: ff280805df140000 RBX: 0000000000000002 RCX: 000000000000001f [ 662.815795] RDX: 0000009a52da2d08 RSI: ffffffff93f8240b RDI: ffffffff93f53ee7 [ 662.815796] RBP: ff5e2bd11ff41928 R08: 0000000000000000 R09: 000000000002f8c0 [ 662.815797] R10: 0000010c3f18e2cf R11: 000000000000000f R12: 0000009a52da2d08 [ 662.815798] R13: ffffffff94ad7e20 R14: 0000000000000002 R15: 0000000000000000 [ 662.815801] cpuidle_enter+0x29/0x40 [ 662.815803] do_idle+0x261/0x2b0 [ 662.815807] cpu_startup_entry+0x19/0x20 [ 662.815809] start_secondary+0x114/0x150 [ 662.815813] secondary_startup_64_no_verify+0xd5/0xdb [ 662.815818] </TASK> [ 662.815846] bad: scheduling from the idle thread! [ 662.815849] CPU: 37 PID: 0 Comm: swapper/37 Kdump: loaded Tainted: G S W OE 5.17.1 #2 [ 662.815852] Hardware name: Intel Corporation D50DNP/D50DNP, BIOS SE5C6301.86B.6624.D18.2111021741 11/02/2021 [ 662.815853] Call Trace: [ 662.815855] <IRQ> [ 662.815856] dump_stack_lvl+0x33/0x42 [ 662.815860] dequeue_task_idle+0x20/0x30 [ 662.815863] __schedule+0x1c3/0x990 [ 662.815868] schedule+0x44/0xc0 [ 662.815871] schedule_preempt_disabled+0x14/0x20 [ 662.815873] __mutex_lock.isra.11+0x3a8/0x490 [ 662.815876] ? __ibdev_printk+0x76/0xc0 [ib_core] [ 662.815904] device_del+0x37/0x3d0 [ 662.815909] ice_unplug_aux_dev+0x1a/0x40 [ice] [ 662.815937] ice_schedule_reset+0x3c/0xd0 [ice] [ 662.815961] irdma_iidc_event_handler.cold.7+0xb6/0xd3 [irdma] [ 662.815979] ? bitmap_find_next_zero_area_off+0x45/0xa0 [ 662.815985] ice_send_event_to_aux+0x54/0x70 [ice] [ 662.816011] ice_misc_intr+0x21d/0x2d0 [ice] [ 662.816033] __handle_irq_event_percpu+0x4c/0x180 [ 662.816037] handle_irq_event_percpu+0xf/0x40 [ 662.816039] handle_irq_event+0x34/0x60 [ 662.816042] handle_edge_irq+0x9a/0x1c0 [ 662.816045] __common_interrupt+0x62/0x100 [ 662.816048] common_interrupt+0xb4/0xd0 [ 662.816052] </IRQ> [ 662.816053] <TASK> [ 662.816054] asm_common_interrupt+0x1e/0x40 [ 662.816057] RIP: 0010:cpuidle_enter_state+0xd6/0x380 [ 662.816060] Code: 49 89 c4 0f 1f 44 00 00 31 ff e8 65 d7 95 ff 45 84 ff 74 12 9c 58 f6 c4 02 0f 85 64 02 00 00 31 ff e8 ae c5 9c ff fb 45 85 f6 <0f> 88 12 01 00 00 49 63 d6 4c 2b 24 24 48 8d 04 52 48 8d 04 82 49 [ 662.816063] RSP: 0018:ff2c2c4f18edbe80 EFLAGS: 00000202 [ 662.816065] RAX: ff280805df140000 RBX: 0000000000000002 RCX: 000000000000001f [ 662.816067] RDX: 0000009a52da2d08 RSI: ffffffff93f8240b RDI: ffffffff93f53ee7 [ 662.816068] RBP: ff5e2bd11ff41928 R08: 0000000000000000 R09: 000000000002f8c0 [ 662.816070] R10: 0000010c3f18e2cf R11: 000000000000000f R12: 0000009a52da2d08 [ 662.816071] R13: ffffffff94ad7e20 R14: 0000000000000002 R15: 0000000000000000 [ 662.816075] cpuidle_enter+0x29/0x40 [ 662.816077] do_idle+0x261/0x2b0 [ 662.816080] cpu_startup_entry+0x19/0x20 [ 662.816083] start_secondary+0x114/0x150 [ 662.816087] secondary_startup_64_no_verify+0xd5/0xdb [ 662.816091] </TASK> [ 662.816169] bad: scheduling from the idle thread!
The correct place to unplug the aux devices for a reset is in the prepare_for_reset function, as this is a common place for all reset flows. It also has built in protection from being called twice in a single reset instance before the aux devices are replugged.
--- drivers/net/ethernet/intel/ice/ice_main.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +0 -2
@@ -2255,8 +2255,6 @@ int ice_schedule_reset(struct ice_pf *pf, enum ice_reset_req reset)return -EBUSY ; } -ice_unplug_aux_dev (pf); -switch (reset) {case ICE_RESET_PFR :set_bit (ICE_PFR_REQ , pf->state);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/148 iavf: Fix cached head and tail value for iavf_get_tx_pending
In reply to Greg Kroah-HartmanFrom: Brett Creeley <[email protected]>
[ Upstream commit 809f23c0423a43266e47a7dc67e95b5cb4d1cbfc ]
The underlying hardware may or may not allow reading of the head or tail registers and it really makes no difference if we use the software cached values. So, always used the software cached values.
--- drivers/net/ethernet/intel/iavf/iavf_txrx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/iavf/iavf_txrx.c +4 -1
@@ -114,8 +114,11 @@ u32 iavf_get_tx_pending(struct iavf_ring *ring, bool in_sw) {u32 head, tail; +/* underlying hardware might not allow access and/or always return +* 0 for the head/tail registers so just use the cached values +*/ head = ring->next_to_clean; - tail =readl (ring->tail); + tail = ring->next_to_use;if (head != tail) return (head < tail) ?
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/148 ipvlan: Fix out-of-bound bugs caused by unset skb->mac_header
In reply to Greg Kroah-HartmanFrom: Lu Wei <[email protected]>
[ Upstream commit 81225b2ea161af48e093f58e8dfee6d705b16af4 ]
If an AF_PACKET socket is used to send packets through ipvlan and the default xmit function of the AF_PACKET socket is changed from dev_queue_xmit() to packet_direct_xmit() via setsockopt() with the option name of PACKET_QDISC_BYPASS, the skb->mac_header may not be reset and remains as the initial value of 65535, this may trigger slab-out-of-bounds bugs as following:
=================================================================
UG: KASAN: slab-out-of-bounds in ipvlan_xmit_mode_l2+0xdb/0x330 [ipvlan]
PU: 2 PID: 1768 Comm: raw_send Kdump: loaded Not tainted 6.0.0-rc4+ #6 ardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-1.fc33 all Trace:
print_address_description.constprop.0+0x1d/0x160 print_report.cold+0x4f/0x112 kasan_report+0xa3/0x130 ipvlan_xmit_mode_l2+0xdb/0x330 [ipvlan] ipvlan_start_xmit+0x29/0xa0 [ipvlan] __dev_direct_xmit+0x2e2/0x380 packet_direct_xmit+0x22/0x60 packet_snd+0x7c9/0xc40 sock_sendmsg+0x9a/0xa0 __sys_sendto+0x18a/0x230 __x64_sys_sendto+0x74/0x90 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
The root cause is:
1. packet_snd() only reset skb->mac_header when sock->type is SOCK_RAW
and skb->protocol is not specified as in packet_parse_headers()
2. packet_direct_xmit() doesn't reset skb->mac_header as dev_queue_xmit()
In this case, skb->mac_header is 65535 when ipvlan_xmit_mode_l2() is called. So when ipvlan_xmit_mode_l2() gets mac header with eth_hdr() which use "skb->head + skb->mac_header", out-of-bound access occurs.
This patch replaces eth_hdr() with skb_eth_hdr() in ipvlan_xmit_mode_l2() and reset mac header in multicast to solve this out-of-bound bug.
--- drivers/net/ipvlan/ipvlan_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ipvlan/ipvlan_core.c +4 -2
@@ -496,7 +496,6 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)static int ipvlan_process_outbound (struct sk_buff *skb) { -struct ethhdr *ethh =eth_hdr (skb);int ret =NET_XMIT_DROP ;/* The ipvlan is a pseudo-L2 device, so the packets that we receive
@@ -506,6 +505,8 @@ static int ipvlan_process_outbound(struct sk_buff *skb)if (skb_mac_header_was_set (skb)) {/* In this mode we dont care about * multicast and broadcast traffic */ +struct ethhdr *ethh =eth_hdr (skb); +if (is_multicast_ether_addr (ethh->h_dest)) { pr_debug_ratelimited( "Dropped {multi|broad}cast of type=[%x]\n",
@@ -590,7 +591,7 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)static int ipvlan_xmit_mode_l2 (struct sk_buff *skb,struct net_device *dev) {const struct ipvl_dev *ipvlan =netdev_priv (dev); -struct ethhdr *eth =eth_hdr (skb); +struct ethhdr *eth =skb_eth_hdr (skb);struct ipvl_addr *addr;void *lyr3h;int addr_type;
@@ -620,6 +621,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)return dev_forward_skb (ipvlan->phy_dev, skb); }else if (is_multicast_ether_addr (eth->h_dest)) { +skb_reset_mac_header (skb);ipvlan_skb_crossing_ns (skb,NULL );ipvlan_multicast_enqueue (ipvlan->port, skb, true);return NET_XMIT_SUCCESS ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/148 net: core: fix flow symmetric hash
In reply to Greg Kroah-HartmanFrom: Ludovic Cintrat <[email protected]>
[ Upstream commit 64ae13ed478428135cddc2f1113dff162d8112d4 ]
__flow_hash_consistentify() wrongly swaps ipv4 addresses in few cases. This function is indirectly used by __skb_get_hash_symmetric(), which is used to fanout packets in AF_PACKET.
Intrusion detection systems may be impacted by this issue.
__flow_hash_consistentify() computes the addresses difference then swaps them if the difference is negative. In few cases src - dst and dst - src are both negative.
The following snippet mimics __flow_hash_consistentify():
```
#include <stdio.h>
#include <stdint.h>
int main(int argc, char** argv) {
int diffs_d, diffd_s;
uint32_t dst = 0xb225a8c0; /* 178.37.168.192 --> 192.168.37.178 */
uint32_t src = 0x3225a8c0; /* 50.37.168.192 --> 192.168.37.50 */
uint32_t dst2 = 0x3325a8c0; /* 51.37.168.192 --> 192.168.37.51 */
diffs_d = src - dst;
diffd_s = dst - src;
printf("src:%08x dst:%08x, diff(s-d)=%d(0x%x) diff(d-s)=%d(0x%x)\n",
src, dst, diffs_d, diffs_d, diffd_s, diffd_s);
diffs_d = src - dst2;
diffd_s = dst2 - src;
printf("src:%08x dst:%08x, diff(s-d)=%d(0x%x) diff(d-s)=%d(0x%x)\n",
src, dst2, diffs_d, diffs_d, diffd_s, diffd_s);
return 0;
}
```Results:
src:3225a8c0 dst:b225a8c0, \
diff(s-d)=-2147483648(0x80000000) \
diff(d-s)=-2147483648(0x80000000)src:3225a8c0 dst:3325a8c0, \
diff(s-d)=-16777216(0xff000000) \
diff(d-s)=16777216(0x1000000)In the first case the addresses differences are always < 0, therefore __flow_hash_consistentify() always swaps, thus dst->src and src->dst packets have differents hashes.
--- net/core/flow_dissector.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/core/flow_dissector.c +2 -3
@@ -1519,9 +1519,8 @@ static inline void __flow_hash_consistentify(struct flow_keys *keys)switch (keys->control.addr_type) {case FLOW_DISSECTOR_KEY_IPV4_ADDRS : - addr_diff = (__force u32 )keys->addrs.v4addrs.dst - - (__force u32 )keys->addrs.v4addrs.src; -if (addr_diff <0 ) +if ((__force u32 )keys->addrs.v4addrs.dst < + (__force u32 )keys->addrs.v4addrs.src)swap (keys->addrs.v4addrs.src, keys->addrs.v4addrs.dst); if ((__force u16)keys->ports.dst <
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/148 net: phy: aquantia: wait for the suspend/resume operations to finish
In reply to Greg Kroah-HartmanFrom: Ioana Ciornei <[email protected]>
[ Upstream commit ca2dccdeeb49a7e408112d681bf447984c845292 ]
The Aquantia datasheet notes that after issuing a Processor-Intensive MDIO operation, like changing the low-power state of the device, the driver should wait for the operation to finish before issuing a new MDIO command.
The new aqr107_wait_processor_intensive_op() function is added which can be used after these kind of MDIO operations. At the moment, we are only adding it at the end of the suspend/resume calls.
The issue was identified on a board featuring the AQR113C PHY, on which commands like 'ip link (..) up / down' issued without any delays between them would render the link on the PHY to remain down. The issue was easy to reproduce with a one-liner:
$ ip link set dev ethX down; ip link set dev ethX up; \ ip link set dev ethX down; ip link set dev ethX up;
--- drivers/net/phy/aquantia_main.c | 53 ++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-)
drivers/net/phy/aquantia_main.c +49 -4
@@ -90,6 +90,9 @@#define VEND1_GLOBAL_FW_ID_MAJOR GENMASK(15, 8)#define VEND1_GLOBAL_FW_ID_MINOR GENMASK(7, 0) +#define VEND1_GLOBAL_GEN_STAT2 0xc831 +#define VEND1_GLOBAL_GEN_STAT2_OP_IN_PROG BIT(15) +#define VEND1_GLOBAL_RSVD_STAT1 0xc885#define VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID GENMASK(7, 4)#define VEND1_GLOBAL_RSVD_STAT1_PROV_ID GENMASK(3, 0)
@@ -124,6 +127,12 @@#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1)#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) +/* Sleep and timeout for checking if the Processor-Intensive +* MDIO operation is finished +*/ +#define AQR107_OP_IN_PROG_SLEEP 1000 +#define AQR107_OP_IN_PROG_TIMEOUT 100000 +struct aqr107_hw_stat {const char *name;int reg;
@@ -598,16 +607,52 @@ static void aqr107_link_change_notify(struct phy_device *phydev)phydev_info (phydev,"Aquantia 1000Base-T2 mode active\n" ); } +static int aqr107_wait_processor_intensive_op (struct phy_device *phydev) +{ +int val, err; + +/* The datasheet notes to wait at least 1ms after issuing a +* processor intensive operation before checking. +* We cannot use the 'sleep_before_read' parameter of read_poll_timeout +* because that just determines the maximum time slept, not the minimum. +*/ +usleep_range (1000 ,5000 ); + + err =phy_read_mmd_poll_timeout (phydev,MDIO_MMD_VEND1 , +VEND1_GLOBAL_GEN_STAT2 , val, + !(val &VEND1_GLOBAL_GEN_STAT2_OP_IN_PROG ), +AQR107_OP_IN_PROG_SLEEP , +AQR107_OP_IN_PROG_TIMEOUT , false); +if (err) { +phydev_err (phydev,"timeout: processor-intensive MDIO operation\n" ); +return err; + } + +return 0 ; +} +static int aqr107_suspend (struct phy_device *phydev) { -return phy_set_bits_mmd (phydev,MDIO_MMD_VEND1 ,MDIO_CTRL1 , -MDIO_CTRL1_LPOWER ); +int err; + + err =phy_set_bits_mmd (phydev,MDIO_MMD_VEND1 ,MDIO_CTRL1 , +MDIO_CTRL1_LPOWER ); +if (err) +return err; + +return aqr107_wait_processor_intensive_op (phydev); }static int aqr107_resume (struct phy_device *phydev) { -return phy_clear_bits_mmd (phydev,MDIO_MMD_VEND1 ,MDIO_CTRL1 , -MDIO_CTRL1_LPOWER ); +int err; + + err =phy_clear_bits_mmd (phydev,MDIO_MMD_VEND1 ,MDIO_CTRL1 , +MDIO_CTRL1_LPOWER ); +if (err) +return err; + +return aqr107_wait_processor_intensive_op (phydev); }static int aqr107_probe (struct phy_device *phydev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/148 scsi: qla2xxx: Fix memory leak in __qlt_24xx_handle_abts()
In reply to Greg Kroah-HartmanFrom: Rafael Mendonca <[email protected]>
[ Upstream commit 601be20fc6a1b762044d2398befffd6bf236cebf ]
Commit 8f394da36a36 ("scsi: qla2xxx: Drop TARGET_SCF_LOOKUP_LUN_FROM_TAG") made the __qlt_24xx_handle_abts() function return early if tcm_qla2xxx_find_cmd_by_tag() didn't find a command, but it missed to clean up the allocated memory for the management command.
--- drivers/scsi/qla2xxx/qla_target.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.c +3 -1
@@ -2166,8 +2166,10 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha, abort_cmd = ha->tgt.tgt_ops->find_cmd_by_tag (sess,le32_to_cpu (abts->exchange_addr_to_abort)); -if (!abort_cmd) +if (!abort_cmd) { +mempool_free (mcmd, qla_tgt_mgmt_cmd_mempool);return -EIO ; + } mcmd->unpacked_lun = abort_cmd->se_cmd.orig_fe_lun;if (abort_cmd->qpair) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 75/148 scsi: mpt3sas: Fix return value check of dma_get_required_mask()
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit e0e0747de0ea3dd87cdbb0393311e17471a9baf1 ]
Fix the incorrect return value check of dma_get_required_mask(). Due to this incorrect check, the driver was always setting the DMA mask to 63 bit.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +1 -1
@@ -3005,7 +3005,7 @@ _base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)if (ioc->is_mcpu_endpoint ||sizeof (dma_addr_t) ==4 || ioc->use_32bit_dma || -dma_get_required_mask (&pdev->dev) <=32 ) +dma_get_required_mask (&pdev->dev) <=DMA_BIT_MASK (32 )) ioc->dma_mask =32 ;/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */ else if (ioc->hba_mpi_version_belonged >MPI2_VERSION )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/148 net: bonding: Share lacpdu_mcast_addr definition
In reply to Greg Kroah-HartmanFrom: Benjamin Poirier <[email protected]>
[ Upstream commit 1d9a143ee3408349700f44a9197b7ae0e4faae5d ]
There are already a few definitions of arrays containing MULTICAST_LACPDU_ADDR and the next patch will add one more use. These all contain the same constant data so define one common instance for all bonding code.
Stable-dep-of: 86247aba599e ("net: bonding: Unsync device addresses on ndo_stop")
--- drivers/net/bonding/bond_3ad.c | 5 +++-- drivers/net/bonding/bond_main.c | 16 ++++------------ include/net/bond_3ad.h | 2 -- include/net/bonding.h | 3 +++ 4 files changed, 10 insertions(+), 16 deletions(-)
drivers/net/bonding/bond_3ad.c +3 -2
@@ -87,8 +87,9 @@ static const u8 null_mac_addr[ETH_ALEN + 2] __long_aligned = {static u16 ad_ticks_per_sec;static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL *HZ ) /1000 ; -static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned = -MULTICAST_LACPDU_ADDR ; +const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned = { +0x01 ,0x80 ,0xC2 ,0x00 ,0x00 ,0x02 +};/* ================= main 802.3ad protocol functions ================== */ static int ad_lacpdu_send (struct port *port);
drivers/net/bonding/bond_main.c +4 -12
@@ -862,12 +862,8 @@ static void bond_hw_addr_flush(struct net_device *bond_dev,dev_uc_unsync (slave_dev, bond_dev);dev_mc_unsync (slave_dev, bond_dev); -if (BOND_MODE (bond) ==BOND_MODE_8023AD ) { -/* del lacpdu mc addr from mc list */ -u8 lacpdu_multicast[ETH_ALEN ] =MULTICAST_LACPDU_ADDR ; - -dev_mc_del (slave_dev, lacpdu_multicast); - } +if (BOND_MODE (bond) ==BOND_MODE_8023AD ) +dev_mc_del (slave_dev, lacpdu_mcast_addr); }/*--------------------------- Active slave change ---------------------------*/
@@ -2139,12 +2135,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,dev_uc_sync_multiple (slave_dev, bond_dev);netif_addr_unlock_bh (bond_dev); -if (BOND_MODE (bond) ==BOND_MODE_8023AD ) { -/* add lacpdu mc addr to mc list */ -u8 lacpdu_multicast[ETH_ALEN ] =MULTICAST_LACPDU_ADDR ; - -dev_mc_add (slave_dev, lacpdu_multicast); - } +if (BOND_MODE (bond) ==BOND_MODE_8023AD ) +dev_mc_add (slave_dev, lacpdu_mcast_addr); } bond->slave_cnt++;
include/net/bond_3ad.h +0 -2
@@ -15,8 +15,6 @@#define PKT_TYPE_LACPDU cpu_to_be16(ETH_P_SLOW)#define AD_TIMER_INTERVAL 100/*msec*/ -#define MULTICAST_LACPDU_ADDR {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02} -#define AD_LACP_SLOW 0#define AD_LACP_FAST 1
include/net/bonding.h +3 -0
@@ -757,6 +757,9 @@ extern struct rtnl_link_ops bond_link_ops;/* exported from bond_sysfs_slave.c */ extern const struct sysfs_ops slave_sysfs_ops; +/* exported from bond_3ad.c */ +extern const u8 lacpdu_mcast_addr[]; +static inline netdev_tx_t bond_tx_drop (struct net_device *dev,struct sk_buff *skb) {atomic_long_inc (&dev->tx_dropped);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 77/148 net: bonding: Unsync device addresses on ndo_stop
In reply to Greg Kroah-HartmanFrom: Benjamin Poirier <[email protected]>
[ Upstream commit 86247aba599e5b07d7e828e6edaaebb0ef2b1158 ]
Netdev drivers are expected to call dev_{uc,mc}_sync() in their ndo_set_rx_mode method and dev_{uc,mc}_unsync() in their ndo_stop method. This is mentioned in the kerneldoc for those dev_* functions.
The bonding driver calls dev_{uc,mc}_unsync() during ndo_uninit instead of ndo_stop. This is ineffective because address lists (dev->{uc,mc}) have already been emptied in unregister_netdevice_many() before ndo_uninit is called. This mistake can result in addresses being leftover on former bond slaves after a bond has been deleted; see test_LAG_cleanup() in the last patch in this series.
Add unsync calls, via bond_hw_addr_flush(), at their expected location, bond_close().
Add dev_mc_add() call to bond_open() to match the above change.
v3:
* When adding or deleting a slave, only sync/unsync, add/del addresses if the bond is up. In other cases, it is taken care of at the right time by ndo_open/ndo_set_rx_mode/ndo_stop.
--- drivers/net/bonding/bond_main.c | 47 ++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 12 deletions(-)
drivers/net/bonding/bond_main.c +35 -12
@@ -883,7 +883,8 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,if (bond->dev->flags &IFF_ALLMULTI )dev_set_allmulti (old_active->dev,-1 ); -bond_hw_addr_flush (bond->dev, old_active->dev); +if (bond->dev->flags &IFF_UP ) +bond_hw_addr_flush (bond->dev, old_active->dev); }if (new_active) {
@@ -894,10 +895,12 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,if (bond->dev->flags &IFF_ALLMULTI )dev_set_allmulti (new_active->dev,1 ); -netif_addr_lock_bh (bond->dev); -dev_uc_sync (new_active->dev, bond->dev); -dev_mc_sync (new_active->dev, bond->dev); -netif_addr_unlock_bh (bond->dev); +if (bond->dev->flags &IFF_UP ) { +netif_addr_lock_bh (bond->dev); +dev_uc_sync (new_active->dev, bond->dev); +dev_mc_sync (new_active->dev, bond->dev); +netif_addr_unlock_bh (bond->dev); + } } }
@@ -2130,13 +2133,15 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, } } -netif_addr_lock_bh (bond_dev); -dev_mc_sync_multiple (slave_dev, bond_dev); -dev_uc_sync_multiple (slave_dev, bond_dev); -netif_addr_unlock_bh (bond_dev); +if (bond_dev->flags &IFF_UP ) { +netif_addr_lock_bh (bond_dev); +dev_mc_sync_multiple (slave_dev, bond_dev); +dev_uc_sync_multiple (slave_dev, bond_dev); +netif_addr_unlock_bh (bond_dev); -if (BOND_MODE (bond) ==BOND_MODE_8023AD ) -dev_mc_add (slave_dev, lacpdu_mcast_addr); +if (BOND_MODE (bond) ==BOND_MODE_8023AD ) +dev_mc_add (slave_dev, lacpdu_mcast_addr); + } } bond->slave_cnt++;
@@ -2407,7 +2412,8 @@ static int __bond_release_one(struct net_device *bond_dev,if (old_flags &IFF_ALLMULTI )dev_set_allmulti (slave_dev,-1 ); -bond_hw_addr_flush (bond_dev, slave_dev); +if (old_flags &IFF_UP ) +bond_hw_addr_flush (bond_dev, slave_dev); }slave_disable_netpoll (slave);
@@ -3961,6 +3967,9 @@ static int bond_open(struct net_device *bond_dev)/* register to receive LACPDUs */ bond->recv_probe = bond_3ad_lacpdu_recv;bond_3ad_initiate_agg_selection (bond,1 ); + +bond_for_each_slave (bond, slave, iter) +dev_mc_add (slave->dev, lacpdu_mcast_addr); }if (bond_mode_can_use_xmit_hash (bond))
@@ -3972,6 +3981,7 @@ static int bond_open(struct net_device *bond_dev)static int bond_close (struct net_device *bond_dev) {struct bonding *bond =netdev_priv (bond_dev); +struct slave *slave;bond_work_cancel_all (bond); bond->send_peer_notif =0 ;
@@ -3979,6 +3989,19 @@ static int bond_close(struct net_device *bond_dev)bond_alb_deinitialize (bond); bond->recv_probe =NULL ; +if (bond_uses_primary (bond)) { +rcu_read_lock (); + slave =rcu_dereference (bond->curr_active_slave); +if (slave) +bond_hw_addr_flush (bond_dev, slave->dev); +rcu_read_unlock (); + }else { +struct list_head *iter; + +bond_for_each_slave (bond, slave, iter) +bond_hw_addr_flush (bond_dev, slave->dev); + } +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 78/148 net: team: Unsync device addresses on ndo_stop
In reply to Greg Kroah-HartmanFrom: Benjamin Poirier <[email protected]>
[ Upstream commit bd60234222b2fd5573526da7bcd422801f271f5f ]
Netdev drivers are expected to call dev_{uc,mc}_sync() in their ndo_set_rx_mode method and dev_{uc,mc}_unsync() in their ndo_stop method. This is mentioned in the kerneldoc for those dev_* functions.
The team driver calls dev_{uc,mc}_unsync() during ndo_uninit instead of ndo_stop. This is ineffective because address lists (dev->{uc,mc}) have already been emptied in unregister_netdevice_many() before ndo_uninit is called. This mistake can result in addresses being leftover on former team ports after a team device has been deleted; see test_LAG_cleanup() in the last patch in this series.
Add unsync calls at their expected location, team_close().
v3:
* When adding or deleting a port, only sync/unsync addresses if the team device is up. In other cases, it is taken care of at the right time by ndo_open/ndo_set_rx_mode/ndo_stop.
--- drivers/net/team/team.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/net/team/team.c +18 -6
@@ -1270,10 +1270,12 @@ static int team_port_add(struct team *team, struct net_device *port_dev, } } -netif_addr_lock_bh (dev); -dev_uc_sync_multiple (port_dev, dev); -dev_mc_sync_multiple (port_dev, dev); -netif_addr_unlock_bh (dev); +if (dev->flags &IFF_UP ) { +netif_addr_lock_bh (dev); +dev_uc_sync_multiple (port_dev, dev); +dev_mc_sync_multiple (port_dev, dev); +netif_addr_unlock_bh (dev); + } port->index =-1 ;list_add_tail_rcu (&port->list, &team->port_list);
@@ -1344,8 +1346,10 @@ static int team_port_del(struct team *team, struct net_device *port_dev)netdev_rx_handler_unregister (port_dev);team_port_disable_netpoll (port);vlan_vids_del_by_dev (port_dev, dev); -dev_uc_unsync (port_dev, dev); -dev_mc_unsync (port_dev, dev); +if (dev->flags &IFF_UP ) { +dev_uc_unsync (port_dev, dev); +dev_mc_unsync (port_dev, dev); + }dev_close (port_dev);team_port_leave (team, port);
@@ -1695,6 +1699,14 @@ static int team_open(struct net_device *dev)static int team_close (struct net_device *dev) { +struct team *team =netdev_priv (dev); +struct team_port *port; + +list_for_each_entry (port, &team->port_list, list) { +dev_uc_unsync (port->dev, dev); +dev_mc_unsync (port->dev, dev); + } +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/148 drm/panel: simple: Fix innolux_g121i1_l01 bus_format
In reply to Greg Kroah-HartmanFrom: Heiko Schocher <[email protected]>
[ Upstream commit a7c48a0ab87ae52c087d663e83e56b8225ac4cce ]
innolux_g121i1_l01 sets bpc to 6, so use the corresponding bus format:MEDIA_BUS_FMT_RGB666_1X7X3_SPWG.
--- drivers/gpu/drm/panel/panel-simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-simple.c +1 -1
@@ -2579,7 +2579,7 @@ static const struct panel_desc innolux_g121i1_l01 = { .enable = 200, .disable = 20, }, - .bus_format = MEDIA_BUS_FMT_RGB888_1X7X4_SPWG, + .bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG, .connector_type = DRM_MODE_CONNECTOR_LVDS, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 80/148 MIPS: lantiq: export clk_get_io() for lantiq_wdt.ko
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 502550123bee6a2ffa438409b5b9aad4d6db3a8c ]
The lantiq WDT driver uses clk_get_io(), which is not exported, so export it to fix a build error:
ERROR: modpost: "clk_get_io" [drivers/watchdog/lantiq_wdt.ko] undefined!
--- arch/mips/lantiq/clk.c | 1 + 1 file changed, 1 insertion(+)
arch/mips/lantiq/clk.c +1 -0
@@ -50,6 +50,7 @@ struct clk *clk_get_io(void) {return &cpu_clk_generic[2 ]; } +EXPORT_SYMBOL_GPL (clk_get_io);struct clk *clk_get_ppe (void ) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 81/148 MIPS: Loongson32: Fix PHY-mode being left unspecified
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
[ Upstream commit e9f3f8f488005f6da3cfb66070706770ecaef747 ]
commit 0060c8783330 ("net: stmmac: implement support for passive mode converters via dt") has changed the plat->interface field semantics from containing the PHY-mode to specifying the MAC-PCS interface mode. Due to that the loongson32 platform code will leave the phylink interface uninitialized with the PHY-mode intended by the means of the actual platform setup. The commit-author most likely has just missed the arch-specific code to fix. Let's mend the Loongson32 platform code then by assigning the PHY-mode to the phy_interface field of the STMMAC platform data.
--- arch/mips/loongson32/common/platform.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/mips/loongson32/common/platform.c +8 -8
@@ -98,7 +98,7 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv)if (plat_dat->bus_id) {__raw_writel (__raw_readl (LS1X_MUX_CTRL0 ) |GMAC1_USE_UART1 |GMAC1_USE_UART0 ,LS1X_MUX_CTRL0 ); -switch (plat_dat->interface) { +switch (plat_dat->phy_interface) {case PHY_INTERFACE_MODE_RGMII : val &= ~(GMAC1_USE_TXCLK |GMAC1_USE_PWM23 );break ;
@@ -107,12 +107,12 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv)break ;default :pr_err ("unsupported mii mode %d\n" , - plat_dat->interface); + plat_dat->phy_interface);return -ENOTSUPP ; } val &= ~GMAC1_SHUT ; }else { -switch (plat_dat->interface) { +switch (plat_dat->phy_interface) {case PHY_INTERFACE_MODE_RGMII : val &= ~(GMAC0_USE_TXCLK |GMAC0_USE_PWM01 );break ;
@@ -121,7 +121,7 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv)break ;default :pr_err ("unsupported mii mode %d\n" , - plat_dat->interface); + plat_dat->phy_interface);return -ENOTSUPP ; } val &= ~GMAC0_SHUT ;
@@ -131,7 +131,7 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv) plat_dat =dev_get_platdata (&pdev->dev); val &= ~PHY_INTF_SELI ; -if (plat_dat->interface ==PHY_INTERFACE_MODE_RMII ) +if (plat_dat->phy_interface ==PHY_INTERFACE_MODE_RMII ) val |=0x4 <<PHY_INTF_SELI_SHIFT ;__raw_writel (val,LS1X_MUX_CTRL1 );
@@ -146,9 +146,9 @@ static struct plat_stmmacenet_data ls1x_eth0_pdata = { .bus_id = 0, .phy_addr = -1,#if defined(CONFIG_LOONGSON1_LS1B ) - .interface = PHY_INTERFACE_MODE_MII, + .phy_interface = PHY_INTERFACE_MODE_MII,#elif defined(CONFIG_LOONGSON1_LS1C ) - .interface = PHY_INTERFACE_MODE_RMII, + .phy_interface = PHY_INTERFACE_MODE_RMII, #endif .mdio_bus_data = &ls1x_mdio_bus_data, .dma_cfg = &ls1x_eth_dma_cfg,
@@ -186,7 +186,7 @@ struct platform_device ls1x_eth0_pdev = {static struct plat_stmmacenet_data ls1x_eth1_pdata = { .bus_id =1 , .phy_addr =-1 , - .interface =PHY_INTERFACE_MODE_MII , + .phy_interface =PHY_INTERFACE_MODE_MII , .mdio_bus_data = &ls1x_mdio_bus_data, .dma_cfg = &ls1x_eth_dma_cfg, .has_gmac =1 ,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 82/148 um: fix default console kernel parameter
In reply to Greg Kroah-HartmanFrom: Christian Lamparter <[email protected]>
[ Upstream commit 782b1f70f8a8b28571949d2ba43fe88b96d75ec3 ]
OpenWrt's UML with 5.15 was producing odd errors/warnings during preinit part of the early userspace portion:
|[ 0.000000] Kernel command line: ubd0=root.img root=98:0 console=tty |[...] |[ 0.440000] random: jshn: uninitialized urandom read (4 bytes read) |[ 0.460000] random: jshn: uninitialized urandom read (4 bytes read) |/etc/preinit: line 47: can't create /dev/tty: No such device or address |/etc/preinit: line 48: can't create /dev/tty: No such device or address |/etc/preinit: line 58: can't open /dev/tty: No such device or address |[...] repeated many times
That "/dev/tty" came from the command line (which is automatically added if no console= parameter was specified for the uml binary).
The TLDP project tells the following about the /dev/tty:
<https://tldp.org/HOWTO/Text-Terminal-HOWTO-7.html#ss7.3>
| /dev/tty stands for the controlling terminal (if any) for the current | process.[...] | /dev/tty is something like a link to the actually terminal device[..]
The "(if any)" is important here, since it's possible for processes to not have a controlling terminal.
I think this was a simple typo and the author wanted tty0 there.
--- arch/um/kernel/um_arch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/kernel/um_arch.c +1 -1
@@ -31,7 +31,7 @@#include <os.h> #define DEFAULT_COMMAND_LINE_ROOT "root=98:0" -#define DEFAULT_COMMAND_LINE_CONSOLE "console=tty" +#define DEFAULT_COMMAND_LINE_CONSOLE "console=tty0"/* Changed in add_arg and setup_arch, which run before SMP is started */ static char __initdata command_line[COMMAND_LINE_SIZE ] = {0 };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/148 iavf: Fix bad page state
In reply to Greg Kroah-HartmanFrom: Norbert Zulinski <[email protected]>
[ Upstream commit 66039eb9015eee4f7ff0c99b83c65c7ecb3c8190 ]
Fix bad page state, free inappropriate page in handling dummy descriptor. iavf_build_skb now has to check not only if rx_buffer is NULL but also if size is zero, same thing in iavf_clean_rx_irq. Without this patch driver would free page that will be used by napi_build_skb.
--- drivers/net/ethernet/intel/iavf/iavf_txrx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_txrx.c +2 -2
@@ -1358,7 +1358,7 @@ static struct sk_buff *iavf_build_skb(struct iavf_ring *rx_ring,#endif struct sk_buff *skb; -if (!rx_buffer) +if (!rx_buffer || !size)return NULL ;/* prefetch first cache line of first page */ va =page_address (rx_buffer->page) + rx_buffer->page_offset;
@@ -1516,7 +1516,7 @@ static int iavf_clean_rx_irq(struct iavf_ring *rx_ring, int budget)/* exit if we failed to retrieve a buffer */ if (!skb) { rx_ring->rx_stats.alloc_buff_failed++; -if (rx_buffer) +if (rx_buffer && size) rx_buffer->pagecnt_bias++;break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/148 mlxbf_gige: clear MDIO gateway lock after read
In reply to Greg Kroah-HartmanFrom: David Thompson <[email protected]>
[ Upstream commit 182447b12144b7be9b63a273d27c5a11bd54960a ]
The MDIO gateway (GW) lock in BlueField-2 GIGE logic is set after read. This patch adds logic to make sure the lock is always cleared at the end of each MDIO transaction.
--- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c +6 -0
@@ -178,6 +178,9 @@ static int mlxbf_gige_mdio_read(struct mii_bus *bus, int phy_add, int phy_reg)/* Only return ad bits of the gw register */ ret &=MLXBF_GIGE_MDIO_GW_AD_MASK ; +/* The MDIO lock is set on read. To release it, clear gw register */ +writel (0 , priv->mdio_io +MLXBF_GIGE_MDIO_GW_OFFSET ); +return ret; }
@@ -201,6 +204,9 @@ static int mlxbf_gige_mdio_write(struct mii_bus *bus, int phy_add, ret =readl_poll_timeout_atomic (priv->mdio_io +MLXBF_GIGE_MDIO_GW_OFFSET , temp, !(temp &MLXBF_GIGE_MDIO_GW_BUSY_MASK ),100 ,1000000 ); +/* The MDIO lock is set on read. To release it, clear gw register */ +writel (0 , priv->mdio_io +MLXBF_GIGE_MDIO_GW_OFFSET ); +return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 85/148 iavf: Fix set max MTU size with port VLAN and jumbo frames
In reply to Greg Kroah-HartmanFrom: Michal Jaron <[email protected]>
[ Upstream commit 399c98c4dc50b7eb7e9f24da7ffdda6f025676ef ]
After setting port VLAN and MTU to 9000 on VF with ice driver there was an iavf error
"PF returned error -5 (IAVF_ERR_PARAM) to our request 6".
During queue configuration, VF's max packet size was set to IAVF_MAX_RXBUFFER but on ice max frame size was smaller by VLAN_HLEN due to making some space for port VLAN as VF is not aware whether it's in a port VLAN. This mismatch in sizes caused ice to reject queue configuration with ERR_PARAM error. Proper max_mtu is sent from ice PF to VF with GET_VF_RESOURCES msg but VF does not look at this.
In iavf change max_frame from IAVF_MAX_RXBUFFER to max_mtu received from pf with GET_VF_RESOURCES msg to make vf's max_frame_size dependent from pf. Add check if received max_mtu is not in eligible range then set it to IAVF_MAX_RXBUFFER.
--- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +5 -2
@@ -244,11 +244,14 @@ int iavf_get_vf_config(struct iavf_adapter *adapter)void iavf_configure_queues (struct iavf_adapter *adapter) {struct virtchnl_vsi_queue_config_info *vqci; -struct virtchnl_queue_pair_info *vqpi; +int i, max_frame = adapter->vf_res->max_mtu;int pairs = adapter->num_active_queues; -int i, max_frame =IAVF_MAX_RXBUFFER ; +struct virtchnl_queue_pair_info *vqpi;size_t len; +if (max_frame >IAVF_MAX_RXBUFFER || !max_frame) + max_frame =IAVF_MAX_RXBUFFER ; +if (adapter->current_op !=VIRTCHNL_OP_UNKNOWN ) {/* bail because we already have a command pending */ dev_err(&adapter->pdev->dev, "Cannot configure queues, command %d pending\n",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/148 i40e: Fix VF set max MTU size
In reply to Greg Kroah-HartmanFrom: Michal Jaron <[email protected]>
[ Upstream commit 372539def2824c43b6afe2403045b140f65c5acc ]
Max MTU sent to VF is set to 0 during memory allocation. It cause that max MTU on VF is changed to IAVF_MAX_RXBUFFER and does not depend on data from HW.
Set max_mtu field in virtchnl_vf_resource struct to inform VF in GET_VF_RESOURCES msg what size should be max frame.
--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +20 -0
@@ -2038,6 +2038,25 @@ static void i40e_del_qch(struct i40e_vf *vf) } } +/** +* i40e_vc_get_max_frame_size +* @vf: pointer to the VF +* +* Max frame size is determined based on the current port's max frame size and +* whether a port VLAN is configured on this VF. The VF is not aware whether +* it's in a port VLAN so the PF needs to account for this in max frame size +* checks and sending the max frame size to the VF. +**/ +static u16 i40e_vc_get_max_frame_size (struct i40e_vf *vf) +{ +u16 max_frame_size = vf->pf->hw.phy.link_info.max_frame_size; + +if (vf->port_vlan_id) + max_frame_size -=VLAN_HLEN ; + +return max_frame_size; +} +/** * i40e_vc_get_vf_resources_msg * @vf: pointer to the VF info
@@ -2139,6 +2158,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf; vfres->rss_key_size =I40E_HKEY_ARRAY_SIZE ; vfres->rss_lut_size =I40E_VF_HLUT_ARRAY_SIZE ; + vfres->max_mtu =i40e_vc_get_max_frame_size (vf);if (vf->lan_vsi_idx) { vfres->vsi_res[0 ].vsi_id = vf->lan_vsi_id;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/148 i40e: Fix set max_tx_rate when it is lower than 1 Mbps
In reply to Greg Kroah-HartmanFrom: Michal Jaron <[email protected]>
[ Upstream commit 198eb7e1b81d8ba676d0f4f120c092032ae69a8e ]
While converting max_tx_rate from bytes to Mbps, this value was set to 0, if the original value was lower than 125000 bytes (1 Mbps). This would cause no transmission rate limiting to occur. This happened due to lack of check of max_tx_rate against the 1 Mbps value for max_tx_rate and the following division by 125000. Fix this issue by adding a helper i40e_bw_bytes_to_mbits() which sets max_tx_rate to minimum usable value of 50 Mbps, if its value is less than 1 Mbps, otherwise do the required conversion by dividing by 125000.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 32 +++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +26 -6
@@ -5766,6 +5766,26 @@ static int i40e_get_link_speed(struct i40e_vsi *vsi) } } +/** +* i40e_bw_bytes_to_mbits - Convert max_tx_rate from bytes to mbits +* @vsi: Pointer to vsi structure +* @max_tx_rate: max TX rate in bytes to be converted into Mbits +* +* Helper function to convert units before send to set BW limit +**/ +static u64 i40e_bw_bytes_to_mbits (struct i40e_vsi *vsi,u64 max_tx_rate) +{ +if (max_tx_rate <I40E_BW_MBPS_DIVISOR ) { +dev_warn (&vsi->back->pdev->dev, +"Setting max tx rate to minimum usable value of 50Mbps.\n" ); + max_tx_rate =I40E_BW_CREDIT_DIVISOR ; + }else { +do_div (max_tx_rate,I40E_BW_MBPS_DIVISOR ); + } + +return max_tx_rate; +} +/** * i40e_set_bw_limit - setup BW limit for Tx traffic based on max_tx_rate * @vsi: VSI to be configured
@@ -5788,10 +5808,10 @@ int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate) max_tx_rate, seid);return -EINVAL ; } -if (max_tx_rate && max_tx_rate <50 ) { +if (max_tx_rate && max_tx_rate <I40E_BW_CREDIT_DIVISOR ) {dev_warn (&pf->pdev->dev,"Setting max tx rate to minimum usable value of 50Mbps.\n" ); - max_tx_rate =50 ; + max_tx_rate =I40E_BW_CREDIT_DIVISOR ; }/* Tx rate credits are in values of 50Mbps, 0 is disabled */
@@ -8082,9 +8102,9 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)if (i40e_is_tc_mqprio_enabled (pf)) {if (vsi->mqprio_qopt.max_rate[0 ]) { -u64 max_tx_rate = vsi->mqprio_qopt.max_rate[0 ]; +u64 max_tx_rate =i40e_bw_bytes_to_mbits (vsi, + vsi->mqprio_qopt.max_rate[0 ]); -do_div (max_tx_rate,I40E_BW_MBPS_DIVISOR ); ret =i40e_set_bw_limit (vsi, vsi->seid, max_tx_rate);if (!ret) {u64 credits = max_tx_rate;
@@ -10829,10 +10849,10 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) }if (vsi->mqprio_qopt.max_rate[0 ]) { -u64 max_tx_rate = vsi->mqprio_qopt.max_rate[0 ]; +u64 max_tx_rate =i40e_bw_bytes_to_mbits (vsi, + vsi->mqprio_qopt.max_rate[0 ]);u64 credits =0 ; -do_div (max_tx_rate,I40E_BW_MBPS_DIVISOR ); ret =i40e_set_bw_limit (vsi, vsi->seid, max_tx_rate);if (ret) goto end_unlock;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 88/148 sfc: fix TX channel offset when using legacy interrupts
In reply to Greg Kroah-HartmanFrom: Íñigo Huguet <[email protected]>
[ Upstream commit f232af4295653afa4ade3230462b3be15ad16419 ]
In legacy interrupt mode the tx_channel_offset was hardcoded to 1, but that's not correct if efx_sepparate_tx_channels is false. In that case, the offset is 0 because the tx queues are in the single existing channel at index 0, together with the rx queue.
Without this fix, as soon as you try to send any traffic, it tries to get the tx queues from an uninitialized channel getting these errors:
WARNING: CPU: 1 PID: 0 at drivers/net/ethernet/sfc/tx.c:540 efx_hard_start_xmit+0x12e/0x170 [sfc] [...] RIP: 0010:efx_hard_start_xmit+0x12e/0x170 [sfc] [...] Call Trace: <IRQ> dev_hard_start_xmit+0xd7/0x230 sch_direct_xmit+0x9f/0x360 __dev_queue_xmit+0x890/0xa40 [...] BUG: unable to handle kernel NULL pointer dereference at 0000000000000020 [...] RIP: 0010:efx_hard_start_xmit+0x153/0x170 [sfc] [...] Call Trace: <IRQ> dev_hard_start_xmit+0xd7/0x230 sch_direct_xmit+0x9f/0x360 __dev_queue_xmit+0x890/0xa40 [...]
--- drivers/net/ethernet/sfc/efx_channels.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/sfc/efx_channels.c +1 -1
@@ -329,7 +329,7 @@ int efx_probe_interrupts(struct efx_nic *efx) efx->n_channels =1 + (efx_separate_tx_channels ?1 :0 ); efx->n_rx_channels =1 ; efx->n_tx_channels =1 ; - efx->tx_channel_offset =1 ; + efx->tx_channel_offset = efx_separate_tx_channels ?1 :0 ; efx->n_xdp_channels =0 ; efx->xdp_channel_offset = efx->n_channels; efx->legacy_irq = efx->pci_dev->irq;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 89/148 sfc: fix null pointer dereference in efx_hard_start_xmit
In reply to Greg Kroah-HartmanFrom: Íñigo Huguet <[email protected]>
[ Upstream commit 0a242eb2913a4aa3d6fbdb86559f27628e9466f3 ]
Trying to get the channel from the tx_queue variable here is wrong because we can only be here if tx_queue is NULL, so we shouldn't dereference it. As the above comment in the code says, this is very unlikely to happen, but it's wrong anyway so let's fix it.
I hit this issue because of a different bug that caused tx_queue to be NULL. If that happens, this is the error message that we get here:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000020 [...] RIP: 0010:efx_hard_start_xmit+0x153/0x170 [sfc]
--- drivers/net/ethernet/sfc/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/sfc/tx.c +1 -1
@@ -548,7 +548,7 @@ netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,* previous packets out. */ if (!netdev_xmit_more ()) -efx_tx_send_pending (tx_queue->channel); +efx_tx_send_pending (efx_get_tx_channel (efx, index));return NETDEV_TX_OK ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/148 drm/hisilicon/hibmc: Allow to be built if COMPILE_TEST is enabled
In reply to Greg Kroah-HartmanFrom: Javier Martinez Canillas <[email protected]>
[ Upstream commit a0f25a6bb319aa05e04dcf51707c97c2881b4f47 ]
The commit feeb07d0ca5a ("drm/hisilicon/hibmc: Make CONFIG_DRM_HISI_HIBMC depend on ARM64") made the driver Kconfig symbol to depend on ARM64 since it only supports that architecture and loading the module on others would lead to incorrect video modes being used.
But it also prevented the driver to be built on other architectures which is useful to have compile test coverage when doing subsystem wide changes.
Make the dependency instead to be (ARM64 || COMPILE_TEST), so the driver is buildable when the CONFIG_COMPILE_TEST option is enabled.
Stable-dep-of: d8a79c030549 ("drm/hisilicon: Add depends on MMU")
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/hisilicon/hibmc/Kconfig +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_HISI_HIBMC tristate "DRM Support for Hisilicon Hibmc" - depends on DRM && PCI && ARM64 + depends on DRM && PCI && (ARM64 || COMPILE_TEST) select DRM_KMS_HELPER select DRM_VRAM_HELPER select DRM_TTM
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/148 drm/hisilicon: Add depends on MMU
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit d8a79c03054911c375a2252627a429c9bc4615b6 ]
The Kconfig symbol depended on MMU but was dropped by the commit acad3fe650a5 ("drm/hisilicon: Removed the dependency on the mmu") because it already had as a dependency ARM64 that already selects MMU.
But later, commit a0f25a6bb319 ("drm/hisilicon/hibmc: Allow to be built if COMPILE_TEST is enabled") allowed the driver to be built for non-ARM64 when COMPILE_TEST is set but that could lead to unmet direct dependencies and linking errors.
Prevent a kconfig warning when MMU is not enabled by making DRM_HISI_HIBMC depend on MMU.
WARNING: unmet direct dependencies detected for DRM_TTM
Depends on [n]: HAS_IOMEM [=y] && DRM [=m] && MMU [=n]
Selected by [m]:
- DRM_TTM_HELPER [=m] && HAS_IOMEM [=y] && DRM [=m]
- DRM_HISI_HIBMC [=m] && HAS_IOMEM [=y] && DRM [=m] && PCI [=y] && (ARM64 || COMPILE_TEST [=y])
--- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/hisilicon/hibmc/Kconfig +1 -0
@@ -2,6 +2,7 @@ config DRM_HISI_HIBMC tristate "DRM Support for Hisilicon Hibmc" depends on DRM && PCI && (ARM64 || COMPILE_TEST) + depends on MMU select DRM_KMS_HELPER select DRM_VRAM_HELPER select DRM_TTM
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 92/148 of: mdio: Add of_node_put() when breaking out of for_each_xx
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
[ Upstream commit 1c48709e6d9d353acaaac1d8e33474756b121d78 ]
In of_mdiobus_register(), we should call of_node_put() for 'child' escaped out of for_each_available_child_of_node().
--- drivers/net/mdio/of_mdio.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/mdio/of_mdio.c +1 -0
@@ -231,6 +231,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)return 0 ; unregister: +of_node_put (child);mdiobus_unregister (mdio);return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 93/148 net: ipa: properly limit modem routing table use
In reply to Greg Kroah-HartmanFrom: Alex Elder <[email protected]>
[ Upstream commit cf412ec333250cb82bafe57169204e14a9f1c2ac ]
IPA can route packets between IPA-connected entities. The AP and modem are currently the only such entities supported, and no routing is required to transfer packets between them.
The number of entries in each routing table is fixed, and defined at initialization time. Some of these entries are designated for use by the modem, and the rest are available for the AP to use. The AP sends a QMI message to the modem which describes (among other things) information about routing table memory available for the modem to use.
Currently the QMI initialization packet gives wrong information in its description of routing tables. What *should* be supplied is the maximum index that the modem can use for the routing table memory located at a given location. The current code instead supplies the total *number* of routing table entries. Furthermore, the modem is granted the entire table, not just the subset it's supposed to use.
This patch fixes this. First, the ipa_mem_bounds structure is generalized so its "end" field can be interpreted either as a final byte offset, or a final array index. Second, the IPv4 and IPv6 (non-hashed and hashed) table information fields in the QMI ipa_init_modem_driver_req structure are changed to be ipa_mem_bounds rather than ipa_mem_array structures. Third, we set the "end" value for each routing table to be the last index, rather than setting the "count" to be the number of indices. Finally, instead of allowing the modem to use all of a routing table's memory, it is limited to just the portion meant to be used by the modem. In all versions of IPA currently supported, that is IPA_ROUTE_MODEM_COUNT (8) entries.
Update a few comments for clarity.
--- drivers/net/ipa/ipa_qmi.c | 8 ++++---- drivers/net/ipa/ipa_qmi_msg.c | 8 ++++---- drivers/net/ipa/ipa_qmi_msg.h | 37 ++++++++++++++++++++--------------- drivers/net/ipa/ipa_table.c | 2 -- drivers/net/ipa/ipa_table.h | 3 +++ 5 files changed, 32 insertions(+), 26 deletions(-)
drivers/net/ipa/ipa_qmi.c +4 -4
@@ -308,12 +308,12 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi) mem =ipa_mem_find (ipa,IPA_MEM_V4_ROUTE ); req.v4_route_tbl_info_valid =1 ; req.v4_route_tbl_info.start = ipa->mem_offset + mem->offset; - req.v4_route_tbl_info.count = mem->size /sizeof (__le64); + req.v4_route_tbl_info.end =IPA_ROUTE_MODEM_COUNT -1 ; mem =ipa_mem_find (ipa,IPA_MEM_V6_ROUTE ); req.v6_route_tbl_info_valid =1 ; req.v6_route_tbl_info.start = ipa->mem_offset + mem->offset; - req.v6_route_tbl_info.count = mem->size /sizeof (__le64); + req.v6_route_tbl_info.end =IPA_ROUTE_MODEM_COUNT -1 ; mem =ipa_mem_find (ipa,IPA_MEM_V4_FILTER ); req.v4_filter_tbl_start_valid =1 ;
@@ -352,7 +352,7 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi) req.v4_hash_route_tbl_info_valid =1 ; req.v4_hash_route_tbl_info.start = ipa->mem_offset + mem->offset; - req.v4_hash_route_tbl_info.count = mem->size /sizeof (__le64); + req.v4_hash_route_tbl_info.end =IPA_ROUTE_MODEM_COUNT -1 ; } mem =ipa_mem_find (ipa,IPA_MEM_V6_ROUTE_HASHED );
@@ -360,7 +360,7 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi) req.v6_hash_route_tbl_info_valid =1 ; req.v6_hash_route_tbl_info.start = ipa->mem_offset + mem->offset; - req.v6_hash_route_tbl_info.count = mem->size /sizeof (__le64); + req.v6_hash_route_tbl_info.end =IPA_ROUTE_MODEM_COUNT -1 ; } mem =ipa_mem_find (ipa,IPA_MEM_V4_FILTER_HASHED );
drivers/net/ipa/ipa_qmi_msg.c +4 -4
@@ -311,7 +311,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = { .tlv_type = 0x12, .offset = offsetof(struct ipa_init_modem_driver_req, v4_route_tbl_info), - .ei_array = ipa_mem_array_ei, + .ei_array = ipa_mem_bounds_ei, }, { .data_type = QMI_OPT_FLAG,
@@ -332,7 +332,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = { .tlv_type = 0x13, .offset = offsetof(struct ipa_init_modem_driver_req, v6_route_tbl_info), - .ei_array = ipa_mem_array_ei, + .ei_array = ipa_mem_bounds_ei, }, { .data_type = QMI_OPT_FLAG,
@@ -496,7 +496,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = { .tlv_type = 0x1b, .offset = offsetof(struct ipa_init_modem_driver_req, v4_hash_route_tbl_info), - .ei_array = ipa_mem_array_ei, + .ei_array = ipa_mem_bounds_ei, }, { .data_type = QMI_OPT_FLAG,
@@ -517,7 +517,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = { .tlv_type = 0x1c, .offset = offsetof(struct ipa_init_modem_driver_req, v6_hash_route_tbl_info), - .ei_array = ipa_mem_array_ei, + .ei_array = ipa_mem_bounds_ei, }, { .data_type = QMI_OPT_FLAG,
drivers/net/ipa/ipa_qmi_msg.h +21 -16
@@ -86,9 +86,11 @@ enum ipa_platform_type { IPA_QMI_PLATFORM_TYPE_MSM_QNX_V01 = 0x5, /* QNX MSM */ }; -/* This defines the start and end offset of a range of memory. Both -* fields are offsets relative to the start of IPA shared memory. -* The end value is the last addressable byte *within* the range. +/* This defines the start and end offset of a range of memory. The start +* value is a byte offset relative to the start of IPA shared memory. The +* end value is the last addressable unit *within* the range. Typically +* the end value is in units of bytes, however it can also be a maximum +* array index value. */ struct ipa_mem_bounds {u32 start;
@@ -129,18 +131,19 @@ struct ipa_init_modem_driver_req {u8 hdr_tbl_info_valid;struct ipa_mem_bounds hdr_tbl_info; -/* Routing table information. These define the location and size of -* non-hashable IPv4 and IPv6 filter tables. The start values are -* offsets relative to the start of IPA shared memory. +/* Routing table information. These define the location and maximum +* *index* (not byte) for the modem portion of non-hashable IPv4 and +* IPv6 routing tables. The start values are byte offsets relative +* to the start of IPA shared memory. */ u8 v4_route_tbl_info_valid; -struct ipa_mem_array v4_route_tbl_info; +struct ipa_mem_bounds v4_route_tbl_info;u8 v6_route_tbl_info_valid; -struct ipa_mem_array v6_route_tbl_info; +struct ipa_mem_bounds v6_route_tbl_info;/* Filter table information. These define the location of the * non-hashable IPv4 and IPv6 filter tables. The start values are -* offsets relative to the start of IPA shared memory. +* byte offsets relative to the start of IPA shared memory. */ u8 v4_filter_tbl_start_valid;u32 v4_filter_tbl_start;
@@ -181,18 +184,20 @@ struct ipa_init_modem_driver_req {u8 zip_tbl_info_valid;struct ipa_mem_bounds zip_tbl_info; -/* Routing table information. These define the location and size -* of hashable IPv4 and IPv6 filter tables. The start values are -* offsets relative to the start of IPA shared memory. +/* Routing table information. These define the location and maximum +* *index* (not byte) for the modem portion of hashable IPv4 and IPv6 +* routing tables (if supported by hardware). The start values are +* byte offsets relative to the start of IPA shared memory. */ u8 v4_hash_route_tbl_info_valid; -struct ipa_mem_array v4_hash_route_tbl_info; +struct ipa_mem_bounds v4_hash_route_tbl_info;u8 v6_hash_route_tbl_info_valid; -struct ipa_mem_array v6_hash_route_tbl_info; +struct ipa_mem_bounds v6_hash_route_tbl_info;/* Filter table information. These define the location and size -* of hashable IPv4 and IPv6 filter tables. The start values are -* offsets relative to the start of IPA shared memory. +* of hashable IPv4 and IPv6 filter tables (if supported by hardware). +* The start values are byte offsets relative to the start of IPA +* shared memory. */ u8 v4_hash_filter_tbl_start_valid;u32 v4_hash_filter_tbl_start;
drivers/net/ipa/ipa_table.c +0 -2
@@ -108,8 +108,6 @@/* Assignment of route table entries to the modem and AP */ #define IPA_ROUTE_MODEM_MIN 0 -#define IPA_ROUTE_MODEM_COUNT 8 -#define IPA_ROUTE_AP_MIN IPA_ROUTE_MODEM_COUNT#define IPA_ROUTE_AP_COUNT \ (IPA_ROUTE_COUNT_MAX - IPA_ROUTE_MODEM_COUNT)
drivers/net/ipa/ipa_table.h +3 -0
@@ -13,6 +13,9 @@ struct ipa;/* The maximum number of filter table entries (IPv4, IPv6; hashed or not) */ #define IPA_FILTER_COUNT_MAX 14 +/* The number of route table entries allotted to the modem */ +#define IPA_ROUTE_MODEM_COUNT 8 +/* The maximum number of route table entries (IPv4, IPv6; hashed or not) */ #define IPA_ROUTE_COUNT_MAX 15
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/148 wireguard: ratelimiter: disable timings test by default
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
[ Upstream commit 684dec3cf45da2b0848298efae4adf3b2aeafeda ]
A previous commit tried to make the ratelimiter timings test more reliable but in the process made it less reliable on other configurations. This is an impossible problem to solve without increasingly ridiculous heuristics. And it's not even a problem that actually needs to be solved in any comprehensive way, since this is only ever used during development. So just cordon this off with a DEBUG_ ifdef, just like we do for the trie's randomized tests, so it can be enabled while hacking on the code, and otherwise disabled in CI. In the process we also revert 151c8e499f47.
--- drivers/net/wireguard/selftest/ratelimiter.c | 25 ++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/net/wireguard/selftest/ratelimiter.c +10 -15
@@ -6,29 +6,28 @@#ifdef DEBUG #include <linux/jiffies.h> -#include <linux/hrtimer.h> static const struct {bool result; -u64 nsec_to_sleep_before; +unsigned int msec_to_sleep_before; } expected_results[]__initconst = { [0 ...PACKETS_BURSTABLE -1 ] = { true,0 }, [PACKETS_BURSTABLE ] = { false,0 }, - [PACKETS_BURSTABLE +1 ] = { true,NSEC_PER_SEC /PACKETS_PER_SECOND }, + [PACKETS_BURSTABLE +1 ] = { true,MSEC_PER_SEC /PACKETS_PER_SECOND }, [PACKETS_BURSTABLE +2 ] = { false,0 }, - [PACKETS_BURSTABLE +3 ] = { true, (NSEC_PER_SEC /PACKETS_PER_SECOND ) *2 }, + [PACKETS_BURSTABLE +3 ] = { true, (MSEC_PER_SEC /PACKETS_PER_SECOND ) *2 }, [PACKETS_BURSTABLE +4 ] = { true,0 }, [PACKETS_BURSTABLE +5 ] = { false,0 } };static __init unsigned int maximum_jiffies_at_index (int index) { -u64 total_nsecs =2 *NSEC_PER_SEC /PACKETS_PER_SECOND /3 ; +unsigned int total_msecs =2 *MSEC_PER_SEC /PACKETS_PER_SECOND /3 ;int i;for (i =0 ; i <= index; ++i) - total_nsecs += expected_results[i].nsec_to_sleep_before; -return nsecs_to_jiffies (total_nsecs); + total_msecs += expected_results[i].msec_to_sleep_before; +return msecs_to_jiffies (total_msecs); } static __init int timings_test(struct sk_buff *skb4, struct iphdr *hdr4,
@@ -43,12 +42,8 @@ static __init int timings_test(struct sk_buff *skb4, struct iphdr *hdr4, loop_start_time = jiffies;for (i =0 ; i <ARRAY_SIZE (expected_results); ++i) { -if (expected_results[i].nsec_to_sleep_before) { -ktime_t timeout =ktime_add (ktime_add_ns (ktime_get_coarse_boottime (),TICK_NSEC *4 /3 ), -ns_to_ktime (expected_results[i].nsec_to_sleep_before)); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_hrtimeout_range_clock (&timeout,0 ,HRTIMER_MODE_ABS ,CLOCK_BOOTTIME ); - } +if (expected_results[i].msec_to_sleep_before) +msleep (expected_results[i].msec_to_sleep_before);if (time_is_before_jiffies (loop_start_time +maximum_jiffies_at_index (i)))
@@ -132,7 +127,7 @@ bool __init wg_ratelimiter_selftest(void)if (IS_ENABLED (CONFIG_KASAN ) ||IS_ENABLED (CONFIG_UBSAN ))return true; -BUILD_BUG_ON (NSEC_PER_SEC %PACKETS_PER_SECOND !=0 ); +BUILD_BUG_ON (MSEC_PER_SEC %PACKETS_PER_SECOND !=0 );if (wg_ratelimiter_init ()) goto out;
@@ -172,7 +167,7 @@ bool __init wg_ratelimiter_selftest(void) ++test;#endif -for (trials =TRIALS_BEFORE_GIVING_UP ;;) { +for (trials =TRIALS_BEFORE_GIVING_UP ;IS_ENABLED (DEBUG_RATELIMITER_TIMINGS );) {int test_count =0 , ret; ret =timings_test (skb4, hdr4, skb6, hdr6, &test_count);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 95/148 wireguard: netlink: avoid variable-sized memcpy on sockaddr
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
[ Upstream commit 26c013108c12b94bc023bf19198a4300596c98b1 ]
Doing a variable-sized memcpy is slower, and the compiler isn't smart enough to turn this into a constant-size assignment.
Further, Kees' latest fortified memcpy will actually bark, because the destination pointer is type sockaddr, not explicitly sockaddr_in or sockaddr_in6, so it thinks there's an overflow:
memcpy: detected field-spanning write (size 28) of single field "&endpoint.addr" at drivers/net/wireguard/netlink.c:446 (size 16)
Fix this by just assigning by using explicit casts for each checked case.
--- drivers/net/wireguard/netlink.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/wireguard/netlink.c +6 -7
@@ -436,14 +436,13 @@ static int set_peer(struct wg_device *wg, struct nlattr **attrs)if (attrs[WGPEER_A_ENDPOINT ]) {struct sockaddr *addr =nla_data (attrs[WGPEER_A_ENDPOINT ]);size_t len =nla_len (attrs[WGPEER_A_ENDPOINT ]); +struct endpoint endpoint = { { {0 } } }; -if ((len ==sizeof (struct sockaddr_in ) && - addr->sa_family ==AF_INET ) || - (len ==sizeof (struct sockaddr_in6 ) && - addr->sa_family ==AF_INET6 )) { -struct endpoint endpoint = { { {0 } } }; - -memcpy (&endpoint.addr, addr, len); +if (len ==sizeof (struct sockaddr_in ) && addr->sa_family ==AF_INET ) { + endpoint.addr4 = *(struct sockaddr_in *)addr; +wg_socket_set_peer_endpoint (peer, &endpoint); + }else if (len ==sizeof (struct sockaddr_in6 ) && addr->sa_family ==AF_INET6 ) { + endpoint.addr6 = *(struct sockaddr_in6 *)addr;wg_socket_set_peer_endpoint (peer, &endpoint); } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 96/148 net: enetc: move enetc_set_psfp() out of the common enetc_set_features()
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit fed38e64d9b99d65a36c0dbadc3d3f8ddd9ea030 ]
The VF netdev driver shouldn't respond to changes in the NETIF_F_HW_TC flag; only PFs should. Moreover, TSN-specific code should go to enetc_qos.c, which should not be included in the VF driver.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 32 +------------------ drivers/net/ethernet/freescale/enetc/enetc.h | 9 ++++-- .../net/ethernet/freescale/enetc/enetc_pf.c | 11 ++++++- .../net/ethernet/freescale/enetc/enetc_qos.c | 23 +++++++++++++ .../net/ethernet/freescale/enetc/enetc_vf.c | 4 ++- 5 files changed, 44 insertions(+), 35 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +1 -31
@@ -2307,29 +2307,6 @@ static int enetc_set_rss(struct net_device *ndev, int en)return 0 ; } -static int enetc_set_psfp (struct net_device *ndev,int en) -{ -struct enetc_ndev_priv *priv =netdev_priv (ndev); -int err; - -if (en) { - err =enetc_psfp_enable (priv); -if (err) -return err; - - priv->active_offloads |=ENETC_F_QCI ; -return 0 ; - } - - err =enetc_psfp_disable (priv); -if (err) -return err; - - priv->active_offloads &= ~ENETC_F_QCI ; - -return 0 ; -} -static void enetc_enable_rxvlan (struct net_device *ndev,bool en) {struct enetc_ndev_priv *priv =netdev_priv (ndev);
@@ -2348,11 +2325,9 @@ static void enetc_enable_txvlan(struct net_device *ndev, bool en)enetc_bdr_enable_txvlan (&priv->si->hw, i, en); } -int enetc_set_features (struct net_device *ndev, -netdev_features_t features) +void enetc_set_features (struct net_device *ndev,netdev_features_t features) {netdev_features_t changed = ndev->features ^ features; -int err =0 ;if (changed &NETIF_F_RXHASH )enetc_set_rss (ndev, !!(features &NETIF_F_RXHASH ));
@@ -2364,11 +2339,6 @@ int enetc_set_features(struct net_device *ndev,if (changed &NETIF_F_HW_VLAN_CTAG_TX )enetc_enable_txvlan (ndev, !!(features &NETIF_F_HW_VLAN_CTAG_TX )); - -if (changed &NETIF_F_HW_TC ) - err =enetc_set_psfp (ndev, !!(features &NETIF_F_HW_TC )); - -return err; }#ifdef CONFIG_FSL_ENETC_PTP_CLOCK
drivers/net/ethernet/freescale/enetc/enetc.h +7 -2
@@ -385,8 +385,7 @@ void enetc_start(struct net_device *ndev);void enetc_stop (struct net_device *ndev);netdev_tx_t enetc_xmit (struct sk_buff *skb,struct net_device *ndev);struct net_device_stats *enetc_get_stats (struct net_device *ndev); -int enetc_set_features (struct net_device *ndev, -netdev_features_t features); +void enetc_set_features (struct net_device *ndev,netdev_features_t features);int enetc_ioctl (struct net_device *ndev,struct ifreq *rq,int cmd);int enetc_setup_tc (struct net_device *ndev,enum tc_setup_type type,void *type_data);
@@ -421,6 +420,7 @@ int enetc_setup_tc_block_cb(enum tc_setup_type type, void *type_data,int enetc_setup_tc_psfp (struct net_device *ndev,void *type_data);int enetc_psfp_init (struct enetc_ndev_priv *priv);int enetc_psfp_clean (struct enetc_ndev_priv *priv); +int enetc_set_psfp (struct net_device *ndev,bool en);static inline void enetc_get_max_cap (struct enetc_ndev_priv *priv) {
@@ -496,4 +496,9 @@ static inline int enetc_psfp_disable(struct enetc_ndev_priv *priv) {return 0 ; } + +static inline int enetc_set_psfp (struct net_device *ndev,bool en) +{ +return 0 ; +}#endif
drivers/net/ethernet/freescale/enetc/enetc_pf.c +10 -1
@@ -708,6 +708,13 @@ static int enetc_pf_set_features(struct net_device *ndev, {netdev_features_t changed = ndev->features ^ features;struct enetc_ndev_priv *priv =netdev_priv (ndev); +int err; + +if (changed &NETIF_F_HW_TC ) { + err =enetc_set_psfp (ndev, !!(features &NETIF_F_HW_TC )); +if (err) +return err; + }if (changed &NETIF_F_HW_VLAN_CTAG_FILTER ) {struct enetc_pf *pf =enetc_si_priv (priv->si);
@@ -721,7 +728,9 @@ static int enetc_pf_set_features(struct net_device *ndev,if (changed &NETIF_F_LOOPBACK )enetc_set_loopback (ndev, !!(features &NETIF_F_LOOPBACK )); -return enetc_set_features (ndev, features); +enetc_set_features (ndev, features); + +return 0 ; }static const struct net_device_ops enetc_ndev_ops = {
drivers/net/ethernet/freescale/enetc/enetc_qos.c +23 -0
@@ -1529,6 +1529,29 @@ int enetc_setup_tc_block_cb(enum tc_setup_type type, void *type_data, } } +int enetc_set_psfp (struct net_device *ndev,bool en) +{ +struct enetc_ndev_priv *priv =netdev_priv (ndev); +int err; + +if (en) { + err =enetc_psfp_enable (priv); +if (err) +return err; + + priv->active_offloads |=ENETC_F_QCI ; +return 0 ; + } + + err =enetc_psfp_disable (priv); +if (err) +return err; + + priv->active_offloads &= ~ENETC_F_QCI ; + +return 0 ; +} +int enetc_psfp_init (struct enetc_ndev_priv *priv) {if (epsfp.psfp_sfi_bitmap)
drivers/net/ethernet/freescale/enetc/enetc_vf.c +3 -1
@@ -88,7 +88,9 @@ static int enetc_vf_set_mac_addr(struct net_device *ndev, void *addr)static int enetc_vf_set_features (struct net_device *ndev,netdev_features_t features) { -return enetc_set_features (ndev, features); +enetc_set_features (ndev, features); + +return 0 ; }/* Probing/ Init */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 97/148 net: enetc: deny offload of tc-based TSN features on VF interfaces
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 5641c751fe2f92d3d9e8a8e03c1263ac8caa0b42 ]
TSN features on the ENETC (taprio, cbs, gate, police) are configured through a mix of command BD ring messages and port registers:enetc_port_rd(), enetc_port_wr().
Port registers are a region of the ENETC memory map which are only accessible from the PCIe Physical Function. They are not accessible from the Virtual Functions.
Moreover, attempting to access these registers crashes the kernel:
$ echo 1 > /sys/bus/pci/devices/0000\:00\:00.0/sriov_numvfs pci 0000:00:01.0: [1957:ef00] type 00 class 0x020001 fsl_enetc_vf 0000:00:01.0: Adding to iommu group 15 fsl_enetc_vf 0000:00:01.0: enabling device (0000 -> 0002) fsl_enetc_vf 0000:00:01.0 eno0vf0: renamed from eth0 $ tc qdisc replace dev eno0vf0 root taprio num_tc 8 map 0 1 2 3 4 5 6 7 \ queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 0 \ sched-entry S 0x7f 900000 sched-entry S 0x80 100000 flags 0x2 Unable to handle kernel paging request at virtual address ffff800009551a08 Internal error: Oops: 96000007 [#1] PREEMPT SMP pc : enetc_setup_tc_taprio+0x170/0x47c lr : enetc_setup_tc_taprio+0x16c/0x47c Call trace: enetc_setup_tc_taprio+0x170/0x47c enetc_setup_tc+0x38/0x2dc taprio_change+0x43c/0x970 taprio_init+0x188/0x1e0 qdisc_create+0x114/0x470 tc_modify_qdisc+0x1fc/0x6c0 rtnetlink_rcv_msg+0x12c/0x390
Split enetc_setup_tc() into separate functions for the PF and for the VF drivers. Also remove enetc_qos.o from being included into enetc-vf.ko, since it serves absolutely no purpose there.
--- drivers/net/ethernet/freescale/enetc/Makefile | 1 - drivers/net/ethernet/freescale/enetc/enetc.c | 21 +------------------ drivers/net/ethernet/freescale/enetc/enetc.h | 3 +-- .../net/ethernet/freescale/enetc/enetc_pf.c | 21 ++++++++++++++++++- .../net/ethernet/freescale/enetc/enetc_vf.c | 13 +++++++++++- 5 files changed, 34 insertions(+), 25 deletions(-)
drivers/net/ethernet/freescale/enetc/Makefile +0 -1
@@ -9,7 +9,6 @@ fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o fsl-enetc-vf-y := enetc_vf.o $(common-objs) -fsl-enetc-vf-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o obj-$(CONFIG_FSL_ENETC_IERB) += fsl-enetc-ierb.o fsl-enetc-ierb-y := enetc_ierb.o
drivers/net/ethernet/freescale/enetc/enetc.c +1 -20
@@ -2142,7 +2142,7 @@ int enetc_close(struct net_device *ndev)return 0 ; } -static int enetc_setup_tc_mqprio (struct net_device *ndev,void *type_data) +int enetc_setup_tc_mqprio (struct net_device *ndev,void *type_data) {struct enetc_ndev_priv *priv =netdev_priv (ndev);struct tc_mqprio_qopt *mqprio = type_data;
@@ -2196,25 +2196,6 @@ static int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)return 0 ; } -int enetc_setup_tc (struct net_device *ndev,enum tc_setup_type type, -void *type_data) -{ -switch (type) { -case TC_SETUP_QDISC_MQPRIO : -return enetc_setup_tc_mqprio (ndev, type_data); -case TC_SETUP_QDISC_TAPRIO : -return enetc_setup_tc_taprio (ndev, type_data); -case TC_SETUP_QDISC_CBS : -return enetc_setup_tc_cbs (ndev, type_data); -case TC_SETUP_QDISC_ETF : -return enetc_setup_tc_txtime (ndev, type_data); -case TC_SETUP_BLOCK : -return enetc_setup_tc_psfp (ndev, type_data); -default : -return -EOPNOTSUPP ; - } -} -static int enetc_setup_xdp_prog (struct net_device *dev,struct bpf_prog *prog,struct netlink_ext_ack *extack) {
drivers/net/ethernet/freescale/enetc/enetc.h +1 -2
@@ -387,8 +387,7 @@ netdev_tx_t enetc_xmit(struct sk_buff *skb, struct net_device *ndev);struct net_device_stats *enetc_get_stats (struct net_device *ndev);void enetc_set_features (struct net_device *ndev,netdev_features_t features);int enetc_ioctl (struct net_device *ndev,struct ifreq *rq,int cmd); -int enetc_setup_tc (struct net_device *ndev,enum tc_setup_type type, -void *type_data); +int enetc_setup_tc_mqprio (struct net_device *ndev,void *type_data);int enetc_setup_bpf (struct net_device *dev,struct netdev_bpf *xdp);int enetc_xdp_xmit (struct net_device *ndev,int num_frames,struct xdp_frame **frames,u32 flags);
drivers/net/ethernet/freescale/enetc/enetc_pf.c +20 -1
@@ -733,6 +733,25 @@ static int enetc_pf_set_features(struct net_device *ndev,return 0 ; } +static int enetc_pf_setup_tc (struct net_device *ndev,enum tc_setup_type type, +void *type_data) +{ +switch (type) { +case TC_SETUP_QDISC_MQPRIO : +return enetc_setup_tc_mqprio (ndev, type_data); +case TC_SETUP_QDISC_TAPRIO : +return enetc_setup_tc_taprio (ndev, type_data); +case TC_SETUP_QDISC_CBS : +return enetc_setup_tc_cbs (ndev, type_data); +case TC_SETUP_QDISC_ETF : +return enetc_setup_tc_txtime (ndev, type_data); +case TC_SETUP_BLOCK : +return enetc_setup_tc_psfp (ndev, type_data); +default : +return -EOPNOTSUPP ; + } +} +static const struct net_device_ops enetc_ndev_ops = { .ndo_open = enetc_open, .ndo_stop = enetc_close,
@@ -747,7 +766,7 @@ static const struct net_device_ops enetc_ndev_ops = { .ndo_set_vf_spoofchk = enetc_pf_set_vf_spoofchk, .ndo_set_features = enetc_pf_set_features, .ndo_eth_ioctl = enetc_ioctl, - .ndo_setup_tc = enetc_setup_tc, + .ndo_setup_tc = enetc_pf_setup_tc, .ndo_bpf = enetc_setup_bpf, .ndo_xdp_xmit = enetc_xdp_xmit, };
drivers/net/ethernet/freescale/enetc/enetc_vf.c +12 -1
@@ -93,6 +93,17 @@ static int enetc_vf_set_features(struct net_device *ndev,return 0 ; } +static int enetc_vf_setup_tc (struct net_device *ndev,enum tc_setup_type type, +void *type_data) +{ +switch (type) { +case TC_SETUP_QDISC_MQPRIO : +return enetc_setup_tc_mqprio (ndev, type_data); +default : +return -EOPNOTSUPP ; + } +} +/* Probing/ Init */ static const struct net_device_ops enetc_ndev_ops = { .ndo_open = enetc_open,
@@ -102,7 +113,7 @@ static const struct net_device_ops enetc_ndev_ops = { .ndo_set_mac_address = enetc_vf_set_mac_addr, .ndo_set_features = enetc_vf_set_features, .ndo_eth_ioctl = enetc_ioctl, - .ndo_setup_tc = enetc_setup_tc, + .ndo_setup_tc = enetc_vf_setup_tc, }; static void enetc_vf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 98/148 net/sched: taprio: avoid disabling offload when it was never enabled
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit db46e3a88a09c5cf7e505664d01da7238cd56c92 ]
In an incredibly strange API design decision, qdisc->destroy() gets called even if qdisc->init() never succeeded, not exclusively since commit 87b60cfacf9f ("net_sched: fix error recovery at qdisc creation"), but apparently also earlier (in the case of qdisc_create_dflt()).
The taprio qdisc does not fully acknowledge this when it attempts full offload, because it starts off with q->flags = TAPRIO_FLAGS_INVALID in taprio_init(), then it replaces q->flags with TCA_TAPRIO_ATTR_FLAGS parsed from netlink (in taprio_change(), tail called from taprio_init()).
But in taprio_destroy(), we call taprio_disable_offload(), and this determines what to do based on FULL_OFFLOAD_IS_ENABLED(q->flags).
But looking at the implementation of FULL_OFFLOAD_IS_ENABLED() (a bitwise check of bit 1 in q->flags), it is invalid to call this macro on q->flags when it contains TAPRIO_FLAGS_INVALID, because that is set to U32_MAX, and therefore FULL_OFFLOAD_IS_ENABLED() will return true on an invalid set of flags.
As a result, it is possible to crash the kernel if user space forces an error between setting q->flags = TAPRIO_FLAGS_INVALID, and the calling of taprio_enable_offload(). This is because drivers do not expect the offload to be disabled when it was never enabled.
The error that we force here is to attach taprio as a non-root qdisc, but instead as child of an mqprio root qdisc:
$ tc qdisc add dev swp0 root handle 1: \ mqprio num_tc 8 map 0 1 2 3 4 5 6 7 \ queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 hw 0 $ tc qdisc replace dev swp0 parent 1:1 \ taprio num_tc 8 map 0 1 2 3 4 5 6 7 \ queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 base-time 0 \ sched-entry S 0x7f 990000 sched-entry S 0x80 100000 \ flags 0x0 clockid CLOCK_TAI Unable to handle kernel paging request at virtual address fffffffffffffff8 [fffffffffffffff8] pgd=0000000000000000, p4d=0000000000000000 Internal error: Oops: 96000004 [#1] PREEMPT SMP Call trace: taprio_dump+0x27c/0x310 vsc9959_port_setup_tc+0x1f4/0x460 felix_port_setup_tc+0x24/0x3c dsa_slave_setup_tc+0x54/0x27c taprio_disable_offload.isra.0+0x58/0xe0 taprio_destroy+0x80/0x104 qdisc_create+0x240/0x470 tc_modify_qdisc+0x1fc/0x6b0 rtnetlink_rcv_msg+0x12c/0x390 netlink_rcv_skb+0x5c/0x130 rtnetlink_rcv+0x1c/0x2c
Fix this by keeping track of the operations we made, and undo the offload only if we actually did it.
I've added "bool offloaded" inside a 4 byte hole between "int clockid" and "atomic64_t picos_per_byte". Now the first cache line looks like below:
$ pahole -C taprio_sched net/sched/sch_taprio.o
struct taprio_sched {
struct Qdisc * * qdiscs; /* 0 8 */
struct Qdisc * root; /* 8 8 */
u32 flags; /* 16 4 */
enum tk_offsets tk_offset; /* 20 4 */
int clockid; /* 24 4 */
bool offloaded; /* 28 1 *//* XXX 3 bytes hole, try to pack */
atomic64_t picos_per_byte; /* 32 0 */
/* XXX 8 bytes hole, try to pack */
spinlock_t current_entry_lock; /* 40 0 */
/* XXX 8 bytes hole, try to pack */
struct sched_entry * current_entry; /* 48 8 */
struct sched_gate_list * oper_sched; /* 56 8 */
/* --- cacheline 1 boundary (64 bytes) --- */
--- net/sched/sch_taprio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/sched/sch_taprio.c +6 -4
@@ -66,6 +66,7 @@ struct taprio_sched {u32 flags;enum tk_offsets tk_offset;int clockid; +bool offloaded;atomic64_t picos_per_byte;/* Using picoseconds because for 10Gbps+ * speeds it's sub-nanoseconds per byte */
@@ -1278,6 +1279,8 @@ static int taprio_enable_offload(struct net_device *dev, goto done; } + q->offloaded = true; + done:taprio_offload_free (offload);
@@ -1292,12 +1295,9 @@ static int taprio_disable_offload(struct net_device *dev,struct tc_taprio_qopt_offload *offload;int err; -if (!FULL_OFFLOAD_IS_ENABLED (q->flags)) +if (!q->offloaded)return 0 ; -if (!ops->ndo_setup_tc) -return -EOPNOTSUPP ; - offload =taprio_offload_alloc (0 );if (!offload) { NL_SET_ERR_MSG(extack,
@@ -1313,6 +1313,8 @@ static int taprio_disable_offload(struct net_device *dev, goto out; } + q->offloaded = false; + out:taprio_offload_free (offload);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 99/148 net/sched: taprio: make qdisc_leaf() see the per-netdev-queue pfifo child qdiscs
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 1461d212ab277d8bba1a753d33e9afe03d81f9d4 ]
taprio can only operate as root qdisc, and to that end, there exists the following check in taprio_init(), just as in mqprio:
if (sch->parent != TC_H_ROOT) return -EOPNOTSUPP;
And indeed, when we try to attach taprio to an mqprio child, it fails as expected:
$ tc qdisc add dev swp0 root handle 1: mqprio num_tc 8 \ map 0 1 2 3 4 5 6 7 \ queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 hw 0 $ tc qdisc replace dev swp0 parent 1:2 taprio num_tc 8 \ map 0 1 2 3 4 5 6 7 \ queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 \ base-time 0 sched-entry S 0x7f 990000 sched-entry S 0x80 100000 \ flags 0x0 clockid CLOCK_TAI Error: sch_taprio: Can only be attached as root qdisc.
(extack message added by me)
But when we try to attach a taprio child to a taprio root qdisc, surprisingly it doesn't fail:
$ tc qdisc replace dev swp0 root handle 1: taprio num_tc 8 \ map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 \ base-time 0 sched-entry S 0x7f 990000 sched-entry S 0x80 100000 \ flags 0x0 clockid CLOCK_TAI $ tc qdisc replace dev swp0 parent 1:2 taprio num_tc 8 \ map 0 1 2 3 4 5 6 7 \ queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 \ base-time 0 sched-entry S 0x7f 990000 sched-entry S 0x80 100000 \ flags 0x0 clockid CLOCK_TAI
This is because tc_modify_qdisc() behaves differently when mqprio is root, vs when taprio is root.
In the mqprio case, it finds the parent qdisc through
p = qdisc_lookup(dev, TC_H_MAJ(clid)), and then the child qdisc through q = qdisc_leaf(p, clid). This leaf qdisc q has handle 0, so it is ignored according to the comment right below ("It may be default qdisc, ignore it"). As a result, tc_modify_qdisc() goes through the qdisc_create() code path, and this gives taprio_init() a chance to check for sch_parent != TC_H_ROOT and error out.
Whereas in the taprio case, the returned q = qdisc_leaf(p, clid) is different. It is not the default qdisc created for each netdev queue (both taprio and mqprio call qdisc_create_dflt() and keep them in a private q->qdiscs[], or priv->qdiscs[], respectively). Instead, taprio makes qdisc_leaf() return the _root_ qdisc, aka itself.
When taprio does that, tc_modify_qdisc() goes through the qdisc_change() code path, because the qdisc layer never finds out about the child qdisc of the root. And through the ->change() ops, taprio has no reason to check whether its parent is root or not, just through ->init(), which is not called.
The problem is the taprio_leaf() implementation. Even though code wise, it does the exact same thing as mqprio_leaf() which it is copied from, it works with different input data. This is because mqprio does not attach itself (the root) to each device TX queue, but one of the default qdiscs from its private array.
In fact, since commit 13511704f8d7 ("net: taprio offload: enforce qdisc to netdev queue mapping"), taprio does this too, but just for the full offload case. So if we tried to attach a taprio child to a fully offloaded taprio root qdisc, it would properly fail too; just not to a software root taprio.
To fix the problem, stop looking at the Qdisc that's attached to the TX queue, and instead, always return the default qdiscs that we've allocated (and to which we privately enqueue and dequeue, in software scheduling mode).
Since Qdisc_class_ops :: leaf is only called from tc_modify_qdisc(), the risk of unforeseen side effects introduced by this change is minimal.
--- net/sched/sch_taprio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/sched/sch_taprio.c +5 -3
@@ -1950,12 +1950,14 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)static struct Qdisc *taprio_leaf (struct Qdisc *sch,unsigned long cl) { -struct netdev_queue *dev_queue =taprio_queue_get (sch, cl); +struct taprio_sched *q =qdisc_priv (sch); +struct net_device *dev =qdisc_dev (sch); +unsigned int ntx = cl -1 ; -if (!dev_queue) +if (ntx >= dev->num_tx_queues)return NULL ; -return dev_queue->qdisc_sleeping; +return q->qdiscs[ntx]; }static unsigned long taprio_find (struct Qdisc *sch,u32 classid)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 100/148 netfilter: nf_tables: fix nft_counters_enabled underflow at nf_tables_addchain()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 921ebde3c0d22c8cba74ce8eb3cc4626abff1ccd ]
syzbot is reporting underflow of nft_counters_enabled counter at nf_tables_addchain() [1], for commit 43eb8949cfdffa76 ("netfilter:nf_tables: do not leave chain stats enabled on error") missed that nf_tables_chain_destroy() after nft_basechain_init() in the error path of nf_tables_addchain() decrements the counter because nft_basechain_init() makes nft_is_base_chain() return true by setting NFT_CHAIN_BASE flag.
Increment the counter immediately after returning from nft_basechain_init().
--- net/netfilter/nf_tables_api.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +3 -4
@@ -2103,7 +2103,6 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, struct netlink_ext_ack *extack) {const struct nlattr *const *nla = ctx->nla; -struct nft_stats __percpu *stats =NULL ;struct nft_table *table = ctx->table;struct nft_base_chain *basechain;struct net *net = ctx->net;
@@ -2117,6 +2116,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,return -EOVERFLOW ;if (nla[NFTA_CHAIN_HOOK ]) { +struct nft_stats __percpu *stats =NULL ;struct nft_chain_hook hook;if (flags &NFT_CHAIN_BINDING )
@@ -2150,6 +2150,8 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,kfree (basechain);return err; } +if (stats) +static_branch_inc (&nft_counters_enabled); }else {if (flags &NFT_CHAIN_BASE )return -EINVAL ;
@@ -2224,9 +2226,6 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, goto err_unregister_hook; } -if (stats) -static_branch_inc (&nft_counters_enabled); - table->use++;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 101/148 netfilter: nf_tables: fix percpu memory leak at nf_tables_addchain()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 9a4d6dd554b86e65581ef6b6638a39ae079b17ac ]
It seems to me that percpu memory for chain stats started leaking since commit 3bc158f8d0330f0a ("netfilter: nf_tables: map basechain priority to hardware priority") when nft_chain_offload_priority() returned an error.
--- net/netfilter/nf_tables_api.c | 1 + 1 file changed, 1 insertion(+)
net/netfilter/nf_tables_api.c +1 -0
@@ -2148,6 +2148,7 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,if (err <0 ) {nft_chain_release_hook (&hook);kfree (basechain); +free_percpu (stats);return err; }if (stats)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 102/148 netfilter: ebtables: fix memory leak when blob is malformed
In reply to Greg Kroah-HartmanFrom: Florian Westphal <[email protected]>
[ Upstream commit 62ce44c4fff947eebdf10bb582267e686e6835c9 ]
The bug fix was incomplete, it "replaced" crash with a memory leak. The old code had an assignment to "ret" embedded into the conditional, restore this.
--- net/bridge/netfilter/ebtables.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/bridge/netfilter/ebtables.c +3 -1
@@ -1040,8 +1040,10 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl, goto free_iterate; } -if (repl->valid_hooks != t->valid_hooks) +if (repl->valid_hooks != t->valid_hooks) { + ret = -EINVAL ; goto free_unlock; + }if (repl->num_counters && repl->num_counters != t->private->nentries) { ret = -EINVAL ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 103/148 net: ravb: Fix PHY state warning splat during system resume
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 4924c0cdce75575295f8fa682851fb8e5d619dd2 ]
Since commit 744d23c71af39c7d ("net: phy: Warn about incorrect mdio_bus_phy_resume() state"), a warning splat is printed during system resume with Wake-on-LAN disabled:
WARNING: CPU: 0 PID: 1197 at drivers/net/phy/phy_device.c:323 mdio_bus_phy_resume+0xbc/0xc8
As the Renesas Ethernet AVB driver already calls phy_{stop,start}() in its suspend/resume callbacks, it is sufficient to just mark the MAC responsible for managing the power state of the PHY.
--- drivers/net/ethernet/renesas/ravb_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/renesas/ravb_main.c +2 -0
@@ -1115,6 +1115,8 @@ static int ravb_phy_init(struct net_device *ndev)phy_remove_link_mode (phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);phy_remove_link_mode (phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT); +/* Indicate that the MAC is responsible for managing PHY PM */ + phydev->mac_managed_pm = true;phy_attached_info (phydev);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 104/148 net: sh_eth: Fix PHY state warning splat during system resume
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 6a1dbfefdae4f7809b3e277cc76785dac0ac1cd0 ]
Since commit 744d23c71af39c7d ("net: phy: Warn about incorrect mdio_bus_phy_resume() state"), a warning splat is printed during system resume with Wake-on-LAN disabled:
WARNING: CPU: 0 PID: 626 at drivers/net/phy/phy_device.c:323 mdio_bus_phy_resume+0xbc/0xe4
As the Renesas SuperH Ethernet driver already calls phy_{stop,start}() in its suspend/resume callbacks, it is sufficient to just mark the MAC responsible for managing the power state of the PHY.
--- drivers/net/ethernet/renesas/sh_eth.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/renesas/sh_eth.c +2 -0
@@ -2033,6 +2033,8 @@ static int sh_eth_phy_init(struct net_device *ndev) } } +/* Indicate that the MAC is responsible for managing PHY PM */ + phydev->mac_managed_pm = true;phy_attached_info (phydev);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 105/148 can: gs_usb: gs_can_open(): fix race dev->can.state condition
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
[ Upstream commit 5440428b3da65408dba0241985acb7a05258b85e ]
The dev->can.state is set to CAN_STATE_ERROR_ACTIVE, after the device has been started. On busy networks the CAN controller might receive CAN frame between and go into an error state before the dev->can.state is assigned.
Assign dev->can.state before starting the controller to close the race window.
--- drivers/net/can/usb/gs_usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/can/usb/gs_usb.c +2 -2
@@ -680,6 +680,7 @@ static int gs_can_open(struct net_device *netdev) flags |=GS_CAN_MODE_TRIPLE_SAMPLE ;/* finally start device */ + dev->can.state =CAN_STATE_ERROR_ACTIVE ; dm->mode =cpu_to_le32 (GS_CAN_MODE_START ); dm->flags =cpu_to_le32 (flags); rc = usb_control_msg(interface_to_usbdev(dev->iface),
@@ -696,13 +697,12 @@ static int gs_can_open(struct net_device *netdev)if (rc <0 ) {netdev_err (netdev,"Couldn't start device (err=%d)\n" , rc);kfree (dm); + dev->can.state =CAN_STATE_STOPPED ;return rc; }kfree (dm); - dev->can.state =CAN_STATE_ERROR_ACTIVE ; - parent->active_channels++;if (!(dev->can.ctrlmode &CAN_CTRLMODE_LISTENONLY ))netif_start_queue (netdev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 106/148 perf stat: Fix BPF program section name
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit 0d77326c3369e255715ed2440a78894ccc98dd69 ]
It seems the recent libbpf got more strict about the section name. I'm seeing a failure like this:
$ sudo ./perf stat -a --bpf-counters --for-each-cgroup ^. sleep 1 libbpf: prog 'on_cgrp_switch': missing BPF prog type, check ELF section name 'perf_events' libbpf: prog 'on_cgrp_switch': failed to load: -22 libbpf: failed to load object 'bperf_cgroup_bpf' libbpf: failed to load BPF skeleton 'bperf_cgroup_bpf': -22 Failed to load cgroup skeleton
The section name should be 'perf_event' (without the trailing 's'). Although it's related to the libbpf change, it'd be better fix the section name in the first place.
--- tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/bpf_skel/bperf_cgroup.bpf.c +1 -1
@@ -176,7 +176,7 @@ static int bperf_cgroup_count(void) }// This will be attached to cgroup-switches event for each cpu -SEC("perf_events") +SEC("perf_event")int BPF_PROG (on_cgrp_switch ) {return bperf_cgroup_count ();
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 107/148 perf jit: Include program header in ELF files
In reply to Greg Kroah-HartmanFrom: Lieven Hey <[email protected]>
[ Upstream commit babd04386b1df8c364cdaa39ac0e54349502e1e5 ]
The missing header makes it hard for programs like elfutils to open these files.
--- tools/perf/util/genelf.c | 14 ++++++++++++++ tools/perf/util/genelf.h | 4 ++++ 2 files changed, 18 insertions(+)
tools/perf/util/genelf.c +14 -0
@@ -251,6 +251,7 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,Elf_Data *d;Elf_Scn *scn;Elf_Ehdr *ehdr; +Elf_Phdr *phdr;Elf_Shdr *shdr;uint64_t eh_frame_base_offset;char *strsym =NULL ;
@@ -285,6 +286,19 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym, ehdr->e_version =EV_CURRENT ; ehdr->e_shstrndx= unwinding ?4 :2 ;/* shdr index for section name */ +/* +* setup program header +*/ + phdr =elf_newphdr (e,1 ); + phdr[0 ].p_type =PT_LOAD ; + phdr[0 ].p_offset =0 ; + phdr[0 ].p_vaddr =0 ; + phdr[0 ].p_paddr =0 ; + phdr[0 ].p_filesz = csize; + phdr[0 ].p_memsz = csize; + phdr[0 ].p_flags =PF_X |PF_R ; + phdr[0 ].p_align =8 ; +/* * setup text section */
tools/perf/util/genelf.h +4 -0
@@ -50,8 +50,10 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent#if GEN_ELF_CLASS ==ELFCLASS64 #define elf_newehdr elf64_newehdr +#define elf_newphdr elf64_newphdr#define elf_getshdr elf64_getshdr#define Elf_Ehdr Elf64_Ehdr +#define Elf_Phdr Elf64_Phdr#define Elf_Shdr Elf64_Shdr#define Elf_Sym Elf64_Sym#define ELF_ST_TYPE (a) ELF64_ST_TYPE(a)
@@ -59,8 +61,10 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent#define ELF_ST_VIS (a) ELF64_ST_VISIBILITY(a)#else #define elf_newehdr elf32_newehdr +#define elf_newphdr elf32_newphdr#define elf_getshdr elf32_getshdr#define Elf_Ehdr Elf32_Ehdr +#define Elf_Phdr Elf32_Phdr#define Elf_Shdr Elf32_Shdr#define Elf_Sym Elf32_Sym#define ELF_ST_TYPE (a) ELF32_ST_TYPE(a)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 108/148 perf kcore_copy: Do not check /proc/modules is unchanged
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit 5b427df27b94aec1312cace48a746782a0925c53 ]
/proc/kallsyms and /proc/modules are compared before and after the copy in order to ensure no changes during the copy.
However /proc/modules also might change due to reference counts changing even though that does not make any difference.
Any modules loaded or unloaded should be visible in changes to kallsyms, so it is not necessary to check /proc/modules also anyway.
Remove the comparison checking that /proc/modules is unchanged.
--- tools/perf/util/symbol-elf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
tools/perf/util/symbol-elf.c +2 -5
@@ -2091,8 +2091,8 @@ static int kcore_copy__compare_file(const char *from_dir, const char *to_dir,* unusual. One significant peculiarity is that the mapping (start -> pgoff) * is not the same for the kernel map and the modules map. That happens because * the data is copied adjacently whereas the original kcore has gaps. Finally, -* kallsyms and modules files are compared with their copies to check that -* modules have not been loaded or unloaded while the copies were taking place. +* kallsyms file is compared with its copy to check that modules have not been +* loaded or unloaded while the copies were taking place. * * Return: %0 on success, %-1 on failure. */
@@ -2155,9 +2155,6 @@ int kcore_copy(const char *from_dir, const char *to_dir) goto out_extract_close; } -if (kcore_copy__compare_file (from_dir, to_dir,"modules" )) - goto out_extract_close; -if (kcore_copy__compare_file (from_dir, to_dir,"kallsyms" )) goto out_extract_close;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 109/148 perf tools: Honor namespace when synthesizing build-ids
In reply to Greg Kroah-HartmanFrom: Namhyung Kim <[email protected]>
[ Upstream commit 999e4eaa4b3691acf85d094836260ec4b66c74fd ]
It needs to enter the namespace before reading a file.
--- tools/perf/util/synthetic-events.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
tools/perf/util/synthetic-events.c +14 -3
@@ -367,13 +367,24 @@ static void perf_record_mmap2__read_build_id(struct perf_record_mmap2 *event, bool is_kernel) {struct build_id bid; +struct nsinfo *nsi; +struct nscookie nc;int rc; -if (is_kernel) +if (is_kernel) { rc =sysfs__read_build_id ("/sys/kernel/notes" , &bid); -else - rc =filename__read_build_id (event->filename, &bid) >0 ?0 :-1 ; + goto out; + } + + nsi =nsinfo__new (event->pid); +nsinfo__mountns_enter (nsi, &nc); + rc =filename__read_build_id (event->filename, &bid) >0 ?0 :-1 ; + +nsinfo__mountns_exit (&nc); +nsinfo__put (nsi); + +out:if (rc ==0 ) {memcpy (event->build_id, bid.data,sizeof (bid.data)); event->build_id_size = (u8 ) bid.size;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 110/148 drm/mediatek: dsi: Move mtk_dsi_stop() call back to mtk_dsi_poweroff()
In reply to Greg Kroah-HartmanFrom: Nícolas F. R. A. Prado <[email protected]>
[ Upstream commit 90144dd8b0d137d9e78ef34b3c418e51a49299ad ]
As the comment right before the mtk_dsi_stop() call advises, mtk_dsi_stop() should only be called after mtk_drm_crtc_atomic_disable(). That's because that function calls drm_crtc_wait_one_vblank(), which requires the vblank irq to be enabled.
Previously mtk_dsi_stop(), being in mtk_dsi_poweroff() and guarded by a refcount, would only be called at the end of mtk_drm_crtc_atomic_disable(), through the call to mtk_crtc_ddp_hw_fini(). Commit cde7e2e35c28 ("drm/mediatek: Separate poweron/poweroff from enable/disable and define new funcs") moved the mtk_dsi_stop() call to mtk_output_dsi_disable(), causing it to be called before mtk_drm_crtc_atomic_disable(), and consequently generating vblank timeout warnings during suspend.
Move the mtk_dsi_stop() call back to mtk_dsi_poweroff() so that we have a working vblank irq during mtk_drm_crtc_atomic_disable() and stop getting vblank timeout warnings.
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +10 -11
@@ -673,6 +673,16 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi)if (--dsi->refcount !=0 )return ; +/* +* mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since +* mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(), +* which needs irq for vblank, and mtk_dsi_stop() will disable irq. +* mtk_dsi_start() needs to be called in mtk_output_dsi_enable(), +* after dsi is fully set. +*/ +mtk_dsi_stop (dsi); + +mtk_dsi_switch_to_cmd_mode (dsi,VM_DONE_INT_FLAG ,500 );mtk_dsi_reset_engine (dsi);mtk_dsi_lane0_ulp_mode_enter (dsi);mtk_dsi_clk_ulp_mode_enter (dsi);
@@ -723,17 +733,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi)if (!dsi->enabled)return ; -/* -* mtk_dsi_stop() and mtk_dsi_start() is asymmetric, since -* mtk_dsi_stop() should be called after mtk_drm_crtc_atomic_disable(), -* which needs irq for vblank, and mtk_dsi_stop() will disable irq. -* mtk_dsi_start() needs to be called in mtk_output_dsi_enable(), -* after dsi is fully set. -*/ -mtk_dsi_stop (dsi); - -mtk_dsi_switch_to_cmd_mode (dsi,VM_DONE_INT_FLAG ,500 ); - dsi->enabled = false; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 111/148 net/smc: Stop the CLC flow if no link to map buffers on
In reply to Greg Kroah-HartmanFrom: Wen Gu <[email protected]>
[ Upstream commit e738455b2c6dcdab03e45d97de36476f93f557d2 ]
There might be a potential race between SMC-R buffer map and link group termination.
smc_smcr_terminate_all() | smc_connect_rdma()
--------------------------------------------------------------
| smc_conn_create()
for links in smcibdev |
schedule links down |
| smc_buf_create()
| \- smcr_buf_map_usable_links()
| \- no usable links found,
| (rmb->mr = NULL)
|
| smc_clc_send_confirm()
| \- access conn->rmb_desc->mr[]->rkey
| (panic)During reboot and IB device module remove, all links will be set down and no usable links remain in link groups. In such situation smcr_buf_map_usable_links() should return an error and stop the CLC flow accessing to uninitialized mr.
--- net/smc/smc_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/smc/smc_core.c +4 -1
@@ -1980,7 +1980,7 @@ static struct smc_buf_desc *smcr_new_buf_create(struct smc_link_group *lgr,static int smcr_buf_map_usable_links (struct smc_link_group *lgr,struct smc_buf_desc *buf_desc,bool is_rmb) { -int i, rc =0 ; +int i, rc =0 , cnt =0 ;/* protect against parallel link reconfiguration */ mutex_lock (&lgr->llc_conf_mutex);
@@ -1993,9 +1993,12 @@ static int smcr_buf_map_usable_links(struct smc_link_group *lgr, rc = -ENOMEM ; goto out; } + cnt++; } out:mutex_unlock (&lgr->llc_conf_mutex); +if (!rc && !cnt) + rc = -EINVAL ;return rc; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 112/148 bonding: fix NULL deref in bond_rr_gen_slave_id
In reply to Greg Kroah-HartmanFrom: Jonathan Toppins <[email protected]>
[ Upstream commit 0e400d602f46360752e4b32ce842dba3808e15e6 ]
Fix a NULL dereference of the struct bonding.rr_tx_counter member because if a bond is initially created with an initial mode != zero (Round Robin) the memory required for the counter is never created and when the mode is changed there is never any attempt to verify the memory is allocated upon switching modes.
This causes the following Oops on an aarch64 machine:
[ 334.686773] Unable to handle kernel paging request at virtual address ffff2c91ac905000
[ 334.694703] Mem abort info:
[ 334.697486] ESR = 0x0000000096000004
[ 334.701234] EC = 0x25: DABT (current EL), IL = 32 bits
[ 334.706536] SET = 0, FnV = 0
[ 334.709579] EA = 0, S1PTW = 0
[ 334.712719] FSC = 0x04: level 0 translation fault
[ 334.717586] Data abort info:
[ 334.720454] ISV = 0, ISS = 0x00000004
[ 334.724288] CM = 0, WnR = 0
[ 334.727244] swapper pgtable: 4k pages, 48-bit VAs, pgdp=000008044d662000
[ 334.733944] [ffff2c91ac905000] pgd=0000000000000000, p4d=0000000000000000
[ 334.740734] Internal error: Oops: 96000004 [#1] SMP
[ 334.745602] Modules linked in: bonding tls veth rfkill sunrpc arm_spe_pmu vfat fat acpi_ipmi ipmi_ssif ixgbe igb i40e mdio ipmi_devintf ipmi_msghandler arm_cmn arm_dsu_pmu cppc_cpufreq acpi_tad fuse zram crct10dif_ce ast ghash_ce sbsa_gwdt nvme drm_vram_helper drm_ttm_helper nvme_core ttm xgene_hwmon
[ 334.772217] CPU: 7 PID: 2214 Comm: ping Not tainted 6.0.0-rc4-00133-g64ae13ed4784 #4
[ 334.779950] Hardware name: GIGABYTE R272-P31-00/MP32-AR1-00, BIOS F18v (SCP: 1.08.20211002) 12/01/2021
[ 334.789244] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 334.796196] pc : bond_rr_gen_slave_id+0x40/0x124 [bonding]
[ 334.801691] lr : bond_xmit_roundrobin_slave_get+0x38/0xdc [bonding]
[ 334.807962] sp : ffff8000221733e0
[ 334.811265] x29: ffff8000221733e0 x28: ffffdbac8572d198 x27: ffff80002217357c
[ 334.818392] x26: 000000000000002a x25: ffffdbacb33ee000 x24: ffff07ff980fa000
[ 334.825519] x23: ffffdbacb2e398ba x22: ffff07ff98102000 x21: ffff07ff981029c0
[ 334.832646] x20: 0000000000000001 x19: ffff07ff981029c0 x18: 0000000000000014
[ 334.839773] x17: 0000000000000000 x16: ffffdbacb1004364 x15: 0000aaaabe2f5a62
[ 334.846899] x14: ffff07ff8e55d968 x13: ffff07ff8e55db30 x12: 0000000000000000
[ 334.854026] x11: ffffdbacb21532e8 x10: 0000000000000001 x9 : ffffdbac857178ec
[ 334.861153] x8 : ffff07ff9f6e5a28 x7 : 0000000000000000 x6 : 000000007c2b3742
[ 334.868279] x5 : ffff2c91ac905000 x4 : ffff2c91ac905000 x3 : ffff07ff9f554400
[ 334.875406] x2 : ffff2c91ac905000 x1 : 0000000000000001 x0 : ffff07ff981029c0
[ 334.882532] Call trace:
[ 334.884967] bond_rr_gen_slave_id+0x40/0x124 [bonding]
[ 334.890109] bond_xmit_roundrobin_slave_get+0x38/0xdc [bonding]
[ 334.896033] __bond_start_xmit+0x128/0x3a0 [bonding]
[ 334.901001] bond_start_xmit+0x54/0xb0 [bonding]
[ 334.905622] dev_hard_start_xmit+0xb4/0x220
[ 334.909798] __dev_queue_xmit+0x1a0/0x720
[ 334.913799] arp_xmit+0x3c/0xbc
[ 334.916932] arp_send_dst+0x98/0xd0
[ 334.920410] arp_solicit+0xe8/0x230
[ 334.923888] neigh_probe+0x60/0xb0
[ 334.927279] __neigh_event_send+0x3b0/0x470
[ 334.931453] neigh_resolve_output+0x70/0x90
[ 334.935626] ip_finish_output2+0x158/0x514
[ 334.939714] __ip_finish_output+0xac/0x1a4
[ 334.943800] ip_finish_output+0x40/0xfc
[ 334.947626] ip_output+0xf8/0x1a4
[ 334.950931] ip_send_skb+0x5c/0x100
[ 334.954410] ip_push_pending_frames+0x3c/0x60
[ 334.958758] raw_sendmsg+0x458/0x6d0
[ 334.962325] inet_sendmsg+0x50/0x80
[ 334.965805] sock_sendmsg+0x60/0x6c
[ 334.969286] __sys_sendto+0xc8/0x134
[ 334.972853] __arm64_sys_sendto+0x34/0x4c
[ 334.976854] invoke_syscall+0x78/0x100
[ 334.980594] el0_svc_common.constprop.0+0x4c/0xf4
[ 334.985287] do_el0_svc+0x38/0x4c
[ 334.988591] el0_svc+0x34/0x10c
[ 334.991724] el0t_64_sync_handler+0x11c/0x150
[ 334.996072] el0t_64_sync+0x190/0x194
[ 334.999726] Code: b9001062 f9403c02 d53cd044 8b040042 (b8210040)
[ 335.005810] ---[ end trace 0000000000000000 ]---
[ 335.010416] Kernel panic - not syncing: Oops: Fatal exception in interrupt
[ 335.017279] SMP: stopping secondary CPUs
[ 335.021374] Kernel Offset: 0x5baca8eb0000 from 0xffff800008000000
[ 335.027456] PHYS_OFFSET: 0x80000000
[ 335.030932] CPU features: 0x0000,0085c029,19805c82
[ 335.035713] Memory Limit: none
[ 335.038756] Rebooting in 180 seconds..The fix is to allocate the memory in bond_open() which is guaranteed to be called before any packets are processed.
--- drivers/net/bonding/bond_main.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/net/bonding/bond_main.c +6 -9
@@ -3930,6 +3930,12 @@ static int bond_open(struct net_device *bond_dev)struct list_head *iter;struct slave *slave; +if (BOND_MODE (bond) ==BOND_MODE_ROUNDROBIN && !bond->rr_tx_counter) { + bond->rr_tx_counter =alloc_percpu (u32); +if (!bond->rr_tx_counter) +return -ENOMEM ; + } +/* reset slave->backup and slave->inactive */ if (bond_has_slaves (bond)) {bond_for_each_slave (bond, slave, iter) {
@@ -5907,15 +5913,6 @@ static int bond_init(struct net_device *bond_dev)if (!bond->wq)return -ENOMEM ; -if (BOND_MODE (bond) ==BOND_MODE_ROUNDROBIN ) { - bond->rr_tx_counter =alloc_percpu (u32); -if (!bond->rr_tx_counter) { -destroy_workqueue (bond->wq); - bond->wq =NULL ; -return -ENOMEM ; - } - } -spin_lock_init (&bond->stats_lock);netdev_lockdep_set_classes (bond_dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 113/148 net: sunhme: Fix packet reception for len < RX_COPY_THRESHOLD
In reply to Greg Kroah-HartmanFrom: Sean Anderson <[email protected]>
[ Upstream commit 878e2405710aacfeeb19364c300f38b7a9abfe8f ]
There is a separate receive path for small packets (under 256 bytes). Instead of allocating a new dma-capable skb to be used for the next packet, this path allocates a skb and copies the data into it (reusing the existing sbk for the next packet). There are two bytes of junk data at the beginning of every packet. I believe these are inserted in order to allow aligned DMA and IP headers. We skip over them using skb_reserve. Before copying over the data, we must use a barrier to ensure we see the whole packet. The current code only synchronizes len bytes, starting from the beginning of the packet, including the junk bytes. However, this leaves off the final two bytes in the packet. Synchronize the whole packet.
To reproduce this problem, ping a HME with a payload size between 17 and 214
$ ping -s 17 <hme_address>
which will complain rather loudly about the data mismatch. Small packets (below 60 bytes on the wire) do not have this issue. I suspect this is related to the padding added to increase the minimum packet size.
--- drivers/net/ethernet/sun/sunhme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/sun/sunhme.c +2 -2
@@ -2039,9 +2039,9 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)skb_reserve (copy_skb,2 );skb_put (copy_skb, len); -dma_sync_single_for_cpu (hp->dma_dev, dma_addr, len,DMA_FROM_DEVICE ); +dma_sync_single_for_cpu (hp->dma_dev, dma_addr, len +2 ,DMA_FROM_DEVICE );skb_copy_from_linear_data (skb, copy_skb->data, len); -dma_sync_single_for_device (hp->dma_dev, dma_addr, len,DMA_FROM_DEVICE ); +dma_sync_single_for_device (hp->dma_dev, dma_addr, len +2 ,DMA_FROM_DEVICE );/* Reuse original ring buffer. */ hme_write_rxd(hp, this, (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 114/148 net: sched: fix possible refcount leak in tc_new_tfilter()
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
[ Upstream commit c2e1cfefcac35e0eea229e148c8284088ce437b5 ]
tfilter_put need to be called to put the refount got by tp->ops->get to avoid possible refcount leak when chain->tmplt_ops != NULL and chain->tmplt_ops != tp->ops.
--- net/sched/cls_api.c | 1 + 1 file changed, 1 insertion(+)
net/sched/cls_api.c +1 -0
@@ -2117,6 +2117,7 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n, }if (chain->tmplt_ops && chain->tmplt_ops != tp->ops) { +tfilter_put (tp, fh);NL_SET_ERR_MSG (extack,"Chain template is set to a different filter kind" ); err = -EINVAL ; goto errout;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 115/148 bnxt: prevent skb UAF after handing over to PTP worker
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit c31f26c8f69f776759cbbdfb38e40ea91aa0dd65 ]
When reading the timestamp is required bnxt_tx_int() hands over the ownership of the completed skb to the PTP worker. The skb should not be used afterwards, as the worker may run before the rest of our code and free the skb, leading to a use-after-free.
Since dev_kfree_skb_any() accepts NULL make the loss of ownership more obvious and set skb to NULL.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -5
@@ -709,7 +709,6 @@ static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts)for (i =0 ; i < nr_pkts; i++) {struct bnxt_sw_tx_bd *tx_buf; -bool compl_deferred = false;struct sk_buff *skb;int j, last;
@@ -718,6 +717,8 @@ static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts) skb = tx_buf->skb; tx_buf->skb =NULL ; + tx_bytes += skb->len; +if (tx_buf->is_push) { tx_buf->is_push =0 ; goto next_tx_int;
@@ -738,8 +739,9 @@ static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts) }if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_IN_PROGRESS )) {if (bp->flags &BNXT_FLAG_CHIP_P5 ) { +/* PTP worker takes ownership of the skb */ if (!bnxt_get_tx_ts_p5 (bp, skb)) - compl_deferred = true; + skb =NULL ;else atomic_inc (&bp->ptp_cfg->tx_avail); }
@@ -748,9 +750,7 @@ static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts) next_tx_int: cons =NEXT_TX (cons); - tx_bytes += skb->len; -if (!compl_deferred) -dev_kfree_skb_any (skb); +dev_kfree_skb_any (skb); }netdev_tx_completed_queue (txq, nr_pkts, tx_bytes);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 116/148 selftests: forwarding: add shebang for sch_red.sh
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit 83e4b196838d90799a8879e5054a3beecf9ed256 ]
RHEL/Fedora RPM build checks are stricter, and complain when executable files don't have a shebang line, e.g.
*** WARNING: ./kselftests/net/forwarding/sch_red.sh is executable but has no shebang, removing executable bit
Fix it by adding shebang line.
--- tools/testing/selftests/net/forwarding/sch_red.sh | 1 + 1 file changed, 1 insertion(+)
tools/testing/selftests/net/forwarding/sch_red.sh +1 -0
@@ -1,3 +1,4 @@ +#!/bin/bash # SPDX-License-Identifier: GPL-2.0 # This test sends one stream of traffic from H1 through a TBF shaper, to a RED
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 117/148 KVM: x86/mmu: Fold rmap_recycle into rmap_add
In reply to Greg Kroah-HartmanFrom: David Matlack <[email protected]>
[ Upstream commit 68be1306caea8948738cab04014ca4506b590d38 ]
Consolidate rmap_recycle and rmap_add into a single function since they are only ever called together (and only from one place). This has a nice side effect of eliminating an extra kvm_vcpu_gfn_to_memslot(). In addition it makes mmu_set_spte(), which is a very long function, a little shorter.
No functional change intended.
Message-Id: <[email protected]>
Stable-dep-of: 604f533262ae ("KVM: x86/mmu: add missing update to max_mmu_rmap_size")
--- arch/x86/kvm/mmu/mmu.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-)
arch/x86/kvm/mmu/mmu.c +14 -26
@@ -1071,20 +1071,6 @@ static bool rmap_can_add(struct kvm_vcpu *vcpu)return kvm_mmu_memory_cache_nr_free_objects (mc); } -static int rmap_add (struct kvm_vcpu *vcpu,u64 *spte,gfn_t gfn) -{ -struct kvm_memory_slot *slot; -struct kvm_mmu_page *sp; -struct kvm_rmap_head *rmap_head; - - sp =sptep_to_sp (spte); -kvm_mmu_page_set_gfn (sp, spte - sp->spt, gfn); - slot =kvm_vcpu_gfn_to_memslot (vcpu, gfn); - rmap_head =gfn_to_rmap (gfn, sp->role.level, slot); -return pte_list_add (vcpu, spte, rmap_head); -} - -static void rmap_remove (struct kvm *kvm,u64 *spte) {struct kvm_memslots *slots;
@@ -1097,9 +1083,9 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) gfn =kvm_mmu_page_get_gfn (sp, spte - sp->spt);/* -* Unlike rmap_add and rmap_recycle, rmap_remove does not run in the -* context of a vCPU so have to determine which memslots to use based -* on context information in sp->role. +* Unlike rmap_add, rmap_remove does not run in the context of a vCPU +* so we have to determine which memslots to use based on context +* information in sp->role. */ slots =kvm_memslots_for_spte_role (kvm, sp->role);
@@ -1639,19 +1625,24 @@ static bool kvm_test_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,#define RMAP_RECYCLE_THRESHOLD 1000 -static void rmap_recycle (struct kvm_vcpu *vcpu,u64 *spte,gfn_t gfn) +static void rmap_add (struct kvm_vcpu *vcpu,u64 *spte,gfn_t gfn) {struct kvm_memory_slot *slot; -struct kvm_rmap_head *rmap_head;struct kvm_mmu_page *sp; +struct kvm_rmap_head *rmap_head; +int rmap_count; sp =sptep_to_sp (spte); +kvm_mmu_page_set_gfn (sp, spte - sp->spt, gfn); slot =kvm_vcpu_gfn_to_memslot (vcpu, gfn); rmap_head =gfn_to_rmap (gfn, sp->role.level, slot); + rmap_count =pte_list_add (vcpu, spte, rmap_head); -kvm_unmap_rmapp (vcpu->kvm, rmap_head,NULL , gfn, sp->role.level,__pte (0 )); -kvm_flush_remote_tlbs_with_address (vcpu->kvm, sp->gfn, -KVM_PAGES_PER_HPAGE (sp->role.level)); +if (rmap_count >RMAP_RECYCLE_THRESHOLD ) { +kvm_unmap_rmapp (vcpu->kvm, rmap_head,NULL , gfn, sp->role.level,__pte (0 )); +kvm_flush_remote_tlbs_with_address ( + vcpu->kvm, sp->gfn,KVM_PAGES_PER_HPAGE (sp->role.level)); + } }bool kvm_age_gfn (struct kvm *kvm,struct kvm_gfn_range *range)
@@ -2718,7 +2709,6 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, bool host_writable) {int was_rmapped =0 ; -int rmap_count;int set_spte_ret;int ret =RET_PF_FIXED ;bool flush = false;
@@ -2778,9 +2768,7 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep,if (!was_rmapped) {kvm_update_page_stats (vcpu->kvm, level,1 ); - rmap_count =rmap_add (vcpu, sptep, gfn); -if (rmap_count >RMAP_RECYCLE_THRESHOLD ) -rmap_recycle (vcpu, sptep, gfn); +rmap_add (vcpu, sptep, gfn); }return ret;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 118/148 serial: fsl_lpuart: Reset prior to registration
In reply to Greg Kroah-HartmanFrom: Lukas Wunner <[email protected]>
commit 60f361722ad2ae5ee667d0b0545d40c42f754daf upstream.
Since commit bd5305dcabbc ("tty: serial: fsl_lpuart: do software reset for imx7ulp and imx8qxp"), certain i.MX UARTs are reset after they've already been registered. Register state may thus be clobbered after user space has begun to open and access the UART.
Avoid by performing the reset prior to registration.
--- drivers/tty/serial/fsl_lpuart.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/tty/serial/fsl_lpuart.c +5 -4
@@ -2726,14 +2726,15 @@ static int lpuart_probe(struct platform_ lpuart_reg.cons =LPUART_CONSOLE ; handler = lpuart_int; } - ret =uart_add_one_port (&lpuart_reg, &sport->port); -if (ret) - goto failed_attach_port; ret =lpuart_global_reset (sport);if (ret) goto failed_reset; + ret =uart_add_one_port (&lpuart_reg, &sport->port); +if (ret) + goto failed_attach_port; + ret =uart_get_rs485_mode (&sport->port);if (ret) goto failed_get_rs485;
@@ -2756,9 +2757,9 @@ static int lpuart_probe(struct platform_ failed_irq_request: failed_get_rs485: -failed_reset:uart_remove_one_port (&lpuart_reg, &sport->port); failed_attach_port: +failed_reset:lpuart_disable_clks (sport);return ret; }
Greg Kroah-Hartman
maintainerPATCH 119/148 serial: Create uart_xmit_advance()
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
commit e77cab77f2cb3a1ca2ba8df4af45bb35617ac16d upstream.
A very common pattern in the drivers is to advance xmit tail index and do bookkeeping of Tx'ed characters. Create uart_xmit_advance() to handle it.
--- include/linux/serial_core.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/linux/serial_core.h +17 -0
@@ -300,6 +300,23 @@ struct uart_state {/* number of characters left in xmit buffer before we ask for more */ #define WAKEUP_CHARS 256 +/** +* uart_xmit_advance - Advance xmit buffer and account Tx'ed chars +* @up: uart_port structure describing the port +* @chars: number of characters sent +* +* This function advances the tail of circular xmit buffer by the number of +* @chars transmitted and handles accounting of transmitted bytes (into +* @up's icount.tx). +*/ +static inline void uart_xmit_advance (struct uart_port *up,unsigned int chars) +{ +struct circ_buf *xmit = &up->state->xmit; + + xmit->tail = (xmit->tail + chars) & (UART_XMIT_SIZE -1 ); + up->icount.tx += chars; +} +struct module ;struct tty_driver ;
Greg Kroah-Hartman
maintainerPATCH 120/148 serial: tegra: Use uart_xmit_advance(), fixes icount.tx accounting
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
commit 754f68044c7dd6c52534ba3e0f664830285c4b15 upstream.
DMA complete & stop paths did not correctly account Tx'ed characters into icount.tx. Using uart_xmit_advance() fixes the problem.
--- drivers/tty/serial/serial-tegra.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/tty/serial/serial-tegra.c +2 -3
@@ -525,7 +525,7 @@ static void tegra_uart_tx_dma_complete(v count = tup->tx_bytes_requested - state.residue;async_tx_ack (tup->tx_dma_desc);spin_lock_irqsave (&tup->uport.lock, flags); - xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE -1 ); +uart_xmit_advance (&tup->uport, count); tup->tx_in_progress =0 ;if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )uart_write_wakeup (&tup->uport);
@@ -613,7 +613,6 @@ static unsigned int tegra_uart_tx_empty(static void tegra_uart_stop_tx (struct uart_port *u) {struct tegra_uart_port *tup =to_tegra_uport (u); -struct circ_buf *xmit = &tup->uport.state->xmit;struct dma_tx_state state;unsigned int count;
@@ -624,7 +623,7 @@ static void tegra_uart_stop_tx(struct uadmaengine_tx_status (tup->tx_dma_chan, tup->tx_cookie, &state); count = tup->tx_bytes_requested - state.residue;async_tx_ack (tup->tx_dma_desc); - xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE -1 ); +uart_xmit_advance (&tup->uport, count); tup->tx_in_progress =0 ; }
Greg Kroah-Hartman
maintainerPATCH 121/148 serial: tegra-tcu: Use uart_xmit_advance(), fixes icount.tx accounting
In reply to Greg Kroah-HartmanFrom: Ilpo Järvinen <[email protected]>
commit 1d10cd4da593bc0196a239dcc54dac24b6b0a74e upstream.
Tx'ing does not correctly account Tx'ed characters into icount.tx. Using uart_xmit_advance() fixes the problem.
--- drivers/tty/serial/tegra-tcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/serial/tegra-tcu.c +1 -1
@@ -101,7 +101,7 @@ static void tegra_tcu_uart_start_tx(strubreak ;tegra_tcu_write (tcu, &xmit->buf[xmit->tail], count); - xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE -1 ); +uart_xmit_advance (port, count); }uart_write_wakeup (port);
Greg Kroah-Hartman
maintainerPATCH 122/148 s390/dasd: fix Oops in dasd_alias_get_start_dev due to missing pavgroup
In reply to Greg Kroah-HartmanFrom: Stefan Haberland <[email protected]>
commit db7ba07108a48c0f95b74fabbfd5d63e924f992d upstream.
Fix Oops in dasd_alias_get_start_dev() function caused by the pavgroup pointer being NULL.
The pavgroup pointer is checked on the entrance of the function but without the lcu->lock being held. Therefore there is a race window between dasd_alias_get_start_dev() and _lcu_update() which sets pavgroup to NULL with the lcu->lock held.
Fix by checking the pavgroup pointer with lcu->lock held.
--- drivers/s390/block/dasd_alias.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/s390/block/dasd_alias.c +7 -2
@@ -675,12 +675,12 @@ int dasd_alias_remove_device(struct dasdstruct dasd_device *dasd_alias_get_start_dev (struct dasd_device *base_device) {struct dasd_eckd_private *alias_priv, *private = base_device->private; -struct alias_pav_group *group = private->pavgroup;struct alias_lcu *lcu = private->lcu;struct dasd_device *alias_device; +struct alias_pav_group *group;unsigned long flags; -if (!group || !lcu) +if (!lcu)return NULL ;if (lcu->pav ==NO_PAV || lcu->flags & (NEED_UAC_UPDATE |UPDATE_PENDING ))
@@ -697,6 +697,11 @@ struct dasd_device *dasd_alias_get_start }spin_lock_irqsave (&lcu->lock, flags); + group = private->pavgroup; +if (!group) { +spin_unlock_irqrestore (&lcu->lock, flags); +return NULL ; + } alias_device = group->next;if (!alias_device) {if (list_empty (&group->aliaslist)) {
Greg Kroah-Hartman
maintainerPATCH 123/148 drm/amd/amdgpu: fixing read wrong pf2vf data in SRIOV
In reply to Greg Kroah-HartmanFrom: Jingwen Chen <[email protected]>
commit 9a458402fb69bda886aa6cbe067311b6e3d9c52a upstream.
[Why]
This fixes 892deb48269c ("drm/amdgpu: Separate vf2pf work item init from virt data exchange"). we should read pf2vf data based at mman.fw_vram_usage_va after gmcsw_init. commit 892deb48269c breaks this logic.
[How]
calling amdgpu_virt_exchange_data in amdgpu_virt_init_data_exchange to set the right base in the right sequence.
v2:
call amdgpu_virt_init_data_exchange after gmc sw_init to make data exchange workqueue run
v3:
clean up the code logic
v4:
add some comment and make the code more readable
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1 -1
@@ -2433,7 +2433,7 @@ static int amdgpu_device_ip_init(struct }if (amdgpu_sriov_vf (adev)) -amdgpu_virt_exchange_data (adev); +amdgpu_virt_init_data_exchange (adev); r =amdgpu_ib_pool_init (adev);if (r) {
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +7 -13
@@ -618,20 +618,20 @@ void amdgpu_virt_init_data_exchange(stru adev->virt.fw_reserve.p_vf2pf =NULL ; adev->virt.vf2pf_update_interval_ms =0 ; -if (adev->bios !=NULL ) { - adev->virt.vf2pf_update_interval_ms =2000 ; +if (adev->mman.fw_vram_usage_va !=NULL ) { +/* go through this logic in ip_init and reset to init workqueue*/ +amdgpu_virt_exchange_data (adev); +INIT_DELAYED_WORK (&adev->virt.vf2pf_work, amdgpu_virt_update_vf2pf_work_item); +schedule_delayed_work (&(adev->virt.vf2pf_work),msecs_to_jiffies (adev->virt.vf2pf_update_interval_ms)); + }else if (adev->bios !=NULL ) { +/* got through this logic in early init stage to get necessary flags, e.g. rlcg_acc related*/ adev->virt.fw_reserve.p_pf2vf = (struct amd_sriov_msg_pf2vf_info_header *) (adev->bios + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB <<10 ));amdgpu_virt_read_pf2vf_data (adev); } - -if (adev->virt.vf2pf_update_interval_ms !=0 ) { -INIT_DELAYED_WORK (&adev->virt.vf2pf_work, amdgpu_virt_update_vf2pf_work_item); -schedule_delayed_work (&(adev->virt.vf2pf_work),msecs_to_jiffies (adev->virt.vf2pf_update_interval_ms)); - } }
@@ -667,12 +667,6 @@ void amdgpu_virt_exchange_data(struct amif (adev->virt.ras_init_done)amdgpu_virt_add_bad_page (adev, bp_block_offset, bp_block_size); } - }else if (adev->bios !=NULL ) { - adev->virt.fw_reserve.p_pf2vf = - (struct amd_sriov_msg_pf2vf_info_header *) - (adev->bios + (AMD_SRIOV_MSG_PF2VF_OFFSET_KB <<10 )); - -amdgpu_virt_read_pf2vf_data (adev); } }
Greg Kroah-Hartman
maintainerPATCH 124/148 Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit f0880e2cb7e1f8039a048fdd01ce45ab77247221 ]
Passed through PCI device sometimes misbehave on Gen1 VMs when Hyper-V DRM driver is also loaded. Looking at IOMEM assignment, we can see e.g.
$ cat /proc/iomem
...
f8000000-fffbffff : PCI Bus 0000:00
f8000000-fbffffff : 0000:00:08.0
f8000000-f8001fff : bb8c4f33-2ba2-4808-9f7f-02f3b4da22fe
...
fe0000000-fffffffff : PCI Bus 0000:00
fe0000000-fe07fffff : bb8c4f33-2ba2-4808-9f7f-02f3b4da22fe
fe0000000-fe07fffff : 2ba2:00:02.0
fe0000000-fe07fffff : mlx4_corethe interesting part is the 'f8000000' region as it is actually the VM's framebuffer:
$ lspci -v ... 0000:00:08.0 VGA compatible controller: Microsoft Corporation Hyper-V virtual VGA (prog-if 00 [VGA controller]) Flags: bus master, fast devsel, latency 0, IRQ 11 Memory at f8000000 (32-bit, non-prefetchable) [size=64M] ...
hv_vmbus: registering driver hyperv_drm
hyperv_drm 5620e0c7-8062-4dce-aeb7-520c7ef76171: [drm] Synthvid Version major 3, minor 5 hyperv_drm 0000:00:08.0: vgaarb: deactivate vga console
hyperv_drm 0000:00:08.0: BAR 0: can't reserve [mem 0xf8000000-0xfbffffff]
hyperv_drm 5620e0c7-8062-4dce-aeb7-520c7ef76171: [drm] Cannot request framebuffer, boot fb still active?
Note: "Cannot request framebuffer" is not a fatal error in hyperv_setup_gen1() as the code assumes there's some other framebuffer device there but we actually have some other PCI device (mlx4 in this case) config space there!
The problem appears to be that vmbus_allocate_mmio() can use dedicated framebuffer region to serve any MMIO request from any device. The semantics one might assume of a parameter named "fb_overlap_ok" aren't implemented because !fb_overlap_ok essentially has no effect. The existing semantics are really "prefer_fb_overlap". This patch implements the expected and needed semantics, which is to not allocate from the frame buffer space when !fb_overlap_ok.
Note, Gen2 VMs are usually unaffected by the issue because framebuffer region is already taken by EFI fb (in case kernel supports it) but Gen1 VMs may have this region unclaimed by the time Hyper-V PCI pass-through driver tries allocating MMIO space if Hyper-V DRM/FB drivers load after it. Devices can be brought up in any sequence so let's resolve the issue by always ignoring 'fb_mmio' region for non-FB requests, even if the region is unclaimed.
--- drivers/hv/vmbus_drv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/hv/vmbus_drv.c +9 -1
@@ -2340,7 +2340,7 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, bool fb_overlap_ok) {struct resource *iter, *shadow; -resource_size_t range_min, range_max, start; +resource_size_t range_min, range_max, start, end;const char *dev_n =dev_name (&device_obj->device);int retval;
@@ -2375,6 +2375,14 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, range_max = iter->end; start = (range_min + align -1 ) & ~(align -1 );for (; start + size -1 <= range_max; start += align) { + end = start + size -1 ; + +/* Skip the whole fb_mmio region if not fb_overlap_ok */ +if (!fb_overlap_ok && fb_mmio && + (((start >= fb_mmio->start) && (start <= fb_mmio->end)) || + ((end >= fb_mmio->start) && (end <= fb_mmio->end)))) +continue ; + shadow =__request_region (iter, start, size,NULL ,IORESOURCE_BUSY );if (!shadow)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 125/148 drm/gma500: Fix BUG: sleeping function called from invalid context errors
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 63e37a79f7bd939314997e29c2f5a9f0ef184281 ]
gma_crtc_page_flip() was holding the event_lock spinlock while calling crtc_funcs->mode_set_base() which takes ww_mutex.
The only reason to hold event_lock is to clear gma_crtc->page_flip_event on mode_set_base() errors.
Instead unlock it after setting gma_crtc->page_flip_event and on errors re-take the lock and clear gma_crtc->page_flip_event it it is still set.
This fixes the following WARN/stacktrace:
[ 512.122953] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:870 [ 512.123004] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 1253, name: gnome-shell [ 512.123031] preempt_count: 1, expected: 0 [ 512.123048] RCU nest depth: 0, expected: 0 [ 512.123066] INFO: lockdep is turned off. [ 512.123080] irq event stamp: 0 [ 512.123094] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [ 512.123134] hardirqs last disabled at (0): [<ffffffff8d0ec28c>] copy_process+0x9fc/0x1de0 [ 512.123176] softirqs last enabled at (0): [<ffffffff8d0ec28c>] copy_process+0x9fc/0x1de0 [ 512.123207] softirqs last disabled at (0): [<0000000000000000>] 0x0 [ 512.123233] Preemption disabled at: [ 512.123241] [<0000000000000000>] 0x0 [ 512.123275] CPU: 3 PID: 1253 Comm: gnome-shell Tainted: G W 5.19.0+ #1 [ 512.123304] Hardware name: Packard Bell dot s/SJE01_CT, BIOS V1.10 07/23/2013 [ 512.123323] Call Trace: [ 512.123346] <TASK> [ 512.123370] dump_stack_lvl+0x5b/0x77 [ 512.123412] __might_resched.cold+0xff/0x13a [ 512.123458] ww_mutex_lock+0x1e/0xa0 [ 512.123495] psb_gem_pin+0x2c/0x150 [gma500_gfx] [ 512.123601] gma_pipe_set_base+0x76/0x240 [gma500_gfx] [ 512.123708] gma_crtc_page_flip+0x95/0x130 [gma500_gfx] [ 512.123808] drm_mode_page_flip_ioctl+0x57d/0x5d0 [ 512.123897] ? drm_mode_cursor2_ioctl+0x10/0x10 [ 512.123936] drm_ioctl_kernel+0xa1/0x150 [ 512.123984] drm_ioctl+0x21f/0x420 [ 512.124025] ? drm_mode_cursor2_ioctl+0x10/0x10 [ 512.124070] ? rcu_read_lock_bh_held+0xb/0x60 [ 512.124104] ? lock_release+0x1ef/0x2d0 [ 512.124161] __x64_sys_ioctl+0x8d/0xd0 [ 512.124203] do_syscall_64+0x58/0x80 [ 512.124239] ? do_syscall_64+0x67/0x80 [ 512.124267] ? trace_hardirqs_on_prepare+0x55/0xe0 [ 512.124300] ? do_syscall_64+0x67/0x80 [ 512.124340] ? rcu_read_lock_sched_held+0x10/0x80 [ 512.124377] entry_SYSCALL_64_after_hwframe+0x63/0xcd [ 512.124411] RIP: 0033:0x7fcc4a70740f [ 512.124442] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00 [ 512.124470] RSP: 002b:00007ffda73f5390 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 512.124503] RAX: ffffffffffffffda RBX: 000055cc9e474500 RCX: 00007fcc4a70740f [ 512.124524] RDX: 00007ffda73f5420 RSI: 00000000c01864b0 RDI: 0000000000000009 [ 512.124544] RBP: 00007ffda73f5420 R08: 000055cc9c0b0cb0 R09: 0000000000000034 [ 512.124564] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000c01864b0 [ 512.124584] R13: 0000000000000009 R14: 000055cc9df484d0 R15: 000055cc9af5d0c0 [ 512.124647] </TASK>
--- drivers/gpu/drm/gma500/gma_display.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/gma500/gma_display.c +7 -4
@@ -529,15 +529,18 @@ int gma_crtc_page_flip(struct drm_crtc *crtc,WARN_ON (drm_crtc_vblank_get (crtc) !=0 ); gma_crtc->page_flip_event = event; +spin_unlock_irqrestore (&dev->event_lock, flags);/* Call this locked if we want an event at vblank interrupt. */ ret = crtc_funcs->mode_set_base (crtc, crtc->x, crtc->y, old_fb);if (ret) { - gma_crtc->page_flip_event =NULL ; -drm_crtc_vblank_put (crtc); +spin_lock_irqsave (&dev->event_lock, flags); +if (gma_crtc->page_flip_event) { + gma_crtc->page_flip_event =NULL ; +drm_crtc_vblank_put (crtc); + } +spin_unlock_irqrestore (&dev->event_lock, flags); } - -spin_unlock_irqrestore (&dev->event_lock, flags); }else { ret = crtc_funcs->mode_set_base (crtc, crtc->x, crtc->y, old_fb); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 126/148 gpio: ixp4xx: Make irqchip immutable
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit 94e9bc73d85aa6ecfe249e985ff57abe0ab35f34 ]
This turns the IXP4xx GPIO irqchip into an immutable irqchip, a bit different from the standard template due to being hierarchical.
Tested on the IXP4xx which uses drivers/ata/pata_ixp4xx_cf.c for a rootfs on compact flash with IRQs from this GPIO block to the CF ATA controller.
--- drivers/gpio/gpio-ixp4xx.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/gpio/gpio-ixp4xx.c +14 -3
@@ -67,6 +67,14 @@ static void ixp4xx_gpio_irq_ack(struct irq_data *d)__raw_writel (BIT (d->hwirq), g->base +IXP4XX_REG_GPIS ); } +static void ixp4xx_gpio_mask_irq (struct irq_data *d) +{ +struct gpio_chip *gc =irq_data_get_irq_chip_data (d); + +irq_chip_mask_parent (d); +gpiochip_disable_irq (gc, d->hwirq); +} +static void ixp4xx_gpio_irq_unmask (struct irq_data *d) {struct gpio_chip *gc =irq_data_get_irq_chip_data (d);
@@ -76,6 +84,7 @@ static void ixp4xx_gpio_irq_unmask(struct irq_data *d)if (!(g->irq_edge &BIT (d->hwirq)))ixp4xx_gpio_irq_ack (d); +gpiochip_enable_irq (gc, d->hwirq);irq_chip_unmask_parent (d); }
@@ -153,12 +162,14 @@ static int ixp4xx_gpio_irq_set_type(struct irq_data *d, unsigned int type)return irq_chip_set_type_parent (d,IRQ_TYPE_LEVEL_HIGH ); } -static struct irq_chip ixp4xx_gpio_irqchip = { +static const struct irq_chip ixp4xx_gpio_irqchip = { .name ="IXP4GPIO" , .irq_ack = ixp4xx_gpio_irq_ack, - .irq_mask = irq_chip_mask_parent, + .irq_mask = ixp4xx_gpio_mask_irq, .irq_unmask = ixp4xx_gpio_irq_unmask, .irq_set_type = ixp4xx_gpio_irq_set_type, + .flags =IRQCHIP_IMMUTABLE , +GPIOCHIP_IRQ_RESOURCE_HELPERS , }; static int ixp4xx_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
@@ -282,7 +293,7 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev) g->gc.owner =THIS_MODULE ; girq = &g->gc.irq; - girq->chip = &ixp4xx_gpio_irqchip; +gpio_irq_chip_set_chip (girq, &ixp4xx_gpio_irqchip); girq->fwnode = g->fwnode; girq->parent_domain = parent; girq->child_to_parent_hwirq = ixp4xx_gpio_child_to_parent_hwirq;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 127/148 drm/amd/pm: disable BACO entry/exit completely on several sienna cichlid cards
In reply to Greg Kroah-HartmanFrom: Guchun Chen <[email protected]>
[ Upstream commit 7c6fb61a400bf3218c6504cb2d48858f98822c9d ]
To avoid hardware intermittent failures.
--- .../gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +11 -0
@@ -358,6 +358,17 @@ static void sienna_cichlid_check_bxco_support(struct smu_context *smu) smu_baco->platform_support = (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; + +/* +* Disable BACO entry/exit completely on below SKUs to +* avoid hardware intermittent failures. +*/ +if (((adev->pdev->device ==0x73A1 ) && + (adev->pdev->revision ==0x00 )) || + ((adev->pdev->device ==0x73BF ) && + (adev->pdev->revision ==0xCF ))) + smu_baco->platform_support = false; + } }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 128/148 drm/amdgpu: use dirty framebuffer helper
In reply to Greg Kroah-HartmanFrom: Hamza Mahfooz <[email protected]>
[ Upstream commit 66f99628eb24409cb8feb5061f78283c8b65f820 ]
Currently, we aren't handling DRM_IOCTL_MODE_DIRTYFB. So, use drm_atomic_helper_dirtyfb() as the dirty callback in the amdgpu_fb_funcs struct.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +2 -0
@@ -35,6 +35,7 @@#include <linux/pci.h> #include <linux/pm_runtime.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_damage_helper.h> #include <drm/drm_edid.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_fb_helper.h>
@@ -490,6 +491,7 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector,static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { .destroy = drm_gem_fb_destroy, .create_handle = drm_gem_fb_create_handle, + .dirty = drm_atomic_helper_dirtyfb, }; uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 129/148 drm/amd/display: Limit user regamma to a valid value
In reply to Greg Kroah-HartmanFrom: Yao Wang1 <[email protected]>
[ Upstream commit 3601d620f22e37740cf73f8278eabf9f2aa19eb7 ]
[Why]
For HDR mode, we get total 512 tf_point and after switching to SDR mode we actually get 400 tf_point and the rest of points(401~512) still use dirty value from HDR mode. We should limit the rest of the points to max value.
[How]
Limit the value when coordinates_x.x > 1, just like what we do in translate_from_linear_space for other re-gamma build paths.
--- drivers/gpu/drm/amd/display/modules/color/color_gamma.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/display/modules/color/color_gamma.c +4 -0
@@ -1597,6 +1597,7 @@ static void interpolate_user_regamma(uint32_t hw_points_num,struct fixed31_32 lut2;struct fixed31_32 delta_lut;struct fixed31_32 delta_index; +const struct fixed31_32 one =dc_fixpt_from_int (1 ); i =0 ;/* fixed_pt library has problems handling too small values */
@@ -1625,6 +1626,9 @@ static void interpolate_user_regamma(uint32_t hw_points_num, }else hw_x = coordinates_x[i].x; +if (dc_fixpt_le (one, hw_x)) + hw_x = one; + norm_x =dc_fixpt_mul (norm_factor, hw_x); index =dc_fixpt_floor (norm_x);if (index <0 || index >255 )
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 130/148 drm/amd/display: Reduce number of arguments of dml31s CalculateWatermarksAndDRAMSpeedChangeSupport()
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 37934d4118e22bceb80141804391975078f31734 ]
Most of the arguments are identical between the two call sites and they can be accessed through the 'struct vba_vars_st' pointer. This reduces the total amount of stack space that dml31_ModeSupportAndSystemConfigurationFull() uses by 240 bytes with LLVM 16 (2216 -> 1976), helping clear up the following clang warning:
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c:3908:6: error: stack frame size (2216) exceeds limit (2048) in 'dml31_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than] void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
^
1 error generated.
--- .../dc/dml/dcn31/display_mode_vba_31.c | 248 ++++-------------- 1 file changed, 52 insertions(+), 196 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +52 -196
@@ -319,64 +319,28 @@ static void CalculateVupdateAndDynamicMetadataParameters(static void CalculateWatermarksAndDRAMSpeedChangeSupport (struct display_mode_lib *mode_lib,unsigned int PrefetchMode, -unsigned int NumberOfActivePlanes, -unsigned int MaxLineBufferLines, -unsigned int LineBufferSize, -unsigned int WritebackInterfaceBufferSize,double DCFCLK ,double ReturnBW, -bool SynchronizedVBlank, -unsigned int dpte_group_bytes[], -unsigned int MetaChunkSize,double UrgentLatency,double ExtraLatency, -double WritebackLatency, -double WritebackChunkSize,double SOCCLK , -double DRAMClockChangeLatency, -double SRExitTime, -double SREnterPlusExitTime, -double SRExitZ8Time, -double SREnterPlusExitZ8Time,double DCFCLKDeepSleep,unsigned int DETBufferSizeY[],unsigned int DETBufferSizeC[],unsigned int SwathHeightY[],unsigned int SwathHeightC[], -unsigned int LBBitPerPixel[],double SwathWidthY[],double SwathWidthC[], -double HRatio[], -double HRatioChroma[], -unsigned int vtaps[], -unsigned int VTAPsChroma[], -double VRatio[], -double VRatioChroma[], -unsigned int HTotal[], -double PixelClock[], -unsigned int BlendingAndTiming[],unsigned int DPPPerPlane[],double BytePerPixelDETY[],double BytePerPixelDETC[], -double DSTXAfterScaler[], -double DSTYAfterScaler[], -bool WritebackEnable[], -enum source_format_class WritebackPixelFormat[], -double WritebackDestinationWidth[], -double WritebackDestinationHeight[], -double WritebackSourceHeight[],bool UnboundedRequestEnabled,int unsigned CompressedBufferSizeInkByte,enum clock_change_support *DRAMClockChangeSupport, -double *UrgentWatermark, -double *WritebackUrgentWatermark, -double *DRAMClockChangeWatermark, -double *WritebackDRAMClockChangeWatermark,double *StutterExitWatermark,double *StutterEnterPlusExitWatermark,double *Z8StutterExitWatermark, -double *Z8StutterEnterPlusExitWatermark, -double *MinActiveDRAMClockChangeLatencySupported); +double *Z8StutterEnterPlusExitWatermark); static void CalculateDCFCLKDeepSleep( struct display_mode_lib *mode_lib,
@@ -3072,64 +3036,28 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerformanCalculateWatermarksAndDRAMSpeedChangeSupport ( mode_lib, PrefetchMode, - v->NumberOfActivePlanes, - v->MaxLineBufferLines, - v->LineBufferSize, - v->WritebackInterfaceBufferSize, v->DCFCLK, v->ReturnBW, - v->SynchronizedVBlank, - v->dpte_group_bytes, - v->MetaChunkSize, v->UrgentLatency, v->UrgentExtraLatency, - v->WritebackLatency, - v->WritebackChunkSize, v->SOCCLK, - v->DRAMClockChangeLatency, - v->SRExitTime, - v->SREnterPlusExitTime, - v->SRExitZ8Time, - v->SREnterPlusExitZ8Time, v->DCFCLKDeepSleep, v->DETBufferSizeY, v->DETBufferSizeC, v->SwathHeightY, v->SwathHeightC, - v->LBBitPerPixel, v->SwathWidthY, v->SwathWidthC, - v->HRatio, - v->HRatioChroma, - v->vtaps, - v->VTAPsChroma, - v->VRatio, - v->VRatioChroma, - v->HTotal, - v->PixelClock, - v->BlendingAndTiming, v->DPPPerPlane, v->BytePerPixelDETY, v->BytePerPixelDETC, - v->DSTXAfterScaler, - v->DSTYAfterScaler, - v->WritebackEnable, - v->WritebackPixelFormat, - v->WritebackDestinationWidth, - v->WritebackDestinationHeight, - v->WritebackSourceHeight, v->UnboundedRequestEnabled, v->CompressedBufferSizeInkByte, &DRAMClockChangeSupport, - &v->UrgentWatermark, - &v->WritebackUrgentWatermark, - &v->DRAMClockChangeWatermark, - &v->WritebackDRAMClockChangeWatermark, &v->StutterExitWatermark, &v->StutterEnterPlusExitWatermark, &v->Z8StutterExitWatermark, - &v->Z8StutterEnterPlusExitWatermark, - &v->MinActiveDRAMClockChangeLatencySupported); + &v->Z8StutterEnterPlusExitWatermark);for (k =0 ; k < v->NumberOfActivePlanes; ++k) {if (v->WritebackEnable[k] == true) {
@@ -5561,64 +5489,28 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lCalculateWatermarksAndDRAMSpeedChangeSupport ( mode_lib, v->PrefetchModePerState[i][j], - v->NumberOfActivePlanes, - v->MaxLineBufferLines, - v->LineBufferSize, - v->WritebackInterfaceBufferSize, v->DCFCLKState[i][j], v->ReturnBWPerState[i][j], - v->SynchronizedVBlank, - v->dpte_group_bytes, - v->MetaChunkSize, v->UrgLatency[i], v->ExtraLatency, - v->WritebackLatency, - v->WritebackChunkSize, v->SOCCLKPerState[i], - v->DRAMClockChangeLatency, - v->SRExitTime, - v->SREnterPlusExitTime, - v->SRExitZ8Time, - v->SREnterPlusExitZ8Time, v->ProjectedDCFCLKDeepSleep[i][j], v->DETBufferSizeYThisState, v->DETBufferSizeCThisState, v->SwathHeightYThisState, v->SwathHeightCThisState, - v->LBBitPerPixel, v->SwathWidthYThisState, v->SwathWidthCThisState, - v->HRatio, - v->HRatioChroma, - v->vtaps, - v->VTAPsChroma, - v->VRatio, - v->VRatioChroma, - v->HTotal, - v->PixelClock, - v->BlendingAndTiming, v->NoOfDPPThisState, v->BytePerPixelInDETY, v->BytePerPixelInDETC, - v->DSTXAfterScaler, - v->DSTYAfterScaler, - v->WritebackEnable, - v->WritebackPixelFormat, - v->WritebackDestinationWidth, - v->WritebackDestinationHeight, - v->WritebackSourceHeight, UnboundedRequestEnabledThisState, CompressedBufferSizeInkByteThisState, &v->DRAMClockChangeSupport[i][j], - &v->UrgentWatermark, - &v->WritebackUrgentWatermark, - &v->DRAMClockChangeWatermark, - &v->WritebackDRAMClockChangeWatermark, - &dummy, &dummy, &dummy, &dummy, - &v->MinActiveDRAMClockChangeLatencySupported); + &dummy); } }
@@ -5743,64 +5635,28 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lstatic void CalculateWatermarksAndDRAMSpeedChangeSupport (struct display_mode_lib *mode_lib,unsigned int PrefetchMode, -unsigned int NumberOfActivePlanes, -unsigned int MaxLineBufferLines, -unsigned int LineBufferSize, -unsigned int WritebackInterfaceBufferSize,double DCFCLK ,double ReturnBW, -bool SynchronizedVBlank, -unsigned int dpte_group_bytes[], -unsigned int MetaChunkSize,double UrgentLatency,double ExtraLatency, -double WritebackLatency, -double WritebackChunkSize,double SOCCLK , -double DRAMClockChangeLatency, -double SRExitTime, -double SREnterPlusExitTime, -double SRExitZ8Time, -double SREnterPlusExitZ8Time,double DCFCLKDeepSleep,unsigned int DETBufferSizeY[],unsigned int DETBufferSizeC[],unsigned int SwathHeightY[],unsigned int SwathHeightC[], -unsigned int LBBitPerPixel[],double SwathWidthY[],double SwathWidthC[], -double HRatio[], -double HRatioChroma[], -unsigned int vtaps[], -unsigned int VTAPsChroma[], -double VRatio[], -double VRatioChroma[], -unsigned int HTotal[], -double PixelClock[], -unsigned int BlendingAndTiming[],unsigned int DPPPerPlane[],double BytePerPixelDETY[],double BytePerPixelDETC[], -double DSTXAfterScaler[], -double DSTYAfterScaler[], -bool WritebackEnable[], -enum source_format_class WritebackPixelFormat[], -double WritebackDestinationWidth[], -double WritebackDestinationHeight[], -double WritebackSourceHeight[],bool UnboundedRequestEnabled,int unsigned CompressedBufferSizeInkByte,enum clock_change_support *DRAMClockChangeSupport, -double *UrgentWatermark, -double *WritebackUrgentWatermark, -double *DRAMClockChangeWatermark, -double *WritebackDRAMClockChangeWatermark,double *StutterExitWatermark,double *StutterEnterPlusExitWatermark,double *Z8StutterExitWatermark, -double *Z8StutterEnterPlusExitWatermark, -double *MinActiveDRAMClockChangeLatencySupported) +double *Z8StutterEnterPlusExitWatermark) {struct vba_vars_st *v = &mode_lib->vba;double EffectiveLBLatencyHidingY;
@@ -5820,103 +5676,103 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport(double TotalPixelBW =0.0 ;int k, j; - *UrgentWatermark = UrgentLatency + ExtraLatency; + v->UrgentWatermark = UrgentLatency + ExtraLatency;#ifdef __DML_VBA_DEBUG__dml_print ("DML::%s: UrgentLatency = %f\n" , __func__, UrgentLatency);dml_print ("DML::%s: ExtraLatency = %f\n" , __func__, ExtraLatency); -dml_print ("DML::%s: UrgentWatermark = %f\n" , __func__, *UrgentWatermark); +dml_print ("DML::%s: UrgentWatermark = %f\n" , __func__, v->UrgentWatermark);#endif - *DRAMClockChangeWatermark = DRAMClockChangeLatency + *UrgentWatermark; + v->DRAMClockChangeWatermark = v->DRAMClockChangeLatency + v->UrgentWatermark;#ifdef __DML_VBA_DEBUG__ -dml_print ("DML::%s: DRAMClockChangeLatency = %f\n" , __func__, DRAMClockChangeLatency); -dml_print ("DML::%s: DRAMClockChangeWatermark = %f\n" , __func__, *DRAMClockChangeWatermark); +dml_print ("DML::%s: v->DRAMClockChangeLatency = %f\n" , __func__, v->DRAMClockChangeLatency); +dml_print ("DML::%s: DRAMClockChangeWatermark = %f\n" , __func__, v->DRAMClockChangeWatermark);#endif v->TotalActiveWriteback =0 ; -for (k =0 ; k < NumberOfActivePlanes; ++k) { -if (WritebackEnable[k] == true) { +for (k =0 ; k < v->NumberOfActivePlanes; ++k) { +if (v->WritebackEnable[k] == true) { v->TotalActiveWriteback = v->TotalActiveWriteback +1 ; } }if (v->TotalActiveWriteback <=1 ) { - *WritebackUrgentWatermark = WritebackLatency; + v->WritebackUrgentWatermark = v->WritebackLatency; }else { - *WritebackUrgentWatermark = WritebackLatency + WritebackChunkSize *1024.0 /32.0 /SOCCLK ; + v->WritebackUrgentWatermark = v->WritebackLatency + v->WritebackChunkSize *1024.0 /32.0 /SOCCLK ; }if (v->TotalActiveWriteback <=1 ) { - *WritebackDRAMClockChangeWatermark = DRAMClockChangeLatency + WritebackLatency; + v->WritebackDRAMClockChangeWatermark = v->DRAMClockChangeLatency + v->WritebackLatency; }else { - *WritebackDRAMClockChangeWatermark = DRAMClockChangeLatency + WritebackLatency + WritebackChunkSize *1024.0 /32.0 /SOCCLK ; + v->WritebackDRAMClockChangeWatermark = v->DRAMClockChangeLatency + v->WritebackLatency + v->WritebackChunkSize *1024.0 /32.0 /SOCCLK ; } -for (k =0 ; k < NumberOfActivePlanes; ++k) { +for (k =0 ; k < v->NumberOfActivePlanes; ++k) { TotalPixelBW = TotalPixelBW - + DPPPerPlane[k] * (SwathWidthY[k] * BytePerPixelDETY[k] * VRatio[k] + SwathWidthC[k] * BytePerPixelDETC[k] * VRatioChroma[k]) - / (HTotal[k] / PixelClock[k]); + + DPPPerPlane[k] * (SwathWidthY[k] * BytePerPixelDETY[k] * v->VRatio[k] + SwathWidthC[k] * BytePerPixelDETC[k] * v->VRatioChroma[k]) + / (v->HTotal[k] / v->PixelClock[k]); } -for (k =0 ; k < NumberOfActivePlanes; ++k) { +for (k =0 ; k < v->NumberOfActivePlanes; ++k) {double EffectiveDETBufferSizeY = DETBufferSizeY[k]; v->LBLatencyHidingSourceLinesY =dml_min ( - (double ) MaxLineBufferLines, -dml_floor (LineBufferSize / LBBitPerPixel[k] / (SwathWidthY[k] /dml_max (HRatio[k],1.0 )),1 )) - (vtaps[k] -1 ); + (double ) v->MaxLineBufferLines, +dml_floor (v->LineBufferSize / v->LBBitPerPixel[k] / (SwathWidthY[k] /dml_max (v->HRatio[k],1.0 )),1 )) - (v->vtaps[k] -1 ); v->LBLatencyHidingSourceLinesC =dml_min ( - (double ) MaxLineBufferLines, -dml_floor (LineBufferSize / LBBitPerPixel[k] / (SwathWidthC[k] /dml_max (HRatioChroma[k],1.0 )),1 )) - (VTAPsChroma[k] -1 ); + (double ) v->MaxLineBufferLines, +dml_floor (v->LineBufferSize / v->LBBitPerPixel[k] / (SwathWidthC[k] /dml_max (v->HRatioChroma[k],1.0 )),1 )) - (v->VTAPsChroma[k] -1 ); - EffectiveLBLatencyHidingY = v->LBLatencyHidingSourceLinesY / VRatio[k] * (HTotal[k] / PixelClock[k]); + EffectiveLBLatencyHidingY = v->LBLatencyHidingSourceLinesY / v->VRatio[k] * (v->HTotal[k] / v->PixelClock[k]); - EffectiveLBLatencyHidingC = v->LBLatencyHidingSourceLinesC / VRatioChroma[k] * (HTotal[k] / PixelClock[k]); + EffectiveLBLatencyHidingC = v->LBLatencyHidingSourceLinesC / v->VRatioChroma[k] * (v->HTotal[k] / v->PixelClock[k]);if (UnboundedRequestEnabled) { EffectiveDETBufferSizeY = EffectiveDETBufferSizeY - + CompressedBufferSizeInkByte *1024 * SwathWidthY[k] * BytePerPixelDETY[k] * VRatio[k] / (HTotal[k] / PixelClock[k]) / TotalPixelBW; + + CompressedBufferSizeInkByte *1024 * SwathWidthY[k] * BytePerPixelDETY[k] * v->VRatio[k] / (v->HTotal[k] / v->PixelClock[k]) / TotalPixelBW; } LinesInDETY[k] = (double ) EffectiveDETBufferSizeY / BytePerPixelDETY[k] / SwathWidthY[k]; LinesInDETYRoundedDownToSwath[k] =dml_floor (LinesInDETY[k], SwathHeightY[k]); - FullDETBufferingTimeY = LinesInDETYRoundedDownToSwath[k] * (HTotal[k] / PixelClock[k]) / VRatio[k]; + FullDETBufferingTimeY = LinesInDETYRoundedDownToSwath[k] * (v->HTotal[k] / v->PixelClock[k]) / v->VRatio[k];if (BytePerPixelDETC[k] >0 ) { LinesInDETC = v->DETBufferSizeC[k] / BytePerPixelDETC[k] / SwathWidthC[k]; LinesInDETCRoundedDownToSwath =dml_floor (LinesInDETC, SwathHeightC[k]); - FullDETBufferingTimeC = LinesInDETCRoundedDownToSwath * (HTotal[k] / PixelClock[k]) / VRatioChroma[k]; + FullDETBufferingTimeC = LinesInDETCRoundedDownToSwath * (v->HTotal[k] / v->PixelClock[k]) / v->VRatioChroma[k]; }else { LinesInDETC =0 ; FullDETBufferingTimeC =999999 ; } ActiveDRAMClockChangeLatencyMarginY = EffectiveLBLatencyHidingY + FullDETBufferingTimeY - - ((double ) DSTXAfterScaler[k] / HTotal[k] + DSTYAfterScaler[k]) * HTotal[k] / PixelClock[k] - *UrgentWatermark - *DRAMClockChangeWatermark; + - ((double ) v->DSTXAfterScaler[k] / v->HTotal[k] + v->DSTYAfterScaler[k]) * v->HTotal[k] / v->PixelClock[k] - v->UrgentWatermark - v->DRAMClockChangeWatermark; -if (NumberOfActivePlanes >1 ) { +if (v->NumberOfActivePlanes >1 ) { ActiveDRAMClockChangeLatencyMarginY = ActiveDRAMClockChangeLatencyMarginY - - (1 -1.0 / NumberOfActivePlanes) * SwathHeightY[k] * HTotal[k] / PixelClock[k] / VRatio[k]; + - (1 -1.0 / v->NumberOfActivePlanes) * SwathHeightY[k] * v->HTotal[k] / v->PixelClock[k] / v->VRatio[k]; }if (BytePerPixelDETC[k] >0 ) { ActiveDRAMClockChangeLatencyMarginC = EffectiveLBLatencyHidingC + FullDETBufferingTimeC - - ((double ) DSTXAfterScaler[k] / HTotal[k] + DSTYAfterScaler[k]) * HTotal[k] / PixelClock[k] - *UrgentWatermark - *DRAMClockChangeWatermark; + - ((double ) v->DSTXAfterScaler[k] / v->HTotal[k] + v->DSTYAfterScaler[k]) * v->HTotal[k] / v->PixelClock[k] - v->UrgentWatermark - v->DRAMClockChangeWatermark; -if (NumberOfActivePlanes >1 ) { +if (v->NumberOfActivePlanes >1 ) { ActiveDRAMClockChangeLatencyMarginC = ActiveDRAMClockChangeLatencyMarginC - - (1 -1.0 / NumberOfActivePlanes) * SwathHeightC[k] * HTotal[k] / PixelClock[k] / VRatioChroma[k]; + - (1 -1.0 / v->NumberOfActivePlanes) * SwathHeightC[k] * v->HTotal[k] / v->PixelClock[k] / v->VRatioChroma[k]; } v->ActiveDRAMClockChangeLatencyMargin[k] =dml_min (ActiveDRAMClockChangeLatencyMarginY, ActiveDRAMClockChangeLatencyMarginC); }else { v->ActiveDRAMClockChangeLatencyMargin[k] = ActiveDRAMClockChangeLatencyMarginY; } -if (WritebackEnable[k] == true) { - WritebackDRAMClockChangeLatencyHiding = WritebackInterfaceBufferSize *1024 - / (WritebackDestinationWidth[k] * WritebackDestinationHeight[k] / (WritebackSourceHeight[k] * HTotal[k] / PixelClock[k]) *4 ); -if (WritebackPixelFormat[k] == dm_444_64) { +if (v->WritebackEnable[k] == true) { + WritebackDRAMClockChangeLatencyHiding = v->WritebackInterfaceBufferSize *1024 + / (v->WritebackDestinationWidth[k] * v->WritebackDestinationHeight[k] / (v->WritebackSourceHeight[k] * v->HTotal[k] / v->PixelClock[k]) *4 ); +if (v->WritebackPixelFormat[k] == dm_444_64) { WritebackDRAMClockChangeLatencyHiding = WritebackDRAMClockChangeLatencyHiding /2 ; } WritebackDRAMClockChangeLatencyMargin = WritebackDRAMClockChangeLatencyHiding - v->WritebackDRAMClockChangeWatermark;
@@ -5926,14 +5782,14 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport( v->MinActiveDRAMClockChangeMargin =999999 ; PlaneWithMinActiveDRAMClockChangeMargin =0 ; -for (k =0 ; k < NumberOfActivePlanes; ++k) { +for (k =0 ; k < v->NumberOfActivePlanes; ++k) {if (v->ActiveDRAMClockChangeLatencyMargin[k] < v->MinActiveDRAMClockChangeMargin) { v->MinActiveDRAMClockChangeMargin = v->ActiveDRAMClockChangeLatencyMargin[k]; -if (BlendingAndTiming[k] == k) { +if (v->BlendingAndTiming[k] == k) { PlaneWithMinActiveDRAMClockChangeMargin = k; }else { -for (j =0 ; j < NumberOfActivePlanes; ++j) { -if (BlendingAndTiming[k] == j) { +for (j =0 ; j < v->NumberOfActivePlanes; ++j) { +if (v->BlendingAndTiming[k] == j) { PlaneWithMinActiveDRAMClockChangeMargin = j; } }
@@ -5941,11 +5797,11 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport( } } - *MinActiveDRAMClockChangeLatencySupported = v->MinActiveDRAMClockChangeMargin + DRAMClockChangeLatency; + v->MinActiveDRAMClockChangeLatencySupported = v->MinActiveDRAMClockChangeMargin + v->DRAMClockChangeLatency ; SecondMinActiveDRAMClockChangeMarginOneDisplayInVBLank =999999 ; -for (k =0 ; k < NumberOfActivePlanes; ++k) { -if (!((k == PlaneWithMinActiveDRAMClockChangeMargin) && (BlendingAndTiming[k] == k)) && !(BlendingAndTiming[k] == PlaneWithMinActiveDRAMClockChangeMargin) +for (k =0 ; k < v->NumberOfActivePlanes; ++k) { +if (!((k == PlaneWithMinActiveDRAMClockChangeMargin) && (v->BlendingAndTiming[k] == k)) && !(v->BlendingAndTiming[k] == PlaneWithMinActiveDRAMClockChangeMargin) && v->ActiveDRAMClockChangeLatencyMargin[k] < SecondMinActiveDRAMClockChangeMarginOneDisplayInVBLank) { SecondMinActiveDRAMClockChangeMarginOneDisplayInVBLank = v->ActiveDRAMClockChangeLatencyMargin[k]; }
@@ -5953,25 +5809,25 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport( v->TotalNumberOfActiveOTG =0 ; -for (k =0 ; k < NumberOfActivePlanes; ++k) { -if (BlendingAndTiming[k] == k) { +for (k =0 ; k < v->NumberOfActivePlanes; ++k) { +if (v->BlendingAndTiming[k] == k) { v->TotalNumberOfActiveOTG = v->TotalNumberOfActiveOTG +1 ; } }if (v->MinActiveDRAMClockChangeMargin >0 && PrefetchMode ==0 ) { *DRAMClockChangeSupport = dm_dram_clock_change_vactive; - }else if ((SynchronizedVBlank == true || v->TotalNumberOfActiveOTG ==1 + }else if ((v->SynchronizedVBlank == true || v->TotalNumberOfActiveOTG ==1 || SecondMinActiveDRAMClockChangeMarginOneDisplayInVBLank >0 ) && PrefetchMode ==0 ) { *DRAMClockChangeSupport = dm_dram_clock_change_vblank; }else { *DRAMClockChangeSupport = dm_dram_clock_change_unsupported; } - *StutterExitWatermark = SRExitTime + ExtraLatency +10 / DCFCLKDeepSleep; - *StutterEnterPlusExitWatermark = (SREnterPlusExitTime + ExtraLatency +10 / DCFCLKDeepSleep); - *Z8StutterExitWatermark = SRExitZ8Time + ExtraLatency +10 / DCFCLKDeepSleep; - *Z8StutterEnterPlusExitWatermark = SREnterPlusExitZ8Time + ExtraLatency +10 / DCFCLKDeepSleep; + *StutterExitWatermark = v->SRExitTime + ExtraLatency +10 / DCFCLKDeepSleep; + *StutterEnterPlusExitWatermark = (v->SREnterPlusExitTime + ExtraLatency +10 / DCFCLKDeepSleep); + *Z8StutterExitWatermark = v->SRExitZ8Time + ExtraLatency +10 / DCFCLKDeepSleep; + *Z8StutterEnterPlusExitWatermark = v->SREnterPlusExitZ8Time + ExtraLatency +10 / DCFCLKDeepSleep;#ifdef __DML_VBA_DEBUG__dml_print ("DML::%s: StutterExitWatermark = %f\n" , __func__, *StutterExitWatermark);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 131/148 drm/amd/display: Reduce number of arguments of dml31s CalculateFlipSchedule()
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 21485d3da659b66c37d99071623af83ee1c6733d ]
Most of the arguments are identical between the two call sites and they can be accessed through the 'struct vba_vars_st' pointer. This reduces the total amount of stack space that dml31_ModeSupportAndSystemConfigurationFull() uses by 112 bytes with LLVM 16 (1976 -> 1864), helping clear up the following clang warning:
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c:3908:6: error: stack frame size (2216) exceeds limit (2048) in 'dml31_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than] void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
^
1 error generated.
--- .../dc/dml/dcn31/display_mode_vba_31.c | 172 +++++------------- 1 file changed, 47 insertions(+), 125 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +47 -125
@@ -259,33 +259,13 @@ static void CalculateRowBandwidth(static void CalculateFlipSchedule (struct display_mode_lib *mode_lib, +unsigned int k,double HostVMInefficiencyFactor,double UrgentExtraLatency,double UrgentLatency, -unsigned int GPUVMMaxPageTableLevels, -bool HostVMEnable, -unsigned int HostVMMaxNonCachedPageTableLevels, -bool GPUVMEnable, -double HostVMMinPageSize,double PDEAndMetaPTEBytesPerFrame,double MetaRowBytes, -double DPTEBytesPerRow, -double BandwidthAvailableForImmediateFlip, -unsigned int TotImmediateFlipBytes, -enum source_format_class SourcePixelFormat, -double LineTime, -double VRatio, -double VRatioChroma, -double Tno_bw, -bool DCCEnable, -unsigned int dpte_row_height, -unsigned int meta_row_height, -unsigned int dpte_row_height_chroma, -unsigned int meta_row_height_chroma, -double *DestinationLinesToRequestVMInImmediateFlip, -double *DestinationLinesToRequestRowInImmediateFlip, -double *final_flip_bw, -bool *ImmediateFlipSupportedForPipe); +double DPTEBytesPerRow); static double CalculateWriteBackDelay( enum source_format_class WritebackPixelFormat, double WritebackHRatio,
@@ -2923,33 +2903,13 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerformanfor (k =0 ; k < v->NumberOfActivePlanes; ++k) {CalculateFlipSchedule ( mode_lib, + k, HostVMInefficiencyFactor, v->UrgentExtraLatency, v->UrgentLatency, - v->GPUVMMaxPageTableLevels, - v->HostVMEnable, - v->HostVMMaxNonCachedPageTableLevels, - v->GPUVMEnable, - v->HostVMMinPageSize, v->PDEAndMetaPTEBytesFrame[k], v->MetaRowByte[k], - v->PixelPTEBytesPerRow[k], - v->BandwidthAvailableForImmediateFlip, - v->TotImmediateFlipBytes, - v->SourcePixelFormat[k], - v->HTotal[k] / v->PixelClock[k], - v->VRatio[k], - v->VRatioChroma[k], - v->Tno_bw[k], - v->DCCEnable[k], - v->dpte_row_height[k], - v->meta_row_height[k], - v->dpte_row_height_chroma[k], - v->meta_row_height_chroma[k], - &v->DestinationLinesToRequestVMInImmediateFlip[k], - &v->DestinationLinesToRequestRowInImmediateFlip[k], - &v->final_flip_bw[k], - &v->ImmediateFlipSupportedForPipe[k]); + v->PixelPTEBytesPerRow[k]); } v->total_dcn_read_bw_with_flip =0.0 ;
@@ -3669,61 +3629,43 @@ static void CalculateRowBandwidth(static void CalculateFlipSchedule (struct display_mode_lib *mode_lib, +unsigned int k,double HostVMInefficiencyFactor,double UrgentExtraLatency,double UrgentLatency, -unsigned int GPUVMMaxPageTableLevels, -bool HostVMEnable, -unsigned int HostVMMaxNonCachedPageTableLevels, -bool GPUVMEnable, -double HostVMMinPageSize,double PDEAndMetaPTEBytesPerFrame,double MetaRowBytes, -double DPTEBytesPerRow, -double BandwidthAvailableForImmediateFlip, -unsigned int TotImmediateFlipBytes, -enum source_format_class SourcePixelFormat, -double LineTime, -double VRatio, -double VRatioChroma, -double Tno_bw, -bool DCCEnable, -unsigned int dpte_row_height, -unsigned int meta_row_height, -unsigned int dpte_row_height_chroma, -unsigned int meta_row_height_chroma, -double *DestinationLinesToRequestVMInImmediateFlip, -double *DestinationLinesToRequestRowInImmediateFlip, -double *final_flip_bw, -bool *ImmediateFlipSupportedForPipe) +double DPTEBytesPerRow) { +struct vba_vars_st *v = &mode_lib->vba;double min_row_time =0.0 ;unsigned int HostVMDynamicLevelsTrips;double TimeForFetchingMetaPTEImmediateFlip;double TimeForFetchingRowInVBlankImmediateFlip;double ImmediateFlipBW; +double LineTime = v->HTotal[k] / v->PixelClock[k]; -if (GPUVMEnable == true && HostVMEnable == true) { - HostVMDynamicLevelsTrips = HostVMMaxNonCachedPageTableLevels; +if (v->GPUVMEnable == true && v->HostVMEnable == true) { + HostVMDynamicLevelsTrips = v->HostVMMaxNonCachedPageTableLevels; }else { HostVMDynamicLevelsTrips =0 ; } -if (GPUVMEnable == true || DCCEnable == true) { - ImmediateFlipBW = (PDEAndMetaPTEBytesPerFrame + MetaRowBytes + DPTEBytesPerRow) * BandwidthAvailableForImmediateFlip / TotImmediateFlipBytes; +if (v->GPUVMEnable == true || v->DCCEnable[k] == true) { + ImmediateFlipBW = (PDEAndMetaPTEBytesPerFrame + MetaRowBytes + DPTEBytesPerRow) * v->BandwidthAvailableForImmediateFlip / v->TotImmediateFlipBytes; } -if (GPUVMEnable == true) { +if (v->GPUVMEnable == true) { TimeForFetchingMetaPTEImmediateFlip =dml_max3 ( - Tno_bw + PDEAndMetaPTEBytesPerFrame * HostVMInefficiencyFactor / ImmediateFlipBW, - UrgentExtraLatency + UrgentLatency * (GPUVMMaxPageTableLevels * (HostVMDynamicLevelsTrips +1 ) -1 ), + v->Tno_bw[k] + PDEAndMetaPTEBytesPerFrame * HostVMInefficiencyFactor / ImmediateFlipBW, + UrgentExtraLatency + UrgentLatency * (v->GPUVMMaxPageTableLevels * (HostVMDynamicLevelsTrips +1 ) -1 ), LineTime /4.0 ); }else { TimeForFetchingMetaPTEImmediateFlip =0 ; } - *DestinationLinesToRequestVMInImmediateFlip =dml_ceil (4.0 * (TimeForFetchingMetaPTEImmediateFlip / LineTime),1 ) /4.0 ; -if ((GPUVMEnable == true || DCCEnable == true)) { + v->DestinationLinesToRequestVMInImmediateFlip[k] =dml_ceil (4.0 * (TimeForFetchingMetaPTEImmediateFlip / LineTime),1 ) /4.0 ; +if ((v->GPUVMEnable == true || v->DCCEnable[k] == true)) { TimeForFetchingRowInVBlankImmediateFlip = dml_max3( (MetaRowBytes + DPTEBytesPerRow * HostVMInefficiencyFactor) / ImmediateFlipBW, UrgentLatency * (HostVMDynamicLevelsTrips + 1),
@@ -3732,54 +3674,54 @@ static void CalculateFlipSchedule( TimeForFetchingRowInVBlankImmediateFlip =0 ; } - *DestinationLinesToRequestRowInImmediateFlip =dml_ceil (4.0 * (TimeForFetchingRowInVBlankImmediateFlip / LineTime),1 ) /4.0 ; + v->DestinationLinesToRequestRowInImmediateFlip[k] =dml_ceil (4.0 * (TimeForFetchingRowInVBlankImmediateFlip / LineTime),1 ) /4.0 ; -if (GPUVMEnable == true) { - *final_flip_bw =dml_max ( - PDEAndMetaPTEBytesPerFrame * HostVMInefficiencyFactor / (*DestinationLinesToRequestVMInImmediateFlip * LineTime), - (MetaRowBytes + DPTEBytesPerRow * HostVMInefficiencyFactor) / (*DestinationLinesToRequestRowInImmediateFlip * LineTime)); - }else if ((GPUVMEnable == true || DCCEnable == true)) { - *final_flip_bw = (MetaRowBytes + DPTEBytesPerRow * HostVMInefficiencyFactor) / (*DestinationLinesToRequestRowInImmediateFlip * LineTime); +if (v->GPUVMEnable == true) { + v->final_flip_bw[k] =dml_max ( + PDEAndMetaPTEBytesPerFrame * HostVMInefficiencyFactor / (v->DestinationLinesToRequestVMInImmediateFlip[k] * LineTime), + (MetaRowBytes + DPTEBytesPerRow * HostVMInefficiencyFactor) / (v->DestinationLinesToRequestRowInImmediateFlip[k] * LineTime)); + }else if ((v->GPUVMEnable == true || v->DCCEnable[k] == true)) { + v->final_flip_bw[k] = (MetaRowBytes + DPTEBytesPerRow * HostVMInefficiencyFactor) / (v->DestinationLinesToRequestRowInImmediateFlip[k] * LineTime); }else { - *final_flip_bw =0 ; + v->final_flip_bw[k] =0 ; } -if (SourcePixelFormat == dm_420_8 || SourcePixelFormat == dm_420_10 || SourcePixelFormat == dm_rgbe_alpha) { -if (GPUVMEnable == true && DCCEnable != true) { - min_row_time =dml_min (dpte_row_height * LineTime / VRatio, dpte_row_height_chroma * LineTime / VRatioChroma); - }else if (GPUVMEnable != true && DCCEnable == true) { - min_row_time =dml_min (meta_row_height * LineTime / VRatio, meta_row_height_chroma * LineTime / VRatioChroma); +if (v->SourcePixelFormat[k] == dm_420_8 || v->SourcePixelFormat[k] == dm_420_10 || v->SourcePixelFormat[k] == dm_rgbe_alpha) { +if (v->GPUVMEnable == true && v->DCCEnable[k] != true) { + min_row_time =dml_min (v->dpte_row_height[k] * LineTime / v->VRatio[k], v->dpte_row_height_chroma[k] * LineTime / v->VRatioChroma[k]); + }else if (v->GPUVMEnable != true && v->DCCEnable[k] == true) { + min_row_time =dml_min (v->meta_row_height[k] * LineTime / v->VRatio[k], v->meta_row_height_chroma[k] * LineTime / v->VRatioChroma[k]); }else { min_row_time =dml_min4 ( - dpte_row_height * LineTime / VRatio, - meta_row_height * LineTime / VRatio, - dpte_row_height_chroma * LineTime / VRatioChroma, - meta_row_height_chroma * LineTime / VRatioChroma); + v->dpte_row_height[k] * LineTime / v->VRatio[k], + v->meta_row_height[k] * LineTime / v->VRatio[k], + v->dpte_row_height_chroma[k] * LineTime / v->VRatioChroma[k], + v->meta_row_height_chroma[k] * LineTime / v->VRatioChroma[k]); } }else { -if (GPUVMEnable == true && DCCEnable != true) { - min_row_time = dpte_row_height * LineTime / VRatio; - }else if (GPUVMEnable != true && DCCEnable == true) { - min_row_time = meta_row_height * LineTime / VRatio; +if (v->GPUVMEnable == true && v->DCCEnable[k] != true) { + min_row_time = v->dpte_row_height[k] * LineTime / v->VRatio[k]; + }else if (v->GPUVMEnable != true && v->DCCEnable[k] == true) { + min_row_time = v->meta_row_height[k] * LineTime / v->VRatio[k]; }else { - min_row_time =dml_min (dpte_row_height * LineTime / VRatio, meta_row_height * LineTime / VRatio); + min_row_time =dml_min (v->dpte_row_height[k] * LineTime / v->VRatio[k], v->meta_row_height[k] * LineTime / v->VRatio[k]); } } -if (*DestinationLinesToRequestVMInImmediateFlip >=32 || *DestinationLinesToRequestRowInImmediateFlip >=16 +if (v->DestinationLinesToRequestVMInImmediateFlip[k] >=32 || v->DestinationLinesToRequestRowInImmediateFlip[k] >=16 || TimeForFetchingMetaPTEImmediateFlip +2 * TimeForFetchingRowInVBlankImmediateFlip > min_row_time) { - *ImmediateFlipSupportedForPipe = false; + v->ImmediateFlipSupportedForPipe[k] = false; }else { - *ImmediateFlipSupportedForPipe = true; + v->ImmediateFlipSupportedForPipe[k] = true; }#ifdef __DML_VBA_DEBUG__ -dml_print ("DML::%s: DestinationLinesToRequestVMInImmediateFlip = %f\n" , __func__, *DestinationLinesToRequestVMInImmediateFlip); -dml_print ("DML::%s: DestinationLinesToRequestRowInImmediateFlip = %f\n" , __func__, *DestinationLinesToRequestRowInImmediateFlip); +dml_print ("DML::%s: DestinationLinesToRequestVMInImmediateFlip = %f\n" , __func__, v->DestinationLinesToRequestVMInImmediateFlip[k]); +dml_print ("DML::%s: DestinationLinesToRequestRowInImmediateFlip = %f\n" , __func__, v->DestinationLinesToRequestRowInImmediateFlip[k]);dml_print ("DML::%s: TimeForFetchingMetaPTEImmediateFlip = %f\n" , __func__, TimeForFetchingMetaPTEImmediateFlip);dml_print ("DML::%s: TimeForFetchingRowInVBlankImmediateFlip = %f\n" , __func__, TimeForFetchingRowInVBlankImmediateFlip);dml_print ("DML::%s: min_row_time = %f\n" , __func__, min_row_time); -dml_print ("DML::%s: ImmediateFlipSupportedForPipe = %d\n" , __func__, *ImmediateFlipSupportedForPipe); +dml_print ("DML::%s: ImmediateFlipSupportedForPipe = %d\n" , __func__, v->ImmediateFlipSupportedForPipe[k]);#endif }
@@ -5405,33 +5347,13 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lfor (k =0 ; k < v->NumberOfActivePlanes; k++) {CalculateFlipSchedule ( mode_lib, + k, HostVMInefficiencyFactor, v->ExtraLatency, v->UrgLatency[i], - v->GPUVMMaxPageTableLevels, - v->HostVMEnable, - v->HostVMMaxNonCachedPageTableLevels, - v->GPUVMEnable, - v->HostVMMinPageSize, v->PDEAndMetaPTEBytesPerFrame[i][j][k], v->MetaRowBytes[i][j][k], - v->DPTEBytesPerRow[i][j][k], - v->BandwidthAvailableForImmediateFlip, - v->TotImmediateFlipBytes, - v->SourcePixelFormat[k], - v->HTotal[k] / v->PixelClock[k], - v->VRatio[k], - v->VRatioChroma[k], - v->Tno_bw[k], - v->DCCEnable[k], - v->dpte_row_height[k], - v->meta_row_height[k], - v->dpte_row_height_chroma[k], - v->meta_row_height_chroma[k], - &v->DestinationLinesToRequestVMInImmediateFlip[k], - &v->DestinationLinesToRequestRowInImmediateFlip[k], - &v->final_flip_bw[k], - &v->ImmediateFlipSupportedForPipe[k]); + v->DPTEBytesPerRow[i][j][k]); } v->total_dcn_read_bw_with_flip =0.0 ;for (k =0 ; k < v->NumberOfActivePlanes; k++) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 132/148 drm/amd/display: Mark dml30s UseMinimumDCFCLK() as noinline for stack usage
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit 41012d715d5d7b9751ae84b8fb255e404ac9c5d0 ]
This function consumes a lot of stack space and it blows up the size of dml30_ModeSupportAndSystemConfigurationFull() with clang:
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn30/display_mode_vba_30.c:3542:6: error: stack frame size (2200) exceeds limit (2048) in 'dml30_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than] void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
^
1 error generated.
Commit a0f7e7f759cf ("drm/amd/display: fix i386 frame size warning") aimed to address this for i386 but it did not help x86_64.
To reduce the amount of stack space that dml30_ModeSupportAndSystemConfigurationFull() uses, mark UseMinimumDCFCLK() as noinline, using the _for_stack variant for documentation. While this will increase the total amount of stack usage between the two functions (1632 and 1304 bytes respectively), it will make sure both stay below the limit of 2048 bytes for these files. The aforementioned change does help reduce UseMinimumDCFCLK()'s stack usage so it should not be reverted in favor of this change.
--- drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +1 -2
@@ -6658,8 +6658,7 @@ static double CalculateUrgentLatency(return ret; } - -static void UseMinimumDCFCLK( +static noinline_for_stack void UseMinimumDCFCLK( struct display_mode_lib *mode_lib, int MaxInterDCNTileRepeaters, int MaxPrefetchMode,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 133/148 drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
In reply to Greg Kroah-HartmanFrom: Nathan Huckleberry <[email protected]>
[ Upstream commit b0b9408f132623dc88e78adb5282f74e4b64bb57 ]
The mode_valid field in drm_connector_helper_funcs is expected to be of type:
enum drm_mode_status (* mode_valid) (struct drm_connector *connector,
struct drm_display_mode *mode);
The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition.
The return type of cdn_dp_connector_mode_valid should be changed from int to enum drm_mode_status.
--- drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/rockchip/cdn-dp-core.c +3 -2
@@ -277,8 +277,9 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)return ret; } -static int cdn_dp_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) +static enum drm_mode_status +cdn_dp_connector_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode) {struct cdn_dp_device *dp =connector_to_dp (connector);struct drm_display_info *display_info = &dp->connector.display_info;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 134/148 fsdax: Fix infinite loop in dax_iomap_rw()
In reply to Greg Kroah-HartmanFrom: Li Jinlin <[email protected]>
[ Upstream commit 17d9c15c9b9e7fb285f7ac5367dfb5f00ff575e3 ]
I got an infinite loop and a WARNING report when executing a tail command in virtiofs.
WARNING: CPU: 10 PID: 964 at fs/iomap/iter.c:34 iomap_iter+0x3a2/0x3d0 Modules linked in: CPU: 10 PID: 964 Comm: tail Not tainted 5.19.0-rc7 Call Trace: <TASK> dax_iomap_rw+0xea/0x620 ? __this_cpu_preempt_check+0x13/0x20 fuse_dax_read_iter+0x47/0x80 fuse_file_read_iter+0xae/0xd0 new_sync_read+0xfe/0x180 ? 0xffffffff81000000 vfs_read+0x14d/0x1a0 ksys_read+0x6d/0xf0 __x64_sys_read+0x1a/0x20 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd
The tail command will call read() with a count of 0. In this case, iomap_iter() will report this WARNING, and always return 1 which casuing the infinite loop in dax_iomap_rw().
Fixing by checking count whether is 0 in dax_iomap_rw().
--- fs/dax.c | 3 +++ 1 file changed, 3 insertions(+)
fs/dax.c +3 -0
@@ -1279,6 +1279,9 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter,loff_t done =0 ;int ret; +if (!iomi.len) +return 0 ; +if (iov_iter_rw (iter) ==WRITE ) {lockdep_assert_held_write (&iomi.inode->i_rwsem); iomi.flags |=IOMAP_WRITE ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 135/148 workqueue: dont skip lockdep work dependency in cancel_work_sync()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit c0feea594e058223973db94c1c32a830c9807c86 ]
Like Hillf Danton mentioned
syzbot should have been able to catch cancel_work_sync() in work context by checking lockdep_map in __flush_work() for both flush and cancel.
in [1], being unable to report an obvious deadlock scenario shown below is broken. From locking dependency perspective, sync version of cancel request should behave as if flush request, for it waits for completion of work if that work has already started execution.
----------
#include <linux/module.h>
#include <linux/sched.h>
static DEFINE_MUTEX(mutex);
static void work_fn(struct work_struct *work)
{
schedule_timeout_uninterruptible(HZ / 5);
mutex_lock(&mutex);
mutex_unlock(&mutex);
}
static DECLARE_WORK(work, work_fn);
static int __init test_init(void)
{
schedule_work(&work);
schedule_timeout_uninterruptible(HZ / 10);
mutex_lock(&mutex);
cancel_work_sync(&work);
mutex_unlock(&mutex);
return -EINVAL;
}
module_init(test_init);
MODULE_LICENSE("GPL");
----------The check this patch restores was added by commit 0976dfc1d0cd80a4 ("workqueue: Catch more locking problems with flush_work()").
Then, lockdep's crossrelease feature was added by commit b09be676e0ff25bd ("locking/lockdep: Implement the 'crossrelease' feature"). As a result, this check was once removed by commit fd1a5b04dfb899f8 ("workqueue: Remove now redundant lock acquisitions wrt. workqueue flushes").
But lockdep's crossrelease feature was removed by commit e966eaeeb623f099 ("locking/lockdep: Remove the cross-release locking checks"). At this point, this check should have been restored.
Then, commit d6e89786bed977f3 ("workqueue: skip lockdep wq dependency in cancel_work_sync()") introduced a boolean flag in order to distinguish flush_work() and cancel_work_sync(), for checking "struct workqueue_struct" dependency when called from cancel_work_sync() was causing false positives.
Then, commit 87915adc3f0acdf0 ("workqueue: re-add lockdep dependencies for flushing") tried to restore "struct work_struct" dependency check, but by error checked this boolean flag. Like an example shown above indicates, "struct work_struct" dependency needs to be checked for both flush_work() and cancel_work_sync().
--- kernel/workqueue.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/workqueue.c +2 -4
@@ -3083,10 +3083,8 @@ static bool __flush_work(struct work_struct *work, bool from_cancel)if (WARN_ON (!work->func))return false; -if (!from_cancel) { -lock_map_acquire (&work->lockdep_map); -lock_map_release (&work->lockdep_map); - } +lock_map_acquire (&work->lockdep_map); +lock_map_release (&work->lockdep_map);if (start_flush_work (work, &barr, from_cancel)) {wait_for_completion (&barr.done);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 136/148 i2c: imx: If pm_runtime_get_sync() returned 1 device access is possible
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 085aacaa73163f4b8a89dec24ecb32cfacd34017 ]
pm_runtime_get_sync() returning 1 also means the device is powered. So resetting the chip registers in .remove() is possible and should be done.
--- drivers/i2c/busses/i2c-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-imx.c +1 -1
@@ -1496,7 +1496,7 @@ static int i2c_imx_remove(struct platform_device *pdev)if (i2c_imx->dma)i2c_imx_dma_free (i2c_imx); -if (ret ==0 ) { +if (ret >=0 ) {/* setup chip registers to defaults */ imx_i2c_write_reg (0 , i2c_imx,IMX_I2C_IADR );imx_i2c_write_reg (0 , i2c_imx,IMX_I2C_IFDR );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 137/148 i2c: mlxbf: incorrect base address passed during io write
In reply to Greg Kroah-HartmanFrom: Asmaa Mnebhi <[email protected]>
[ Upstream commit 2a5be6d1340c0fefcee8a6489cff7fd88a0d5b85 ]
Correct the base address used during io write.
This bug had no impact over the overall functionality of the read and write transactions. MLXBF_I2C_CAUSE_OR_CLEAR=0x18 so writing to (smbus->io + 0x18) instead of (mst_cause->ioi + 0x18) actually writes to the sc_low_timeout register which just sets the timeout value before a read/write aborts.
--- drivers/i2c/busses/i2c-mlxbf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-mlxbf.c +1 -1
@@ -669,7 +669,7 @@ static int mlxbf_i2c_smbus_enable(struct mlxbf_i2c_priv *priv, u8 slave,/* Clear status bits. */ writel (0x0 , priv->smbus->io +MLXBF_I2C_SMBUS_MASTER_STATUS );/* Set the cause data. */ -writel (~0x0 , priv->smbus->io +MLXBF_I2C_CAUSE_OR_CLEAR ); +writel (~0x0 , priv->mst_cause->io +MLXBF_I2C_CAUSE_OR_CLEAR );/* Zero PEC byte. */ writel (0x0 , priv->smbus->io +MLXBF_I2C_SMBUS_MASTER_PEC );/* Zero byte count. */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 138/148 i2c: mlxbf: prevent stack overflow in mlxbf_i2c_smbus_start_transaction()
In reply to Greg Kroah-HartmanFrom: Asmaa Mnebhi <[email protected]>
[ Upstream commit de24aceb07d426b6f1c59f33889d6a964770547b ]
memcpy() is called in a loop while 'operation->length' upper bound is not checked and 'data_idx' also increments.
--- drivers/i2c/busses/i2c-mlxbf.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/i2c/busses/i2c-mlxbf.c +3 -0
@@ -738,6 +738,9 @@ mlxbf_i2c_smbus_start_transaction(struct mlxbf_i2c_priv *priv,if (flags &MLXBF_I2C_F_WRITE ) { write_en =1 ; write_len += operation->length; +if (data_idx + operation->length > +MLXBF_I2C_MASTER_DATA_DESC_SIZE ) +return -ENOBUFS ;memcpy (data_desc + data_idx, operation->buffer, operation->length); data_idx += operation->length;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 139/148 i2c: mlxbf: Fix frequency calculation
In reply to Greg Kroah-HartmanFrom: Asmaa Mnebhi <[email protected]>
[ Upstream commit 37f071ec327b04c83d47637c5e5c2199b39899ca ]
The i2c-mlxbf.c driver is currently broken because there is a bug in the calculation of the frequency. core_f, core_r and core_od are components read from hardware registers and are used to compute the frequency used to compute different timing parameters. The shifting mechanism used to get core_f, core_r and core_od is wrong. Use FIELD_GET to mask and shift the bitfields properly.
--- drivers/i2c/busses/i2c-mlxbf.c | 63 +++++++++++++--------------------- 1 file changed, 23 insertions(+), 40 deletions(-)
drivers/i2c/busses/i2c-mlxbf.c +23 -40
@@ -6,6 +6,7 @@*/ #include <linux/acpi.h> +#include <linux/bitfield.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/interrupt.h>
@@ -63,13 +64,14 @@*/ #define MLXBF_I2C_TYU_PLL_OUT_FREQ (400 * 1000 * 1000)/* Reference clock for Bluefield - 156 MHz. */ -#define MLXBF_I2C_PLL_IN_FREQ (156 * 1000 * 1000) +#define MLXBF_I2C_PLL_IN_FREQ 156250000ULL/* Constant used to determine the PLL frequency. */ -#define MLNXBF_I2C_COREPLL_CONST 16384 +#define MLNXBF_I2C_COREPLL_CONST 16384ULL + +#define MLXBF_I2C_FREQUENCY_1GHZ 1000000000ULL/* PLL registers. */ -#define MLXBF_I2C_CORE_PLL_REG0 0x0#define MLXBF_I2C_CORE_PLL_REG1 0x4#define MLXBF_I2C_CORE_PLL_REG2 0x8
@@ -181,22 +183,15 @@#define MLXBF_I2C_COREPLL_FREQ MLXBF_I2C_TYU_PLL_OUT_FREQ/* Core PLL TYU configuration. */ -#define MLXBF_I2C_COREPLL_CORE_F_TYU_MASK GENMASK(12, 0) -#define MLXBF_I2C_COREPLL_CORE_OD_TYU_MASK GENMASK(3, 0) -#define MLXBF_I2C_COREPLL_CORE_R_TYU_MASK GENMASK(5, 0) - -#define MLXBF_I2C_COREPLL_CORE_F_TYU_SHIFT 3 -#define MLXBF_I2C_COREPLL_CORE_OD_TYU_SHIFT 16 -#define MLXBF_I2C_COREPLL_CORE_R_TYU_SHIFT 20 +#define MLXBF_I2C_COREPLL_CORE_F_TYU_MASK GENMASK(15, 3) +#define MLXBF_I2C_COREPLL_CORE_OD_TYU_MASK GENMASK(19, 16) +#define MLXBF_I2C_COREPLL_CORE_R_TYU_MASK GENMASK(25, 20)/* Core PLL YU configuration. */ #define MLXBF_I2C_COREPLL_CORE_F_YU_MASK GENMASK(25, 0)#define MLXBF_I2C_COREPLL_CORE_OD_YU_MASK GENMASK(3, 0) -#define MLXBF_I2C_COREPLL_CORE_R_YU_MASK GENMASK(5, 0) +#define MLXBF_I2C_COREPLL_CORE_R_YU_MASK GENMASK(31, 26) -#define MLXBF_I2C_COREPLL_CORE_F_YU_SHIFT 0 -#define MLXBF_I2C_COREPLL_CORE_OD_YU_SHIFT 1 -#define MLXBF_I2C_COREPLL_CORE_R_YU_SHIFT 26/* Core PLL frequency. */ static u64 mlxbf_i2c_corepll_frequency;
@@ -479,8 +474,6 @@ static struct mutex mlxbf_i2c_bus_lock;#define MLXBF_I2C_MASK_8 GENMASK(7, 0)#define MLXBF_I2C_MASK_16 GENMASK(15, 0) -#define MLXBF_I2C_FREQUENCY_1GHZ 1000000000 -/* * Function to poll a set of bits at a specific address; it checks whether * the bits are equal to zero when eq_zero is set to 'true', and not equal
@@ -1410,24 +1403,19 @@ static int mlxbf_i2c_init_master(struct platform_device *pdev,return 0 ; } -static u64 mlxbf_calculate_freq_from_tyu (struct mlxbf_i2c_resource *corepll_res) +static u64 mlxbf_i2c_calculate_freq_from_tyu (struct mlxbf_i2c_resource *corepll_res) { -u64 core_frequency, pad_frequency; +u64 core_frequency;u8 core_od, core_r;u32 corepll_val;u16 core_f; - pad_frequency =MLXBF_I2C_PLL_IN_FREQ ; - corepll_val =readl (corepll_res->io +MLXBF_I2C_CORE_PLL_REG1 );/* Get Core PLL configuration bits. */ - core_f =rol32 (corepll_val,MLXBF_I2C_COREPLL_CORE_F_TYU_SHIFT ) & -MLXBF_I2C_COREPLL_CORE_F_TYU_MASK ; - core_od =rol32 (corepll_val,MLXBF_I2C_COREPLL_CORE_OD_TYU_SHIFT ) & -MLXBF_I2C_COREPLL_CORE_OD_TYU_MASK ; - core_r =rol32 (corepll_val,MLXBF_I2C_COREPLL_CORE_R_TYU_SHIFT ) & -MLXBF_I2C_COREPLL_CORE_R_TYU_MASK ; + core_f =FIELD_GET (MLXBF_I2C_COREPLL_CORE_F_TYU_MASK , corepll_val); + core_od =FIELD_GET (MLXBF_I2C_COREPLL_CORE_OD_TYU_MASK , corepll_val); + core_r =FIELD_GET (MLXBF_I2C_COREPLL_CORE_R_TYU_MASK , corepll_val);/* * Compute PLL output frequency as follow:
@@ -1439,31 +1427,26 @@ static u64 mlxbf_calculate_freq_from_tyu(struct mlxbf_i2c_resource *corepll_res)* Where PLL_OUT_FREQ and PLL_IN_FREQ refer to CoreFrequency * and PadFrequency, respectively. */ - core_frequency = pad_frequency * (++core_f); + core_frequency =MLXBF_I2C_PLL_IN_FREQ * (++core_f); core_frequency /= (++core_r) * (++core_od);return core_frequency; } -static u64 mlxbf_calculate_freq_from_yu (struct mlxbf_i2c_resource *corepll_res) +static u64 mlxbf_i2c_calculate_freq_from_yu (struct mlxbf_i2c_resource *corepll_res) {u32 corepll_reg1_val, corepll_reg2_val; -u64 corepll_frequency, pad_frequency; +u64 corepll_frequency;u8 core_od, core_r;u32 core_f; - pad_frequency =MLXBF_I2C_PLL_IN_FREQ ; - corepll_reg1_val =readl (corepll_res->io +MLXBF_I2C_CORE_PLL_REG1 ); corepll_reg2_val =readl (corepll_res->io +MLXBF_I2C_CORE_PLL_REG2 );/* Get Core PLL configuration bits */ - core_f =rol32 (corepll_reg1_val,MLXBF_I2C_COREPLL_CORE_F_YU_SHIFT ) & -MLXBF_I2C_COREPLL_CORE_F_YU_MASK ; - core_r =rol32 (corepll_reg1_val,MLXBF_I2C_COREPLL_CORE_R_YU_SHIFT ) & -MLXBF_I2C_COREPLL_CORE_R_YU_MASK ; - core_od =rol32 (corepll_reg2_val,MLXBF_I2C_COREPLL_CORE_OD_YU_SHIFT ) & -MLXBF_I2C_COREPLL_CORE_OD_YU_MASK ; + core_f =FIELD_GET (MLXBF_I2C_COREPLL_CORE_F_YU_MASK , corepll_reg1_val); + core_r =FIELD_GET (MLXBF_I2C_COREPLL_CORE_R_YU_MASK , corepll_reg1_val); + core_od =FIELD_GET (MLXBF_I2C_COREPLL_CORE_OD_YU_MASK , corepll_reg2_val);/* * Compute PLL output frequency as follow:
@@ -1475,7 +1458,7 @@ static u64 mlxbf_calculate_freq_from_yu(struct mlxbf_i2c_resource *corepll_res)* Where PLL_OUT_FREQ and PLL_IN_FREQ refer to CoreFrequency * and PadFrequency, respectively. */ - corepll_frequency = (pad_frequency * core_f) /MLNXBF_I2C_COREPLL_CONST ; + corepll_frequency = (MLXBF_I2C_PLL_IN_FREQ * core_f) /MLNXBF_I2C_COREPLL_CONST ; corepll_frequency /= (++core_r) * (++core_od);return corepll_frequency;
@@ -2183,14 +2166,14 @@ static struct mlxbf_i2c_chip_info mlxbf_i2c_chip[] = { [1] = &mlxbf_i2c_corepll_res[MLXBF_I2C_CHIP_TYPE_1], [2 ] = &mlxbf_i2c_gpio_res[MLXBF_I2C_CHIP_TYPE_1 ] }, - .calculate_freq = mlxbf_calculate_freq_from_tyu + .calculate_freq = mlxbf_i2c_calculate_freq_from_tyu }, [MLXBF_I2C_CHIP_TYPE_2] = { .type = MLXBF_I2C_CHIP_TYPE_2, .shared_res = { [0 ] = &mlxbf_i2c_corepll_res[MLXBF_I2C_CHIP_TYPE_2 ] }, - .calculate_freq = mlxbf_calculate_freq_from_yu + .calculate_freq = mlxbf_i2c_calculate_freq_from_yu } };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 140/148 drm/amdgpu: dont register a dirty callback for non-atomic
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
[ Upstream commit abbc7a3dafb91b9d4ec56b70ec9a7520f8e13334 ]
Some asics still support non-atomic code paths.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +10 -1
@@ -36,6 +36,7 @@#include <linux/pm_runtime.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_damage_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_edid.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_fb_helper.h>
@@ -491,6 +492,11 @@ bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector,static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { .destroy = drm_gem_fb_destroy, .create_handle = drm_gem_fb_create_handle, +}; + +static const struct drm_framebuffer_funcs amdgpu_fb_funcs_atomic = { + .destroy = drm_gem_fb_destroy, + .create_handle = drm_gem_fb_create_handle, .dirty = drm_atomic_helper_dirtyfb, };
@@ -1111,7 +1117,10 @@ int amdgpu_display_gem_fb_verify_and_init(if (ret) goto err; - ret =drm_framebuffer_init (dev, &rfb->base, &amdgpu_fb_funcs); +if (drm_drv_uses_atomic_modeset (dev)) + ret =drm_framebuffer_init (dev, &rfb->base, &amdgpu_fb_funcs_atomic); +else + ret =drm_framebuffer_init (dev, &rfb->base, &amdgpu_fb_funcs);if (ret) goto err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 141/148 NFSv4: Fixes for nfs4_inode_return_delegation()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit 6e176d47160cec8bcaa28d9aa06926d72d54237c upstream.
We mustn't call nfs_wb_all() on anything other than a regular file. Furthermore, we can exit early when we don't hold a delegation.
--- fs/nfs/delegation.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/nfs/delegation.c +6 -4
@@ -755,11 +755,13 @@ int nfs4_inode_return_delegation(structstruct nfs_delegation *delegation; delegation =nfs_start_delegation_return (nfsi); -/* Synchronous recall of any application leases */ -break_lease (inode,O_WRONLY |O_RDWR ); -nfs_wb_all (inode); -if (delegation !=NULL ) +if (delegation !=NULL ) { +/* Synchronous recall of any application leases */ +break_lease (inode,O_WRONLY |O_RDWR ); +if (S_ISREG (inode->i_mode)) +nfs_wb_all (inode);return nfs_end_delegation_return (inode, delegation,1 ); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 142/148 devdax: Fix soft-reservation memory description
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
commit 67feaba413ec68daf4124e9870878899b4ed9a0e upstream.
The "hmem" platform-devices that are created to represent the platform-advertised "Soft Reserved" memory ranges end up inserting a resource that causes the iomem_resource tree to look like this:
340000000-43fffffff : hmem.0
340000000-43fffffff : Soft Reserved
340000000-43fffffff : dax0.0
This is because insert_resource() reparents ranges when they completely intersect an existing range.
This matters because code that uses region_intersects() to scan for a given IORES_DESC will only check that top-level 'hmem.0' resource and not the 'Soft Reserved' descendant.
So, to support EINJ (via einj_error_inject()) to inject errors into memory hosted by a dax-device, be sure to describe the memory as IORES_DESC_SOFT_RESERVED. This is a follow-on to:
commit b13a3e5fd40b ("ACPI: APEI: Fix _EINJ vs EFI_MEMORY_SP")
...that fixed EINJ support for "Soft Reserved" ranges in the first instance.
--- drivers/dax/hmem/device.c | 1 + 1 file changed, 1 insertion(+)
drivers/dax/hmem/device.c +1 -0
@@ -15,6 +15,7 @@ void hmem_register_device(int target_nid .start = r->start, .end = r->end, .flags = IORESOURCE_MEM, + .desc = IORES_DESC_SOFT_RESERVED, };struct platform_device *pdev;struct memregion_info info;
Greg Kroah-Hartman
maintainerPATCH 143/148 ext4: fix bug in extents parsing when eh_entries == 0 and eh_depth > 0
In reply to Greg Kroah-HartmanFrom: Luís Henriques <[email protected]>
commit 29a5b8a137ac8eb410cc823653a29ac0e7b7e1b0 upstream.
When walking through an inode extents, the ext4_ext_binsearch_idx() function assumes that the extent header has been previously validated. However, there are no checks that verify that the number of entries (eh->eh_entries) is non-zero when depth is > 0. And this will lead to problems because the EXT_FIRST_INDEX() and EXT_LAST_INDEX() will return garbage and result in this:
[ 135.245946] ------------[ cut here ]------------ [ 135.247579] kernel BUG at fs/ext4/extents.c:2258! [ 135.249045] invalid opcode: 0000 [#1] PREEMPT SMP [ 135.250320] CPU: 2 PID: 238 Comm: tmp118 Not tainted 5.19.0-rc8+ #4 [ 135.252067] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.15.0-0-g2dd4b9b-rebuilt.opensuse.org 04/01/2014 [ 135.255065] RIP: 0010:ext4_ext_map_blocks+0xc20/0xcb0 [ 135.256475] Code: [ 135.261433] RSP: 0018:ffffc900005939f8 EFLAGS: 00010246 [ 135.262847] RAX: 0000000000000024 RBX: ffffc90000593b70 RCX: 0000000000000023 [ 135.264765] RDX: ffff8880038e5f10 RSI: 0000000000000003 RDI: ffff8880046e922c [ 135.266670] RBP: ffff8880046e9348 R08: 0000000000000001 R09: ffff888002ca580c [ 135.268576] R10: 0000000000002602 R11: 0000000000000000 R12: 0000000000000024 [ 135.270477] R13: 0000000000000000 R14: 0000000000000024 R15: 0000000000000000 [ 135.272394] FS: 00007fdabdc56740(0000) GS:ffff88807dd00000(0000) knlGS:0000000000000000 [ 135.274510] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 135.276075] CR2: 00007ffc26bd4f00 CR3: 0000000006261004 CR4: 0000000000170ea0 [ 135.277952] Call Trace: [ 135.278635] <TASK> [ 135.279247] ? preempt_count_add+0x6d/0xa0 [ 135.280358] ? percpu_counter_add_batch+0x55/0xb0 [ 135.281612] ? _raw_read_unlock+0x18/0x30 [ 135.282704] ext4_map_blocks+0x294/0x5a0 [ 135.283745] ? xa_load+0x6f/0xa0 [ 135.284562] ext4_mpage_readpages+0x3d6/0x770 [ 135.285646] read_pages+0x67/0x1d0 [ 135.286492] ? folio_add_lru+0x51/0x80 [ 135.287441] page_cache_ra_unbounded+0x124/0x170 [ 135.288510] filemap_get_pages+0x23d/0x5a0 [ 135.289457] ? path_openat+0xa72/0xdd0 [ 135.290332] filemap_read+0xbf/0x300 [ 135.291158] ? _raw_spin_lock_irqsave+0x17/0x40 [ 135.292192] new_sync_read+0x103/0x170 [ 135.293014] vfs_read+0x15d/0x180 [ 135.293745] ksys_read+0xa1/0xe0 [ 135.294461] do_syscall_64+0x3c/0x80 [ 135.295284] entry_SYSCALL_64_after_hwframe+0x46/0xb0
This patch simply adds an extra check in __ext4_ext_check(), verifying that eh_entries is not 0 when eh_depth is > 0.
--- fs/ext4/extents.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ext4/extents.c +4 -0
@@ -460,6 +460,10 @@ static int __ext4_ext_check(const char * error_msg ="invalid eh_entries" ; goto corrupted; } +if (unlikely ((eh->eh_entries ==0 ) && (depth >0 ))) { + error_msg ="eh_entries is 0 but eh_depth is > 0" ; + goto corrupted; + }if (!ext4_valid_extent_entries (inode, eh, lblk, &pblk, depth)) { error_msg ="invalid extent entries" ; goto corrupted;
Greg Kroah-Hartman
maintainerPATCH 144/148 ext4: limit the number of retries after discarding preallocations blocks
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
commit 80fa46d6b9e7b1527bfd2197d75431fd9c382161 upstream.
This patch avoids threads live-locking for hours when a large number threads are competing over the last few free extents as they blocks getting added and removed from preallocation pools. From our bug reporter:
A reliable way for triggering this has multiple writers continuously write() to files when the filesystem is full, while small amounts of space are freed (e.g. by truncating a large file -1MiB at a time). In the local filesystem, this can be done by simply not checking the return code of write (0) and/or the error (ENOSPACE) that is set. Over NFS with an async mount, even clients with proper error checking will behave this way since the linux NFS client implementation will not propagate the server errors [the write syscalls immediately return success] until the file handle is closed. This leads to a situation where NFS clients send a continuous stream of WRITE rpcs which result in ERRNOSPACE -- but since the client isn't seeing this, the stream of writes continues at maximum network speed.
When some space does appear, multiple writers will all attempt to claim it for their current write. For NFS, we may see dozens to hundreds of threads that do this.
The real-world scenario of this is database backup tooling (in particular, github.com/mdkent/percona-xtrabackup) which may write large files (>1TiB) to NFS for safe keeping. Some temporary files are written, rewound, and read back -- all before closing the file handle (the temp file is actually unlinked, to trigger automatic deletion on close/crash.) An application like this operating on an async NFS mount will not see an error code until TiB have been written/read.
The lockup was observed when running this database backup on large filesystems (64 TiB in this case) with a high number of block groups and no free space. Fragmentation is generally not a factor in this filesystem (~thousands of large files, mostly contiguous except for the parts written while the filesystem is at capacity.)
--- fs/ext4/mballoc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ext4/mballoc.c +3 -1
@@ -5539,6 +5539,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_text4_fsblk_t block =0 ;unsigned int inquota =0 ;unsigned int reserv_clstrs =0 ; +int retries =0 ;u64 seq;might_sleep ();
@@ -5641,7 +5642,8 @@ repeat: ar->len = ac->ac_b_ex.fe_len; } }else { -if (ext4_mb_discard_preallocations_should_retry (sb, ac, &seq)) +if (++retries <3 && +ext4_mb_discard_preallocations_should_retry (sb, ac, &seq)) goto repeat;/* * If block allocation fails then the pa allocated above
Greg Kroah-Hartman
maintainerPATCH 145/148 ext4: make mballoc try target group first even with mb_optimize_scan
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 4fca50d440cc5d4dc570ad5484cc0b70b381bc2a upstream.
One of the side-effects of mb_optimize_scan was that the optimized functions to select next group to try were called even before we tried the goal group. As a result we no longer allocate files close to corresponding inodes as well as we don't try to expand currently allocated extent in the same group. This results in reaim regression with workfile.disk workload of upto 8% with many clients on my test machine:
baseline mb_optimize_scan
Hmean disk-1 2114.16 ( 0.00%) 2099.37 ( -0.70%) Hmean disk-41 87794.43 ( 0.00%) 83787.47 * -4.56%* Hmean disk-81 148170.73 ( 0.00%) 135527.05 * -8.53%* Hmean disk-121 177506.11 ( 0.00%) 166284.93 * -6.32%* Hmean disk-161 220951.51 ( 0.00%) 207563.39 * -6.06%* Hmean disk-201 208722.74 ( 0.00%) 203235.59 ( -2.63%) Hmean disk-241 222051.60 ( 0.00%) 217705.51 ( -1.96%) Hmean disk-281 252244.17 ( 0.00%) 241132.72 * -4.41%* Hmean disk-321 255844.84 ( 0.00%) 245412.84 * -4.08%*
Also this is causing huge regression (time increased by a factor of 5 or so) when untarring archive with lots of small files on some eMMC storage cards.
Fix the problem by making sure we try goal group first.
--- fs/ext4/mballoc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
fs/ext4/mballoc.c +7 -7
@@ -1052,8 +1052,10 @@ static void ext4_mb_choose_next_group(st { *new_cr = ac->ac_criteria; -if (!should_optimize_scan (ac) || ac->ac_groups_linear_remaining) +if (!should_optimize_scan (ac) || ac->ac_groups_linear_remaining) { + *group =next_linear_group (ac, *group, ngroups);return ; + }if (*new_cr ==0 ) {ext4_mb_choose_next_group_cr0 (ac, new_cr, group, ngroups);
@@ -2633,7 +2635,7 @@ static noinline_for_stack int ext4_mb_regular_allocator(struct ext4_allocation_context *ac) {ext4_group_t prefetch_grp =0 , ngroups, group, i; -int cr =-1 ; +int cr =-1 , new_cr;int err =0 , first_err =0 ;unsigned int nr =0 , prefetch_ios =0 ;struct ext4_sb_info *sbi;
@@ -2708,13 +2710,11 @@ repeat: ac->ac_groups_linear_remaining = sbi->s_mb_max_linear_groups; prefetch_grp = group; -for (i =0 ; i < ngroups; group =next_linear_group (ac, group, ngroups), - i++) { -int ret =0 , new_cr; +for (i =0 , new_cr = cr; i < ngroups; i++, +ext4_mb_choose_next_group (ac, &new_cr, &group, ngroups)) { +int ret =0 ;cond_resched (); - -ext4_mb_choose_next_group (ac, &new_cr, &group, ngroups);if (new_cr != cr) { cr = new_cr; goto repeat;
Greg Kroah-Hartman
maintainerPATCH 146/148 ext4: avoid unnecessary spreading of allocations among groups
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 1940265ede6683f6317cba0d428ce6505eaca944 upstream.
mb_set_largest_free_order() updates lists containing groups with largest chunk of free space of given order. The way it updates it leads to always moving the group to the tail of the list. Thus allocations looking for free space of given order effectively end up cycling through all groups (and due to initialization in last to first order). This spreads allocations among block groups which reduces performance for rotating disks or low-end flash media. Change mb_set_largest_free_order() to only update lists if the order of the largest free chunk in the group changed.
--- fs/ext4/mballoc.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
fs/ext4/mballoc.c +13 -11
@@ -1080,23 +1080,25 @@ mb_set_largest_free_order(struct super_bstruct ext4_sb_info *sbi =EXT4_SB (sb);int i; -if (test_opt2 (sb,MB_OPTIMIZE_SCAN ) && grp->bb_largest_free_order >=0 ) { +for (i =MB_NUM_ORDERS (sb) -1 ; i >=0 ; i--) +if (grp->bb_counters[i] >0 ) +break ; +/* No need to move between order lists? */ +if (!test_opt2 (sb,MB_OPTIMIZE_SCAN ) || + i == grp->bb_largest_free_order) { + grp->bb_largest_free_order = i; +return ; + } + +if (grp->bb_largest_free_order >=0 ) {write_lock (&sbi->s_mb_largest_free_orders_locks[ grp->bb_largest_free_order]);list_del_init (&grp->bb_largest_free_order_node);write_unlock (&sbi->s_mb_largest_free_orders_locks[ grp->bb_largest_free_order]); } - grp->bb_largest_free_order =-1 ;/* uninit */ - -for (i =MB_NUM_ORDERS (sb) -1 ; i >=0 ; i--) { -if (grp->bb_counters[i] >0 ) { - grp->bb_largest_free_order = i; -break ; - } - } -if (test_opt2 (sb,MB_OPTIMIZE_SCAN ) && - grp->bb_largest_free_order >=0 && grp->bb_free) { + grp->bb_largest_free_order = i; +if (grp->bb_largest_free_order >=0 && grp->bb_free) {write_lock (&sbi->s_mb_largest_free_orders_locks[ grp->bb_largest_free_order]); list_add_tail(&grp->bb_largest_free_order_node,
Greg Kroah-Hartman
maintainerPATCH 147/148 ext4: make directory inode spreading reflect flexbg size
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
Currently the Orlov inode allocator searches for free inodes for a directory only in flex block groups with at most inodes_per_group/16 more directory inodes than average per flex block group. However with growing size of flex block group this becomes unnecessarily strict. Scale allowed difference from average directory count per flex block group with flex block group size as we do with other metrics.
--- fs/ext4/ialloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/ialloc.c +1 -1
@@ -510,7 +510,7 @@ static int find_group_orlov(struct super goto fallback; } - max_dirs = ndirs / ngroups + inodes_per_group /16 ; + max_dirs = ndirs / ngroups + inodes_per_group*flex_size /16 ; min_inodes = avefreei - inodes_per_group*flex_size /4 ;if (min_inodes <1 ) min_inodes =1 ;
Greg Kroah-Hartman
maintainerPATCH 148/148 ext4: use locality group preallocation for small closed files
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit a9f2a2931d0e197ab28c6007966053fdababd53f upstream.
Curently we don't use any preallocation when a file is already closed when allocating blocks (from writeback code when converting delayed allocation). However for small files, using locality group preallocation is actually desirable as that is not specific to a particular file. Rather it is a method to pack small files together to reduce fragmentation and for that the fact the file is closed is actually even stronger hint the file would benefit from packing. So change the logic to allow locality group preallocation in this case.
--- fs/ext4/mballoc.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
fs/ext4/mballoc.c +15 -12
@@ -5169,6 +5169,7 @@ static void ext4_mb_group_or_file(structstruct ext4_sb_info *sbi =EXT4_SB (ac->ac_sb);int bsbits = ac->ac_sb->s_blocksize_bits;loff_t size, isize; +bool inode_pa_eligible, group_pa_eligible;if (!(ac->ac_flags &EXT4_MB_HINT_DATA ))return ;
@@ -5176,25 +5177,27 @@ static void ext4_mb_group_or_file(structif (unlikely (ac->ac_flags &EXT4_MB_HINT_GOAL_ONLY ))return ; + group_pa_eligible = sbi->s_mb_group_prealloc >0 ; + inode_pa_eligible = true; size = ac->ac_o_ex.fe_logical +EXT4_C2B (sbi, ac->ac_o_ex.fe_len); isize = (i_size_read (ac->ac_inode) + ac->ac_sb->s_blocksize -1 ) >> bsbits; +/* No point in using inode preallocation for closed files */ if ((size == isize) && !ext4_fs_is_busy (sbi) && - !inode_is_open_for_write (ac->ac_inode)) { - ac->ac_flags |=EXT4_MB_HINT_NOPREALLOC ; -return ; - } - -if (sbi->s_mb_group_prealloc <=0 ) { - ac->ac_flags |=EXT4_MB_STREAM_ALLOC ; -return ; - } + !inode_is_open_for_write (ac->ac_inode)) + inode_pa_eligible = false; -/* don't use group allocation for large files */ size =max (size, isize); -if (size > sbi->s_mb_stream_request) { - ac->ac_flags |=EXT4_MB_STREAM_ALLOC ; +/* Don't use group allocation for large files */ +if (size > sbi->s_mb_stream_request) + group_pa_eligible = false; + +if (!group_pa_eligible) { +if (inode_pa_eligible) + ac->ac_flags |=EXT4_MB_STREAM_ALLOC ; +else + ac->ac_flags |=EXT4_MB_HINT_NOPREALLOC ;return ; }
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +0000. Anything received after that time might be too late.
Building arm:ixp4xx_defconfig ... failed
--------------
Error log:drivers/gpio/gpio-ixp4xx.c:171:18: error: 'IRQCHIP_IMMUTABLE' undeclared here (not in a function); did you mean 'IS_IMMUTABLE'?
171 | .flags = IRQCHIP_IMMUTABLE,
| ^~~~~~~~~~~~~~~~~
| IS_IMMUTABLE
drivers/gpio/gpio-ixp4xx.c:172:9: error: 'GPIOCHIP_IRQ_RESOURCE_HELPERS' undeclared here (not in a function)
172 | GPIOCHIP_IRQ_RESOURCE_HELPERS,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/gpio/gpio-ixp4xx.c:172:9: warning: excess elements in struct initializerdrivers/gpio/gpio-ixp4xx.c:172:9: note: (near initialization for 'ixp4xx_gpio_irqchip')drivers/gpio/gpio-ixp4xx.c: In function 'ixp4xx_gpio_probe':drivers/gpio/gpio-ixp4xx.c:296:9: error: implicit declaration of function 'gpio_irq_chip_set_chip' [-Werror=implicit-function-declaration]
296 | gpio_irq_chip_set_chip(girq, &ixp4xx_gpio_irqchip);
| ^~~~~~~~~~~~~~~~~~~~~~Greg Kroah-Hartman
maintainerQuoted 21 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +0000. Anything received after that time might be too late.
Building arm:ixp4xx_defconfig ... failed
--------------
Error log:drivers/gpio/gpio-ixp4xx.c:171:18: error: 'IRQCHIP_IMMUTABLE' undeclared here (not in a function); did you mean 'IS_IMMUTABLE'?171 | .flags = IRQCHIP_IMMUTABLE, | ^~~~~~~~~~~~~~~~~ | IS_IMMUTABLE drivers/gpio/gpio-ixp4xx.c:172:9: error: 'GPIOCHIP_IRQ_RESOURCE_HELPERS' undeclared here (not in a function) 172 | GPIOCHIP_IRQ_RESOURCE_HELPERS, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 6 lines
drivers/gpio/gpio-ixp4xx.c:172:9: warning: excess elements in struct initializerdrivers/gpio/gpio-ixp4xx.c:172:9: note: (near initialization for 'ixp4xx_gpio_irqchip')drivers/gpio/gpio-ixp4xx.c: In function 'ixp4xx_gpio_probe':drivers/gpio/gpio-ixp4xx.c:296:9: error: implicit declaration of function 'gpio_irq_chip_set_chip' [-Werror=implicit-function-declaration]296 | gpio_irq_chip_set_chip(girq, &ixp4xx_gpio_irqchip); | ^~~~~~~~~~~~~~~~~~~~~~
Should now be fixed, will do a -rc2.
thanks,
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +0000. Anything received after that time might be too late.
Another build failure:
Building powerpc:defconfig ... failed
--------------
Error log:
powerpc64-linux-ld: arch/powerpc/kernel/rtas_entry.o: in function `enter_rtas':
(.text+0x92): undefined reference to `IRQS_ENABLED'
make[1]: *** [Makefile:1214: vmlinux] Error 1
make: *** [Makefile:219: __sub-make] Error 2
Greg Kroah-Hartman
maintainerQuoted 12 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +0000. Anything received after that time might be too late.
Another build failure:
Quoted 7 lines
Building powerpc:defconfig ... failed
--------------
Error log:
powerpc64-linux-ld:arch/powerpc/kernel/rtas_entry.o: in function `enter_rtas':
(.text+0x92): undefined reference to `IRQS_ENABLED'
make[1]: *** [Makefile:1214: vmlinux] Error 1
make: *** [Makefile:219: __sub-make] Error 2
Offending patch (and follow-on patch), now dropped, thanks.
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.71-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Following build warnings / errors noticed on arm and powerpc on stable-rc 5.15.
Regressions found on arm:
- build-gcc-8-ixp4xx_defconfig
- build-gcc-11-ixp4xx_defconfig
- build-gcc-12-ixp4xx_defconfig
- build-gcc-9-ixp4xx_defconfig
- build-gcc-10-ixp4xx_defconfig
Regressions found on powerpc:
- build-clang-nightly-defconfig
- build-gcc-8-maple_defconfig
- build-gcc-9-cell_defconfig
- build-gcc-12-cell_defconfig
- build-gcc-11-cell_defconfig
- build-gcc-8-cell_defconfig
- build-gcc-10-cell_defconfig
- build-clang-14-defconfig
- build-gcc-9-maple_defconfig
- build-gcc-10-maple_defconfig
- build-gcc-11-defconfig
- build-clang-13-defconfig
- build-gcc-8-defconfig
- build-gcc-12-maple_defconfig
- build-gcc-10-defconfig
- build-gcc-11-maple_defconfig
- build-gcc-9-defconfig
- build-gcc-12-defconfig
arm build errors:
-----------------drivers/gpio/gpio-ixp4xx.c:171:11: error: 'IRQCHIP_IMMUTABLE' undeclared here (not in a function); did you mean 'IS_IMMUTABLE'?
.flags = IRQCHIP_IMMUTABLE,
^~~~~~~~~~~~~~~~~
IS_IMMUTABLEdrivers/gpio/gpio-ixp4xx.c:172:2: error:
'GPIOCHIP_IRQ_RESOURCE_HELPERS' undeclared here (not in a function)
GPIOCHIP_IRQ_RESOURCE_HELPERS,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/gpio/gpio-ixp4xx.c:172:2: warning: excess elements in struct initializer drivers/gpio/gpio-ixp4xx.c:172:2: note: (near initialization for 'ixp4xx_gpio_irqchip')drivers/gpio/gpio-ixp4xx.c: In function 'ixp4xx_gpio_probe':drivers/gpio/gpio-ixp4xx.c:296:2: error: implicit declaration of function 'gpio_irq_chip_set_chip'; did you mean 'gpiochip_get_data'? [-Werror=implicit-function-declaration]
gpio_irq_chip_set_chip(girq, &ixp4xx_gpio_irqchip); ^~~~~~~~~~~~~~~~~~~~~~
gpiochip_get_data
cc1: some warnings being treated as errors
Build:
https://builds.tuxbuild.com/2FInaOdiei4NQtTNOEIHoQiC7Lq/
Powerpc build errors:
-----------------
powerpc64le-linux-gnu-ld: arch/powerpc/kernel/rtas_entry.o: in function `enter_rtas':
(.text+0x92): undefined reference to `IRQS_ENABLED'
build: https://builds.tuxbuild.com/2FInbucjJPAvqTvJc7358SVLh2O/
--
Linaro LKFT
https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 61 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.71-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Following build warnings / errors noticed on arm and powerpc on stable-rc 5.15.
Regressions found on arm:
- build-gcc-8-ixp4xx_defconfig
- build-gcc-11-ixp4xx_defconfig
- build-gcc-12-ixp4xx_defconfig
- build-gcc-9-ixp4xx_defconfig
- build-gcc-10-ixp4xx_defconfigRegressions found on powerpc:
- build-clang-nightly-defconfig
- build-gcc-8-maple_defconfig
- build-gcc-9-cell_defconfig
- build-gcc-12-cell_defconfig
- build-gcc-11-cell_defconfig
- build-gcc-8-cell_defconfig
- build-gcc-10-cell_defconfig
- build-clang-14-defconfig
- build-gcc-9-maple_defconfig
- build-gcc-10-maple_defconfig
- build-gcc-11-defconfig
- build-clang-13-defconfig
- build-gcc-8-defconfig
- build-gcc-12-maple_defconfig
- build-gcc-10-defconfig
- build-gcc-11-maple_defconfig
- build-gcc-9-defconfig
- build-gcc-12-defconfigarm build errors:
-----------------drivers/gpio/gpio-ixp4xx.c:171:11: error: 'IRQCHIP_IMMUTABLE' undeclared here (not in a function); did you mean 'IS_IMMUTABLE'?
.flags =IRQCHIP_IMMUTABLE,^~~~~~~~~~~~~~~~~ IS_IMMUTABLE
Quoted 15 lines
drivers/gpio/gpio-ixp4xx.c:172:2: error:
'GPIOCHIP_IRQ_RESOURCE_HELPERS' undeclared here (not in a function)
GPIOCHIP_IRQ_RESOURCE_HELPERS,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~drivers/gpio/gpio-ixp4xx.c:172:2: warning: excess elements in struct initializerdrivers/gpio/gpio-ixp4xx.c:172:2: note: (near initialization for 'ixp4xx_gpio_irqchip')drivers/gpio/gpio-ixp4xx.c: In function 'ixp4xx_gpio_probe':drivers/gpio/gpio-ixp4xx.c:296:2: error: implicit declaration of function 'gpio_irq_chip_set_chip'; did you mean 'gpiochip_get_data'? [-Werror=implicit-function-declaration]
gpio_irq_chip_set_chip(girq, &ixp4xx_gpio_irqchip); ^~~~~~~~~~~~~~~~~~~~~~
gpiochip_get_data
cc1: some warnings being treated as errors
Should be fixed now, will do a -rc2 soon.
thanks,
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.71 release. There are 148 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, 28 Sep 2022 10:07:26 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.71-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah