5.15.6-rc1 review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 5.15.6-rc1 review
This is the start of the stable review cycle for the 5.15.6 release. There are 179 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, 01 Dec 2021 18:16:51 +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.6-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.6-rc1
Alex Deucher <[email protected]>
drm/amdgpu/gfx9: switch to golden tsc registers for renoir+
Alex Deucher <[email protected]>
drm/amdgpu/gfx10: add wraparound gpu counter check for APUs as well
Ming Lei <[email protected]>
block: avoid to quiesce queue in elevator_init_mq
Ming Lei <[email protected]>
blk-mq: cancel blk-mq dispatch work in both blk_cleanup_queue and disk_release()
Mauro Carvalho Chehab <[email protected]>
docs: accounting: update delay-accounting.rst reference
Cristian Marussi <[email protected]>
firmware: arm_scmi: Fix type error in sensor protocol
Cristian Marussi <[email protected]>
firmware: arm_scmi: Fix type error assignment in voltage protocol
Ye Bin <[email protected]>
io_uring: fix soft lockup when call __io_remove_buffers
Shyam Prasad N <[email protected]>
cifs: nosharesock should be set on new server
Steven Rostedt (VMware) <[email protected]>
tracing: Check pid filtering when creating events
Christophe JAILLET <[email protected]>
ksmbd: Fix an error handling path in 'smb2_sess_setup()'
Stefano Garzarella <[email protected]>
vhost/vsock: fix incorrect used length reported to the guest
Longpeng <[email protected]>
vdpa_sim: avoid putting an uninitialized iova_domain
Joerg Roedel <[email protected]>
iommu/amd: Clarify AMD IOMMUv2 initialization messages
Jeff Layton <[email protected]>
ceph: properly handle statfs on multifs setups
Shyam Prasad N <[email protected]>
cifs: nosharesock should not share socket with future sessions
Krzysztof Kozlowski <[email protected]>
riscv: dts: microchip: drop duplicated MMC/SDHC node
Krzysztof Kozlowski <[email protected]>
riscv: dts: microchip: fix board compatible
Weichao Guo <[email protected]>
f2fs: set SBI_NEED_FSCK flag when inconsistent node block found
Chao Yu <[email protected]>
f2fs: quota: fix potential deadlock
Alex Williamson <[email protected]>
iommu/vt-d: Fix unmap_pages support
Alex Bee <[email protected]>
iommu/rockchip: Fix PAGE_DESC_HI_MASKs for RK3568
Mark Rutland <[email protected]>
sched/scs: Reset task stack state in bringup_cpu()
Marco Elver <[email protected]>
perf: Ignore sigtrap for tracepoints destined for other tasks
Waiman Long <[email protected]>
locking/rwsem: Make handoff bit handling more consistent
Vladimir Oltean <[email protected]>
net: mscc: ocelot: correctly report the timestamping RX filters in ethtool
Vladimir Oltean <[email protected]>
net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP
Jie Wang <[email protected]>
net: hns3: fix incorrect components info of ethtool --reset command
Guangbin Huang <[email protected]>
net: hns3: fix VF RSS failed problem after PF enable multi-TCs
Tony Lu <[email protected]>
net/smc: Don't call clcsock shutdown twice when smc shutdown
Ziyang Xuan <[email protected]>
net: vlan: fix underflow for the real_dev refcnt
Julian Wiedmann <[email protected]>
ethtool: ioctl: fix potential NULL deref in ethtool_set_coalesce()
Davide Caratti <[email protected]>
net/sched: sch_ets: don't peek at classes beyond 'nbands'
Yannick Vignon <[email protected]>
net: stmmac: Disable Tx queues when reconfiguring the interface
Jakub Kicinski <[email protected]>
tls: fix replacing proto_ops
Jakub Kicinski <[email protected]>
tls: splice_read: fix accessing pre-processed records
Jakub Kicinski <[email protected]>
tls: splice_read: fix record type check
Huang Pei <[email protected]>
MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48
Huang Pei <[email protected]>
MIPS: loongson64: fix FTLB configuration
Jesse Brandeburg <[email protected]>
igb: fix netpoll exit with traffic
Maurizio Lombardi <[email protected]>
nvmet: use IOCB_NOWAIT only if the filesystem supports it
Guo DaXing <[email protected]>
net/smc: Fix loop in smc_listen
Karsten Graul <[email protected]>
net/smc: Fix NULL pointer dereferencing in smc_vlan_by_tcpsk()
Russell King (Oracle) <[email protected]>
net: phylink: Force retrigger in case of latched link-fail indicator
Russell King (Oracle) <[email protected]>
net: phylink: Force link down and retrigger resolve on interface change
Heiner Kallweit <[email protected]>
lan743x: fix deadlock in lan743x_phy_link_status_change()
Eric Dumazet <[email protected]>
tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Set plane update flags for all planes in reset
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Fix DPIA outbox timeout after GPU reset
Thomas Zeitlhofer <[email protected]>
PM: hibernate: use correct mode for swsusp_close()
Kumar Thangavel <[email protected]>
net/ncsi : Add payload to be 32-bit aligned to fix dropped packets
Mark Rutland <[email protected]>
arm64: uaccess: avoid blocking within critical sections
Mohammed Gamal <[email protected]>
drm/hyperv: Fix device removal on Gen1 VMs
Varun Prakash <[email protected]>
nvmet-tcp: fix incomplete data digest send
Adamos Ttofari <[email protected]>
cpufreq: intel_pstate: Add Ice Lake server to out-of-band IDs
Marek Behún <[email protected]>
net: marvell: mvpp2: increase MTU limit when XDP enabled
Alex Elder <[email protected]>
net: ipa: kill ipa_cmd_pipeline_clear()
Alex Elder <[email protected]>
net: ipa: separate disabling setup from modem stop
Alex Elder <[email protected]>
net: ipa: directly disable ipa-setup-ready interrupt
Amit Cohen <[email protected]>
mlxsw: spectrum: Protect driver from buggy firmware
Tony Lu <[email protected]>
net/smc: Ensure the active closing peer first closes clcsock
Vincent Whitchurch <[email protected]>
i2c: virtio: disable timeout handling
Huang Jianan <[email protected]>
erofs: fix deadlock when shrink erofs slab
Shin'ichiro Kawasaki <[email protected]>
scsi: scsi_debug: Zero clear zones at reset write pointer
Mike Christie <[email protected]>
scsi: core: sysfs: Fix setting device state to SDEV_RUNNING
Marta Plantykow <[email protected]>
ice: avoid bpf_prog refcount underflow
Maciej Fijalkowski <[email protected]>
ice: fix vsi->txq_map sizing
Nikolay Aleksandrov <[email protected]>
net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group
Nikolay Aleksandrov <[email protected]>
net: ipv6: add fib6_nh_release_dsts stub
Holger Assmann <[email protected]>
net: stmmac: retain PTP clock time during SIOCSHWTSTAMP ioctls
Diana Wang <[email protected]>
nfp: checking parameter process for rx-usecs/tx-usecs is invalid
Eric Dumazet <[email protected]>
ipv6: fix typos in __ip6_finish_output()
Michael Kelley <[email protected]>
firmware: smccc: Fix check for ARCH_SOC_ID not implemented
Vincent Whitchurch <[email protected]>
af_unix: fix regression in read after shutdown
Paolo Abeni <[email protected]>
mptcp: use delegate action to schedule 3rd ack retrans
Eric Dumazet <[email protected]>
mptcp: fix delack timer
Pierre-Louis Bossart <[email protected]>
ALSA: intel-dsp-config: add quirk for JSL devices based on ES8336 codec
Juergen Gross <[email protected]>
xen/pvh: add missing prototype to header
Juergen Gross <[email protected]>
x86/pvh: add prototype for xen_pvh_init()
Brett Creeley <[email protected]>
iavf: Fix VLAN feature flags after VFR
Jedrzej Jagielski <[email protected]>
iavf: Fix refreshing iavf adapter stats on ethtool request
Nitesh B Venkatesh <[email protected]>
iavf: Prevent changing static ITR values if adaptive moderation is on
Claudia Pellegrino <[email protected]>
HID: magicmouse: prevent division by 0 on scroll
Thomas Weißschuh <[email protected]>
HID: input: set usage type to key on keycode remap
Hans de Goede <[email protected]>
HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields
Volodymyr Mytnyk <[email protected]>
net: marvell: prestera: fix double free issue on err path
Volodymyr Mytnyk <[email protected]>
net: marvell: prestera: fix brige port operation
Joel Stanley <[email protected]>
drm/aspeed: Fix vga_pw sysfs output
Dan Carpenter <[email protected]>
drm/vc4: fix error code in vc4_create_object()
Sreekanth Reddy <[email protected]>
scsi: mpt3sas: Fix incorrect system timestamp
Sreekanth Reddy <[email protected]>
scsi: mpt3sas: Fix system going into read-only mode
Sreekanth Reddy <[email protected]>
scsi: mpt3sas: Fix kernel panic during drive powercycle test
Dan Carpenter <[email protected]>
scsi: qla2xxx: edif: Fix off by one bug in qla_edif_app_getfcinfo()
Dan Carpenter <[email protected]>
drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks
Takashi Iwai <[email protected]>
ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE
Trond Myklebust <[email protected]>
NFSv42: Don't fail clone() unless the OP_CLONE operation failed
Olivier Moysan <[email protected]>
ASoC: stm32: i2s: fix 32 bits channel length without mclk
Peng Fan <[email protected]>
firmware: arm_scmi: pm: Propagate return value to caller
Vincent Guittot <[email protected]>
firmware: arm_scmi: Fix base agent discover response
Alexander Aring <[email protected]>
net: ieee802154: handle iftypes as u32
Srinivas Kandagatla <[email protected]>
ASoC: codecs: lpass-rx-macro: fix HPHR setting CLSH mask
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd934x: return error code correctly from hw_params
Srinivas Kandagatla <[email protected]>
ASoC: codecs: wcd938x: fix volatile register range
Takashi Iwai <[email protected]>
ASoC: topology: Add missing rwsem around snd_ctl_remove() calls
Srinivas Kandagatla <[email protected]>
ASoC: qdsp6: q6asm: fix q6asm_dai_prepare error handling
Srinivas Kandagatla <[email protected]>
ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer
Florian Fainelli <[email protected]>
ARM: dts: bcm2711: Fix PCIe interrupts
Florian Fainelli <[email protected]>
ARM: dts: BCM5301X: Add interrupt properties to GPIO node
Florian Fainelli <[email protected]>
ARM: dts: BCM5301X: Fix I2C controller interrupt
Cristian Marussi <[email protected]>
firmware: arm_scmi: Fix null de-reference on error path
Arnd Bergmann <[email protected]>
media: v4l2-core: fix VIDIOC_DQEVENT handling on non-x86
Will Mortensen <[email protected]>
netfilter: flowtable: fix IPv6 tunnel addr match
yangxingwu <[email protected]>
netfilter: ipvs: Fix reuse connection if RS weight is 0
Florent Fourcot <[email protected]>
netfilter: ctnetlink: do not erase error code with EINVAL
Florent Fourcot <[email protected]>
netfilter: ctnetlink: fix filtering with CTA_TUPLE_REPLY
Kai Vehmanen <[email protected]>
ASoC: SOF: Intel: hda: fix hotplug when only codec is suspended
David Hildenbrand <[email protected]>
proc/vmcore: fix clearing user buffer by properly using clear_user()
Roman Li <[email protected]>
drm/amd/display: Fix OLED brightness control on eDP
Pali Rohár <[email protected]>
PCI: aardvark: Fix link training
Pali Rohár <[email protected]>
PCI: aardvark: Simplify initialization of rootcap on virtual bridge
Pali Rohár <[email protected]>
PCI: aardvark: Implement re-issuing config requests on CRS response
Marek Behún <[email protected]>
PCI: aardvark: Deduplicate code in advk_pcie_rd_conf()
Benjamin Coddington <[email protected]>
NFSv42: Fix pagecache invalidation after COPY/CLONE
Andreas Gruenbacher <[email protected]>
iomap: Fix inline extent handling in iomap_readpage
Christophe Leroy <[email protected]>
powerpc/32: Fix hardlockup on vmap stack overflow
Rafael J. Wysocki <[email protected]>
cpufreq: intel_pstate: Fix active mode offline/online EPP handling
Pingfan Liu <[email protected]>
arm64: mm: Fix VM_BUG_ON(mm != &init_mm) for trans_pgd
Dylan Hung <[email protected]>
mdio: aspeed: Fix "Link is Down" issue
Adrian Hunter <[email protected]>
mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB
Tim Harvey <[email protected]>
mmc: sdhci-esdhc-imx: disable CMDQ support
Steven Rostedt (VMware) <[email protected]>
tracing: Fix pid filtering when triggers are attached
Jiri Olsa <[email protected]>
tracing/uprobe: Fix uprobe_perf_open probes iteration
Nicholas Piggin <[email protected]>
KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB
Namjae Jeon <[email protected]>
ksmbd: fix memleak in get_file_stream_info()
Namjae Jeon <[email protected]>
ksmbd: contain default data stream even if xattr is empty
Namjae Jeon <[email protected]>
ksmbd: downgrade addition info error msg to debug in smb2_get_info_sec()
Ben Skeggs <[email protected]>
drm/nouveau: recognise GA106
Alex Deucher <[email protected]>
drm/amdgpu/pm: fix powerplay OD interface
Philip Yang <[email protected]>
drm/amdgpu: IH process reset count when restart
Pavel Begunkov <[email protected]>
io_uring: fix link traversal locking
Pavel Begunkov <[email protected]>
io_uring: fail cancellation for EXITING tasks
Pavel Begunkov <[email protected]>
io_uring: correct link-list traversal locking
Stefano Stabellini <[email protected]>
xen: detect uninitialized xenbus in xenbus_init
Stefano Stabellini <[email protected]>
xen: don't continue xenstore initialization in case of errors
Miklos Szeredi <[email protected]>
fuse: release pipe buf after last use
Dan Carpenter <[email protected]>
staging: r8188eu: fix a memory leak in rtw_wx_read32()
Michael Straube <[email protected]>
staging: r8188eu: use GFP_ATOMIC under spinlock
Larry Finger <[email protected]>
staging: r8188eu: Fix breakage introduced when 5G code was removed
Fabio M. De Francesco <[email protected]>
staging: r8188eu: Use kzalloc() with GFP_ATOMIC in atomic context
Dan Carpenter <[email protected]>
staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect()
Takashi Iwai <[email protected]>
staging: greybus: Add missing rwsem around snd_ctl_remove() calls
Noralf Trønnes <[email protected]>
staging/fbtft: Fix backlight
Jason Gerecke <[email protected]>
HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts
Helge Deller <[email protected]>
Revert "parisc: Fix backtrace to always include init funtion names"
Hans Verkuil <[email protected]>
media: cec: copy sequence field for the reply
Takashi Iwai <[email protected]>
ALSA: hda/realtek: Fix LED on HP ProBook 435 G7
Werner Sembach <[email protected]>
ALSA: hda/realtek: Add quirk for ASRock NUC Box 1100
Takashi Iwai <[email protected]>
ALSA: ctxfi: Fix out-of-range access
Todd Kjos <[email protected]>
binder: fix test regression due to sender_euid change
Mathias Nyman <[email protected]>
usb: hub: Fix locking issues with address0_mutex
Mathias Nyman <[email protected]>
usb: hub: Fix usb enumeration issue due to address0 race
Dmitry Osipenko <[email protected]>
usb: xhci: tegra: Check padctrl interrupt presence in device tree
Ondrej Jirman <[email protected]>
usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts
Dan Carpenter <[email protected]>
usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe
Nikolay Aleksandrov <[email protected]>
net: nexthop: fix null pointer dereference when IPv6 is not enabled
Martyn Welch <[email protected]>
net: usb: Correct PHY handling of smsc95xx
Albert Wang <[email protected]>
usb: dwc3: gadget: Fix null pointer exception
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Check for L1/L2/U3 for Start Transfer
Thinh Nguyen <[email protected]>
usb: dwc3: gadget: Ignore NoStream after End Transfer
Thinh Nguyen <[email protected]>
usb: dwc3: core: Revise GHWPARAMS9 offset
Fabio Aiuto <[email protected]>
usb: dwc3: leave default DMA for PCI devices
Nathan Chancellor <[email protected]>
usb: dwc2: hcd_queue: Fix use of floating point literal
Minas Harutyunyan <[email protected]>
usb: dwc2: gadget: Fix ISOC flow for elapsed frames
Mingjie Zhang <[email protected]>
USB: serial: option: add Fibocom FM101-GL variants
Daniele Palmas <[email protected]>
USB: serial: option: add Telit LE910S1 0x9200 composition
Johan Hovold <[email protected]>
USB: serial: pl2303: fix GC type detection
Rafael J. Wysocki <[email protected]>
ACPI: CPPC: Add NULL pointer check to cppc_get_perf()
Sakari Ailus <[email protected]>
ACPI: Get acpi_device's parent from the parent field
Damien Le Moal <[email protected]>
scsi: sd: Fix sd_do_mode_sense() buffer length handling
-------------
Diffstat:
Documentation/admin-guide/sysctl/kernel.rst | 2 +- Documentation/networking/ipvs-sysctl.rst | 3 +- Makefile | 4 +- arch/arm/boot/dts/bcm2711.dtsi | 8 +- arch/arm/boot/dts/bcm5301x.dtsi | 4 +- arch/arm/mach-socfpga/core.h | 2 +- arch/arm/mach-socfpga/platsmp.c | 8 +- arch/arm64/include/asm/pgalloc.h | 2 +- arch/arm64/include/asm/uaccess.h | 48 +++- arch/mips/Kconfig | 2 +- arch/mips/kernel/cpu-probe.c | 4 +- arch/parisc/kernel/vmlinux.lds.S | 3 +- arch/powerpc/kernel/head_32.h | 6 +- arch/powerpc/kvm/book3s_hv_builtin.c | 5 +- .../dts/microchip/microchip-mpfs-icicle-kit.dts | 13 +- arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi | 33 +-- arch/x86/include/asm/xen/hypervisor.h | 5 + block/blk-core.c | 4 +- block/blk-mq.c | 13 ++ block/blk-mq.h | 2 + block/blk-sysfs.c | 10 - block/elevator.c | 10 +- block/genhd.c | 2 + drivers/acpi/cppc_acpi.c | 9 +- drivers/acpi/property.c | 11 +- drivers/android/binder.c | 2 +- drivers/cpufreq/intel_pstate.c | 7 + drivers/firmware/arm_scmi/base.c | 15 +- drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 +- drivers/firmware/arm_scmi/sensors.c | 2 +- drivers/firmware/arm_scmi/virtio.c | 10 +- drivers/firmware/arm_scmi/voltage.c | 2 +- drivers/firmware/smccc/soc_id.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 3 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 46 +++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 20 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 24 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 6 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 28 ++- .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 10 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 58 +++-- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 19 +- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 22 ++ drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 6 +- drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 6 +- drivers/gpu/drm/vc4/vc4_bo.c | 2 +- drivers/hid/hid-input.c | 6 +- drivers/hid/hid-magicmouse.c | 7 +- drivers/hid/wacom_wac.c | 8 +- drivers/hid/wacom_wac.h | 1 + drivers/i2c/busses/i2c-virtio.c | 14 +- drivers/iommu/amd/iommu_v2.c | 6 +- drivers/iommu/intel/iommu.c | 6 +- drivers/iommu/rockchip-iommu.c | 4 +- drivers/media/cec/core/cec-adap.c | 1 + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 41 ++-- drivers/mmc/host/sdhci-esdhc-imx.c | 2 - drivers/mmc/host/sdhci.c | 21 +- drivers/mmc/host/sdhci.h | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 +- drivers/net/ethernet/intel/iavf/iavf.h | 3 + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 33 ++- drivers/net/ethernet/intel/iavf/iavf_main.c | 51 +++-- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 47 +++- drivers/net/ethernet/intel/ice/ice_lib.c | 9 +- drivers/net/ethernet/intel/ice/ice_main.c | 18 +- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 +- .../ethernet/marvell/prestera/prestera_switchdev.c | 8 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- drivers/net/ethernet/microchip/lan743x_main.c | 12 +- drivers/net/ethernet/mscc/ocelot.c | 11 +- drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 - .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 127 +++++++---- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- drivers/net/ipa/ipa_cmd.c | 16 -- drivers/net/ipa/ipa_cmd.h | 6 - drivers/net/ipa/ipa_endpoint.c | 2 - drivers/net/ipa/ipa_main.c | 6 + drivers/net/ipa/ipa_modem.c | 6 +- drivers/net/ipa/ipa_smp2p.c | 21 +- drivers/net/ipa/ipa_smp2p.h | 7 +- drivers/net/mdio/mdio-aspeed.c | 7 + drivers/net/phy/phylink.c | 26 ++- drivers/net/usb/smsc95xx.c | 55 +++-- drivers/nvme/target/io-cmd-file.c | 4 +- drivers/nvme/target/tcp.c | 7 +- drivers/pci/controller/pci-aardvark.c | 242 +++++++++------------ drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 59 ++++- drivers/scsi/qla2xxx/qla_edif.c | 2 +- drivers/scsi/scsi_debug.c | 5 + drivers/scsi/scsi_sysfs.c | 2 +- drivers/scsi/sd.c | 7 + drivers/staging/fbtft/fb_ssd1351.c | 4 - drivers/staging/fbtft/fbtft-core.c | 9 +- drivers/staging/greybus/audio_helper.c | 8 +- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 8 +- drivers/staging/r8188eu/os_dep/mlme_linux.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +- drivers/usb/chipidea/ci_hdrc_imx.c | 18 +- drivers/usb/core/hub.c | 24 +- drivers/usb/dwc2/gadget.c | 17 +- drivers/usb/dwc2/hcd_queue.c | 2 +- drivers/usb/dwc3/core.c | 8 +- drivers/usb/dwc3/core.h | 2 +- drivers/usb/dwc3/gadget.c | 39 +++- drivers/usb/host/xhci-tegra.c | 41 +++- drivers/usb/serial/option.c | 5 + drivers/usb/serial/pl2303.c | 1 + drivers/usb/typec/tcpm/fusb302.c | 6 +- drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +- drivers/vhost/vsock.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 27 ++- fs/ceph/super.c | 11 +- fs/cifs/cifs_debug.c | 2 + fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 7 + fs/erofs/utils.c | 8 +- fs/f2fs/checkpoint.c | 3 +- fs/f2fs/node.c | 1 + fs/fuse/dev.c | 10 +- fs/io_uring.c | 70 ++++-- fs/iomap/buffered-io.c | 11 +- fs/ksmbd/smb2pdu.c | 30 +-- fs/nfs/nfs42proc.c | 4 +- fs/nfs/nfs42xdr.c | 3 +- fs/proc/vmcore.c | 16 +- include/net/ip6_fib.h | 1 + include/net/ipv6_stubs.h | 1 + include/net/nl802154.h | 7 +- kernel/cpu.c | 7 + kernel/events/core.c | 3 + kernel/locking/rwsem.c | 171 ++++++++------- kernel/power/hibernate.c | 6 +- kernel/sched/core.c | 4 - kernel/trace/trace.h | 24 +- kernel/trace/trace_events.c | 10 + kernel/trace/trace_uprobe.c | 1 + net/8021q/vlan.c | 3 - net/8021q/vlan_dev.c | 3 + net/ethtool/ioctl.c | 2 +- net/ipv4/nexthop.c | 35 ++- net/ipv4/tcp_cubic.c | 5 +- net/ipv6/af_inet6.c | 1 + net/ipv6/ip6_output.c | 2 +- net/ipv6/route.c | 19 ++ net/mptcp/options.c | 32 +-- net/mptcp/protocol.c | 51 ++++- net/mptcp/protocol.h | 17 +- net/ncsi/ncsi-cmd.c | 24 +- net/netfilter/ipvs/ip_vs_core.c | 8 +- net/netfilter/nf_conntrack_netlink.c | 6 +- net/netfilter/nf_flow_table_offload.c | 4 +- net/sched/sch_ets.c | 8 +- net/smc/af_smc.c | 12 +- net/smc/smc_close.c | 6 + net/smc/smc_core.c | 35 +-- net/tls/tls_main.c | 47 +++- net/tls/tls_sw.c | 40 ++-- net/unix/af_unix.c | 3 - sound/hda/intel-dsp-config.c | 9 + sound/pci/ctxfi/ctamixer.c | 14 +- sound/pci/ctxfi/ctdaio.c | 16 +- sound/pci/ctxfi/ctresource.c | 7 +- sound/pci/ctxfi/ctresource.h | 4 +- sound/pci/ctxfi/ctsrc.c | 7 +- sound/pci/hda/patch_realtek.c | 28 +++ sound/soc/codecs/lpass-rx-macro.c | 2 +- sound/soc/codecs/wcd934x.c | 3 +- sound/soc/codecs/wcd938x.c | 3 + sound/soc/qcom/qdsp6/q6asm-dai.c | 19 +- sound/soc/qcom/qdsp6/q6routing.c | 6 +- sound/soc/soc-topology.c | 3 + sound/soc/sof/intel/hda-bus.c | 17 ++ sound/soc/sof/intel/hda-dsp.c | 3 +- sound/soc/sof/intel/hda.c | 16 ++ sound/soc/stm/stm32_i2s.c | 2 +- 186 files changed, 1695 insertions(+), 973 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/179 scsi: sd: Fix sd_do_mode_sense() buffer length handling
From: Damien Le Moal <[email protected]>
commit c749301ebee82eb5e97dec14b6ab31a4aabe37a6 upstream.
For devices that explicitly asked for MODE SENSE(10) use, make sure that scsi_mode_sense() is called with a buffer of at least 8 bytes so that the sense header fits.
--- drivers/scsi/sd.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/sd.c +7 -0
@@ -2607,6 +2607,13 @@ sd_do_mode_sense(struct scsi_disk *sdkp, unsigned char *buffer, int len, struct scsi_mode_data *data, struct scsi_sense_hdr *sshdr) { + /* + * If we must use MODE SENSE(10), make sure that the buffer length + * is at least 8 bytes so that the mode sense header fits. + */ + if (sdkp->device->use_10_for_ms && len < 8) + len =8 ; +return scsi_mode_sense (sdkp->device, dbd, modepage, buffer, len,SD_TIMEOUT , sdkp->max_retries, data, sshdr);
Greg Kroah-Hartman
maintainerPATCH 2/179 ACPI: Get acpi_devices parent from the parent field
In reply to Greg Kroah-HartmanFrom: Sakari Ailus <[email protected]>
commit 9054fc6d57e80c27c0b0632966416144f2092c2b upstream.
Printk modifier %pfw is used to print the full path of the device name. This is obtained device by device until a device no longer has a parent.
On ACPI getting the parent fwnode is done by calling acpi_get_parent() which tries to down() a semaphore. But local IRQs are now disabled in vprintk_store() before the mutex is acquired. This is obviously a problem.
Luckily struct device, embedded in struct acpi_device, has a parent field already. Use that field to get the parent instead of relying on acpi_get_parent().
--- drivers/acpi/property.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/acpi/property.c +3 -8
@@ -1090,15 +1090,10 @@ struct fwnode_handle *acpi_node_get_pare/* All data nodes have parent pointer so just return that */ return to_acpi_data_node (fwnode)->parent; }else if (is_acpi_device_node (fwnode)) { -acpi_handle handle, parent_handle; +struct device *dev =to_acpi_device_node (fwnode)->dev.parent; - handle =to_acpi_device_node (fwnode)->handle; -if (ACPI_SUCCESS (acpi_get_parent (handle, &parent_handle))) { -struct acpi_device *adev; - -if (!acpi_bus_get_device (parent_handle, &adev)) -return acpi_fwnode_handle (adev); - } +if (dev) +return acpi_fwnode_handle (to_acpi_device (dev)); }return NULL ;
Greg Kroah-Hartman
maintainerPATCH 3/179 ACPI: CPPC: Add NULL pointer check to cppc_get_perf()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 935dff305da2be7957a5ce8f07f45d6c4c1c6984 upstream.
Check cpc_desc against NULL in cppc_get_perf(), so it doesn't crash down the road if cpc_desc is NULL.
--- drivers/acpi/cppc_acpi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/acpi/cppc_acpi.c +8 -1
@@ -1011,7 +1011,14 @@ static int cpc_write(int cpu, struct cpcstatic int cppc_get_perf (int cpunum,enum cppc_regs reg_idx,u64 *perf) {struct cpc_desc *cpc_desc =per_cpu (cpc_desc_ptr, cpunum); -struct cpc_register_resource *reg = &cpc_desc->cpc_regs[reg_idx]; +struct cpc_register_resource *reg; + +if (!cpc_desc) { +pr_debug ("No CPC descriptor for CPU:%d\n" , cpunum); +return -ENODEV ; + } + + reg = &cpc_desc->cpc_regs[reg_idx];if (CPC_IN_PCC (reg)) {int pcc_ss_id =per_cpu (cpu_pcc_subspace_idx, cpunum);
Greg Kroah-Hartman
maintainerPATCH 4/179 USB: serial: pl2303: fix GC type detection
In reply to Greg Kroah-HartmanFrom: Johan Hovold <[email protected]>
commit aa5721a9e0c9fb8a4bdfe0c8751377cd537d6174 upstream.
At least some PL2303GC have a bcdDevice of 0x105 instead of 0x100 as the datasheet claims. Add it to the list of known release numbers for the HXN (G) type.
Note the chip type could only be determined indirectly based on its package being of QFP type, which appears to only be available for PL2303GC.
--- drivers/usb/serial/pl2303.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -432,6 +432,7 @@ static int pl2303_detect_type(struct usbcase 0x200 :switch (bcdDevice) {case 0x100 : +case 0x105 :case 0x305 :case 0x405 :/*
Greg Kroah-Hartman
maintainerPATCH 5/179 USB: serial: option: add Telit LE910S1 0x9200 composition
In reply to Greg Kroah-HartmanFrom: Daniele Palmas <[email protected]>
commit e353f3e88720300c3d72f49a4bea54f42db1fa5e upstream.
Add the following Telit LE910S1 composition:
0x9200: tty
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -1267,6 +1267,8 @@ static const struct usb_device_id option .driver_info = NCTRL(2) }, { USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */ .driver_info = NCTRL(0) | ZLP }, + { USB_DEVICE(TELIT_VENDOR_ID, 0x9200), /* Telit LE910S1 flashing device */ + .driver_info = NCTRL(0) | ZLP }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), .driver_info = RSVD(1) },
Greg Kroah-Hartman
maintainerPATCH 6/179 USB: serial: option: add Fibocom FM101-GL variants
In reply to Greg Kroah-HartmanFrom: Mingjie Zhang <[email protected]>
commit 88459e3e42760abb2299bbf6cb1026491170e02a upstream.
Update the USB serial option driver support for the Fibocom FM101-GL Cat.6
LTE modules as there are actually several different variants.
- VID:PID 2cb7:01a2, FM101-GL are laptop M.2 cards (with MBIM interfaces for /Linux/Chrome OS)
- VID:PID 2cb7:01a4, FM101-GL for laptop debug M.2 cards(with adb interface for /Linux/Chrome OS)
0x01a2: mbim, tty, tty, diag, gnss0x01a4: mbim, diag, tty, adb, gnss, gnss
Here are the outputs of lsusb -v and usb-devices:
T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 86 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 P: Vendor=2cb7 ProdID=01a2 Rev= 5.04 S: Manufacturer=Fibocom Wireless Inc. S: Product=Fibocom FM101-GL Module S: SerialNumber=673326ce
C:* #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA
A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00
I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim
I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=(none) I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=(none) I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none) I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=(none)
Bus 002 Device 084: ID 2cb7:01a2 Fibocom Wireless Inc. Fibocom FM101-GL Module Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 3.20
bDeviceClass 0 bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 9 idVendor 0x2cb7 idProduct 0x01a2 bcdDevice 5.04 iManufacturer 1 Fibocom Wireless Inc. iProduct 2 Fibocom FM101-GL Module iSerial 3 673326ce bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x015d
bNumInterfaces 6
bConfigurationValue 1
iConfiguration 4 MBIM_DUN_DUN_DIAG_NMEA
bmAttributes 0xa0
(Bus Powered)
Remote Wakeup
MaxPower 896mA
Interface Association:
bLength 8
bDescriptorType 11
bFirstInterface 0
bInterfaceCount 2
bFunctionClass 2 Communications
bFunctionSubClass 14
bFunctionProtocol 0
iFunction 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 1
bInterfaceClass 2 Communications
bInterfaceSubClass 14
bInterfaceProtocol 0
iInterface 5 Fibocom FM101-GL LTE Modem
CDC Header:
bcdCDC 1.10
CDC Union:
bMasterInterface 0
bSlaveInterface 1
CDC MBIM:
bcdMBIMVersion 1.00
wMaxControlMessage 4096
bNumberFilters 32
bMaxFilterSize 128
wMaxSegmentSize 2048
bmNetworkCapabilities 0x20
8-byte ntb input size
CDC MBIM Extended:
bcdMBIMExtendedVersion 1.00
bMaxOutstandingCommandMessages 64
wMTU 1500
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 9
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 0
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0
bInterfaceProtocol 2
iInterface 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 1
bNumEndpoints 2
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0
bInterfaceProtocol 2
iInterface 6 MBIM Data
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x8e EP 14 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 6
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x0f EP 15 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 2
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 2
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 64
iInterface 0
** UNRECOGNIZED: 05 24 00 10 01
** UNRECOGNIZED: 05 24 01 00 00
** UNRECOGNIZED: 04 24 02 02
** UNRECOGNIZED: 05 24 06 00 00
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x83 EP 3 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x000a 1x 10 bytes
bInterval 9
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 3
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 64
iInterface 0
** UNRECOGNIZED: 05 24 00 10 01
** UNRECOGNIZED: 05 24 01 00 00
** UNRECOGNIZED: 04 24 02 02
** UNRECOGNIZED: 05 24 06 00 00
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x85 EP 5 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x000a 1x 10 bytes
bInterval 9
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x84 EP 4 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 4
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 48
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x03 EP 3 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x86 EP 6 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 5
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 0
bInterfaceProtocol 64
iInterface 0
** UNRECOGNIZED: 05 24 00 10 01
** UNRECOGNIZED: 05 24 01 00 00
** UNRECOGNIZED: 04 24 02 02
** UNRECOGNIZED: 05 24 06 00 00
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x88 EP 8 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x000a 1x 10 bytes
bInterval 9
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x87 EP 7 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x04 EP 4 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 85 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 P: Vendor=2cb7 ProdID=01a4 Rev= 5.04 S: Manufacturer=Fibocom Wireless Inc. S: Product=Fibocom FM101-GL Module S: SerialNumber=673326ce
C:* #Ifs= 7 Cfg#= 1 Atr=a0 MxPwr=896mA
A: FirstIf#= 0 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00
I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim
I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=(none) I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=(none) I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) I:* If#= 5 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=(none) I:* If#= 6 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=40 Driver=(none)
Bus 002 Device 085: ID 2cb7:01a4 Fibocom Wireless Inc. Fibocom FM101-GL Module Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 3.20
bDeviceClass 0 bDeviceSubClass 0 bDeviceProtocol 0 bMaxPacketSize0 9 idVendor 0x2cb7 idProduct 0x01a4 bcdDevice 5.04 iManufacturer 1 Fibocom Wireless Inc. iProduct 2 Fibocom FM101-GL Module iSerial 3 673326ce bNumConfigurations 1
Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 0x0180
bNumInterfaces 7
bConfigurationValue 1
iConfiguration 4 MBIM_DIAG_DUN_ADB_GNSS_GNSS
bmAttributes 0xa0
(Bus Powered)
Remote Wakeup
MaxPower 896mA
Interface Association:
bLength 8
bDescriptorType 11
bFirstInterface 0
bInterfaceCount 2
bFunctionClass 2 Communications
bFunctionSubClass 14
bFunctionProtocol 0
iFunction 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 1
bInterfaceClass 2 Communications
bInterfaceSubClass 14
bInterfaceProtocol 0
iInterface 5 Fibocom FM101-GL LTE Modem
CDC Header:
bcdCDC 1.10
CDC Union:
bMasterInterface 0
bSlaveInterface 1
CDC MBIM:
bcdMBIMVersion 1.00
wMaxControlMessage 4096
bNumberFilters 32
bMaxFilterSize 128
wMaxSegmentSize 2048
bmNetworkCapabilities 0x20
8-byte ntb input size
CDC MBIM Extended:
bcdMBIMExtendedVersion 1.00
bMaxOutstandingCommandMessages 64
wMTU 1500
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 9
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 0
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0
bInterfaceProtocol 2
iInterface 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 1
bNumEndpoints 2
bInterfaceClass 10 CDC Data
bInterfaceSubClass 0
bInterfaceProtocol 2
iInterface 6 MBIM Data
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x8e EP 14 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 6
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x0f EP 15 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 2
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 2
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 48
iInterface 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x01 EP 1 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 3
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 64
iInterface 0
** UNRECOGNIZED: 05 24 00 10 01
** UNRECOGNIZED: 05 24 01 00 00
** UNRECOGNIZED: 04 24 02 02
** UNRECOGNIZED: 05 24 06 00 00
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x84 EP 4 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x000a 1x 10 bytes
bInterval 9
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x83 EP 3 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 4
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 66
bInterfaceProtocol 1
iInterface 8 ADB Interface
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x03 EP 3 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x85 EP 5 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 5
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 0
bInterfaceProtocol 64
iInterface 0
** UNRECOGNIZED: 05 24 00 10 01
** UNRECOGNIZED: 05 24 01 00 00
** UNRECOGNIZED: 04 24 02 02
** UNRECOGNIZED: 05 24 06 00 00
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x87 EP 7 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x000a 1x 10 bytes
bInterval 9
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x86 EP 6 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x04 EP 4 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 6
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 0
bInterfaceProtocol 64
iInterface 0
** UNRECOGNIZED: 05 24 00 10 01
** UNRECOGNIZED: 05 24 01 00 00
** UNRECOGNIZED: 04 24 02 02
** UNRECOGNIZED: 05 24 06 00 00
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x89 EP 9 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x000a 1x 10 bytes
bInterval 9
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x88 EP 8 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x05 EP 5 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0400 1x 1024 bytes
bInterval 0
bMaxBurst 0
--- drivers/usb/serial/option.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/option.c +3 -0
@@ -2096,6 +2096,9 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */ + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */ + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */ + .driver_info = RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) }, /* GosunCn GM500 RNDIS */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) }, /* GosunCn GM500 MBIM */
Greg Kroah-Hartman
maintainerPATCH 7/179 usb: dwc2: gadget: Fix ISOC flow for elapsed frames
In reply to Greg Kroah-HartmanFrom: Minas Harutyunyan <[email protected]>
commit 7ad4a0b1d46b2612f4429a72afd8f137d7efa9a9 upstream.
Added updating of request frame number for elapsed frames, otherwise frame number will remain as previous use of request. This will allow function driver to correctly track frames in case of Missed ISOC occurs.
Added setting request actual length to 0 for elapsed frames. In Slave mode when pushing data to RxFIFO by dwords, request actual length incrementing accordingly. But before whole packet will be pushed into RxFIFO and send to host can occurs Missed ISOC and data will not send to host. So, in this case request actual length should be reset to 0.
--- drivers/usb/dwc2/gadget.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/usb/dwc2/gadget.c +14 -3
@@ -1198,6 +1198,8 @@ static void dwc2_hsotg_start_req(struct } ctrl |=DXEPCTL_CNAK ; }else { + hs_req->req.frame_number = hs_ep->target_frame; + hs_req->req.actual =0 ;dwc2_hsotg_complete_request (hsotg, hs_ep, hs_req, -ENODATA );return ; }
@@ -2857,9 +2859,12 @@ static void dwc2_gadget_handle_ep_disabl do { hs_req = get_ep_head(hs_ep); - if (hs_req) + if (hs_req) { + hs_req->req.frame_number = hs_ep->target_frame; + hs_req->req.actual = 0; dwc2_hsotg_complete_request(hsotg, hs_ep, hs_req, -ENODATA); + } dwc2_gadget_incr_frame_num(hs_ep); /* Update current frame number value. */ hsotg->frame_number = dwc2_hsotg_read_frameno(hsotg);
@@ -2912,8 +2917,11 @@ static void dwc2_gadget_handle_out_tokenwhile (dwc2_gadget_target_frame_elapsed (ep)) { hs_req =get_ep_head (ep); -if (hs_req) +if (hs_req) { + hs_req->req.frame_number = ep->target_frame; + hs_req->req.actual =0 ;dwc2_hsotg_complete_request (hsotg, ep, hs_req, -ENODATA ); + }dwc2_gadget_incr_frame_num (ep);/* Update current frame number value. */
@@ -3002,8 +3010,11 @@ static void dwc2_gadget_handle_nak(strucwhile (dwc2_gadget_target_frame_elapsed (hs_ep)) { hs_req =get_ep_head (hs_ep); -if (hs_req) +if (hs_req) { + hs_req->req.frame_number = hs_ep->target_frame; + hs_req->req.actual =0 ;dwc2_hsotg_complete_request (hsotg, hs_ep, hs_req, -ENODATA ); + }dwc2_gadget_incr_frame_num (hs_ep);/* Update current frame number value. */
Greg Kroah-Hartman
maintainerPATCH 8/179 usb: dwc2: hcd_queue: Fix use of floating point literal
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
commit 310780e825f3ffd211b479b8f828885a6faedd63 upstream.
A new commit in LLVM causes an error on the use of 'long double' when '-mno-x87' is used, which the kernel does through an alias, '-mno-80387' (see the LLVM commit below for more details around why it does this).
drivers/usb/dwc2/hcd_queue.c:1744:25: error: expression requires 'long double' type support, but target 'x86_64-unknown-linux-gnu' does not support it
delay = ktime_set(0, DWC2_RETRY_WAIT_DELAY);
^
drivers/usb/dwc2/hcd_queue.c:62:34: note: expanded from macro 'DWC2_RETRY_WAIT_DELAY'
#define DWC2_RETRY_WAIT_DELAY (1 * 1E6L)
^1 error generated.
This happens due to the use of a 'long double' literal. The 'E6' part of '1E6L' causes the literal to be a 'double' then the 'L' suffix promotes it to 'long double'.
There is no visible reason for a floating point value in this driver, as the value is only used as a parameter to a function that expects an integer type. Use NSEC_PER_MSEC, which is the same integer value as '1E6L', to avoid changing functionality but fix the error.
--- drivers/usb/dwc2/hcd_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc2/hcd_queue.c +1 -1
@@ -59,7 +59,7 @@#define DWC2_UNRESERVE_DELAY (msecs_to_jiffies(5))/* If we get a NAK, wait this long before retrying */ -#define DWC2_RETRY_WAIT_DELAY (1 * 1E6L) +#define DWC2_RETRY_WAIT_DELAY (1 * NSEC_PER_MSEC)/** * dwc2_periodic_channel_available() - Checks that a channel is available for a
Greg Kroah-Hartman
maintainerPATCH 9/179 usb: dwc3: leave default DMA for PCI devices
In reply to Greg Kroah-HartmanFrom: Fabio Aiuto <[email protected]>
commit 47ce45906ca9870cf5267261f155fb7c70307cf0 upstream.
in case of a PCI dwc3 controller, leave the default DMA mask. Calling of a 64 bit DMA mask breaks the driver on cherrytrail based tablets like Cyberbook T116.
--- drivers/usb/dwc3/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/dwc3/core.c +5 -3
@@ -1565,9 +1565,11 @@ static int dwc3_probe(struct platform_dedwc3_get_properties (dwc); - ret =dma_set_mask_and_coherent (dwc->sysdev,DMA_BIT_MASK (64 )); -if (ret) -return ret; +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))
Greg Kroah-Hartman
maintainerPATCH 10/179 usb: dwc3: core: Revise GHWPARAMS9 offset
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 250fdabec6ffcaf895c5e0dedca62706ef10d8f6 upstream.
During our predesign phase for DWC_usb32, the GHWPARAMS9 register offset was 0xc680. We revised our final design, and the GHWPARAMS9 offset is now moved to 0xc6e8 on release.
--- drivers/usb/dwc3/core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/core.h +1 -1
@@ -143,7 +143,7 @@#define DWC3_GHWPARAMS8 0xc600#define DWC3_GUCTL3 0xc60c#define DWC3_GFLADJ 0xc630 -#define DWC3_GHWPARAMS9 0xc680 +#define DWC3_GHWPARAMS9 0xc6e0/* Device Registers */ #define DWC3_DCFG 0xc700
Greg Kroah-Hartman
maintainerPATCH 11/179 usb: dwc3: gadget: Ignore NoStream after End Transfer
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit d74dc3e9f58c28689cef1faccf918e06587367d3 upstream.
The End Transfer command from a stream endpoint will generate a NoStream event, and we should ignore it. Currently we set the flag DWC3_EP_IGNORE_NEXT_NOSTREAM to track this prior to sending the command, and it will be cleared on the next stream event. However, a stream event may be generated before the End Transfer command completion and prematurely clear the flag. Fix this by setting the flag on End Transfer completion instead.
--- drivers/usb/dwc3/gadget.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/usb/dwc3/gadget.c +8 -8
@@ -3352,6 +3352,14 @@ static void dwc3_gadget_endpoint_commandif (cmd !=DWC3_DEPCMD_ENDTRANSFER )return ; +/* +* The END_TRANSFER command will cause the controller to generate a +* NoStream Event, and it's not due to the host DP NoStream rejection. +* Ignore the next NoStream event. +*/ +if (dep->stream_capable) + dep->flags |=DWC3_EP_IGNORE_NEXT_NOSTREAM ; + dep->flags &= ~DWC3_EP_END_TRANSFER_PENDING ; dep->flags &= ~DWC3_EP_TRANSFER_STARTED ;dwc3_gadget_ep_cleanup_cancelled_requests (dep);
@@ -3574,14 +3582,6 @@ static void dwc3_stop_active_transfer(stWARN_ON_ONCE (ret); dep->resource_index =0 ; -/* -* The END_TRANSFER command will cause the controller to generate a -* NoStream Event, and it's not due to the host DP NoStream rejection. -* Ignore the next NoStream event. -*/ -if (dep->stream_capable) - dep->flags |=DWC3_EP_IGNORE_NEXT_NOSTREAM ; -if (!interrupt) dep->flags &= ~DWC3_EP_TRANSFER_STARTED ;else
Greg Kroah-Hartman
maintainerPATCH 12/179 usb: dwc3: gadget: Check for L1/L2/U3 for Start Transfer
In reply to Greg Kroah-HartmanFrom: Thinh Nguyen <[email protected]>
commit 63c4c320ccf77074ffe9019ac596603133c1b517 upstream.
The programming guide noted that the driver needs to verify if the link state is in U0 before executing the Start Transfer command. If it's not in U0, the driver needs to perform remote wakeup. This is not accurate. If the link state is in U1/U2, then the controller will not respond to link recovery request from DCTL.ULSTCHNGREQ. The Start Transfer command will trigger a link recovery if it is in U1/U2. A clarification will be added to the programming guide for all controller versions.
The current implementation shouldn't cause any functional issue. It may occasionally report an invalid time out warning from failed link recovery request. The driver will still go ahead with the Start Transfer command if the remote wakeup fails. The new change only initiates remote wakeup where it is needed, which is when the link state is in L1/L2/U3.
--- drivers/usb/dwc3/gadget.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/usb/dwc3/gadget.c +14 -3
@@ -310,13 +310,24 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_if (DWC3_DEPCMD_CMD (cmd) ==DWC3_DEPCMD_STARTTRANSFER ) {int link_state; +/* +* Initiate remote wakeup if the link state is in U3 when +* operating in SS/SSP or L1/L2 when operating in HS/FS. If the +* link state is in U1/U2, no remote wakeup is needed. The Start +* Transfer command will initiate the link recovery. +*/ link_state =dwc3_gadget_get_link_state (dwc); -if (link_state ==DWC3_LINK_STATE_U1 || - link_state ==DWC3_LINK_STATE_U2 || - link_state ==DWC3_LINK_STATE_U3 ) { +switch (link_state) { +case DWC3_LINK_STATE_U2 : +if (dwc->gadget->speed >=USB_SPEED_SUPER ) +break ; + + fallthrough; +case DWC3_LINK_STATE_U3 : ret =__dwc3_gadget_wakeup (dwc);dev_WARN_ONCE (dwc->dev, ret,"wakeup failed --> %d\n" , ret); +break ; } }
Greg Kroah-Hartman
maintainerPATCH 13/179 usb: dwc3: gadget: Fix null pointer exception
In reply to Greg Kroah-HartmanFrom: Albert Wang <[email protected]>
commit 26288448120b28af1dfd85a6fa6b6d55a16c7f2f upstream.
In the endpoint interrupt functions dwc3_gadget_endpoint_transfer_in_progress() and dwc3_gadget_endpoint_trbs_complete() will dereference the endpoint descriptor. But it could be cleared in __dwc3_gadget_ep_disable() when accessory disconnected. So we need to check whether it is null or not before dereferencing it.
--- drivers/usb/dwc3/gadget.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/usb/dwc3/gadget.c +6 -0
@@ -3263,6 +3263,9 @@ static bool dwc3_gadget_endpoint_trbs_costruct dwc3 *dwc = dep->dwc;bool no_started_trb = true; +if (!dep->endpoint.desc) +return no_started_trb; +dwc3_gadget_ep_cleanup_completed_requests (dep, event, status);if (dep->flags &DWC3_EP_END_TRANSFER_PENDING )
@@ -3310,6 +3313,9 @@ static void dwc3_gadget_endpoint_transfe {int status =0 ; +if (!dep->endpoint.desc) +return ; +if (usb_endpoint_xfer_isoc (dep->endpoint.desc))dwc3_gadget_endpoint_frame_from_event (dep, event);
Greg Kroah-Hartman
maintainerPATCH 14/179 net: usb: Correct PHY handling of smsc95xx
In reply to Greg Kroah-HartmanFrom: Martyn Welch <[email protected]>
commit a049a30fc27c1cb2e12889bbdbd463dbf750103a upstream.
The smsc95xx driver is dropping phy speed settings and causing a stack trace at device unbind:
[ 536.379147] smsc95xx 2-1:1.0 eth1: unregister 'smsc95xx' usb-ci_hdrc.2-1, smsc95xx USB 2.0 Ethernet [ 536.425029] ------------[ cut here ]------------
[ 536.429650] WARNING: CPU: 0 PID: 439 at fs/kernfs/dir.c:1535 kernfs_remove_by_name_ns+0xb8/0xc0 [ 536.438416] kernfs: can not remove 'attached_dev', no directory
[ 536.444363] Modules linked in: xts dm_crypt dm_mod atmel_mxt_ts smsc95xx usbnet
[ 536.451748] CPU: 0 PID: 439 Comm: sh Tainted: G W 5.15.0 #1
[ 536.458636] Hardware name: Freescale i.MX53 (Device Tree Support)
[ 536.464735] Backtrace:
[ 536.467190] [<80b1c904>] (dump_backtrace) from [<80b1cb48>] (show_stack+0x20/0x24)
[ 536.474787] r7:000005ff r6:8035b294 r5:600f0013 r4:80d8af78
[ 536.480449] [<80b1cb28>] (show_stack) from [<80b1f764>] (dump_stack_lvl+0x48/0x54)
[ 536.488035] [<80b1f71c>] (dump_stack_lvl) from [<80b1f788>] (dump_stack+0x18/0x1c)
[ 536.495620] r5:00000009 r4:80d9b820
[ 536.499198] [<80b1f770>] (dump_stack) from [<80124fac>] (__warn+0xfc/0x114)
[ 536.506187] [<80124eb0>] (__warn) from [<80b1d21c>] (warn_slowpath_fmt+0xa8/0xdc)
[ 536.513688] r7:000005ff r6:80d9b820 r5:80d9b8e0 r4:83744000
[ 536.519349] [<80b1d178>] (warn_slowpath_fmt) from [<8035b294>] (kernfs_remove_by_name_ns+0xb8/0xc0) [ 536.528416] r9:00000001 r8:00000000 r7:824926dc r6:00000000 r5:80df6c2c r4:00000000
[ 536.536162] [<8035b1dc>] (kernfs_remove_by_name_ns) from [<80b1f56c>] (sysfs_remove_link+0x4c/0x50) [ 536.545225] r6:7f00f02c r5:80df6c2c r4:83306400
[ 536.549845] [<80b1f520>] (sysfs_remove_link) from [<806f9c8c>] (phy_detach+0xfc/0x11c)
[ 536.557780] r5:82492000 r4:83306400
[ 536.561359] [<806f9b90>] (phy_detach) from [<806f9cf8>] (phy_disconnect+0x4c/0x58)
[ 536.568943] r7:824926dc r6:7f00f02c r5:82492580 r4:83306400
[ 536.574604] [<806f9cac>] (phy_disconnect) from [<7f00a310>] (smsc95xx_disconnect_phy+0x30/0x38 [smsc95xx]) [ 536.584290] r5:82492580 r4:82492580
[ 536.587868] [<7f00a2e0>] (smsc95xx_disconnect_phy [smsc95xx]) from [<7f001570>] (usbnet_stop+0x70/0x1a0 [usbnet]) [ 536.598161] r5:82492580 r4:82492000
[ 536.601740] [<7f001500>] (usbnet_stop [usbnet]) from [<808baa70>] (__dev_close_many+0xb4/0x12c) [ 536.610466] r8:83744000 r7:00000000 r6:83744000 r5:83745b74 r4:82492000
[ 536.617170] [<808ba9bc>] (__dev_close_many) from [<808bab78>] (dev_close_many+0x90/0x120)
[ 536.625365] r7:00000001 r6:83745b74 r5:83745b8c r4:82492000
[ 536.631026] [<808baae8>] (dev_close_many) from [<808bf408>] (unregister_netdevice_many+0x15c/0x704) [ 536.640094] r9:00000001 r8:81130b98 r7:83745b74 r6:83745bc4 r5:83745b8c r4:82492000
[ 536.647840] [<808bf2ac>] (unregister_netdevice_many) from [<808bfa50>] (unregister_netdevice_queue+0xa0/0xe8) [ 536.657775] r10:8112bcc0 r9:83306c00 r8:83306c80 r7:8291e420 r6:83744000 r5:00000000
[ 536.665608] r4:82492000
[ 536.668143] [<808bf9b0>] (unregister_netdevice_queue) from [<808bfac0>] (unregister_netdev+0x28/0x30) [ 536.677381] r6:7f01003c r5:82492000 r4:82492000
[ 536.682000] [<808bfa98>] (unregister_netdev) from [<7f000b40>] (usbnet_disconnect+0x64/0xdc [usbnet]) [ 536.691241] r5:82492000 r4:82492580
[ 536.694819] [<7f000adc>] (usbnet_disconnect [usbnet]) from [<8076b958>] (usb_unbind_interface+0x80/0x248) [ 536.704406] r5:7f01003c r4:83306c80
[ 536.707984] [<8076b8d8>] (usb_unbind_interface) from [<8061765c>] (device_release_driver_internal+0x1c4/0x1cc) [ 536.718005] r10:8112bcc0 r9:80dff1dc r8:83306c80 r7:83744000 r6:7f01003c r5:00000000
[ 536.725838] r4:8291e420
[ 536.728373] [<80617498>] (device_release_driver_internal) from [<80617684>] (device_release_driver+0x20/0x24) [ 536.738302] r7:83744000 r6:810d4f4c r5:8291e420 r4:8176ae30
[ 536.743963] [<80617664>] (device_release_driver) from [<806156cc>] (bus_remove_device+0xf0/0x148) [ 536.752858] [<806155dc>] (bus_remove_device) from [<80610018>] (device_del+0x198/0x41c)
[ 536.760880] r7:83744000 r6:8116e2e4 r5:8291e464 r4:8291e420
[ 536.766542] [<8060fe80>] (device_del) from [<80768fe8>] (usb_disable_device+0xcc/0x1e0)
[ 536.774576] r10:8112bcc0 r9:80dff1dc r8:00000001 r7:8112bc48 r6:8291e400 r5:00000001
[ 536.782410] r4:83306c00
[ 536.784945] [<80768f1c>] (usb_disable_device) from [<80769c30>] (usb_set_configuration+0x514/0x8dc) [ 536.794011] r10:00000000 r9:00000000 r8:832c3600 r7:00000004 r6:810d5688 r5:00000000
[ 536.801844] r4:83306c00
[ 536.804379] [<8076971c>] (usb_set_configuration) from [<80775fac>] (usb_generic_driver_disconnect+0x34/0x38) [ 536.814236] r10:832c3610 r9:83745ef8 r8:832c3600 r7:00000004 r6:810d5688 r5:83306c00
[ 536.822069] r4:83306c00
[ 536.824605] [<80775f78>] (usb_generic_driver_disconnect) from [<8076b850>] (usb_unbind_device+0x30/0x70) [ 536.834100] r5:83306c00 r4:810d5688
[ 536.837678] [<8076b820>] (usb_unbind_device) from [<8061765c>] (device_release_driver_internal+0x1c4/0x1cc) [ 536.847432] r5:822fb480 r4:83306c80
[ 536.851009] [<80617498>] (device_release_driver_internal) from [<806176a8>] (device_driver_detach+0x20/0x24) [ 536.860853] r7:00000004 r6:810d4f4c r5:810d5688 r4:83306c80
[ 536.866515] [<80617688>] (device_driver_detach) from [<80614d98>] (unbind_store+0x70/0xe4)
[ 536.874793] [<80614d28>] (unbind_store) from [<80614118>] (drv_attr_store+0x30/0x3c)
[ 536.882554] r7:00000000 r6:00000000 r5:83739200 r4:80614d28
[ 536.888217] [<806140e8>] (drv_attr_store) from [<8035cb68>] (sysfs_kf_write+0x48/0x54)
[ 536.896154] r5:83739200 r4:806140e8
[ 536.899732] [<8035cb20>] (sysfs_kf_write) from [<8035be84>] (kernfs_fop_write_iter+0x11c/0x1d4) [ 536.908446] r5:83739200 r4:00000004
[ 536.912024] [<8035bd68>] (kernfs_fop_write_iter) from [<802b87fc>] (vfs_write+0x258/0x3e4)
[ 536.920317] r10:00000000 r9:83745f58 r8:83744000 r7:00000000 r6:00000004 r5:00000000
[ 536.928151] r4:82adacc0
[ 536.930687] [<802b85a4>] (vfs_write) from [<802b8b0c>] (ksys_write+0x74/0xf4)
[ 536.937842] r10:00000004 r9:007767a0 r8:83744000 r7:00000000 r6:00000000 r5:82adacc0
[ 536.945676] r4:82adacc0
[ 536.948213] [<802b8a98>] (ksys_write) from [<802b8ba4>] (sys_write+0x18/0x1c)
[ 536.955367] r10:00000004 r9:83744000 r8:80100244 r7:00000004 r6:76f47b58 r5:76fc0350
[ 536.963200] r4:00000004
[ 536.965735] [<802b8b8c>] (sys_write) from [<80100060>] (ret_fast_syscall+0x0/0x48)
[ 536.973320] Exception stack(0x83745fa8 to 0x83745ff0)
[ 536.978383] 5fa0: 00000004 76fc0350 00000001 007767a0 00000004 00000000
[ 536.986569] 5fc0: 00000004 76fc0350 76f47b58 00000004 76f47c7c 76f48114 00000000 7e87991c
[ 536.994753] 5fe0: 00000498 7e879908 76e6dce8 76eca2e8
[ 536.999922] ---[ end trace 9b835d809816b435 ]---
The driver should not be connecting and disconnecting the PHY when the device is opened and closed, it should be stopping and starting the PHY. The phy should be connected as part of binding and disconnected during unbinding.
As this results in the PHY not being reset during open, link speed, etc. settings set prior to the link coming up are now not being lost.
It is necessary for phy_stop() to only be called when the phydev still exists (resolving the above stack trace). When unbinding, ".unbind" will be called prior to ".stop", with phy_disconnect() already having called phy_stop() before the phydev becomes inaccessible.
--- drivers/net/usb/smsc95xx.c | 55 +++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 29 deletions(-)
drivers/net/usb/smsc95xx.c +26 -29
@@ -1049,6 +1049,14 @@ static const struct net_device_ops smsc9 .ndo_set_features = smsc95xx_set_features, }; +static void smsc95xx_handle_link_change (struct net_device *net) +{ +struct usbnet *dev =netdev_priv (net); + +phy_print_status (net->phydev); +usbnet_defer_kevent (dev,EVENT_LINK_CHANGE ); +} +static int smsc95xx_bind (struct usbnet *dev,struct usb_interface *intf) {struct smsc95xx_priv *pdata;
@@ -1153,6 +1161,17 @@ static int smsc95xx_bind(struct usbnet * dev->net->min_mtu =ETH_MIN_MTU ; dev->net->max_mtu =ETH_DATA_LEN ; dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len; + + ret =phy_connect_direct (dev->net, pdata->phydev, + &smsc95xx_handle_link_change, +PHY_INTERFACE_MODE_MII ); +if (ret) { +netdev_err (dev->net,"can't attach PHY to %s\n" , pdata->mdiobus->id); + goto unregister_mdio; + } + +phy_attached_info (dev->net->phydev); +return 0 ; unregister_mdio:
@@ -1170,47 +1189,25 @@ static void smsc95xx_unbind(struct usbne {struct smsc95xx_priv *pdata = dev->driver_priv; +phy_disconnect (dev->net->phydev);mdiobus_unregister (pdata->mdiobus);mdiobus_free (pdata->mdiobus);netif_dbg (dev, ifdown, dev->net,"free pdata\n" );kfree (pdata); } -static void smsc95xx_handle_link_change (struct net_device *net) -{ -struct usbnet *dev =netdev_priv (net); - -phy_print_status (net->phydev); -usbnet_defer_kevent (dev,EVENT_LINK_CHANGE ); -} -static int smsc95xx_start_phy (struct usbnet *dev) { -struct smsc95xx_priv *pdata = dev->driver_priv; -struct net_device *net = dev->net; -int ret; +phy_start (dev->net->phydev); - ret =smsc95xx_reset (dev); -if (ret <0 ) -return ret; - - ret =phy_connect_direct (net, pdata->phydev, - &smsc95xx_handle_link_change, -PHY_INTERFACE_MODE_MII ); -if (ret) { -netdev_err (net,"can't attach PHY to %s\n" , pdata->mdiobus->id); -return ret; - } - -phy_attached_info (net->phydev); -phy_start (net->phydev);return 0 ; } -static int smsc95xx_disconnect_phy (struct usbnet *dev) +static int smsc95xx_stop (struct usbnet *dev) { -phy_stop (dev->net->phydev); -phy_disconnect (dev->net->phydev); +if (dev->net->phydev) +phy_stop (dev->net->phydev); +return 0 ; }
@@ -1965,7 +1962,7 @@ static const struct driver_info smsc95xx .unbind = smsc95xx_unbind, .link_reset = smsc95xx_link_reset, .reset = smsc95xx_start_phy, - .stop = smsc95xx_disconnect_phy, + .stop = smsc95xx_stop, .rx_fixup = smsc95xx_rx_fixup, .tx_fixup = smsc95xx_tx_fixup, .status = smsc95xx_status,
Greg Kroah-Hartman
maintainerPATCH 15/179 net: nexthop: fix null pointer dereference when IPv6 is not enabled
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
commit 1c743127cc54b112b155f434756bd4b5fa565a99 upstream.
When we try to add an IPv6 nexthop and IPv6 is not enabled (!CONFIG_IPV6) we'll hit a NULL pointer dereference[1] in the error path of nh_create_ipv6() due to calling ipv6_stub->fib6_nh_release. The bug has been present since the beginning of IPv6 nexthop gateway support. Commit 1aefd3de7bc6 ("ipv6: Add fib6_nh_init and release to stubs") tells us that only fib6_nh_init has a dummy stub because fib6_nh_release should not be called if fib6_nh_init returns an error, but the commit below added a call to ipv6_stub->fib6_nh_release in its error path. To fix it return the dummy stub's -EAFNOSUPPORT error directly without calling ipv6_stub->fib6_nh_release in nh_create_ipv6()'s error path.
[1]
Output is a bit truncated, but it clearly shows the error.
BUG: kernel NULL pointer dereference, address: 000000000000000000 #PF: supervisor instruction fetch in kernel modede #PF: error_code(0x0010) - not-present pagege PGD 0 P4D 0 Oops: 0010 [#1] PREEMPT SMP NOPTI CPU: 4 PID: 638 Comm: ip Kdump: loaded Not tainted 5.16.0-rc1+ #446 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-4.fc34 04/01/2014 RIP: 0010:0x0 Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6. RSP: 0018:ffff888109f5b8f0 EFLAGS: 00010286^Ac RAX: 0000000000000000 RBX: ffff888109f5ba28 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff8881008a2860 RBP: ffff888109f5b9d8 R08: 0000000000000000 R09: 0000000000000000 R10: ffff888109f5b978 R11: ffff888109f5b948 R12: 00000000ffffff9f R13: ffff8881008a2a80 R14: ffff8881008a2860 R15: ffff8881008a2840 FS: 00007f98de70f100(0000) GS:ffff88822bf00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffffffffffffffd6 CR3: 0000000100efc000 CR4: 00000000000006e0 Call Trace: <TASK> nh_create_ipv6+0xed/0x10c rtm_new_nexthop+0x6d7/0x13f3 ? check_preemption_disabled+0x3d/0xf2 ? lock_is_held_type+0xbe/0xfd rtnetlink_rcv_msg+0x23f/0x26a ? check_preemption_disabled+0x3d/0xf2 ? rtnl_calcit.isra.0+0x147/0x147 netlink_rcv_skb+0x61/0xb2 netlink_unicast+0x100/0x187 netlink_sendmsg+0x37f/0x3a0 ? netlink_unicast+0x187/0x187 sock_sendmsg_nosec+0x67/0x9b ____sys_sendmsg+0x19d/0x1f9 ? copy_msghdr_from_user+0x4c/0x5e ? rcu_read_lock_any_held+0x2a/0x78 ___sys_sendmsg+0x6c/0x8c ? asm_sysvec_apic_timer_interrupt+0x12/0x20 ? lockdep_hardirqs_on+0xd9/0x102 ? sockfd_lookup_light+0x69/0x99 __sys_sendmsg+0x50/0x6e do_syscall_64+0xcb/0xf2 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f98dea28914 Code: 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b5 0f 1f 80 00 00 00 00 48 8d 05 e9 5d 0c 00 8b 00 85 c0 75 13 b8 2e 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 54 c3 0f 1f 00 41 54 41 89 d4 55 48 89 f5 53 RSP: 002b:00007fff859f5e68 EFLAGS: 00000246 ORIG_RAX: 000000000000002e2e RAX: ffffffffffffffda RBX: 00000000619cb810 RCX: 00007f98dea28914 RDX: 0000000000000000 RSI: 00007fff859f5ed0 RDI: 0000000000000003 RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000008 R10: fffffffffffffce6 R11: 0000000000000246 R12: 0000000000000001 R13: 000055c0097ae520 R14: 000055c0097957fd R15: 00007fff859f63a0 </TASK> Modules linked in: bridge stp llc bonding virtio_net
--- net/ipv4/nexthop.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
net/ipv4/nexthop.c +7 -3
@@ -2544,11 +2544,15 @@ static int nh_create_ipv6(struct net *ne/* sets nh_dev if successful */ err = ipv6_stub->fib6_nh_init (net, fib6_nh, &fib6_cfg,GFP_KERNEL , extack); -if (err) +if (err) { +/* IPv6 is not enabled, don't call fib6_nh_release */ +if (err == -EAFNOSUPPORT ) + goto out; ipv6_stub->fib6_nh_release (fib6_nh); -else + }else { nh->nh_flags = fib6_nh->fib_nh_flags; - + } +out:return err; }
Greg Kroah-Hartman
maintainerPATCH 16/179 usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit d4d2e5329ae9dfd6742c84d79f7d143d10410f1b upstream.
If the first call to devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0) fails with something other than -ENODEV then it leads to an error pointer dereference. For those errors we should just jump directly to the error handling.
--- drivers/usb/chipidea/ci_hdrc_imx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +9 -9
@@ -420,15 +420,15 @@ static int ci_hdrc_imx_probe(struct plat data->phy =devm_usb_get_phy_by_phandle (dev,"fsl,usbphy" ,0 );if (IS_ERR (data->phy)) { ret =PTR_ERR (data->phy); -if (ret == -ENODEV ) { - data->phy =devm_usb_get_phy_by_phandle (dev,"phys" ,0 ); -if (IS_ERR (data->phy)) { - ret =PTR_ERR (data->phy); -if (ret == -ENODEV ) - data->phy =NULL ; -else - goto err_clk; - } +if (ret != -ENODEV ) + goto err_clk; + data->phy =devm_usb_get_phy_by_phandle (dev,"phys" ,0 ); +if (IS_ERR (data->phy)) { + ret =PTR_ERR (data->phy); +if (ret == -ENODEV ) + data->phy =NULL ; +else + goto err_clk; } }
Greg Kroah-Hartman
maintainerPATCH 17/179 usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts
In reply to Greg Kroah-HartmanFrom: Ondrej Jirman <[email protected]>
commit 362468830dd5bea8bf6ad5203b2ea61f8a4e8288 upstream.
The code that enables either BC_LVL or COMP_CHNG interrupt in tcpm_set_cc wrongly assumes that the interrupt is unmasked by writing 1 to the apropriate bit in the mask register. In fact, interrupts are enabled when the mask is 0, so the tcpm_set_cc enables interrupt for COMP_CHNG when it expects BC_LVL interrupt to be enabled.
This causes inability of the driver to recognize cable unplug events in host mode (unplug is recognized only via a COMP_CHNG interrupt).
In device mode this bug was masked by simultaneous triggering of the VBUS change interrupt, because of loss of VBUS when the port peer is providing power.
--- drivers/usb/typec/tcpm/fusb302.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/usb/typec/tcpm/fusb302.c +4 -2
@@ -669,25 +669,27 @@ static int tcpm_set_cc(struct tcpc_dev * ret =fusb302_i2c_mask_write (chip,FUSB_REG_MASK ,FUSB_REG_MASK_BC_LVL |FUSB_REG_MASK_COMP_CHNG , -FUSB_REG_MASK_COMP_CHNG ); +FUSB_REG_MASK_BC_LVL );if (ret <0 ) {fusb302_log (chip,"cannot set SRC interrupt, ret=%d" , ret); goto done; } chip->intr_comp_chng = true; + chip->intr_bc_lvl = false;break ;case TYPEC_CC_RD : ret =fusb302_i2c_mask_write (chip,FUSB_REG_MASK ,FUSB_REG_MASK_BC_LVL |FUSB_REG_MASK_COMP_CHNG , -FUSB_REG_MASK_BC_LVL ); +FUSB_REG_MASK_COMP_CHNG );if (ret <0 ) {fusb302_log (chip,"cannot set SRC interrupt, ret=%d" , ret); goto done; } chip->intr_bc_lvl = true; + chip->intr_comp_chng = false;break ;default :break ;
Greg Kroah-Hartman
maintainerPATCH 18/179 usb: xhci: tegra: Check padctrl interrupt presence in device tree
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit 51f2246158f686c881859f4b620f831f06e296e1 upstream.
Older device-trees don't specify padctrl interrupt and xhci-tegra driver now fails to probe with -EINVAL using those device-trees. Check interrupt presence and keep runtime PM disabled if it's missing to fix the trouble.
--- drivers/usb/host/xhci-tegra.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-)
drivers/usb/host/xhci-tegra.c +29 -12
@@ -1400,6 +1400,7 @@ static void tegra_xusb_deinit_usb_phy(ststatic int tegra_xusb_probe (struct platform_device *pdev) { +struct of_phandle_args args;struct tegra_xusb *tegra;struct device_node *np;struct resource *regs;
@@ -1454,10 +1455,17 @@ static int tegra_xusb_probe(struct platf goto put_padctl; } - tegra->padctl_irq =of_irq_get (np,0 ); -if (tegra->padctl_irq <=0 ) { - err = (tegra->padctl_irq ==0 ) ? -ENODEV : tegra->padctl_irq; - goto put_padctl; +/* Older device-trees don't have padctrl interrupt */ + err =of_irq_parse_one (np,0 , &args); +if (!err) { + tegra->padctl_irq =of_irq_get (np,0 ); +if (tegra->padctl_irq <=0 ) { + err = (tegra->padctl_irq ==0 ) ? -ENODEV : tegra->padctl_irq; + goto put_padctl; + } + }else { +dev_dbg (&pdev->dev, +"%pOF is missing an interrupt, disabling PM support\n" , np); } tegra->host_clk =devm_clk_get (&pdev->dev,"xusb_host" );
@@ -1696,11 +1704,15 @@ static int tegra_xusb_probe(struct platf goto remove_usb3; } - err =devm_request_threaded_irq (&pdev->dev, tegra->padctl_irq,NULL , tegra_xusb_padctl_irq, -IRQF_ONESHOT ,dev_name (&pdev->dev), tegra); -if (err <0 ) { -dev_err (&pdev->dev,"failed to request padctl IRQ: %d\n" , err); - goto remove_usb3; +if (tegra->padctl_irq) { + err =devm_request_threaded_irq (&pdev->dev, tegra->padctl_irq, +NULL , tegra_xusb_padctl_irq, +IRQF_ONESHOT ,dev_name (&pdev->dev), + tegra); +if (err <0 ) { +dev_err (&pdev->dev,"failed to request padctl IRQ: %d\n" , err); + goto remove_usb3; + } } err =tegra_xusb_enable_firmware_messages (tegra);
@@ -1718,13 +1730,16 @@ static int tegra_xusb_probe(struct platf/* Enable wake for both USB 2.0 and USB 3.0 roothubs */ device_init_wakeup (&tegra->hcd->self.root_hub->dev, true);device_init_wakeup (&xhci->shared_hcd->self.root_hub->dev, true); -device_init_wakeup (tegra->dev, true);pm_runtime_use_autosuspend (tegra->dev);pm_runtime_set_autosuspend_delay (tegra->dev,2000 );pm_runtime_mark_last_busy (tegra->dev);pm_runtime_set_active (tegra->dev); -pm_runtime_enable (tegra->dev); + +if (tegra->padctl_irq) { +device_init_wakeup (tegra->dev, true); +pm_runtime_enable (tegra->dev); + }return 0 ;
@@ -1772,7 +1787,9 @@ static int tegra_xusb_remove(struct platdma_free_coherent (&pdev->dev, tegra->fw.size, tegra->fw.virt, tegra->fw.phys); -pm_runtime_disable (&pdev->dev); +if (tegra->padctl_irq) +pm_runtime_disable (&pdev->dev); +pm_runtime_put (&pdev->dev);tegra_xusb_powergate_partitions (tegra);
Greg Kroah-Hartman
maintainerPATCH 19/179 usb: hub: Fix usb enumeration issue due to address0 race
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 6ae6dc22d2d1ce6aa77a6da8a761e61aca216f8b upstream.
xHC hardware can only have one slot in default state with address 0 waiting for a unique address at a time, otherwise "undefined behavior may occur" according to xhci spec 5.4.3.4
The address0_mutex exists to prevent this across both xhci roothubs.
If hub_port_init() fails, it may unlock the mutex and exit with a xhci slot in default state. If the other xhci roothub calls hub_port_init() at this point we end up with two slots in default state.
Make sure the address0_mutex protects the slot default state across hub_port_init() retries, until slot is addressed or disabled.
Note, one known minor case is not fixed by this patch.
If device needs to be reset during resume, but fails all hub_port_init() retries in usb_reset_and_verify_device(), then it's possible the slot is still left in default state when address0_mutex is unlocked.
--- drivers/usb/core/hub.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/usb/core/hub.c +11 -3
@@ -4700,8 +4700,6 @@ hub_port_init(struct usb_hub *hub, strucif (oldspeed ==USB_SPEED_LOW ) delay =HUB_LONG_RESET_TIME ; -mutex_lock (hcd->address0_mutex); -/* Reset the device; full speed may morph to high speed */ /* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */ retval =hub_port_reset (hub, port1, udev, delay, false);
@@ -5016,7 +5014,6 @@ fail:hub_port_disable (hub, port1,0 );update_devnum (udev, devnum);/* for disconnect processing */ } -mutex_unlock (hcd->address0_mutex);return retval; }
@@ -5246,6 +5243,9 @@ static void hub_port_connect(struct usb_ unit_load =100 ; status =0 ; + +mutex_lock (hcd->address0_mutex); +for (i =0 ; i <PORT_INIT_TRIES ; i++) {/* reallocate for each attempt, since references
@@ -5282,6 +5282,8 @@ static void hub_port_connect(struct usb_if (status <0 ) goto loop; +mutex_unlock (hcd->address0_mutex); +if (udev->quirks &USB_QUIRK_DELAY_INIT )msleep (2000 );
@@ -5370,6 +5372,7 @@ static void hub_port_connect(struct usb_ loop_disable:hub_port_disable (hub, port1,1 ); +mutex_lock (hcd->address0_mutex); loop:usb_ep0_reinit (udev);release_devnum (udev);
@@ -5396,6 +5399,8 @@ loop: } done: +mutex_unlock (hcd->address0_mutex); +hub_port_disable (hub, port1,1 );if (hcd->driver->relinquish_port && !hub->hdev->parent) {if (status != -ENOTCONN && status != -ENODEV )
@@ -5915,6 +5920,8 @@ static int usb_reset_and_verify_device(s bos = udev->bos; udev->bos =NULL ; +mutex_lock (hcd->address0_mutex); +for (i =0 ; i <PORT_INIT_TRIES ; ++i) {/* ep0 maxpacket size may change; let the HCD know about it.
@@ -5924,6 +5931,7 @@ static int usb_reset_and_verify_device(sif (ret >=0 || ret == -ENOTCONN || ret == -ENODEV )break ; } +mutex_unlock (hcd->address0_mutex);if (ret <0 ) goto re_enumerate;
Greg Kroah-Hartman
maintainerPATCH 20/179 usb: hub: Fix locking issues with address0_mutex
In reply to Greg Kroah-HartmanFrom: Mathias Nyman <[email protected]>
commit 6cca13de26eea6d32a98d96d916a048d16a12822 upstream.
Fix the circular lock dependency and unbalanced unlock of addess0_mutex introduced when fixing an address0_mutex enumeration retry race in commit ae6dc22d2d1 ("usb: hub: Fix usb enumeration issue due to address0 race")
Make sure locking order between port_dev->status_lock and address0_mutex is correct, and that address0_mutex is not unlocked in hub_port_connect "done:" codepath which may be reached without locking address0_mutex
--- drivers/usb/core/hub.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/usb/core/hub.c +12 -8
@@ -5188,6 +5188,7 @@ static void hub_port_connect(struct usb_struct usb_port *port_dev = hub->ports[port1 -1 ];struct usb_device *udev = port_dev->child;static int unreliable_port =-1 ; +bool retry_locked;/* Disconnect any existing devices under this port */ if (udev) {
@@ -5244,10 +5245,10 @@ static void hub_port_connect(struct usb_ status =0 ; -mutex_lock (hcd->address0_mutex); -for (i =0 ; i <PORT_INIT_TRIES ; i++) { - +usb_lock_port (port_dev); +mutex_lock (hcd->address0_mutex); + retry_locked = true;/* reallocate for each attempt, since references * to the previous one can escape in various ways */
@@ -5255,6 +5256,8 @@ static void hub_port_connect(struct usb_if (!udev) {dev_err (&port_dev->dev,"couldn't allocate usb_device\n" ); +mutex_unlock (hcd->address0_mutex); +usb_unlock_port (port_dev); goto done; }
@@ -5276,13 +5279,13 @@ static void hub_port_connect(struct usb_ }/* reset (non-USB 3.0 devices) and get descriptor */ -usb_lock_port (port_dev); status =hub_port_init (hub, udev, port1, i); -usb_unlock_port (port_dev);if (status <0 ) goto loop;mutex_unlock (hcd->address0_mutex); +usb_unlock_port (port_dev); + retry_locked = false;if (udev->quirks &USB_QUIRK_DELAY_INIT )msleep (2000 );
@@ -5372,11 +5375,14 @@ static void hub_port_connect(struct usb_ loop_disable:hub_port_disable (hub, port1,1 ); -mutex_lock (hcd->address0_mutex); loop:usb_ep0_reinit (udev);release_devnum (udev);hub_free_dev (udev); +if (retry_locked) { +mutex_unlock (hcd->address0_mutex); +usb_unlock_port (port_dev); + }usb_put_dev (udev);if ((status == -ENOTCONN ) || (status == -ENOTSUPP ))break ;
@@ -5399,8 +5405,6 @@ loop: } done: -mutex_unlock (hcd->address0_mutex); -hub_port_disable (hub, port1,1 );if (hcd->driver->relinquish_port && !hub->hdev->parent) {if (status != -ENOTCONN && status != -ENODEV )
Greg Kroah-Hartman
maintainerPATCH 21/179 binder: fix test regression due to sender_euid change
In reply to Greg Kroah-HartmanFrom: Todd Kjos <[email protected]>
commit c21a80ca0684ec2910344d72556c816cb8940c01 upstream.
This is a partial revert of commit29bc22ac5e5b ("binder: use euid from cred instead of using task"). Setting sender_euid using proc->cred caused some Android system test regressions that need further investigation. It is a partial reversion because subsequent patches rely on proc->cred.
--- drivers/android/binder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/android/binder.c +1 -1
@@ -2710,7 +2710,7 @@ static void binder_transaction(struct bi t->from = thread; else t->from = NULL; - t->sender_euid = proc->cred->euid; + t->sender_euid =task_euid (proc->tsk); t->to_proc = target_proc; t->to_thread = target_thread; t->code = tr->code;
Greg Kroah-Hartman
maintainerPATCH 22/179 ALSA: ctxfi: Fix out-of-range access
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 76c47183224c86e4011048b80f0e2d0d166f01c2 upstream.
The master and next_conj of rcs_ops are used for iterating the resource list entries, and currently those are supposed to return the current value. The problem is that next_conf may go over the last entry before the loop abort condition is evaluated, and it may return the "current" value that is beyond the array size. It was caught recently as a GPF, for example.
Those return values are, however, never actually evaluated, hence basically we don't have to consider the current value as the return at all. By dropping those return values, the potential out-of-range access above is also fixed automatically.
This patch changes the return type of master and next_conj callbacks to void and drop the superfluous code accordingly.
--- sound/pci/ctxfi/ctamixer.c | 14 ++++++-------- sound/pci/ctxfi/ctdaio.c | 16 ++++++++-------- sound/pci/ctxfi/ctresource.c | 7 +++---- sound/pci/ctxfi/ctresource.h | 4 ++-- sound/pci/ctxfi/ctsrc.c | 7 +++---- 5 files changed, 22 insertions(+), 26 deletions(-)
sound/pci/ctxfi/ctamixer.c +6 -8
@@ -23,16 +23,15 @@#define BLANK_SLOT 4094 -static int amixer_master (struct rsc *rsc) +static void amixer_master (struct rsc *rsc) { rsc->conj =0 ; - return rsc->idx = container_of(rsc, struct amixer, rsc)->idx[0]; + rsc->idx = container_of(rsc, struct amixer, rsc)->idx[0]; } -static int amixer_next_conj (struct rsc *rsc) +static void amixer_next_conj (struct rsc *rsc) { rsc->conj++; - return container_of(rsc, struct amixer, rsc)->idx[rsc->conj]; }static int amixer_index (const struct rsc *rsc)
@@ -331,16 +330,15 @@ int amixer_mgr_destroy(struct amixer_mgr/* SUM resource management */ -static int sum_master (struct rsc *rsc) +static void sum_master (struct rsc *rsc) { rsc->conj =0 ; - return rsc->idx = container_of(rsc, struct sum, rsc)->idx[0]; + rsc->idx = container_of(rsc, struct sum, rsc)->idx[0]; } -static int sum_next_conj (struct rsc *rsc) +static void sum_next_conj (struct rsc *rsc) { rsc->conj++; - return container_of(rsc, struct sum, rsc)->idx[rsc->conj]; }static int sum_index (const struct rsc *rsc)
sound/pci/ctxfi/ctdaio.c +8 -8
@@ -51,12 +51,12 @@ static const struct daio_rsc_idx idx_20k [SPDIFIO] = {.left = 0x05, .right = 0x85}, }; -static int daio_master (struct rsc *rsc) +static void daio_master (struct rsc *rsc) {/* Actually, this is not the resource index of DAIO. * For DAO, it is the input mapper index. And, for DAI, * it is the output time-slot index. */ -return rsc->conj = rsc->idx; + rsc->conj = rsc->idx; }static int daio_index (const struct rsc *rsc)
@@ -64,19 +64,19 @@ static int daio_index(const struct rsc *return rsc->conj; } -static int daio_out_next_conj (struct rsc *rsc) +static void daio_out_next_conj (struct rsc *rsc) { -return rsc->conj +=2 ; + rsc->conj +=2 ; } -static int daio_in_next_conj_20k1 (struct rsc *rsc) +static void daio_in_next_conj_20k1 (struct rsc *rsc) { -return rsc->conj +=0x200 ; + rsc->conj +=0x200 ; } -static int daio_in_next_conj_20k2 (struct rsc *rsc) +static void daio_in_next_conj_20k2 (struct rsc *rsc) { -return rsc->conj +=0x100 ; + rsc->conj +=0x100 ; }static const struct rsc_ops daio_out_rsc_ops = {
sound/pci/ctxfi/ctresource.c +3 -4
@@ -109,18 +109,17 @@ static int audio_ring_slot(const structreturn (rsc->conj <<4 ) + offset_in_audio_slot_block[rsc->type]; } -static int rsc_next_conj (struct rsc *rsc) +static void rsc_next_conj (struct rsc *rsc) {unsigned int i;for (i =0 ; (i <8 ) && (!(rsc->msr & (0x1 << i))); ) i++; rsc->conj += (AUDIO_SLOT_BLOCK_NUM >> i); -return rsc->conj; } -static int rsc_master (struct rsc *rsc) +static void rsc_master (struct rsc *rsc) { -return rsc->conj = rsc->idx; + rsc->conj = rsc->idx; }static const struct rsc_ops rsc_generic_ops = {
sound/pci/ctxfi/ctresource.h +2 -2
@@ -39,8 +39,8 @@ struct rsc { };struct rsc_ops { -int (*master)(struct rsc *rsc);/* Move to master resource */ -int (*next_conj)(struct rsc *rsc);/* Move to next conjugate resource */ +void (*master)(struct rsc *rsc);/* Move to master resource */ +void (*next_conj)(struct rsc *rsc);/* Move to next conjugate resource */ int (*index)(const struct rsc *rsc);/* Return the index of resource */ /* Return the output slot number */ int (*output_slot)(const struct rsc *rsc);
sound/pci/ctxfi/ctsrc.c +3 -4
@@ -590,16 +590,15 @@ int src_mgr_destroy(struct src_mgr *src_/* SRCIMP resource manager operations */ -static int srcimp_master (struct rsc *rsc) +static void srcimp_master (struct rsc *rsc) { rsc->conj =0 ; - return rsc->idx = container_of(rsc, struct srcimp, rsc)->idx[0]; + rsc->idx = container_of(rsc, struct srcimp, rsc)->idx[0]; } -static int srcimp_next_conj (struct rsc *rsc) +static void srcimp_next_conj (struct rsc *rsc) { rsc->conj++; - return container_of(rsc, struct srcimp, rsc)->idx[rsc->conj]; }static int srcimp_index (const struct rsc *rsc)
Greg Kroah-Hartman
maintainerPATCH 23/179 ALSA: hda/realtek: Add quirk for ASRock NUC Box 1100
In reply to Greg Kroah-HartmanFrom: Werner Sembach <[email protected]>
commit 174a7fb3859ae75b0f0e35ef852459d8882b55b5 upstream.
This applies a SND_PCI_QUIRK(...) to the ASRock NUC Box 1100 series. This fixes the issue of the headphone jack not being detected unless warm rebooted from a certain other OS.
When booting a certain other OS some coeff settings are changed that enable the audio jack. These settings are preserved on a warm reboot and can be easily dumped.
The relevant indexes and values where gathered by naively diff-ing and reading a working and a non-working coeff dump.
--- sound/pci/hda/patch_realtek.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
sound/pci/hda/patch_realtek.c +27 -0
@@ -6521,6 +6521,27 @@ static void alc256_fixup_tongfang_reset_alc_write_coef_idx (codec,0x45 ,0x5089 ); } +static const struct coef_fw alc233_fixup_no_audio_jack_coefs[] = { +WRITE_COEF (0x1a ,0x9003 ),WRITE_COEF (0x1b ,0x0e2b ),WRITE_COEF (0x37 ,0xfe06 ), +WRITE_COEF (0x38 ,0x4981 ),WRITE_COEF (0x45 ,0xd489 ),WRITE_COEF (0x46 ,0x0074 ), +WRITE_COEF (0x49 ,0x0149 ), + {} +}; + +static void alc233_fixup_no_audio_jack (struct hda_codec *codec, +const struct hda_fixup *fix, +int action) +{ +/* +* The audio jack input and output is not detected on the ASRock NUC Box +* 1100 series when cold booting without this fix. Warm rebooting from a +* certain other OS makes the audio functional, as COEF settings are +* preserved in this case. This fix sets these altered COEF values as +* the default. +*/ +alc_process_coef_fw (codec, alc233_fixup_no_audio_jack_coefs); +} +enum {ALC269_FIXUP_GPIO2 ,ALC269_FIXUP_SONY_VAIO ,
@@ -6740,6 +6761,7 @@ enum {ALC287_FIXUP_13S_GEN2_SPEAKERS ,ALC256_FIXUP_TONGFANG_RESET_PERSISTENT_SETTINGS ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE , + ALC233_FIXUP_NO_AUDIO_JACK, }; static const struct hda_fixup alc269_fixups[] = {
@@ -8460,6 +8482,10 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, }, + [ALC233_FIXUP_NO_AUDIO_JACK] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc233_fixup_no_audio_jack, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8894,6 +8920,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x511e ,"Thinkpad" ,ALC298_FIXUP_TPT470_DOCK ),SND_PCI_QUIRK (0x17aa ,0x511f ,"Thinkpad" ,ALC298_FIXUP_TPT470_DOCK ),SND_PCI_QUIRK (0x17aa ,0x9e54 ,"LENOVO NB" ,ALC269_FIXUP_LENOVO_EAPD ), +SND_PCI_QUIRK (0x1849 ,0x1233 ,"ASRock NUC Box 1100" ,ALC233_FIXUP_NO_AUDIO_JACK ),SND_PCI_QUIRK (0x19e5 ,0x3204 ,"Huawei MACH-WX9" ,ALC256_FIXUP_HUAWEI_MACH_WX9_PINS ),SND_PCI_QUIRK (0x1b35 ,0x1235 ,"CZC B20" ,ALC269_FIXUP_CZC_B20 ), SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI),
Greg Kroah-Hartman
maintainerPATCH 24/179 ALSA: hda/realtek: Fix LED on HP ProBook 435 G7
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 05ec7161084565365ecf267e9909a897a95f243a upstream.
HP ProBook 435 G7 (SSID 103c:8735) needs the similar quirk as another HP ProBook for enabling the mute and the mic-mute LEDs.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -8665,6 +8665,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8728 ,"HP EliteBook 840 G7" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8729 ,"HP" ,ALC285_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8730 ,"HP ProBook 445 G7" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ), +SND_PCI_QUIRK (0x103c ,0x8735 ,"HP ProBook 435 G7" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8736 ,"HP" ,ALC285_FIXUP_HP_GPIO_AMP_INIT ),SND_PCI_QUIRK (0x103c ,0x8760 ,"HP" ,ALC285_FIXUP_HP_MUTE_LED ), SND_PCI_QUIRK(0x103c, 0x877a, "HP", ALC285_FIXUP_HP_MUTE_LED),
Greg Kroah-Hartman
maintainerPATCH 25/179 media: cec: copy sequence field for the reply
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
commit 13cbaa4c2b7bf9f8285e1164d005dbf08244ecd5 upstream.
When the reply for a non-blocking transmit arrives, the sequence field for that reply was never filled in, so userspace would have no way of associating the reply to the original transmit.
Copy the sequence field to ensure that this is now possible.
--- drivers/media/cec/core/cec-adap.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/cec/core/cec-adap.c +1 -0
@@ -1199,6 +1199,7 @@ void cec_received_msg_ts(struct cec_adapif (abort) dst->rx_status |=CEC_RX_STATUS_FEATURE_ABORT ; msg->flags = dst->flags; + msg->sequence = dst->sequence;/* Remove it from the wait_queue */ list_del_init (&data->list);
Greg Kroah-Hartman
maintainerPATCH 26/179 Revert "parisc: Fix backtrace to always include init funtion names"
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 98400ad75e95860e9a10ec78b0b90ab66184a2ce upstream.
This reverts commit 279917e27edc293eb645a25428c6ab3f3bca3f86.
With the CONFIG_HARDENED_USERCOPY option enabled, this patch triggers kernel bugs at runtime:
usercopy: Kernel memory overwrite attempt detected to kernel text (offset 2084839, size 6)! kernel BUG at mm/usercopy.c:99!
Backtrace: IAOQ[0]: usercopy_abort+0xc4/0xe8 [<00000000406ed1c8>] __check_object_size+0x174/0x238 [<00000000407086d4>] copy_strings.isra.0+0x3e8/0x708 [<0000000040709a20>] do_execveat_common.isra.0+0x1bc/0x328 [<000000004070b760>] compat_sys_execve+0x7c/0xb8 [<0000000040303eb8>] syscall_exit+0x0/0x14
The problem is, that we have an init section of at least 2MB size which starts at _stext and is freed after bootup.
If then later some kernel data is (temporarily) stored in this free memory, check_kernel_text_object() will trigger a bug since the data appears to be inside the kernel text (>=_stext) area:
if (overlaps(ptr, len, _stext, _etext))
usercopy_abort("kernel text");
--- arch/parisc/kernel/vmlinux.lds.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/parisc/kernel/vmlinux.lds.S +1 -2
@@ -57,8 +57,6 @@ SECTIONS { . = KERNEL_BINARY_TEXT_START; - _stext = .; /* start of kernel text, includes init code & data */ - __init_begin = .; HEAD_TEXT_SECTION MLONGCALL_DISCARD(INIT_TEXT_SECTION(8))
@@ -82,6 +80,7 @@ SECTIONS /* freed after init ends here */ _text = .; /* Text and read-only data */ + _stext = .; MLONGCALL_KEEP(INIT_TEXT_SECTION(8)) .text ALIGN(PAGE_SIZE) : { TEXT_TEXT
Greg Kroah-Hartman
maintainerPATCH 27/179 HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts
In reply to Greg Kroah-HartmanFrom: Jason Gerecke <[email protected]>
commit 7fb0413baa7f8a04caef0c504df9af7e0623d296 upstream.
The HID descriptor of many of Wacom's touch input devices include a "Confidence" usage that signals if a particular touch collection contains useful data. The driver does not look at this flag, however, which causes even invalid contacts to be reported to userspace. A lucky combination of kernel event filtering and device behavior (specifically: contact ID 0 == invalid, contact ID >0 == valid; and order all data so that all valid contacts are reported before any invalid contacts) spare most devices from any visibly-bad behavior.
The DTH-2452 is one example of an unlucky device that misbehaves. It uses ID 0 for both the first valid contact and all invalid contacts. Because we report both the valid and invalid contacts, the kernel reports that contact 0 first goes down (valid) and then goes up (invalid) in every report. This causes ~100 clicks per second simply by touching the screen.
This patch inroduces new confidence flag in our hid_data structure. The value is initially set to true at the start of a report and can be set to false if an invalid touch usage is seen.
--- drivers/hid/wacom_wac.c | 8 +++++++- drivers/hid/wacom_wac.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/hid/wacom_wac.c +7 -1
@@ -2603,6 +2603,9 @@ static void wacom_wac_finger_event(strucreturn ;switch (equivalent_usage) { +case HID_DG_CONFIDENCE : + wacom_wac->hid_data.confidence = value; +break ;case HID_GD_X : wacom_wac->hid_data.x = value;break ;
@@ -2635,7 +2638,8 @@ static void wacom_wac_finger_event(struc }if (usage->usage_index +1 == field->report_count) { -if (equivalent_usage == wacom_wac->hid_data.last_slot_field) +if (equivalent_usage == wacom_wac->hid_data.last_slot_field && + wacom_wac->hid_data.confidence)wacom_wac_finger_slot (wacom_wac, wacom_wac->touch_input); } }
@@ -2653,6 +2657,8 @@ static void wacom_wac_finger_pre_report( wacom_wac->is_invalid_bt_frame = false; + hid_data->confidence = true; +for (i =0 ; i < report->maxfield; i++) {struct hid_field *field = report->field[i];int j;
drivers/hid/wacom_wac.h +1 -0
@@ -301,6 +301,7 @@ struct hid_data {bool barrelswitch;bool barrelswitch2;bool serialhi; +bool confidence;int x;int y;int pressure;
Greg Kroah-Hartman
maintainerPATCH 28/179 staging/fbtft: Fix backlight
In reply to Greg Kroah-HartmanFrom: Noralf Trønnes <[email protected]>
commit 7865dd24934ad580d1bcde8f63c39f324211a23b upstream.
Commit b4a1ed0cd18b ("fbdev: make FB_BACKLIGHT a tristate") forgot to update fbtft breaking its backlight support when FB_BACKLIGHT is a module.
Since FB_TFT selects FB_BACKLIGHT there's no need for this conditional so just remove it and we're good.
--- drivers/staging/fbtft/fb_ssd1351.c | 4 ---- drivers/staging/fbtft/fbtft-core.c | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-)
drivers/staging/fbtft/fb_ssd1351.c +0 -4
@@ -187,7 +187,6 @@ static struct fbtft_display display = { }, }; -#ifdef CONFIG_FB_BACKLIGHT static int update_onboard_backlight (struct backlight_device *bd) {struct fbtft_par *par =bl_get_data (bd);
@@ -231,9 +230,6 @@ static void register_onboard_backlight(sif (!par->fbtftops.unregister_backlight) par->fbtftops.unregister_backlight = fbtft_unregister_backlight; } -#else -static void register_onboard_backlight (struct fbtft_par *par) { }; -#endif FBTFT_REGISTER_DRIVER (DRVNAME ,"solomon,ssd1351" , &display);
drivers/staging/fbtft/fbtft-core.c +1 -8
@@ -128,7 +128,6 @@ static int fbtft_request_gpios(struct fbreturn 0 ; } -#ifdef CONFIG_FB_BACKLIGHT static int fbtft_backlight_update_status (struct backlight_device *bd) {struct fbtft_par *par =bl_get_data (bd);
@@ -161,6 +160,7 @@ void fbtft_unregister_backlight(struct f par->info->bl_dev =NULL ; } } +EXPORT_SYMBOL (fbtft_unregister_backlight);static const struct backlight_ops fbtft_bl_ops = { .get_brightness = fbtft_backlight_get_brightness,
@@ -198,12 +198,7 @@ void fbtft_register_backlight(struct fbtif (!par->fbtftops.unregister_backlight) par->fbtftops.unregister_backlight = fbtft_unregister_backlight; } -#else -void fbtft_register_backlight (struct fbtft_par *par) { }; -void fbtft_unregister_backlight (struct fbtft_par *par) { }; -#endif EXPORT_SYMBOL (fbtft_register_backlight); -EXPORT_SYMBOL (fbtft_unregister_backlight);static void fbtft_set_addr_win (struct fbtft_par *par,int xs,int ys,int xe,int ye)
@@ -853,13 +848,11 @@ int fbtft_register_framebuffer(struct fb fb_info->fix.smem_len >>10 , text1, HZ / fb_info->fbdefio->delay, text2); -#ifdef CONFIG_FB_BACKLIGHT /* Turn on backlight if available */ if (fb_info->bl_dev) { fb_info->bl_dev->props.power =FB_BLANK_UNBLANK ; fb_info->bl_dev->ops->update_status (fb_info->bl_dev); } -#endif return 0 ;
Greg Kroah-Hartman
maintainerPATCH 29/179 staging: greybus: Add missing rwsem around snd_ctl_remove() calls
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit ffcf7ae90f4489047d7b076539ba207024dea5f6 upstream.
snd_ctl_remove() has to be called with card->controls_rwsem held (when called after the card instantiation). This patch adds the missing rwsem calls around it.
--- drivers/staging/greybus/audio_helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/staging/greybus/audio_helper.c +6 -2
@@ -192,7 +192,11 @@ int gbaudio_remove_component_controls(st unsigned int num_controls) {struct snd_card *card = component->card->snd_card; +int err; -return gbaudio_remove_controls (card, component->dev, controls, - num_controls, component->name_prefix); +down_write (&card->controls_rwsem); + err =gbaudio_remove_controls (card, component->dev, controls, + num_controls, component->name_prefix); +up_write (&card->controls_rwsem); +return err; }
Greg Kroah-Hartman
maintainerPATCH 30/179 staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit b535917c51acc97fb0761b1edec85f1f3d02bda4 upstream.
The free_rtllib() function frees the "dev" pointer so there is use after free on the next line. Re-arrange things to avoid that.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +2 -1
@@ -2549,13 +2549,14 @@ static void _rtl92e_pci_disconnect(strucfree_irq (dev->irq, dev); priv->irq =0 ; } -free_rtllib (dev);if (dev->mem_start !=0 ) {iounmap ((void __iomem *)dev->mem_start);release_mem_region (pci_resource_start (pdev,1 ),pci_resource_len (pdev,1 )); } + +free_rtllib (dev); }pci_disable_device (pdev);
Greg Kroah-Hartman
maintainerPATCH 31/179 staging: r8188eu: Use kzalloc() with GFP_ATOMIC in atomic context
In reply to Greg Kroah-HartmanFrom: Fabio M. De Francesco <[email protected]>
commit c15a059f85de49c542e6ec2464967dd2b2aa18f6 upstream.
Use the GFP_ATOMIC flag of kzalloc() with two memory allocation in report_del_sta_event(). This function is called while holding spinlocks, therefore it is not allowed to sleep. With the GFP_ATOMIC type flag, the allocation is high priority and must not sleep.
This issue is detected by Smatch which emits the following warning:
"drivers/staging/r8188eu/core/rtw_mlme_ext.c:6848 report_del_sta_event()
warn: sleeping in atomic context".
After the change, the post-commit hook output the following message:
"CHECK: Prefer kzalloc(sizeof(*pcmd_obj)...) over kzalloc(sizeof(struct cmd_obj)...)".
According to the above "CHECK", use the preferred style in the first kzalloc().
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +2 -2
@@ -7080,12 +7080,12 @@ void report_del_sta_event(struct adapterstruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; - pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL ); + pcmd_obj =kzalloc (sizeof (*pcmd_obj),GFP_ATOMIC );if (!pcmd_obj)return ; cmdsz = (sizeof (struct stadel_event ) +sizeof (struct C2HEvent_Header )); - pevtcmd =kzalloc (cmdsz,GFP_KERNEL ); + pevtcmd =kzalloc (cmdsz,GFP_ATOMIC );if (!pevtcmd) {kfree (pcmd_obj);return ;
Greg Kroah-Hartman
maintainerPATCH 32/179 staging: r8188eu: Fix breakage introduced when 5G code was removed
In reply to Greg Kroah-HartmanFrom: Larry Finger <[email protected]>
commit d5f0b804368951b6b4a77d2f14b5bb6a04b0e011 upstream.
In commit 221abd4d478a ("staging: r8188eu: Remove no more necessary definitions and code"), two entries were removed from RTW_ChannelPlanMap[], but not replaced with zeros. The position within this table is important, thus the patch broke systems operating in regulatory domains osted later than entry 0x13 in the table. Unfortunately, the FCC entry comes before that point and most testers did not see this problem.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +2 -0
@@ -104,6 +104,7 @@ static struct rt_channel_plan_map RTW_Ch {0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */ {0x02}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */ {0x01}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */ + {0x00}, /* 0x13 */ {0x02}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */ {0x00}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */ {0x00}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */
@@ -115,6 +116,7 @@ static struct rt_channel_plan_map RTW_Ch {0x00}, /* 0x1C, */ {0x00}, /* 0x1D, */ {0x00}, /* 0x1E, */ + {0x00}, /* 0x1F, *//* 0x20 ~ 0x7F , New Define ===== */ {0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */ {0x01}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */
Greg Kroah-Hartman
maintainerPATCH 33/179 staging: r8188eu: use GFP_ATOMIC under spinlock
In reply to Greg Kroah-HartmanFrom: Michael Straube <[email protected]>
commit 4a293eaf92a510ff688dc7b3f0815221f99c9d1b upstream.
In function rtw_report_sec_ie() kzalloc() is called under a spinlock, so the allocation have to be atomic.
Call tree:
-> rtw_select_and_join_from_scanned_queue() <- takes a spinlock
-> rtw_joinbss_cmd()
-> rtw_restruct_sec_ie()
-> rtw_report_sec_ie()--- drivers/staging/r8188eu/os_dep/mlme_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/r8188eu/os_dep/mlme_linux.c +1 -1
@@ -114,7 +114,7 @@ void rtw_report_sec_ie(struct adapter *a buff =NULL ;if (authmode == _WPA_IE_ID_) { - buff =kzalloc (IW_CUSTOM_MAX ,GFP_KERNEL ); + buff =kzalloc (IW_CUSTOM_MAX ,GFP_ATOMIC );if (!buff)return ; p = buff;
Greg Kroah-Hartman
maintainerPATCH 34/179 staging: r8188eu: fix a memory leak in rtw_wx_read32()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit be4ea8f383551b9dae11b8dfff1f38b3b5436e9a upstream.
Free "ptmp" before returning -EINVAL.
--- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/staging/r8188eu/os_dep/ioctl_linux.c +7 -1
@@ -2061,6 +2061,7 @@ static int rtw_wx_read32(struct net_deviu32 data32;u32 bytes;u8 *ptmp; +int ret; padapter = (struct adapter *)rtw_netdev_priv (dev); p = &wrqu->data;
@@ -2093,12 +2094,17 @@ static int rtw_wx_read32(struct net_devibreak ;default :DBG_88E (KERN_INFO "%s: usage> read [bytes],[address(hex)]\n" , __func__); -return -EINVAL ; + ret = -EINVAL ; + goto err_free_ptmp; }DBG_88E (KERN_INFO "%s: addr = 0x%08X data =%s\n" , __func__, addr, extra);kfree (ptmp);return 0 ; + +err_free_ptmp: +kfree (ptmp); +return ret; } static int rtw_wx_write32(struct net_device *dev,
Greg Kroah-Hartman
maintainerPATCH 35/179 fuse: release pipe buf after last use
In reply to Greg Kroah-HartmanFrom: Miklos Szeredi <[email protected]>
commit 473441720c8616dfaf4451f9c7ea14f0eb5e5d65 upstream.
Checking buf->flags should be done before the pipe_buf_release() is called on the pipe buffer, since releasing the buffer might modify the flags.
This is exactly what page_cache_pipe_buf_release() does, and which results in the same VM_BUG_ON_PAGE(PageLRU(page)) that the original patch was trying to fix.
--- fs/fuse/dev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/fuse/dev.c +5 -5
@@ -847,17 +847,17 @@ static int fuse_try_move_page(struct fusreplace_page_cache_page (oldpage, newpage); +get_page (newpage); + +if (!(buf->flags &PIPE_BUF_FLAG_LRU )) +lru_cache_add (newpage); +/* * Release while we have extra ref on stolen page. Otherwise * anon_pipe_buf_release() might think the page can be reused. */ pipe_buf_release (cs->pipe, buf); -get_page (newpage); - -if (!(buf->flags &PIPE_BUF_FLAG_LRU )) -lru_cache_add (newpage); - err =0 ;spin_lock (&cs->req->waitq.lock);if (test_bit (FR_ABORTED , &cs->req->flags))
Greg Kroah-Hartman
maintainerPATCH 36/179 xen: dont continue xenstore initialization in case of errors
In reply to Greg Kroah-HartmanFrom: Stefano Stabellini <[email protected]>
commit 08f6c2b09ebd4b326dbe96d13f94fee8f9814c78 upstream.
In case of errors in xenbus_init (e.g. missing xen_store_gfn parameter), we goto out_error but we forget to reset xen_store_domain_type to XS_UNKNOWN. As a consequence xenbus_probe_initcall and other initcalls will still try to initialize xenstore resulting into a crash at boot.
[ 2.479830] Call trace: [ 2.482314] xb_init_comms+0x18/0x150 [ 2.486354] xs_init+0x34/0x138 [ 2.489786] xenbus_probe+0x4c/0x70 [ 2.498432] xenbus_probe_initcall+0x2c/0x7c [ 2.503944] do_one_initcall+0x54/0x1b8 [ 2.507358] kernel_init_freeable+0x1ac/0x210 [ 2.511617] kernel_init+0x28/0x130 [ 2.516112] ret_from_fork+0x10/0x20
--- drivers/xen/xenbus/xenbus_probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/xen/xenbus/xenbus_probe.c +3 -1
@@ -909,7 +909,7 @@ static struct notifier_block xenbus_resustatic int __init xenbus_init (void ) { -int err =0 ; +int err;uint64_t v =0 ; xen_store_domain_type =XS_UNKNOWN ;
@@ -983,8 +983,10 @@ static int __init xenbus_init(void)*/ proc_create_mount_point ("xen" );#endif +return 0 ; out_error: + xen_store_domain_type =XS_UNKNOWN ;return err; }
Greg Kroah-Hartman
maintainerPATCH 37/179 xen: detect uninitialized xenbus in xenbus_init
In reply to Greg Kroah-HartmanFrom: Stefano Stabellini <[email protected]>
commit 36e8f60f0867d3b70d398d653c17108459a04efe upstream.
If the xenstore page hasn't been allocated properly, reading the value of the related hvm_param (HVM_PARAM_STORE_PFN) won't actually return error. Instead, it will succeed and return zero. Instead of attempting to xen_remap a bad guest physical address, detect this condition and return early.
Note that although a guest physical address of zero for HVM_PARAM_STORE_PFN is theoretically possible, it is not a good choice and zero has never been validly used in that capacity.
Also recognize all bits set as an invalid value.
For 32-bit Linux, any pfn above ULONG_MAX would get truncated. Pfns above ULONG_MAX should never be passed by the Xen tools to HVM guests anyway, so check for this condition and return early.
--- drivers/xen/xenbus/xenbus_probe.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/xen/xenbus/xenbus_probe.c +23 -0
@@ -949,6 +949,29 @@ static int __init xenbus_init(void) err =hvm_get_parameter (HVM_PARAM_STORE_PFN , &v);if (err) goto out_error; +/* +* Uninitialized hvm_params are zero and return no error. +* Although it is theoretically possible to have +* HVM_PARAM_STORE_PFN set to zero on purpose, in reality it is +* not zero when valid. If zero, it means that Xenstore hasn't +* been properly initialized. Instead of attempting to map a +* wrong guest physical address return error. +* +* Also recognize all bits set as an invalid value. +*/ +if (!v || !~v) { + err = -ENOENT ; + goto out_error; + } +/* Avoid truncation on 32-bit. */ +#if BITS_PER_LONG ==32 +if (v >ULONG_MAX ) { +pr_err ("%s: cannot handle HVM_PARAM_STORE_PFN=%llx > ULONG_MAX\n" , + __func__, v); + err = -EINVAL ; + goto out_error; + } +#endif xen_store_gfn = (unsigned long )v; xen_store_interface = xen_remap(xen_store_gfn << XEN_PAGE_SHIFT,
Greg Kroah-Hartman
maintainerPATCH 38/179 io_uring: correct link-list traversal locking
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 674ee8e1b4a41d2fdffc885c55350c3fbb38c22a upstream.
As io_remove_next_linked() is now under ->timeout_lock (see io_link_timeout_fn), we should update locking around io_for_each_link() and io_match_task() to use the new lock.
--- fs/io_uring.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/io_uring.c +8 -4
@@ -1430,10 +1430,10 @@ static void io_prep_async_link(struct ioif (req->flags &REQ_F_LINK_TIMEOUT ) {struct io_ring_ctx *ctx = req->ctx; -spin_lock (&ctx->completion_lock); +spin_lock_irq (&ctx->timeout_lock);io_for_each_link (cur, req)io_prep_async_work (cur); -spin_unlock (&ctx->completion_lock); +spin_unlock_irq (&ctx->timeout_lock); }else {io_for_each_link (cur, req)io_prep_async_work (cur);
@@ -5697,6 +5697,7 @@ static bool io_poll_remove_all(struct ioint posted =0 , i;spin_lock (&ctx->completion_lock); +spin_lock_irq (&ctx->timeout_lock);for (i =0 ; i < (1U << ctx->cancel_hash_bits); i++) {struct hlist_head *list;
@@ -5706,6 +5707,7 @@ static bool io_poll_remove_all(struct io posted +=io_poll_remove_one (req); } } +spin_unlock_irq (&ctx->timeout_lock);spin_unlock (&ctx->completion_lock);if (posted)
@@ -9523,9 +9525,9 @@ static bool io_cancel_task_cb(struct io_struct io_ring_ctx *ctx = req->ctx;/* protect against races with linked timeouts */ -spin_lock (&ctx->completion_lock); +spin_lock_irq (&ctx->timeout_lock); ret =io_match_task (req, cancel->task, cancel->all); -spin_unlock (&ctx->completion_lock); +spin_unlock_irq (&ctx->timeout_lock); }else { ret =io_match_task (req, cancel->task, cancel->all); }
@@ -9539,12 +9541,14 @@ static bool io_cancel_defer_files(structLIST_HEAD (list);spin_lock (&ctx->completion_lock); +spin_lock_irq (&ctx->timeout_lock);list_for_each_entry_reverse (de, &ctx->defer_list, list) {if (io_match_task (de->req, task, cancel_all)) {list_cut_position (&list, &ctx->defer_list, &de->list);break ; } } +spin_unlock_irq (&ctx->timeout_lock);spin_unlock (&ctx->completion_lock);if (list_empty (&list))return false;
Greg Kroah-Hartman
maintainerPATCH 39/179 io_uring: fail cancellation for EXITING tasks
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 617a89484debcd4e7999796d693cf0b77d2519de upstream.
WARNING: CPU: 1 PID: 20 at fs/io_uring.c:6269 io_try_cancel_userdata+0x3c5/0x640 fs/io_uring.c:6269 CPU: 1 PID: 20 Comm: kworker/1:0 Not tainted 5.16.0-rc1-syzkaller #0 Workqueue: events io_fallback_req_func RIP: 0010:io_try_cancel_userdata+0x3c5/0x640 fs/io_uring.c:6269 Call Trace: <TASK> io_req_task_link_timeout+0x6b/0x1e0 fs/io_uring.c:6886 io_fallback_req_func+0xf9/0x1ae fs/io_uring.c:1334 process_one_work+0x9b2/0x1690 kernel/workqueue.c:2298 worker_thread+0x658/0x11f0 kernel/workqueue.c:2445 kthread+0x405/0x4f0 kernel/kthread.c:327 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 </TASK>
We need original task's context to do cancellations, so if it's dying and the callback is executed in a fallback mode, fail the cancellation attempt.
--- fs/io_uring.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/io_uring.c +3 -2
@@ -6886,10 +6886,11 @@ static inline struct file *io_file_get(sstatic void io_req_task_link_timeout (struct io_kiocb *req,bool *locked) {struct io_kiocb *prev = req->timeout.prev; -int ret; +int ret = -ENOENT ;if (prev) { - ret =io_try_cancel_userdata (req, prev->user_data); +if (!(req->task->flags &PF_EXITING )) + ret =io_try_cancel_userdata (req, prev->user_data);io_req_complete_post (req, ret ?: -ETIME ,0 );io_put_req (prev); }else {
Greg Kroah-Hartman
maintainerPATCH 40/179 io_uring: fix link traversal locking
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 6af3f48bf6156a7f02e91aca64e2927c4bebda03 upstream.
WARNING: inconsistent lock state 5.16.0-rc2-syzkaller #0 Not tainted inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W} usage. ffff888078e11418 (&ctx->timeout_lock ){?.+.}-{2:2}
, at: io_timeout_fn+0x6f/0x360 fs/io_uring.c:5943 {HARDIRQ-ON-W} state was registered at:
[...]
spin_unlock_irq include/linux/spinlock.h:399 [inline] __io_poll_remove_one fs/io_uring.c:5669 [inline] __io_poll_remove_one fs/io_uring.c:5654 [inline] io_poll_remove_one+0x236/0x870 fs/io_uring.c:5680 io_poll_remove_all+0x1af/0x235 fs/io_uring.c:5709 io_ring_ctx_wait_and_kill+0x1cc/0x322 fs/io_uring.c:9534 io_uring_release+0x42/0x46 fs/io_uring.c:9554 __fput+0x286/0x9f0 fs/file_table.c:280 task_work_run+0xdd/0x1a0 kernel/task_work.c:164 exit_task_work include/linux/task_work.h:32 [inline] do_exit+0xc14/0x2b40 kernel/exit.c:832
674ee8e1b4a41 ("io_uring: correct link-list traversal locking") fixed a data race but introduced a possible deadlock and inconsistentcy in irq states. E.g.
io_poll_remove_all()
spin_lock_irq(timeout_lock)
io_poll_remove_one()
spin_lock/unlock_irq(poll_lock);
spin_unlock_irq(timeout_lock)Another type of problem is freeing a request while holding ->timeout_lock, which may leads to a deadlock in io_commit_cqring() -> io_flush_timeouts() and other places.
Having 3 nested locks is also too ugly. Add io_match_task_safe(), which would briefly take and release timeout_lock for race prevention inside, so the actuall request cancellation / free / etc. code doesn't have it taken.
--- fs/io_uring.c | 60 ++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 18 deletions(-)
fs/io_uring.c +42 -18
@@ -1204,6 +1204,7 @@ static void io_refs_resurrect(struct perstatic bool io_match_task (struct io_kiocb *head,struct task_struct *task,bool cancel_all) + __must_hold(&req->ctx->timeout_lock) {struct io_kiocb *req;
@@ -1219,6 +1220,44 @@ static bool io_match_task(struct io_kiocreturn false; } +static bool io_match_linked (struct io_kiocb *head) +{ +struct io_kiocb *req; + +io_for_each_link (req, head) { +if (req->flags &REQ_F_INFLIGHT ) +return true; + } +return false; +} + +/* +* As io_match_task() but protected against racing with linked timeouts. +* User must not hold timeout_lock. +*/ +static bool io_match_task_safe (struct io_kiocb *head,struct task_struct *task, +bool cancel_all) +{ +bool matched; + +if (task && head->task != task) +return false; +if (cancel_all) +return true; + +if (head->flags &REQ_F_LINK_TIMEOUT ) { +struct io_ring_ctx *ctx = head->ctx; + +/* protect against races with linked timeouts */ +spin_lock_irq (&ctx->timeout_lock); + matched =io_match_linked (head); +spin_unlock_irq (&ctx->timeout_lock); + }else { + matched =io_match_linked (head); + } +return matched; +} +static inline void req_set_fail (struct io_kiocb *req) { req->flags |=REQ_F_FAIL ;
@@ -5697,17 +5736,15 @@ static bool io_poll_remove_all(struct ioint posted =0 , i;spin_lock (&ctx->completion_lock); -spin_lock_irq (&ctx->timeout_lock);for (i =0 ; i < (1U << ctx->cancel_hash_bits); i++) {struct hlist_head *list; list = &ctx->cancel_hash[i];hlist_for_each_entry_safe (req, tmp, list, hash_node) { -if (io_match_task (req, tsk, cancel_all)) +if (io_match_task_safe (req, tsk, cancel_all)) posted +=io_poll_remove_one (req); } } -spin_unlock_irq (&ctx->timeout_lock);spin_unlock (&ctx->completion_lock);if (posted)
@@ -9520,19 +9557,8 @@ static bool io_cancel_task_cb(struct io_ { struct io_kiocb *req = container_of(work, struct io_kiocb, work);struct io_task_cancel *cancel = data; -bool ret; -if (!cancel->all && (req->flags &REQ_F_LINK_TIMEOUT )) { -struct io_ring_ctx *ctx = req->ctx; - -/* protect against races with linked timeouts */ -spin_lock_irq (&ctx->timeout_lock); - ret =io_match_task (req, cancel->task, cancel->all); -spin_unlock_irq (&ctx->timeout_lock); - }else { - ret =io_match_task (req, cancel->task, cancel->all); - } -return ret; +return io_match_task_safe (req, cancel->task, cancel->all); } static bool io_cancel_defer_files(struct io_ring_ctx *ctx,
@@ -9542,14 +9568,12 @@ static bool io_cancel_defer_files(structLIST_HEAD (list);spin_lock (&ctx->completion_lock); -spin_lock_irq (&ctx->timeout_lock);list_for_each_entry_reverse (de, &ctx->defer_list, list) { -if (io_match_task (de->req, task, cancel_all)) { +if (io_match_task_safe (de->req, task, cancel_all)) {list_cut_position (&list, &ctx->defer_list, &de->list);break ; } } -spin_unlock_irq (&ctx->timeout_lock);spin_unlock (&ctx->completion_lock);if (list_empty (&list))return false;
Greg Kroah-Hartman
maintainerPATCH 41/179 drm/amdgpu: IH process reset count when restart
In reply to Greg Kroah-HartmanFrom: Philip Yang <[email protected]>
commit 4d62555f624582e60be416fbc4772cd3fcd12b1a upstream.
Otherwise when IH process restart, count is zero, the loop will not exit to wake_up_all after processing AMDGPU_IH_MAX_NUM_IVS interrupts.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c +2 -1
@@ -223,7 +223,7 @@ int amdgpu_ih_wait_on_checkpoint_process*/ int amdgpu_ih_process (struct amdgpu_device *adev,struct amdgpu_ih_ring *ih) { -unsigned int count =AMDGPU_IH_MAX_NUM_IVS ; +unsigned int count;u32 wptr;if (!ih->enabled || adev->shutdown)
@@ -232,6 +232,7 @@ int amdgpu_ih_process(struct amdgpu_devi wptr =amdgpu_ih_get_wptr (adev, ih); restart_ih: + count =AMDGPU_IH_MAX_NUM_IVS ;DRM_DEBUG ("%s: rptr %d, wptr %d\n" , __func__, ih->rptr, wptr);/* Order reading of wptr vs. reading of IH ring data */
Greg Kroah-Hartman
maintainerPATCH 42/179 drm/amdgpu/pm: fix powerplay OD interface
In reply to Greg Kroah-HartmanFrom: Alex Deucher <[email protected]>
commit d5c7255dc7ff6e1239d794b9c53029d83ced04ca upstream.
The overclocking interface currently appends data to a string. Revert back to using sprintf().
--- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 20 ++---- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 24 +++---- drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 6 - drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 28 ++++---- drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 10 +-- drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 58 ++++++++---------- 6 files changed, 67 insertions(+), 79 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +9 -11
@@ -1024,8 +1024,6 @@ static int smu10_print_clock_levels(struuint32_t min_freq, max_freq =0 ;uint32_t ret =0 ; -phm_get_sysfs_buf (&buf, &size); -switch (type) {case PP_SCLK :smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency, &now);
@@ -1038,13 +1036,13 @@ static int smu10_print_clock_levels(struelse i =1 ; - size +=sysfs_emit_at (buf, size,"0: %uMhz %s\n" , + size +=sprintf (buf + size,"0: %uMhz %s\n" , data->gfx_min_freq_limit/100 , i ==0 ?"*" :"" ); - size +=sysfs_emit_at (buf, size,"1: %uMhz %s\n" , + size +=sprintf (buf + size,"1: %uMhz %s\n" , i ==1 ? now :SMU10_UMD_PSTATE_GFXCLK , i ==1 ?"*" :"" ); - size +=sysfs_emit_at (buf, size,"2: %uMhz %s\n" , + size +=sprintf (buf + size,"2: %uMhz %s\n" , data->gfx_max_freq_limit/100 , i ==2 ?"*" :"" );break ;
@@ -1052,7 +1050,7 @@ static int smu10_print_clock_levels(strusmum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency, &now);for (i =0 ; i < mclk_table->count; i++) - size += sysfs_emit_at(buf, size, "%d: %uMhz %s\n", + size += sprintf(buf + size, "%d: %uMhz %s\n", i, mclk_table->entries[i].clk / 100, ((mclk_table->entries[i].clk / 100)
@@ -1067,10 +1065,10 @@ static int smu10_print_clock_levels(struif (ret)return ret; - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); - size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , + size +=sprintf (buf + size,"%s:\n" ,"OD_SCLK" ); + size +=sprintf (buf + size,"0: %10uMhz\n" , (data->gfx_actual_soft_min_freq >0 ) ? data->gfx_actual_soft_min_freq : min_freq); - size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , + size +=sprintf (buf + size,"1: %10uMhz\n" , (data->gfx_actual_soft_max_freq >0 ) ? data->gfx_actual_soft_max_freq : max_freq); }break ;
@@ -1083,8 +1081,8 @@ static int smu10_print_clock_levels(struif (ret)return ret; - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); - size +=sysfs_emit_at (buf, size,"SCLK: %7uMHz %10uMHz\n" , + size +=sprintf (buf + size,"%s:\n" ,"OD_RANGE" ); + size +=sprintf (buf + size,"SCLK: %7uMHz %10uMHz\n" , min_freq, max_freq); }break ;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +11 -13
@@ -4914,8 +4914,6 @@ static int smu7_print_clock_levels(strucint size =0 ;uint32_t i, now, clock, pcie_speed; -phm_get_sysfs_buf (&buf, &size); -switch (type) {case PP_SCLK :smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &clock);
@@ -4928,7 +4926,7 @@ static int smu7_print_clock_levels(struc now = i;for (i =0 ; i < sclk_table->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, sclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4943,7 +4941,7 @@ static int smu7_print_clock_levels(struc now = i;for (i =0 ; i < mclk_table->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, mclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4957,7 +4955,7 @@ static int smu7_print_clock_levels(struc now = i;for (i =0 ; i < pcie_table->count; i++) - size += sysfs_emit_at(buf, size, "%d: %s %s\n", i, + size += sprintf(buf + size, "%d: %s %s\n", i, (pcie_table->dpm_levels[i].value == 0) ? "2.5GT/s, x8" : (pcie_table->dpm_levels[i].value == 1) ? "5.0GT/s, x16" : (pcie_table->dpm_levels[i].value == 2) ? "8.0GT/s, x16" : "",
@@ -4965,32 +4963,32 @@ static int smu7_print_clock_levels(strucbreak ;case OD_SCLK :if (hwmgr->od_enabled) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); + size +=sprintf (buf + size,"%s:\n" ,"OD_SCLK" );for (i =0 ; i < odn_sclk_table->num_of_pl; i++) - size +=sysfs_emit_at (buf, size,"%d: %10uMHz %10umV\n" , + size +=sprintf (buf + size,"%d: %10uMHz %10umV\n" , i, odn_sclk_table->entries[i].clock/100 , odn_sclk_table->entries[i].vddc); }break ;case OD_MCLK :if (hwmgr->od_enabled) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_MCLK" ); + size +=sprintf (buf + size,"%s:\n" ,"OD_MCLK" );for (i =0 ; i < odn_mclk_table->num_of_pl; i++) - size +=sysfs_emit_at (buf, size,"%d: %10uMHz %10umV\n" , + size +=sprintf (buf + size,"%d: %10uMHz %10umV\n" , i, odn_mclk_table->entries[i].clock/100 , odn_mclk_table->entries[i].vddc); }break ;case OD_RANGE :if (hwmgr->od_enabled) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); - size +=sysfs_emit_at (buf, size,"SCLK: %7uMHz %10uMHz\n" , + size +=sprintf (buf + size,"%s:\n" ,"OD_RANGE" ); + size +=sprintf (buf + size,"SCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.sclk_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.engineClock/100 ); - size +=sysfs_emit_at (buf, size,"MCLK: %7uMHz %10uMHz\n" , + size +=sprintf (buf + size,"MCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.mclk_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.memoryClock/100 ); - size +=sysfs_emit_at (buf, size,"VDDC: %7umV %11umV\n" , + size +=sprintf (buf + size,"VDDC: %7umV %11umV\n" , data->odn_dpm_table.min_vddc, data->odn_dpm_table.max_vddc); }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c +2 -4
@@ -1550,8 +1550,6 @@ static int smu8_print_clock_levels(strucuint32_t i, now;int size =0 ; -phm_get_sysfs_buf (&buf, &size); -switch (type) {case PP_SCLK : now = PHM_GET_FIELD(cgs_read_ind_register(hwmgr->device,
@@ -1561,7 +1559,7 @@ static int smu8_print_clock_levels(struc CURR_SCLK_INDEX);for (i =0 ; i < sclk_table->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, sclk_table->entries[i].clk /100 , (i == now) ?"*" :"" );break ;
@@ -1573,7 +1571,7 @@ static int smu8_print_clock_levels(struc CURR_MCLK_INDEX);for (i =SMU8_NUM_NBPMEMORYCLOCK ; i >0 ; i--) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" ,SMU8_NUM_NBPMEMORYCLOCK -i, data->sys_info.nbp_memory_clock[i-1 ] /100 , (SMU8_NUM_NBPMEMORYCLOCK -i == now) ?"*" :"" );break ;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +13 -15
@@ -4639,8 +4639,6 @@ static int vega10_print_clock_levels(strint i, now, size =0 , count =0 ; -phm_get_sysfs_buf (&buf, &size); -switch (type) {case PP_SCLK :if (data->registry_data.sclk_dpm_key_disabled)
@@ -4654,7 +4652,7 @@ static int vega10_print_clock_levels(strelse count = sclk_table->count;for (i =0 ; i < count; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, sclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4665,7 +4663,7 @@ static int vega10_print_clock_levels(strsmum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex, &now);for (i =0 ; i < mclk_table->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, mclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4676,7 +4674,7 @@ static int vega10_print_clock_levels(strsmum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentSocclkIndex, &now);for (i =0 ; i < soc_table->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, soc_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4688,7 +4686,7 @@ static int vega10_print_clock_levels(str PPSMC_MSG_GetClockFreqMHz, CLK_DCEFCLK, &now);for (i =0 ; i < dcef_table->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, dcef_table->dpm_levels[i].value /100 , (dcef_table->dpm_levels[i].value /100 == now) ?"*" :"" );
@@ -4702,7 +4700,7 @@ static int vega10_print_clock_levels(str gen_speed = pptable->PcieGenSpeed[i]; lane_width = pptable->PcieLaneCount[i]; - size +=sysfs_emit_at (buf, size,"%d: %s %s %s\n" , i, + size +=sprintf (buf + size,"%d: %s %s %s\n" , i, (gen_speed ==0 ) ?"2.5GT/s," : (gen_speed ==1 ) ?"5.0GT/s," : (gen_speed == 2) ? "8.0GT/s," :
@@ -4721,34 +4719,34 @@ static int vega10_print_clock_levels(strcase OD_SCLK :if (hwmgr->od_enabled) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); + size +=sprintf (buf + size,"%s:\n" ,"OD_SCLK" ); podn_vdd_dep = &data->odn_dpm_table.vdd_dep_on_sclk;for (i =0 ; i < podn_vdd_dep->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %10uMhz %10umV\n" , + size +=sprintf (buf + size,"%d: %10uMhz %10umV\n" , i, podn_vdd_dep->entries[i].clk /100 , podn_vdd_dep->entries[i].vddc); }break ;case OD_MCLK :if (hwmgr->od_enabled) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_MCLK" ); + size +=sprintf (buf + size,"%s:\n" ,"OD_MCLK" ); podn_vdd_dep = &data->odn_dpm_table.vdd_dep_on_mclk;for (i =0 ; i < podn_vdd_dep->count; i++) - size +=sysfs_emit_at (buf, size,"%d: %10uMhz %10umV\n" , + size +=sprintf (buf + size,"%d: %10uMhz %10umV\n" , i, podn_vdd_dep->entries[i].clk/100 , podn_vdd_dep->entries[i].vddc); }break ;case OD_RANGE :if (hwmgr->od_enabled) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); - size +=sysfs_emit_at (buf, size,"SCLK: %7uMHz %10uMHz\n" , + size +=sprintf (buf + size,"%s:\n" ,"OD_RANGE" ); + size +=sprintf (buf + size,"SCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.gfx_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.engineClock/100 ); - size +=sysfs_emit_at (buf, size,"MCLK: %7uMHz %10uMHz\n" , + size +=sprintf (buf + size,"MCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.mem_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.memoryClock/100 ); - size +=sysfs_emit_at (buf, size,"VDDC: %7umV %11umV\n" , + size +=sprintf (buf + size,"VDDC: %7umV %11umV\n" , data->odn_dpm_table.min_vddc, data->odn_dpm_table.max_vddc); }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +4 -6
@@ -2246,8 +2246,6 @@ static int vega12_print_clock_levels(strint i, now, size =0 ;struct pp_clock_levels_with_latency clocks; -phm_get_sysfs_buf (&buf, &size); -switch (type) {case PP_SCLK : PP_ASSERT_WITH_CODE(
@@ -2260,7 +2258,7 @@ static int vega12_print_clock_levels(str"Attempt to get gfx clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now /100 ) ?"*" :"" );break ;
@@ -2276,7 +2274,7 @@ static int vega12_print_clock_levels(str"Attempt to get memory clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now /100 ) ?"*" :"" );break ;
@@ -2294,7 +2292,7 @@ static int vega12_print_clock_levels(str"Attempt to get soc clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now) ?"*" :"" );break ;
@@ -2312,7 +2310,7 @@ static int vega12_print_clock_levels(str"Attempt to get dcef clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now) ?"*" :"" );break ;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +28 -30
173 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 43/179 drm/nouveau: recognise GA106
In reply to Greg Kroah-HartmanFrom: Ben Skeggs <[email protected]>
commit 46741e4f593ff1bd0e4a140ab7e566701946484b upstream.
I've got HW now, appears to work as expected so far.
--- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +22 -0
@@ -2627,6 +2627,27 @@ nv174_chipset = { };static const struct nvkm_device_chip +nv176_chipset = { + .name ="GA106" , + .bar = {0x00000001 , tu102_bar_new }, + .bios = {0x00000001 , nvkm_bios_new }, + .devinit = {0x00000001 , ga100_devinit_new }, + .fb = {0x00000001 , ga102_fb_new }, + .gpio = {0x00000001 , ga102_gpio_new }, + .i2c = {0x00000001 , gm200_i2c_new }, + .imem = {0x00000001 , nv50_instmem_new }, + .mc = {0x00000001 , ga100_mc_new }, + .mmu = {0x00000001 , tu102_mmu_new }, + .pci = {0x00000001 , gp100_pci_new }, + .privring = {0x00000001 , gm200_privring_new }, + .timer = {0x00000001 , gk20a_timer_new }, + .top = {0x00000001 , ga100_top_new }, + .disp = {0x00000001 , ga102_disp_new }, + .dma = {0x00000001 , gv100_dma_new }, + .fifo = {0x00000001 , ga102_fifo_new }, +}; + +static const struct nvkm_device_chip nv177_chipset = { .name ="GA107" , .bar = {0x00000001 , tu102_bar_new },
@@ -3072,6 +3093,7 @@ nvkm_device_ctor(const struct nvkm_deviccase 0x168 : device->chip = &nv168_chipset;break ;case 0x172 : device->chip = &nv172_chipset;break ;case 0x174 : device->chip = &nv174_chipset;break ; +case 0x176 : device->chip = &nv176_chipset;break ;case 0x177 : device->chip = &nv177_chipset;break ;default :if (nvkm_boolopt (device->cfgopt,"NvEnableUnsupportedChipsets" , false)) {
Greg Kroah-Hartman
maintainerPATCH 44/179 ksmbd: downgrade addition info error msg to debug in smb2_get_info_sec()
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
commit 8e537d1465e7401f352a6e0a728a93f8cad5294a upstream.
While file transfer through windows client, This error flood message happen. This flood message will cause performance degradation and misunderstand server has problem.
--- fs/ksmbd/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ksmbd/smb2pdu.c +1 -1
@@ -5060,7 +5060,7 @@ static int smb2_get_info_sec(struct ksmbif (addition_info & ~(OWNER_SECINFO |GROUP_SECINFO |DACL_SECINFO |PROTECTED_DACL_SECINFO |UNPROTECTED_DACL_SECINFO )) { -pr_err ("Unsupported addition info: 0x%x)\n" , +ksmbd_debug (SMB ,"Unsupported addition info: 0x%x)\n" , addition_info); pntsd->revision =cpu_to_le16 (1 );
Greg Kroah-Hartman
maintainerPATCH 45/179 ksmbd: contain default data stream even if xattr is empty
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
commit 1ec72153ff434ce75bace3044dc89a23a05d7064 upstream.
If xattr is not supported like exfat or fat, ksmbd server doesn't contain default data stream in FILE_STREAM_INFORMATION response. It will cause ppt or doc file update issue if local filesystem is such as ones. This patch move goto statement to contain it.
--- fs/ksmbd/smb2pdu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fs/ksmbd/smb2pdu.c +9 -9
@@ -4450,6 +4450,12 @@ static void get_file_stream_info(struct &stat); file_info = (struct smb2_file_stream_info *)rsp->Buffer; + buf_free_len = +smb2_calc_max_out_buf_len (work,8 , +le32_to_cpu (req->OutputBufferLength)); +if (buf_free_len <0 ) + goto out; + xattr_list_len =ksmbd_vfs_listxattr (path->dentry, &xattr_list);if (xattr_list_len <0 ) { goto out;
@@ -4458,12 +4464,6 @@ static void get_file_stream_info(struct goto out; } - buf_free_len = -smb2_calc_max_out_buf_len (work,8 , -le32_to_cpu (req->OutputBufferLength)); -if (buf_free_len <0 ) - goto out; -while (idx < xattr_list_len) { stream_name = xattr_list + idx; streamlen =strlen (stream_name);
@@ -4507,6 +4507,7 @@ static void get_file_stream_info(struct file_info->NextEntryOffset =cpu_to_le32 (next); } +out:if (!S_ISDIR (stat.mode) && buf_free_len >=sizeof (struct smb2_file_stream_info ) +7 *2 ) { file_info = (struct smb2_file_stream_info *)
@@ -4515,14 +4516,13 @@ static void get_file_stream_info(struct "::$DATA", 7, conn->local_nls, 0); streamlen *=2 ; file_info->StreamNameLength =cpu_to_le32 (streamlen); - file_info->StreamSize =0 ; - file_info->StreamAllocationSize =0 ; + file_info->StreamSize =cpu_to_le64 (stat.size); + file_info->StreamAllocationSize =cpu_to_le64 (stat.blocks <<9 ); nbytes +=sizeof (struct smb2_file_stream_info ) + streamlen; }/* last entry offset should be 0 */ file_info->NextEntryOffset =0 ; -out:kvfree (xattr_list); rsp->OutputBufferLength =cpu_to_le32 (nbytes);
Greg Kroah-Hartman
maintainerPATCH 46/179 ksmbd: fix memleak in get_file_stream_info()
In reply to Greg Kroah-HartmanFrom: Namjae Jeon <[email protected]>
commit 178ca6f85aa3231094467691f5ea1ff2f398aa8d upstream.
Fix memleak in get_file_stream_info()
--- fs/ksmbd/smb2pdu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/ksmbd/smb2pdu.c +3 -1
@@ -4489,8 +4489,10 @@ static void get_file_stream_info(struct ":%s", &stream_name[XATTR_NAME_STREAM_LEN]); next =sizeof (struct smb2_file_stream_info ) + streamlen *2 ; -if (next > buf_free_len) +if (next > buf_free_len) { +kfree (stream_buf);break ; + } file_info = (struct smb2_file_stream_info *)&rsp->Buffer[nbytes]; streamlen = smbConvertToUTF16((__le16 *)file_info->StreamName,
Greg Kroah-Hartman
maintainerPATCH 47/179 KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
commit cf0b0e3712f7af90006f8317ff27278094c2c128 upstream.
The POWER9 ERAT flush instruction is a SLBIA with IH=7, which is a reserved value on POWER7/8. On POWER8 this invalidates the SLB entries above index 0, similarly to SLBIA IH=0.
If the SLB entries are invalidated, and then the guest is bypassed, the host SLB does not get re-loaded, so the bolted entries above 0 will be lost. This can result in kernel stack access causing a SLB fault.
Kernel stack access causing a SLB fault was responsible for the infamous mega bug (search "Fix SLB reload bug"). Although since commit 48e7b7695745 ("powerpc/64s/hash: Convert SLB miss handlers to C") that starts using the kernel stack in the SLB miss handler, it might only result in an infinite loop of SLB faults. In any case it's a bug.
Fix this by only executing the instruction on >= POWER9 where IH=7 is defined not to invalidate the SLB. POWER7/8 don't require this ERAT flush.
--- arch/powerpc/kvm/book3s_hv_builtin.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv_builtin.c +4 -1
@@ -695,6 +695,7 @@ static void flush_guest_tlb(struct kvm * "r" (0) : "memory"); } asmvolatile ("ptesync" : : :"memory" ); +// POWER9 congruence-class TLBIEL leaves ERAT. Flush it now. asm volatile(PPC_RADIX_INVALIDATE_ERAT_GUEST : : :"memory"); }else {for (set =0 ; set < kvm->arch.tlb_sets; ++set) {
@@ -705,7 +706,9 @@ static void flush_guest_tlb(struct kvm * rb +=PPC_BIT (51 );/* increment set number */ } asmvolatile ("ptesync" : : :"memory" ); - asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT : : :"memory"); +// POWER9 congruence-class TLBIEL leaves ERAT. Flush it now. +if (cpu_has_feature (CPU_FTR_ARCH_300 )) + asm volatile(PPC_ISA_3_0_INVALIDATE_ERAT : : :"memory"); } }
Greg Kroah-Hartman
maintainerPATCH 48/179 tracing/uprobe: Fix uprobe_perf_open probes iteration
In reply to Greg Kroah-HartmanFrom: Jiri Olsa <[email protected]>
commit 1880ed71ce863318c1ce93bf324876fb5f92854f upstream.
Add missing 'tu' variable initialization in the probes loop, otherwise the head 'tu' is used instead of added probes.
--- kernel/trace/trace_uprobe.c | 1 + 1 file changed, 1 insertion(+)
kernel/trace/trace_uprobe.c +1 -0
@@ -1313,6 +1313,7 @@ static int uprobe_perf_open(struct tracereturn 0 ;list_for_each_entry (pos,trace_probe_probe_list (tp), list) { + tu = container_of(pos, struct trace_uprobe, tp); err =uprobe_apply (tu->inode, tu->offset, &tu->consumer, true);if (err) {uprobe_perf_close (call, event);
Greg Kroah-Hartman
maintainerPATCH 49/179 tracing: Fix pid filtering when triggers are attached
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit a55f224ff5f238013de8762c4287117e47b86e22 upstream.
If a event is filtered by pid and a trigger that requires processing of the event to happen is a attached to the event, the discard portion does not take the pid filtering into account, and the event will then be recorded when it should not have been.
--- kernel/trace/trace.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
kernel/trace/trace.h +18 -6
@@ -1360,14 +1360,26 @@ __event_trigger_test_discard(struct tracif (eflags &EVENT_FILE_FL_TRIGGER_COND ) *tt =event_triggers_call (file, buffer, entry, event); -if (test_bit (EVENT_FILE_FL_SOFT_DISABLED_BIT , &file->flags) || - (unlikely (file->flags &EVENT_FILE_FL_FILTERED ) && - !filter_match_preds (file->filter, entry))) { -__trace_event_discard_commit (buffer, event); -return true; - } +if (likely (!(file->flags & (EVENT_FILE_FL_SOFT_DISABLED | +EVENT_FILE_FL_FILTERED | +EVENT_FILE_FL_PID_FILTER )))) +return false; + +if (file->flags &EVENT_FILE_FL_SOFT_DISABLED ) + goto discard; + +if (file->flags &EVENT_FILE_FL_FILTERED && + !filter_match_preds (file->filter, entry)) + goto discard; + +if ((file->flags &EVENT_FILE_FL_PID_FILTER ) && +trace_event_ignore_this_pid (file)) + goto discard;return false; + discard: +__trace_event_discard_commit (buffer, event); +return true; }/**
Greg Kroah-Hartman
maintainerPATCH 50/179 mmc: sdhci-esdhc-imx: disable CMDQ support
In reply to Greg Kroah-HartmanFrom: Tim Harvey <[email protected]>
commit adab993c25191b839b415781bdc7173a77315240 upstream.
On IMX SoC's which support CMDQ the following can occur during high a high cpu load:
mmc2: cqhci: ============ CQHCI REGISTER DUMP ===========
mmc2: cqhci: Caps: 0x0000310a | Version: 0x00000510
mmc2: cqhci: Config: 0x00001001 | Control: 0x00000000
mmc2: cqhci: Int stat: 0x00000000 | Int enab: 0x00000006
mmc2: cqhci: Int sig: 0x00000006 | Int Coal: 0x00000000
mmc2: cqhci: TDL base: 0x8003f000 | TDL up32: 0x00000000
mmc2: cqhci: Doorbell: 0xbf01dfff | TCN: 0x00000000
mmc2: cqhci: Dev queue: 0x00000000 | Dev Pend: 0x08000000
mmc2: cqhci: Task clr: 0x00000000 | SSC1: 0x00011000
mmc2: cqhci: SSC2: 0x00000001 | DCMD rsp: 0x00000800
mmc2: cqhci: RED mask: 0xfdf9a080 | TERRI: 0x00000000
mmc2: cqhci: Resp idx: 0x0000000d | Resp arg: 0x00000000
mmc2: sdhci: ============ SDHCI REGISTER DUMP ===========
mmc2: sdhci: Sys addr: 0x7c722000 | Version: 0x00000002
mmc2: sdhci: Blk size: 0x00000200 | Blk cnt: 0x00000020
mmc2: sdhci: Argument: 0x00018000 | Trn mode: 0x00000023
mmc2: sdhci: Present: 0x01f88008 | Host ctl: 0x00000030
mmc2: sdhci: Power: 0x00000002 | Blk gap: 0x00000080
mmc2: sdhci: Wake-up: 0x00000008 | Clock: 0x0000000f
mmc2: sdhci: Timeout: 0x0000008f | Int stat: 0x00000000
mmc2: sdhci: Int enab: 0x107f4000 | Sig enab: 0x107f4000
mmc2: sdhci: ACmd stat: 0x00000000 | Slot int: 0x00000502
mmc2: sdhci: Caps: 0x07eb0000 | Caps_1: 0x8000b407
mmc2: sdhci: Cmd: 0x00000d1a | Max curr: 0x00ffffff
mmc2: sdhci: Resp[0]: 0x00000000 | Resp[1]: 0xffc003ff
mmc2: sdhci: Resp[2]: 0x328f5903 | Resp[3]: 0x00d07f01
mmc2: sdhci: Host ctl2: 0x00000088
mmc2: sdhci: ADMA Err: 0x00000000 | ADMA Ptr: 0xfe179020
mmc2: sdhci-esdhc-imx: ========= ESDHC IMX DEBUG STATUS DUMP ====
mmc2: sdhci-esdhc-imx: cmd debug status: 0x2120
mmc2: sdhci-esdhc-imx: data debug status: 0x2200
mmc2: sdhci-esdhc-imx: trans debug status: 0x2300
mmc2: sdhci-esdhc-imx: dma debug status: 0x2400
mmc2: sdhci-esdhc-imx: adma debug status: 0x2510
mmc2: sdhci-esdhc-imx: fifo debug status: 0x2680
mmc2: sdhci-esdhc-imx: async fifo debug status: 0x2750
mmc2: sdhci: ============================================
For now, disable CMDQ support on the imx8qm/imx8qxp/imx8mm until the issue is found and resolved.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 2 -- 1 file changed, 2 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +0 -2
@@ -300,7 +300,6 @@ static struct esdhc_soc_data usdhc_imx8q .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING |ESDHC_FLAG_HAVE_CAP1 |ESDHC_FLAG_HS200 |ESDHC_FLAG_HS400 |ESDHC_FLAG_HS400_ES - |ESDHC_FLAG_CQHCI |ESDHC_FLAG_STATE_LOST_IN_LPMODE | ESDHC_FLAG_CLK_RATE_LOST_IN_PM_RUNTIME, };
@@ -309,7 +308,6 @@ static struct esdhc_soc_data usdhc_imx8m .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING |ESDHC_FLAG_HAVE_CAP1 |ESDHC_FLAG_HS200 |ESDHC_FLAG_HS400 |ESDHC_FLAG_HS400_ES - |ESDHC_FLAG_CQHCI | ESDHC_FLAG_STATE_LOST_IN_LPMODE, };
Greg Kroah-Hartman
maintainerPATCH 51/179 mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 3d7c194b7c9ad414264935ad4f943a6ce285ebb1 upstream.
The block layer forces a minimum segment size of PAGE_SIZE, so a segment can be too big for the ADMA table, if PAGE_SIZE >= 64KiB. Fix by writing multiple descriptors, noting that the ADMA table is sized for 4KiB chunks anyway, so it will be big enough.
--- drivers/mmc/host/sdhci.c | 21 ++++++++++++++++++--- drivers/mmc/host/sdhci.h | 4 +++- 2 files changed, 21 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci.c +18 -3
@@ -771,7 +771,19 @@ static void sdhci_adma_table_pre(struct len -= offset; } -BUG_ON (len >65536 ); +/* +* The block layer forces a minimum segment size of PAGE_SIZE, +* so 'len' can be too big here if PAGE_SIZE >= 64KiB. Write +* multiple descriptors, noting that the ADMA table is sized +* for 4KiB chunks anyway, so it will be big enough. +*/ +while (len > host->max_adma) { +int n =32 *1024 ;/* 32KiB*/ + +__sdhci_adma_write_desc (host, &desc, addr, n,ADMA2_TRAN_VALID ); + addr += n; + len -= n; + }/* tran, valid */ if (len)
@@ -3952,6 +3964,7 @@ struct sdhci_host *sdhci_alloc_host(stru* descriptor for each segment, plus 1 for a nop end descriptor. */ host->adma_table_cnt =SDHCI_MAX_SEGS *2 +1 ; + host->max_adma =65536 ; host->max_timeout_count =0xE ;
@@ -4617,10 +4630,12 @@ int sdhci_setup_host(struct sdhci_host ** be larger than 64 KiB though. */ if (host->flags &SDHCI_USE_ADMA ) { -if (host->quirks &SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC ) +if (host->quirks &SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC ) { + host->max_adma =65532 ;/* 32-bit alignment */ mmc->max_seg_size =65535 ; -else + }else { mmc->max_seg_size =65536 ; + } }else { mmc->max_seg_size = mmc->max_req_size; }
drivers/mmc/host/sdhci.h +3 -1
@@ -340,7 +340,8 @@ struct sdhci_adma2_64_desc {/* * Maximum segments assuming a 512KiB maximum requisition size and a minimum -* 4KiB page size. +* 4KiB page size. Note this also allows enough for multiple descriptors in +* case of PAGE_SIZE >= 64KiB. */ #define SDHCI_MAX_SEGS 128
@@ -543,6 +544,7 @@ struct sdhci_host {unsigned int blocks;/* remaining PIO blocks */ int sg_count;/* Mapped sg entries */ +int max_adma;/* Max. length in ADMA descriptor */ void *adma_table;/* ADMA descriptor table */ void *align_buffer;/* Bounce buffer */
Greg Kroah-Hartman
maintainerPATCH 52/179 mdio: aspeed: Fix "Link is Down" issue
In reply to Greg Kroah-HartmanFrom: Dylan Hung <[email protected]>
commit 9dbe33cf371bd70330858370bdbc35c7668f00c3 upstream.
The issue happened randomly in runtime. The message "Link is Down" is popped but soon it recovered to "Link is Up".
The "Link is Down" results from the incorrect read data for reading the PHY register via MDIO bus. The correct sequence for reading the data shall be:
1. fire the command
2. wait for command done (this step was missing)
3. wait for data idle
4. read data from data register
--- drivers/net/mdio/mdio-aspeed.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/mdio/mdio-aspeed.c +7 -0
@@ -61,6 +61,13 @@ static int aspeed_mdio_read(struct mii_biowrite32 (ctrl, ctx->base +ASPEED_MDIO_CTRL ); + rc =readl_poll_timeout (ctx->base +ASPEED_MDIO_CTRL , ctrl, + !(ctrl &ASPEED_MDIO_CTRL_FIRE ), +ASPEED_MDIO_INTERVAL_US , +ASPEED_MDIO_TIMEOUT_US ); +if (rc <0 ) +return rc; + rc = readl_poll_timeout(ctx->base + ASPEED_MDIO_DATA, data, data & ASPEED_MDIO_DATA_IDLE, ASPEED_MDIO_INTERVAL_US,
Greg Kroah-Hartman
maintainerPATCH 53/179 arm64: mm: Fix VM_BUG_ON(mm != &init_mm) for trans_pgd
In reply to Greg Kroah-HartmanFrom: Pingfan Liu <[email protected]>
commit d3eb70ead6474ec16f976fcacf10a7a890a95bd3 upstream.
trans_pgd_create_copy() can hit "VM_BUG_ON(mm != &init_mm)" in the function pmd_populate_kernel().
This is the combined consequence of commit 5de59884ac0e ("arm64:trans_pgd: pass NULL instead of init_mm to *_populate functions"), which replaced &init_mm with NULL and commit 59511cfd08f3 ("arm64: mm: use XN table mapping attributes for user/kernel mappings"), which introduced the VM_BUG_ON.
Since the former sounds reasonable, it is better to work on the later.
Quoted 1 line
From the perspective of
trans_pgd, two groups of functions are
considered in the later one:
pmd_populate_kernel()
mm == NULL should be fixed, else it hits VM_BUG_ON()
p?d_populate()
mm == NULL means PXN, that is OK, since trans_pgd only copies a linear map, no execution will happen on the map.
So it is good enough to just relax VM_BUG_ON() to disregard mm == NULL
--- arch/arm64/include/asm/pgalloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/include/asm/pgalloc.h +1 -1
@@ -76,7 +76,7 @@ static inline void __pmd_populate(pmd_tstatic inline void pmd_populate_kernel (struct mm_struct *mm,pmd_t *pmdp,pte_t *ptep) { -VM_BUG_ON (mm != &init_mm); +VM_BUG_ON (mm && mm != &init_mm);__pmd_populate (pmdp,__pa (ptep),PMD_TYPE_TABLE |PMD_TABLE_UXN ); }
Greg Kroah-Hartman
maintainerPATCH 54/179 cpufreq: intel_pstate: Fix active mode offline/online EPP handling
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit ed38eb49d101e829ae0f8c0a0d3bf5cb6bcbc6b2 upstream.
After commit 4adcf2e5829f ("cpufreq: intel_pstate: Add ->offline and ->online callbacks") the EPP value set by the "performance" scaling algorithm in the active mode is not restored after an offline/online cycle which replaces it with the saved EPP value coming from user space.
Address this issue by forcing intel_pstate_hwp_set() to set a new EPP value when it runs first time after online.
--- drivers/cpufreq/intel_pstate.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/cpufreq/intel_pstate.c +6 -0
@@ -999,6 +999,12 @@ static void intel_pstate_hwp_offline(str*/ value &= ~GENMASK_ULL (31 ,24 ); value |=HWP_ENERGY_PERF_PREFERENCE (cpu->epp_cached); +/* +* However, make sure that EPP will be set to "performance" when +* the CPU is brought back online again and the "performance" +* scaling algorithm is still in effect. +*/ + cpu->epp_policy =CPUFREQ_POLICY_UNKNOWN ; }/*
Greg Kroah-Hartman
maintainerPATCH 55/179 powerpc/32: Fix hardlockup on vmap stack overflow
In reply to Greg Kroah-HartmanFrom: Christophe Leroy <[email protected]>
commit 5bb60ea611db1e04814426ed4bd1c95d1487678e upstream.
Since the commit c118c7303ad5 ("powerpc/32: Fix vmap stack - Do not activate MMU before reading task struct") a vmap stack overflow results in a hard lockup. This is because emergency_ctx is still addressed with its virtual address allthough data MMU is not active anymore at that time.
Fix it by using a physical address instead.
--- arch/powerpc/kernel/head_32.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kernel/head_32.h +3 -3
@@ -202,11 +202,11 @@ vmap_stack_overflow:mfspr r1,SPRN_SPRG_THREAD lwz r1, TASK_CPU - THREAD(r1) slwi r1, r1, 3 - addis r1, r1, emergency_ctx@ha + addis r1, r1, emergency_ctx-PAGE_OFFSET@ha #else - lis r1, emergency_ctx@ha + lis r1, emergency_ctx-PAGE_OFFSET@ha #endif - lwz r1, emergency_ctx@l(r1) + lwz r1, emergency_ctx-PAGE_OFFSET@l(r1) addi r1, r1, THREAD_SIZE - INT_FRAME_SIZE EXCEPTION_PROLOG_2 0 vmap_stack_overflow prepare_transfer_to_handler
Greg Kroah-Hartman
maintainerPATCH 56/179 iomap: Fix inline extent handling in iomap_readpage
In reply to Greg Kroah-HartmanFrom: Andreas Gruenbacher <[email protected]>
commit d8af404ffce71448f29bbc19a05e3d095baf98eb upstream.
Before commit 740499c78408 ("iomap: fix the iomap_readpage_actor return value for inline data"), when hitting an IOMAP_INLINE extent, iomap_readpage_actor would report having read the entire page. Since then, it only reports having read the inline data (iomap->length).
This will force iomap_readpage into another iteration, and the filesystem will report an unaligned hole after the IOMAP_INLINE extent. But iomap_readpage_actor (now iomap_readpage_iter) isn't prepared to deal with unaligned extents, it will get things wrong on filesystems with a block size smaller than the page size, and we'll eventually run into the following warning in iomap_iter_advance:
WARN_ON_ONCE(iter->processed > iomap_length(iter));
Fix that by changing iomap_readpage_iter to return 0 when hitting an inline extent; this will cause iomap_iter to stop immediately.
To fix readahead as well, change iomap_readahead_iter to pass on iomap_readpage_iter return values less than or equal to zero.
--- fs/iomap/buffered-io.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/iomap/buffered-io.c +9 -2
@@ -256,8 +256,13 @@ static loff_t iomap_readpage_iter(constunsigned poff, plen;sector_t sector; -if (iomap->type ==IOMAP_INLINE ) -return min (iomap_read_inline_data (iter, page), length); +if (iomap->type ==IOMAP_INLINE ) { +loff_t ret =iomap_read_inline_data (iter, page); + +if (ret <0 ) +return ret; +return 0 ; + }/* zero post-eof blocks as the page may be mapped */ iop =iomap_page_create (iter->inode, page);
@@ -370,6 +375,8 @@ static loff_t iomap_readahead_iter(const ctx->cur_page_in_bio = false; } ret =iomap_readpage_iter (iter, ctx, done); +if (ret <=0 ) +return ret; }return done;
Greg Kroah-Hartman
maintainerPATCH 57/179 NFSv42: Fix pagecache invalidation after COPY/CLONE
In reply to Greg Kroah-HartmanFrom: Benjamin Coddington <[email protected]>
commit 3f015d89a47cd8855cd92f71fff770095bd885a1 upstream.
The mechanism in use to allow the client to see the results of COPY/CLONE is to drop those pages from the pagecache. This forces the client to read those pages once more from the server. However, truncate_pagecache_range() zeros out partial pages instead of dropping them. Let us instead use invalidate_inode_pages2_range() with full-page offsets to ensure the client properly sees the results of COPY/CLONE operations.
--- fs/nfs/nfs42proc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nfs/nfs42proc.c +3 -1
@@ -285,7 +285,9 @@ static void nfs42_copy_dest_done(structloff_t newsize = pos + len;loff_t end = newsize -1 ; -truncate_pagecache_range (inode, pos, end); +WARN_ON_ONCE (invalidate_inode_pages2_range (inode->i_mapping, + pos >>PAGE_SHIFT , end >>PAGE_SHIFT )); +spin_lock (&inode->i_lock);if (newsize >i_size_read (inode))i_size_write (inode, newsize);
Greg Kroah-Hartman
maintainerPATCH 58/179 PCI: aardvark: Deduplicate code in advk_pcie_rd_conf()
In reply to Greg Kroah-HartmanFrom: Marek Behún <[email protected]>
commit 67cb2a4c93499c2c22704998fd1fd2bc35194d8e upstream.
Avoid code repetition in advk_pcie_rd_conf() by handling errors with goto jump, as is customary in kernel.
--- drivers/pci/controller/pci-aardvark.c | 48 ++++++++++++++-------------------- 1 file changed, 20 insertions(+), 28 deletions(-)
drivers/pci/controller/pci-aardvark.c +20 -28
@@ -1090,18 +1090,8 @@ static int advk_pcie_rd_conf(struct pci_ (le16_to_cpu (pcie->bridge.pcie_conf.rootctl) &PCI_EXP_RTCTL_CRSSVE ); -if (advk_pcie_pio_is_running (pcie)) { -/* -* If it is possible return Completion Retry Status so caller -* tries to issue the request again instead of failing. -*/ -if (allow_crs) { - *val =CFG_RD_CRS_VAL ; -return PCIBIOS_SUCCESSFUL ; - } - *val =0xffffffff ; -return PCIBIOS_SET_FAILED ; - } +if (advk_pcie_pio_is_running (pcie)) + goto try_crs;/* Program the control register */ reg =advk_readl (pcie,PIO_CTRL );
@@ -1125,25 +1115,13 @@ static int advk_pcie_rd_conf(struct pci_advk_writel (pcie,1 ,PIO_START ); ret =advk_pcie_wait_pio (pcie); -if (ret <0 ) { -/* -* If it is possible return Completion Retry Status so caller -* tries to issue the request again instead of failing. -*/ -if (allow_crs) { - *val =CFG_RD_CRS_VAL ; -return PCIBIOS_SUCCESSFUL ; - } - *val =0xffffffff ; -return PCIBIOS_SET_FAILED ; - } +if (ret <0 ) + goto try_crs;/* Check PIO status and get the read result */ ret =advk_pcie_check_pio_status (pcie, allow_crs, val); -if (ret <0 ) { - *val =0xffffffff ; -return PCIBIOS_SET_FAILED ; - } +if (ret <0 ) + goto fail;if (size ==1 ) *val = (*val >> (8 * (where &3 ))) &0xff ;
@@ -1151,6 +1129,20 @@ static int advk_pcie_rd_conf(struct pci_ *val = (*val >> (8 * (where &3 ))) &0xffff ;return PCIBIOS_SUCCESSFUL ; + +try_crs: +/* +* If it is possible, return Completion Retry Status so that caller +* tries to issue the request again instead of failing. +*/ +if (allow_crs) { + *val =CFG_RD_CRS_VAL ; +return PCIBIOS_SUCCESSFUL ; + } + +fail: + *val =0xffffffff ; +return PCIBIOS_SET_FAILED ; } static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
Greg Kroah-Hartman
maintainerPATCH 59/179 PCI: aardvark: Implement re-issuing config requests on CRS response
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 223dec14a05337a4155f1deed46d2becce4d00fd upstream.
Commit 43f5c77bcbd2 ("PCI: aardvark: Fix reporting CRS value") fixed handling of CRS response and when CRSSVE flag was not enabled it marked CRS response as failed transaction (due to simplicity).
But pci-aardvark.c driver is already waiting up to the PIO_RETRY_CNT count for PIO config response and so we can with a small change implement re-issuing of config requests as described in PCIe base specification.
This change implements re-issuing of config requests when response is CRS. Set upper bound of wait cycles to around PIO_RETRY_CNT, afterwards the transaction is marked as failed and an all-ones value is returned as before.
We do this by returning appropriate error codes from function advk_pcie_check_pio_status(). On CRS we return -EAGAIN and caller then reissues transaction.
--- drivers/pci/controller/pci-aardvark.c | 69 +++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 25 deletions(-)
drivers/pci/controller/pci-aardvark.c +44 -25
@@ -692,6 +692,7 @@ static int advk_pcie_check_pio_status(stu32 reg;unsigned int status;char *strcomp_status, *str_posted; +int ret; reg =advk_readl (pcie,PIO_STAT ); status = (reg & PIO_COMPLETION_STATUS_MASK) >>
@@ -716,6 +717,7 @@ static int advk_pcie_check_pio_status(stcase PIO_COMPLETION_STATUS_OK :if (reg &PIO_ERR_STATUS ) { strcomp_status ="COMP_ERR" ; + ret = -EFAULT ;break ; }/* Get the read result */
@@ -723,9 +725,11 @@ static int advk_pcie_check_pio_status(st *val =advk_readl (pcie,PIO_RD_DATA );/* No error */ strcomp_status =NULL ; + ret =0 ;break ;case PIO_COMPLETION_STATUS_UR : strcomp_status ="UR" ; + ret = -EOPNOTSUPP ;break ;case PIO_COMPLETION_STATUS_CRS :if (allow_crs && val) {
@@ -743,6 +747,7 @@ static int advk_pcie_check_pio_status(st*/ *val =CFG_RD_CRS_VAL ; strcomp_status =NULL ; + ret =0 ;break ; }/* PCIe r4.0, sec 2.3.2, says:
@@ -758,21 +763,24 @@ static int advk_pcie_check_pio_status(st* Request and taking appropriate action, e.g., complete the * Request to the host as a failed transaction. * -* To simplify implementation do not re-issue the Configuration -* Request and complete the Request as a failed transaction. +* So return -EAGAIN and caller (pci-aardvark.c driver) will +* re-issue request again up to the PIO_RETRY_CNT retries. */ strcomp_status ="CRS" ; + ret = -EAGAIN ;break ;case PIO_COMPLETION_STATUS_CA : strcomp_status ="CA" ; + ret = -ECANCELED ;break ;default : strcomp_status ="Unknown" ; + ret = -EINVAL ;break ; }if (!strcomp_status) -return 0 ; +return ret;if (reg &PIO_NON_POSTED_REQ ) str_posted ="Non-posted" ;
@@ -782,7 +790,7 @@ static int advk_pcie_check_pio_status(stdev_dbg (dev,"%s PIO Response Status: %s, %#x @ %#x\n" , str_posted, strcomp_status, reg,advk_readl (pcie,PIO_ADDR_LS )); -return -EFAULT ; +return ret; }static int advk_pcie_wait_pio (struct advk_pcie *pcie)
@@ -790,13 +798,13 @@ static int advk_pcie_wait_pio(struct advstruct device *dev = &pcie->pdev->dev;int i; -for (i =0 ; i <PIO_RETRY_CNT ; i++) { +for (i =1 ; i <=PIO_RETRY_CNT ; i++) {u32 start, isr; start =advk_readl (pcie,PIO_START ); isr =advk_readl (pcie,PIO_ISR );if (!start && isr) -return 0 ; +return i;udelay (PIO_RETRY_DELAY ); }
@@ -1068,6 +1076,7 @@ static int advk_pcie_rd_conf(struct pci_ int where, int size, u32 *val) { struct advk_pcie *pcie = bus->sysdata; +int retry_count;bool allow_crs;u32 reg;int ret;
@@ -1110,16 +1119,22 @@ static int advk_pcie_rd_conf(struct pci_/* Program the data strobe */ advk_writel (pcie,0xf ,PIO_WR_DATA_STRB ); -/* Clear PIO DONE ISR and start the transfer */ -advk_writel (pcie,1 ,PIO_ISR ); -advk_writel (pcie,1 ,PIO_START ); - - ret =advk_pcie_wait_pio (pcie); -if (ret <0 ) - goto try_crs; + retry_count =0 ; +do { +/* Clear PIO DONE ISR and start the transfer */ +advk_writel (pcie,1 ,PIO_ISR ); +advk_writel (pcie,1 ,PIO_START ); + + ret =advk_pcie_wait_pio (pcie); +if (ret <0 ) + goto try_crs; + + retry_count += ret; + +/* Check PIO status and get the read result */ + ret =advk_pcie_check_pio_status (pcie, allow_crs, val); + }while (ret == -EAGAIN && retry_count <PIO_RETRY_CNT ); -/* Check PIO status and get the read result */ - ret =advk_pcie_check_pio_status (pcie, allow_crs, val);if (ret <0 ) goto fail;
@@ -1151,6 +1166,7 @@ static int advk_pcie_wr_conf(struct pci_struct advk_pcie *pcie = bus->sysdata;u32 reg;u32 data_strobe =0x0 ; +int retry_count;int offset;int ret;
@@ -1192,19 +1208,22 @@ static int advk_pcie_wr_conf(struct pci_/* Program the data strobe */ advk_writel (pcie, data_strobe,PIO_WR_DATA_STRB ); -/* Clear PIO DONE ISR and start the transfer */ -advk_writel (pcie,1 ,PIO_ISR ); -advk_writel (pcie,1 ,PIO_START ); + retry_count =0 ; +do { +/* Clear PIO DONE ISR and start the transfer */ +advk_writel (pcie,1 ,PIO_ISR ); +advk_writel (pcie,1 ,PIO_START ); + + ret =advk_pcie_wait_pio (pcie); +if (ret <0 ) +return PCIBIOS_SET_FAILED ; - ret =advk_pcie_wait_pio (pcie); -if (ret <0 ) -return PCIBIOS_SET_FAILED ; + retry_count += ret; - ret =advk_pcie_check_pio_status (pcie, false,NULL ); -if (ret <0 ) -return PCIBIOS_SET_FAILED ; + ret =advk_pcie_check_pio_status (pcie, false,NULL ); + }while (ret == -EAGAIN && retry_count <PIO_RETRY_CNT ); -return PCIBIOS_SUCCESSFUL ; +return ret <0 ?PCIBIOS_SET_FAILED :PCIBIOS_SUCCESSFUL ; }static struct pci_ops advk_pcie_ops = {
Greg Kroah-Hartman
maintainerPATCH 60/179 PCI: aardvark: Simplify initialization of rootcap on virtual bridge
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 454c53271fc11f3aa5e44e41fd99ca181bd32c62 upstream.
PCIe config space can be initialized also before pci_bridge_emul_init() call, so move rootcap initialization after PCI config space initialization.
This simplifies the function a little since it removes one if (ret < 0) check.
--- drivers/pci/controller/pci-aardvark.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/pci/controller/pci-aardvark.c +4 -10
@@ -992,7 +992,6 @@ static struct pci_bridge_emul_ops advk_pstatic int advk_sw_pci_bridge_init (struct advk_pcie *pcie) {struct pci_bridge_emul *bridge = &pcie->bridge; -int ret; bridge->conf.vendor =cpu_to_le16 (advk_readl (pcie,PCIE_CORE_DEV_ID_REG ) &0xffff );
@@ -1012,19 +1011,14 @@ static int advk_sw_pci_bridge_init(struc/* Support interrupt A for MSI feature */ bridge->conf.intpin =PCIE_CORE_INT_A_ASSERT_ENABLE ; +/* Indicates supports for Completion Retry Status */ + bridge->pcie_conf.rootcap =cpu_to_le16 (PCI_EXP_RTCAP_CRSVIS ); + bridge->has_pcie = true; bridge->data = pcie; bridge->ops = &advk_pci_bridge_emul_ops; -/* PCIe config space can be initialized after pci_bridge_emul_init() */ - ret =pci_bridge_emul_init (bridge,0 ); -if (ret <0 ) -return ret; - -/* Indicates supports for Completion Retry Status */ - bridge->pcie_conf.rootcap =cpu_to_le16 (PCI_EXP_RTCAP_CRSVIS ); - -return 0 ; +return pci_bridge_emul_init (bridge,0 ); } static bool advk_pcie_valid_device(struct advk_pcie *pcie, struct pci_bus *bus,
Greg Kroah-Hartman
maintainerPATCH 61/179 PCI: aardvark: Fix link training
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit f76b36d40beee0a13aa8f6aa011df0d7cbbb8a7f upstream.
Fix multiple link training issues in aardvark driver. The main reason of these issues was misunderstanding of what certain registers do, since their names and comments were misleading: before commit 96be36dbffac ("PCI:
aardvark: Replace custom macros by standard linux/pci_regs.h macros"), the pci-aardvark.c driver used custom macros for accessing standard PCIe Root Bridge registers, and misleading comments did not help to understand what the code was really doing.
After doing more tests and experiments I've come to the conclusion that the SPEED_GEN register in aardvark sets the PCIe revision / generation compliance and forces maximal link speed. Both GEN3 and GEN2 values set the read-only PCI_EXP_FLAGS_VERS bits (PCIe capabilities version of Root Bridge) to value 2, while GEN1 value sets PCI_EXP_FLAGS_VERS to 1, which matches with PCI Express specifications revisions 3, 2 and 1 respectively. Changing SPEED_GEN also sets the read-only bits PCI_EXP_LNKCAP_SLS and PCI_EXP_LNKCAP2_SLS to corresponding speed.
(Note that PCI Express rev 1 specification does not define PCI_EXP_LNKCAP2
and PCI_EXP_LNKCTL2 registers and when SPEED_GEN is set to GEN1 (which also sets PCI_EXP_FLAGS_VERS set to 1), lspci cannot access PCI_EXP_LNKCAP2 and PCI_EXP_LNKCTL2 registers.)
Changing PCIe link speed can be done via PCI_EXP_LNKCTL2_TLS bits of PCI_EXP_LNKCTL2 register. Armada 3700 Functional Specifications says that the default value of PCI_EXP_LNKCTL2_TLS is based on SPEED_GEN value, but tests showed that the default value is always 8.0 GT/s, independently of speed set by SPEED_GEN. So after setting SPEED_GEN, we must also set value in PCI_EXP_LNKCTL2 register via PCI_EXP_LNKCTL2_TLS bits.
Triggering PCI_EXP_LNKCTL_RL bit immediately after setting LINK_TRAINING_EN bit actually doesn't do anything. Tests have shown that a delay is needed after enabling LINK_TRAINING_EN bit. As triggering PCI_EXP_LNKCTL_RL currently does nothing, remove it.
Commit 43fc679ced18 ("PCI: aardvark: Improve link training") introduced code which sets SPEED_GEN register based on negotiated link speed from PCI_EXP_LNKSTA_CLS bits of PCI_EXP_LNKSTA register. This code was added to fix detection of Compex WLE900VX (Atheros QCA9880) WiFi GEN1 PCIe cards, as otherwise these cards were "invisible" on PCIe bus (probably because they crashed). But apparently more people reported the same issues with these cards also with other PCIe controllers [1] and I was able to reproduce this issue also with other "noname" WiFi cards based on Atheros QCA9890 chip (with the same PCI vendor/device ids as Atheros QCA9880). So this is not an issue in aardvark but rather an issue in Atheros QCA98xx chips. Also, this issue only exists if the kernel is compiled with PCIe ASPM support, and a generic workaround for this is to change PCIe Bridge to 2.5 GT/s link speed via PCI_EXP_LNKCTL2_TLS_2_5GT bits in PCI_EXP_LNKCTL2 register [2], before triggering PCI_EXP_LNKCTL_RL bit. This workaround also works when SPEED_GEN is set to value GEN2 (5 GT/s). So remove this hack completely in the aardvark driver and always set SPEED_GEN to value from 'max-link-speed' DT property. Fix for Atheros QCA98xx chips is handled separately by patch [2].
These two things (code for triggering PCI_EXP_LNKCTL_RL bit and changing SPEED_GEN value) also explain why commit 6964494582f5 ("PCI: aardvark:
Train link immediately after enabling training") somehow fixed detection of those problematic Compex cards with Atheros chips: if triggering link retraining (via PCI_EXP_LNKCTL_RL bit) was done immediately after enabling link training (via LINK_TRAINING_EN), it did nothing. If there was a specific delay, aardvark HW already initialized PCIe link and therefore triggering link retraining caused the above issue. Compex cards triggered link down event and disappeared from the PCIe bus.
Commit f4c7d053d7f7 ("PCI: aardvark: Wait for endpoint to be ready before training link") added 100ms sleep before calling 'Start link training' command and explained that it is a requirement of PCI Express specification. But the code after this 100ms sleep was not doing 'Start link training', rather it triggered PCI_EXP_LNKCTL_RL bit via PCIe Root Bridge to put link into Recovery state.
The required delay after fundamental reset is already done in function advk_pcie_wait_for_link() which also checks whether PCIe link is up. So after removing the code which triggers PCI_EXP_LNKCTL_RL bit on PCIe Root Bridge, there is no need to wait 100ms again. Remove the extra msleep() call and update comment about the delay required by the PCI Express specification.
According to Marvell Armada 3700 Functional Specifications, Link training should be enabled via aardvark register LINK_TRAINING_EN after selecting PCIe generation and x1 lane. There is no need to disable it prior resetting card via PERST# signal. This disabling code was introduced in commit 5169a9851daa ("PCI: aardvark: Issue PERST via GPIO") as a workaround for some Atheros cards. It turns out that this also is Atheros specific issue and affects any PCIe controller, not only aardvark. Moreover this Atheros issue was triggered by juggling with PCI_EXP_LNKCTL_RL, LINK_TRAINING_EN and SPEED_GEN bits interleaved with sleeps. Now, after removing triggering PCI_EXP_LNKCTL_RL, there is no need to explicitly disable LINK_TRAINING_EN bit. So remove this code too. The problematic Compex cards described in previous git commits are correctly detected in advk_pcie_train_link() function even after applying all these changes.
Note that with this patch, and also prior this patch, some NVMe disks which support PCIe GEN3 with 8 GT/s speed are negotiated only at the lowest link speed 2.5 GT/s, independently of SPEED_GEN value. After manually triggering PCI_EXP_LNKCTL_RL bit (e.g. from userspace via setpci), these NVMe disks change link speed to 5 GT/s when SPEED_GEN was configured to GEN2. This issue first needs to be properly investigated. I will send a fix in the future.
On the other hand, some other GEN2 PCIe cards with 5 GT/s speed are autonomously by HW autonegotiated at full 5 GT/s speed without need of any software interaction.
Armada 3700 Functional Specifications describes the following steps for link training: set SPEED_GEN to GEN2, enable LINK_TRAINING_EN, poll until link training is complete, trigger PCI_EXP_LNKCTL_RL, poll until signal rate is 5 GT/s, poll until link training is complete, enable ASPM L0s.
The requirement for triggering PCI_EXP_LNKCTL_RL can be explained by the need to achieve 5 GT/s speed (as changing link speed is done by throw to recovery state entered by PCI_EXP_LNKCTL_RL) or maybe as a part of enabling ASPM L0s (but in this case ASPM L0s should have been enabled prior PCI_EXP_LNKCTL_RL).
It is unknown why the original pci-aardvark.c driver was triggering PCI_EXP_LNKCTL_RL bit before waiting for the link to be up. This does not align with neither PCIe base specifications nor with Armada 3700 Functional Specification. (Note that in older versions of aardvark, this bit was called incorrectly PCIE_CORE_LINK_TRAINING, so this may be the reason.)
It is also unknown why Armada 3700 Functional Specification says that it is needed to trigger PCI_EXP_LNKCTL_RL for GEN2 mode, as according to PCIe base specification 5 GT/s speed negotiation is supposed to be entirely autonomous, even if initial speed is 2.5 GT/s.
[1] - https://lore.kernel.org/linux-pci/[email protected]/
[2] - https://lore.kernel.org/linux-pci/[email protected]/
--- drivers/pci/controller/pci-aardvark.c | 119 ++++++++++------------------------ 1 file changed, 35 insertions(+), 84 deletions(-)
drivers/pci/controller/pci-aardvark.c +35 -84
@@ -299,11 +299,6 @@ static inline u32 advk_readl(struct advkreturn readl (pcie->base + reg); } -static inline u16 advk_read16 (struct advk_pcie *pcie,u64 reg) -{ -return advk_readl (pcie, (reg & ~0x3 )) >> ((reg &0x3 ) *8 ); -} -static u8 advk_pcie_ltssm_state (struct advk_pcie *pcie) {u32 val;
@@ -377,23 +372,9 @@ static void advk_pcie_wait_for_retrain(sstatic void advk_pcie_issue_perst (struct advk_pcie *pcie) { -u32 reg; -if (!pcie->reset_gpio)return ; -/* -* As required by PCI Express spec (PCI Express Base Specification, REV. -* 4.0 PCI Express, February 19 2014, 6.6.1 Conventional Reset) a delay -* for at least 100ms after de-asserting PERST# signal is needed before -* link training is enabled. So ensure that link training is disabled -* prior de-asserting PERST# signal to fulfill that PCI Express spec -* requirement. -*/ - reg =advk_readl (pcie,PCIE_CORE_CTRL0_REG ); - reg &= ~LINK_TRAINING_EN ; -advk_writel (pcie, reg,PCIE_CORE_CTRL0_REG ); -/* 10ms delay is needed for some cards */ dev_info (&pcie->pdev->dev,"issuing PERST via reset GPIO for 10ms\n" );gpiod_set_value_cansleep (pcie->reset_gpio,1 );
@@ -401,54 +382,47 @@ static void advk_pcie_issue_perst(structgpiod_set_value_cansleep (pcie->reset_gpio,0 ); } -static int advk_pcie_train_at_gen (struct advk_pcie *pcie,int gen) +static void advk_pcie_train_link (struct advk_pcie *pcie) { -int ret, neg_gen; +struct device *dev = &pcie->pdev->dev;u32 reg; +int ret; -/* Setup link speed */ +/* +* Setup PCIe rev / gen compliance based on device tree property +* 'max-link-speed' which also forces maximal link speed. +*/ reg =advk_readl (pcie,PCIE_CORE_CTRL0_REG ); reg &= ~PCIE_GEN_SEL_MSK ; -if (gen ==3 ) +if (pcie->link_gen ==3 ) reg |=SPEED_GEN_3 ; -else if (gen ==2 ) +else if (pcie->link_gen ==2 ) reg |=SPEED_GEN_2 ;else reg |=SPEED_GEN_1 ;advk_writel (pcie, reg,PCIE_CORE_CTRL0_REG );/* -* Enable link training. This is not needed in every call to this -* function, just once suffices, but it does not break anything either. -*/ +* Set maximal link speed value also into PCIe Link Control 2 register. +* Armada 3700 Functional Specification says that default value is based +* on SPEED_GEN but tests showed that default value is always 8.0 GT/s. +*/ + reg =advk_readl (pcie,PCIE_CORE_PCIEXP_CAP +PCI_EXP_LNKCTL2 ); + reg &= ~PCI_EXP_LNKCTL2_TLS ; +if (pcie->link_gen ==3 ) + reg |=PCI_EXP_LNKCTL2_TLS_8_0GT ; +else if (pcie->link_gen ==2 ) + reg |=PCI_EXP_LNKCTL2_TLS_5_0GT ; +else + reg |=PCI_EXP_LNKCTL2_TLS_2_5GT ; +advk_writel (pcie, reg,PCIE_CORE_PCIEXP_CAP +PCI_EXP_LNKCTL2 ); + +/* Enable link training after selecting PCIe generation */ reg =advk_readl (pcie,PCIE_CORE_CTRL0_REG ); reg |=LINK_TRAINING_EN ;advk_writel (pcie, reg,PCIE_CORE_CTRL0_REG );/* -* Start link training immediately after enabling it. -* This solves problems for some buggy cards. -*/ - reg =advk_readl (pcie,PCIE_CORE_PCIEXP_CAP +PCI_EXP_LNKCTL ); - reg |=PCI_EXP_LNKCTL_RL ; -advk_writel (pcie, reg,PCIE_CORE_PCIEXP_CAP +PCI_EXP_LNKCTL ); - - ret =advk_pcie_wait_for_link (pcie); -if (ret) -return ret; - - reg =advk_read16 (pcie,PCIE_CORE_PCIEXP_CAP +PCI_EXP_LNKSTA ); - neg_gen = reg &PCI_EXP_LNKSTA_CLS ; - -return neg_gen; -} - -static void advk_pcie_train_link (struct advk_pcie *pcie) -{ -struct device *dev = &pcie->pdev->dev; -int neg_gen =-1 , gen; - -/* * Reset PCIe card via PERST# signal. Some cards are not detected * during link training when they are in some non-initial state. */
@@ -458,41 +432,18 @@ static void advk_pcie_train_link(struct* PERST# signal could have been asserted by pinctrl subsystem before * probe() callback has been called or issued explicitly by reset gpio * function advk_pcie_issue_perst(), making the endpoint going into -* fundamental reset. As required by PCI Express spec a delay for at -* least 100ms after such a reset before link training is needed. -*/ -msleep (PCI_PM_D3COLD_WAIT ); - -/* -* Try link training at link gen specified by device tree property -* 'max-link-speed'. If this fails, iteratively train at lower gen. -*/ -for (gen = pcie->link_gen; gen >0 ; --gen) { - neg_gen =advk_pcie_train_at_gen (pcie, gen); -if (neg_gen >0 ) -break ; - } - -if (neg_gen <0 ) - goto err; - -/* -* After successful training if negotiated gen is lower than requested, -* train again on negotiated gen. This solves some stability issues for -* some buggy gen1 cards. +* fundamental reset. As required by PCI Express spec (PCI Express +* Base Specification, REV. 4.0 PCI Express, February 19 2014, 6.6.1 +* Conventional Reset) a delay for at least 100ms after such a reset +* before sending a Configuration Request to the device is needed. +* So wait until PCIe link is up. Function advk_pcie_wait_for_link() +* waits for link at least 900ms. */ -if (neg_gen < gen) { - gen = neg_gen; - neg_gen =advk_pcie_train_at_gen (pcie, gen); - } - -if (neg_gen == gen) { -dev_info (dev,"link up at gen %i\n" , gen); -return ; - } - -err: -dev_err (dev,"link never came up\n" ); + ret =advk_pcie_wait_for_link (pcie); +if (ret <0 ) +dev_err (dev,"link never came up\n" ); +else +dev_info (dev,"link up\n" ); }/*
Greg Kroah-Hartman
maintainerPATCH 62/179 drm/amd/display: Fix OLED brightness control on eDP
In reply to Greg Kroah-HartmanFrom: Roman Li <[email protected]>
commit dab60582685aabdae2d4ff7ce716456bd0dc7a0f upstream.
[Why]
After commit ("drm/amdgpu/display: add support for multiple backlights") number of eDPs is defined while registering backlight device. However the panel's extended caps get updated once before register call. That leads to regression with extended caps like oled brightness control.
[How]
Update connector ext caps after register_backlight_device
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -3846,6 +3846,9 @@ static int amdgpu_dm_initialize_drm_devi }else if (dc_link_detect (link,DETECT_REASON_BOOT )) {amdgpu_dm_update_connector_after_detect (aconnector);register_backlight_device (dm, link); + +if (dm->num_of_edps) +update_connector_ext_caps (aconnector);if (amdgpu_dc_feature_mask &DC_PSR_MASK )amdgpu_dm_set_psr_caps (link); }
Greg Kroah-Hartman
maintainerPATCH 63/179 proc/vmcore: fix clearing user buffer by properly using clear_user()
In reply to Greg Kroah-HartmanFrom: David Hildenbrand <[email protected]>
commit c1e63117711977cc4295b2ce73de29dd17066c82 upstream.
To clear a user buffer we cannot simply use memset, we have to use clear_user(). With a virtio-mem device that registers a vmcore_cb and has some logically unplugged memory inside an added Linux memory block, I can easily trigger a BUG by copying the vmcore via "cp":
systemd[1]: Starting Kdump Vmcore Save Service...
kdump[420]: Kdump is using the default log level(3).
kdump[453]: saving to /sysroot/var/crash/127.0.0.1-2021-11-11-14:59:22/ kdump[458]: saving vmcore-dmesg.txt to /sysroot/var/crash/127.0.0.1-2021-11-11-14:59:22/ kdump[465]: saving vmcore-dmesg.txt complete
kdump[467]: saving vmcore
BUG: unable to handle page fault for address: 00007f2374e01000 #PF: supervisor write access in kernel mode #PF: error_code(0x0003) - permissions violation PGD 7a523067 P4D 7a523067 PUD 7a528067 PMD 7a525067 PTE 800000007048f867 Oops: 0003 [#1] PREEMPT SMP NOPTI CPU: 0 PID: 468 Comm: cp Not tainted 5.15.0+ #6 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.14.0-27-g64f37cc530f1-prebuilt.qemu.org 04/01/2014 RIP: 0010:read_from_oldmem.part.0.cold+0x1d/0x86 Code: ff ff ff e8 05 ff fe ff e9 b9 e9 7f ff 48 89 de 48 c7 c7 38 3b 60 82 e8 f1 fe fe ff 83 fd 08 72 3c 49 8d 7d 08 4c 89 e9 89 e8 <49> c7 45 00 00 00 00 00 49 c7 44 05 f8 00 00 00 00 48 83 e7 f81 RSP: 0018:ffffc9000073be08 EFLAGS: 00010212 RAX: 0000000000001000 RBX: 00000000002fd000 RCX: 00007f2374e01000 RDX: 0000000000000001 RSI: 00000000ffffdfff RDI: 00007f2374e01008 RBP: 0000000000001000 R08: 0000000000000000 R09: ffffc9000073bc50 R10: ffffc9000073bc48 R11: ffffffff829461a8 R12: 000000000000f000 R13: 00007f2374e01000 R14: 0000000000000000 R15: ffff88807bd421e8 FS: 00007f2374e12140(0000) GS:ffff88807f000000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f2374e01000 CR3: 000000007a4aa000 CR4: 0000000000350eb0 Call Trace: read_vmcore+0x236/0x2c0 proc_reg_read+0x55/0xa0 vfs_read+0x95/0x190 ksys_read+0x4f/0xc0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae
Some x86-64 CPUs have a CPU feature called "Supervisor Mode Access Prevention (SMAP)", which is used to detect wrong access from the kernel to user buffers like this: SMAP triggers a permissions violation on wrong access. In the x86-64 variant of clear_user(), SMAP is properly handled via clac()+stac().
To fix, properly use clear_user() when we're dealing with a user buffer.
--- fs/proc/vmcore.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
fs/proc/vmcore.c +10 -6
@@ -124,9 +124,13 @@ ssize_t read_from_oldmem(char *buf, size nr_bytes = count;/* If pfn is not ram, return zeros for sparse dump files */ -if (pfn_is_ram (pfn) ==0 ) -memset (buf,0 , nr_bytes); -else { +if (pfn_is_ram (pfn) ==0 ) { + tmp =0 ; +if (!userbuf) +memset (buf,0 , nr_bytes); +else if (clear_user (buf, nr_bytes)) + tmp = -EFAULT ; + }else {if (encrypted) tmp = copy_oldmem_page_encrypted(pfn, buf, nr_bytes,
@@ -135,10 +139,10 @@ ssize_t read_from_oldmem(char *buf, sizeelse tmp =copy_oldmem_page (pfn, buf, nr_bytes, offset, userbuf); - -if (tmp <0 ) -return tmp; } +if (tmp <0 ) +return tmp; + *ppos += nr_bytes; count -= nr_bytes; buf += nr_bytes;
Greg Kroah-Hartman
maintainerPATCH 64/179 ASoC: SOF: Intel: hda: fix hotplug when only codec is suspended
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit fd572393baf0350835e8d822db588f679dc7bcb8 ]
If codec is in runtime suspend, but controller is not, hotplug events are missed as the codec has no way to alert the controller. Problem does not occur if both controller and codec are active, or when both are suspended.
An easy way to reproduce is to play an audio stream on one codec (e.g. to HDMI/DP display codec), wait for other HDA codec to go to runtime suspend, and then plug in a headset to the suspended codec. The jack event is not reported correctly in this case. Another way to reproduce is to force controller to stay active with "snd_sof_pci.sof_pci_debug=0x1"
Fix the issue by reconfiguring the WAKEEN register when powering up/down individual links, and handling control events in the interrupt handler.
--- sound/soc/sof/intel/hda-bus.c | 17 +++++++++++++++++ sound/soc/sof/intel/hda-dsp.c | 3 +-- sound/soc/sof/intel/hda.c | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-)
sound/soc/sof/intel/hda-bus.c +17 -0
@@ -10,6 +10,8 @@#include <linux/io.h> #include <sound/hdaudio.h> #include <sound/hda_i915.h> +#include <sound/hda_codec.h> +#include <sound/hda_register.h> #include "../sof-priv.h" #include "hda.h"
@@ -21,6 +23,18 @@#endif #if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) +static void update_codec_wake_enable (struct hdac_bus *bus,unsigned int addr,bool link_power) +{ +unsigned int mask =snd_hdac_chip_readw (bus,WAKEEN ); + +if (link_power) + mask &= ~BIT (addr); +else + mask |=BIT (addr); + +snd_hdac_chip_updatew (bus,WAKEEN ,STATESTS_INT_MASK , mask); +} +static void sof_hda_bus_link_power (struct hdac_device *codec,bool enable) {struct hdac_bus *bus = codec->bus;
@@ -41,6 +55,9 @@ static void sof_hda_bus_link_power(struct hdac_device *codec, bool enable)*/ if (codec->addr ==HDA_IDISP_ADDR && !enable)snd_hdac_display_power (bus,HDA_CODEC_IDX_CONTROLLER , false); + +/* WAKEEN needs to be set for disabled links */ +update_codec_wake_enable (bus, codec->addr, enable); }static const struct hdac_bus_ops bus_core_ops = {
sound/soc/sof/intel/hda-dsp.c +1 -2
@@ -623,8 +623,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)hda_dsp_ipc_int_disable (sdev);#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) -if (runtime_suspend) -hda_codec_jack_wake_enable (sdev, true); +hda_codec_jack_wake_enable (sdev, runtime_suspend);/* power down all hda link */ snd_hdac_ext_bus_link_power_down_all (bus);
sound/soc/sof/intel/hda.c +16 -0
@@ -696,6 +696,20 @@ static int hda_init_caps(struct snd_sof_dev *sdev)return 0 ; } +static void hda_check_for_state_change (struct snd_sof_dev *sdev) +{ +#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) +struct hdac_bus *bus =sof_to_bus (sdev); +unsigned int codec_mask; + + codec_mask =snd_hdac_chip_readw (bus,STATESTS ); +if (codec_mask) { +hda_codec_jack_check (sdev); +snd_hdac_chip_writew (bus,STATESTS , codec_mask); + } +#endif +} +static irqreturn_t hda_dsp_interrupt_handler (int irq,void *context) {struct snd_sof_dev *sdev = context;
@@ -737,6 +751,8 @@ static irqreturn_t hda_dsp_interrupt_thread(int irq, void *context)if (hda_sdw_check_wakeen_irq (sdev))hda_sdw_process_wakeen (sdev); +hda_check_for_state_change (sdev); +/* enable GIE interrupt */ snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 65/179 netfilter: ctnetlink: fix filtering with CTA_TUPLE_REPLY
In reply to Greg Kroah-HartmanFrom: Florent Fourcot <[email protected]>
[ Upstream commit ad81d4daf6a3f4769a346e635d5e1e967ca455d9 ]
filter->orig_flags was used for a reply context.
--- net/netfilter/nf_conntrack_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -1011,7 +1011,7 @@ ctnetlink_alloc_filter(const struct nlattr * const cda[], u8 family)CTA_TUPLE_REPLY , filter->family, &filter->zone, - filter->orig_flags); + filter->reply_flags);if (err <0 ) { err = -EINVAL ; goto err_filter;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 66/179 netfilter: ctnetlink: do not erase error code with EINVAL
In reply to Greg Kroah-HartmanFrom: Florent Fourcot <[email protected]>
[ Upstream commit 77522ff02f333434612bd72df9b376f8d3836e4d ]
And be consistent in error management for both orig/reply filtering
--- net/netfilter/nf_conntrack_netlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/netfilter/nf_conntrack_netlink.c +1 -3
@@ -1012,10 +1012,8 @@ ctnetlink_alloc_filter(const struct nlattr * const cda[], u8 family) filter->family, &filter->zone, filter->reply_flags); -if (err <0 ) { - err = -EINVAL ; +if (err <0 ) goto err_filter; - } }return filter;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 67/179 netfilter: ipvs: Fix reuse connection if RS weight is 0
In reply to Greg Kroah-HartmanFrom: yangxingwu <[email protected]>
[ Upstream commit c95c07836fa4c1767ed11d8eca0769c652760e32 ]
We are changing expire_nodest_conn to work even for reused connections when conn_reuse_mode=0, just as what was done with commit dc7b3eb900aa ("ipvs:
Fix reuse connection if real server is dead").
For controlled and persistent connections, the new connection will get the needed real server depending on the rules in ip_vs_check_template().
--- Documentation/networking/ipvs-sysctl.rst | 3 +-- net/netfilter/ipvs/ip_vs_core.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-)
Documentation/networking/ipvs-sysctl.rst +1 -2
@@ -37,8 +37,7 @@ conn_reuse_mode - INTEGER 0: disable any special handling on port reuse. The new connection will be delivered to the same real server that was - servicing the previous connection. This will effectively - disable expire_nodest_conn. + servicing the previous connection. bit 1: enable rescheduling of new connections when it is safe. That is, whenever expire_nodest_conn and for TCP sockets, when
net/netfilter/ipvs/ip_vs_core.c +4 -4
@@ -1964,7 +1964,6 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, intstruct ip_vs_proto_data *pd;struct ip_vs_conn *cp;int ret, pkts; -int conn_reuse_mode;struct sock *sk;/* Already marked as IPVS request or reply? */
@@ -2041,15 +2040,16 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int cp =INDIRECT_CALL_1 (pp->conn_in_get, ip_vs_conn_in_get_proto, ipvs, af, skb, &iph); - conn_reuse_mode =sysctl_conn_reuse_mode (ipvs); -if (conn_reuse_mode && !iph.fragoffs &&is_new_conn (skb, &iph) && cp) { +if (!iph.fragoffs &&is_new_conn (skb, &iph) && cp) { +int conn_reuse_mode =sysctl_conn_reuse_mode (ipvs);bool old_ct = false, resched = false;if (unlikely (sysctl_expire_nodest_conn (ipvs)) && cp->dest &&unlikely (!atomic_read (&cp->dest->weight))) { resched = true; old_ct =ip_vs_conn_uses_old_conntrack (cp, skb); - }else if (is_new_conn_expected (cp, conn_reuse_mode)) { + }else if (conn_reuse_mode && +is_new_conn_expected (cp, conn_reuse_mode)) { old_ct =ip_vs_conn_uses_old_conntrack (cp, skb);if (!atomic_read (&cp->n_control)) { resched = true;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 68/179 netfilter: flowtable: fix IPv6 tunnel addr match
In reply to Greg Kroah-HartmanFrom: Will Mortensen <[email protected]>
[ Upstream commit 39f6eed4cb209643f3f8633291854ed7375d7264 ]
Previously the IPv6 addresses in the key were clobbered and the mask was left unset.
I haven't tested this; I noticed it while skimming the code to understand an unrelated issue.
--- net/netfilter/nf_flow_table_offload.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_flow_table_offload.c +2 -2
@@ -65,11 +65,11 @@ static void nf_flow_rule_lwt_match(struct nf_flow_match *match, sizeof(struct in6_addr));if (memcmp (&key->enc_ipv6.src, &in6addr_any,sizeof (struct in6_addr ))) -memset (&key->enc_ipv6.src,0xff , +memset (&mask->enc_ipv6.src,0xff ,sizeof (struct in6_addr ));if (memcmp (&key->enc_ipv6.dst, &in6addr_any,sizeof (struct in6_addr ))) -memset (&key->enc_ipv6.dst,0xff , +memset (&mask->enc_ipv6.dst,0xff ,sizeof (struct in6_addr )); enc_keys |=BIT (FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS ); key->enc_control.addr_type =FLOW_DISSECTOR_KEY_IPV6_ADDRS ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 69/179 media: v4l2-core: fix VIDIOC_DQEVENT handling on non-x86
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 678d92b6126b9f55419b6a51ef0a88bce2ef2f20 ]
My previous bugfix addressed an API inconsistency found by syzbot, and it correctly fixed the issue on x86-64 machines, which now behave correctly for both native and compat tasks.
Unfortunately, John found that the patch broke compat mode on all other architectures, as they can no longer rely on the VIDIOC_DQEVENT_TIME32 code from the native handler as a fallback in the compat code.
The best way I can see for addressing this is to generalize the VIDIOC_DQEVENT32_TIME32 code from x86 and use that for all architectures, leaving only the VIDIOC_DQEVENT32 variant as x86 specific. The original code was trying to be clever and use the same conversion helper for native 32-bit code and compat mode, but that turned out to be too obscure so even I missed that bit I had introduced myself when I made the fix.
--- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-)
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +17 -24
@@ -744,10 +744,6 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *p64,/* * x86 is the only compat architecture with different struct alignment * between 32-bit and 64-bit tasks. -* -* On all other architectures, v4l2_event32 and v4l2_event32_time32 are -* the same as v4l2_event and v4l2_event_time32, so we can use the native -* handlers, converting v4l2_event to v4l2_event_time32 if necessary. */ struct v4l2_event32 {__u32 type;
@@ -765,21 +761,6 @@ struct v4l2_event32 {__u32 reserved[8 ]; }; -#ifdef CONFIG_COMPAT_32BIT_TIME -struct v4l2_event32_time32 { -__u32 type; -union { -compat_s64 value64; -__u8 data[64 ]; - } u; -__u32 pending; -__u32 sequence; -struct old_timespec32 timestamp; -__u32 id; -__u32 reserved[8 ]; -}; -#endif -static int put_v4l2_event32 (struct v4l2_event *p64,struct v4l2_event32 __user *p32) {
@@ -795,7 +776,22 @@ static int put_v4l2_event32(struct v4l2_event *p64,return 0 ; } +#endif +#ifdef CONFIG_COMPAT_32BIT_TIME +struct v4l2_event32_time32 { +__u32 type; +union { +compat_s64 value64; +__u8 data[64 ]; + } u; +__u32 pending; +__u32 sequence; +struct old_timespec32 timestamp; +__u32 id; +__u32 reserved[8 ]; +}; +static int put_v4l2_event32_time32 (struct v4l2_event *p64,struct v4l2_event32_time32 __user *p32) {
@@ -811,7 +807,6 @@ static int put_v4l2_event32_time32(struct v4l2_event *p64,return 0 ; }#endif -#endif struct v4l2_edid32 {__u32 pad;
@@ -873,9 +868,7 @@ static int put_v4l2_edid32(struct v4l2_edid *p64,#define VIDIOC_QUERYBUF32_TIME32 _IOWR('V', 9, struct v4l2_buffer32_time32)#define VIDIOC_QBUF32_TIME32 _IOWR('V', 15, struct v4l2_buffer32_time32)#define VIDIOC_DQBUF32_TIME32 _IOWR('V', 17, struct v4l2_buffer32_time32) -#ifdef CONFIG_X86_64 #define VIDIOC_DQEVENT32_TIME32 _IOR ('V', 89, struct v4l2_event32_time32) -#endif #define VIDIOC_PREPARE_BUF32_TIME32 _IOWR('V', 93, struct v4l2_buffer32_time32)#endif
@@ -929,10 +922,10 @@ unsigned int v4l2_compat_translate_cmd(unsigned int cmd)#ifdef CONFIG_X86_64 case VIDIOC_DQEVENT32 :return VIDIOC_DQEVENT ; +#endif #ifdef CONFIG_COMPAT_32BIT_TIME case VIDIOC_DQEVENT32_TIME32 :return VIDIOC_DQEVENT ; -#endif #endif }return cmd;
@@ -1025,10 +1018,10 @@ int v4l2_compat_put_user(void __user *arg, void *parg, unsigned int cmd)#ifdef CONFIG_X86_64 case VIDIOC_DQEVENT32 :return put_v4l2_event32 (parg, arg); +#endif #ifdef CONFIG_COMPAT_32BIT_TIME case VIDIOC_DQEVENT32_TIME32 :return put_v4l2_event32_time32 (parg, arg); -#endif #endif }return 0 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 70/179 firmware: arm_scmi: Fix null de-reference on error path
In reply to Greg Kroah-HartmanFrom: Cristian Marussi <[email protected]>
[ Upstream commit 95161165727650a707bc34ecfac286a418b6bb00 ]
During channel setup a failure in the call of scmi_vio_feed_vq_rx() leads to an attempt to access a dev pointer by dereferencing vioch->cinfo at a time when vioch->cinfo has still to be initialized.
Fix it by providing the device reference directly to scmi_vio_feed_vq_rx.
--- drivers/firmware/arm_scmi/virtio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/firmware/arm_scmi/virtio.c +5 -5
@@ -82,7 +82,8 @@ static bool scmi_vio_have_vq_rx(struct virtio_device *vdev) }static int scmi_vio_feed_vq_rx (struct scmi_vio_channel *vioch, -struct scmi_vio_msg *msg) +struct scmi_vio_msg *msg, +struct device *dev) {struct scatterlist sg_in;int rc;
@@ -94,8 +95,7 @@ static int scmi_vio_feed_vq_rx(struct scmi_vio_channel *vioch, rc =virtqueue_add_inbuf (vioch->vqueue, &sg_in,1 , msg,GFP_ATOMIC );if (rc) -dev_err_once (vioch->cinfo->dev, -"failed to add to virtqueue (%d)\n" , rc); +dev_err_once (dev,"failed to add to virtqueue (%d)\n" , rc);else virtqueue_kick (vioch->vqueue);
@@ -108,7 +108,7 @@ static void scmi_finalize_message(struct scmi_vio_channel *vioch, struct scmi_vio_msg *msg) {if (vioch->is_rx) { -scmi_vio_feed_vq_rx (vioch, msg); +scmi_vio_feed_vq_rx (vioch, msg, vioch->cinfo->dev); }else {/* Here IRQs are assumed to be already disabled by the caller */ spin_lock (&vioch->lock);
@@ -269,7 +269,7 @@ static int virtio_chan_setup(struct scmi_chan_info *cinfo, struct device *dev,list_add_tail (&msg->list, &vioch->free_list);spin_unlock_irqrestore (&vioch->lock, flags); }else { -scmi_vio_feed_vq_rx (vioch, msg); +scmi_vio_feed_vq_rx (vioch, msg, cinfo->dev); } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 71/179 ARM: dts: BCM5301X: Fix I2C controller interrupt
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 754c4050a00e802e122690112fc2c3a6abafa7e2 ]
The I2C interrupt controller line is off by 32 because the datasheet describes interrupt inputs into the GIC which are for Shared Peripheral Interrupts and are starting at offset 32. The ARM GIC binding expects the SPI interrupts to be numbered from 0 relative to the SPI base.
--- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm5301x.dtsi +1 -1
@@ -408,7 +408,7 @@ uart2: serial@18008000 { i2c0: i2c@18009000 { compatible = "brcm,iproc-i2c"; reg = <0x18009000 0x50>; - interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; clock-frequency = <100000>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 72/179 ARM: dts: BCM5301X: Add interrupt properties to GPIO node
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 40f7342f0587639e5ad625adaa15efdd3cffb18f ]
The GPIO controller is also an interrupt controller provider and is currently missing the appropriate 'interrupt-controller' and '#interrupt-cells' properties to denote that.
--- arch/arm/boot/dts/bcm5301x.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/bcm5301x.dtsi +2 -0
@@ -242,6 +242,8 @@ chipcommon: chipcommon@0 { gpio-controller; #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; }; pcie0: pcie@12000 {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 73/179 ARM: dts: bcm2711: Fix PCIe interrupts
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 98481f3d72fb88cb5b973153434061015f094925 ]
The PCIe host bridge has two interrupt lines, one that goes towards it PCIE_INTR2 second level interrupt controller and one for its MSI second level interrupt controller. The first interrupt line is not currently managed by the driver, which is why it was not a functional problem.
The interrupt-map property was also only listing the PCI_INTA interrupts when there are also the INTB, C and D.
--- arch/arm/boot/dts/bcm2711.dtsi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/boot/dts/bcm2711.dtsi +7 -1
@@ -506,11 +506,17 @@ pcie0: pcie@7d500000 { #address-cells = <3>; #interrupt-cells = <1>; #size-cells = <2>; - interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, + interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "pcie", "msi"; interrupt-map-mask = <0x0 0x0 0x0 0x7>; interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 143 + IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 2 &gicv2 GIC_SPI 144 + IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &gicv2 GIC_SPI 145 + IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &gicv2 GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>; msi-controller; msi-parent = <&pcie0>;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 74/179 ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 861afeac7990587588d057b2c0b3222331c3da29 ]
Stream IDs are reused across multiple BackEnd mixers, do not reset the stream mixers if they are not already set for that particular FrontEnd.
Ex:
amixer cset iface=MIXER,name='SLIMBUS_0_RX Audio Mixer MultiMedia1' 1
would set the MultiMedia1 steam for SLIMBUS_0_RX, however doing below command will reset previously setup MultiMedia1 stream, because both of them are using MultiMedia1 PCM stream.
amixer cset iface=MIXER,name='SLIMBUS_2_RX Audio Mixer MultiMedia1' 0
reset the FrontEnd Mixers conditionally to fix this issue.
This is more noticeable in desktop setup, where in alsactl tries to restore the alsa state and overwriting the previous mixer settings.
--- sound/soc/qcom/qdsp6/q6routing.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/soc/qcom/qdsp6/q6routing.c +5 -1
@@ -495,7 +495,11 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol, session->port_id = be_id;snd_soc_dapm_mixer_update_power (dapm, kcontrol,1 , update); }else { - session->port_id =-1 ; +if (session->port_id == be_id) { + session->port_id =-1 ; +return 0 ; + } +snd_soc_dapm_mixer_update_power (dapm, kcontrol,0 , update); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 75/179 ASoC: qdsp6: q6asm: fix q6asm_dai_prepare error handling
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 721a94b4352dc8e47bff90b549a0118c39776756 ]
Error handling in q6asm_dai_prepare() seems to be completely broken, Fix this by handling it properly.
--- sound/soc/qcom/qdsp6/q6asm-dai.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
sound/soc/qcom/qdsp6/q6asm-dai.c +13 -6
@@ -269,9 +269,7 @@ static int q6asm_dai_prepare(struct snd_soc_component *component,if (ret <0 ) {dev_err (dev,"%s: q6asm_open_write failed\n" , __func__); -q6asm_audio_client_free (prtd->audio_client); - prtd->audio_client =NULL ; -return -ENOMEM ; + goto open_err; } prtd->session_id =q6asm_get_session_id (prtd->audio_client);
@@ -279,7 +277,7 @@ static int q6asm_dai_prepare(struct snd_soc_component *component, prtd->session_id, substream->stream);if (ret) {dev_err (dev,"%s: stream reg failed ret:%d\n" , __func__, ret); -return ret; + goto routing_err; }if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) {
@@ -301,10 +299,19 @@ static int q6asm_dai_prepare(struct snd_soc_component *component, }if (ret <0 )dev_info (dev,"%s: CMD Format block failed\n" , __func__); +else + prtd->state =Q6ASM_STREAM_RUNNING ; - prtd->state =Q6ASM_STREAM_RUNNING ; +return ret; -return 0 ; +routing_err: +q6asm_cmd (prtd->audio_client, prtd->stream_id,CMD_CLOSE ); +open_err: +q6asm_unmap_memory_regions (substream->stream, prtd->audio_client); +q6asm_audio_client_free (prtd->audio_client); + prtd->audio_client =NULL ; + +return ret; } static int q6asm_dai_trigger(struct snd_soc_component *component,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 76/179 ASoC: topology: Add missing rwsem around snd_ctl_remove() calls
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 7e567b5ae06315ef2d70666b149962e2bb4b97af ]
snd_ctl_remove() has to be called with card->controls_rwsem held (when called after the card instantiation). This patch add the missing rwsem calls around it.
--- sound/soc/soc-topology.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/soc-topology.c +3 -0
@@ -2674,6 +2674,7 @@ EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load);/* remove dynamic controls from the component driver */ int snd_soc_tplg_component_remove (struct snd_soc_component *comp) { +struct snd_card *card = comp->card->snd_card;struct snd_soc_dobj *dobj, *next_dobj;int pass =SOC_TPLG_PASS_END ;
@@ -2681,6 +2682,7 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp)while (pass >=SOC_TPLG_PASS_START ) {/* remove mixer controls */ +down_write (&card->controls_rwsem);list_for_each_entry_safe (dobj, next_dobj, &comp->dobj_list, list) {
@@ -2719,6 +2721,7 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp)break ; } } +up_write (&card->controls_rwsem); pass--; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 77/179 ASoC: codecs: wcd938x: fix volatile register range
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit ea157c2ba821dab789a544cd9fbe44dc07036ff8 ]
Interrupt Clear registers WCD938X_INTR_CLEAR_0 - WCD938X_INTR_CLEAR_2 are not marked as volatile. This has resulted in a missing interrupt bug while performing runtime pm. regcache_sync() during runtime pm resume path will write to Interrupt clear registers with previous values which basically clears the pending interrupt and actual interrupt handler never sees this interrupt.
This issue is more visible with headset plug-in plug-out case compared to headset button.
Fix this by adding the Interrupt clear registers to volatile range
--- sound/soc/codecs/wcd938x.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/wcd938x.c +3 -0
@@ -1174,6 +1174,9 @@ static bool wcd938x_readonly_register(struct device *dev, unsigned int reg)case WCD938X_DIGITAL_INTR_STATUS_0 :case WCD938X_DIGITAL_INTR_STATUS_1 :case WCD938X_DIGITAL_INTR_STATUS_2 : +case WCD938X_DIGITAL_INTR_CLEAR_0 : +case WCD938X_DIGITAL_INTR_CLEAR_1 : +case WCD938X_DIGITAL_INTR_CLEAR_2 :case WCD938X_DIGITAL_SWR_HM_TEST_0 :case WCD938X_DIGITAL_SWR_HM_TEST_1 :case WCD938X_DIGITAL_EFUSE_T_DATA_0 :
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 78/179 ASoC: codecs: wcd934x: return error code correctly from hw_params
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 006ea27c4e7037369085755c7b5389effa508c04 ]
Error returned from wcd934x_slim_set_hw_params() are not passed to upper layer, this could be misleading to the user which can start sending stream leading to unnecessary errors.
Fix this by properly returning the errors.
--- sound/soc/codecs/wcd934x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/codecs/wcd934x.c +1 -2
@@ -1896,9 +1896,8 @@ static int wcd934x_hw_params(struct snd_pcm_substream *substream, } wcd->dai[dai->id].sconfig.rate =params_rate (params); -wcd934x_slim_set_hw_params (wcd, &wcd->dai[dai->id], substream->stream); -return 0 ; +return wcd934x_slim_set_hw_params (wcd, &wcd->dai[dai->id], substream->stream); } static int wcd934x_hw_free(struct snd_pcm_substream *substream,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 79/179 ASoC: codecs: lpass-rx-macro: fix HPHR setting CLSH mask
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit cb04d8cd0bb0b82acc34cc73cb33ae77cbfb020d ]
For some reason we ended up using snd_soc_component_write_field for HPHL and snd_soc_component_update_bits for HPHR, so fix this.
--- sound/soc/codecs/lpass-rx-macro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/lpass-rx-macro.c +1 -1
@@ -2188,7 +2188,7 @@ static int rx_macro_config_classh(struct snd_soc_component *component,snd_soc_component_update_bits (component,CDC_RX_CLSH_DECAY_CTRL ,CDC_RX_CLSH_DECAY_RATE_MASK ,0x0 ); -snd_soc_component_update_bits (component, +snd_soc_component_write_field (component,CDC_RX_RX1_RX_PATH_CFG0 , CDC_RX_RXn_CLSH_EN_MASK,0x1 );break ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 80/179 net: ieee802154: handle iftypes as u32
In reply to Greg Kroah-HartmanFrom: Alexander Aring <[email protected]>
[ Upstream commit 451dc48c806a7ce9fbec5e7a24ccf4b2c936e834 ]
This patch fixes an issue that an u32 netlink value is handled as a signed enum value which doesn't fit into the range of u32 netlink type. If it's handled as -1 value some BIT() evaluation ends in a shift-out-of-bounds issue. To solve the issue we set the to u32 max which is s32 "-1" value to keep backwards compatibility and let the followed enum values start counting at 0. This brings the compiler to never handle the enum as signed and a check if the value is above NL802154_IFTYPE_MAX should filter -1 out.
--- include/net/nl802154.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
include/net/nl802154.h +4 -3
@@ -19,6 +19,8 @@* */ +#include <linux/types.h> +#define NL802154_GENL_NAME "nl802154"enum nl802154_commands {
@@ -150,10 +152,9 @@ enum nl802154_attrs { };enum nl802154_iftype { -/* for backwards compatibility TODO */ -NL802154_IFTYPE_UNSPEC =-1 , +NL802154_IFTYPE_UNSPEC = (~(__u32 )0 ), -NL802154_IFTYPE_NODE , +NL802154_IFTYPE_NODE =0 ,NL802154_IFTYPE_MONITOR ,NL802154_IFTYPE_COORD ,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 81/179 firmware: arm_scmi: Fix base agent discover response
In reply to Greg Kroah-HartmanFrom: Vincent Guittot <[email protected]>
[ Upstream commit d1cbd9e0f7e51ae8e3638a36ba884fdbb2fc967e ]
According to scmi specification, the response of the discover agent request is made of:
- int32 status
- uint32 agent_id
- uint8 name[16]
but the current implementation doesn't take into account the agent_id field and only allocates a rx buffer of SCMI_MAX_STR_SIZE length
Allocate the correct length for rx buffer and copy the name from the correct offset in the response.
While no error were returned until v5.15, v5.16-rc1 fails with virtio_scmi transport channel:
| arm-scmi firmware:scmi0: SCMI Notifications - Core Enabled. | arm-scmi firmware:scmi0: SCMI Protocol v2.0 'Linaro:PMWG' Firmware version 0x2090000 | scmi-virtio virtio0: tx:used len 28 is larger than in buflen 24
--- drivers/firmware/arm_scmi/base.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/firmware/arm_scmi/base.c +12 -3
@@ -34,6 +34,12 @@ struct scmi_msg_resp_base_attributes {__le16 reserved; }; +struct scmi_msg_resp_base_discover_agent { +__le32 agent_id; +u8 name[SCMI_MAX_STR_SIZE ]; +}; + +struct scmi_msg_base_error_notify {__le32 event_control;#define BASE_TP_NOTIFY_ALL BIT(0)
@@ -225,18 +231,21 @@ static int scmi_base_discover_agent_get(const struct scmi_protocol_handle *ph, int id, char *name) { int ret; +struct scmi_msg_resp_base_discover_agent *agent_info;struct scmi_xfer *t; ret = ph->xops->xfer_get_init (ph,BASE_DISCOVER_AGENT , -sizeof (__le32),SCMI_MAX_STR_SIZE , &t); +sizeof (__le32),sizeof (*agent_info), &t);if (ret)return ret;put_unaligned_le32 (id, t->tx.buf); ret = ph->xops->do_xfer (ph, t); -if (!ret) -strlcpy (name, t->rx.buf,SCMI_MAX_STR_SIZE ); +if (!ret) { + agent_info = t->rx.buf; +strlcpy (name, agent_info->name,SCMI_MAX_STR_SIZE ); + } ph->xops->xfer_put (ph, t);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 82/179 firmware: arm_scmi: pm: Propagate return value to caller
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 1446fc6c678e8d8b31606a4b877abe205f344b38 ]
of_genpd_add_provider_onecell may return error, so let's propagate its return value to caller
--- drivers/firmware/arm_scmi/scmi_pm_domain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/firmware/arm_scmi/scmi_pm_domain.c +1 -3
@@ -138,9 +138,7 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) scmi_pd_data->domains = domains; scmi_pd_data->num_domains = num_domains; -of_genpd_add_provider_onecell (np, scmi_pd_data); - -return 0 ; +return of_genpd_add_provider_onecell (np, scmi_pd_data); }static const struct scmi_device_id scmi_id_table[] = {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 83/179 ASoC: stm32: i2s: fix 32 bits channel length without mclk
In reply to Greg Kroah-HartmanFrom: Olivier Moysan <[email protected]>
[ Upstream commit 424fe7edbed18d47f7b97f7e1322a6f8969b77ae ]
Fix divider calculation in the case of 32 bits channel configuration, when no master clock is used.
--- sound/soc/stm/stm32_i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/stm/stm32_i2s.c +1 -1
@@ -700,7 +700,7 @@ static int stm32_i2s_configure_clock(struct snd_soc_dai *cpu_dai,if (ret <0 )return ret; - nb_bits = frame_len * ((cgfr &I2S_CGFR_CHLEN ) +1 ); + nb_bits = frame_len * (FIELD_GET (I2S_CGFR_CHLEN , cgfr) +1 ); ret =stm32_i2s_calc_clk_div (i2s, i2s_clock_rate, (nb_bits * rate));if (ret)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 84/179 NFSv42: Dont fail clone() unless the OP_CLONE operation failed
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit d3c45824ad65aebf765fcf51366d317a29538820 ]
The failure to retrieve post-op attributes has no bearing on whether or not the clone operation itself was successful. We must therefore ignore the return value of decode_getfattr() when looking at the success or failure of nfs4_xdr_dec_clone().
--- fs/nfs/nfs42xdr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfs/nfs42xdr.c +1 -2
@@ -1434,8 +1434,7 @@ static int nfs4_xdr_dec_clone(struct rpc_rqst *rqstp, status =decode_clone (xdr);if (status) goto out; - status =decode_getfattr (xdr, res->dst_fattr, res->server); - +decode_getfattr (xdr, res->dst_fattr, res->server); out: res->rpc_status = status;return status;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 85/179 ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
[ Upstream commit 187bea472600dcc8d2eb714335053264dd437172 ]
When CONFIG_FORTIFY_SOURCE is set, memcpy() checks the potential buffer overflow and panics. The code in sofcpga bootstrapping contains the memcpy() calls are mistakenly translated as the shorter size, hence it triggers a panic as if it were overflowing.
This patch changes the secondary_trampoline and *_end definitions to arrays for avoiding the false-positive crash above.
--- arch/arm/mach-socfpga/core.h | 2 +- arch/arm/mach-socfpga/platsmp.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-socfpga/core.h +1 -1
@@ -33,7 +33,7 @@ extern void __iomem *sdr_ctl_base_addr;u32 socfpga_sdram_self_refresh (u32 sdr_base);extern unsigned int socfpga_sdram_self_refresh_sz; -extern char secondary_trampoline, secondary_trampoline_end; +extern char secondary_trampoline[], secondary_trampoline_end[];extern unsigned long socfpga_cpu1start_addr;
arch/arm/mach-socfpga/platsmp.c +4 -4
@@ -20,14 +20,14 @@static int socfpga_boot_secondary (unsigned int cpu,struct task_struct *idle) { -int trampoline_size = &secondary_trampoline_end - &secondary_trampoline; +int trampoline_size = secondary_trampoline_end - secondary_trampoline;if (socfpga_cpu1start_addr) {/* This will put CPU #1 into reset. */ writel (RSTMGR_MPUMODRST_CPU1 , rst_manager_base_addr +SOCFPGA_RSTMGR_MODMPURST ); -memcpy (phys_to_virt (0 ), &secondary_trampoline, trampoline_size); +memcpy (phys_to_virt (0 ), secondary_trampoline, trampoline_size);writel (__pa_symbol (secondary_startup), sys_manager_base_addr + (socfpga_cpu1start_addr &0x000000ff ));
@@ -45,12 +45,12 @@ static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)static int socfpga_a10_boot_secondary (unsigned int cpu,struct task_struct *idle) { -int trampoline_size = &secondary_trampoline_end - &secondary_trampoline; +int trampoline_size = secondary_trampoline_end - secondary_trampoline;if (socfpga_cpu1start_addr) {writel (RSTMGR_MPUMODRST_CPU1 , rst_manager_base_addr +SOCFPGA_A10_RSTMGR_MODMPURST ); -memcpy (phys_to_virt (0 ), &secondary_trampoline, trampoline_size); +memcpy (phys_to_virt (0 ), secondary_trampoline, trampoline_size);writel (__pa_symbol (secondary_startup), sys_manager_base_addr + (socfpga_cpu1start_addr &0x00000fff ));
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 86/179 drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit b371fd131fcec59f6165c80778bdc2cd1abd616b ]
The nvkm_acr_lsfw_add() function never returns NULL. It returns error pointers on error.
--- drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 6 ++++-- drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c +4 -2
@@ -207,11 +207,13 @@ int gm200_acr_wpr_parse(struct nvkm_acr *acr) {const struct wpr_header *hdr = (void *)acr->wpr_fw->data; +struct nvkm_acr_lsfw *lsfw;while (hdr->falcon_id !=WPR_HEADER_V0_FALCON_ID_INVALID ) {wpr_header_dump (&acr->subdev, hdr); -if (!nvkm_acr_lsfw_add (NULL , acr,NULL , (hdr++)->falcon_id)) -return -ENOMEM ; + lsfw =nvkm_acr_lsfw_add (NULL , acr,NULL , (hdr++)->falcon_id); +if (IS_ERR (lsfw)) +return PTR_ERR (lsfw); }return 0 ;
drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c +4 -2
@@ -161,11 +161,13 @@ int gp102_acr_wpr_parse(struct nvkm_acr *acr) {const struct wpr_header_v1 *hdr = (void *)acr->wpr_fw->data; +struct nvkm_acr_lsfw *lsfw;while (hdr->falcon_id !=WPR_HEADER_V1_FALCON_ID_INVALID ) {wpr_header_v1_dump (&acr->subdev, hdr); -if (!nvkm_acr_lsfw_add (NULL , acr,NULL , (hdr++)->falcon_id)) -return -ENOMEM ; + lsfw =nvkm_acr_lsfw_add (NULL , acr,NULL , (hdr++)->falcon_id); +if (IS_ERR (lsfw)) +return PTR_ERR (lsfw); }return 0 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 87/179 scsi: qla2xxx: edif: Fix off by one bug in qla_edif_app_getfcinfo()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e11e285b9cd132db21568b5d29c291f590841944 ]
The > comparison needs to be >= to prevent accessing one element beyond the end of the app_reply->ports[] array.
--- drivers/scsi/qla2xxx/qla_edif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_edif.c +1 -1
@@ -865,7 +865,7 @@ qla_edif_app_getfcinfo(scsi_qla_host_t *vha, struct bsg_job *bsg_job) "APP request entry - portid=%06x.\n", tdid.b24);/* Ran out of space */ -if (pcnt > app_req.num_ports) +if (pcnt >= app_req.num_ports)break ;if (tdid.b24 !=0 && tdid.b24 != fcport->d_id.b24)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 88/179 scsi: mpt3sas: Fix kernel panic during drive powercycle test
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit 0ee4ba13e09c9d9c1cb6abb59da8295d9952328b ]
While looping over shost's sdev list it is possible that one of the drives is getting removed and its sas_target object is freed but its sdev object remains intact.
Consequently, a kernel panic can occur while the driver is trying to access the sas_address field of sas_target object without also checking the sas_target object for NULL.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -3869,7 +3869,7 @@ _scsih_ublock_io_device(struct MPT3SAS_ADAPTER *ioc,shost_for_each_device (sdev, ioc->shost) { sas_device_priv_data = sdev->hostdata; -if (!sas_device_priv_data) +if (!sas_device_priv_data || !sas_device_priv_data->sas_target)continue ;if (sas_device_priv_data->sas_target->sas_address != sas_address)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 89/179 scsi: mpt3sas: Fix system going into read-only mode
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit 91202a01a2fb2b78da3d03811b6d3d973ae426aa ]
While determining the SAS address of a drive, the driver checks whether the handle number is less than the HBA phy count or not. If the handle number is less than the HBA phy count then driver assumes that this handle belongs to HBA and hence it assigns the HBA SAS address.
During IOC firmware downgrade operation, if the number of HBA phys is reduced and the OS drive's device handle drops below the phy count while determining the drive's SAS address, the driver ends up using the HBA's SAS address. This leads to a mismatch of drive's SAS address and hence the driver unregisters the OS drive and the system goes into read-only mode.
Update the IOC's num_phys to the HBA phy count provided by actual loaded firmware.
--- drivers/scsi/mpt3sas/mpt3sas_base.h | 4 ++ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 57 +++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-)
drivers/scsi/mpt3sas/mpt3sas_base.h +4 -0
@@ -142,6 +142,8 @@#define MPT_MAX_CALLBACKS 32 +#define MPT_MAX_HBA_NUM_PHYS 32 +#define INTERNAL_CMDS_COUNT 10/* reserved cmds */ /* reserved for issuing internally framed scsi io cmds */ #define INTERNAL_SCSIIO_CMDS_COUNT 3
@@ -798,6 +800,7 @@ struct _sas_phy {* @enclosure_handle: handle for this a member of an enclosure * @device_info: bitwise defining capabilities of this sas_host/expander * @responding: used in _scsih_expander_device_mark_responding +* @nr_phys_allocated: Allocated memory for this many count phys * @phy: a list of phys that make up this sas_host/expander * @sas_port_list: list of ports attached to this sas_host/expander * @port: hba port entry containing node's port number info
@@ -813,6 +816,7 @@ struct _sas_node {u16 enclosure_handle;u64 enclosure_logical_id;u8 responding; +u8 nr_phys_allocated;struct hba_port *port;struct _sas_phy *phy;struct list_head sas_port_list;
drivers/scsi/mpt3sas/mpt3sas_scsih.c +56 -1
86 lines not on this page · raw message
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 90/179 scsi: mpt3sas: Fix incorrect system timestamp
In reply to Greg Kroah-HartmanFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit 5ecae9f8c705fae85fe4d2ed9f1b9cddf91e88e9 ]
For updating the IOC firmware's timestamp with system timestamp, the driver issues the Mpi26IoUnitControlRequest message. While framing the Mpi26IoUnitControlRequest, the driver should copy the lower 32 bits of the current timestamp into IOCParameterValue field and the higher 32 bits into Reserved7 field.
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +2 -2
@@ -639,8 +639,8 @@ static void _base_sync_drv_fw_timestamp(struct MPT3SAS_ADAPTER *ioc) mpi_request->IOCParameter =MPI26_SET_IOC_PARAMETER_SYNC_TIMESTAMP ; current_time =ktime_get_real (); TimeStamp =ktime_to_ms (current_time); - mpi_request->Reserved7 =cpu_to_le32 (TimeStamp &0xFFFFFFFF ); - mpi_request->IOCParameterValue =cpu_to_le32 (TimeStamp >>32 ); + mpi_request->Reserved7 =cpu_to_le32 (TimeStamp >>32 ); + mpi_request->IOCParameterValue =cpu_to_le32 (TimeStamp &0xFFFFFFFF );init_completion (&ioc->scsih_cmds.done); ioc->put_smid_default (ioc, smid); dinitprintk(ioc, ioc_info(ioc,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 91/179 drm/vc4: fix error code in vc4_create_object()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 96c5f82ef0a145d3e56e5b26f2bf6dcd2ffeae1c ]
The ->gem_create_object() functions are supposed to return NULL if there is an error. None of the callers expect error pointers so returing one will lead to an Oops. See drm_gem_vram_create(), for example.
--- drivers/gpu/drm/vc4/vc4_bo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vc4/vc4_bo.c +1 -1
@@ -391,7 +391,7 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size) bo =kzalloc (sizeof (*bo),GFP_KERNEL );if (!bo) -return ERR_PTR (-ENOMEM ); +return NULL ; bo->madv =VC4_MADV_WILLNEED ;refcount_set (&bo->usecnt,0 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 92/179 drm/aspeed: Fix vga_pw sysfs output
In reply to Greg Kroah-HartmanFrom: Joel Stanley <[email protected]>
[ Upstream commit b4a6aaeaf4aa79f23775f6688a7e8db3ee1c1303 ]
Before the drm driver had support for this file there was a driver that exposed the contents of the vga password register to userspace. It would present the entire register instead of interpreting it.
The drm implementation chose to mask of the lower bit, without explaining why. This breaks the existing userspace, which is looking for 0xa8 in the lower byte.
Change our implementation to expose the entire register.
--- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +1 -1
@@ -291,7 +291,7 @@ vga_pw_show(struct device *dev, struct device_attribute *attr, char *buf)if (rc)return rc; -return sprintf (buf,"%u\n" , reg &1 ); +return sprintf (buf,"%u\n" , reg); }static DEVICE_ATTR_RO (vga_pw);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 93/179 net: marvell: prestera: fix brige port operation
In reply to Greg Kroah-HartmanFrom: Volodymyr Mytnyk <[email protected]>
[ Upstream commit 253e9b4d11e577bb8cbc77ef68a9ff46438065ca ]
Return NOTIFY_DONE (dont't care) for switchdev notifications that prestera driver don't know how to handle them.
With introduction of SWITCHDEV_BRPORT_[UN]OFFLOADED switchdev events, the driver rejects adding swport to bridge operation which is handled by prestera_bridge_port_join() func. The root cause of this is that prestera driver returns error (EOPNOTSUPP) in prestera_switchdev_blk_event() handler for unknown swdev events. This causes switchdev_bridge_port_offload() to fail when adding port to bridge in prestera_bridge_port_join().
--- drivers/net/ethernet/marvell/prestera/prestera_switchdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/marvell/prestera/prestera_switchdev.c +1 -1
@@ -1124,7 +1124,7 @@ static int prestera_switchdev_blk_event(struct notifier_block *unused, prestera_port_obj_attr_set);break ;default : - err = -EOPNOTSUPP ; +return NOTIFY_DONE ; }return notifier_from_errno (err);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 94/179 net: marvell: prestera: fix double free issue on err path
In reply to Greg Kroah-HartmanFrom: Volodymyr Mytnyk <[email protected]>
[ Upstream commit e8d032507cb7912baf1d3e0af54516f823befefd ]
fix error path handling in prestera_bridge_port_join() that cases prestera driver to crash (see below).
Trace:
Internal error: Oops: 96000044 [#1] SMP
Modules linked in: prestera_pci prestera uio_pdrv_genirq
CPU: 1 PID: 881 Comm: ip Not tainted 5.15.0 #1
pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : prestera_bridge_destroy+0x2c/0xb0 [prestera]
lr : prestera_bridge_port_join+0x2cc/0x350 [prestera]
sp : ffff800011a1b0f0
...
x2 : ffff000109ca6c80 x1 : dead000000000100 x0 : dead000000000122
Call trace:
prestera_bridge_destroy+0x2c/0xb0 [prestera]
prestera_bridge_port_join+0x2cc/0x350 [prestera]
prestera_netdev_port_event.constprop.0+0x3c4/0x450 [prestera]
prestera_netdev_event_handler+0xf4/0x110 [prestera]
raw_notifier_call_chain+0x54/0x80
call_netdevice_notifiers_info+0x54/0xa0
__netdev_upper_dev_link+0x19c/0x380--- drivers/net/ethernet/marvell/prestera/prestera_switchdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/marvell/prestera/prestera_switchdev.c +2 -4
@@ -497,8 +497,8 @@ int prestera_bridge_port_join(struct net_device *br_dev, br_port =prestera_bridge_port_add (bridge, port->dev);if (IS_ERR (br_port)) { - err =PTR_ERR (br_port); - goto err_brport_create; +prestera_bridge_put (bridge); +return PTR_ERR (br_port); } err = switchdev_bridge_port_offload(br_port->dev, port->dev, NULL,
@@ -519,8 +519,6 @@ int prestera_bridge_port_join(struct net_device *br_dev,switchdev_bridge_port_unoffload (br_port->dev,NULL ,NULL ,NULL ); err_switchdev_offload:prestera_bridge_port_put (br_port); -err_brport_create: -prestera_bridge_put (bridge);return err; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 95/179 HID: input: Fix parsing of HID_CP_CONSUMER_CONTROL fields
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 7fc48fd6b2c0acacd8130d83d2a037670d6192d2 ]
Fix parsing of HID_CP_CONSUMER_CONTROL fields which are not in the HID_CP_PROGRAMMABLEBUTTONS collection.
--- drivers/hid/hid-input.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/hid/hid-input.c +2 -3
@@ -650,10 +650,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel code +=KEY_MACRO1 ; else code += BTN_TRIGGER_HAPPY - 0x1e; - }else { - goto ignore; +break ; } -break ; + fallthrough;default :switch (field->physical) {case HID_GD_MOUSE :
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 96/179 HID: input: set usage type to key on keycode remap
In reply to Greg Kroah-HartmanFrom: Thomas Weißschuh <[email protected]>
[ Upstream commit 3e6a950d98366f5e716904e9a7e8ffc7ed638bd6 ]
When a scancode is manually remapped that previously was not handled as key, then the old usage type was incorrectly reused.
This caused issues on a "04b3:301b IBM Corp. SK-8815 Keyboard" which has marked some of its keys with an invalid HID usage. These invalid usage keys are being ignored since support for USB programmable buttons was added.
The scancodes are however remapped explicitly by the systemd hwdb to the keycodes that are printed on the physical buttons. During this mapping step the existing usage is retrieved which will be found with a default type of 0 (EV_SYN) instead of EV_KEY.
The events with the correct code but EV_SYN type are not forwarded to userspace.
This also leads to a kernel oops when trying to print the report descriptor via debugfs. hid_resolv_event() tries to resolve a EV_SYN event with an EV_KEY code which leads to an out-of-bounds access in the EV_SYN names array.
--- drivers/hid/hid-input.c | 1 + 1 file changed, 1 insertion(+)
drivers/hid/hid-input.c +1 -0
@@ -160,6 +160,7 @@ static int hidinput_setkeycode(struct input_dev *dev,if (usage) { *old_keycode = usage->type ==EV_KEY ? usage->code :KEY_RESERVED ; + usage->type =EV_KEY ; usage->code = ke->keycode;clear_bit (*old_keycode, dev->keybit);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 97/179 HID: magicmouse: prevent division by 0 on scroll
In reply to Greg Kroah-HartmanFrom: Claudia Pellegrino <[email protected]>
[ Upstream commit a1091118e0d6d84c2fdb94e6c397ac790bfb9dd6 ]
In hid_magicmouse, if the user has set scroll_speed to a value between 55 and 63 and scrolls seven times in quick succession, the step_hr variable in the magicmouse_emit_touch function becomes 0.
That causes a division by zero further down in the function when it does step_x_hr /= step_hr.
To reproduce, create /etc/modprobe.d/hid_magicmouse.conf with the following content:
``` options hid_magicmouse scroll_acceleration=1 scroll_speed=55 ```
Then reboot, connect a Magic Mouse and scroll seven times quickly. The system will freeze for a minute, and after that dmesg will confirm that a division by zero occurred.
Enforce a minimum of 1 for the variable so the high resolution step count can never reach 0 even at maximum scroll acceleration.
--- drivers/hid/hid-magicmouse.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/hid/hid-magicmouse.c +5 -2
@@ -256,8 +256,11 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tdaunsigned long now = jiffies;int step_x = msc->touches[id].scroll_x - x;int step_y = msc->touches[id].scroll_y - y; -int step_hr = ((64 - (int )scroll_speed) * msc->scroll_accel) / -SCROLL_HR_STEPS ; +int step_hr = +max_t (int, + ((64 - (int )scroll_speed) * msc->scroll_accel) / +SCROLL_HR_STEPS , +1 );int step_x_hr = msc->touches[id].scroll_x_hr - x;int step_y_hr = msc->touches[id].scroll_y_hr - y;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 98/179 iavf: Prevent changing static ITR values if adaptive moderation is on
In reply to Greg Kroah-HartmanFrom: Nitesh B Venkatesh <[email protected]>
[ Upstream commit e792779e6b639c182df91b46ac1e5803460b0b15 ]
Resolve being able to change static values on VF when adaptive interrupt moderation is enabled.
This problem is fixed by checking the interrupt settings is not a combination of change of static value while adaptive interrupt moderation is turned on.
Without this fix, the user would be able to change static values on VF with adaptive moderation enabled.
--- .../net/ethernet/intel/iavf/iavf_ethtool.c | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +26 -4
@@ -723,12 +723,31 @@ static int iavf_get_per_queue_coalesce(struct net_device *netdev, u32 queue,* * Change the ITR settings for a specific queue. **/ -static void iavf_set_itr_per_queue (struct iavf_adapter *adapter, -struct ethtool_coalesce *ec,int queue) +static int iavf_set_itr_per_queue (struct iavf_adapter *adapter, +struct ethtool_coalesce *ec,int queue) {struct iavf_ring *rx_ring = &adapter->rx_rings[queue];struct iavf_ring *tx_ring = &adapter->tx_rings[queue];struct iavf_q_vector *q_vector; +u16 itr_setting; + + itr_setting = rx_ring->itr_setting & ~IAVF_ITR_DYNAMIC ; + +if (ec->rx_coalesce_usecs != itr_setting && + ec->use_adaptive_rx_coalesce) { +netif_info (adapter, drv, adapter->netdev, +"Rx interrupt throttling cannot be changed if adaptive-rx is enabled\n" ); +return -EINVAL ; + } + + itr_setting = tx_ring->itr_setting & ~IAVF_ITR_DYNAMIC ; + +if (ec->tx_coalesce_usecs != itr_setting && + ec->use_adaptive_tx_coalesce) { +netif_info (adapter, drv, adapter->netdev, +"Tx interrupt throttling cannot be changed if adaptive-tx is enabled\n" ); +return -EINVAL ; + } rx_ring->itr_setting =ITR_REG_ALIGN (ec->rx_coalesce_usecs); tx_ring->itr_setting =ITR_REG_ALIGN (ec->tx_coalesce_usecs);
@@ -751,6 +770,7 @@ static void iavf_set_itr_per_queue(struct iavf_adapter *adapter,* the Tx and Rx ITR values based on the values we have entered * into the q_vector, no need to write the values now. */ +return 0 ; }/**
@@ -792,9 +812,11 @@ static int __iavf_set_coalesce(struct net_device *netdev,*/ if (queue <0 ) {for (i =0 ; i < adapter->num_active_queues; i++) -iavf_set_itr_per_queue (adapter, ec, i); +if (iavf_set_itr_per_queue (adapter, ec, i)) +return -EINVAL ; }else if (queue < adapter->num_active_queues) { -iavf_set_itr_per_queue (adapter, ec, queue); +if (iavf_set_itr_per_queue (adapter, ec, queue)) +return -EINVAL ; }else {netif_info (adapter, drv, netdev,"Invalid queue value, queue range is 0 - %d\n" , adapter->num_active_queues -1 );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 99/179 iavf: Fix refreshing iavf adapter stats on ethtool request
In reply to Greg Kroah-HartmanFrom: Jedrzej Jagielski <[email protected]>
[ Upstream commit 3b5bdd18eb76e7570d9bacbcab6828a9b26ae121 ]
Currently iavf adapter statistics are refreshed only in a watchdog task, triggered approximately every two seconds, which causes some ethtool requests to return outdated values.
Add explicit statistics refresh when requested by ethtool -S.
--- drivers/net/ethernet/intel/iavf/iavf.h | 2 ++ drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 3 +++ drivers/net/ethernet/intel/iavf/iavf_main.c | 18 ++++++++++++++++++ .../net/ethernet/intel/iavf/iavf_virtchnl.c | 2 ++ 4 files changed, 25 insertions(+)
drivers/net/ethernet/intel/iavf/iavf.h +2 -0
@@ -305,6 +305,7 @@ struct iavf_adapter {#define IAVF_FLAG_AQ_DEL_FDIR_FILTER BIT(26)#define IAVF_FLAG_AQ_ADD_ADV_RSS_CFG BIT(27)#define IAVF_FLAG_AQ_DEL_ADV_RSS_CFG BIT(28) +#define IAVF_FLAG_AQ_REQUEST_STATS BIT(29)/* OS defined structs */ struct net_device *netdev;
@@ -398,6 +399,7 @@ int iavf_up(struct iavf_adapter *adapter);void iavf_down (struct iavf_adapter *adapter);int iavf_process_config (struct iavf_adapter *adapter);void iavf_schedule_reset (struct iavf_adapter *adapter); +void iavf_schedule_request_stats (struct iavf_adapter *adapter);void iavf_reset (struct iavf_adapter *adapter);void iavf_set_ethtool_ops (struct net_device *netdev);void iavf_update_stats (struct iavf_adapter *adapter);
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +3 -0
@@ -354,6 +354,9 @@ static void iavf_get_ethtool_stats(struct net_device *netdev,struct iavf_adapter *adapter =netdev_priv (netdev);unsigned int i; +/* Explicitly request stats refresh */ +iavf_schedule_request_stats (adapter); +iavf_add_ethtool_stats (&data, adapter, iavf_gstrings_stats);rcu_read_lock ();
drivers/net/ethernet/intel/iavf/iavf_main.c +18 -0
@@ -165,6 +165,19 @@ void iavf_schedule_reset(struct iavf_adapter *adapter) } } +/** +* iavf_schedule_request_stats - Set the flags and schedule statistics request +* @adapter: board private structure +* +* Sets IAVF_FLAG_AQ_REQUEST_STATS flag so iavf_watchdog_task() will explicitly +* request and refresh ethtool stats +**/ +void iavf_schedule_request_stats (struct iavf_adapter *adapter) +{ + adapter->aq_required |=IAVF_FLAG_AQ_REQUEST_STATS ; +mod_delayed_work (iavf_wq, &adapter->watchdog_task,0 ); +} +/** * iavf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure
@@ -1700,6 +1713,11 @@ static int iavf_process_aq_command(struct iavf_adapter *adapter)iavf_del_adv_rss_cfg (adapter);return 0 ; } +if (adapter->aq_required &IAVF_FLAG_AQ_REQUEST_STATS ) { +iavf_request_stats (adapter); +return 0 ; + } +return -EAGAIN ; }
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +2 -0
@@ -784,6 +784,8 @@ void iavf_request_stats(struct iavf_adapter *adapter)/* no error message, this isn't crucial */ return ; } + + adapter->aq_required &= ~IAVF_FLAG_AQ_REQUEST_STATS ; adapter->current_op =VIRTCHNL_OP_GET_STATS ; vqs.vsi_id = adapter->vsi_res->vsi_id;/* queue maps are ignored for this message - only the vsi is used */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 100/179 iavf: Fix VLAN feature flags after VFR
In reply to Greg Kroah-HartmanFrom: Brett Creeley <[email protected]>
[ Upstream commit 5951a2b9812d8227d33f20d1899fae60e4f72c04 ]
When a VF goes through a reset, it's possible for the VF's feature set to change. For example it may lose the VIRTCHNL_VF_OFFLOAD_VLAN capability after VF reset. Unfortunately, the driver doesn't correctly deal with this situation and errors are seen from downing/upping the interface and/or moving the interface in/out of a network namespace.
When setting the interface down/up we see the following errors after the VIRTCHNL_VF_OFFLOAD_VLAN capability was taken away from the VF:
ice 0000:51:00.1: VF 1 failed opcode 12, retval: -64 iavf 0000:51:09.1:
Failed to add VLAN filter, error IAVF_NOT_SUPPORTED ice 0000:51:00.1: VF 1 failed opcode 13, retval: -64 iavf 0000:51:09.1: Failed to delete VLAN filter, error IAVF_NOT_SUPPORTED
These add/delete errors are happening because the VLAN filters are tracked internally to the driver and regardless of the VLAN_ALLOWED() setting the driver tries to delete/re-add them over virtchnl.
Fix the delete failure by making sure to delete any VLAN filter tracking in the driver when a removal request is made, while preventing the virtchnl request. This makes it so the driver's VLAN list is up to date and the errors are
Fix the add failure by making sure the check for VLAN_ALLOWED() during reset is done after the VF receives its capability list from the PF via VIRTCHNL_OP_GET_VF_RESOURCES. If VLAN functionality is not allowed, then prevent requesting re-adding the filters over virtchnl.
When moving the interface into a network namespace we see the following errors after the VIRTCHNL_VF_OFFLOAD_VLAN capability was taken away from the VF:
iavf 0000:51:09.1 enp81s0f1v1: NIC Link is Up Speed is 25 Gbps Full Duplex
iavf 0000:51:09.1 temp_27: renamed from enp81s0f1v1
iavf 0000:51:09.1 mgmt: renamed from temp_27
iavf 0000:51:09.1 dev27: set_features() failed (-22); wanted 0x020190001fd54833, left 0x020190001fd54bb3
These errors are happening because we aren't correctly updating the netdev capabilities and dealing with ndo_fix_features() and ndo_set_features() correctly.
Fix this by only reporting errors in the driver's ndo_set_features() callback when VIRTCHNL_VF_OFFLOAD_VLAN is not allowed and any attempt to enable the VLAN features is made. Also, make sure to disable VLAN insertion, filtering, and stripping since the VIRTCHNL_VF_OFFLOAD_VLAN flag applies to all of them and not just VLAN stripping.
Also, after we process the capabilities in the VF reset path, make sure to call netdev_update_features() in case the capabilities have changed in order to update the netdev's feature set to match the VF's actual capabilities.
Lastly, make sure to always report success on VLAN filter delete when VIRTCHNL_VF_OFFLOAD_VLAN is not supported. The changed flow in iavf_del_vlans() allows the stack to delete previosly existing VLAN filters even if VLAN filtering is not allowed. This makes it so the VLAN filter list is up to date.
--- drivers/net/ethernet/intel/iavf/iavf.h | 1 + drivers/net/ethernet/intel/iavf/iavf_main.c | 33 ++++++-------- .../net/ethernet/intel/iavf/iavf_virtchnl.c | 45 +++++++++++++++++-- 3 files changed, 56 insertions(+), 23 deletions(-)
drivers/net/ethernet/intel/iavf/iavf.h +1 -0
@@ -457,4 +457,5 @@ void iavf_add_adv_rss_cfg(struct iavf_adapter *adapter);void iavf_del_adv_rss_cfg (struct iavf_adapter *adapter);struct iavf_mac_filter *iavf_add_filter (struct iavf_adapter *adapter,const u8 *macaddr); +int iavf_lock_timeout (struct mutex *lock,unsigned int msecs);#endif /* _IAVF_H_ */
drivers/net/ethernet/intel/iavf/iavf_main.c +13 -20
@@ -138,7 +138,7 @@ enum iavf_status iavf_free_virt_mem_d(struct iavf_hw *hw,* * Returns 0 on success, negative on failure **/ -static int iavf_lock_timeout (struct mutex *lock,unsigned int msecs) +int iavf_lock_timeout (struct mutex *lock,unsigned int msecs) {unsigned int wait, delay =10 ;
@@ -708,13 +708,11 @@ static void iavf_del_vlan(struct iavf_adapter *adapter, u16 vlan)**/ static void iavf_restore_filters (struct iavf_adapter *adapter) { -/* re-add all VLAN filters */ -if (VLAN_ALLOWED (adapter)) { -u16 vid; +u16 vid; -for_each_set_bit (vid, adapter->vsi.active_vlans,VLAN_N_VID ) -iavf_add_vlan (adapter, vid); - } +/* re-add all VLAN filters */ +for_each_set_bit (vid, adapter->vsi.active_vlans,VLAN_N_VID ) +iavf_add_vlan (adapter, vid); }/**
@@ -749,9 +747,6 @@ static int iavf_vlan_rx_kill_vid(struct net_device *netdev, {struct iavf_adapter *adapter =netdev_priv (netdev); -if (!VLAN_ALLOWED (adapter)) -return -EIO ; -iavf_del_vlan (adapter, vid);clear_bit (vid, adapter->vsi.active_vlans);
@@ -2142,7 +2137,6 @@ static void iavf_reset_task(struct work_struct *work)struct net_device *netdev = adapter->netdev;struct iavf_hw *hw = &adapter->hw;struct iavf_mac_filter *f, *ftmp; -struct iavf_vlan_filter *vlf;struct iavf_cloud_filter *cf;u32 reg_val;int i =0 , err;
@@ -2282,11 +2276,6 @@ static void iavf_reset_task(struct work_struct *work)list_for_each_entry (f, &adapter->mac_filter_list, list) { f->add = true; } -/* re-add all VLAN filters */ -list_for_each_entry (vlf, &adapter->vlan_filter_list, list) { - vlf->add = true; - } -spin_unlock_bh (&adapter->mac_vlan_list_lock);/* check if TCs are running and re-add all cloud filters */
@@ -2300,7 +2289,6 @@ static void iavf_reset_task(struct work_struct *work)spin_unlock_bh (&adapter->cloud_filter_list_lock); adapter->aq_required |=IAVF_FLAG_AQ_ADD_MAC_FILTER ; - adapter->aq_required |=IAVF_FLAG_AQ_ADD_VLAN_FILTER ; adapter->aq_required |=IAVF_FLAG_AQ_ADD_CLOUD_FILTER ;iavf_misc_irq_enable (adapter);
@@ -3398,11 +3386,16 @@ static int iavf_set_features(struct net_device *netdev, {struct iavf_adapter *adapter =netdev_priv (netdev); -/* Don't allow changing VLAN_RX flag when adapter is not capable -* of VLAN offload +/* Don't allow enabling VLAN features when adapter is not capable +* of VLAN offload/filtering */ if (!VLAN_ALLOWED (adapter)) { -if ((netdev->features ^ features) &NETIF_F_HW_VLAN_CTAG_RX ) + netdev->hw_features &= ~(NETIF_F_HW_VLAN_CTAG_RX | +NETIF_F_HW_VLAN_CTAG_TX | +NETIF_F_HW_VLAN_CTAG_FILTER ); +if (features & (NETIF_F_HW_VLAN_CTAG_RX | +NETIF_F_HW_VLAN_CTAG_TX | +NETIF_F_HW_VLAN_CTAG_FILTER ))return -EINVAL ; }else if ((netdev->features ^ features) &NETIF_F_HW_VLAN_CTAG_RX ) {if (features &NETIF_F_HW_VLAN_CTAG_RX )
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +42 -3
66 lines not on this page · raw message
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 101/179 x86/pvh: add prototype for xen_pvh_init()
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit 767216796cb9ae7f1e3bdf43a7b13b2bf100c2d2 ]
xen_pvh_init() is lacking a prototype in a header, add it.
--- arch/x86/include/asm/xen/hypervisor.h | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/include/asm/xen/hypervisor.h +4 -0
@@ -62,4 +62,8 @@ void xen_arch_register_cpu(int num);void xen_arch_unregister_cpu (int num);#endif +#ifdef CONFIG_PVH +void __init xen_pvh_init (struct boot_params *boot_params); +#endif +#endif /* _ASM_X86_XEN_HYPERVISOR_H */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 102/179 xen/pvh: add missing prototype to header
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
[ Upstream commit 2a0991929aba0a3dd6fe51d1daba06a93a96a021 ]
The prototype of mem_map_via_hcall() is missing in its header, so add it.
--- arch/x86/include/asm/xen/hypervisor.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/xen/hypervisor.h +1 -0
@@ -64,6 +64,7 @@ void xen_arch_unregister_cpu(int num);#ifdef CONFIG_PVH void __init xen_pvh_init (struct boot_params *boot_params); +void __init mem_map_via_hcall (struct boot_params *boot_params_p);#endif #endif /* _ASM_X86_XEN_HYPERVISOR_H */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 103/179 ALSA: intel-dsp-config: add quirk for JSL devices based on ES8336 codec
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit fa9730b4f28b7bd183d28a0bf636ab7108de35d7 ]
These devices are based on an I2C/I2S device, we need to force the use of the SOF driver otherwise the legacy HDaudio driver will be loaded - only HDMI will be supported.
We previously added support for other Intel platforms but missed JasperLake.
--- sound/hda/intel-dsp-config.c | 9 +++++++++ 1 file changed, 9 insertions(+)
sound/hda/intel-dsp-config.c +9 -0
@@ -299,6 +299,15 @@ static const struct config_entry config_table[] = { },#endif +/* JasperLake */ +#if IS_ENABLED(CONFIG_SND_SOC_SOF_JASPERLAKE) + { + .flags = FLAG_SOF, + .device = 0x4dc8, + .codec_hid = "ESSX8336", + }, +#endif + /* Tigerlake */ #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) {
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 104/179 mptcp: fix delack timer
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ee50e67ba0e17b1a1a8d76691d02eadf9e0f392c ]
To compute the rtx timeout schedule_3rdack_retransmission() does multiple things in the wrong way: srtt_us is measured in usec/8 and the timeout itself is an absolute value.
--- net/mptcp/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mptcp/options.c +2 -1
@@ -434,9 +434,10 @@ static void schedule_3rdack_retransmission(struct sock *sk)/* reschedule with a timeout above RTT, as we must look only for drop */ if (tp->srtt_us) - timeout = tp->srtt_us <<1 ; + timeout =usecs_to_jiffies (tp->srtt_us >> (3 -1 ));else timeout =TCP_TIMEOUT_INIT ; + timeout += jiffies;WARN_ON_ONCE (icsk->icsk_ack.pending &ICSK_ACK_TIMER ); icsk->icsk_ack.pending |=ICSK_ACK_SCHED |ICSK_ACK_TIMER ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 105/179 mptcp: use delegate action to schedule 3rd ack retrans
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit bcd97734318d1d87bb237dbc0a60c81237b0ac50 ]
Scheduling a delack in mptcp_established_options_mp() is not a good idea: such function is called by tcp_send_ack() and the pending delayed ack will be cleared shortly after by the tcp_event_ack_sent() call in __tcp_transmit_skb().
Instead use the mptcp delegated action infrastructure to schedule the delayed ack after the current bh processing completes.
Additionally moves the schedule_3rdack_retransmission() helper into protocol.c to avoid making it visible in a different compilation unit.
--- net/mptcp/options.c | 33 ++++++++-------------------- net/mptcp/protocol.c | 51 ++++++++++++++++++++++++++++++++++++-------- net/mptcp/protocol.h | 17 ++++++++------- 3 files changed, 60 insertions(+), 41 deletions(-)
net/mptcp/options.c +9 -24
@@ -422,29 +422,6 @@ bool mptcp_syn_options(struct sock *sk, const struct sk_buff *skb,return false; } -/* MP_JOIN client subflow must wait for 4th ack before sending any data: -* TCP can't schedule delack timer before the subflow is fully established. -* MPTCP uses the delack timer to do 3rd ack retransmissions -*/ -static void schedule_3rdack_retransmission (struct sock *sk) -{ -struct inet_connection_sock *icsk =inet_csk (sk); -struct tcp_sock *tp =tcp_sk (sk); -unsigned long timeout; - -/* reschedule with a timeout above RTT, as we must look only for drop */ -if (tp->srtt_us) - timeout =usecs_to_jiffies (tp->srtt_us >> (3 -1 )); -else - timeout =TCP_TIMEOUT_INIT ; - timeout += jiffies; - -WARN_ON_ONCE (icsk->icsk_ack.pending &ICSK_ACK_TIMER ); - icsk->icsk_ack.pending |=ICSK_ACK_SCHED |ICSK_ACK_TIMER ; - icsk->icsk_ack.timeout = timeout; -sk_reset_timer (sk, &icsk->icsk_delack_timer, timeout); -} -static void clear_3rdack_retransmission (struct sock *sk) {struct inet_connection_sock *icsk =inet_csk (sk);
@@ -527,7 +504,15 @@ static bool mptcp_established_options_mp(struct sock *sk, struct sk_buff *skb, *size =TCPOLEN_MPTCP_MPJ_ACK ;pr_debug ("subflow=%p" , subflow); -schedule_3rdack_retransmission (sk); +/* we can use the full delegate action helper only from BH context +* If we are in process context - sk is flushing the backlog at +* socket lock release time - just set the appropriate flag, will +* be handled by the release callback +*/ +if (sock_owned_by_user (sk)) +set_bit (MPTCP_DELEGATE_ACK , &subflow->delegated_status); +else +mptcp_subflow_delegate (subflow,MPTCP_DELEGATE_ACK );return true; }return false;
net/mptcp/protocol.c +42 -9
74 lines not on this page · raw message
net/mptcp/protocol.h +9 -8
@@ -401,6 +401,7 @@ struct mptcp_delegated_action { DECLARE_PER_CPU(struct mptcp_delegated_action, mptcp_delegated_actions);#define MPTCP_DELEGATE_SEND 0 +#define MPTCP_DELEGATE_ACK 1/* MPTCP subflow context */ struct mptcp_subflow_context {
@@ -506,23 +507,23 @@ static inline void mptcp_add_pending_subflow(struct mptcp_sock *msk,void mptcp_subflow_process_delegated (struct sock *ssk); -static inline void mptcp_subflow_delegate (struct mptcp_subflow_context *subflow) +static inline void mptcp_subflow_delegate (struct mptcp_subflow_context *subflow,int action) {struct mptcp_delegated_action *delegated;bool schedule; +/* the caller held the subflow bh socket lock */ +lockdep_assert_in_softirq (); +/* The implied barrier pairs with mptcp_subflow_delegated_done(), and * ensures the below list check sees list updates done prior to status * bit changes */ -if (!test_and_set_bit (MPTCP_DELEGATE_SEND , &subflow->delegated_status)) { +if (!test_and_set_bit (action, &subflow->delegated_status)) {/* still on delegated list from previous scheduling */ if (!list_empty (&subflow->delegated_node))return ; -/* the caller held the subflow bh socket lock */ -lockdep_assert_in_softirq (); - delegated =this_cpu_ptr (&mptcp_delegated_actions); schedule =list_empty (&delegated->head);list_add_tail (&subflow->delegated_node, &delegated->head);
@@ -547,16 +548,16 @@ mptcp_subflow_delegated_next(struct mptcp_delegated_action *delegated)static inline bool mptcp_subflow_has_delegated_action (const struct mptcp_subflow_context *subflow) { -return test_bit (MPTCP_DELEGATE_SEND , &subflow->delegated_status); +return !!READ_ONCE (subflow->delegated_status); } -static inline void mptcp_subflow_delegated_done (struct mptcp_subflow_context *subflow) +static inline void mptcp_subflow_delegated_done (struct mptcp_subflow_context *subflow,int action) {/* pairs with mptcp_subflow_delegate, ensures delegate_node is updated before * touching the status bit */ smp_wmb (); -clear_bit (MPTCP_DELEGATE_SEND , &subflow->delegated_status); +clear_bit (action, &subflow->delegated_status); }int mptcp_is_enabled (const struct net *net);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 106/179 af_unix: fix regression in read after shutdown
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
[ Upstream commit f9390b249c90a15a4d9e69fbfb7a53c860b1fcaf ]
On kernels before v5.15, calling read() on a unix socket after shutdown(SHUT_RD) or shutdown(SHUT_RDWR) would return the data previously written or EOF. But now, while read() after shutdown(SHUT_RD) still behaves the same way, read() after shutdown(SHUT_RDWR) always fails with -EINVAL.
This behaviour change was apparently inadvertently introduced as part of a bug fix for a different regression caused by the commit adding sockmap support to af_unix, commit 94531cfcbe79c359 ("af_unix: Add unix_stream_proto for sockmap"). Those commits, for unclear reasons, started setting the socket state to TCP_CLOSE on shutdown(SHUT_RDWR), while this state change had previously only been done in unix_release_sock().
Restore the original behaviour. The sockmap tests in tests/selftests/bpf continue to pass after this patch.
--- net/unix/af_unix.c | 3 --- 1 file changed, 3 deletions(-)
net/unix/af_unix.c +0 -3
@@ -2882,9 +2882,6 @@ static int unix_shutdown(struct socket *sock, int mode)unix_state_lock (sk); sk->sk_shutdown |= mode; -if ((sk->sk_type ==SOCK_STREAM || sk->sk_type ==SOCK_SEQPACKET ) && - mode ==SHUTDOWN_MASK ) - sk->sk_state =TCP_CLOSE ; other =unix_peer (sk);if (other)sock_hold (other);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 107/179 firmware: smccc: Fix check for ARCH_SOC_ID not implemented
In reply to Greg Kroah-HartmanFrom: Michael Kelley <[email protected]>
[ Upstream commit e95d8eaee21cd0d117d34125d4cdc97489c1ab82 ]
The ARCH_FEATURES function ID is a 32-bit SMC call, which returns a 32-bit result per the SMCCC spec. Current code is doing a 64-bit comparison against -1 (SMCCC_RET_NOT_SUPPORTED) to detect that the feature is unimplemented. That check doesn't work in a Hyper-V VM, where the upper 32-bits are zero as allowed by the spec.
Cast the result as an 'int' so the comparison works. The change also makes the code consistent with other similar checks in this file.
--- drivers/firmware/smccc/soc_id.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/smccc/soc_id.c +1 -1
@@ -50,7 +50,7 @@ static int __init smccc_soc_init(void)arm_smccc_1_1_invoke (ARM_SMCCC_ARCH_FEATURES_FUNC_ID ,ARM_SMCCC_ARCH_SOC_ID , &res); -if (res.a0 ==SMCCC_RET_NOT_SUPPORTED ) { +if ((int )res.a0 ==SMCCC_RET_NOT_SUPPORTED ) {pr_info ("ARCH_SOC_ID not implemented, skipping ....\n" );return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 108/179 ipv6: fix typos in __ip6_finish_output()
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 19d36c5f294879949c9d6f57cb61d39cc4c48553 ]
We deal with IPv6 packets, so we need to use IP6CB(skb)->flags and IP6SKB_REROUTED, instead of IPCB(skb)->flags and IPSKB_REROUTED
Found by code inspection, please double check that fixing this bug does not surface other bugs.
--- net/ipv6/ip6_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv6/ip6_output.c +1 -1
@@ -174,7 +174,7 @@ static int __ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff#if defined(CONFIG_NETFILTER ) && defined(CONFIG_XFRM )/* Policy lookup after SNAT yielded a new policy */ if (skb_dst (skb)->xfrm) { -IPCB (skb)->flags |=IPSKB_REROUTED ; +IP6CB (skb)->flags |=IP6SKB_REROUTED ;return dst_output (net, sk, skb); }#endif
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 109/179 nfp: checking parameter process for rx-usecs/tx-usecs is invalid
In reply to Greg Kroah-HartmanFrom: Diana Wang <[email protected]>
[ Upstream commit 3bd6b2a838ba6a3b86d41b077f570b1b61174def ]
Use nn->tlv_caps.me_freq_mhz instead of nn->me_freq_mhz to check whether rx-usecs/tx-usecs is valid.
This is because nn->tlv_caps.me_freq_mhz represents the clock_freq (MHz) of the flow processing cores (FPC) on the NIC. While nn->me_freq_mhz is not be set.
--- drivers/net/ethernet/netronome/nfp/nfp_net.h | 3 --- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_net.h +0 -3
@@ -565,7 +565,6 @@ struct nfp_net_dp {* @exn_name: Name for Exception interrupt * @shared_handler: Handler for shared interrupts * @shared_name: Name for shared interrupt -* @me_freq_mhz: ME clock_freq (MHz) * @reconfig_lock: Protects @reconfig_posted, @reconfig_timer_active, * @reconfig_sync_present and HW reconfiguration request * regs/machinery from async requests (sync must take
@@ -650,8 +649,6 @@ struct nfp_net {irq_handler_t shared_handler;char shared_name[IFNAMSIZ +8 ]; -u32 me_freq_mhz; -bool link_up;spinlock_t link_status_lock;
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +1 -1
@@ -1343,7 +1343,7 @@ static int nfp_net_set_coalesce(struct net_device *netdev,* ME timestamp ticks. There are 16 ME clock cycles for each timestamp * count. */ - factor = nn->me_freq_mhz /16 ; + factor = nn->tlv_caps.me_freq_mhz /16 ;/* Each pair of (usecs, max_frames) fields specifies that interrupts * should be coalesced until
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 110/179 net: stmmac: retain PTP clock time during SIOCSHWTSTAMP ioctls
In reply to Greg Kroah-HartmanFrom: Holger Assmann <[email protected]>
[ Upstream commit a6da2bbb0005e6b4909472962c9d0af29e75dd06 ]
Currently, when user space emits SIOCSHWTSTAMP ioctl calls such as enabling/disabling timestamping or changing filter settings, the driver reads the current CLOCK_REALTIME value and programming this into the NIC's hardware clock. This might be necessary during system initialization, but at runtime, when the PTP clock has already been synchronized to a grandmaster, a reset of the timestamp settings might result in a clock jump. Furthermore, if the clock is also controlled by phc2sys in automatic mode (where the UTC offset is queried from ptp4l), that UTC-to-TAI offset (currently 37 seconds in 2021) would be temporarily reset to 0, and it would take a long time for phc2sys to readjust so that CLOCK_REALTIME and the PHC are apart by 37 seconds again.
To address the issue, we introduce a new function called stmmac_init_tstamp_counter(), which gets called during ndo_open(). It contains the code snippet moved from stmmac_hwtstamp_set() that manages the time synchronization. Besides, the sub second increment configuration is also moved here since the related values are hardware dependent and runtime invariant.
Furthermore, the hardware clock must be kept running even when no time stamping mode is selected in order to retain the synchronized time base. That way, timestamping can be enabled again at any time only with the need to compensate the clock's natural drifting.
As a side effect, this patch fixes the issue that ptp_clock_info::enable can be called before SIOCSHWTSTAMP and the driver (which looks at priv->systime_flags) was not prepared to handle that ordering.
--- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + .../net/ethernet/stmicro/stmmac/stmmac_main.c | 125 +++++++++++------- .../ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- 3 files changed, 81 insertions(+), 47 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac.h +1 -0
@@ -314,6 +314,7 @@ int stmmac_mdio_reset(struct mii_bus *mii);int stmmac_xpcs_setup (struct mii_bus *mii);void stmmac_set_ethtool_ops (struct net_device *netdev); +int stmmac_init_tstamp_counter (struct stmmac_priv *priv,u32 systime_flags);void stmmac_ptp_register (struct stmmac_priv *priv);void stmmac_ptp_unregister (struct stmmac_priv *priv);int stmmac_open (struct net_device *dev);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +79 -46
171 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +1 -1
@@ -816,7 +816,7 @@ static int __maybe_unused stmmac_pltfr_noirq_resume(struct device *dev)if (ret)return ret; -clk_prepare_enable (priv->plat->clk_ptp_ref); +stmmac_init_tstamp_counter (priv, priv->systime_flags); }return 0 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 111/179 net: ipv6: add fib6_nh_release_dsts stub
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
[ Upstream commit 8837cbbf854246f5f4d565f21e6baa945d37aded ]
We need a way to release a fib6_nh's per-cpu dsts when replacing nexthops otherwise we can end up with stale per-cpu dsts which hold net device references, so add a new IPv6 stub called fib6_nh_release_dsts. It must be used after an RCU grace period, so no new dsts can be created through a group's nexthop entry.
Similar to fib6_nh_release it shouldn't be used if fib6_nh_init has failed so it doesn't need a dummy stub when IPv6 is not enabled.
--- include/net/ip6_fib.h | 1 + include/net/ipv6_stubs.h | 1 + net/ipv6/af_inet6.c | 1 + net/ipv6/route.c | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+)
include/net/ip6_fib.h +1 -0
@@ -485,6 +485,7 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, struct fib6_config *cfg, gfp_t gfp_flags, struct netlink_ext_ack *extack);void fib6_nh_release (struct fib6_nh *fib6_nh); +void fib6_nh_release_dsts (struct fib6_nh *fib6_nh); int call_fib6_entry_notifiers(struct net *net, enum fib_event_type event_type,
include/net/ipv6_stubs.h +1 -0
@@ -47,6 +47,7 @@ struct ipv6_stub { struct fib6_config *cfg, gfp_t gfp_flags, struct netlink_ext_ack *extack);void (*fib6_nh_release)(struct fib6_nh *fib6_nh); +void (*fib6_nh_release_dsts)(struct fib6_nh *fib6_nh);void (*fib6_update_sernum)(struct net *net,struct fib6_info *rt);int (*ip6_del_rt)(struct net *net,struct fib6_info *rt,bool skip_notify); void (*fib6_rt_update)(struct net *net, struct fib6_info *rt,
net/ipv6/af_inet6.c +1 -0
@@ -1026,6 +1026,7 @@ static const struct ipv6_stub ipv6_stub_impl = { .ip6_mtu_from_fib6 = ip6_mtu_from_fib6, .fib6_nh_init = fib6_nh_init, .fib6_nh_release = fib6_nh_release, + .fib6_nh_release_dsts = fib6_nh_release_dsts, .fib6_update_sernum = fib6_update_sernum_stub, .fib6_rt_update = fib6_rt_update, .ip6_del_rt = ip6_del_rt,
net/ipv6/route.c +19 -0
@@ -3680,6 +3680,25 @@ void fib6_nh_release(struct fib6_nh *fib6_nh)fib_nh_common_release (&fib6_nh->nh_common); } +void fib6_nh_release_dsts (struct fib6_nh *fib6_nh) +{ +int cpu; + +if (!fib6_nh->rt6i_pcpu) +return ; + +for_each_possible_cpu (cpu) { +struct rt6_info *pcpu_rt, **ppcpu_rt; + + ppcpu_rt =per_cpu_ptr (fib6_nh->rt6i_pcpu, cpu); + pcpu_rt =xchg (ppcpu_rt,NULL ); +if (pcpu_rt) { +dst_dev_put (&pcpu_rt->dst); +dst_release (&pcpu_rt->dst); + } + } +} +static struct fib6_info *ip6_route_info_create (struct fib6_config *cfg,gfp_t gfp_flags,struct netlink_ext_ack *extack)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 112/179 net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group
In reply to Greg Kroah-HartmanFrom: Nikolay Aleksandrov <[email protected]>
[ Upstream commit 1005f19b9357b81aa64e1decd08d6e332caaa284 ]
When replacing a nexthop group, we must release the IPv6 per-cpu dsts of the removed nexthop entries after an RCU grace period because they contain references to the nexthop's net device and to the fib6 info. With specific series of events[1] we can reach net device refcount imbalance which is unrecoverable. IPv4 is not affected because dsts don't take a refcount on the route.
[1]
$ ip nexthop list
id 200 via 2002:db8::2 dev bridge.10 scope link onlink
id 201 via 2002:db8::3 dev bridge scope link onlink
id 203 group 201/200
$ ip -6 route
2001:db8::10 nhid 203 metric 1024 pref medium
nexthop via 2002:db8::3 dev bridge weight 1 onlink
nexthop via 2002:db8::2 dev bridge.10 weight 1 onlinkCreate rt6_info through one of the multipath legs, e.g.:
$ taskset -a -c 1 ./pkt_inj 24 bridge.10 2001:db8::10 (pkt_inj is just a custom packet generator, nothing special)
Then remove that leg from the group by replace (let's assume it is id 200 in this case):
$ ip nexthop replace id 203 group 201
Now remove the IPv6 route:
$ ip -6 route del 2001:db8::10/128
The route won't be really deleted due to the stale rt6_info holding 1 refcnt in nexthop id 200.
At this point we have the following reference count dependency:
(deleted) IPv6 route holds 1 reference over nhid 203
nh 203 holds 1 ref over id 201
nh 200 holds 1 ref over the net device and the route due to the stale rt6_info
Now to create circular dependency between nh 200 and the IPv6 route, and also to get a reference over nh 200, restore nhid 200 in the group:
$ ip nexthop replace id 203 group 201/200
And now we have a permanent circular dependncy because nhid 203 holds a reference over nh 200 and 201, but the route holds a ref over nh 203 and is deleted.
To trigger the bug just delete the group (nhid 203):
$ ip nexthop del id 203
It won't really be deleted due to the IPv6 route dependency, and now we have 2 unlinked and deleted objects that reference each other: the group and the IPv6 route. Since the group drops the reference it holds over its entries at free time (i.e. its own refcount needs to drop to 0) that will never happen and we get a permanent ref on them, since one of the entries holds a reference over the IPv6 route it will also never be released.
At this point the dependencies are:
(deleted, only unlinked) IPv6 route holds reference over group nh 203 (deleted, only unlinked) group nh 203 holds reference over nh 201 and 200 nh 200 holds 1 ref over the net device and the route due to the stale rt6_info
This is the last point where it can be fixed by running traffic through nh 200, and specifically through the same CPU so the rt6_info (dst) will get released due to the IPv6 genid, that in turn will free the IPv6 route, which in turn will free the ref count over the group nh 203.
If nh 200 is deleted at this point, it will never be released due to the ref from the unlinked group 203, it will only be unlinked:
$ ip nexthop del id 200 $ ip nexthop $
Now we can never release that stale rt6_info, we have IPv6 route with ref over group nh 203, group nh 203 with ref over nh 200 and 201, nh 200 with rt6_info (dst) with ref over the net device and the IPv6 route. All of these objects are only unlinked, and cannot be released, thus they can't release their ref counts.
Message from syslogd@dev at Nov 19 14:04:10 ...
kernel:[73501.828730] unregister_netdevice: waiting for bridge.10 to become free. Usage count = 3
Message from syslogd@dev at Nov 19 14:04:20 ...
kernel:[73512.068811] unregister_netdevice: waiting for bridge.10 to become free. Usage count = 3
--- net/ipv4/nexthop.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
net/ipv4/nexthop.c +23 -2
@@ -1899,15 +1899,36 @@ static void remove_nexthop(struct net *net, struct nexthop *nh,/* if any FIB entries reference this nexthop, any dst entries * need to be regenerated */ -static void nh_rt_cache_flush (struct net *net,struct nexthop *nh) +static void nh_rt_cache_flush (struct net *net,struct nexthop *nh, +struct nexthop *replaced_nh) {struct fib6_info *f6i; +struct nh_group *nhg; +int i;if (!list_empty (&nh->fi_list))rt_cache_flush (net);list_for_each_entry (f6i, &nh->f6i_list, nh_list) ipv6_stub->fib6_update_sernum (net, f6i); + +/* if an IPv6 group was replaced, we have to release all old +* dsts to make sure all refcounts are released +*/ +if (!replaced_nh->is_group) +return ; + +/* new dsts must use only the new nexthop group */ +synchronize_net (); + + nhg =rtnl_dereference (replaced_nh->nh_grp); +for (i =0 ; i < nhg->num_nh; i++) { +struct nh_grp_entry *nhge = &nhg->nh_entries[i]; +struct nh_info *nhi =rtnl_dereference (nhge->nh->nh_info); + +if (nhi->family ==AF_INET6 ) + ipv6_stub->fib6_nh_release_dsts (&nhi->fib6_nh); + } } static int replace_nexthop_grp(struct net *net, struct nexthop *old,
@@ -2247,7 +2268,7 @@ static int replace_nexthop(struct net *net, struct nexthop *old, err =replace_nexthop_single (net, old, new, extack);if (!err) { -nh_rt_cache_flush (net, old); +nh_rt_cache_flush (net, old, new);__remove_nexthop (net, new,NULL );nexthop_put (new);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 113/179 ice: fix vsi->txq_map sizing
In reply to Greg Kroah-HartmanFrom: Maciej Fijalkowski <[email protected]>
[ Upstream commit 792b2086584f25d84081a526beee80d103c2a913 ]
The approach of having XDP queue per CPU regardless of user's setting exposed a hidden bug that could occur in case when Rx queue count differ from Tx queue count. Currently vsi->txq_map's size is equal to the doubled vsi->alloc_txq, which is not correct due to the fact that XDP rings were previously based on the Rx queue count. Below splat can be seen when ethtool -L is used and XDP rings are configured:
[ 682.875339] BUG: kernel NULL pointer dereference, address: 000000000000000f [ 682.883403] #PF: supervisor read access in kernel mode [ 682.889345] #PF: error_code(0x0000) - not-present page [ 682.895289] PGD 0 P4D 0 [ 682.898218] Oops: 0000 [#1] PREEMPT SMP PTI [ 682.903055] CPU: 42 PID: 2878 Comm: ethtool Tainted: G OE 5.15.0-rc5+ #1 [ 682.912214] Hardware name: Intel Corp. GRANTLEY/GRANTLEY, BIOS GRRFCRB1.86B.0276.D07.1605190235 05/19/2016 [ 682.923380] RIP: 0010:devres_remove+0x44/0x130 [ 682.928527] Code: 49 89 f4 55 48 89 fd 4c 89 ff 53 48 83 ec 10 e8 92 b9 49 00 48 8b 9d a8 02 00 00 48 8d 8d a0 02 00 00 49 89 c2 48 39 cb 74 0f <4c> 3b 63 10 74 25 48 8b 5b 08 48 39 cb 75 f1 4c 89 ff 4c 89 d6 e8 [ 682.950237] RSP: 0018:ffffc90006a679f0 EFLAGS: 00010002 [ 682.956285] RAX: 0000000000000286 RBX: ffffffffffffffff RCX: ffff88908343a370 [ 682.964538] RDX: 0000000000000001 RSI: ffffffff81690d60 RDI: 0000000000000000 [ 682.972789] RBP: ffff88908343a0d0 R08: 0000000000000000 R09: 0000000000000000 [ 682.981040] R10: 0000000000000286 R11: 3fffffffffffffff R12: ffffffff81690d60 [ 682.989282] R13: ffffffff81690a00 R14: ffff8890819807a8 R15: ffff88908343a36c [ 682.997535] FS: 00007f08c7bfa740(0000) GS:ffff88a03fd00000(0000) knlGS:0000000000000000 [ 683.006910] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 683.013557] CR2: 000000000000000f CR3: 0000001080a66003 CR4: 00000000003706e0 [ 683.021819] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 683.030075] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 683.038336] Call Trace: [ 683.041167] devm_kfree+0x33/0x50 [ 683.045004] ice_vsi_free_arrays+0x5e/0xc0 [ice] [ 683.050380] ice_vsi_rebuild+0x4c8/0x750 [ice] [ 683.055543] ice_vsi_recfg_qs+0x9a/0x110 [ice] [ 683.060697] ice_set_channels+0x14f/0x290 [ice] [ 683.065962] ethnl_set_channels+0x333/0x3f0 [ 683.070807] genl_family_rcv_msg_doit+0xea/0x150 [ 683.076152] genl_rcv_msg+0xde/0x1d0 [ 683.080289] ? channels_prepare_data+0x60/0x60 [ 683.085432] ? genl_get_cmd+0xd0/0xd0 [ 683.089667] netlink_rcv_skb+0x50/0xf0 [ 683.094006] genl_rcv+0x24/0x40 [ 683.097638] netlink_unicast+0x239/0x340 [ 683.102177] netlink_sendmsg+0x22e/0x470 [ 683.106717] sock_sendmsg+0x5e/0x60 [ 683.110756] __sys_sendto+0xee/0x150 [ 683.114894] ? handle_mm_fault+0xd0/0x2a0 [ 683.119535] ? do_user_addr_fault+0x1f3/0x690 [ 683.134173] __x64_sys_sendto+0x25/0x30 [ 683.148231] do_syscall_64+0x3b/0xc0 [ 683.161992] entry_SYSCALL_64_after_hwframe+0x44/0xae
Fix this by taking into account the value that num_possible_cpus() yields in addition to vsi->alloc_txq instead of doubling the latter.
--- drivers/net/ethernet/intel/ice/ice_lib.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_lib.c +7 -2
@@ -83,8 +83,13 @@ static int ice_vsi_alloc_arrays(struct ice_vsi *vsi)if (!vsi->rx_rings) goto err_rings; -/* XDP will have vsi->alloc_txq Tx queues as well, so double the size */ - vsi->txq_map =devm_kcalloc (dev, (2 * vsi->alloc_txq), +/* txq_map needs to have enough space to track both Tx (stack) rings +* and XDP rings; at this point vsi->num_xdp_txq might not be set, +* so use num_possible_cpus() as we want to always provide XDP ring +* per CPU, regardless of queue count settings from user that might +* have come from ethtool's set_channels() callback; +*/ + vsi->txq_map =devm_kcalloc (dev, (vsi->alloc_txq +num_possible_cpus ()),sizeof (*vsi->txq_map),GFP_KERNEL );if (!vsi->txq_map)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 114/179 ice: avoid bpf_prog refcount underflow
In reply to Greg Kroah-HartmanFrom: Marta Plantykow <[email protected]>
[ Upstream commit f65ee535df775a13a1046c0a0b2d72db342f8a5b ]
Ice driver has the routines for managing XDP resources that are shared between ndo_bpf op and VSI rebuild flow. The latter takes place for example when user changes queue count on an interface via ethtool's set_channels().
There is an issue around the bpf_prog refcounting when VSI is being rebuilt - since ice_prepare_xdp_rings() is called with vsi->xdp_prog as an argument that is used later on by ice_vsi_assign_bpf_prog(), same bpf_prog pointers are swapped with each other. Then it is also interpreted as an 'old_prog' which in turn causes us to call bpf_prog_put on it that will decrement its refcount.
Below splat can be interpreted in a way that due to zero refcount of a bpf_prog it is wiped out from the system while kernel still tries to refer to it:
[ 481.069429] BUG: unable to handle page fault for address: ffffc9000640f038 [ 481.077390] #PF: supervisor read access in kernel mode [ 481.083335] #PF: error_code(0x0000) - not-present page [ 481.089276] PGD 100000067 P4D 100000067 PUD 1001cb067 PMD 106d2b067 PTE 0 [ 481.097141] Oops: 0000 [#1] PREEMPT SMP PTI [ 481.101980] CPU: 12 PID: 3339 Comm: sudo Tainted: G OE 5.15.0-rc5+ #1 [ 481.110840] Hardware name: Intel Corp. GRANTLEY/GRANTLEY, BIOS GRRFCRB1.86B.0276.D07.1605190235 05/19/2016 [ 481.122021] RIP: 0010:dev_xdp_prog_id+0x25/0x40 [ 481.127265] Code: 80 00 00 00 00 0f 1f 44 00 00 89 f6 48 c1 e6 04 48 01 fe 48 8b 86 98 08 00 00 48 85 c0 74 13 48 8b 50 18 31 c0 48 85 d2 74 07 <48> 8b 42 38 8b 40 20 c3 48 8b 96 90 08 00 00 eb e8 66 2e 0f 1f 84 [ 481.148991] RSP: 0018:ffffc90007b63868 EFLAGS: 00010286 [ 481.155034] RAX: 0000000000000000 RBX: ffff889080824000 RCX: 0000000000000000 [ 481.163278] RDX: ffffc9000640f000 RSI: ffff889080824010 RDI: ffff889080824000 [ 481.171527] RBP: ffff888107af7d00 R08: 0000000000000000 R09: ffff88810db5f6e0 [ 481.179776] R10: 0000000000000000 R11: ffff8890885b9988 R12: ffff88810db5f4bc [ 481.188026] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 [ 481.196276] FS: 00007f5466d5bec0(0000) GS:ffff88903fb00000(0000) knlGS:0000000000000000 [ 481.205633] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 481.212279] CR2: ffffc9000640f038 CR3: 000000014429c006 CR4: 00000000003706e0 [ 481.220530] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 481.228771] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 481.237029] Call Trace: [ 481.239856] rtnl_fill_ifinfo+0x768/0x12e0 [ 481.244602] rtnl_dump_ifinfo+0x525/0x650 [ 481.249246] ? __alloc_skb+0xa5/0x280 [ 481.253484] netlink_dump+0x168/0x3c0 [ 481.257725] netlink_recvmsg+0x21e/0x3e0 [ 481.262263] ____sys_recvmsg+0x87/0x170 [ 481.266707] ? __might_fault+0x20/0x30 [ 481.271046] ? _copy_from_user+0x66/0xa0 [ 481.275591] ? iovec_from_user+0xf6/0x1c0 [ 481.280226] ___sys_recvmsg+0x82/0x100 [ 481.284566] ? sock_sendmsg+0x5e/0x60 [ 481.288791] ? __sys_sendto+0xee/0x150 [ 481.293129] __sys_recvmsg+0x56/0xa0 [ 481.297267] do_syscall_64+0x3b/0xc0 [ 481.301395] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 481.307238] RIP: 0033:0x7f5466f39617 [ 481.311373] Code: 0c 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb bd 0f 1f 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 2f 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10 [ 481.342944] RSP: 002b:00007ffedc7f4308 EFLAGS: 00000246 ORIG_RAX: 000000000000002f [ 481.361783] RAX: ffffffffffffffda RBX: 00007ffedc7f5460 RCX: 00007f5466f39617 [ 481.380278] RDX: 0000000000000000 RSI: 00007ffedc7f5360 RDI: 0000000000000003 [ 481.398500] RBP: 00007ffedc7f53f0 R08: 0000000000000000 R09: 000055d556f04d50 [ 481.416463] R10: 0000000000000077 R11: 0000000000000246 R12: 00007ffedc7f5360 [ 481.434131] R13: 00007ffedc7f5350 R14: 00007ffedc7f5344 R15: 0000000000000e98 [ 481.451520] Modules linked in: ice(OE) af_packet binfmt_misc nls_iso8859_1 ipmi_ssif intel_rapl_msr intel_rapl_common x86_pkg_temp_thermal intel_powerclamp mxm_wmi mei_me coretemp mei ipmi_si ipmi_msghandler wmi acpi_pad acpi_power_meter ip_tables x_tables autofs4 crct10dif_pclmul crc32_pclmul ghash_clmulni_intel aesni_intel ahci crypto_simd cryptd libahci lpc_ich [last unloaded: ice] [ 481.528558] CR2: ffffc9000640f038 [ 481.542041] ---[ end trace d1f24c9ecf5b61c1 ]---
Fix this by only calling ice_vsi_assign_bpf_prog() inside ice_prepare_xdp_rings() when current vsi->xdp_prog pointer is NULL. This way set_channels() flow will not attempt to swap the vsi->xdp_prog pointers with itself.
Also, sprinkle around some comments that provide a reasoning about correlation between driver and kernel in terms of bpf_prog refcount.
--- drivers/net/ethernet/intel/ice/ice_main.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_main.c +17 -1
@@ -2497,7 +2497,18 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog) ice_stat_str(status)); goto clear_xdp_rings; } -ice_vsi_assign_bpf_prog (vsi, prog); + +/* assign the prog only when it's not already present on VSI; +* this flow is a subject of both ethtool -L and ndo_bpf flows; +* VSI rebuild that happens under ethtool -L can expose us to +* the bpf_prog refcount issues as we would be swapping same +* bpf_prog pointers from vsi->xdp_prog and calling bpf_prog_put +* on it as it would be treated as an 'old_prog'; for ndo_bpf +* this is not harmful as dev_xdp_install bumps the refcount +* before calling the op exposed by the driver; +*/ +if (!ice_is_xdp_ena_vsi (vsi)) +ice_vsi_assign_bpf_prog (vsi, prog);return 0 ; clear_xdp_rings:
@@ -2643,6 +2654,11 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,if (xdp_ring_err)NL_SET_ERR_MSG_MOD (extack,"Freeing XDP Tx resources failed" ); }else { +/* safe to call even when prog == vsi->xdp_prog as +* dev_xdp_install in net/core/dev.c incremented prog's +* refcount so corresponding bpf_prog_put won't cause +* underflow +*/ ice_vsi_assign_bpf_prog (vsi, prog); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 115/179 scsi: core: sysfs: Fix setting device state to SDEV_RUNNING
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit eb97545d6264b341b06ba7603f52ff6c0b2af6ea ]
This fixes an issue added in commit 4edd8cd4e86d ("scsi: core: sysfs: Fix hang when device state is set via sysfs") where if userspace is requesting to set the device state to SDEV_RUNNING when the state is already SDEV_RUNNING, we return -EINVAL instead of count. The commmit above set ret to count for this case, when it should have set it to 0.
--- drivers/scsi/scsi_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/scsi_sysfs.c +1 -1
@@ -817,7 +817,7 @@ store_state_field(struct device *dev, struct device_attribute *attr,mutex_lock (&sdev->state_mutex);if (sdev->sdev_state ==SDEV_RUNNING && state ==SDEV_RUNNING ) { - ret = count; + ret =0 ; }else { ret =scsi_device_set_state (sdev, state);if (ret ==0 && state ==SDEV_RUNNING )
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 116/179 scsi: scsi_debug: Zero clear zones at reset write pointer
In reply to Greg Kroah-HartmanFrom: Shin'ichiro Kawasaki <[email protected]>
[ Upstream commit 2d62253eb1b60f4ce8b39125eee282739b519297 ]
When a reset is requested the position of the write pointer is updated but the data in the corresponding zone is not cleared. Instead scsi_debug returns any data written before the write pointer was reset. This is an error and prevents using scsi_debug for stale page cache testing of the BLKRESETZONE ioctl.
Zero written data in the zone when resetting the write pointer.
--- drivers/scsi/scsi_debug.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/scsi/scsi_debug.c +5 -0
@@ -4649,6 +4649,7 @@ static void zbc_rwp_zone(struct sdebug_dev_info *devip, struct sdeb_zone_state *zsp) {enum sdebug_z_cond zc; +struct sdeb_store_info *sip =devip2sip (devip, false);if (zbc_zone_is_conv (zsp))return ;
@@ -4660,6 +4661,10 @@ static void zbc_rwp_zone(struct sdebug_dev_info *devip,if (zsp->z_cond ==ZC4_CLOSED ) devip->nr_closed--; +if (zsp->z_wp > zsp->z_start) +memset (sip->storep + zsp->z_start * sdebug_sector_size,0 , + (zsp->z_wp - zsp->z_start) * sdebug_sector_size); + zsp->z_non_seq_resource = false; zsp->z_wp = zsp->z_start; zsp->z_cond =ZC1_EMPTY ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 117/179 erofs: fix deadlock when shrink erofs slab
In reply to Greg Kroah-HartmanFrom: Huang Jianan <[email protected]>
[ Upstream commit 57bbeacdbee72a54eb97d56b876cf9c94059fc34 ]
We observed the following deadlock in the stress test under low memory scenario:
Thread A Thread B
- erofs_shrink_scan
- erofs_try_to_release_workgroup
- erofs_workgroup_try_to_freeze -- A
- z_erofs_do_read_page
- z_erofs_collection_begin
- z_erofs_register_collection
- erofs_insert_workgroup
- xa_lock(&sbi->managed_pslots) -- B
- erofs_workgroup_get
- erofs_wait_on_workgroup_freezed -- A
- xa_erase
- xa_lock(&sbi->managed_pslots) -- B
To fix this, it needs to hold xa_lock before freezing the workgroup since xarray will be touched then. So let's hold the lock before accessing each workgroup, just like what we did with the radix tree before.
[ Gao Xiang: Jianhua Hao also reports this issue at
https://lore.kernel.org/r/[email protected] ]
--- fs/erofs/utils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
fs/erofs/utils.c +6 -2
@@ -141,7 +141,7 @@ static bool erofs_try_to_release_workgroup(struct erofs_sb_info *sbi,* however in order to avoid some race conditions, add a * DBG_BUGON to observe this in advance. */ -DBG_BUGON (xa_erase (&sbi->managed_pslots, grp->index) != grp); +DBG_BUGON (__xa_erase (&sbi->managed_pslots, grp->index) != grp);/* last refcount should be connected with its managed pslot. */ erofs_workgroup_unfreeze (grp,0 );
@@ -156,15 +156,19 @@ static unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi,unsigned int freed =0 ;unsigned long index; +xa_lock (&sbi->managed_pslots);xa_for_each (&sbi->managed_pslots, index, grp) {/* try to shrink each valid workgroup */ if (!erofs_try_to_release_workgroup (sbi, grp))continue ; +xa_unlock (&sbi->managed_pslots); ++freed;if (!--nr_shrink) -break ; +return freed; +xa_lock (&sbi->managed_pslots); } +xa_unlock (&sbi->managed_pslots);return freed; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 118/179 i2c: virtio: disable timeout handling
In reply to Greg Kroah-HartmanFrom: Vincent Whitchurch <[email protected]>
[ Upstream commit 84e1d0bf1d7121759622dabf8fbef4c99ad597c5 ]
If a timeout is hit, it can result is incorrect data on the I2C bus and/or memory corruptions in the guest since the device can still be operating on the buffers it was given while the guest has freed them.
Here is, for example, the start of a slub_debug splat which was triggered on the next transfer after one transfer was forced to timeout by setting a breakpoint in the backend (rust-vmm/vhost-device):
BUG kmalloc-1k (Not tainted): Poison overwritten First byte 0x1 instead of 0x6b
Allocated in virtio_i2c_xfer+0x65/0x35c age=350 cpu=0 pid=29
__kmalloc+0xc2/0x1c9 virtio_i2c_xfer+0x65/0x35c __i2c_transfer+0x429/0x57d i2c_transfer+0x115/0x134 i2cdev_ioctl_rdwr+0x16a/0x1de i2cdev_ioctl+0x247/0x2ed vfs_ioctl+0x21/0x30 sys_ioctl+0xb18/0xb41 Freed in virtio_i2c_xfer+0x32e/0x35c age=244 cpu=0 pid=29 kfree+0x1bd/0x1cc virtio_i2c_xfer+0x32e/0x35c __i2c_transfer+0x429/0x57d i2c_transfer+0x115/0x134 i2cdev_ioctl_rdwr+0x16a/0x1de i2cdev_ioctl+0x247/0x2ed vfs_ioctl+0x21/0x30 sys_ioctl+0xb18/0xb41
There is no simple fix for this (the driver would have to always create bounce buffers and hold on to them until the device eventually returns the buffers), so just disable the timeout support for now.
--- drivers/i2c/busses/i2c-virtio.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-virtio.c +5 -9
@@ -106,11 +106,10 @@ static int virtio_i2c_prepare_reqs(struct virtqueue *vq,static int virtio_i2c_complete_reqs (struct virtqueue *vq,struct virtio_i2c_req *reqs, -struct i2c_msg *msgs,int num, -bool timedout) +struct i2c_msg *msgs,int num) {struct virtio_i2c_req *req; -bool failed = timedout; +bool failed = false;unsigned int len;int i, j =0 ;
@@ -132,7 +131,7 @@ static int virtio_i2c_complete_reqs(struct virtqueue *vq, j++; } -return timedout ? -ETIMEDOUT : j; +return j; } static int virtio_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
@@ -141,7 +140,6 @@ static int virtio_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,struct virtio_i2c *vi =i2c_get_adapdata (adap);struct virtqueue *vq = vi->vq;struct virtio_i2c_req *reqs; -unsigned long time_left;int count; reqs =kcalloc (num,sizeof (*reqs),GFP_KERNEL );
@@ -164,11 +162,9 @@ static int virtio_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,reinit_completion (&vi->completion);virtqueue_kick (vq); - time_left =wait_for_completion_timeout (&vi->completion, adap->timeout); -if (!time_left) -dev_err (&adap->dev,"virtio i2c backend timeout.\n" ); +wait_for_completion (&vi->completion); - count =virtio_i2c_complete_reqs (vq, reqs, msgs, count, !time_left); + count =virtio_i2c_complete_reqs (vq, reqs, msgs, count); err_free:kfree (reqs);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 119/179 net/smc: Ensure the active closing peer first closes clcsock
In reply to Greg Kroah-HartmanFrom: Tony Lu <[email protected]>
[ Upstream commit 606a63c9783a32a45bd2ef0eee393711d75b3284 ]
The side that actively closed socket, it's clcsock doesn't enter TIME_WAIT state, but the passive side does it. It should show the same behavior as TCP sockets.
Consider this, when client actively closes the socket, the clcsock in server enters TIME_WAIT state, which means the address is occupied and won't be reused before TIME_WAIT dismissing. If we restarted server, the service would be unavailable for a long time.
To solve this issue, shutdown the clcsock in [A], perform the TCP active close progress first, before the passive closed side closing it. So that the actively closed side enters TIME_WAIT, not the passive one.
Client | Server
close() // client actively close |
smc_release() |
smc_close_active() // PEERCLOSEWAIT1 |
smc_close_final() // abort or closed = 1|
smc_cdc_get_slot_and_msg_send() |
[A] |
|smc_cdc_msg_recv_action() // ACTIVE
| queue_work(smc_close_wq, &conn->close_work)
| smc_close_passive_work() // PROCESSABORT or APPCLOSEWAIT1
| smc_close_passive_abort_received() // only in abort
|
|close() // server recv zero, close
| smc_release() // PROCESSABORT or APPCLOSEWAIT1
| smc_close_active()
| smc_close_abort() or smc_close_final() // CLOSED
| smc_cdc_get_slot_and_msg_send() // abort or closed = 1
smc_cdc_msg_recv_action() | smc_clcsock_release()
queue_work(smc_close_wq, &conn->close_work) | sock_release(tcp) // actively close clc, enter TIME_WAIT
smc_close_passive_work() // PEERCLOSEWAIT1 | smc_conn_free()
smc_close_passive_abort_received() // CLOSED|
smc_conn_free() |
smc_clcsock_release() |
sock_release(tcp) // passive close clc |--- net/smc/smc_close.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/smc/smc_close.c +6 -0
@@ -228,6 +228,12 @@ int smc_close_active(struct smc_sock *smc)/* send close request */ rc =smc_close_final (conn); sk->sk_state =SMC_PEERCLOSEWAIT1 ; + +/* actively shutdown clcsock before peer close it, +* prevent peer from entering TIME_WAIT state. +*/ +if (smc->clcsock && smc->clcsock->sk) + rc =kernel_sock_shutdown (smc->clcsock,SHUT_RDWR ); }else {/* peer event has changed the state */ goto again;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 120/179 mlxsw: spectrum: Protect driver from buggy firmware
In reply to Greg Kroah-HartmanFrom: Amit Cohen <[email protected]>
[ Upstream commit 63b08b1f6834bbb0b4f7783bf63b80c8c8e9a047 ]
When processing port up/down events generated by the device's firmware, the driver protects itself from events reported for non-existent local ports, but not the CPU port (local port 0), which exists, but lacks a netdev.
This can result in a NULL pointer dereference when calling netif_carrier_{on,off}().
Fix this by bailing early when processing an event reported for the CPU port. Problem was only observed when running on top of a buggy emulator.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +1 -1
@@ -2131,7 +2131,7 @@ static void mlxsw_sp_pude_event_func(const struct mlxsw_reg_info *reg, max_ports =mlxsw_core_max_ports (mlxsw_sp->core); local_port =mlxsw_reg_pude_local_port_get (pude_pl); -if (WARN_ON_ONCE (local_port >= max_ports)) +if (WARN_ON_ONCE (!local_port || local_port >= max_ports))return ; mlxsw_sp_port = mlxsw_sp->ports[local_port];if (!mlxsw_sp_port)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 121/179 net: ipa: directly disable ipa-setup-ready interrupt
In reply to Greg Kroah-HartmanFrom: Alex Elder <[email protected]>
[ Upstream commit 33a153100bb3459479bd95d3259c2915b53fefa8 ]
We currently maintain a "disabled" Boolean flag to determine whether the "ipa-setup-ready" SMP2P IRQ handler does anything. That flag must be accessed under protection of a mutex.
Instead, disable the SMP2P interrupt when requested, which prevents the interrupt handler from ever being called. More importantly, it synchronizes a thread disabling the interrupt with the completion of the interrupt handler in case they run concurrently.
Use the IPA setup_complete flag rather than the disabled flag in the handler to determine whether to ignore any interrupts arriving after the first.
Rename the "disabled" flag to be "setup_disabled", to be specific about its purpose.
--- drivers/net/ipa/ipa_smp2p.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/net/ipa/ipa_smp2p.c +9 -10
@@ -53,7 +53,7 @@* @setup_ready_irq: IPA interrupt triggered by modem to signal GSI ready * @power_on: Whether IPA power is on * @notified: Whether modem has been notified of power state -* @disabled: Whether setup ready interrupt handling is disabled +* @setup_disabled: Whether setup ready interrupt handler is disabled * @mutex: Mutex protecting ready-interrupt/shutdown interlock * @panic_notifier: Panic notifier structure */
@@ -67,7 +67,7 @@ struct ipa_smp2p {u32 setup_ready_irq;bool power_on;bool notified; -bool disabled; +bool setup_disabled;struct mutex mutex;struct notifier_block panic_notifier; };
@@ -155,11 +155,9 @@ static irqreturn_t ipa_smp2p_modem_setup_ready_isr(int irq, void *dev_id)struct device *dev;int ret; -mutex_lock (&smp2p->mutex); - -if (smp2p->disabled) - goto out_mutex_unlock; - smp2p->disabled = true;/* If any others arrive, ignore them */ +/* Ignore any (spurious) interrupts received after the first */ +if (smp2p->ipa->setup_complete) +return IRQ_HANDLED ;/* Power needs to be active for setup */ dev = &smp2p->ipa->pdev->dev;
@@ -176,8 +174,6 @@ static irqreturn_t ipa_smp2p_modem_setup_ready_isr(int irq, void *dev_id) out_power_put:pm_runtime_mark_last_busy (dev); (void )pm_runtime_put_autosuspend (dev); -out_mutex_unlock: -mutex_unlock (&smp2p->mutex);return IRQ_HANDLED ; }
@@ -322,7 +318,10 @@ void ipa_smp2p_disable(struct ipa *ipa)mutex_lock (&smp2p->mutex); - smp2p->disabled = true; +if (!smp2p->setup_disabled) { +disable_irq (smp2p->setup_ready_irq); + smp2p->setup_disabled = true; + }mutex_unlock (&smp2p->mutex); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 122/179 net: ipa: separate disabling setup from modem stop
In reply to Greg Kroah-HartmanFrom: Alex Elder <[email protected]>
[ Upstream commit 8afc7e471ad3c92a9c96adc62d1b67de77378bb6 ]
The IPA setup_complete flag is set at the end of ipa_setup(), when the setup phase of initialization has completed successfully. This occurs as part of driver probe processing, or (if "modem-init" is specified in the DTS file) it is triggered by the "ipa-setup-ready" SMP2P interrupt generated by the modem.
In the latter case, it's possible for driver shutdown (or remove) to begin while setup processing is underway, and this can't be allowed. The problem is that the setup_complete flag is not adequate to signal that setup is underway.
If setup_complete is set, it will never be un-set, so that case is not a problem. But if setup_complete is false, there's a chance setup is underway.
Because setup is triggered by an interrupt on a "modem-init" system, there is a simple way to ensure the value of setup_complete is safe to read. The threaded handler--if it is executing--will complete as part of a request to disable the "ipa-modem-ready" interrupt. This means that ipa_setup() (which is called from the handler) will run to completion if it was underway, or will never be called otherwise.
The request to disable the "ipa-setup-ready" interrupt is currently made within ipa_modem_stop(). Instead, disable the interrupt outside that function in the two places it's called. In the case of ipa_remove(), this ensures the setup_complete flag is safe to read before we read it.
Rename ipa_smp2p_disable() to be ipa_smp2p_irq_disable_setup(), to be more specific about its effect.
--- drivers/net/ipa/ipa_main.c | 6 ++++++ drivers/net/ipa/ipa_modem.c | 6 +++--- drivers/net/ipa/ipa_smp2p.c | 2 +- drivers/net/ipa/ipa_smp2p.h | 7 +++---- 4 files changed, 13 insertions(+), 8 deletions(-)
drivers/net/ipa/ipa_main.c +6 -0
@@ -28,6 +28,7 @@#include "ipa_reg.h" #include "ipa_mem.h" #include "ipa_table.h" +#include "ipa_smp2p.h" #include "ipa_modem.h" #include "ipa_uc.h" #include "ipa_interrupt.h"
@@ -801,6 +802,11 @@ static int ipa_remove(struct platform_device *pdev)struct device *dev = &pdev->dev;int ret; +/* Prevent the modem from triggering a call to ipa_setup(). This +* also ensures a modem-initiated setup that's underway completes. +*/ +ipa_smp2p_irq_disable_setup (ipa); + ret =pm_runtime_get_sync (dev);if (WARN_ON (ret <0 )) goto out_power_put;
drivers/net/ipa/ipa_modem.c +3 -3
@@ -339,9 +339,6 @@ int ipa_modem_stop(struct ipa *ipa)if (state !=IPA_MODEM_STATE_RUNNING )return -EBUSY ; -/* Prevent the modem from triggering a call to ipa_setup() */ -ipa_smp2p_disable (ipa); -/* Clean up the netdev and endpoints if it was started */ if (netdev) {struct ipa_priv *priv =netdev_priv (netdev);
@@ -369,6 +366,9 @@ static void ipa_modem_crashed(struct ipa *ipa)struct device *dev = &ipa->pdev->dev;int ret; +/* Prevent the modem from triggering a call to ipa_setup() */ +ipa_smp2p_irq_disable_setup (ipa); + ret =pm_runtime_get_sync (dev);if (ret <0 ) {dev_err (dev,"error %d getting power to handle crash\n" , ret);
drivers/net/ipa/ipa_smp2p.c +1 -1
@@ -309,7 +309,7 @@ void ipa_smp2p_exit(struct ipa *ipa)kfree (smp2p); } -void ipa_smp2p_disable (struct ipa *ipa) +void ipa_smp2p_irq_disable_setup (struct ipa *ipa) {struct ipa_smp2p *smp2p = ipa->smp2p;
drivers/net/ipa/ipa_smp2p.h +3 -4
@@ -27,13 +27,12 @@ int ipa_smp2p_init(struct ipa *ipa, bool modem_init);void ipa_smp2p_exit (struct ipa *ipa);/** -* ipa_smp2p_disable() - Prevent "ipa-setup-ready" interrupt handling +* ipa_smp2p_irq_disable_setup() - Disable the "setup ready" interrupt * @ipa: IPA pointer * -* Prevent handling of the "setup ready" interrupt from the modem. -* This is used before initiating shutdown of the driver. +* Disable the "ipa-setup-ready" interrupt from the modem. */ -void ipa_smp2p_disable (struct ipa *ipa); +void ipa_smp2p_irq_disable_setup (struct ipa *ipa);/** * ipa_smp2p_notify_reset() - Reset modem notification state
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 123/179 net: ipa: kill ipa_cmd_pipeline_clear()
In reply to Greg Kroah-HartmanFrom: Alex Elder <[email protected]>
[ Upstream commit e4e9bfb7c93d7e78aa4ad7e1c411a8df15386062 ]
Calling ipa_cmd_pipeline_clear() after stopping the channel underlying the AP<-modem RX endpoint can lead to a deadlock.
This occurs in the ->runtime_suspend device power operation for the IPA driver. While this callback is in progress, any other requests for power will block until the callback returns.
Stopping the AP<-modem RX channel does not prevent the modem from sending another packet to this endpoint. If a packet arrives for an RX channel when the channel is stopped, an SUSPEND IPA interrupt condition will be pending. Handling an IPA interrupt requires power, so ipa_isr_thread() calls pm_runtime_get_sync() first thing.
The problem occurs because a "pipeline clear" command will not complete while such a SUSPEND interrupt condition exists. So the SUSPEND IPA interrupt handler won't proceed until it gets power; that won't happen until the ->runtime_suspend callback (and its "pipeline clear" command) completes; and that can't happen while the SUSPEND interrupt condition exists.
It turns out that in this case there is no need to use the "pipeline clear" command. There are scenarios in which clearing the pipeline is required while suspending, but those are not (yet) supported upstream. So a simple fix, avoiding the potential deadlock, is to stop calling ipa_cmd_pipeline_clear() in ipa_endpoint_suspend(). This removes the only user of ipa_cmd_pipeline_clear(), so get rid of that function. It can be restored again whenever it's needed.
This is basically a manual revert along with an explanation for commit 6cb63ea6a39ea ("net: ipa: introduce ipa_cmd_tag_process()").
--- drivers/net/ipa/ipa_cmd.c | 16 ---------------- drivers/net/ipa/ipa_cmd.h | 6 ------ drivers/net/ipa/ipa_endpoint.c | 2 -- 3 files changed, 24 deletions(-)
drivers/net/ipa/ipa_cmd.c +0 -16
@@ -661,22 +661,6 @@ void ipa_cmd_pipeline_clear_wait(struct ipa *ipa)wait_for_completion (&ipa->completion); } -void ipa_cmd_pipeline_clear (struct ipa *ipa) -{ -u32 count =ipa_cmd_pipeline_clear_count (); -struct gsi_trans *trans; - - trans =ipa_cmd_trans_alloc (ipa, count); -if (trans) { -ipa_cmd_pipeline_clear_add (trans); -gsi_trans_commit_wait (trans); -ipa_cmd_pipeline_clear_wait (ipa); - }else { -dev_err (&ipa->pdev->dev, -"error allocating %u entry tag transaction\n" , count); - } -} -static struct ipa_cmd_info *ipa_cmd_info_alloc (struct ipa_endpoint *endpoint,u32 tre_count) {
drivers/net/ipa/ipa_cmd.h +0 -6
@@ -163,12 +163,6 @@ u32 ipa_cmd_pipeline_clear_count(void);*/ void ipa_cmd_pipeline_clear_wait (struct ipa *ipa); -/** -* ipa_cmd_pipeline_clear() - Clear the hardware pipeline -* @ipa: - IPA pointer -*/ -void ipa_cmd_pipeline_clear (struct ipa *ipa); -/** * ipa_cmd_trans_alloc() - Allocate a transaction for the command TX endpoint * @ipa: IPA pointer
drivers/net/ipa/ipa_endpoint.c +0 -2
@@ -1636,8 +1636,6 @@ void ipa_endpoint_suspend(struct ipa *ipa)if (ipa->modem_netdev)ipa_modem_suspend (ipa->modem_netdev); -ipa_cmd_pipeline_clear (ipa); -ipa_endpoint_suspend_one (ipa->name_map[IPA_ENDPOINT_AP_LAN_RX ]);ipa_endpoint_suspend_one (ipa->name_map[IPA_ENDPOINT_AP_COMMAND_TX ]); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 124/179 net: marvell: mvpp2: increase MTU limit when XDP enabled
In reply to Greg Kroah-HartmanFrom: Marek Behún <[email protected]>
[ Upstream commit 7b1b62bc1e6a7b2fd5ee7a4296268eb291d23aeb ]
Currently mvpp2_xdp_setup won't allow attaching XDP program if
mtu > ETH_DATA_LEN (1500).
The mvpp2_change_mtu on the other hand checks whether
MVPP2_RX_PKT_SIZE(mtu) > MVPP2_BM_LONG_PKT_SIZE.
These two checks are semantically different.
Moreover this limit can be increased to MVPP2_MAX_RX_BUF_SIZE, since in mvpp2_rx we have
xdp.data = data + MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM; xdp.frame_sz = PAGE_SIZE;
Change the checks to check whether
mtu > MVPP2_MAX_RX_BUF_SIZE
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +8 -6
@@ -5017,11 +5017,13 @@ static int mvpp2_change_mtu(struct net_device *dev, int mtu) mtu =ALIGN (MVPP2_RX_PKT_SIZE (mtu),8 ); } +if (port->xdp_prog && mtu >MVPP2_MAX_RX_BUF_SIZE ) { +netdev_err (dev,"Illegal MTU value %d (> %d) for XDP mode\n" , + mtu, (int )MVPP2_MAX_RX_BUF_SIZE ); +return -EINVAL ; + } +if (MVPP2_RX_PKT_SIZE (mtu) >MVPP2_BM_LONG_PKT_SIZE ) { -if (port->xdp_prog) { -netdev_err (dev,"Jumbo frames are not supported with XDP\n" ); -return -EINVAL ; - }if (priv->percpu_pools) {netdev_warn (dev,"mtu %d too high, switching to shared buffers" , mtu);mvpp2_bm_switch_buffers (priv, false);
@@ -5307,8 +5309,8 @@ static int mvpp2_xdp_setup(struct mvpp2_port *port, struct netdev_bpf *bpf)bool running =netif_running (port->dev);bool reset = !prog != !port->xdp_prog; -if (port->dev->mtu >ETH_DATA_LEN ) { -NL_SET_ERR_MSG_MOD (bpf->extack,"XDP is not supported with jumbo frames enabled" ); +if (port->dev->mtu >MVPP2_MAX_RX_BUF_SIZE ) { +NL_SET_ERR_MSG_MOD (bpf->extack,"MTU too large for XDP" );return -EOPNOTSUPP ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 125/179 cpufreq: intel_pstate: Add Ice Lake server to out-of-band IDs
In reply to Greg Kroah-HartmanFrom: Adamos Ttofari <[email protected]>
[ Upstream commit cd23f02f166892603eb9f2d488152b975872b682 ]
Commit fbdc21e9b038 ("cpufreq: intel_pstate: Add Icelake servers support in no-HWP mode") enabled the use of Intel P-State driver for Ice Lake servers.
But it doesn't cover the case when OS can't control P-States.
Therefore, for Ice Lake server, if MSR_MISC_PWR_MGMT bits 8 or 18 are enabled, then the Intel P-State driver should exit as OS can't control P-States.
--- drivers/cpufreq/intel_pstate.c | 1 + 1 file changed, 1 insertion(+)
drivers/cpufreq/intel_pstate.c +1 -0
@@ -2255,6 +2255,7 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {X86_MATCH (BROADWELL_D , core_funcs),X86_MATCH (BROADWELL_X , core_funcs),X86_MATCH (SKYLAKE_X , core_funcs), + X86_MATCH(ICELAKE_X, core_funcs), {} };
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 126/179 nvmet-tcp: fix incomplete data digest send
In reply to Greg Kroah-HartmanFrom: Varun Prakash <[email protected]>
[ Upstream commit 102110efdff6beedece6ab9b51664c32ac01e2db ]
Current nvmet_try_send_ddgst() code does not check whether all data digest bytes are transmitted, fix this by returning -EAGAIN if all data digest bytes are not transmitted.
--- drivers/nvme/target/tcp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/nvme/target/tcp.c +6 -1
@@ -700,10 +700,11 @@ static int nvmet_try_send_r2t(struct nvmet_tcp_cmd *cmd, bool last_in_batch)static int nvmet_try_send_ddgst (struct nvmet_tcp_cmd *cmd,bool last_in_batch) {struct nvmet_tcp_queue *queue = cmd->queue; +int left =NVME_TCP_DIGEST_LENGTH - cmd->offset;struct msghdr msg = { .msg_flags =MSG_DONTWAIT };struct kvec iov = { .iov_base = (u8 *)&cmd->exp_ddgst + cmd->offset, - .iov_len =NVME_TCP_DIGEST_LENGTH - cmd->offset + .iov_len = left };int ret;
@@ -717,6 +718,10 @@ static int nvmet_try_send_ddgst(struct nvmet_tcp_cmd *cmd, bool last_in_batch)return ret; cmd->offset += ret; + left -= ret; + +if (left) +return -EAGAIN ;if (queue->nvme_sq.sqhd_disabled) { cmd->queue->snd_cmd =NULL ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 127/179 drm/hyperv: Fix device removal on Gen1 VMs
In reply to Greg Kroah-HartmanFrom: Mohammed Gamal <[email protected]>
[ Upstream commit e048834c209a02e3776bcc47d43c6d863e3a67ca ]
The Hyper-V DRM driver tries to free MMIO region on removing the device regardless of VM type, while Gen1 VMs don't use MMIO and hence causing the kernel to crash on a NULL pointer dereference.
Fix this by making deallocating MMIO only on Gen2 machines and implement removal for Gen1
--- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/gpu/drm/hyperv/hyperv_drm_drv.c +18 -1
@@ -225,12 +225,29 @@ static int hyperv_vmbus_remove(struct hv_device *hdev) {struct drm_device *dev =hv_get_drvdata (hdev);struct hyperv_drm_device *hv =to_hv (dev); +struct pci_dev *pdev;drm_dev_unplug (dev);drm_atomic_helper_shutdown (dev);vmbus_close (hdev->channel);hv_set_drvdata (hdev,NULL ); -vmbus_free_mmio (hv->mem->start, hv->fb_size); + +/* +* Free allocated MMIO memory only on Gen2 VMs. +* On Gen1 VMs, release the PCI device +*/ +if (efi_enabled (EFI_BOOT )) { +vmbus_free_mmio (hv->mem->start, hv->fb_size); + }else { + pdev =pci_get_device (PCI_VENDOR_ID_MICROSOFT , +PCI_DEVICE_ID_HYPERV_VIDEO ,NULL ); +if (!pdev) { +drm_err (dev,"Unable to find PCI Hyper-V video\n" ); +return -ENODEV ; + } +pci_release_region (pdev,0 ); +pci_dev_put (pdev); + }return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 128/179 arm64: uaccess: avoid blocking within critical sections
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
[ Upstream commit 94902d849e85093aafcdbea2be8e2beff47233e6 ]
As Vincent reports in:
https://lore.kernel.org/r/[email protected]
The put_user() in schedule_tail() can get stuck in a livelock, similar to a problem recently fixed on riscv in commit:
285a76bb2cf51b0c ("riscv: evaluate put_user() arg before enabling user access")
In __raw_put_user() we have a critical section between uaccess_ttbr0_enable() and uaccess_ttbr0_disable() where we cannot safely call into the scheduler without having taken an exception, as schedule() and other scheduling functions will not save/restore the TTBR0 state. If either of the x or ptr arguments to __raw_put_user() contain a blocking call, we may call into the scheduler within the critical section. This can result in two problems:
1) The access within the critical section will occur without the required TTBR0 tables installed. This will fault, and where the required tables permit access, the access will be retried without the required tables, resulting in a livelock.
2) When TTBR0 SW PAN is in use, check_and_switch_context() does not modify TTBR0, leaving a stale value installed. The mappings of the blocked task will erroneously be accessible to regular accesses in the context of the new task. Additionally, if the tables are subsequently freed, local TLB maintenance required to reuse the ASID may be lost, potentially resulting in TLB corruption (e.g. in the presence of CnP).
The same issue exists for __raw_get_user() in the critical section between uaccess_ttbr0_enable() and uaccess_ttbr0_disable().
A similar issue exists for __get_kernel_nofault() and __put_kernel_nofault() for the critical section between __uaccess_enable_tco_async() and __uaccess_disable_tco_async(), as the TCO state is not context-switched by direct calls into the scheduler. Here the TCO state may be lost from the context of the current task, resulting in unexpected asynchronous tag check faults. It may also be leaked to another task, suppressing expected tag check faults.
To fix all of these cases, we must ensure that we do not directly call into the scheduler in their respective critical sections. This patch reworks __raw_put_user(), __raw_get_user(), __get_kernel_nofault(), and __put_kernel_nofault(), ensuring that parameters are evaluated outside of the critical sections. To make this requirement clear, comments are added describing the problem, and line spaces added to separate the critical sections from other portions of the macros.
For __raw_get_user() and __raw_put_user() the err parameter is conditionally assigned to, and we must currently evaluate this in the critical section. This behaviour is relied upon by the signal code, which uses chains of put_user_error() and get_user_error(), checking the return value at the end. In all cases, the err parameter is a plain int rather than a more complex expression with a blocking call, so this is safe.
In future we should try to clean up the err usage to remove the potential for this to be a problem.
Aside from the changes to time of evaluation, there should be no functional change as a result of this patch.
--- arch/arm64/include/asm/uaccess.h | 48 +++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 7 deletions(-)
arch/arm64/include/asm/uaccess.h +41 -7
@@ -292,12 +292,22 @@ do { \ (x) = (__force __typeof__(*(ptr)))__gu_val; \ }while (0 ) +/* +* We must not call into the scheduler between uaccess_ttbr0_enable() and +* uaccess_ttbr0_disable(). As `x` and `ptr` could contain blocking functions, +* we must evaluate these outside of the critical section. + */#define __raw_get_user (x, ptr, err) \ do { \ + __typeof__(*(ptr)) __user *__rgu_ptr = (ptr); \ + __typeof__(x) __rgu_val; \ __chk_user_ptr(ptr); \ + \ uaccess_ttbr0_enable(); \ - __raw_get_mem("ldtr", x, ptr, err); \ + __raw_get_mem("ldtr", __rgu_val, __rgu_ptr, err); \ uaccess_ttbr0_disable(); \ + \ + (x) = __rgu_val; \ } while (0)#define __get_user_error (x, ptr, err) \
@@ -321,14 +331,22 @@ do { \#define get_user __get_user +/* +* We must not call into the scheduler between __uaccess_enable_tco_async() and +* __uaccess_disable_tco_async(). As `dst` and `src` may contain blocking +* functions, we must evaluate these outside of the critical section. +*/ #define __get_kernel_nofault (dst, src, type, err_label) \ do { \ + __typeof__(dst) __gkn_dst = (dst); \ + __typeof__(src) __gkn_src = (src); \ int __gkn_err = 0; \ \ __uaccess_enable_tco_async(); \ - __raw_get_mem("ldr", *((type *)(dst)), \ - (__force type *)(src), __gkn_err); \ + __raw_get_mem("ldr", *((type *)(__gkn_dst)), \ + (__force type *)(__gkn_src), __gkn_err); \ __uaccess_disable_tco_async(); \ + \ if (unlikely(__gkn_err)) \ goto err_label; \ } while (0)
@@ -367,11 +385,19 @@ do { \ } \ }while (0 ) +/* +* We must not call into the scheduler between uaccess_ttbr0_enable() and +* uaccess_ttbr0_disable(). As `x` and `ptr` could contain blocking functions, +* we must evaluate these outside of the critical section. + */#define __raw_put_user (x, ptr, err) \ do { \ - __chk_user_ptr(ptr); \ + __typeof__(*(ptr)) __user *__rpu_ptr = (ptr); \ + __typeof__(*(ptr)) __rpu_val = (x); \ + __chk_user_ptr(__rpu_ptr); \ + \ uaccess_ttbr0_enable(); \ - __raw_put_mem("sttr", x, ptr, err); \ + __raw_put_mem("sttr", __rpu_val, __rpu_ptr, err); \ uaccess_ttbr0_disable(); \ } while (0)
@@ -396,14 +422,22 @@ do { \#define put_user __put_user +/* +* We must not call into the scheduler between __uaccess_enable_tco_async() and +* __uaccess_disable_tco_async(). As `dst` and `src` may contain blocking +* functions, we must evaluate these outside of the critical section. +*/ #define __put_kernel_nofault (dst, src, type, err_label) \ do { \ + __typeof__(dst) __pkn_dst = (dst); \ + __typeof__(src) __pkn_src = (src); \ int __pkn_err = 0; \ \ __uaccess_enable_tco_async(); \ - __raw_put_mem("str", *((type *)(src)), \ - (__force type *)(dst), __pkn_err); \ + __raw_put_mem("str", *((type *)(__pkn_src)), \ + (__force type *)(__pkn_dst), __pkn_err); \ __uaccess_disable_tco_async(); \ + \ if (unlikely(__pkn_err)) \ goto err_label; \ } while(0)
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 129/179 net/ncsi : Add payload to be 32-bit aligned to fix dropped packets
In reply to Greg Kroah-HartmanFrom: Kumar Thangavel <[email protected]>
[ Upstream commit ac132852147ad303a938dda318970dd1bbdfda4e ]
Update NC-SI command handler (both standard and OEM) to take into account of payload paddings in allocating skb (in case of payload size is not 32-bit aligned).
The checksum field follows payload field, without taking payload padding into account can cause checksum being truncated, leading to dropped packets.
--- net/ncsi/ncsi-cmd.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
net/ncsi/ncsi-cmd.c +16 -8
@@ -18,6 +18,8 @@#include "internal.h" #include "ncsi-pkt.h" +static const int padding_bytes =26 ; +u32 ncsi_calculate_checksum (unsigned char *data,int len) {u32 checksum =0 ;
@@ -213,12 +215,17 @@ static int ncsi_cmd_handler_oem(struct sk_buff *skb, {struct ncsi_cmd_oem_pkt *cmd;unsigned int len; +int payload; +/* NC-SI spec DSP_0222_1.2.0, section 8.2.2.2 +* requires payload to be padded with 0 to +* 32-bit boundary before the checksum field. +* Ensure the padding bytes are accounted for in +* skb allocation +*/ + payload =ALIGN (nca->payload,4 ); len =sizeof (struct ncsi_cmd_pkt_hdr ) +4 ; -if (nca->payload <26 ) - len +=26 ; -else - len += nca->payload; + len +=max (payload, padding_bytes); cmd =skb_put_zero (skb, len);memcpy (&cmd->mfr_id, nca->data, nca->payload);
@@ -272,6 +279,7 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)struct net_device *dev = nd->dev;int hlen =LL_RESERVED_SPACE (dev);int tlen = dev->needed_tailroom; +int payload;int len = hlen + tlen;struct sk_buff *skb;struct ncsi_request *nr;
@@ -281,14 +289,14 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)return NULL ;/* NCSI command packet has 16-bytes header, payload, 4 bytes checksum. +* Payload needs padding so that the checksum field following payload is +* aligned to 32-bit boundary. * The packet needs padding if its payload is less than 26 bytes to * meet 64 bytes minimal ethernet frame length. */ len +=sizeof (struct ncsi_cmd_pkt_hdr ) +4 ; -if (nca->payload <26 ) - len +=26 ; -else - len += nca->payload; + payload =ALIGN (nca->payload,4 ); + len +=max (payload, padding_bytes);/* Allocate skb */ skb =alloc_skb (len,GFP_ATOMIC );
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 130/179 PM: hibernate: use correct mode for swsusp_close()
In reply to Greg Kroah-HartmanFrom: Thomas Zeitlhofer <[email protected]>
[ Upstream commit cefcf24b4d351daf70ecd945324e200d3736821e ]
Commit 39fbef4b0f77 ("PM: hibernate: Get block device exclusively in swsusp_check()") changed the opening mode of the block device to (FMODE_READ | FMODE_EXCL).
In the corresponding calls to swsusp_close(), the mode is still just FMODE_READ which triggers the warning in blkdev_flush_mapping() on resume from hibernate.
So, use the mode (FMODE_READ | FMODE_EXCL) also when closing the device.
--- kernel/power/hibernate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/power/hibernate.c +3 -3
@@ -691,7 +691,7 @@ static int load_image_and_restore(void) goto Unlock; error =swsusp_read (&flags); -swsusp_close (FMODE_READ ); +swsusp_close (FMODE_READ |FMODE_EXCL );if (!error) error =hibernation_restore (flags &SF_PLATFORM_MODE );
@@ -981,7 +981,7 @@ static int software_resume(void)/* The snapshot device should not be opened while we're running */ if (!hibernate_acquire ()) { error = -EBUSY ; -swsusp_close (FMODE_READ ); +swsusp_close (FMODE_READ |FMODE_EXCL ); goto Unlock; }
@@ -1016,7 +1016,7 @@ static int software_resume(void)pm_pr_dbg ("Hibernation image not present or could not be loaded.\n" );return error; Close_Finish: -swsusp_close (FMODE_READ ); +swsusp_close (FMODE_READ |FMODE_EXCL ); goto Finish; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 131/179 drm/amd/display: Fix DPIA outbox timeout after GPU reset
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 6eff272dbee7ad444c491c9a96d49e78e91e2161 ]
[Why]
The HW interrupt gets disabled after GPU reset so we don't receive notifications for HPD or AUX from DMUB - leading to timeout and black screen with (or without) DPIA links connected.
[How]
Re-enable the interrupt after GPU reset like we do for the other DC interrupts.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -0
@@ -2213,6 +2213,8 @@ static int dm_resume(void *handle)if (amdgpu_in_reset (adev)) { dc_state = dm->cached_dc_state; +amdgpu_dm_outbox_init (adev); + r =dm_dmub_hw_init (adev);if (r)DRM_ERROR ("DMUB interface failed to initialize: status=%d\n" , r);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 132/179 drm/amd/display: Set plane update flags for all planes in reset
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit 21431f70f6014f81b0d118ff4fcee12b00b9dd70 ]
[Why]
We're only setting the flags on stream[0]'s planes so this logic fails if we have more than one stream in the state.
This can cause a page flip timeout with multiple displays in the configuration.
[How]
Index into the stream_status array using the stream index - it's a 1:1 mapping.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -2
@@ -2226,8 +2226,8 @@ static int dm_resume(void *handle)for (i =0 ; i < dc_state->stream_count; i++) { dc_state->streams[i]->mode_changed = true; -for (j =0 ; j < dc_state->stream_status->plane_count; j++) { - dc_state->stream_status->plane_states[j]->update_flags.raw +for (j =0 ; j < dc_state->stream_status[i].plane_count; j++) { + dc_state->stream_status[i].plane_states[j]->update_flags.raw =0xffffffff ; } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 133/179 tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 4e1fddc98d2585ddd4792b5e44433dcee7ece001 ]
While testing BIG TCP patch series, I was expecting that TCP_RR workloads with 80KB requests/answers would send one 80KB TSO packet, then being received as a single GRO packet.
It turns out this was not happening, and the root cause was that cubic Hystart ACK train was triggering after a few (2 or 3) rounds of RPC.
Hystart was wrongly setting CWND/SSTHRESH to 30, while my RPC needed a budget of ~20 segments.
Ideally these TCP_RR flows should not exit slow start.
Cubic Hystart should reset itself at each round, instead of assuming every TCP flow is a bulk one.
Note that even after this patch, Hystart can still trigger, depending on scheduling artifacts, but at a higher CWND/SSTHRESH threshold, keeping optimal TSO packet sizes.
Tested:
ip link set dev eth0 gro_ipv6_max_size 131072 gso_ipv6_max_size 131072
nstat -n; netperf -H ... -t TCP_RR -l 5 -- -r 80000,80000 -K cubic; nstat|egrep "Ip6InReceives|Hystart|Ip6OutRequests"
Before:
8605
Ip6InReceives 87541 0.0 Ip6OutRequests 129496 0.0 TcpExtTCPHystartTrainDetect 1 0.0 TcpExtTCPHystartTrainCwnd 30 0.0
After:
8760
Ip6InReceives 88514 0.0 Ip6OutRequests 87975 0.0
--- net/ipv4/tcp_cubic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/ipv4/tcp_cubic.c +3 -2
@@ -328,8 +328,6 @@ static void cubictcp_cong_avoid(struct sock *sk, u32 ack, u32 acked)return ;if (tcp_in_slow_start (tp)) { -if (hystart &&after (ack, ca->end_seq)) -bictcp_hystart_reset (sk); acked =tcp_slow_start (tp, acked);if (!acked)return ;
@@ -389,6 +387,9 @@ static void hystart_update(struct sock *sk, u32 delay)struct bictcp *ca =inet_csk_ca (sk);u32 threshold; +if (after (tp->snd_una, ca->end_seq)) +bictcp_hystart_reset (sk); +if (hystart_detect &HYSTART_ACK_TRAIN ) {u32 now =bictcp_clock_us (sk);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 134/179 lan743x: fix deadlock in lan743x_phy_link_status_change()
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit ddb826c2c92d461f290a7bab89e7c28696191875 ]
Usage of phy_ethtool_get_link_ksettings() in the link status change handler isn't needed, and in combination with the referenced change it results in a deadlock. Simply remove the call and replace it with direct access to phydev->speed. The duplex argument of lan743x_phy_update_flowcontrol() isn't used and can be removed.
--- drivers/net/ethernet/microchip/lan743x_main.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/net/ethernet/microchip/lan743x_main.c +3 -9
@@ -914,8 +914,7 @@ static int lan743x_phy_reset(struct lan743x_adapter *adapter) }static void lan743x_phy_update_flowcontrol (struct lan743x_adapter *adapter, -u8 duplex,u16 local_adv, -u16 remote_adv) +u16 local_adv,u16 remote_adv) {struct lan743x_phy *phy = &adapter->phy;u8 cap;
@@ -943,7 +942,6 @@ static void lan743x_phy_link_status_change(struct net_device *netdev)phy_print_status (phydev);if (phydev->state ==PHY_RUNNING ) { -struct ethtool_link_ksettings ksettings;int remote_advertisement =0 ;int local_advertisement =0 ;
@@ -980,18 +978,14 @@ static void lan743x_phy_link_status_change(struct net_device *netdev) }lan743x_csr_write (adapter,MAC_CR , data); -memset (&ksettings,0 ,sizeof (ksettings)); -phy_ethtool_get_link_ksettings (netdev, &ksettings); local_advertisement =linkmode_adv_to_mii_adv_t (phydev->advertising); remote_advertisement =linkmode_adv_to_mii_adv_t (phydev->lp_advertising); -lan743x_phy_update_flowcontrol (adapter, - ksettings.base.duplex, - local_advertisement, +lan743x_phy_update_flowcontrol (adapter, local_advertisement, remote_advertisement); -lan743x_ptp_update_latency (adapter, ksettings.base.speed); +lan743x_ptp_update_latency (adapter, phydev->speed); } }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 135/179 net: phylink: Force link down and retrigger resolve on interface change
In reply to Greg Kroah-HartmanFrom: Russell King (Oracle) <[email protected]>
[ Upstream commit 80662f4fd4771bc9c7cc4abdfbe866ebd1179621 ]
On PHY state change the phylink_resolve() function can read stale information from the MAC and report incorrect link speed and duplex to the kernel message log.
Example with a Marvell 88X3310 PHY connected to a SerDes port on Marvell 88E6393X switch:
- PHY driver triggers state change due to PHY interface mode being changed from 10gbase-r to 2500base-x due to copper change in speed from 10Gbps to 2.5Gbps, but the PHY itself either hasn't yet changed its interface to the host, or the interrupt about loss of SerDes link hadn't arrived yet (there can be a delay of several milliseconds for this), so we still think that the 10gbase-r mode is up
- phylink_resolve()
- phylink_mac_pcs_get_state()
- this fills in speed=10g link=up
- interface mode is updated to 2500base-x but speed is left at 10Gbps
- phylink_major_config()
- interface is changed to 2500base-x
- phylink_link_up()
- mv88e6xxx_mac_link_up()
- .port_set_speed_duplex()
- speed is set to 10Gbps
- reports "Link is Up - 10Gbps/Full" to dmesg
Afterwards when the interrupt finally arrives for mv88e6xxx, another resolve is forced in which we get the correct speed from phylink_mac_pcs_get_state(), but since the interface is not being changed anymore, we don't call phylink_major_config() but only phylink_mac_config(), which does not set speed/duplex anymore.
To fix this, we need to force the link down and trigger another resolve on PHY interface change event.
--- drivers/net/phy/phylink.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/phy/phylink.c +12 -1
@@ -657,6 +657,7 @@ static void phylink_resolve(struct work_struct *w)struct phylink_link_state link_state;struct net_device *ndev = pl->netdev;bool mac_config = false; +bool retrigger = false;bool cur_link_state;mutex_lock (&pl->state_mutex);
@@ -670,6 +671,7 @@ static void phylink_resolve(struct work_struct *w) link_state.link = false; }else if (pl->mac_link_dropped) { link_state.link = false; + retrigger = true; }else {switch (pl->cur_link_an_mode) {case MLO_AN_PHY :
@@ -694,6 +696,15 @@ static void phylink_resolve(struct work_struct *w)/* Only update if the PHY link is up */ if (pl->phydev && pl->phy_state.link) { +/* If the interface has changed, force a +* link down event if the link isn't already +* down, and re-resolve. +*/ +if (link_state.interface != + pl->phy_state.interface) { + retrigger = true; + link_state.link = false; + } link_state.interface = pl->phy_state.interface;/* If we have a PHY, we need to update with
@@ -736,7 +747,7 @@ static void phylink_resolve(struct work_struct *w)else phylink_link_up (pl, link_state); } -if (!link_state.link && pl->mac_link_dropped) { +if (!link_state.link && retrigger) { pl->mac_link_dropped = false;queue_work (system_power_efficient_wq, &pl->resolve); }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 136/179 net: phylink: Force retrigger in case of latched link-fail indicator
In reply to Greg Kroah-HartmanFrom: Russell King (Oracle) <[email protected]>
[ Upstream commit dbae3388ea9ca33bd1d5eabc3b0ef17e69c74677 ]
On mv88e6xxx 1G/2.5G PCS, the SerDes register 4.2001.2 has the following description:
This register bit indicates when link was lost since the last read. For the current link status, read this register back-to-back.
Thus to get current link state, we need to read the register twice.
But doing that in the link change interrupt handler would lead to potentially ignoring link down events, which we really want to avoid.
Thus this needs to be solved in phylink's resolve, by retriggering another resolve in the event when PCS reports link down and previous link was up, and by re-reading PCS state if the previous link was down.
The wrong value is read when phylink requests change from sgmii to 2500base-x mode, and link won't come up. This fixes the bug.
--- drivers/net/phy/phylink.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/phy/phylink.c +13 -0
@@ -688,6 +688,19 @@ static void phylink_resolve(struct work_struct *w)case MLO_AN_INBAND :phylink_mac_pcs_get_state (pl, &link_state); +/* The PCS may have a latching link-fail indicator. +* If the link was up, bring the link down and +* re-trigger the resolve. Otherwise, re-read the +* PCS state to get the current status of the link. +*/ +if (!link_state.link) { +if (cur_link_state) + retrigger = true; +else +phylink_mac_pcs_get_state (pl, + &link_state); + } +/* If we have a phy, the "up" state is the union of * both the PHY and the MAC */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 137/179 net/smc: Fix NULL pointer dereferencing in smc_vlan_by_tcpsk()
In reply to Greg Kroah-HartmanFrom: Karsten Graul <[email protected]>
[ Upstream commit 587acad41f1bc48e16f42bb2aca63bf323380be8 ]
Coverity reports a possible NULL dereferencing problem:
in smc_vlan_by_tcpsk():
6. returned_null: netdev_lower_get_next returns NULL (checked 29 out of 30 times).
7. var_assigned: Assigning: ndev = NULL return value from netdev_lower_get_next.
1623 ndev = (struct net_device *)netdev_lower_get_next(ndev, &lower);
CID 1468509 (#1 of 1): Dereference null return value (NULL_RETURNS)
8. dereference: Dereferencing a pointer that might be NULL ndev when calling is_vlan_dev.
1624 if (is_vlan_dev(ndev)) {
Remove the manual implementation and use netdev_walk_all_lower_dev() to iterate over the lower devices. While on it remove an obsolete function parameter comment.
--- net/smc/smc_core.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)
net/smc/smc_core.c +18 -17
@@ -1596,14 +1596,26 @@ static void smc_link_down_work(struct work_struct *work)mutex_unlock (&lgr->llc_conf_mutex); } -/* Determine vlan of internal TCP socket. -* @vlan_id: address to store the determined vlan id into -*/ +static int smc_vlan_by_tcpsk_walk (struct net_device *lower_dev, +struct netdev_nested_priv *priv) +{ +unsigned short *vlan_id = (unsigned short *)priv->data; + +if (is_vlan_dev (lower_dev)) { + *vlan_id =vlan_dev_vlan_id (lower_dev); +return 1 ; + } + +return 0 ; +} + +/* Determine vlan of internal TCP socket. */ int smc_vlan_by_tcpsk (struct socket *clcsock,struct smc_init_info *ini) {struct dst_entry *dst =sk_dst_get (clcsock->sk); +struct netdev_nested_priv priv;struct net_device *ndev; -int i, nest_lvl, rc =0 ; +int rc =0 ; ini->vlan_id =0 ;if (!dst) {
@@ -1621,20 +1633,9 @@ int smc_vlan_by_tcpsk(struct socket *clcsock, struct smc_init_info *ini) goto out_rel; } + priv.data = (void *)&ini->vlan_id;rtnl_lock (); - nest_lvl = ndev->lower_level; -for (i =0 ; i < nest_lvl; i++) { -struct list_head *lower = &ndev->adj_list.lower; - -if (list_empty (lower)) -break ; - lower = lower->next; - ndev = (struct net_device *)netdev_lower_get_next (ndev, &lower); -if (is_vlan_dev (ndev)) { - ini->vlan_id =vlan_dev_vlan_id (ndev); -break ; - } - } +netdev_walk_all_lower_dev (ndev, smc_vlan_by_tcpsk_walk, &priv);rtnl_unlock (); out_rel:
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 138/179 net/smc: Fix loop in smc_listen
In reply to Greg Kroah-HartmanFrom: Guo DaXing <[email protected]>
[ Upstream commit 9ebb0c4b27a6158303b791b5b91e66d7665ee30e ]
The kernel_listen function in smc_listen will fail when all the available ports are occupied. At this point smc->clcsock->sk->sk_data_ready has been changed to smc_clcsock_data_ready. When we call smc_listen again, now both smc->clcsock->sk->sk_data_ready and smc->clcsk_data_ready point to the smc_clcsock_data_ready function.
The smc_clcsock_data_ready() function calls lsmc->clcsk_data_ready which now points to itself resulting in an infinite loop.
This patch restores smc->clcsock->sk->sk_data_ready with the old value.
--- net/smc/af_smc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/smc/af_smc.c +3 -1
@@ -1918,8 +1918,10 @@ static int smc_listen(struct socket *sock, int backlog) smc->clcsock->sk->sk_user_data = (void *)((uintptr_t )smc |SK_USER_DATA_NOCOPY ); rc =kernel_listen (smc->clcsock, backlog); -if (rc) +if (rc) { + smc->clcsock->sk->sk_data_ready = smc->clcsk_data_ready; goto out; + } sk->sk_max_ack_backlog = backlog; sk->sk_ack_backlog =0 ; sk->sk_state =SMC_LISTEN ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 139/179 nvmet: use IOCB_NOWAIT only if the filesystem supports it
In reply to Greg Kroah-HartmanFrom: Maurizio Lombardi <[email protected]>
[ Upstream commit c024b226a417c4eb9353ff500b1c823165d4d508 ]
Submit I/O requests with the IOCB_NOWAIT flag set only if the underlying filesystem supports it.
--- drivers/nvme/target/io-cmd-file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/target/io-cmd-file.c +3 -1
@@ -8,6 +8,7 @@#include <linux/uio.h> #include <linux/falloc.h> #include <linux/file.h> +#include <linux/fs.h> #include "nvmet.h" #define NVMET_MAX_MPOOL_BVEC 16
@@ -266,7 +267,8 @@ static void nvmet_file_execute_rw(struct nvmet_req *req)if (req->ns->buffered_io) {if (likely (!req->f.mpool_alloc) && -nvmet_file_execute_io (req,IOCB_NOWAIT )) + (req->ns->file->f_mode &FMODE_NOWAIT ) && +nvmet_file_execute_io (req,IOCB_NOWAIT ))return ;nvmet_file_submit_buffered_io (req); }else
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 140/179 igb: fix netpoll exit with traffic
In reply to Greg Kroah-HartmanFrom: Jesse Brandeburg <[email protected]>
[ Upstream commit eaeace60778e524a2820d0c0ad60bf80289e292c ]
Oleksandr brought a bug report where netpoll causes trace messages in the log on igb.
Danielle brought this back up as still occurring, so we'll try again.
[22038.710800] ------------[ cut here ]------------ [22038.710801] igb_poll+0x0/0x1440 [igb] exceeded budget in poll [22038.710802] WARNING: CPU: 12 PID: 40362 at net/core/netpoll.c:155 netpoll_poll_dev+0x18a/0x1a0
As Alex suggested, change the driver to return work_done at the exit of napi_poll, which should be safe to do in this driver because it is not polling multiple queues in this single napi context (multiple queues attached to one MSI-X vector). Several other drivers contain the same simple sequence, so I hope this will not create new problems.
--- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
@@ -8019,7 +8019,7 @@ static int igb_poll(struct napi_struct *napi, int budget)if (likely (napi_complete_done (napi, work_done)))igb_ring_irq_enable (q_vector); -return min (work_done, budget -1 ); +return work_done; }/**
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 141/179 MIPS: loongson64: fix FTLB configuration
In reply to Greg Kroah-HartmanFrom: Huang Pei <[email protected]>
[ Upstream commit 7db5e9e9e5e6c10d7d26f8df7f8fd8841cb15ee7 ]
It turns out that 'decode_configs' -> 'set_ftlb_enable' is called under c->cputype unset, which leaves FTLB disabled on BOTH 3A2000 and 3A3000
Fix it by calling "decode_configs" after c->cputype is initialized
--- arch/mips/kernel/cpu-probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/mips/kernel/cpu-probe.c +2 -2
@@ -1734,8 +1734,6 @@ static inline void decode_cpucfg(struct cpuinfo_mips *c)static inline void cpu_probe_loongson (struct cpuinfo_mips *c,unsigned int cpu) { -decode_configs (c); -/* All Loongson processors covered here define ExcCode 16 as GSExc. */ c->options |=MIPS_CPU_GSEXCEX ;
@@ -1796,6 +1794,8 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu)panic ("Unknown Loongson Processor ID!" ); break; } + +decode_configs (c); }#else static inline void cpu_probe_loongson (struct cpuinfo_mips *c,unsigned int cpu) { }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 142/179 MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48
In reply to Greg Kroah-HartmanFrom: Huang Pei <[email protected]>
[ Upstream commit 41ce097f714401e6ad8f3f5eb30d7f91b0b5e495 ]
It hangup when booting Loongson 3A1000 with BOTH CONFIG_PAGE_SIZE_64KB and CONFIG_MIPS_VA_BITS_48, that it turn out to use 2-level pgtable instead of 3-level. 64KB page size with 2-level pgtable only cover 42 bits VA, use 3-level pgtable to cover all 48 bits VA(55 bits)
--- arch/mips/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/Kconfig +1 -1
@@ -3189,7 +3189,7 @@ config STACKTRACE_SUPPORT config PGTABLE_LEVELS int default 4 if PAGE_SIZE_4KB && MIPS_VA_BITS_48 - default 3 if 64BIT && !PAGE_SIZE_64KB + default 3 if 64BIT && (!PAGE_SIZE_64KB || MIPS_VA_BITS_48) default 2 config MIPS_AUTO_PFN_OFFSET
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 143/179 tls: splice_read: fix record type check
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 520493f66f6822551aef2879cd40207074fe6980 ]
We don't support splicing control records. TLS 1.3 changes moved the record type check into the decrypt if(). The skb may already be decrypted and still be an alert.
Note that decrypt_skb_update() is idempotent and updates ctx->decrypted so the if() is pointless.
Reorder the check for decryption errors with the content type check while touching them. This part is not really a bug, because if decryption failed in TLS 1.3 content type will be DATA, and for TLS 1.2 it will be correct. Nevertheless its strange to touch output before checking if the function has failed.
--- net/tls/tls_sw.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
net/tls/tls_sw.c +10 -13
@@ -2006,21 +2006,18 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,if (!skb) goto splice_read_end; -if (!ctx->decrypted) { - err =decrypt_skb_update (sk, skb,NULL , &chunk, &zc, false); - -/* splice does not support reading control messages */ -if (ctx->control !=TLS_RECORD_TYPE_DATA ) { - err = -EINVAL ; - goto splice_read_end; - } + err =decrypt_skb_update (sk, skb,NULL , &chunk, &zc, false); +if (err <0 ) { +tls_err_abort (sk, -EBADMSG ); + goto splice_read_end; + } -if (err <0 ) { -tls_err_abort (sk, -EBADMSG ); - goto splice_read_end; - } - ctx->decrypted =1 ; +/* splice does not support reading control messages */ +if (ctx->control !=TLS_RECORD_TYPE_DATA ) { + err = -EINVAL ; + goto splice_read_end; } + rxm =strp_msg (skb); chunk = min_t(unsigned int, rxm->full_len, len);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 144/179 tls: splice_read: fix accessing pre-processed records
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit e062fe99cccd9ff9f232e593d163ecabd244fae8 ]
recvmsg() will put peek()ed and partially read records onto the rx_list. splice_read() needs to consult that list otherwise it may miss data. Align with recvmsg() and also put partially-read records onto rx_list. tls_sw_advance_skb() is pretty pointless now and will be removed in net-next.
--- net/tls/tls_sw.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-)
net/tls/tls_sw.c +25 -8
@@ -1993,6 +1993,7 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,struct sock *sk = sock->sk;struct sk_buff *skb;ssize_t copied =0 ; +bool from_queue;int err =0 ;long timeo;int chunk;
@@ -2002,14 +2003,20 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos, timeo =sock_rcvtimeo (sk, flags &SPLICE_F_NONBLOCK ); - skb =tls_wait_data (sk,NULL , flags &SPLICE_F_NONBLOCK , timeo, &err); -if (!skb) - goto splice_read_end; + from_queue = !skb_queue_empty (&ctx->rx_list); +if (from_queue) { + skb =__skb_dequeue (&ctx->rx_list); + }else { + skb =tls_wait_data (sk,NULL , flags &SPLICE_F_NONBLOCK , timeo, + &err); +if (!skb) + goto splice_read_end; - err =decrypt_skb_update (sk, skb,NULL , &chunk, &zc, false); -if (err <0 ) { -tls_err_abort (sk, -EBADMSG ); - goto splice_read_end; + err =decrypt_skb_update (sk, skb,NULL , &chunk, &zc, false); +if (err <0 ) { +tls_err_abort (sk, -EBADMSG ); + goto splice_read_end; + } }/* splice does not support reading control messages */
@@ -2025,7 +2032,17 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,if (copied <0 ) goto splice_read_end; -tls_sw_advance_skb (sk, skb, copied); +if (!from_queue) { + ctx->recv_pkt =NULL ; +__strp_unpause (&ctx->strp); + } +if (chunk < rxm->full_len) { +__skb_queue_head (&ctx->rx_list, skb); + rxm->offset += len; + rxm->full_len -= len; + }else { +consume_skb (skb); + } splice_read_end:release_sock (sk);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 145/179 tls: fix replacing proto_ops
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit f3911f73f51d1534f4db70b516cc1fcb6be05bae ]
We replace proto_ops whenever TLS is configured for RX. But our replacement also overrides sendpage_locked, which will crash unless TX is also configured. Similarly we plug both of those in for TLS_HW (NIC crypto offload) even tho TLS_HW has a completely different implementation for TX.
Last but not least we always plug in something based on inet_stream_ops even though a few of the callbacks differ for IPv6 (getname, release, bind).
Use a callback building method similar to what we do for struct proto.
--- net/tls/tls_main.c | 47 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-)
net/tls/tls_main.c +40 -7
@@ -61,7 +61,7 @@ static DEFINE_MUTEX(tcpv6_prot_mutex);static const struct proto *saved_tcpv4_prot;static DEFINE_MUTEX (tcpv4_prot_mutex);static struct proto tls_prots[TLS_NUM_PROTS ][TLS_NUM_CONFIG ][TLS_NUM_CONFIG ]; -static struct proto_ops tls_sw_proto_ops; +static struct proto_ops tls_proto_ops[TLS_NUM_PROTS ][TLS_NUM_CONFIG ][TLS_NUM_CONFIG ];static void build_protos (struct proto prot[TLS_NUM_CONFIG ][TLS_NUM_CONFIG ],const struct proto *base);
@@ -71,6 +71,8 @@ void update_sk_prot(struct sock *sk, struct tls_context *ctx)WRITE_ONCE (sk->sk_prot, &tls_prots[ip_ver][ctx->tx_conf][ctx->rx_conf]); +WRITE_ONCE (sk->sk_socket->ops, + &tls_proto_ops[ip_ver][ctx->tx_conf][ctx->rx_conf]); }int wait_on_pending_writer (struct sock *sk,long *timeo)
@@ -581,8 +583,6 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval,if (tx) { ctx->sk_write_space = sk->sk_write_space; sk->sk_write_space = tls_write_space; - }else { - sk->sk_socket->ops = &tls_sw_proto_ops; } goto out;
@@ -640,6 +640,39 @@ struct tls_context *tls_ctx_create(struct sock *sk)return ctx; } +static void build_proto_ops (struct proto_ops ops[TLS_NUM_CONFIG ][TLS_NUM_CONFIG ], +const struct proto_ops *base) +{ + ops[TLS_BASE ][TLS_BASE ] = *base; + + ops[TLS_SW ][TLS_BASE ] = ops[TLS_BASE ][TLS_BASE ]; + ops[TLS_SW ][TLS_BASE ].sendpage_locked = tls_sw_sendpage_locked; + + ops[TLS_BASE ][TLS_SW ] = ops[TLS_BASE ][TLS_BASE ]; + ops[TLS_BASE ][TLS_SW ].splice_read = tls_sw_splice_read; + + ops[TLS_SW ][TLS_SW ] = ops[TLS_SW ][TLS_BASE ]; + ops[TLS_SW ][TLS_SW ].splice_read = tls_sw_splice_read; + +#ifdef CONFIG_TLS_DEVICE + ops[TLS_HW ][TLS_BASE ] = ops[TLS_BASE ][TLS_BASE ]; + ops[TLS_HW ][TLS_BASE ].sendpage_locked =NULL ; + + ops[TLS_HW ][TLS_SW ] = ops[TLS_BASE ][TLS_SW ]; + ops[TLS_HW ][TLS_SW ].sendpage_locked =NULL ; + + ops[TLS_BASE ][TLS_HW ] = ops[TLS_BASE ][TLS_SW ]; + + ops[TLS_SW ][TLS_HW ] = ops[TLS_SW ][TLS_SW ]; + + ops[TLS_HW ][TLS_HW ] = ops[TLS_HW ][TLS_SW ]; + ops[TLS_HW ][TLS_HW ].sendpage_locked =NULL ; +#endif +#ifdef CONFIG_TLS_TOE + ops[TLS_HW_RECORD ][TLS_HW_RECORD ] = *base; +#endif +} +static void tls_build_proto (struct sock *sk) {int ip_ver = sk->sk_family ==AF_INET6 ?TLSV6 :TLSV4 ;
@@ -651,6 +684,8 @@ static void tls_build_proto(struct sock *sk)mutex_lock (&tcpv6_prot_mutex);if (likely (prot != saved_tcpv6_prot)) {build_protos (tls_prots[TLSV6 ], prot); +build_proto_ops (tls_proto_ops[TLSV6 ], + sk->sk_socket->ops);smp_store_release (&saved_tcpv6_prot, prot); }mutex_unlock (&tcpv6_prot_mutex);
@@ -661,6 +696,8 @@ static void tls_build_proto(struct sock *sk)mutex_lock (&tcpv4_prot_mutex);if (likely (prot != saved_tcpv4_prot)) {build_protos (tls_prots[TLSV4 ], prot); +build_proto_ops (tls_proto_ops[TLSV4 ], + sk->sk_socket->ops);smp_store_release (&saved_tcpv4_prot, prot); }mutex_unlock (&tcpv4_prot_mutex);
@@ -871,10 +908,6 @@ static int __init tls_register(void)if (err)return err; - tls_sw_proto_ops = inet_stream_ops; - tls_sw_proto_ops.splice_read = tls_sw_splice_read; - tls_sw_proto_ops.sendpage_locked = tls_sw_sendpage_locked; -tls_device_init ();tcp_register_ulp (&tcp_tls_ulp_ops);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 146/179 net: stmmac: Disable Tx queues when reconfiguring the interface
In reply to Greg Kroah-HartmanFrom: Yannick Vignon <[email protected]>
[ Upstream commit b270bfe697367776eca2e6759a71d700fb8d82a2 ]
The Tx queues were not disabled in situations where the driver needed to stop the interface to apply a new configuration. This could result in a kernel panic when doing any of the 3 following actions:
* reconfiguring the number of queues (ethtool -L)
* reconfiguring the size of the ring buffers (ethtool -G)
* installing/removing an XDP program (ip l set dev ethX xdp)
Prevent the panic by making sure netif_tx_disable is called when stopping an interface.
Without this patch, the following kernel panic can be observed when doing any of the actions above:
Unable to handle kernel paging request at virtual address ffff80001238d040 [....] Call trace: dwmac4_set_addr+0x8/0x10 dev_hard_start_xmit+0xe4/0x1ac sch_direct_xmit+0xe8/0x39c __dev_queue_xmit+0x3ec/0xaf0 dev_queue_xmit+0x14/0x20
[...]
[ end trace 0000000000000002 ]---
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -0
@@ -3794,6 +3794,8 @@ int stmmac_release(struct net_device *dev)struct stmmac_priv *priv =netdev_priv (dev);u32 chan; +netif_tx_disable (dev); +if (device_may_wakeup (priv->device))phylink_speed_down (priv->phylink, false);/* Stop and disconnect the PHY */
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 147/179 net/sched: sch_ets: dont peek at classes beyond nbands
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit de6d25924c2a8c2988c6a385990cafbe742061bf ]
when the number of DRR classes decreases, the round-robin active list can contain elements that have already been freed in ets_qdisc_change(). As a consequence, it's possible to see a NULL dereference crash, caused by the attempt to call cl->qdisc->ops->peek(cl->qdisc) when cl->qdisc is NULL:
BUG: kernel NULL pointer dereference, address: 0000000000000018 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 1 PID: 910 Comm: mausezahn Not tainted 5.16.0-rc1+ #475 Hardware name: Red Hat KVM, BIOS 1.11.1-4.module+el8.1.0+4066+0f1aadab 04/01/2014 RIP: 0010:ets_qdisc_dequeue+0x129/0x2c0 [sch_ets] Code: c5 01 41 39 ad e4 02 00 00 0f 87 18 ff ff ff 49 8b 85 c0 02 00 00 49 39 c4 0f 84 ba 00 00 00 49 8b ad c0 02 00 00 48 8b 7d 10 <48> 8b 47 18 48 8b 40 38 0f ae e8 ff d0 48 89 c3 48 85 c0 0f 84 9d RSP: 0000:ffffbb36c0b5fdd8 EFLAGS: 00010287 RAX: ffff956678efed30 RBX: 0000000000000000 RCX: 0000000000000000 RDX: 0000000000000002 RSI: ffffffff9b938dc9 RDI: 0000000000000000 RBP: ffff956678efed30 R08: e2f3207fe360129c R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000001 R12: ffff956678efeac0 R13: ffff956678efe800 R14: ffff956611545000 R15: ffff95667ac8f100 FS: 00007f2aa9120740(0000) GS:ffff95667b800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000018 CR3: 000000011070c000 CR4: 0000000000350ee0 Call Trace: <TASK> qdisc_peek_dequeued+0x29/0x70 [sch_ets] tbf_dequeue+0x22/0x260 [sch_tbf] __qdisc_run+0x7f/0x630 net_tx_action+0x290/0x4c0 __do_softirq+0xee/0x4f8 irq_exit_rcu+0xf4/0x130 sysvec_apic_timer_interrupt+0x52/0xc0 asm_sysvec_apic_timer_interrupt+0x12/0x20 RIP: 0033:0x7f2aa7fc9ad4 Code: b9 ff ff 48 8b 54 24 18 48 83 c4 08 48 89 ee 48 89 df 5b 5d e9 ed fc ff ff 0f 1f 00 66 2e 0f 1f 84 00 00 00 00 00 f3 0f 1e fa <53> 48 83 ec 10 48 8b 05 10 64 33 00 48 8b 00 48 85 c0 0f 85 84 00 RSP: 002b:00007ffe5d33fab8 EFLAGS: 00000202 RAX: 0000000000000002 RBX: 0000561f72c31460 RCX: 0000561f72c31720 RDX: 0000000000000002 RSI: 0000561f72c31722 RDI: 0000561f72c31720 RBP: 000000000000002a R08: 00007ffe5d33fa40 R09: 0000000000000014 R10: 0000000000000000 R11: 0000000000000246 R12: 0000561f7187e380 R13: 0000000000000000 R14: 0000000000000000 R15: 0000561f72c31460 </TASK> Modules linked in: sch_ets sch_tbf dummy rfkill iTCO_wdt intel_rapl_msr iTCO_vendor_support intel_rapl_common joydev virtio_balloon lpc_ich i2c_i801 i2c_smbus pcspkr ip_tables xfs libcrc32c crct10dif_pclmul crc32_pclmul crc32c_intel ahci libahci ghash_clmulni_intel serio_raw libata virtio_blk virtio_console virtio_net net_failover failover sunrpc dm_mirror dm_region_hash dm_log dm_mod CR2: 0000000000000018
Ensuring that 'alist' was never zeroed [1] was not sufficient, we need to remove from the active list those elements that are no more SP nor DRR.
v3: fix race between ets_qdisc_change() and ets_qdisc_dequeue() delisting
DRR classes beyond 'nbands' in ets_qdisc_change() with the qdisc lock acquired, thanks to Cong Wang.
v2: when a NULL qdisc is found in the DRR active list, try to dequeue skb
from the next list item.
--- net/sched/sch_ets.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/sched/sch_ets.c +5 -3
@@ -667,12 +667,14 @@ static int ets_qdisc_change(struct Qdisc *sch, struct nlattr *opt, q->classes[i].deficit = quanta[i]; } } +for (i = q->nbands; i < oldbands; i++) { +qdisc_tree_flush_backlog (q->classes[i].qdisc); +if (i >= q->nstrict) +list_del (&q->classes[i].alist); + } q->nstrict = nstrict;memcpy (q->prio2band, priomap,sizeof (priomap)); -for (i = q->nbands; i < oldbands; i++) -qdisc_tree_flush_backlog (q->classes[i].qdisc); -for (i =0 ; i < q->nbands; i++) q->classes[i].quantum = quanta[i];
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 148/179 ethtool: ioctl: fix potential NULL deref in ethtool_set_coalesce()
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
[ Upstream commit 0276af2176c78771da7f311621a25d7608045827 ]
ethtool_set_coalesce() now uses both the .get_coalesce() and .set_coalesce() callbacks. But the check for their availability is buggy, so changing the coalesce settings on a device where the driver provides only _one_ of the callbacks results in a NULL pointer dereference instead of an -EOPNOTSUPP.
Fix the condition so that the availability of both callbacks is ensured. This also matches the netlink code.
Note that reproducing this requires some effort - it only affects the legacy ioctl path, and needs a specific combination of driver options:
- have .get_coalesce() and .coalesce_supported but no .set_coalesce(), or
- have .set_coalesce() but no .get_coalesce(). Here eg. ethtool doesn't cause the crash as it first attempts to call ethtool_get_coalesce() and bails out on error.
--- net/ethtool/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ethtool/ioctl.c +1 -1
@@ -1697,7 +1697,7 @@ static noinline_for_stack int ethtool_set_coalesce(struct net_device *dev,struct ethtool_coalesce coalesce;int ret; -if (!dev->ethtool_ops->set_coalesce && !dev->ethtool_ops->get_coalesce) +if (!dev->ethtool_ops->set_coalesce || !dev->ethtool_ops->get_coalesce)return -EOPNOTSUPP ; ret = dev->ethtool_ops->get_coalesce(dev, &coalesce, &kernel_coalesce,
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 149/179 net: vlan: fix underflow for the real_dev refcnt
In reply to Greg Kroah-HartmanFrom: Ziyang Xuan <[email protected]>
[ Upstream commit 01d9cc2dea3fde3bad6d27f464eff463496e2b00 ]
Inject error before dev_hold(real_dev) in register_vlan_dev(), and execute the following testcase:
ip link add dev dummy1 type dummy
ip link add name dummy1.100 link dummy1 type vlan id 100 ip link del dev dummy1
When the dummy netdevice is removed, we will get a WARNING as following:
=======================================================================refcount_t: decrement hit 0; leaking memory.
WARNING: CPU: 2 PID: 0 at lib/refcount.c:31 refcount_warn_saturate+0xbf/0x1e0
and an endless loop of:
=======================================================================unregister_netdevice: waiting for dummy1 to become free. Usage count = -1073741824
That is because dev_put(real_dev) in vlan_dev_free() be called without dev_hold(real_dev) in register_vlan_dev(). It makes the refcnt of real_dev underflow.
Move the dev_hold(real_dev) to vlan_dev_init() which is the call-back of ndo_init(). That makes dev_hold() and dev_put() for vlan's real_dev symmetrical.
--- net/8021q/vlan.c | 3 --- net/8021q/vlan_dev.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)
net/8021q/vlan.c +0 -3
@@ -184,9 +184,6 @@ int register_vlan_dev(struct net_device *dev, struct netlink_ext_ack *extack)if (err) goto out_unregister_netdev; -/* Account for reference in struct vlan_dev_priv */ -dev_hold (real_dev); -vlan_stacked_transfer_operstate (real_dev, dev, vlan);linkwatch_fire_event (dev);/* _MUST_ call rfc2863_policy() */
net/8021q/vlan_dev.c +3 -0
@@ -615,6 +615,9 @@ static int vlan_dev_init(struct net_device *dev)if (!vlan->vlan_pcpu_stats)return -ENOMEM ; +/* Get vlan's reference to real_dev */ +dev_hold (real_dev); +return 0 ; }
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 150/179 net/smc: Dont call clcsock shutdown twice when smc shutdown
In reply to Greg Kroah-HartmanFrom: Tony Lu <[email protected]>
[ Upstream commit bacb6c1e47691cda4a95056c21b5487fb7199fcc ]
When applications call shutdown() with SHUT_RDWR in userspace, smc_close_active() calls kernel_sock_shutdown(), and it is called twice in smc_shutdown().
This fixes this by checking sk_state before do clcsock shutdown, and avoids missing the application's call of smc_shutdown().
--- net/smc/af_smc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/smc/af_smc.c +7 -1
@@ -2154,8 +2154,10 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,static int smc_shutdown (struct socket *sock,int how) {struct sock *sk = sock->sk; +bool do_shutdown = true;struct smc_sock *smc;int rc = -EINVAL ; +int old_state;int rc1 =0 ; smc =smc_sk (sk);
@@ -2182,7 +2184,11 @@ static int smc_shutdown(struct socket *sock, int how) }switch (how) {case SHUT_RDWR :/* shutdown in both directions */ + old_state = sk->sk_state; rc =smc_close_active (smc); +if (old_state ==SMC_ACTIVE && + sk->sk_state ==SMC_PEERCLOSEWAIT1 ) + do_shutdown = false;break ;case SHUT_WR : rc =smc_close_shutdown_write (smc);
@@ -2192,7 +2198,7 @@ static int smc_shutdown(struct socket *sock, int how)/* nothing more to do because peer is not involved */ break ; } -if (smc->clcsock) +if (do_shutdown && smc->clcsock) rc1 =kernel_sock_shutdown (smc->clcsock, how);/* map sock_shutdown_cmd constants to sk_shutdown value range */ sk->sk_shutdown |= how +1 ;
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 151/179 net: hns3: fix VF RSS failed problem after PF enable multi-TCs
In reply to Greg Kroah-HartmanFrom: Guangbin Huang <[email protected]>
[ Upstream commit 8d2ad993aa05c0768f00c886c9d369cd97a337ac ]
When PF is set to multi-TCs and configured mapping relationship between priorities and TCs, the hardware will active these settings for this PF and its VFs.
In this case when VF just uses one TC and its rx packets contain priority, and if the priority is not mapped to TC0, as other TCs of VF is not valid, hardware always put this kind of packets to the queue 0. It cause this kind of packets of VF can not be used RSS function.
To fix this problem, set tc mode of all unused TCs of VF to the setting of TC0, then rx packet with priority which map to unused TC will be direct to TC0.
--- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +2 -2
@@ -703,9 +703,9 @@ static int hclgevf_set_rss_tc_mode(struct hclgevf_dev *hdev, u16 rss_size) roundup_size =ilog2 (roundup_size);for (i =0 ; i <HCLGEVF_MAX_TC_NUM ; i++) { - tc_valid[i] = !!(hdev->hw_tc_map &BIT (i)); + tc_valid[i] =1 ; tc_size[i] = roundup_size; - tc_offset[i] = rss_size * i; + tc_offset[i] = (hdev->hw_tc_map &BIT (i)) ? rss_size * i :0 ; }hclgevf_cmd_setup_basic_desc (&desc,HCLGEVF_OPC_RSS_TC_MODE , false);
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 152/179 net: hns3: fix incorrect components info of ethtool --reset command
In reply to Greg Kroah-HartmanFrom: Jie Wang <[email protected]>
[ Upstream commit 82229c4dbb8a2780f05fa1bab29c97ef7bcd21bb ]
Currently, HNS3 driver doesn't clear the reset flags of components after successfully executing reset, it causes userspace info of "Components reset" and "Components not reset" is incorrect.
So fix this problem by clear corresponding reset flag after reset process.
--- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +4 -0
@@ -985,6 +985,7 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags)struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev);const struct hnae3_ae_ops *ops = h->ae_algo->ops;const struct hns3_reset_type_map *rst_type_map; +enum ethtool_reset_flags rst_flags;u32 i, size;if (ops->ae_dev_resetting && ops->ae_dev_resetting (h))
@@ -1004,6 +1005,7 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags)for (i =0 ; i < size; i++) {if (rst_type_map[i].rst_flags == *flags) { rst_type = rst_type_map[i].rst_type; + rst_flags = rst_type_map[i].rst_flags;break ; } }
@@ -1019,6 +1021,8 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags) ops->reset_event (h->pdev, h); + *flags &= ~rst_flags; +return 0 ; }
Signature · 1 line
2.33.0