5.2.12-stable review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.2.12-stable review
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. 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.2.12-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.2.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.2.12-rc1
Cong Wang <[email protected]>
hsr: implement dellink to clean up resources
Daniel Borkmann <[email protected]>
bpf: fix use after free in prog symbol exposure
Greg Kroah-Hartman <[email protected]>
x86/ptrace: fix up botched merge of spectrev1 fix
Manasi Navare <[email protected]>
drm/i915/dp: Fix DSC enable code to use cpu_transcoder instead of encoder->type
Ville Syrjälä <[email protected]>
drm/i915: Do not create a new max_bpc prop for MST connectors
Luca Coelho <[email protected]>
iwlwifi: pcie: handle switching killer Qu B0 NICs to C0
Luca Coelho <[email protected]>
iwlwifi: pcie: don't switch FW to qnj when ax201 is detected
Luca Coelho <[email protected]>
iwlwifi: pcie: add support for qu c-step devices
Ihab Zhaika <[email protected]>
iwlwifi: change 0x02F0 fw from qu to quz
Ihab Zhaika <[email protected]>
iwlwifi: add new cards for 9000 and 20000 series
Ihab Zhaika <[email protected]>
iwlwifi: add new cards for 22000 and change wrong structs
Ihab Zhaika <[email protected]>
iwlwifi: add new cards for 22000 and fix struct name
Chunyan Zhang <[email protected]>
mmc: sdhci-sprd: add get_ro hook function
Baolin Wang <[email protected]>
mmc: sdhci-sprd: Implement the get_max_timeout_count() interface
Chunyan Zhang <[email protected]>
mmc: sdhci-sprd: clear the UHS-I modes read from registers
Denis Kenzior <[email protected]>
mac80211: Correctly set noencrypt for PAE frames
Denis Kenzior <[email protected]>
mac80211: Don't memset RXCB prior to PAE intercept
Alexander Wetzel <[email protected]>
cfg80211: Fix Extended Key ID key install checks
Johannes Berg <[email protected]>
mac80211: fix possible sta leak
Hodaszi, Robert <[email protected]>
Revert "cfg80211: fix processing world regdomain when non modular"
Shakeel Butt <[email protected]>
mm: memcontrol: fix percpu vmstats and vmevents flush
Roman Gushchin <[email protected]>
mm, memcg: partially revert "mm/memcontrol.c: keep local VM counters in sync with the hierarchical ones"
Chunyan Zhang <[email protected]>
mms: sdhci-sprd: add SDHCI_QUIRK_BROKEN_CARD_DETECTION
Stanislaw Gruszka <[email protected]>
mt76: mt76x0u: do not reset radio on resume
Trond Myklebust <[email protected]>
SUNRPC: Don't handle errors if the bind/connect succeeded
Gary R Hook <[email protected]>
crypto: ccp - Ignore unconfigured CCP device on suspend/resume
Nadav Amit <[email protected]>
VMCI: Release resource if the work is already queued
John Garry <[email protected]>
bus: hisi_lpc: Add .remove method to avoid driver unbind crash
John Garry <[email protected]>
bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free
Andrew Cooks <[email protected]>
i2c: piix4: Fix port selection for AMD Family 16h Model 30h
Lyude Paul <[email protected]>
drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe()
Xiong Zhang <[email protected]>
drm/i915: Don't deballoon unused ggtt drm_mm_node in linux guest
Aaron Liu <[email protected]>
drm/amdgpu: fix GFXOFF on Picasso and Raven2
Kai-Heng Feng <[email protected]>
drm/amdgpu: Add APTX quirk for Dell Latitude 5495
John Garry <[email protected]>
lib: logic_pio: Add logic_pio_unregister_range()
John Garry <[email protected]>
lib: logic_pio: Avoid possible overlap for unregistering regions
John Garry <[email protected]>
lib: logic_pio: Fix RCU usage
Trond Myklebust <[email protected]>
Revert "NFSv4/flexfiles: Abort I/O early if the layout segment was invalidated"
Trond Myklebust <[email protected]>
NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0
Trond Myklebust <[email protected]>
NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend()
Raul E Rangel <[email protected]>
lkdtm/bugs: fix build error in lkdtm_EXHAUST_STACK
Eddie James <[email protected]>
fsi: scom: Don't abort operations for minor errors
Colin Ian King <[email protected]>
typec: tcpm: fix a typo in the comparison of pdo_max_voltage
Alexander Shishkin <[email protected]>
intel_th: pci: Add Tiger Lake support
Alexander Shishkin <[email protected]>
intel_th: pci: Add support for another Lewisburg PCH
Ding Xiang <[email protected]>
stm class: Fix a double free of stm_source_device
Chunyan Zhang <[email protected]>
mmc: sdhci-sprd: add SDHCI_QUIRK2_PRESET_VALUE_BROKEN
Chunyan Zhang <[email protected]>
mmc: sdhci-sprd: fixed incorrect clock divider
Ulf Hansson <[email protected]>
mmc: core: Fix init of SD cards reporting an invalid VDD range
Masahiro Yamada <[email protected]>
mmc: sdhci-cadence: enable v4_mode to fix ADMA 64-bit addressing
Eugen Hristev <[email protected]>
mmc: sdhci-of-at91: add quirk for broken HS200
Dmitry Osipenko <[email protected]>
Revert "mmc: sdhci-tegra: drop ->get_ro() implementation"
Tomas Winkler <[email protected]>
mei: me: add Tiger Lake point LP device ID
Marc Zyngier <[email protected]>
KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI
Heyi Guo <[email protected]>
KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long
Alexey Kardashevskiy <[email protected]>
KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling
Pu Wen <[email protected]>
tools/power turbostat: Fix caller parameter of get_tdp_amd()
Kai-Heng Feng <[email protected]>
USB: storage: ums-realtek: Whitelist auto-delink support
Kai-Heng Feng <[email protected]>
USB: storage: ums-realtek: Update module parameter description for auto_delink_en
Geert Uytterhoeven <[email protected]>
usb: host: xhci: rcar: Fix typo in compatible string matching
Yoshihiro Shimoda <[email protected]>
usb: host: ohci: fix a race condition between shutdown and irq
Peter Chen <[email protected]>
usb: chipidea: udc: don't do hardware access if gadget has stopped
Schmid, Carsten <[email protected]>
usb: hcd: use managed device resources
Oliver Neukum <[email protected]>
USB: cdc-wdm: fix race between write and disconnect due to flag abuse
Henk van der Laan <[email protected]>
usb-storage: Add new JMS567 revision to unusual_devs
Oliver Neukum <[email protected]>
usbtmc: more sanity checking for packet size
Steven Rostedt (VMware) <[email protected]>
ftrace: Check for empty hash and comment the race with registering probes
Naveen N. Rao <[email protected]>
ftrace: Check for successful allocation of hash
Naveen N. Rao <[email protected]>
ftrace: Fix NULL pointer dereference in t_probe_next()
Benjamin Tissoires <[email protected]>
HID: logitech-hidpp: remove support for the G700 over USB
Bandan Das <[email protected]>
x86/apic: Include the LDR when clearing out APIC registers
Bandan Das <[email protected]>
x86/apic: Do not initialize LDR and DFR for bigsmp
Thomas Gleixner <[email protected]>
x86/mm/cpa: Prevent large page split when ftrace flips RW on kernel text
Sebastian Mayr <[email protected]>
uprobes/x86: Fix detection of 32-bit user mode
Sean Christopherson <[email protected]>
KVM: x86: Don't update RIP or do single-step on faulting emulation
Vitaly Kuznetsov <[email protected]>
KVM: x86: hyper-v: don't crash on KVM_GET_SUPPORTED_HV_CPUID when kvm_intel.nested is disabled
Radim Krcmar <[email protected]>
kvm: x86: skip populating logical dest map if apic is not sw enabled
Takashi Iwai <[email protected]>
ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604
Takashi Iwai <[email protected]>
ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
Takashi Iwai <[email protected]>
ALSA: seq: Fix potential concurrent access to the deleted pool
Jeronimo Borque <[email protected]>
ALSA: hda - Fixes inverted Conexant GPIO mic mute led
Takashi Iwai <[email protected]>
ALSA: line6: Fix memory leak at line6_init_pcm() error path
Paweł Rekowski <[email protected]>
ALSA: hda/ca0132 - Add new SBZ quirk
Takashi Iwai <[email protected]>
ALSA: usb-audio: Check mixer unit bitmap yet more strictly
Andrew Morton <[email protected]>
mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
Hangbin Liu <[email protected]>
xfrm/xfrm_policy: fix dst dev null pointer dereference in collect_md mode
Hangbin Liu <[email protected]>
ipv4/icmp: fix rt dst dev null pointer dereference
Yi-Hung Wei <[email protected]>
openvswitch: Fix conntrack cache with timeout
Alexey Kodanev <[email protected]>
ipv4: mpls: fix mpls_xmit for iptunnel
Eric Dumazet <[email protected]>
tcp: make sure EPOLLOUT wont be missed
Jason Baron <[email protected]>
net/smc: make sure EPOLLOUT is raised
Li RongQing <[email protected]>
net: fix __ip_mc_inc_group usage
Antoine Tenart <[email protected]>
net: cpsw: fix NULL pointer exception in the probe error path
Stefano Brivio <[email protected]>
ipv6: Fix return value of ipv6_mc_may_pull() for malformed packets
Hangbin Liu <[email protected]>
ipv6/addrconf: allow adding multicast addr if IFA_F_MCAUTOJOIN is set
Lorenzo Bianconi <[email protected]>
mt76: usb: fix rx A-MSDU support
Tomi Valkeinen <[email protected]>
drm/bridge: tfp410: fix memleak in get_modes()
Anders Roxell <[email protected]>
selftests/bpf: install files test_xdp_vlan.sh
Stefan Wahren <[email protected]>
watchdog: bcm2835_wdt: Fix module autoload
Peter Zijlstra <[email protected]>
lcoking/rwsem: Add missing ACQUIRE to read_slowpath sleep loop
Jan Stancek <[email protected]>
locking/rwsem: Add missing ACQUIRE to read_slowpath exit when queue is empty
Adrian Vladu <[email protected]>
tools: hv: fix KVP and VSS daemons exit code
Adrian Vladu <[email protected]>
tools: hv: fixed Python pep8/flake8 warnings for lsvmbus
Hans Ulli Kroll <[email protected]>
usb: host: fotg2: restart hcd after port reset
Y.C. Chen <[email protected]>
drm/ast: Fixed reboot test may cause system hanged
Christian König <[email protected]>
drm/scheduler: use job count instead of peek
Wolfram Sang <[email protected]>
i2c: emev2: avoid race when unregistering slave client
Wolfram Sang <[email protected]>
i2c: rcar: avoid race when unregistering slave client
Paul Walmsley <[email protected]>
riscv: fix flush_tlb_range() end address for flush_tlb_page()
Will Deacon <[email protected]>
arm64: cpufeature: Don't treat granule sizes as strict
Wenwen Wang <[email protected]>
xen/blkback: fix memory leaks
Ben Segal <[email protected]>
habanalabs: fix device IRQ unmasking for BE host
Oded Gabbay <[email protected]>
habanalabs: fix endianness handling for internal QMAN submission
Ben Segal <[email protected]>
habanalabs: fix completion queue handling when host is BE
Ben Segal <[email protected]>
habanalabs: fix endianness handling for packets from user
Tomer Tayar <[email protected]>
habanalabs: fix DRAM usage accounting on context tear down
Benjamin Herrenschmidt <[email protected]>
usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt
Benjamin Herrenschmidt <[email protected]>
usb: gadget: composite: Clear "suspended" on reset/disconnect
Lucas Stach <[email protected]>
dma-direct: don't truncate dma_required_mask to bus addressing capabilities
Robin Murphy <[email protected]>
iommu/dma: Handle SG length overflow better
Hans Verkuil <[email protected]>
omap-dma/omap_vout_vrfb: fix off-by-one fi value
Jia-Ju Bai <[email protected]>
dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler()
Yishai Hadas <[email protected]>
IB/mlx5: Fix implicit MR release flow
Qu Wenruo <[email protected]>
btrfs: trim: Check the range passed into to prevent overflow
zhengbin <[email protected]>
auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
Pierre-Louis Bossart <[email protected]>
soundwire: cadence_master: fix definitions for INTSTAT0/1
Pierre-Louis Bossart <[email protected]>
soundwire: cadence_master: fix register definition for SLAVE_STATE
Keith Busch <[email protected]>
nvme-pci: Fix async probe remove race
Sagi Grimberg <[email protected]>
nvme: fix controller removal race with scan work
Sagi Grimberg <[email protected]>
nvme-rdma: fix possible use-after-free in connect error flow
Sagi Grimberg <[email protected]>
nvme: fix a possible deadlock when passthru commands sent to a multipath device
Logan Gunthorpe <[email protected]>
nvme-core: Fix extra device_put() call on error path
Logan Gunthorpe <[email protected]>
nvmet-file: fix nvmet_file_flush() always returning an error
Logan Gunthorpe <[email protected]>
nvmet-loop: Flush nvme_delete_wq when removing the port
Logan Gunthorpe <[email protected]>
nvmet: Fix use-after-free bug when a port is removed
David Howells <[email protected]>
afs: Fix missing dentry data version updating
David Howells <[email protected]>
afs: Only update d_fsdata if different in afs_d_revalidate()
David Howells <[email protected]>
afs: Fix off-by-one in afs_rename() expected data version calculation
Jia-Ju Bai <[email protected]>
fs: afs: Fix a possible null-pointer dereference in afs_put_read()
Marc Dionne <[email protected]>
afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u()
David Howells <[email protected]>
afs: Fix the CB.ProbeUuid service handler to reply correctly
Anthony Iliopoulos <[email protected]>
nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns
Arnd Bergmann <[email protected]>
dmaengine: ste_dma40: fix unneeded variable warning
-------------
Diffstat:
Makefile | 4 +- arch/arm64/kernel/cpufeature.c | 14 +- arch/powerpc/kvm/book3s_64_vio.c | 6 +- arch/powerpc/kvm/book3s_64_vio_hv.c | 6 +- arch/riscv/include/asm/tlbflush.h | 11 +- arch/x86/kernel/apic/apic.c | 4 + arch/x86/kernel/apic/bigsmp_32.c | 24 +- arch/x86/kernel/ptrace.c | 3 +- arch/x86/kernel/uprobes.c | 17 +- arch/x86/kvm/hyperv.c | 5 +- arch/x86/kvm/lapic.c | 5 + arch/x86/kvm/svm.c | 8 +- arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 9 +- arch/x86/mm/pageattr.c | 26 +- drivers/auxdisplay/panel.c | 2 + drivers/block/xen-blkback/xenbus.c | 6 +- drivers/bus/hisi_lpc.c | 47 +++- drivers/crypto/ccp/ccp-dev.c | 8 + drivers/dma/ste_dma40.c | 4 +- drivers/dma/stm32-mdma.c | 2 +- drivers/dma/ti/omap-dma.c | 4 +- drivers/fsi/fsi-scom.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +- drivers/gpu/drm/ast/ast_main.c | 5 +- drivers/gpu/drm/ast/ast_mode.c | 2 +- drivers/gpu/drm/ast/ast_post.c | 2 +- drivers/gpu/drm/bridge/ti-tfp410.c | 7 +- drivers/gpu/drm/i915/i915_drv.c | 6 + drivers/gpu/drm/i915/i915_vgpu.c | 3 + drivers/gpu/drm/i915/intel_dp_mst.c | 10 +- drivers/gpu/drm/i915/intel_vdsc.c | 2 +- drivers/gpu/drm/scheduler/sched_entity.c | 4 +- drivers/hid/hid-logitech-hidpp.c | 2 - drivers/hwtracing/intel_th/pci.c | 10 + drivers/hwtracing/stm/core.c | 1 - drivers/i2c/busses/i2c-emev2.c | 16 +- drivers/i2c/busses/i2c-piix4.c | 12 +- drivers/i2c/busses/i2c-rcar.c | 11 +- drivers/infiniband/core/umem_odp.c | 4 - drivers/infiniband/hw/mlx5/odp.c | 24 +- drivers/iommu/dma-iommu.c | 2 +- drivers/media/platform/omap/omap_vout_vrfb.c | 3 +- drivers/misc/habanalabs/goya/goya.c | 72 ++++-- drivers/misc/habanalabs/goya/goyaP.h | 2 +- drivers/misc/habanalabs/habanalabs.h | 9 +- drivers/misc/habanalabs/hw_queue.c | 14 +- .../misc/habanalabs/include/goya/goya_packets.h | 13 + drivers/misc/habanalabs/irq.c | 27 +-- drivers/misc/habanalabs/memory.c | 2 + drivers/misc/lkdtm/bugs.c | 4 +- drivers/misc/mei/hw-me-regs.h | 2 + drivers/misc/mei/pci-me.c | 2 + drivers/misc/vmw_vmci/vmci_doorbell.c | 6 +- drivers/mmc/core/sd.c | 6 + drivers/mmc/host/sdhci-cadence.c | 1 + drivers/mmc/host/sdhci-of-at91.c | 3 + drivers/mmc/host/sdhci-sprd.c | 37 ++- drivers/mmc/host/sdhci-tegra.c | 14 ++ drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 221 ++++++++++++++++- drivers/net/wireless/intel/iwlwifi/iwl-config.h | 23 +- drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 2 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 268 ++++++++++++--------- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 9 +- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 8 +- drivers/net/wireless/mediatek/mt76/usb.c | 46 +++- drivers/nvme/host/core.c | 15 +- drivers/nvme/host/multipath.c | 76 +++++- drivers/nvme/host/nvme.h | 21 +- drivers/nvme/host/pci.c | 3 +- drivers/nvme/host/rdma.c | 16 +- drivers/nvme/target/configfs.c | 1 + drivers/nvme/target/core.c | 15 ++ drivers/nvme/target/loop.c | 8 + drivers/nvme/target/nvmet.h | 3 + drivers/soundwire/cadence_master.c | 8 +- drivers/usb/chipidea/udc.c | 32 ++- drivers/usb/class/cdc-wdm.c | 16 +- drivers/usb/class/usbtmc.c | 3 + drivers/usb/core/hcd-pci.c | 30 +-- drivers/usb/gadget/composite.c | 1 + drivers/usb/gadget/function/f_mass_storage.c | 28 ++- drivers/usb/host/fotg210-hcd.c | 4 + drivers/usb/host/ohci-hcd.c | 15 +- drivers/usb/host/xhci-rcar.c | 2 +- drivers/usb/storage/realtek_cr.c | 15 +- drivers/usb/storage/unusual_devs.h | 2 +- drivers/usb/typec/tcpm/tcpm.c | 2 +- drivers/watchdog/bcm2835_wdt.c | 1 + fs/afs/cmservice.c | 10 +- fs/afs/dir.c | 89 +++++-- fs/afs/file.c | 12 +- fs/afs/vlclient.c | 11 +- fs/btrfs/extent-tree.c | 14 +- fs/nfs/direct.c | 27 ++- fs/nfs/flexfilelayout/flexfilelayout.c | 17 -- fs/nfs/pagelist.c | 17 +- include/linux/logic_pio.h | 1 + include/linux/sunrpc/sched.h | 1 - include/net/addrconf.h | 2 +- kernel/bpf/syscall.c | 30 ++- kernel/dma/direct.c | 3 - kernel/locking/rwsem-xadd.c | 6 +- kernel/trace/ftrace.c | 17 ++ lib/logic_pio.c | 73 ++++-- mm/memcontrol.c | 18 +- mm/zsmalloc.c | 2 + net/core/stream.c | 16 +- net/hsr/hsr_device.c | 13 +- net/hsr/hsr_device.h | 1 + net/hsr/hsr_framereg.c | 11 +- net/hsr/hsr_framereg.h | 3 +- net/hsr/hsr_netlink.c | 7 + net/ipv4/icmp.c | 8 +- net/ipv4/igmp.c | 4 +- net/ipv6/addrconf.c | 3 +- net/mac80211/cfg.c | 9 +- net/mac80211/rx.c | 6 +- net/mpls/mpls_iptunnel.c | 8 +- net/openvswitch/conntrack.c | 13 + net/smc/smc_tx.c | 6 +- net/sunrpc/clnt.c | 35 ++- net/sunrpc/xprt.c | 7 - net/wireless/reg.c | 2 +- net/wireless/util.c | 23 +- net/xfrm/xfrm_policy.c | 4 +- sound/core/seq/seq_clientmgr.c | 3 +- sound/core/seq/seq_fifo.c | 17 ++ sound/core/seq/seq_fifo.h | 2 + sound/pci/hda/patch_ca0132.c | 1 + sound/pci/hda/patch_conexant.c | 17 +- sound/usb/line6/pcm.c | 18 +- sound/usb/mixer.c | 36 ++- sound/usb/mixer_quirks.c | 8 +- sound/usb/pcm.c | 1 + tools/hv/hv_kvp_daemon.c | 2 + tools/hv/hv_vss_daemon.c | 2 + tools/hv/lsvmbus | 75 +++--- tools/power/x86/turbostat/turbostat.c | 2 +- tools/testing/selftests/bpf/Makefile | 3 +- virt/kvm/arm/vgic/vgic-mmio.c | 18 ++ virt/kvm/arm/vgic/vgic-v2.c | 5 +- virt/kvm/arm/vgic/vgic-v3.c | 5 +- virt/kvm/arm/vgic/vgic.c | 7 + 147 files changed, 1562 insertions(+), 665 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/143 dmaengine: ste_dma40: fix unneeded variable warning
[ Upstream commit 5d6fb560729a5d5554e23db8d00eb57cd0021083 ]
clang-9 points out that there are two variables that depending on the configuration may only be used in an ARRAY_SIZE() expression but not referenced:
drivers/dma/ste_dma40.c:145:12: error: variable 'd40_backup_regs' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
static u32 d40_backup_regs[] = {
^drivers/dma/ste_dma40.c:214:12: error: variable 'd40_backup_regs_chan' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] static u32 d40_backup_regs_chan[] = {
Mark these __maybe_unused to shut up the warning.
--- drivers/dma/ste_dma40.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/ste_dma40.c +2 -2
@@ -142,7 +142,7 @@ enum d40_events {* when the DMA hw is powered off. * TODO: Add save/restore of D40_DREG_GCC on dma40 v3 or later, if that works. */ -static u32 d40_backup_regs[] = { +static __maybe_unused u32 d40_backup_regs[] = {D40_DREG_LCPA ,D40_DREG_LCLA ,D40_DREG_PRMSE ,
@@ -211,7 +211,7 @@ static u32 d40_backup_regs_v4b[] = {#define BACKUP_REGS_SZ_V4B ARRAY_SIZE(d40_backup_regs_v4b) -static u32 d40_backup_regs_chan[] = { +static __maybe_unused u32 d40_backup_regs_chan[] = {D40_CHAN_REG_SSCFG ,D40_CHAN_REG_SSELT ,D40_CHAN_REG_SSPTR ,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 2/143 nvme-multipath: revalidate nvme_ns_head gendisk in nvme_validate_ns
In reply to Greg Kroah-Hartman[ Upstream commit fab7772bfbcfe8fb8e3e352a6a8fcaf044cded17 ]
When CONFIG_NVME_MULTIPATH is set, only the hidden gendisk associated with the per-controller ns is run through revalidate_disk when a rescan is triggered, while the visible blockdev never gets its size (bdev->bd_inode->i_size) updated to reflect any capacity changes that may have occurred.
This prevents online resizing of nvme block devices and in extension of any filesystems atop that will are unable to expand while mounted, as userspace relies on the blockdev size for obtaining the disk capacity (via BLKGETSIZE/64 ioctls).
Fix this by explicitly revalidating the actual namespace gendisk in addition to the per-controller gendisk, when multipath is enabled.
--- drivers/nvme/host/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvme/host/core.c +1 -0
@@ -1668,6 +1668,7 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)if (ns->head->disk) {nvme_update_disk_info (ns->head->disk, ns, id);blk_queue_stack_limits (ns->head->disk->queue, ns->queue); +revalidate_disk (ns->head->disk); }#endif }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 3/143 afs: Fix the CB.ProbeUuid service handler to reply correctly
In reply to Greg Kroah-Hartman[ Upstream commit 2067b2b3f4846402a040286135f98f46f8919939 ]
Fix the service handler function for the CB.ProbeUuid RPC call so that it replies in the correct manner - that is an empty reply for success and an abort of 1 for failure.
Putting 0 or 1 in an integer in the body of the reply should result in the fileserver throwing an RX_PROTOCOL_ERROR abort and discarding its record of the client; older servers, however, don't necessarily check that all the data got consumed, and so might incorrectly think that they got a positive response and associate the client with the wrong host record.
If the client is incorrectly associated, this will result in callbacks intended for a different client being delivered to this one and then, when the other client connects and responds positively, all of the callback promises meant for the client that issued the improper response will be lost and it won't receive any further change notifications.
--- fs/afs/cmservice.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
fs/afs/cmservice.c +3 -7
@@ -502,18 +502,14 @@ static void SRXAFSCB_ProbeUuid(struct work_struct *work) struct afs_call *call = container_of(work, struct afs_call, work);struct afs_uuid *r = call->request; -struct { -__be32 match; - } reply; -_enter ("" );if (memcmp (r, &call->net->uuid,sizeof (call->net->uuid)) ==0 ) - reply.match =htonl (0 ); +afs_send_empty_reply (call);else - reply.match =htonl (1 ); +rxrpc_kernel_abort_call (call->net->socket, call->rxcall, +1 ,1 ,"K-1" ); -afs_send_simple_reply (call, &reply,sizeof (reply));afs_put_call (call);_leave ("" ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 4/143 afs: Fix loop index mixup in afs_deliver_vl_get_entry_by_name_u()
In reply to Greg Kroah-Hartman[ Upstream commit 4a46fdba449a5cd890271df5a9e23927d519ed00 ]
afs_deliver_vl_get_entry_by_name_u() scans through the vl entry received from the volume location server and builds a return list containing the sites that are currently valid. When assigning values for the return list, the index into the vl entry (i) is used rather than the one for the new list (entry->nr_server). If all sites are usable, this works out fine as the indices will match. If some sites are not valid, for example if AFS_VLSF_DONTUSE is set, fs_mask and the uuid will be set for the wrong return site.
Fix this by using entry->nr_server as the index into the arrays being filled in rather than i.
This can lead to EDESTADDRREQ errors if none of the returned sites have a valid fs_mask.
--- fs/afs/vlclient.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/afs/vlclient.c +6 -5
@@ -56,23 +56,24 @@ static int afs_deliver_vl_get_entry_by_name_u(struct afs_call *call)struct afs_uuid__xdr *xdr;struct afs_uuid *uuid;int j; +int n = entry->nr_servers; tmp =ntohl (uvldb->serverFlags[i]);if (tmp &AFS_VLSF_DONTUSE || (new_only && !(tmp &AFS_VLSF_NEWREPSITE )))continue ;if (tmp &AFS_VLSF_RWVOL ) { - entry->fs_mask[i] |=AFS_VOL_VTM_RW ; + entry->fs_mask[n] |=AFS_VOL_VTM_RW ;if (vlflags &AFS_VLF_BACKEXISTS ) - entry->fs_mask[i] |=AFS_VOL_VTM_BAK ; + entry->fs_mask[n] |=AFS_VOL_VTM_BAK ; }if (tmp &AFS_VLSF_ROVOL ) - entry->fs_mask[i] |=AFS_VOL_VTM_RO ; -if (!entry->fs_mask[i]) + entry->fs_mask[n] |=AFS_VOL_VTM_RO ; +if (!entry->fs_mask[n])continue ; xdr = &uvldb->serverNumber[i]; - uuid = (struct afs_uuid *)&entry->fs_server[i]; + uuid = (struct afs_uuid *)&entry->fs_server[n]; uuid->time_low = xdr->time_low; uuid->time_mid =htons (ntohl (xdr->time_mid)); uuid->time_hi_and_version =htons (ntohl (xdr->time_hi_and_version));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 5/143 fs: afs: Fix a possible null-pointer dereference in afs_put_read()
In reply to Greg Kroah-Hartman[ Upstream commit a6eed4ab5dd4bfb696c1a3f49742b8d1846a66a0 ]
In afs_read_dir(), there is an if statement on line 255 to check whether req->pages is NULL:
if (!req->pages) goto error;
If req->pages is NULL, afs_put_read() on line 337 is executed. In afs_put_read(), req->pages[i] is used on line 195. Thus, a possible null-pointer dereference may occur in this case.
To fix this possible bug, an if statement is added in afs_put_read() to check req->pages.
This bug is found by a static analysis tool STCheck written by us.
--- fs/afs/file.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/afs/file.c +7 -5
@@ -191,11 +191,13 @@ void afs_put_read(struct afs_read *req)int i;if (refcount_dec_and_test (&req->usage)) { -for (i =0 ; i < req->nr_pages; i++) -if (req->pages[i]) -put_page (req->pages[i]); -if (req->pages != req->array) -kfree (req->pages); +if (req->pages) { +for (i =0 ; i < req->nr_pages; i++) +if (req->pages[i]) +put_page (req->pages[i]); +if (req->pages != req->array) +kfree (req->pages); + }kfree (req); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 6/143 afs: Fix off-by-one in afs_rename() expected data version calculation
In reply to Greg Kroah-Hartman[ Upstream commit 37c0bbb3326674940e657118306ac52364314523 ]
When afs_rename() calculates the expected data version of the target directory in a cross-directory rename, it doesn't increment it as it should, so it always thinks that the target inode is unexpectedly modified on the server.
--- fs/afs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/afs/dir.c +1 -1
@@ -1807,7 +1807,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry,afs_end_vnode_operation (&fc); goto error_rehash; } - new_data_version = new_dvnode->status.data_version; + new_data_version = new_dvnode->status.data_version +1 ; }else { new_data_version = orig_data_version; new_scb = &scb[0 ];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 7/143 afs: Only update d_fsdata if different in afs_d_revalidate()
In reply to Greg Kroah-Hartman[ Upstream commit 5dc84855b0fc7e1db182b55c5564fd539d6eff92 ]
In the in-kernel afs filesystem, d_fsdata is set with the data version of the parent directory. afs_d_revalidate() will update this to the current directory version, but it shouldn't do this if it the value it read from d_fsdata is the same as no lock is held and cmpxchg() is not used.
Fix the code to only change the value if it is different from the current directory version.
--- fs/afs/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/afs/dir.c +2 -1
@@ -1018,7 +1018,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) dir_version = (long )dir->status.data_version; de_version = (long )dentry->d_fsdata;if (de_version == dir_version) - goto out_valid; + goto out_valid_noupdate; dir_version = (long )dir->invalid_before;if (de_version - dir_version >=0 )
@@ -1082,6 +1082,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) out_valid: dentry->d_fsdata = (void *)dir_version; +out_valid_noupdate:dput (parent);key_put (key);_leave (" = 1 [valid]" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/143 afs: Fix missing dentry data version updating
In reply to Greg Kroah-Hartman[ Upstream commit 9dd0b82ef530cdfe805c9f7079c99e104be59a14 ]
In the in-kernel afs filesystem, the d_fsdata dentry field is used to hold the data version of the parent directory when it was created or when d_revalidate() last caused it to be updated. This is compared to the ->invalid_before field in the directory inode, rather than the actual data version number, thereby allowing changes due to local edits to be ignored. Only if the server data version gets bumped unexpectedly (eg. by a competing client), do we need to revalidate stuff.
However, the d_fsdata field should also be updated if an rpc op is performed that modifies that particular dentry. Such ops return the revised data version of the directory(ies) involved, so we should use that.
This is particularly problematic for rename, since a dentry from one directory may be moved directly into another directory (ie. mv a/x b/x). It would then be sporting the wrong data version - and if this is in the future, for the destination directory, revalidations would be missed, leading to foreign renames and hard-link deletion being missed.
Fix this by the following means:
(1) Return the data version number from operations that read the directory contents - if they issue the read. This starts in afs_dir_iterate() and is used, ignored or passed back by its callers.
(2) In afs_lookup*(), set the dentry version to the version returned by
(1) before d_splice_alias() is called and the dentry published.
(3) In afs_d_revalidate(), set the dentry version to that returned from
(1) if an rpc call was issued. This means that if a parallel procedure, such as mkdir(), modifies the directory, we won't accidentally use the data version from that.
(4) In afs_{mkdir,create,link,symlink}(), set the new dentry's version to the directory data version before d_instantiate() is called.
(5) In afs_{rmdir,unlink}, update the target dentry's version to the directory data version as soon as we've updated the directory inode.
(6) In afs_rename(), we need to unhash the old dentry before we start so that we don't get afs_d_revalidate() reverting the version change in cross-directory renames.
We then need to set both the old and the new dentry versions the data version of the new directory before we call d_move() as d_move() will rehash them.
--- fs/afs/dir.c | 84 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 14 deletions(-)
fs/afs/dir.c +70 -14
@@ -441,7 +441,7 @@ static int afs_dir_iterate_block(struct afs_vnode *dvnode,* iterate through the data blob that lists the contents of an AFS directory */ static int afs_dir_iterate (struct inode *dir,struct dir_context *ctx, -struct key *key) +struct key *key,afs_dataversion_t *_dir_version) {struct afs_vnode *dvnode =AFS_FS_I (dir);struct afs_xdr_dir_page *dbuf;
@@ -461,6 +461,7 @@ static int afs_dir_iterate(struct inode *dir, struct dir_context *ctx, req =afs_read_dir (dvnode, key);if (IS_ERR (req))return PTR_ERR (req); + *_dir_version = req->data_version;/* round the file position up to the next entry boundary */ ctx->pos +=sizeof (union afs_xdr_dirent ) -1 ;
@@ -515,7 +516,10 @@ out:*/ static int afs_readdir (struct file *file,struct dir_context *ctx) { -return afs_dir_iterate (file_inode (file), ctx,afs_file_key (file)); +afs_dataversion_t dir_version; + +return afs_dir_iterate (file_inode (file), ctx,afs_file_key (file), + &dir_version); }/*
@@ -556,7 +560,8 @@ static int afs_lookup_one_filldir(struct dir_context *ctx, const char *name,* - just returns the FID the dentry name maps to if found */ static int afs_do_lookup_one (struct inode *dir,struct dentry *dentry, -struct afs_fid *fid,struct key *key) +struct afs_fid *fid,struct key *key, +afs_dataversion_t *_dir_version) {struct afs_super_info *as = dir->i_sb->s_fs_info;struct afs_lookup_one_cookie cookie = {
@@ -569,7 +574,7 @@ static int afs_do_lookup_one(struct inode *dir, struct dentry *dentry,_enter ("{%lu},%p{%pd}," , dir->i_ino, dentry, dentry);/* search the directory */ - ret =afs_dir_iterate (dir, &cookie.ctx, key); + ret =afs_dir_iterate (dir, &cookie.ctx, key, _dir_version);if (ret <0 ) {_leave (" = %d [iter]" , ret);return ret;
@@ -643,6 +648,7 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry,struct afs_server *server;struct afs_vnode *dvnode =AFS_FS_I (dir), *vnode;struct inode *inode =NULL , *ti; +afs_dataversion_t data_version =READ_ONCE (dvnode->status.data_version);int ret, i;_enter ("{%lu},%p{%pd}," , dir->i_ino, dentry, dentry);
@@ -670,12 +676,14 @@ static struct inode *afs_do_lookup(struct inode *dir, struct dentry *dentry, cookie->fids[i].vid = as->volume->vid;/* search the directory */ - ret =afs_dir_iterate (dir, &cookie->ctx, key); + ret =afs_dir_iterate (dir, &cookie->ctx, key, &data_version);if (ret <0 ) { inode =ERR_PTR (ret); goto out; } + dentry->d_fsdata = (void *)(unsigned long )data_version; + inode =ERR_PTR (-ENOENT );if (!cookie->found) goto out;
@@ -969,7 +977,8 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)struct dentry *parent;struct inode *inode;struct key *key; -long dir_version, de_version; +afs_dataversion_t dir_version; +long de_version;int ret;if (flags &LOOKUP_RCU )
@@ -1015,20 +1024,20 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags)* on a 32-bit system, we only have 32 bits in the dentry to store the * version. */ - dir_version = (long )dir->status.data_version; + dir_version = dir->status.data_version; de_version = (long )dentry->d_fsdata; -if (de_version == dir_version) +if (de_version == (long )dir_version) goto out_valid_noupdate; - dir_version = (long )dir->invalid_before; -if (de_version - dir_version >=0 ) + dir_version = dir->invalid_before; +if (de_version - (long )dir_version >=0 ) goto out_valid;_debug ("dir modified" );afs_stat_v (dir, n_reval);/* search the directory for this vnode */ - ret =afs_do_lookup_one (&dir->vfs_inode, dentry, &fid, key); + ret =afs_do_lookup_one (&dir->vfs_inode, dentry, &fid, key, &dir_version);switch (ret) {case 0 :/* the filename maps to something */
@@ -1081,7 +1090,7 @@ static int afs_d_revalidate(struct dentry *dentry, unsigned int flags) } out_valid: - dentry->d_fsdata = (void *)dir_version; + dentry->d_fsdata = (void *)(unsigned long )dir_version; out_valid_noupdate:dput (parent);key_put (key);
@@ -1187,6 +1196,20 @@ static void afs_prep_for_new_inode(struct afs_fs_cursor *fc, iget_data->cb_s_break = fc->cbi->server->cb_s_break; } +/* +* Note that a dentry got changed. We need to set d_fsdata to the data version +* number derived from the result of the operation. It doesn't matter if +* d_fsdata goes backwards as we'll just revalidate. +*/ +static void afs_update_dentry_version (struct afs_fs_cursor *fc, +struct dentry *dentry, +struct afs_status_cb *scb) +{ +if (fc->ac.error ==0 ) + dentry->d_fsdata = + (void *)(unsigned long )scb->status.data_version; +} +/* * create a directory on an AFS filesystem */
@@ -1229,6 +1252,7 @@ static int afs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)afs_check_for_remote_deletion (&fc, dvnode);afs_vnode_commit_status (&fc, dvnode, fc.cb_break, &data_version, &scb[0 ]); +afs_update_dentry_version (&fc, dentry, &scb[0 ]);afs_vnode_new_inode (&fc, dentry, &iget_data, &scb[1 ]); ret =afs_end_vnode_operation (&fc);if (ret <0 )
@@ -1321,6 +1345,7 @@ static int afs_rmdir(struct inode *dir, struct dentry *dentry)afs_vnode_commit_status (&fc, dvnode, fc.cb_break, &data_version, scb); +afs_update_dentry_version (&fc, dentry, scb); ret =afs_end_vnode_operation (&fc);if (ret ==0 ) {afs_dir_remove_subdir (dentry);
@@ -1462,6 +1487,7 @@ static int afs_unlink(struct inode *dir, struct dentry *dentry) &data_version, &scb[0]);afs_vnode_commit_status (&fc, vnode, fc.cb_break_2, &data_version_2, &scb[1 ]); +afs_update_dentry_version (&fc, dentry, &scb[0 ]); ret =afs_end_vnode_operation (&fc);if (ret ==0 && !(scb[1 ].have_status || scb[1 ].have_error)) ret =afs_dir_remove_link (dvnode, dentry, key);
@@ -1530,6 +1556,7 @@ static int afs_create(struct inode *dir, struct dentry *dentry, umode_t mode,afs_check_for_remote_deletion (&fc, dvnode);afs_vnode_commit_status (&fc, dvnode, fc.cb_break, &data_version, &scb[0 ]); +afs_update_dentry_version (&fc, dentry, &scb[0 ]);afs_vnode_new_inode (&fc, dentry, &iget_data, &scb[1 ]); ret =afs_end_vnode_operation (&fc);if (ret <0 )
@@ -1611,6 +1638,7 @@ static int afs_link(struct dentry *from, struct inode *dir,afs_vnode_commit_status (&fc, vnode, fc.cb_break_2,NULL , &scb[1 ]);ihold (&vnode->vfs_inode); +afs_update_dentry_version (&fc, dentry, &scb[0 ]);d_instantiate (dentry, &vnode->vfs_inode);mutex_unlock (&vnode->io_lock);
@@ -1690,6 +1718,7 @@ static int afs_symlink(struct inode *dir, struct dentry *dentry,afs_check_for_remote_deletion (&fc, dvnode);afs_vnode_commit_status (&fc, dvnode, fc.cb_break, &data_version, &scb[0 ]); +afs_update_dentry_version (&fc, dentry, &scb[0 ]);afs_vnode_new_inode (&fc, dentry, &iget_data, &scb[1 ]); ret =afs_end_vnode_operation (&fc);if (ret <0 )
@@ -1795,6 +1824,17 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, } } +/* This bit is potentially nasty as there's a potential race with +* afs_d_revalidate{,_rcu}(). We have to change d_fsdata on the dentry +* to reflect it's new parent's new data_version after the op, but +* d_revalidate may see old_dentry between the op having taken place +* and the version being updated. +* +* So drop the old_dentry for now to make other threads go through +* lookup instead - which we hold a lock against. +*/ +d_drop (old_dentry); + ret = -ERESTARTSYS ;if (afs_begin_vnode_operation (&fc, orig_dvnode, key, true)) {afs_dataversion_t orig_data_version;
@@ -1806,7 +1846,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry,if (orig_dvnode != new_dvnode) {if (mutex_lock_interruptible_nested (&new_dvnode->io_lock,1 ) <0 ) {afs_end_vnode_operation (&fc); - goto error_rehash; + goto error_rehash_old; } new_data_version = new_dvnode->status.data_version +1 ; }else {
@@ -1831,7 +1871,7 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry, } ret =afs_end_vnode_operation (&fc);if (ret <0 ) - goto error_rehash; + goto error_rehash_old; }if (ret ==0 ) {
@@ -1857,10 +1897,26 @@ static int afs_rename(struct inode *old_dir, struct dentry *old_dentry,drop_nlink (new_inode);spin_unlock (&new_inode->i_lock); } + +/* Now we can update d_fsdata on the dentries to reflect their +* new parent's data_version. +* +* Note that if we ever implement RENAME_EXCHANGE, we'll have +* to update both dentries with opposing dir versions. +*/ +if (new_dvnode != orig_dvnode) { +afs_update_dentry_version (&fc, old_dentry, &scb[1 ]); +afs_update_dentry_version (&fc, new_dentry, &scb[1 ]); + }else { +afs_update_dentry_version (&fc, old_dentry, &scb[0 ]); +afs_update_dentry_version (&fc, new_dentry, &scb[0 ]); + }d_move (old_dentry, new_dentry); goto error_tmp; } +error_rehash_old: +d_rehash (new_dentry); error_rehash:if (rehash)d_rehash (rehash);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/143 nvmet: Fix use-after-free bug when a port is removed
In reply to Greg Kroah-Hartman[ Upstream commit 3aed86731ee2b23e4dc4d2c6d943d33992cd551b ]
When a port is removed through configfs, any connected controllers are still active and can still send commands. This causes a use-after-free bug which is detected by KASAN for any admin command that dereferences req->port (like in nvmet_execute_identify_ctrl).
To fix this, disconnect all active controllers when a subsystem is removed from a port. This ensures there are no active controllers when the port is eventually removed.
--- drivers/nvme/target/configfs.c | 1 + drivers/nvme/target/core.c | 12 ++++++++++++ drivers/nvme/target/nvmet.h | 3 +++ 3 files changed, 16 insertions(+)
drivers/nvme/target/configfs.c +1 -0
@@ -673,6 +673,7 @@ static void nvmet_port_subsys_drop_link(struct config_item *parent, found:list_del (&p->entry); +nvmet_port_del_ctrls (port, subsys);nvmet_port_disc_changed (port, subsys);if (list_empty (&port->subsystems))
drivers/nvme/target/core.c +12 -0
@@ -277,6 +277,18 @@ void nvmet_unregister_transport(const struct nvmet_fabrics_ops *ops) }EXPORT_SYMBOL_GPL (nvmet_unregister_transport); +void nvmet_port_del_ctrls (struct nvmet_port *port,struct nvmet_subsys *subsys) +{ +struct nvmet_ctrl *ctrl; + +mutex_lock (&subsys->lock); +list_for_each_entry (ctrl, &subsys->ctrls, subsys_entry) { +if (ctrl->port == port) + ctrl->ops->delete_ctrl (ctrl); + } +mutex_unlock (&subsys->lock); +} +int nvmet_enable_port (struct nvmet_port *port) {const struct nvmet_fabrics_ops *ops;
drivers/nvme/target/nvmet.h +3 -0
@@ -415,6 +415,9 @@ void nvmet_port_send_ana_event(struct nvmet_port *port);int nvmet_register_transport (const struct nvmet_fabrics_ops *ops);void nvmet_unregister_transport (const struct nvmet_fabrics_ops *ops); +void nvmet_port_del_ctrls (struct nvmet_port *port, +struct nvmet_subsys *subsys); +int nvmet_enable_port (struct nvmet_port *port);void nvmet_disable_port (struct nvmet_port *port);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/143 nvmet-loop: Flush nvme_delete_wq when removing the port
In reply to Greg Kroah-Hartman[ Upstream commit 86b9a63e595ff03f9d0a7b92b6acc231fecefc29 ]
After calling nvme_loop_delete_ctrl(), the controllers will not yet be deleted because nvme_delete_ctrl() only schedules work to do the delete.
This means a race can occur if a port is removed but there are still active controllers trying to access that memory.
To fix this, flush the nvme_delete_wq before returning from nvme_loop_remove_port() so that any controllers that might be in the process of being deleted won't access a freed port.
--- drivers/nvme/target/loop.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/nvme/target/loop.c +8 -0
@@ -654,6 +654,14 @@ static void nvme_loop_remove_port(struct nvmet_port *port)mutex_lock (&nvme_loop_ports_mutex);list_del_init (&port->entry);mutex_unlock (&nvme_loop_ports_mutex); + +/* +* Ensure any ctrls that are in the process of being +* deleted are in fact deleted before we return +* and free the port. This is to prevent active +* ctrls from using a port after it's freed. +*/ +flush_workqueue (nvme_delete_wq); }static const struct nvmet_fabrics_ops nvme_loop_ops = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/143 nvmet-file: fix nvmet_file_flush() always returning an error
In reply to Greg Kroah-Hartman[ Upstream commit cfc1a1af56200362d1508b82b9a3cc3acb2eae0c ]
Presently, nvmet_file_flush() always returns a call to errno_to_nvme_status() but that helper doesn't take into account the case when errno=0. So nvmet_file_flush() always returns an error code.
All other callers of errno_to_nvme_status() check for success before calling it.
To fix this, ensure errno_to_nvme_status() returns success if the errno is zero. This should prevent future mistakes like this from happening.
--- drivers/nvme/target/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/target/core.c +3 -0
@@ -43,6 +43,9 @@ inline u16 errno_to_nvme_status(struct nvmet_req *req, int errno)u16 status;switch (errno) { +case 0 : + status =NVME_SC_SUCCESS ; +break ;case -ENOSPC : req->error_loc = offsetof(struct nvme_rw_command , length); status =NVME_SC_CAP_EXCEEDED |NVME_SC_DNR ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/143 nvme-core: Fix extra device_put() call on error path
In reply to Greg Kroah-Hartman[ Upstream commit 8c36e66fb407ce076535a7db98ab9f6d720b866a ]
In the error path for nvme_init_subsystem(), nvme_put_subsystem() will call device_put(), but it will get called again after the mutex_unlock().
The device_put() only needs to be called if device_add() fails.
This bug caused a KASAN use-after-free error when adding and removing subsytems in a loop:
BUG: KASAN: use-after-free in device_del+0x8d9/0x9a0 Read of size 8 at addr ffff8883cdaf7120 by task multipathd/329 CPU: 0 PID: 329 Comm: multipathd Not tainted 5.2.0-rc6-vmlocalyes-00019-g70a2b39005fd-dirty #314 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 Call Trace: dump_stack+0x7b/0xb5 print_address_description+0x6f/0x280 ? device_del+0x8d9/0x9a0 __kasan_report+0x148/0x199 ? device_del+0x8d9/0x9a0 ? class_release+0x100/0x130 ? device_del+0x8d9/0x9a0 kasan_report+0x12/0x20 __asan_report_load8_noabort+0x14/0x20 device_del+0x8d9/0x9a0 ? device_platform_notify+0x70/0x70 nvme_destroy_subsystem+0xf9/0x150 nvme_free_ctrl+0x280/0x3a0 device_release+0x72/0x1d0 kobject_put+0x144/0x410 put_device+0x13/0x20 nvme_free_ns+0xc4/0x100 nvme_release+0xb3/0xe0 __blkdev_put+0x549/0x6e0 ? kasan_check_write+0x14/0x20 ? bd_set_size+0xb0/0xb0 ? kasan_check_write+0x14/0x20 ? mutex_lock+0x8f/0xe0 ? __mutex_lock_slowpath+0x20/0x20 ? locks_remove_file+0x239/0x370 blkdev_put+0x72/0x2c0 blkdev_close+0x8d/0xd0 __fput+0x256/0x770 ? _raw_read_lock_irq+0x40/0x40 ____fput+0xe/0x10 task_work_run+0x10c/0x180 ? filp_close+0xf7/0x140 exit_to_usermode_loop+0x151/0x170 do_syscall_64+0x240/0x2e0 ? prepare_exit_to_usermode+0xd5/0x190 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7f5a79af05d7 Code: 00 00 0f 05 48 3d 00 f0 ff ff 77 3f c3 66 0f 1f 44 00 00 53 89 fb 48 83 ec 10 e8 c4 fb ff ff 89 df 89 c2 b8 03 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 2b 89 d7 89 44 24 0c e8 06 fc ff ff 8b 44 24 RSP: 002b:00007f5a7799c810 EFLAGS: 00000293 ORIG_RAX: 0000000000000003 RAX: 0000000000000000 RBX: 0000000000000008 RCX: 00007f5a79af05d7 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000008 RBP: 00007f5a58000f98 R08: 0000000000000002 R09: 00007f5a7935ee80 R10: 0000000000000000 R11: 0000000000000293 R12: 000055e432447240 R13: 0000000000000000 R14: 0000000000000001 R15: 000055e4324a9cf0 Allocated by task 1236: save_stack+0x21/0x80 __kasan_kmalloc.constprop.6+0xab/0xe0 kasan_kmalloc+0x9/0x10 kmem_cache_alloc_trace+0x102/0x210 nvme_init_identify+0x13c3/0x3820 nvme_loop_configure_admin_queue+0x4fa/0x5e0 nvme_loop_create_ctrl+0x469/0xf40 nvmf_dev_write+0x19a3/0x21ab __vfs_write+0x66/0x120 vfs_write+0x154/0x490 ksys_write+0x104/0x240 __x64_sys_write+0x73/0xb0 do_syscall_64+0xa5/0x2e0 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Freed by task 329: save_stack+0x21/0x80 __kasan_slab_free+0x129/0x190 kasan_slab_free+0xe/0x10 kfree+0xa7/0x200 nvme_release_subsystem+0x49/0x60 device_release+0x72/0x1d0 kobject_put+0x144/0x410 put_device+0x13/0x20 klist_class_dev_put+0x31/0x40 klist_put+0x8f/0xf0 klist_del+0xe/0x10 device_del+0x3a7/0x9a0 nvme_destroy_subsystem+0xf9/0x150 nvme_free_ctrl+0x280/0x3a0 device_release+0x72/0x1d0 kobject_put+0x144/0x410 put_device+0x13/0x20 nvme_free_ns+0xc4/0x100 nvme_release+0xb3/0xe0 __blkdev_put+0x549/0x6e0 blkdev_put+0x72/0x2c0 blkdev_close+0x8d/0xd0 __fput+0x256/0x770 ____fput+0xe/0x10 task_work_run+0x10c/0x180 exit_to_usermode_loop+0x151/0x170 do_syscall_64+0x240/0x2e0 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/core.c +1 -1
@@ -2440,6 +2440,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)if (ret) {dev_err (ctrl->device,"failed to register subsystem device.\n" ); +put_device (&subsys->dev); goto out_unlock; }ida_init (&subsys->ns_ida);
@@ -2462,7 +2463,6 @@ out_put_subsystem:nvme_put_subsystem (subsys); out_unlock:mutex_unlock (&nvme_subsystems_lock); -put_device (&subsys->dev);return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/143 nvme: fix a possible deadlock when passthru commands sent to a multipath device
In reply to Greg Kroah-Hartman[ Upstream commit b9156daeb1601d69007b7e50efcf89d69d72ec1d ]
When the user issues a command with side effects, we will end up freezing the namespace request queue when updating disk info (and the same for the corresponding mpath disk node).
However, we are not freezing the mpath node request queue, which means that mpath I/O can still come in and block on blk_queue_enter (called from nvme_ns_head_make_request -> direct_make_request).
This is a deadlock, because blk_queue_enter will block until the inner namespace request queue is unfroze, but that process is blocked because the namespace revalidation is trying to update the mpath disk info and freeze its request queue (which will never complete because of the I/O that is blocked on blk_queue_enter).
Fix this by freezing all the subsystem nsheads request queues before executing the passthru command. Given that these commands are infrequent we should not worry about this temporary I/O freeze to keep things sane.
Here is the matching hang traces:
--
[ 374.465002] INFO: task systemd-udevd:17994 blocked for more than 122 seconds. [ 374.472975] Not tainted 5.2.0-rc3-mpdebug+ #42 [ 374.478522] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 374.487274] systemd-udevd D 0 17994 1 0x00000000 [ 374.493407] Call Trace: [ 374.496145] __schedule+0x2ef/0x620 [ 374.500047] schedule+0x38/0xa0 [ 374.503569] blk_queue_enter+0x139/0x220 [ 374.507959] ? remove_wait_queue+0x60/0x60 [ 374.512540] direct_make_request+0x60/0x130 [ 374.517219] nvme_ns_head_make_request+0x11d/0x420 [nvme_core] [ 374.523740] ? generic_make_request_checks+0x307/0x6f0 [ 374.529484] generic_make_request+0x10d/0x2e0 [ 374.534356] submit_bio+0x75/0x140 [ 374.538163] ? guard_bio_eod+0x32/0xe0 [ 374.542361] submit_bh_wbc+0x171/0x1b0 [ 374.546553] block_read_full_page+0x1ed/0x330 [ 374.551426] ? check_disk_change+0x70/0x70 [ 374.556008] ? scan_shadow_nodes+0x30/0x30 [ 374.560588] blkdev_readpage+0x18/0x20 [ 374.564783] do_read_cache_page+0x301/0x860 [ 374.569463] ? blkdev_writepages+0x10/0x10 [ 374.574037] ? prep_new_page+0x88/0x130 [ 374.578329] ? get_page_from_freelist+0xa2f/0x1280 [ 374.583688] ? __alloc_pages_nodemask+0x179/0x320 [ 374.588947] read_cache_page+0x12/0x20 [ 374.593142] read_dev_sector+0x2d/0xd0 [ 374.597337] read_lba+0x104/0x1f0 [ 374.601046] find_valid_gpt+0xfa/0x720 [ 374.605243] ? string_nocheck+0x58/0x70 [ 374.609534] ? find_valid_gpt+0x720/0x720 [ 374.614016] efi_partition+0x89/0x430 [ 374.618113] ? string+0x48/0x60 [ 374.621632] ? snprintf+0x49/0x70 [ 374.625339] ? find_valid_gpt+0x720/0x720 [ 374.629828] check_partition+0x116/0x210 [ 374.634214] rescan_partitions+0xb6/0x360 [ 374.638699] __blkdev_reread_part+0x64/0x70 [ 374.643377] blkdev_reread_part+0x23/0x40 [ 374.647860] blkdev_ioctl+0x48c/0x990 [ 374.651956] block_ioctl+0x41/0x50 [ 374.655766] do_vfs_ioctl+0xa7/0x600 [ 374.659766] ? locks_lock_inode_wait+0xb1/0x150 [ 374.664832] ksys_ioctl+0x67/0x90 [ 374.668539] __x64_sys_ioctl+0x1a/0x20 [ 374.672732] do_syscall_64+0x5a/0x1c0 [ 374.676828] entry_SYSCALL_64_after_hwframe+0x44/0xa9
[ 374.738474] INFO: task nvmeadm:49141 blocked for more than 123 seconds. [ 374.745871] Not tainted 5.2.0-rc3-mpdebug+ #42 [ 374.751419] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 374.760170] nvmeadm D 0 49141 36333 0x00004080 [ 374.766301] Call Trace: [ 374.769038] __schedule+0x2ef/0x620 [ 374.772939] schedule+0x38/0xa0 [ 374.776452] blk_mq_freeze_queue_wait+0x59/0x100 [ 374.781614] ? remove_wait_queue+0x60/0x60 [ 374.786192] blk_mq_freeze_queue+0x1a/0x20 [ 374.790773] nvme_update_disk_info.isra.57+0x5f/0x350 [nvme_core] [ 374.797582] ? nvme_identify_ns.isra.50+0x71/0xc0 [nvme_core] [ 374.804006] __nvme_revalidate_disk+0xe5/0x110 [nvme_core] [ 374.810139] nvme_revalidate_disk+0xa6/0x120 [nvme_core] [ 374.816078] ? nvme_submit_user_cmd+0x11e/0x320 [nvme_core] [ 374.822299] nvme_user_cmd+0x264/0x370 [nvme_core] [ 374.827661] nvme_dev_ioctl+0x112/0x1d0 [nvme_core] [ 374.833114] do_vfs_ioctl+0xa7/0x600 [ 374.837117] ? __audit_syscall_entry+0xdd/0x130 [ 374.842184] ksys_ioctl+0x67/0x90 [ 374.845891] __x64_sys_ioctl+0x1a/0x20 [ 374.850082] do_syscall_64+0x5a/0x1c0 [ 374.854178] entry_SYSCALL_64_after_hwframe+0x44/0xa9
--
--- drivers/nvme/host/core.c | 5 +++++ drivers/nvme/host/multipath.c | 30 ++++++++++++++++++++++++++++++ drivers/nvme/host/nvme.h | 12 ++++++++++++ 3 files changed, 47 insertions(+)
drivers/nvme/host/core.c +5 -0
@@ -1268,6 +1268,9 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,*/ if (effects & (NVME_CMD_EFFECTS_LBCC |NVME_CMD_EFFECTS_CSE_MASK )) {mutex_lock (&ctrl->scan_lock); +mutex_lock (&ctrl->subsys->lock); +nvme_mpath_start_freeze (ctrl->subsys); +nvme_mpath_wait_freeze (ctrl->subsys);nvme_start_freeze (ctrl);nvme_wait_freeze (ctrl); }
@@ -1298,6 +1301,8 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects)nvme_update_formats (ctrl);if (effects & (NVME_CMD_EFFECTS_LBCC |NVME_CMD_EFFECTS_CSE_MASK )) {nvme_unfreeze (ctrl); +nvme_mpath_unfreeze (ctrl->subsys); +mutex_unlock (&ctrl->subsys->lock);mutex_unlock (&ctrl->scan_lock); }if (effects &NVME_CMD_EFFECTS_CCC )
drivers/nvme/host/multipath.c +30 -0
@@ -12,6 +12,36 @@ module_param(multipath, bool, 0444);MODULE_PARM_DESC (multipath,"turn on native support for multiple controllers per subsystem" ); +void nvme_mpath_unfreeze (struct nvme_subsystem *subsys) +{ +struct nvme_ns_head *h; + +lockdep_assert_held (&subsys->lock); +list_for_each_entry (h, &subsys->nsheads, entry) +if (h->disk) +blk_mq_unfreeze_queue (h->disk->queue); +} + +void nvme_mpath_wait_freeze (struct nvme_subsystem *subsys) +{ +struct nvme_ns_head *h; + +lockdep_assert_held (&subsys->lock); +list_for_each_entry (h, &subsys->nsheads, entry) +if (h->disk) +blk_mq_freeze_queue_wait (h->disk->queue); +} + +void nvme_mpath_start_freeze (struct nvme_subsystem *subsys) +{ +struct nvme_ns_head *h; + +lockdep_assert_held (&subsys->lock); +list_for_each_entry (h, &subsys->nsheads, entry) +if (h->disk) +blk_freeze_queue_start (h->disk->queue); +} +/* * If multipathing is enabled we need to always use the subsystem instance * number for numbering our devices to avoid conflicts between subsystems that
drivers/nvme/host/nvme.h +12 -0
@@ -477,6 +477,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl)return ctrl->ana_log_buf !=NULL ; } +void nvme_mpath_unfreeze (struct nvme_subsystem *subsys); +void nvme_mpath_wait_freeze (struct nvme_subsystem *subsys); +void nvme_mpath_start_freeze (struct nvme_subsystem *subsys);void nvme_set_disk_name (char *disk_name,struct nvme_ns *ns,struct nvme_ctrl *ctrl,int *flags);void nvme_failover_req (struct request *req);
@@ -555,6 +558,15 @@ static inline void nvme_mpath_uninit(struct nvme_ctrl *ctrl)static inline void nvme_mpath_stop (struct nvme_ctrl *ctrl) { } +static inline void nvme_mpath_unfreeze (struct nvme_subsystem *subsys) +{ +} +static inline void nvme_mpath_wait_freeze (struct nvme_subsystem *subsys) +{ +} +static inline void nvme_mpath_start_freeze (struct nvme_subsystem *subsys) +{ +}#endif /* CONFIG_NVME_MULTIPATH */ #ifdef CONFIG_NVM
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/143 nvme-rdma: fix possible use-after-free in connect error flow
In reply to Greg Kroah-Hartman[ Upstream commit d94211b8bad3787e0655a67284105f57db728cb1 ]
When start_queue fails, we need to make sure to drain the queue cq before freeing the rdma resources because we might still race with the completion path. Have start_queue() error path safely stop the queue.
--
[30371.808111] nvme nvme1: Failed reconnect attempt 11 [30371.808113] nvme nvme1: Reconnecting in 10 seconds... [...] [30382.069315] nvme nvme1: creating 4 I/O queues. [30382.257058] nvme nvme1: Connect Invalid SQE Parameter, qid 4 [30382.257061] nvme nvme1: failed to connect queue: 4 ret=386 [30382.305001] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018 [30382.305022] IP: qedr_poll_cq+0x8a3/0x1170 [qedr] [30382.305028] PGD 0 P4D 0 [30382.305037] Oops: 0000 [#1] SMP PTI [...] [30382.305153] Call Trace: [30382.305166] ? __switch_to_asm+0x34/0x70 [30382.305187] __ib_process_cq+0x56/0xd0 [ib_core] [30382.305201] ib_poll_handler+0x26/0x70 [ib_core] [30382.305213] irq_poll_softirq+0x88/0x110 [30382.305223] ? sort_range+0x20/0x20 [30382.305232] __do_softirq+0xde/0x2c6 [30382.305241] ? sort_range+0x20/0x20 [30382.305249] run_ksoftirqd+0x1c/0x60 [30382.305258] smpboot_thread_fn+0xef/0x160 [30382.305265] kthread+0x113/0x130 [30382.305273] ? kthread_create_worker_on_cpu+0x50/0x50 [30382.305281] ret_from_fork+0x35/0x40
--
--- drivers/nvme/host/rdma.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/nvme/host/rdma.c +11 -5
@@ -562,13 +562,17 @@ out_destroy_cm_id:return ret; } +static void __nvme_rdma_stop_queue (struct nvme_rdma_queue *queue) +{ +rdma_disconnect (queue->cm_id); +ib_drain_qp (queue->qp); +} +static void nvme_rdma_stop_queue (struct nvme_rdma_queue *queue) {if (!test_and_clear_bit (NVME_RDMA_Q_LIVE , &queue->flags))return ; - -rdma_disconnect (queue->cm_id); -ib_drain_qp (queue->qp); +__nvme_rdma_stop_queue (queue); }static void nvme_rdma_free_queue (struct nvme_rdma_queue *queue)
@@ -607,11 +611,13 @@ static int nvme_rdma_start_queue(struct nvme_rdma_ctrl *ctrl, int idx)else ret =nvmf_connect_admin_queue (&ctrl->ctrl); -if (!ret) +if (!ret) {set_bit (NVME_RDMA_Q_LIVE , &queue->flags); -else + }else { +__nvme_rdma_stop_queue (queue);dev_info (ctrl->ctrl.device,"failed to connect queue: %d ret=%d\n" , idx, ret); + }return ret; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/143 nvme: fix controller removal race with scan work
In reply to Greg Kroah-Hartman[ Upstream commit 0157ec8dad3c8fc9bc9790f76e0831ffdaf2e7f0 ]
With multipath enabled, nvme_scan_work() can read from the device (through nvme_mpath_add_disk()) and hang [1]. However, with fabrics, once ctrl->state is set to NVME_CTRL_DELETING, the reads will hang (see nvmf_check_ready()) and the mpath stack device make_request will block if head->list is not empty. However, when the head->list consistst of only DELETING/DEAD controllers, we should actually not block, but rather fail immediately.
In addition, before we go ahead and remove the namespaces, make sure to clear the current path and kick the requeue list so that the request will fast fail upon requeuing.
[1]:
--
INFO: task kworker/u4:3:166 blocked for more than 120 seconds.
Not tainted 5.2.0-rc6-vmlocalyes-00005-g808c8c2dc0cf #316
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
kworker/u4:3 D 0 166 2 0x80004000
Workqueue: nvme-wq nvme_scan_work
Call Trace:
__schedule+0x851/0x1400
schedule+0x99/0x210
io_schedule+0x21/0x70
do_read_cache_page+0xa57/0x1330
read_cache_page+0x4a/0x70
read_dev_sector+0xbf/0x380
amiga_partition+0xc4/0x1230
check_partition+0x30f/0x630
rescan_partitions+0x19a/0x980
__blkdev_get+0x85a/0x12f0
blkdev_get+0x2a5/0x790
__device_add_disk+0xe25/0x1250
device_add_disk+0x13/0x20
nvme_mpath_set_live+0x172/0x2b0
nvme_update_ns_ana_state+0x130/0x180
nvme_set_ns_ana_state+0x9a/0xb0
nvme_parse_ana_log+0x1c3/0x4a0
nvme_mpath_add_disk+0x157/0x290
nvme_validate_ns+0x1017/0x1bd0
nvme_scan_work+0x44d/0x6a0
process_one_work+0x7d7/0x1240
worker_thread+0x8e/0xff0
kthread+0x2c3/0x3b0
ret_from_fork+0x35/0x40
INFO: task kworker/u4:1:1034 blocked for more than 120 seconds.
Not tainted 5.2.0-rc6-vmlocalyes-00005-g808c8c2dc0cf #316
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
kworker/u4:1 D 0 1034 2 0x80004000
Workqueue: nvme-delete-wq nvme_delete_ctrl_work
Call Trace:
__schedule+0x851/0x1400
schedule+0x99/0x210
schedule_timeout+0x390/0x830
wait_for_completion+0x1a7/0x310
__flush_work+0x241/0x5d0
flush_work+0x10/0x20
nvme_remove_namespaces+0x85/0x3d0
nvme_do_delete_ctrl+0xb4/0x1e0
nvme_delete_ctrl_work+0x15/0x20
process_one_work+0x7d7/0x1240
worker_thread+0x8e/0xff0
kthread+0x2c3/0x3b0
ret_from_fork+0x35/0x40--
--- drivers/nvme/host/core.c | 7 ++++++ drivers/nvme/host/multipath.c | 46 ++++++++++++++++++++++++++++++----- drivers/nvme/host/nvme.h | 9 +++++-- 3 files changed, 54 insertions(+), 8 deletions(-)
drivers/nvme/host/core.c +7 -0
@@ -3529,6 +3529,13 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)struct nvme_ns *ns, *next;LIST_HEAD (ns_list); +/* +* make sure to requeue I/O to all namespaces as these +* might result from the scan itself and must complete +* for the scan_work to make progress +*/ +nvme_mpath_clear_ctrl_paths (ctrl); +/* prevent racing with ns scanning */ flush_work (&ctrl->scan_work);
drivers/nvme/host/multipath.c +40 -6
78 lines not on this page · raw message
drivers/nvme/host/nvme.h +7 -2
@@ -490,7 +490,8 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head);int nvme_mpath_init (struct nvme_ctrl *ctrl,struct nvme_id_ctrl *id);void nvme_mpath_uninit (struct nvme_ctrl *ctrl);void nvme_mpath_stop (struct nvme_ctrl *ctrl); -void nvme_mpath_clear_current_path (struct nvme_ns *ns); +bool nvme_mpath_clear_current_path (struct nvme_ns *ns); +void nvme_mpath_clear_ctrl_paths (struct nvme_ctrl *ctrl);struct nvme_ns *nvme_find_path (struct nvme_ns_head *head);static inline void nvme_mpath_check_last_path (struct nvme_ns *ns)
@@ -538,7 +539,11 @@ static inline void nvme_mpath_add_disk(struct nvme_ns *ns,static inline void nvme_mpath_remove_disk (struct nvme_ns_head *head) { } -static inline void nvme_mpath_clear_current_path (struct nvme_ns *ns) +static inline bool nvme_mpath_clear_current_path (struct nvme_ns *ns) +{ +return false; +} +static inline void nvme_mpath_clear_ctrl_paths (struct nvme_ctrl *ctrl) { }static inline void nvme_mpath_check_last_path (struct nvme_ns *ns)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/143 nvme-pci: Fix async probe remove race
In reply to Greg Kroah-Hartman[ Upstream commit bd46a90634302bfe791e93ad5496f98f165f7ae0 ]
Ensure the controller is not in the NEW state when nvme_probe() exits. This will always allow a subsequent nvme_remove() to set the state to DELETING, fixing a potential race between the initial asynchronous probe and device removal.
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -2712,7 +2712,7 @@ static void nvme_async_probe(void *data, async_cookie_t cookie) {struct nvme_dev *dev = data; -nvme_reset_ctrl_sync (&dev->ctrl); +flush_work (&dev->ctrl.reset_work);flush_work (&dev->ctrl.scan_work);nvme_put_ctrl (&dev->ctrl); }
@@ -2778,6 +2778,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)dev_info (dev->ctrl.device,"pci function %s\n" ,dev_name (&pdev->dev)); +nvme_reset_ctrl (&dev->ctrl);nvme_get_ctrl (&dev->ctrl);async_schedule (nvme_async_probe, dev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/143 soundwire: cadence_master: fix register definition for SLAVE_STATE
In reply to Greg Kroah-Hartman[ Upstream commit b07dd9b400981f487940a4d84292d3a0e7cd9362 ]
wrong prefix and wrong macro.
--- drivers/soundwire/cadence_master.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soundwire/cadence_master.c +2 -2
@@ -80,8 +80,8 @@#define CDNS_MCP_INTSET 0x4C -#define CDNS_SDW_SLAVE_STAT 0x50 -#define CDNS_MCP_SLAVE_STAT_MASK BIT(1, 0) +#define CDNS_MCP_SLAVE_STAT 0x50 +#define CDNS_MCP_SLAVE_STAT_MASK GENMASK(1, 0)#define CDNS_MCP_SLAVE_INTSTAT0 0x54#define CDNS_MCP_SLAVE_INTSTAT1 0x58
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/143 soundwire: cadence_master: fix definitions for INTSTAT0/1
In reply to Greg Kroah-Hartman[ Upstream commit 664b16589f882202b8fa8149d0074f3159bade76 ]
Two off-by-one errors: INTSTAT0 missed BIT(31) and INTSTAT1 is only defined on first 16 bits.
--- drivers/soundwire/cadence_master.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soundwire/cadence_master.c +2 -2
@@ -95,8 +95,8 @@#define CDNS_MCP_SLAVE_INTMASK0 0x5C#define CDNS_MCP_SLAVE_INTMASK1 0x60 -#define CDNS_MCP_SLAVE_INTMASK0_MASK GENMASK(30, 0) -#define CDNS_MCP_SLAVE_INTMASK1_MASK GENMASK(16, 0) +#define CDNS_MCP_SLAVE_INTMASK0_MASK GENMASK(31, 0) +#define CDNS_MCP_SLAVE_INTMASK1_MASK GENMASK(15, 0)#define CDNS_MCP_PORT_INTSTAT 0x64#define CDNS_MCP_PDI_STAT 0x6C
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/143 auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
In reply to Greg Kroah-Hartman[ Upstream commit b33d567560c1aadf3033290d74d4fd67af47aa61 ]
In panel_attach, if misc_register fails, we need to delete scan_timer, which was setup in keypad_init->init_scan_timer.
--- drivers/auxdisplay/panel.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/auxdisplay/panel.c +2 -0
@@ -1617,6 +1617,8 @@ static void panel_attach(struct parport *port)return ; err_lcd_unreg: +if (scan_timer.function) +del_timer_sync (&scan_timer);if (lcd.enabled)charlcd_unregister (lcd.charlcd); err_unreg_device:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/143 btrfs: trim: Check the range passed into to prevent overflow
In reply to Greg Kroah-Hartman[ Upstream commit 07301df7d2fc220d3de5f7ad804dcb941400cb00 ]
Normally the range->len is set to default value (U64_MAX), but when it's not default value, we should check if the range overflows.
And if it overflows, return -EINVAL before doing anything.
--- fs/btrfs/extent-tree.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
fs/btrfs/extent-tree.c +11 -3
@@ -11226,6 +11226,7 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)struct btrfs_device *device;struct list_head *devices;u64 group_trimmed; +u64 range_end =U64_MAX ;u64 start;u64 end;u64 trimmed =0 ;
@@ -11235,16 +11236,23 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)int dev_ret =0 ;int ret =0 ; +/* +* Check range overflow if range->len is set. +* The default range->len is U64_MAX. +*/ +if (range->len !=U64_MAX && +check_add_overflow (range->start, range->len, &range_end)) +return -EINVAL ; + cache =btrfs_lookup_first_block_group (fs_info, range->start);for (; cache; cache =next_block_group (cache)) { -if (cache->key.objectid >= (range->start + range->len)) { +if (cache->key.objectid >= range_end) {btrfs_put_block_group (cache);break ; } start =max (range->start, cache->key.objectid); - end =min (range->start + range->len, - cache->key.objectid + cache->key.offset); + end =min (range_end, cache->key.objectid + cache->key.offset);if (end - start >= range->minlen) {if (!block_group_cache_done (cache)) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/143 IB/mlx5: Fix implicit MR release flow
In reply to Greg Kroah-Hartman[ Upstream commit f591822c3cf314442819486f45ff7dc1f690e0c0 ]
Once implicit MR is being called to be released by ib_umem_notifier_release() its leaves were marked as "dying".
However, when dereg_mr()->mlx5_ib_free_implicit_mr()->mr_leaf_free() is called, it skips running the mr_leaf_free_action (i.e. umem_odp->work) when those leaves were marked as "dying".
As such ib_umem_release() for the leaves won't be called and their MRs will be leaked as well.
When an application exits/killed without calling dereg_mr we might hit the above flow.
This fatal scenario is reported by WARN_ON() upon mlx5_ib_dealloc_ucontext() as ibcontext->per_mm_list is not empty, the call trace can be seen below.
Originally the "dying" mark as part of ib_umem_notifier_release() was introduced to prevent pagefault_mr() from returning a success response once this happened. However, we already have today the completion mechanism so no need for that in those flows any more. Even in case a success response will be returned the firmware will not find the pages and an error will be returned in the following call as a released mm will cause ib_umem_odp_map_dma_pages() to permanently fail mmget_not_zero().
Fix the above issue by dropping the "dying" from the above flows. The other flows that are using "dying" are still needed it for their synchronization purposes.
WARNING: CPU: 1 PID: 7218 at drivers/infiniband/hw/mlx5/main.c:2004 mlx5_ib_dealloc_ucontext+0x84/0x90 [mlx5_ib] CPU: 1 PID: 7218 Comm: ibv_rc_pingpong Tainted: G E 5.2.0-rc6+ #13 Call Trace: uverbs_destroy_ufile_hw+0xb5/0x120 [ib_uverbs] ib_uverbs_close+0x1f/0x80 [ib_uverbs] __fput+0xbe/0x250 task_work_run+0x88/0xa0 do_exit+0x2cb/0xc30 ? __fput+0x14b/0x250 do_group_exit+0x39/0xb0 get_signal+0x191/0x920 ? _raw_spin_unlock_bh+0xa/0x20 ? inet_csk_accept+0x229/0x2f0 do_signal+0x36/0x5e0 ? put_unused_fd+0x5b/0x70 ? __sys_accept4+0x1a6/0x1e0 ? inet_hash+0x35/0x40 ? release_sock+0x43/0x90 ? _raw_spin_unlock_bh+0xa/0x20 ? inet_listen+0x9f/0x120 exit_to_usermode_loop+0x5c/0xc6 do_syscall_64+0x182/0x1b0 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- drivers/infiniband/core/umem_odp.c | 4 ---- drivers/infiniband/hw/mlx5/odp.c | 24 +++++++++--------------- 2 files changed, 9 insertions(+), 19 deletions(-)
drivers/infiniband/core/umem_odp.c +0 -4
@@ -114,10 +114,6 @@ static int ib_umem_notifier_release_trampoline(struct ib_umem_odp *umem_odp,* prevent any further fault handling on this MR. */ ib_umem_notifier_start_account (umem_odp); - umem_odp->dying =1 ; -/* Make sure that the fact the umem is dying is out before we release -* all pending page faults. */ -smp_wmb ();complete_all (&umem_odp->notifier_completion); umem->context->invalidate_range (umem_odp,ib_umem_start (umem),ib_umem_end (umem));
drivers/infiniband/hw/mlx5/odp.c +9 -15
@@ -581,7 +581,6 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr, u32 flags) {int npages =0 , current_seq, page_shift, ret, np; -bool implicit = false;struct ib_umem_odp *odp_mr =to_ib_umem_odp (mr->umem);bool downgrade = flags &MLX5_PF_FLAGS_DOWNGRADE ;bool prefetch = flags &MLX5_PF_FLAGS_PREFETCH ;
@@ -596,7 +595,6 @@ static int pagefault_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr,if (IS_ERR (odp))return PTR_ERR (odp); mr = odp->private; - implicit = true; }else { odp = odp_mr; }
@@ -684,19 +682,15 @@ next_mr: out:if (ret == -EAGAIN ) { -if (implicit || !odp->dying) { -unsigned long timeout = -msecs_to_jiffies (MMU_NOTIFIER_TIMEOUT ); - -if (!wait_for_completion_timeout ( - &odp->notifier_completion, - timeout)) { -mlx5_ib_warn (dev,"timeout waiting for mmu notifier. seq %d against %d. notifiers_count=%d\n" , - current_seq, odp->notifiers_seq, odp->notifiers_count); - } - }else { -/* The MR is being killed, kill the QP as well. */ - ret = -EFAULT ; +unsigned long timeout =msecs_to_jiffies (MMU_NOTIFIER_TIMEOUT ); + +if (!wait_for_completion_timeout (&odp->notifier_completion, + timeout)) { +mlx5_ib_warn ( + dev, +"timeout waiting for mmu notifier. seq %d against %d. notifiers_count=%d\n" , + current_seq, odp->notifiers_seq, + odp->notifiers_count); } }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/143 dmaengine: stm32-mdma: Fix a possible null-pointer dereference in stm32_mdma_irq_handler()
In reply to Greg Kroah-Hartman[ Upstream commit 39c71a5b8212f4b502d9a630c6706ac723abd422 ]
In stm32_mdma_irq_handler(), chan is checked on line 1368. When chan is NULL, it is still used on line 1369:
dev_err(chan2dev(chan), "MDMA channel not initialized\n");
Thus, a possible null-pointer dereference may occur.
To fix this bug, "dev_dbg(mdma2dev(dmadev), ...)" is used instead.
--- drivers/dma/stm32-mdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/stm32-mdma.c +1 -1
@@ -1366,7 +1366,7 @@ static irqreturn_t stm32_mdma_irq_handler(int irq, void *devid) chan = &dmadev->chan[id];if (!chan) { -dev_err (chan2dev (chan),"MDMA channel not initialized\n" ); +dev_dbg (mdma2dev (dmadev),"MDMA channel not initialized\n" ); goto exit; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/143 omap-dma/omap_vout_vrfb: fix off-by-one fi value
In reply to Greg Kroah-Hartman[ Upstream commit d555c34338cae844b207564c482e5a3fb089d25e ]
The OMAP 4 TRM specifies that when using double-index addressing the address increases by the ES plus the EI value minus 1 within a frame. When a full frame is transferred, the address increases by the ES plus the frame index (FI) value minus 1.
The omap-dma code didn't account for the 'minus 1' in the FI register. To get correct addressing, add 1 to the src_icg value.
This was found when testing a hacked version of the media m2m-deinterlace.c driver on a Pandaboard.
The only other source that uses this feature is omap_vout_vrfb.c, and that adds a + 1 when setting the dst_icg. This is a workaround for the broken omap-dma.c behavior. So remove the workaround at the same time that we fix omap-dma.c.
I tested the omap_vout driver with a Beagle XM board to check that the '+ 1' in omap_vout_vrfb.c was indeed a workaround for the omap-dma bug.
--- drivers/dma/ti/omap-dma.c | 4 ++-- drivers/media/platform/omap/omap_vout_vrfb.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/dma/ti/omap-dma.c +2 -2
@@ -1234,7 +1234,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_interleaved(if (src_icg) { d->ccr |=CCR_SRC_AMODE_DBLIDX ; d->ei =1 ; - d->fi = src_icg; + d->fi = src_icg +1 ; }else if (xt->src_inc) { d->ccr |=CCR_SRC_AMODE_POSTINC ; d->fi =0 ;
@@ -1249,7 +1249,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_interleaved(if (dst_icg) { d->ccr |=CCR_DST_AMODE_DBLIDX ; sg->ei =1 ; - sg->fi = dst_icg; + sg->fi = dst_icg +1 ; }else if (xt->dst_inc) { d->ccr |=CCR_DST_AMODE_POSTINC ; sg->fi =0 ;
drivers/media/platform/omap/omap_vout_vrfb.c +1 -2
@@ -253,8 +253,7 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout,*/ pixsize = vout->bpp * vout->vrfb_bpp; - dst_icg = ((MAX_PIXELS_PER_LINE * pixsize) - - (vout->pix.width * vout->bpp)) +1 ; + dst_icg =MAX_PIXELS_PER_LINE * pixsize - vout->pix.width * vout->bpp; xt->src_start = vout->buf_phy_addr[vb->i]; xt->dst_start = vout->vrfb_context[vb->i].paddr[0 ];
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/143 iommu/dma: Handle SG length overflow better
In reply to Greg Kroah-Hartman[ Upstream commit ab2cbeb0ed301a9f0460078e91b09f39958212ef ]
Since scatterlist dimensions are all unsigned ints, in the relatively rare cases where a device's max_segment_size is set to UINT_MAX, then the "cur_len + s_length <= max_len" check in __finalise_sg() will always return true. As a result, the corner case of such a device mapping an excessively large scatterlist which is mergeable to or beyond a total length of 4GB can lead to overflow and a bogus truncated dma_length in the resulting segment.
As we already assume that any single segment must be no longer than max_len to begin with, this can easily be addressed by reshuffling the comparison.
--- drivers/iommu/dma-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/dma-iommu.c +1 -1
@@ -710,7 +710,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents,* - and wouldn't make the resulting output segment too long */ if (cur_len && !s_iova_off && (dma_addr & seg_mask) && - (cur_len + s_length <= max_len)) { + (max_len - cur_len >= s_length)) {/* ...then concatenate it with the previous one */ cur_len += s_length; }else {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/143 dma-direct: dont truncate dma_required_mask to bus addressing capabilities
In reply to Greg Kroah-Hartman[ Upstream commit d8ad55538abe443919e20e0bb996561bca9cad84 ]
The dma required_mask needs to reflect the actual addressing capabilities needed to handle the whole system RAM. When truncated down to the bus addressing capabilities dma_addressing_limited() will incorrectly signal no limitations for devices which are restricted by the bus_dma_mask.
--- kernel/dma/direct.c | 3 --- 1 file changed, 3 deletions(-)
kernel/dma/direct.c +0 -3
@@ -55,9 +55,6 @@ u64 dma_direct_get_required_mask(struct device *dev) {u64 max_dma =phys_to_dma_direct (dev, (max_pfn -1 ) <<PAGE_SHIFT ); -if (dev->bus_dma_mask && dev->bus_dma_mask < max_dma) - max_dma = dev->bus_dma_mask; -return (1ULL << (fls64 (max_dma) -1 )) *2 -1 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/143 usb: gadget: composite: Clear "suspended" on reset/disconnect
In reply to Greg Kroah-Hartman[ Upstream commit 602fda17c7356bb7ae98467d93549057481d11dd ]
In some cases, one can get out of suspend with a reset or a disconnect followed by a reconnect. Previously we would leave a stale suspended flag set.
--- drivers/usb/gadget/composite.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/gadget/composite.c +1 -0
@@ -1976,6 +1976,7 @@ void composite_disconnect(struct usb_gadget *gadget)* disconnect callbacks? */ spin_lock_irqsave (&cdev->lock, flags); + cdev->suspended =0 ;if (cdev->config)reset_config (cdev);if (cdev->driver->disconnect)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/143 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt
In reply to Greg Kroah-Hartman[ Upstream commit 4a56a478a525d6427be90753451c40e1327caa1a ]
If fsg_disable() and fsg_set_alt() are called too closely to each other (for example due to a quick reset/reconnect), what can happen is that fsg_set_alt sets common->new_fsg from an interrupt while handle_exception is trying to process the config change caused by fsg_disable():
fsg_disable()
...
handle_exception()
sets state back to FSG_STATE_NORMAL hasn't yet called do_set_interface() or is inside it.
---> interrupt
fsg_set_alt sets common->new_fsg queues a new FSG_STATE_CONFIG_CHANGE
<---
Now, the first handle_exception can "see" the updated new_fsg, treats it as if it was a fsg_set_alt() response, call usb_composite_setup_continue() etc...
But then, the thread sees the second FSG_STATE_CONFIG_CHANGE, and goes back down the same path, wipes and reattaches a now active fsg, and .. calls usb_composite_setup_continue() which at this point is wrong.
Not only we get a backtrace, but I suspect the second set_interface wrecks some state causing the host to get upset in my case.
This fixes it by replacing "new_fsg" by a "state argument" (same principle) which is set in the same lock section as the state update, and retrieved similarly.
That way, there is never any discrepancy between the dequeued state and the observed value of it. We keep the ability to have the latest reconfig operation take precedence, but we guarantee that once "dequeued" the argument (new_fsg) will not be clobbered by any new event.
--- drivers/usb/gadget/function/f_mass_storage.c | 28 +++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-)
drivers/usb/gadget/function/f_mass_storage.c +18 -10
@@ -261,7 +261,7 @@ struct fsg_common;struct fsg_common {struct usb_gadget *gadget;struct usb_composite_dev *cdev; -struct fsg_dev *fsg, *new_fsg; +struct fsg_dev *fsg;wait_queue_head_t io_wait;wait_queue_head_t fsg_wait;
@@ -290,6 +290,7 @@ struct fsg_common {unsigned int bulk_out_maxpacket;enum fsg_state state;/* For exception handling */ unsigned int exception_req_tag; +void *exception_arg;enum data_direction data_dir;u32 data_size;
@@ -391,7 +392,8 @@ static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)/* These routines may be called in process context or in_irq */ -static void raise_exception (struct fsg_common *common,enum fsg_state new_state) +static void __raise_exception (struct fsg_common *common,enum fsg_state new_state, +void *arg) {unsigned long flags;
@@ -404,6 +406,7 @@ static void raise_exception(struct fsg_common *common, enum fsg_state new_state)if (common->state <= new_state) { common->exception_req_tag = common->ep0_req_tag; common->state = new_state; + common->exception_arg = arg;if (common->thread_task)send_sig_info (SIGUSR1 ,SEND_SIG_PRIV , common->thread_task);
@@ -411,6 +414,10 @@ static void raise_exception(struct fsg_common *common, enum fsg_state new_state)spin_unlock_irqrestore (&common->lock, flags); } +static void raise_exception (struct fsg_common *common,enum fsg_state new_state) +{ +__raise_exception (common, new_state,NULL ); +}/*-------------------------------------------------------------------------*/
@@ -2285,16 +2292,16 @@ reset:static int fsg_set_alt (struct usb_function *f,unsigned intf,unsigned alt) {struct fsg_dev *fsg =fsg_from_func (f); - fsg->common->new_fsg = fsg; -raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ); + +__raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE , fsg);return USB_GADGET_DELAYED_STATUS ; }static void fsg_disable (struct usb_function *f) {struct fsg_dev *fsg =fsg_from_func (f); - fsg->common->new_fsg =NULL ; -raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ); + +__raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ,NULL ); }
@@ -2307,6 +2314,7 @@ static void handle_exception(struct fsg_common *common)enum fsg_state old_state;struct fsg_lun *curlun;unsigned int exception_req_tag; +struct fsg_dev *new_fsg;/* * Clear the existing signals. Anything but SIGUSR1 is converted
@@ -2360,6 +2368,7 @@ static void handle_exception(struct fsg_common *common) common->next_buffhd_to_fill = &common->buffhds[0 ]; common->next_buffhd_to_drain = &common->buffhds[0 ]; exception_req_tag = common->exception_req_tag; + new_fsg = common->exception_arg; old_state = common->state; common->state =FSG_STATE_NORMAL ;
@@ -2413,8 +2422,8 @@ static void handle_exception(struct fsg_common *common)break ;case FSG_STATE_CONFIG_CHANGE : -do_set_interface (common, common->new_fsg); -if (common->new_fsg) +do_set_interface (common, new_fsg); +if (new_fsg)usb_composite_setup_continue (common->cdev);break ;
@@ -2989,8 +2998,7 @@ static void fsg_unbind(struct usb_configuration *c, struct usb_function *f)DBG (fsg,"unbind\n" );if (fsg->common->fsg == fsg) { - fsg->common->new_fsg =NULL ; -raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ); +__raise_exception (fsg->common,FSG_STATE_CONFIG_CHANGE ,NULL );/* FIXME: make interruptible or killable somehow? */ wait_event (common->fsg_wait, common->fsg != fsg); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/143 habanalabs: fix DRAM usage accounting on context tear down
In reply to Greg Kroah-Hartman[ Upstream commit c8113756ba27298d6e95403c087dc5881b419a99 ]
The patch fix the DRAM usage accounting by adding a missing update of the DRAM memory consumption, when a context is being torn down without an organized release of the allocated memory.
--- drivers/misc/habanalabs/memory.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/habanalabs/memory.c +2 -0
@@ -1629,6 +1629,8 @@ void hl_vm_ctx_fini(struct hl_ctx *ctx)dev_dbg (hdev->dev,"page list 0x%p of asid %d is still alive\n" , phys_pg_list, ctx->asid); +atomic64_sub (phys_pg_list->total_size, + &hdev->dram_used_mem);free_phys_pg_pack (hdev, phys_pg_list);idr_remove (&vm->phys_pg_pack_handles, i); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/143 habanalabs: fix endianness handling for packets from user
In reply to Greg Kroah-Hartman[ Upstream commit 213ad5ad016a0da975b35f54e8cd236c3b04724b ]
Packets that arrive from the user and need to be parsed by the driver are assumed to be in LE format.
This patch fix all the places where the code handles these packets and use the correct endianness macros to handle them, as the driver handles the packets in CPU format (LE or BE depending on the arch).
--- drivers/misc/habanalabs/goya/goya.c | 32 +++++++++++-------- .../habanalabs/include/goya/goya_packets.h | 13 ++++++++ 2 files changed, 32 insertions(+), 13 deletions(-)
drivers/misc/habanalabs/goya/goya.c +19 -13
@@ -3425,12 +3425,13 @@ static int goya_validate_cb(struct hl_device *hdev,while (cb_parsed_length < parser->user_cb_size) {enum packet_id pkt_id;u16 pkt_size; -void *user_pkt; +struct goya_packet *user_pkt; - user_pkt = (void *) (uintptr_t ) + user_pkt = (struct goya_packet *) (uintptr_t ) (parser->user_cb->kernel_address + cb_parsed_length); - pkt_id = (enum packet_id ) (((*(u64 *) user_pkt) & + pkt_id = (enum packet_id ) ( + (le64_to_cpu (user_pkt->header) &PACKET_HEADER_PACKET_ID_MASK ) >>PACKET_HEADER_PACKET_ID_SHIFT );
@@ -3450,7 +3451,8 @@ static int goya_validate_cb(struct hl_device *hdev,* need to validate here as well because patch_cb() is * not called in MMU path while this function is called */ - rc =goya_validate_wreg32 (hdev, parser, user_pkt); + rc =goya_validate_wreg32 (hdev, + parser, (struct packet_wreg32 *) user_pkt);break ;case PACKET_WREG_BULK :
@@ -3478,10 +3480,10 @@ static int goya_validate_cb(struct hl_device *hdev,case PACKET_LIN_DMA :if (is_mmu) rc =goya_validate_dma_pkt_mmu (hdev, parser, - user_pkt); + (struct packet_lin_dma *) user_pkt);else rc =goya_validate_dma_pkt_no_mmu (hdev, parser, - user_pkt); + (struct packet_lin_dma *) user_pkt);break ;case PACKET_MSG_LONG :
@@ -3654,15 +3656,16 @@ static int goya_patch_cb(struct hl_device *hdev,enum packet_id pkt_id;u16 pkt_size;u32 new_pkt_size =0 ; -void *user_pkt, *kernel_pkt; +struct goya_packet *user_pkt, *kernel_pkt; - user_pkt = (void *) (uintptr_t ) + user_pkt = (struct goya_packet *) (uintptr_t ) (parser->user_cb->kernel_address + cb_parsed_length); - kernel_pkt = (void *) (uintptr_t ) + kernel_pkt = (struct goya_packet *) (uintptr_t ) (parser->patched_cb->kernel_address + cb_patched_cur_length); - pkt_id = (enum packet_id ) (((*(u64 *) user_pkt) & + pkt_id = (enum packet_id ) ( + (le64_to_cpu (user_pkt->header) &PACKET_HEADER_PACKET_ID_MASK ) >>PACKET_HEADER_PACKET_ID_SHIFT );
@@ -3677,15 +3680,18 @@ static int goya_patch_cb(struct hl_device *hdev,switch (pkt_id) {case PACKET_LIN_DMA : - rc =goya_patch_dma_packet (hdev, parser, user_pkt, - kernel_pkt, &new_pkt_size); + rc =goya_patch_dma_packet (hdev, parser, + (struct packet_lin_dma *) user_pkt, + (struct packet_lin_dma *) kernel_pkt, + &new_pkt_size); cb_patched_cur_length += new_pkt_size;break ;case PACKET_WREG_32 :memcpy (kernel_pkt, user_pkt, pkt_size); cb_patched_cur_length += pkt_size; - rc =goya_validate_wreg32 (hdev, parser, kernel_pkt); + rc =goya_validate_wreg32 (hdev, parser, + (struct packet_wreg32 *) kernel_pkt);break ;case PACKET_WREG_BULK :
drivers/misc/habanalabs/include/goya/goya_packets.h +13 -0
@@ -52,6 +52,19 @@ enum goya_dma_direction {#define GOYA_PKT_CTL_MB_SHIFT 31#define GOYA_PKT_CTL_MB_MASK 0x80000000 +/* All packets have, at least, an 8-byte header, which contains +* the packet type. The kernel driver uses the packet header for packet +* validation and to perform any necessary required preparation before +* sending them off to the hardware. +*/ +struct goya_packet { +__le64 header; +/* The rest of the packet data follows. Use the corresponding +* packet_XXX struct to deference the data, based on packet type +*/ +u8 contents[0 ]; +}; +struct packet_nop {__le32 reserved;__le32 ctl;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/143 habanalabs: fix completion queue handling when host is BE
In reply to Greg Kroah-Hartman[ Upstream commit 4e87334a0ef43663019dbaf3638ad10fd8c3320c ]
This patch fix the CQ irq handler to work in hosts with BE architecture. It adds the correct endian-swapping macros around the relevant memory accesses.
--- drivers/misc/habanalabs/irq.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/misc/habanalabs/irq.c +13 -14
@@ -80,8 +80,7 @@ irqreturn_t hl_irq_handler_cq(int irq, void *arg)struct hl_cs_job *job;bool shadow_index_valid;u16 shadow_index; -u32 *cq_entry; -u32 *cq_base; +struct hl_cq_entry *cq_entry, *cq_base;if (hdev->disabled) { dev_dbg(hdev->dev,
@@ -90,29 +89,29 @@ irqreturn_t hl_irq_handler_cq(int irq, void *arg)return IRQ_HANDLED ; } - cq_base = (u32 *) (uintptr_t ) cq->kernel_address; + cq_base = (struct hl_cq_entry *) (uintptr_t ) cq->kernel_address;while (1 ) { -bool entry_ready = ((cq_base[cq->ci] &CQ_ENTRY_READY_MASK ) +bool entry_ready = ((le32_to_cpu (cq_base[cq->ci].data) & +CQ_ENTRY_READY_MASK ) >>CQ_ENTRY_READY_SHIFT );if (!entry_ready)break ; - cq_entry = (u32 *) &cq_base[cq->ci]; + cq_entry = (struct hl_cq_entry *) &cq_base[cq->ci]; -/* -* Make sure we read CQ entry contents after we've +/* Make sure we read CQ entry contents after we've * checked the ownership bit. */ dma_rmb (); - shadow_index_valid = - ((*cq_entry &CQ_ENTRY_SHADOW_INDEX_VALID_MASK ) + shadow_index_valid = ((le32_to_cpu (cq_entry->data) & +CQ_ENTRY_SHADOW_INDEX_VALID_MASK ) >>CQ_ENTRY_SHADOW_INDEX_VALID_SHIFT ); - shadow_index = (u16) - ((*cq_entry &CQ_ENTRY_SHADOW_INDEX_MASK ) + shadow_index = (u16) ((le32_to_cpu (cq_entry->data) & +CQ_ENTRY_SHADOW_INDEX_MASK ) >>CQ_ENTRY_SHADOW_INDEX_SHIFT ); queue = &hdev->kernel_queues[cq->hw_queue_id];
@@ -122,8 +121,7 @@ irqreturn_t hl_irq_handler_cq(int irq, void *arg)queue_work (hdev->cq_wq, &job->finish_work); } -/* -* Update ci of the context's queue. There is no +/* Update ci of the context's queue. There is no * need to protect it with spinlock because this update is * done only inside IRQ and there is a different IRQ per * queue
@@ -131,7 +129,8 @@ irqreturn_t hl_irq_handler_cq(int irq, void *arg) queue->ci =hl_queue_inc_ptr (queue->ci);/* Clear CQ entry ready bit */ - cq_base[cq->ci] &= ~CQ_ENTRY_READY_MASK ; + cq_entry->data =cpu_to_le32 (le32_to_cpu (cq_entry->data) & + ~CQ_ENTRY_READY_MASK ); cq->ci =hl_cq_inc_ptr (cq->ci);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/143 habanalabs: fix endianness handling for internal QMAN submission
In reply to Greg Kroah-Hartman[ Upstream commit b9040c99414ba5b85090595a61abc686a5dbb388 ]
The PQs of internal H/W queues (QMANs) can be located in different memory areas for different ASICs. Therefore, when writing PQEs, we need to use the correct function according to the location of the PQ. e.g. if the PQ is located in the device's memory (SRAM or DRAM), we need to use memcpy_toio() so it would work in architectures that have separate address ranges for IO memory.
This patch makes the code that writes the PQE to be ASIC-specific so we can handle this properly per ASIC.
--- drivers/misc/habanalabs/goya/goya.c | 7 ++++--- drivers/misc/habanalabs/goya/goyaP.h | 2 +- drivers/misc/habanalabs/habanalabs.h | 9 +++++++-- drivers/misc/habanalabs/hw_queue.c | 14 +++++--------- 4 files changed, 17 insertions(+), 15 deletions(-)
drivers/misc/habanalabs/goya/goya.c +4 -3
@@ -2716,9 +2716,10 @@ void goya_ring_doorbell(struct hl_device *hdev, u32 hw_queue_id, u32 pi) GOYA_ASYNC_EVENT_ID_PI_UPDATE); } -void goya_flush_pq_write (struct hl_device *hdev,u64 *pq,u64 exp_val) +void goya_pqe_write (struct hl_device *hdev,__le64 *pqe,struct hl_bd *bd) { -/* Not needed in Goya */ +/* The QMANs are on the SRAM so need to copy to IO space */ +memcpy_toio ((void __iomem *) pqe, bd,sizeof (struct hl_bd )); } static void *goya_dma_alloc_coherent(struct hl_device *hdev, size_t size,
@@ -4784,7 +4785,7 @@ static const struct hl_asic_funcs goya_funcs = { .resume = goya_resume, .cb_mmap = goya_cb_mmap, .ring_doorbell = goya_ring_doorbell, - .flush_pq_write = goya_flush_pq_write, + .pqe_write = goya_pqe_write, .asic_dma_alloc_coherent = goya_dma_alloc_coherent, .asic_dma_free_coherent = goya_dma_free_coherent, .get_int_queue_base = goya_get_int_queue_base,
drivers/misc/habanalabs/goya/goyaP.h +1 -1
@@ -170,7 +170,7 @@ int goya_late_init(struct hl_device *hdev);void goya_late_fini (struct hl_device *hdev);void goya_ring_doorbell (struct hl_device *hdev,u32 hw_queue_id,u32 pi); -void goya_flush_pq_write (struct hl_device *hdev,u64 *pq,u64 exp_val); +void goya_pqe_write (struct hl_device *hdev,__le64 *pqe,struct hl_bd *bd);void goya_update_eq_ci (struct hl_device *hdev,u32 val);void goya_restore_phase_topology (struct hl_device *hdev);int goya_context_switch (struct hl_device *hdev,u32 asid);
drivers/misc/habanalabs/habanalabs.h +7 -2
@@ -449,7 +449,11 @@ enum hl_pll_frequency {* @resume: handles IP specific H/W or SW changes for resume. * @cb_mmap: maps a CB. * @ring_doorbell: increment PI on a given QMAN. -* @flush_pq_write: flush PQ entry write if necessary, WARN if flushing failed. +* @pqe_write: Write the PQ entry to the PQ. This is ASIC-specific +* function because the PQs are located in different memory areas +* per ASIC (SRAM, DRAM, Host memory) and therefore, the method of +* writing the PQE must match the destination memory area +* properties. * @asic_dma_alloc_coherent: Allocate coherent DMA memory by calling * dma_alloc_coherent(). This is ASIC function because * its implementation is not trivial when the driver
@@ -518,7 +522,8 @@ struct hl_asic_funcs {int (*cb_mmap)(struct hl_device *hdev,struct vm_area_struct *vma,u64 kaddress,phys_addr_t paddress,u32 size);void (*ring_doorbell)(struct hl_device *hdev,u32 hw_queue_id,u32 pi); -void (*flush_pq_write)(struct hl_device *hdev,u64 *pq,u64 exp_val); +void (*pqe_write)(struct hl_device *hdev,__le64 *pqe, +struct hl_bd *bd);void * (*asic_dma_alloc_coherent)(struct hl_device *hdev,size_t size,dma_addr_t *dma_handle,gfp_t flag); void (*asic_dma_free_coherent)(struct hl_device *hdev, size_t size,
drivers/misc/habanalabs/hw_queue.c +5 -9
@@ -290,23 +290,19 @@ static void int_hw_queue_schedule_job(struct hl_cs_job *job)struct hl_device *hdev = job->cs->ctx->hdev;struct hl_hw_queue *q = &hdev->kernel_queues[job->hw_queue_id];struct hl_bd bd; -u64 *pi, *pbd = (u64 *) &bd; +__le64 *pi; bd.ctl =0 ; - bd.len =__cpu_to_le32 (job->job_cb_size); - bd.ptr =__cpu_to_le64 ((u64 ) (uintptr_t ) job->user_cb); + bd.len =cpu_to_le32 (job->job_cb_size); + bd.ptr =cpu_to_le64 ((u64 ) (uintptr_t ) job->user_cb); - pi = (u64 *) (uintptr_t ) (q->kernel_address + + pi = (__le64 *) (uintptr_t ) (q->kernel_address + ((q->pi & (q->int_queue_len -1 )) *sizeof (bd))); - pi[0 ] = pbd[0 ]; - pi[1 ] = pbd[1 ]; - q->pi++; q->pi &= ((q->int_queue_len <<1 ) -1 ); -/* Flush PQ entry write. Relevant only for specific ASICs */ - hdev->asic_funcs->flush_pq_write (hdev, pi, pbd[0 ]); + hdev->asic_funcs->pqe_write (hdev, pi, &bd); hdev->asic_funcs->ring_doorbell (hdev, q->hw_queue_id, q->pi); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/143 habanalabs: fix device IRQ unmasking for BE host
In reply to Greg Kroah-Hartman[ Upstream commit b421d83a3947369fd5718824aecfaebe1efbf7ed ]
When unmasking IRQs inside the ASIC, the driver passes an array of all the IRQ to unmask. The ASIC's CPU is working in LE so when running in a BE host, the driver needs to do the proper endianness swapping when preparing this array.
In addition, this patch also fixes the endianness of a couple of kernel log debug messages that print values of packets
--- drivers/misc/habanalabs/goya/goya.c | 33 +++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-)
drivers/misc/habanalabs/goya/goya.c +24 -9
@@ -3311,9 +3311,11 @@ static int goya_validate_dma_pkt_no_mmu(struct hl_device *hdev,int rc;dev_dbg (hdev->dev,"DMA packet details:\n" ); -dev_dbg (hdev->dev,"source == 0x%llx\n" , user_dma_pkt->src_addr); -dev_dbg (hdev->dev,"destination == 0x%llx\n" , user_dma_pkt->dst_addr); -dev_dbg (hdev->dev,"size == %u\n" , user_dma_pkt->tsize); +dev_dbg (hdev->dev,"source == 0x%llx\n" , +le64_to_cpu (user_dma_pkt->src_addr)); +dev_dbg (hdev->dev,"destination == 0x%llx\n" , +le64_to_cpu (user_dma_pkt->dst_addr)); +dev_dbg (hdev->dev,"size == %u\n" ,le32_to_cpu (user_dma_pkt->tsize)); ctl =le32_to_cpu (user_dma_pkt->ctl); user_dir = (ctl & GOYA_PKT_LIN_DMA_CTL_DMA_DIR_MASK) >>
@@ -3342,9 +3344,11 @@ static int goya_validate_dma_pkt_mmu(struct hl_device *hdev, struct packet_lin_dma *user_dma_pkt) {dev_dbg (hdev->dev,"DMA packet details:\n" ); -dev_dbg (hdev->dev,"source == 0x%llx\n" , user_dma_pkt->src_addr); -dev_dbg (hdev->dev,"destination == 0x%llx\n" , user_dma_pkt->dst_addr); -dev_dbg (hdev->dev,"size == %u\n" , user_dma_pkt->tsize); +dev_dbg (hdev->dev,"source == 0x%llx\n" , +le64_to_cpu (user_dma_pkt->src_addr)); +dev_dbg (hdev->dev,"destination == 0x%llx\n" , +le64_to_cpu (user_dma_pkt->dst_addr)); +dev_dbg (hdev->dev,"size == %u\n" ,le32_to_cpu (user_dma_pkt->tsize));/* * WA for HW-23.
@@ -3384,7 +3388,8 @@ static int goya_validate_wreg32(struct hl_device *hdev,dev_dbg (hdev->dev,"WREG32 packet details:\n" );dev_dbg (hdev->dev,"reg_offset == 0x%x\n" , reg_offset); -dev_dbg (hdev->dev,"value == 0x%x\n" , wreg_pkt->value); +dev_dbg (hdev->dev,"value == 0x%x\n" , +le32_to_cpu (wreg_pkt->value));if (reg_offset != (mmDMA_CH_0_WR_COMP_ADDR_LO &0x1FFF )) { dev_err(hdev->dev, "WREG32 packet with illegal address 0x%x\n",
@@ -4252,6 +4257,8 @@ static int goya_unmask_irq_arr(struct hl_device *hdev, u32 *irq_arr,size_t total_pkt_size;long result;int rc; +int irq_num_entries, irq_arr_index; +__le32 *goya_irq_arr; total_pkt_size =sizeof (struct armcp_unmask_irq_arr_packet ) + irq_arr_size;
@@ -4269,8 +4276,16 @@ static int goya_unmask_irq_arr(struct hl_device *hdev, u32 *irq_arr,if (!pkt)return -ENOMEM ; - pkt->length =cpu_to_le32 (irq_arr_size /sizeof (irq_arr[0 ])); -memcpy (&pkt->irqs, irq_arr, irq_arr_size); + irq_num_entries = irq_arr_size /sizeof (irq_arr[0 ]); + pkt->length =cpu_to_le32 (irq_num_entries); + +/* We must perform any necessary endianness conversation on the irq +* array being passed to the goya hardware +*/ +for (irq_arr_index =0 , goya_irq_arr = (__le32 *) &pkt->irqs; + irq_arr_index < irq_num_entries ; irq_arr_index++) + goya_irq_arr[irq_arr_index] = +cpu_to_le32 (irq_arr[irq_arr_index]); pkt->armcp_pkt.ctl =cpu_to_le32 (ARMCP_PACKET_UNMASK_RAZWI_IRQ_ARRAY <<ARMCP_PKT_CTL_OPCODE_SHIFT );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/143 xen/blkback: fix memory leaks
In reply to Greg Kroah-Hartman[ Upstream commit ae78ca3cf3d9e9f914bfcd0bc5c389ff18b9c2e0 ]
In read_per_ring_refs(), after 'req' and related memory regions are allocated, xen_blkif_map() is invoked to map the shared frame, irq, and etc. However, if this mapping process fails, no cleanup is performed, leading to memory leaks. To fix this issue, invoke the cleanup before returning the error.
--- drivers/block/xen-blkback/xenbus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/block/xen-blkback/xenbus.c +3 -3
@@ -965,6 +965,7 @@ static int read_per_ring_refs(struct xen_blkif_ring *ring, const char *dir) } } + err = -ENOMEM ;for (i =0 ; i < nr_grefs *XEN_BLKIF_REQS_PER_PAGE ; i++) { req =kzalloc (sizeof (*req),GFP_KERNEL );if (!req)
@@ -987,7 +988,7 @@ static int read_per_ring_refs(struct xen_blkif_ring *ring, const char *dir) err =xen_blkif_map (ring, ring_ref, nr_grefs, evtchn);if (err) {xenbus_dev_fatal (dev, err,"mapping ring-ref port %u" , evtchn); -return err; + goto fail; }return 0 ;
@@ -1007,8 +1008,7 @@ fail: }kfree (req); } -return -ENOMEM ; - +return err; }static int connect_ring (struct backend_info *be)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/143 arm64: cpufeature: Dont treat granule sizes as strict
In reply to Greg Kroah-Hartman[ Upstream commit 5717fe5ab38f9ccb32718bcb03bea68409c9cce4 ]
If a CPU doesn't support the page size for which the kernel is configured, then we will complain and refuse to bring it online. For secondary CPUs (and the boot CPU on a system booting with EFI), we will also print an error identifying the mismatch.
Consequently, the only time that the cpufeature code can detect a granule size mismatch is for a granule other than the one that is currently being used. Although we would rather such systems didn't exist, we've unfortunately lost that battle and Kevin reports that on his amlogic S922X (odroid-n2 board) we end up warning and taining with defconfig because 16k pages are not supported by all of the CPUs.
In such a situation, we don't actually care about the feature mismatch, particularly now that KVM only exposes the sanitised view of the CPU registers (commit 93390c0a1b20 - "arm64: KVM: Hide unsupported AArch64 CPU features from guests"). Treat the granule fields as non-strict and let Kevin run without a tainted kernel.
--- arch/arm64/kernel/cpufeature.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
arch/arm64/kernel/cpufeature.c +11 -3
@@ -184,9 +184,17 @@ static const struct arm64_ftr_bits ftr_id_aa64zfr0[] = { };static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN4_SHIFT ,4 ,ID_AA64MMFR0_TGRAN4_NI ), -S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN64_SHIFT ,4 ,ID_AA64MMFR0_TGRAN64_NI ), -ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN16_SHIFT ,4 ,ID_AA64MMFR0_TGRAN16_NI ), +/* +* We already refuse to boot CPUs that don't support our configured +* page size, so we can only detect mismatches for a page size other +* than the one we're currently using. Unfortunately, SoCs like this +* exist in the wild so, even though we don't like it, we'll have to go +* along with it and treat them as non-strict. +*/ +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN4_SHIFT ,4 ,ID_AA64MMFR0_TGRAN4_NI ), +S_ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN64_SHIFT ,4 ,ID_AA64MMFR0_TGRAN64_NI ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_TGRAN16_SHIFT ,4 ,ID_AA64MMFR0_TGRAN16_NI ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_BIGENDEL0_SHIFT ,4 ,0 ),/* Linux shouldn't care about secure memory */ ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_LOWER_SAFE ,ID_AA64MMFR0_SNSMEM_SHIFT ,4 ,0 ),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/143 riscv: fix flush_tlb_range() end address for flush_tlb_page()
In reply to Greg Kroah-Hartman[ Upstream commit eb93685847a9055283d05951c1b205e737f38533 ]
The RISC-V kernel implementation of flush_tlb_page() when CONFIG_SMP is set is wrong. It passes zero to flush_tlb_range() as the final address to flush, but it should be at least 'addr'.
Some other Linux architecture ports use the beginning address to flush, plus PAGE_SIZE, as the final address to flush. This might flush slightly more than what's needed, but it seems unlikely that being more clever would improve anything. So let's just take that implementation for now.
While here, convert the macro into a static inline function, primarily to avoid unintentional multiple evaluations of 'addr'.
This second version of the patch fixes a coding style issue found by Christoph Hellwig <[email protected]>.
--- arch/riscv/include/asm/tlbflush.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/riscv/include/asm/tlbflush.h +9 -2
@@ -53,10 +53,17 @@ static inline void remote_sfence_vma(struct cpumask *cmask, unsigned long start, }#define flush_tlb_all () sbi_remote_sfence_vma(NULL, 0, -1) -#define flush_tlb_page (vma, addr) flush_tlb_range(vma, addr, 0) +#define flush_tlb_range (vma, start, end) \ remote_sfence_vma(mm_cpumask((vma)->vm_mm), start, (end) - (start)) -#define flush_tlb_mm (mm) \ + +static inline void flush_tlb_page (struct vm_area_struct *vma, +unsigned long addr) +{ +flush_tlb_range (vma, addr, addr +PAGE_SIZE ); +} + +#define flush_tlb_mm (mm) \ remote_sfence_vma(mm_cpumask(mm), 0, -1)#endif /* CONFIG_SMP */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/143 i2c: rcar: avoid race when unregistering slave client
In reply to Greg Kroah-Hartman[ Upstream commit 7b814d852af6944657c2961039f404c4490771c0 ]
After we disabled interrupts, there might still be an active one running. Sync before clearing the pointer to the slave device.
--- drivers/i2c/busses/i2c-rcar.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-rcar.c +7 -4
@@ -139,6 +139,7 @@ struct rcar_i2c_priv {enum dma_data_direction dma_direction;struct reset_control *rstc; +int irq; };#define rcar_i2c_priv_to_dev (p) ((p)->adap.dev.parent)
@@ -861,9 +862,11 @@ static int rcar_unreg_slave(struct i2c_client *slave)WARN_ON (!priv->slave); +/* disable irqs and ensure none is running before clearing ptr */ rcar_i2c_write (priv,ICSIER ,0 );rcar_i2c_write (priv,ICSCR ,0 ); +synchronize_irq (priv->irq); priv->slave =NULL ;pm_runtime_put (rcar_i2c_priv_to_dev (priv));
@@ -918,7 +921,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)struct i2c_adapter *adap;struct device *dev = &pdev->dev;struct i2c_timings i2c_t; -int irq, ret; +int ret;/* Otherwise logic will break because some bytes must always use PIO */ BUILD_BUG_ON_MSG (RCAR_MIN_DMA_LEN <3 ,"Invalid min DMA length" );
@@ -984,10 +987,10 @@ static int rcar_i2c_probe(struct platform_device *pdev)pm_runtime_put (dev); - irq =platform_get_irq (pdev,0 ); - ret =devm_request_irq (dev, irq, rcar_i2c_irq,0 ,dev_name (dev), priv); + priv->irq =platform_get_irq (pdev,0 ); + ret =devm_request_irq (dev, priv->irq, rcar_i2c_irq,0 ,dev_name (dev), priv);if (ret <0 ) { -dev_err (dev,"cannot get irq %d\n" , irq); +dev_err (dev,"cannot get irq %d\n" , priv->irq); goto out_pm_disable; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/143 i2c: emev2: avoid race when unregistering slave client
In reply to Greg Kroah-Hartman[ Upstream commit d7437fc0d8291181debe032671a289b6bd93f46f ]
After we disabled interrupts, there might still be an active one running. Sync before clearing the pointer to the slave device.
--- drivers/i2c/busses/i2c-emev2.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-emev2.c +12 -4
@@ -69,6 +69,7 @@ struct em_i2c_device {struct completion msg_done;struct clk *sclk;struct i2c_client *slave; +int irq; };static inline void em_clear_set_bit (struct em_i2c_device *priv,u8 clear,u8 set,u8 reg)
@@ -339,6 +340,12 @@ static int em_i2c_unreg_slave(struct i2c_client *slave)writeb (0 , priv->base +I2C_OFS_SVA0 ); +/* +* Wait for interrupt to finish. New slave irqs cannot happen because we +* cleared the slave address and, thus, only extension codes will be +* detected which do not use the slave ptr. +*/ +synchronize_irq (priv->irq); priv->slave =NULL ;return 0 ;
@@ -355,7 +362,7 @@ static int em_i2c_probe(struct platform_device *pdev) {struct em_i2c_device *priv;struct resource *r; -int irq, ret; +int ret; priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
@@ -390,8 +397,8 @@ static int em_i2c_probe(struct platform_device *pdev)em_i2c_reset (&priv->adap); - irq =platform_get_irq (pdev,0 ); - ret =devm_request_irq (&pdev->dev, irq, em_i2c_irq_handler,0 , + priv->irq =platform_get_irq (pdev,0 ); + ret =devm_request_irq (&pdev->dev, priv->irq, em_i2c_irq_handler,0 ,"em_i2c" , priv);if (ret) goto err_clk;
@@ -401,7 +408,8 @@ static int em_i2c_probe(struct platform_device *pdev)if (ret) goto err_clk; -dev_info (&pdev->dev,"Added i2c controller %d, irq %d\n" , priv->adap.nr, irq); +dev_info (&pdev->dev,"Added i2c controller %d, irq %d\n" , priv->adap.nr, + priv->irq);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/143 drm/scheduler: use job count instead of peek
In reply to Greg Kroah-Hartman[ Upstream commit e1b4ce25dbc93ab0cb8ed0f236a3b9ff7b03802c ]
The spsc_queue_peek function is accessing queue->head which belongs to the consumer thread and shouldn't be accessed by the producer
This is fixing a rare race condition when destroying entities.
--- drivers/gpu/drm/scheduler/sched_entity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/scheduler/sched_entity.c +2 -2
@@ -95,7 +95,7 @@ static bool drm_sched_entity_is_idle(struct drm_sched_entity *entity)rmb ();/* for list_empty to work without lock */ if (list_empty (&entity->list) || -spsc_queue_peek (&entity->job_queue) ==NULL ) +spsc_queue_count (&entity->job_queue) ==0 )return true;return false;
@@ -281,7 +281,7 @@ void drm_sched_entity_fini(struct drm_sched_entity *entity)/* Consumption of existing IBs wasn't completed. Forcefully * remove them here. */ -if (spsc_queue_peek (&entity->job_queue)) { +if (spsc_queue_count (&entity->job_queue)) {if (sched) {/* Park the kernel for a moment to make sure it isn't processing * our enity.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/143 drm/ast: Fixed reboot test may cause system hanged
In reply to Greg Kroah-Hartman[ Upstream commit 05b439711f6ff8700e8660f97a1179650778b9cb ]
There is another thread still access standard VGA I/O while loading drm driver. Disable standard VGA I/O decode to avoid this issue.
--- drivers/gpu/drm/ast/ast_main.c | 5 ++++- drivers/gpu/drm/ast/ast_mode.c | 2 +- drivers/gpu/drm/ast/ast_post.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/ast/ast_main.c +4 -1
@@ -131,8 +131,8 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)/* Enable extended register access */ -ast_enable_mmio (dev);ast_open_key (ast); +ast_enable_mmio (dev);/* Find out whether P2A works or whether to use device-tree */ ast_detect_config_mode (dev, &scu_rev);
@@ -576,6 +576,9 @@ void ast_driver_unload(struct drm_device *dev) {struct ast_private *ast = dev->dev_private; +/* enable standard VGA decode */ +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 ); +ast_release_firmware (dev);kfree (ast->dp501_fw_addr);ast_mode_fini (dev);
drivers/gpu/drm/ast/ast_mode.c +1 -1
@@ -601,7 +601,7 @@ static int ast_crtc_mode_set(struct drm_crtc *crtc,return -EINVAL ;ast_open_key (ast); -ast_set_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xa1 ,0xff ,0x04 ); +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x06 );ast_set_std_reg (crtc, adjusted_mode, &vbios_mode);ast_set_crtc_reg (crtc, adjusted_mode, &vbios_mode);
drivers/gpu/drm/ast/ast_post.c +1 -1
@@ -46,7 +46,7 @@ void ast_enable_mmio(struct drm_device *dev) {struct ast_private *ast = dev->dev_private; -ast_set_index_reg_mask (ast,AST_IO_CRTC_PORT ,0xa1 ,0xff ,0x04 ); +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x06 ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/143 usb: host: fotg2: restart hcd after port reset
In reply to Greg Kroah-Hartman[ Upstream commit 777758888ffe59ef754cc39ab2f275dc277732f4 ]
On the Gemini SoC the FOTG2 stalls after port reset so restart the HCD after each port reset.
--- drivers/usb/host/fotg210-hcd.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/host/fotg210-hcd.c +4 -0
@@ -1628,6 +1628,10 @@ static int fotg210_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,/* see what we found out */ temp =check_reset_complete (fotg210, wIndex, status_reg,fotg210_readl (fotg210, status_reg)); + +/* restart schedule */ + fotg210->command |=CMD_RUN ; +fotg210_writel (fotg210, fotg210->command, &fotg210->regs->command); }if (!(temp & (PORT_RESUME |PORT_RESET ))) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/143 tools: hv: fixed Python pep8/flake8 warnings for lsvmbus
In reply to Greg Kroah-Hartman[ Upstream commit 5912e791f3018de0a007c8cfa9cb38c97d3e5f5c ]
Fixed pep8/flake8 python style code for lsvmbus tool.
The TAB indentation was on purpose ignored (pep8 rule W191) to make sure the code is complying with the Linux code guideline. The following command doe not show any warnings now:
pep8 --ignore=W191 lsvmbus
flake8 --ignore=W191 lsvmbus
--- tools/hv/lsvmbus | 75 +++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 33 deletions(-)
tools/hv/lsvmbus +42 -33
@@ -4,10 +4,10 @@ import os from optparse import OptionParser +help_msg = "print verbose messages. Try -vv, -vvv for more verbose messages" parser = OptionParser() -parser.add_option("-v", "--verbose", dest="verbose", - help="print verbose messages. Try -vv, -vvv for \ - more verbose messages", action="count") +parser.add_option( + "-v", "--verbose", dest="verbose", help=help_msg, action="count") (options, args) = parser.parse_args()
@@ -21,27 +21,28 @@ if not os.path.isdir(vmbus_sys_path): exit(-1) vmbus_dev_dict = { - '{0e0b6031-5213-4934-818b-38d90ced39db}' : '[Operating system shutdown]', - '{9527e630-d0ae-497b-adce-e80ab0175caf}' : '[Time Synchronization]', - '{57164f39-9115-4e78-ab55-382f3bd5422d}' : '[Heartbeat]', - '{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}' : '[Data Exchange]', - '{35fa2e29-ea23-4236-96ae-3a6ebacba440}' : '[Backup (volume checkpoint)]', - '{34d14be3-dee4-41c8-9ae7-6b174977c192}' : '[Guest services]', - '{525074dc-8985-46e2-8057-a307dc18a502}' : '[Dynamic Memory]', - '{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}' : 'Synthetic mouse', - '{f912ad6d-2b17-48ea-bd65-f927a61c7684}' : 'Synthetic keyboard', - '{da0a7802-e377-4aac-8e77-0558eb1073f8}' : 'Synthetic framebuffer adapter', - '{f8615163-df3e-46c5-913f-f2d2f965ed0e}' : 'Synthetic network adapter', - '{32412632-86cb-44a2-9b5c-50d1417354f5}' : 'Synthetic IDE Controller', - '{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}' : 'Synthetic SCSI Controller', - '{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}' : 'Synthetic fiber channel adapter', - '{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}' : 'Synthetic RDMA adapter', - '{44c4f61d-4444-4400-9d52-802e27ede19f}' : 'PCI Express pass-through', - '{276aacf4-ac15-426c-98dd-7521ad3f01fe}' : '[Reserved system device]', - '{f8e65716-3cb3-4a06-9a60-1889c5cccab5}' : '[Reserved system device]', - '{3375baf4-9e15-4b30-b765-67acb10d607b}' : '[Reserved system device]', + '{0e0b6031-5213-4934-818b-38d90ced39db}': '[Operating system shutdown]', + '{9527e630-d0ae-497b-adce-e80ab0175caf}': '[Time Synchronization]', + '{57164f39-9115-4e78-ab55-382f3bd5422d}': '[Heartbeat]', + '{a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}': '[Data Exchange]', + '{35fa2e29-ea23-4236-96ae-3a6ebacba440}': '[Backup (volume checkpoint)]', + '{34d14be3-dee4-41c8-9ae7-6b174977c192}': '[Guest services]', + '{525074dc-8985-46e2-8057-a307dc18a502}': '[Dynamic Memory]', + '{cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}': 'Synthetic mouse', + '{f912ad6d-2b17-48ea-bd65-f927a61c7684}': 'Synthetic keyboard', + '{da0a7802-e377-4aac-8e77-0558eb1073f8}': 'Synthetic framebuffer adapter', + '{f8615163-df3e-46c5-913f-f2d2f965ed0e}': 'Synthetic network adapter', + '{32412632-86cb-44a2-9b5c-50d1417354f5}': 'Synthetic IDE Controller', + '{ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}': 'Synthetic SCSI Controller', + '{2f9bcc4a-0069-4af3-b76b-6fd0be528cda}': 'Synthetic fiber channel adapter', + '{8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}': 'Synthetic RDMA adapter', + '{44c4f61d-4444-4400-9d52-802e27ede19f}': 'PCI Express pass-through', + '{276aacf4-ac15-426c-98dd-7521ad3f01fe}': '[Reserved system device]', + '{f8e65716-3cb3-4a06-9a60-1889c5cccab5}': '[Reserved system device]', + '{3375baf4-9e15-4b30-b765-67acb10d607b}': '[Reserved system device]', } + def get_vmbus_dev_attr(dev_name, attr): try: f = open('%s/%s/%s' % (vmbus_sys_path, dev_name, attr), 'r')
@@ -52,6 +53,7 @@ def get_vmbus_dev_attr(dev_name, attr): return lines + class VMBus_Dev: pass
@@ -66,12 +68,13 @@ for f in os.listdir(vmbus_sys_path): chn_vp_mapping = get_vmbus_dev_attr(f, 'channel_vp_mapping') chn_vp_mapping = [c.strip() for c in chn_vp_mapping] - chn_vp_mapping = sorted(chn_vp_mapping, - key = lambda c : int(c.split(':')[0])) + chn_vp_mapping = sorted( + chn_vp_mapping, key=lambda c: int(c.split(':')[0])) - chn_vp_mapping = ['\tRel_ID=%s, target_cpu=%s' % - (c.split(':')[0], c.split(':')[1]) - for c in chn_vp_mapping] + chn_vp_mapping = [ + '\tRel_ID=%s, target_cpu=%s' % + (c.split(':')[0], c.split(':')[1]) for c in chn_vp_mapping + ] d = VMBus_Dev() d.sysfs_path = '%s/%s' % (vmbus_sys_path, f) d.vmbus_id = vmbus_id
@@ -85,7 +88,7 @@ for f in os.listdir(vmbus_sys_path): vmbus_dev_list.append(d) -vmbus_dev_list = sorted(vmbus_dev_list, key = lambda d : int(d.vmbus_id)) +vmbus_dev_list = sorted(vmbus_dev_list, key=lambda d: int(d.vmbus_id)) format0 = '%2s: %s' format1 = '%2s: Class_ID = %s - %s\n%s'
@@ -95,9 +98,15 @@ for d in vmbus_dev_list: if verbose == 0: print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc)) elif verbose == 1: - print (('VMBUS ID ' + format1) % \ - (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)) + print( + ('VMBUS ID ' + format1) % + (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping) + ) else: - print (('VMBUS ID ' + format2) % \ - (d.vmbus_id, d.class_id, d.dev_desc, \ - d.device_id, d.sysfs_path, d.chn_vp_mapping)) + print( + ('VMBUS ID ' + format2) % + ( + d.vmbus_id, d.class_id, d.dev_desc, + d.device_id, d.sysfs_path, d.chn_vp_mapping + ) + )
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/143 tools: hv: fix KVP and VSS daemons exit code
In reply to Greg Kroah-Hartman[ Upstream commit b0995156071b0ff29a5902964a9dc8cfad6f81c0 ]
HyperV KVP and VSS daemons should exit with 0 when the '--help' or '-h' flags are used.
--- tools/hv/hv_kvp_daemon.c | 2 ++ tools/hv/hv_vss_daemon.c | 2 ++ 2 files changed, 4 insertions(+)
tools/hv/hv_kvp_daemon.c +2 -0
@@ -1386,6 +1386,8 @@ int main(int argc, char *argv[]) daemonize =0 ;break ;case 'h' : +print_usage (argv); +exit (0 );default :print_usage (argv);exit (EXIT_FAILURE );
tools/hv/hv_vss_daemon.c +2 -0
@@ -218,6 +218,8 @@ int main(int argc, char *argv[]) daemonize =0 ;break ;case 'h' : +print_usage (argv); +exit (0 );default :print_usage (argv);exit (EXIT_FAILURE );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/143 locking/rwsem: Add missing ACQUIRE to read_slowpath exit when queue is empty
In reply to Greg Kroah-Hartman[ Upstream commit e1b98fa316648420d0434d9ff5b92ad6609ba6c3 ]
LTP mtest06 has been observed to occasionally hit "still mapped when deleted" and following BUG_ON on arm64.
The extra mapcount originated from pagefault handler, which handled pagefault for vma that has already been detached. vma is detached under mmap_sem write lock by detach_vmas_to_be_unmapped(), which also invalidates vmacache.
When the pagefault handler (under mmap_sem read lock) calls find_vma(), vmacache_valid() wrongly reports vmacache as valid.
After rwsem down_read() returns via 'queue empty' path (as of v5.2), it does so without an ACQUIRE on sem->count:
down_read()
__down_read()
rwsem_down_read_failed()
__rwsem_down_read_failed_common()
raw_spin_lock_irq(&sem->wait_lock);
if (list_empty(&sem->wait_list)) {
if (atomic_long_read(&sem->count) >= 0) {
raw_spin_unlock_irq(&sem->wait_lock);
return sem;The problem can be reproduced by running LTP mtest06 in a loop and building the kernel (-j $NCPUS) in parallel. It does reproduces since v4.20 on arm64 HPE Apollo 70 (224 CPUs, 256GB RAM, 2 nodes). It triggers reliably in about an hour.
The patched kernel ran fine for 10+ hours.
--- kernel/locking/rwsem-xadd.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/locking/rwsem-xadd.c +2 -0
@@ -454,6 +454,8 @@ __rwsem_down_read_failed_common(struct rw_semaphore *sem, int state)* been set in the count. */ if (atomic_long_read (&sem->count) >=0 ) { +/* Provide lock ACQUIRE */ +smp_acquire__after_ctrl_dep ();raw_spin_unlock_irq (&sem->wait_lock);rwsem_set_reader_owned (sem);lockevent_inc (rwsem_rlock_fast);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/143 lcoking/rwsem: Add missing ACQUIRE to read_slowpath sleep loop
In reply to Greg Kroah-Hartman[ Upstream commit 99143f82a255e7f054bead8443462fae76dd829e ]
While reviewing another read_slowpath patch, both Will and I noticed another missing ACQUIRE, namely:
X = 0;
CPU0 CPU1
rwsem_down_read()
for (;;) {
set_current_state(TASK_UNINTERRUPTIBLE); X = 1;
rwsem_up_write();
rwsem_mark_wake()
atomic_long_add(adjustment, &sem->count);
smp_store_release(&waiter->task, NULL);
if (!waiter.task)
break;
...
}r = X;
Allows 'r == 0'.
--- kernel/locking/rwsem-xadd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/locking/rwsem-xadd.c +3 -1
@@ -485,8 +485,10 @@ __rwsem_down_read_failed_common(struct rw_semaphore *sem, int state)/* wait to be given the lock */ while (true) {set_current_state (state); -if (!waiter.task) +if (!smp_load_acquire (&waiter.task)) { +/* Orders against rwsem_mark_wake()'s smp_store_release() */ break ; + }if (signal_pending_state (state, current)) {raw_spin_lock_irq (&sem->wait_lock);if (waiter.task)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/143 watchdog: bcm2835_wdt: Fix module autoload
In reply to Greg Kroah-Hartman[ Upstream commit 215e06f0d18d5d653d6ea269e4dfc684854d48bf ]
The commit 5e6acc3e678e ("bcm2835-pm: Move bcm2835-watchdog's DT probe to an MFD.") broke module autoloading on Raspberry Pi. So add a module alias this fix this.
--- drivers/watchdog/bcm2835_wdt.c | 1 + 1 file changed, 1 insertion(+)
drivers/watchdog/bcm2835_wdt.c +1 -0
@@ -240,6 +240,7 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); +MODULE_ALIAS ("platform:bcm2835-wdt" );MODULE_AUTHOR ("Lubomir Rintel <[email protected]>" );MODULE_DESCRIPTION ("Driver for Broadcom BCM2835 watchdog timer" );MODULE_LICENSE ("GPL" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/143 selftests/bpf: install files test_xdp_vlan.sh
In reply to Greg Kroah-Hartman[ Upstream commit 3035bb72ee47d494c041465b4add9c6407c832ed ]
When ./test_xdp_vlan_mode_generic.sh runs it complains that it can't find file test_xdp_vlan.sh.
# selftests: bpf: test_xdp_vlan_mode_generic.sh
# ./test_xdp_vlan_mode_generic.sh: line 9: ./test_xdp_vlan.sh: No such file or directory
Rework so that test_xdp_vlan.sh gets installed, added to the variable TEST_PROGS_EXTENDED.
--- tools/testing/selftests/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/bpf/Makefile +2 -1
@@ -61,7 +61,8 @@ TEST_PROGS := test_kmod.sh \ TEST_PROGS_EXTENDED := with_addr.sh \ with_tunnels.sh \ tcp_client.py \ - tcp_server.py + tcp_server.py \ + test_xdp_vlan.sh # Compile but not part of 'make run_tests' TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/143 drm/bridge: tfp410: fix memleak in get_modes()
In reply to Greg Kroah-Hartman[ Upstream commit c08f99c39083ab55a9c93b3e93cef48711294dad ]
We don't free the edid blob allocated by the call to drm_get_edid(), causing a memleak. Fix this by calling kfree(edid) at the end of the get_modes().
--- drivers/gpu/drm/bridge/ti-tfp410.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/bridge/ti-tfp410.c +6 -1
@@ -66,7 +66,12 @@ static int tfp410_get_modes(struct drm_connector *connector)drm_connector_update_edid_property (connector, edid); -return drm_add_edid_modes (connector, edid); + ret =drm_add_edid_modes (connector, edid); + +kfree (edid); + +return ret; + fallback:/* No EDID, fallback on the XGA standard modes */ ret =drm_add_modes_noedid (connector,1920 ,1200 );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/143 mt76: usb: fix rx A-MSDU support
In reply to Greg Kroah-Hartman[ Upstream commit 2a92b08b18553c101115423bd34963b1a59a45a3 ]
Commit f8f527b16db5 ("mt76: usb: use EP max packet aligned buffer sizes for rx") breaks A-MSDU support. When A-MSDU is enable the device can receive frames up to q->buf_size but they will be discarded in mt76u_process_rx_entry since there is no enough room for skb_shared_info. Fix the issue reallocating the skb and copying in the linear area the first 128B of the received frames and in the frag_list the remaining part
--- drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/usb.c | 46 ++++++++++++++++++----- 2 files changed, 38 insertions(+), 9 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -30,6 +30,7 @@#define MT_TX_RING_SIZE 256#define MT_MCU_RING_SIZE 32#define MT_RX_BUF_SIZE 2048 +#define MT_SKB_HEAD_LEN 128struct mt76_dev ;struct mt76_wcid ;
drivers/net/wireless/mediatek/mt76/usb.c +37 -9
62 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/143 ipv6/addrconf: allow adding multicast addr if IFA_F_MCAUTOJOIN is set
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit f17f7648a49aa6728649ddf79bdbcac4f1970ce4 ]
In commit 93a714d6b53d ("multicast: Extend ip address command to enable multicast group join/leave on") we added a new flag IFA_F_MCAUTOJOIN to make user able to add multicast address on ethernet interface.
This works for IPv4, but not for IPv6. See the inet6_addr_add code.
static int inet6_addr_add()
{
...
if (cfg->ifa_flags & IFA_F_MCAUTOJOIN) {
ipv6_mc_config(net->ipv6.mc_autojoin_sk, true...)
}
ifp = ipv6_add_addr(idev, cfg, true, extack); <- always fail with maddr
if (!IS_ERR(ifp)) {
...
} else if (cfg->ifa_flags & IFA_F_MCAUTOJOIN) {
ipv6_mc_config(net->ipv6.mc_autojoin_sk, false...)
}
}But in ipv6_add_addr() it will check the address type and reject multicast address directly. So this feature is never worked for IPv6.
We should not remove the multicast address check totally in ipv6_add_addr(), but could accept multicast address only when IFA_F_MCAUTOJOIN flag supplied.
v2: update commit description
--- net/ipv6/addrconf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv6/addrconf.c +2 -1
@@ -1045,7 +1045,8 @@ ipv6_add_addr(struct inet6_dev *idev, stint err =0 ;if (addr_type ==IPV6_ADDR_ANY || - addr_type &IPV6_ADDR_MULTICAST || + (addr_type &IPV6_ADDR_MULTICAST && + !(cfg->ifa_flags &IFA_F_MCAUTOJOIN )) || (!(idev->dev->flags &IFF_LOOPBACK ) && !netif_is_l3_master (idev->dev) && addr_type &IPV6_ADDR_LOOPBACK ))
Greg Kroah-Hartman
maintainerPATCH 50/143 ipv6: Fix return value of ipv6_mc_may_pull() for malformed packets
In reply to Greg Kroah-HartmanFrom: Stefano Brivio <[email protected]>
Commit ba5ea614622d ("bridge: simplify ip_mc_check_igmp() and ipv6_mc_check_mld() calls") replaces direct calls to pskb_may_pull() in br_ipv6_multicast_mld2_report() with calls to ipv6_mc_may_pull(), that returns -EINVAL on buffers too short to be valid IPv6 packets, while maintaining the previous handling of the return code.
This leads to the direct opposite of the intended effect: if the packet is malformed, -EINVAL evaluates as true, and we'll happily proceed with the processing.
Return 0 if the packet is too short, in the same way as this was fixed for IPv4 by commit 083b78a9ed64 ("ip: fix ip_mc_may_pull() return value").
I don't have a reproducer for this, unlike the one referred to by the IPv4 commit, but this is clearly broken.
--- include/net/addrconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/addrconf.h +1 -1
@@ -206,7 +206,7 @@ static inline int ipv6_mc_may_pull(struc unsigned int len) {if (skb_transport_offset (skb) +ipv6_transport_len (skb) < len) -return -EINVAL ; +return 0 ;return pskb_may_pull (skb, len); }
Greg Kroah-Hartman
maintainerPATCH 51/143 net: cpsw: fix NULL pointer exception in the probe error path
In reply to Greg Kroah-HartmanFrom: Antoine Tenart <[email protected]>
[ Upstream commit 2d683eaaeeb9d33d23674ae635e0ef1448523d18 ]
In certain cases when the probe function fails the error path calls cpsw_remove_dt() before calling platform_set_drvdata(). This is an issue as cpsw_remove_dt() uses platform_get_drvdata() to retrieve the cpsw_common data and leds to a NULL pointer exception. This patches fixes it by calling platform_set_drvdata() earlier in the probe.
--- drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -2372,6 +2372,7 @@ static int cpsw_probe(struct platform_deif (!cpsw)return -ENOMEM ; +platform_set_drvdata (pdev, cpsw); cpsw->dev = dev; mode =devm_gpiod_get_array_optional (dev,"mode" ,GPIOD_OUT_LOW );
@@ -2476,7 +2477,6 @@ static int cpsw_probe(struct platform_de goto clean_cpts; } -platform_set_drvdata (pdev, ndev); priv =netdev_priv (ndev); priv->cpsw = cpsw; priv->ndev = ndev;
Greg Kroah-Hartman
maintainerPATCH 52/143 net: fix __ip_mc_inc_group usage
In reply to Greg Kroah-HartmanFrom: Li RongQing <[email protected]>
[ Upstream commit a1c4cd67840ef80f6ca5f73326fa9a6719303a95 ]
in ip_mc_inc_group, memory allocation flag, not mcast mode, is expected by __ip_mc_inc_group
similar issue in __ip_mc_join_group, both mcase mode and gfp_t are needed here, so use ____ip_mc_inc_group(...)
--- net/ipv4/igmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/igmp.c +2 -2
@@ -1474,7 +1474,7 @@ EXPORT_SYMBOL(__ip_mc_inc_group);void ip_mc_inc_group (struct in_device *in_dev,__be32 addr) { -__ip_mc_inc_group (in_dev, addr,MCAST_EXCLUDE ); +__ip_mc_inc_group (in_dev, addr,GFP_KERNEL ); }EXPORT_SYMBOL (ip_mc_inc_group);
@@ -2196,7 +2196,7 @@ static int __ip_mc_join_group(struct soc iml->sflist =NULL ; iml->sfmode = mode;rcu_assign_pointer (inet->mc_list, iml); -__ip_mc_inc_group (in_dev, addr, mode); +____ip_mc_inc_group (in_dev, addr, mode,GFP_KERNEL ); err =0 ; done:return err;
Greg Kroah-Hartman
maintainerPATCH 53/143 net/smc: make sure EPOLLOUT is raised
In reply to Greg Kroah-HartmanFrom: Jason Baron <[email protected]>
[ Upstream commit 4651d1802f7063e4d8c0bcad957f46ece0c04024 ]
Currently, we are only explicitly setting SOCK_NOSPACE on a write timeout for non-blocking sockets. Epoll() edge-trigger mode relies on SOCK_NOSPACE being set when -EAGAIN is returned to ensure that EPOLLOUT is raised. Expand the setting of SOCK_NOSPACE to non-blocking sockets as well that can use SO_SNDTIMEO to adjust their write timeout. This mirrors the behavior that Eric Dumazet introduced for tcp sockets.
--- net/smc/smc_tx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/smc/smc_tx.c +2 -4
@@ -76,13 +76,11 @@ static int smc_tx_wait(struct smc_sock *DEFINE_WAIT_FUNC (wait, woken_wake_function);struct smc_connection *conn = &smc->conn;struct sock *sk = &smc->sk; -bool noblock;long timeo;int rc =0 ;/* similar to sk_stream_wait_memory */ timeo =sock_sndtimeo (sk, flags &MSG_DONTWAIT ); - noblock = timeo ? false : true;add_wait_queue (sk_sleep (sk), &wait);while (1 ) {sk_set_bit (SOCKWQ_ASYNC_NOSPACE , sk);
@@ -97,8 +95,8 @@ static int smc_tx_wait(struct smc_sock *break ; }if (!timeo) { -if (noblock) -set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); +/* ensure EPOLLOUT is subsequently generated */ +set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); rc = -EAGAIN ;break ; }
Greg Kroah-Hartman
maintainerPATCH 54/143 tcp: make sure EPOLLOUT wont be missed
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit ef8d8ccdc216f797e66cb4a1372f5c4c285ce1e4 ]
As Jason Baron explained in commit 790ba4566c1a ("tcp: set SOCK_NOSPACE under memory pressure"), it is crucial we properly set SOCK_NOSPACE when needed.
However, Jason patch had a bug, because the 'nonblocking' status as far as sk_stream_wait_memory() is concerned is governed by MSG_DONTWAIT flag passed at sendmsg() time :
long timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
So it is very possible that tcp sendmsg() calls sk_stream_wait_memory(), and that sk_stream_wait_memory() returns -EAGAIN with SOCK_NOSPACE cleared, if sk->sk_sndtimeo has been set to a small (but not zero) value.
This patch removes the 'noblock' variable since we must always set SOCK_NOSPACE if -EAGAIN is returned.
It also renames the do_nonblock label since we might reach this code path even if we were in blocking mode.
--- net/core/stream.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/core/stream.c +9 -7
@@ -120,7 +120,6 @@ int sk_stream_wait_memory(struct sock *sint err =0 ;long vm_wait =0 ;long current_timeo = *timeo_p; -bool noblock = (*timeo_p ? false : true);DEFINE_WAIT_FUNC (wait, woken_wake_function);if (sk_stream_memory_free (sk))
@@ -133,11 +132,8 @@ int sk_stream_wait_memory(struct sock *sif (sk->sk_err || (sk->sk_shutdown &SEND_SHUTDOWN )) goto do_error; -if (!*timeo_p) { -if (noblock) -set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); - goto do_nonblock; - } +if (!*timeo_p) + goto do_eagain;if (signal_pending (current)) goto do_interrupted;sk_clear_bit (SOCKWQ_ASYNC_NOSPACE , sk);
@@ -169,7 +165,13 @@ out: do_error: err = -EPIPE ; goto out; -do_nonblock: +do_eagain: +/* Make sure that whenever EAGAIN is returned, EPOLLOUT event can +* be generated later. +* When TCP receives ACK packets that make room, tcp_check_space() +* only calls tcp_new_space() if SOCK_NOSPACE is set. +*/ +set_bit (SOCK_NOSPACE , &sk->sk_socket->flags); err = -EAGAIN ; goto out; do_interrupted:
Greg Kroah-Hartman
maintainerPATCH 55/143 ipv4: mpls: fix mpls_xmit for iptunnel
In reply to Greg Kroah-HartmanFrom: Alexey Kodanev <[email protected]>
[ Upstream commit 803f3e22ae10003a83c781498c0ac34cfe3463ff ]
When using mpls over gre/gre6 setup, rt->rt_gw4 address is not set, the same for rt->rt_gw_family. Therefore, when rt->rt_gw_family is checked in mpls_xmit(), neigh_xmit() call is skipped. As a result, such setup doesn't work anymore.
This issue was found with LTP mpls03 tests.
--- net/mpls/mpls_iptunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/mpls/mpls_iptunnel.c +4 -4
@@ -133,12 +133,12 @@ static int mpls_xmit(struct sk_buff *skbmpls_stats_inc_outucastpkts (out_dev, skb);if (rt) { -if (rt->rt_gw_family ==AF_INET ) - err =neigh_xmit (NEIGH_ARP_TABLE , out_dev, &rt->rt_gw4, - skb); -else if (rt->rt_gw_family ==AF_INET6 ) +if (rt->rt_gw_family ==AF_INET6 ) err =neigh_xmit (NEIGH_ND_TABLE , out_dev, &rt->rt_gw6, skb); +else + err =neigh_xmit (NEIGH_ARP_TABLE , out_dev, &rt->rt_gw4, + skb); }else if (rt6) {if (ipv6_addr_v4mapped (&rt6->rt6i_gateway)) {/* 6PE (RFC 4798) */
Greg Kroah-Hartman
maintainerPATCH 56/143 openvswitch: Fix conntrack cache with timeout
In reply to Greg Kroah-HartmanFrom: Yi-Hung Wei <[email protected]>
[ Upstream commit 7177895154e6a35179d332f4a584d396c50d0612 ]
This patch addresses a conntrack cache issue with timeout policy. Currently, we do not check if the timeout extension is set properly in the cached conntrack entry. Thus, after packet recirculate from conntrack action, the timeout policy is not applied properly. This patch fixes the aforementioned issue.
--- net/openvswitch/conntrack.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
net/openvswitch/conntrack.c +13 -0
@@ -67,6 +67,7 @@ struct ovs_conntrack_info {struct md_mark mark;struct md_labels labels;char timeout[CTNL_TIMEOUT_NAME_MAX ]; +struct nf_ct_timeout *nf_ct_timeout;#if IS_ENABLED (CONFIG_NF_NAT )struct nf_nat_range2 range;/* Only present for SRC NAT and DST NAT. */ #endif
@@ -697,6 +698,14 @@ static bool skb_nfct_cached(struct net *if (help &&rcu_access_pointer (help->helper) != info->helper)return false; } +if (info->nf_ct_timeout) { +struct nf_conn_timeout *timeout_ext; + + timeout_ext =nf_ct_timeout_find (ct); +if (!timeout_ext || info->nf_ct_timeout != +rcu_dereference (timeout_ext->timeout)) +return false; + }/* Force conntrack entry direction to the current packet? */ if (info->force &&CTINFO2DIR (ctinfo) !=IP_CT_DIR_ORIGINAL ) {/* Delete the conntrack entry if confirmed, else just release
@@ -1657,6 +1666,10 @@ int ovs_ct_copy_action(struct net *net, ct_info.timeout))pr_info_ratelimited ("Failed to associated timeout " "policy `%s'\n" , ct_info.timeout); + else + ct_info.nf_ct_timeout = rcu_dereference( +nf_ct_timeout_find (ct_info.ct)->timeout); + }if (helper) {
Greg Kroah-Hartman
maintainerPATCH 57/143 ipv4/icmp: fix rt dst dev null pointer dereference
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit e2c693934194fd3b4e795635934883354c06ebc9 ]
In __icmp_send() there is a possibility that the rt->dst.dev is NULL, e,g, with tunnel collect_md mode, which will cause kernel crash. Here is what the code path looks like, for GRE:
- ip6gre_tunnel_xmit
- ip6gre_xmit_ipv4
- __gre6_xmit
- ip6_tnl_xmit
- if skb->len - t->tun_hlen - eth_hlen > mtu; return -EMSGSIZE
- icmp_send
- net = dev_net(rt->dst.dev); <-- here
The reason is __metadata_dst_init() init dst->dev to NULL by default. We could not fix it in __metadata_dst_init() as there is no dev supplied. On the other hand, the reason we need rt->dst.dev is to get the net. So we can just try get it from skb->dev when rt->dst.dev is NULL.
v4: Julian Anastasov remind skb->dev also could be NULL. We'd better still use dst.dev and do a check to avoid crash.
v3: No changes.
v2: fix the issue in __icmp_send() instead of updating shared dst dev in {ip_md, ip6}_tunnel_xmit.
--- net/ipv4/icmp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/ipv4/icmp.c +7 -1
@@ -582,7 +582,13 @@ void __icmp_send(struct sk_buff *skb_in,if (!rt) goto out; - net =dev_net (rt->dst.dev); + +if (rt->dst.dev) + net =dev_net (rt->dst.dev); +else if (skb_in->dev) + net =dev_net (skb_in->dev); +else + goto out;/* * Find the original header. It is expected to be valid, of course.
Greg Kroah-Hartman
maintainerPATCH 58/143 xfrm/xfrm_policy: fix dst dev null pointer dereference in collect_md mode
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
[ Upstream commit c3b4c3a47e05d5fecf7354d75824a9d1b37f3e84 ]
In decode_session{4,6} there is a possibility that the skb dst dev is NULL, e,g, with tunnel collect_md mode, which will cause kernel crash. Here is what the code path looks like, for GRE:
- ip6gre_tunnel_xmit
- ip6gre_xmit_ipv6
- __gre6_xmit
- ip6_tnl_xmit
- if skb->len - t->tun_hlen - eth_hlen > mtu; return -EMSGSIZE
- icmpv6_send
- icmpv6_route_lookup
- xfrm_decode_session_reverse
- decode_session4
- oif = skb_dst(skb)->dev->ifindex; <-- here
- decode_session6
- oif = skb_dst(skb)->dev->ifindex; <-- here
The reason is __metadata_dst_init() init dst->dev to NULL by default. We could not fix it in __metadata_dst_init() as there is no dev supplied. On the other hand, the skb_dst(skb)->dev is actually not needed as we called decode_session{4,6} via xfrm_decode_session_reverse(), so oif is not used by: fl4->flowi4_oif = reverse ? skb->skb_iif : oif;
So make a dst dev check here should be clean and safe.
v4: No changes.
v3: No changes.
v2: fix the issue in decode_session{4,6} instead of updating shared dst dev in {ip_md, ip6}_tunnel_xmit.
--- net/xfrm/xfrm_policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/xfrm/xfrm_policy.c +2 -2
@@ -3272,7 +3272,7 @@ decode_session4(struct sk_buff *skb, strstruct flowi4 *fl4 = &fl->u.ip4;int oif =0 ; -if (skb_dst (skb)) +if (skb_dst (skb) &&skb_dst (skb)->dev) oif =skb_dst (skb)->dev->ifindex;memset (fl4,0 ,sizeof (struct flowi4 ));
@@ -3390,7 +3390,7 @@ decode_session6(struct sk_buff *skb, str nexthdr = nh[nhoff]; -if (skb_dst (skb)) +if (skb_dst (skb) &&skb_dst (skb)->dev) oif =skb_dst (skb)->dev->ifindex;memset (fl6,0 ,sizeof (struct flowi6 ));
Greg Kroah-Hartman
maintainerPATCH 59/143 mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
In reply to Greg Kroah-HartmanFrom: Andrew Morton <[email protected]>
commit 441e254cd40dc03beec3c650ce6ce6074bc6517f upstream.
--- mm/zsmalloc.c | 2 ++ 1 file changed, 2 insertions(+)
mm/zsmalloc.c +2 -0
@@ -2432,7 +2432,9 @@ struct zs_pool *zs_create_pool(const chaif (!pool->name) goto err; +#ifdef CONFIG_COMPACTION init_waitqueue_head (&pool->migration_wait); +#endif if (create_cache (pool)) goto err;
Greg Kroah-Hartman
maintainerPATCH 60/143 ALSA: usb-audio: Check mixer unit bitmap yet more strictly
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit f9f0e9ed350e15d51ad07364b4cf910de50c472a upstream.
The bmControls (for UAC1) or bmMixerControls (for UAC2/3) bitmap has a variable size depending on both input and output pins. Its size is to fit with input * output bits. The problem is that the input size can't be determined simply from the unit descriptor itself but it needs to parse the whole connected sources. Although the uac_mixer_unit_get_channels() tries to check some possible overflow of this bitmap, it's incomplete due to the lack of the evaluation of input pins.
For covering possible overflows, this patch adds the bitmap overflow check in the loop of input pins in parse_audio_mixer_unit().
--- sound/usb/mixer.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)
sound/usb/mixer.c +28 -8
@@ -739,7 +739,6 @@ static int uac_mixer_unit_get_channels(s struct uac_mixer_unit_descriptor *desc) {int mu_channels; -void *c;if (desc->bLength <sizeof (*desc))return -EINVAL ;
@@ -762,13 +761,6 @@ static int uac_mixer_unit_get_channels(sbreak ; } -if (!mu_channels) -return 0 ; - - c =uac_mixer_unit_bmControls (desc, state->mixer->protocol); -if (c - (void *)desc + (mu_channels -1 ) /8 >= desc->bLength) -return 0 ;/* no bmControls -> skip */ -return mu_channels; }
@@ -2009,6 +2001,31 @@ static int parse_audio_feature_unit(stru* Mixer Unit */ +/* check whether the given in/out overflows bmMixerControls matrix */ +static bool mixer_bitmap_overflow (struct uac_mixer_unit_descriptor *desc, +int protocol,int num_ins,int num_outs) +{ +u8 *hdr = (u8 *)desc; +u8 *c =uac_mixer_unit_bmControls (desc, protocol); +size_t rest;/* remaining bytes after bmMixerControls */ + +switch (protocol) { +case UAC_VERSION_1 : +default : + rest =1 ;/* iMixer */ +break ; +case UAC_VERSION_2 : + rest =2 ;/* bmControls + iMixer */ +break ; +case UAC_VERSION_3 : + rest =6 ;/* bmControls + wMixerDescrStr */ +break ; + } + +/* overflow? */ +return c + (num_ins * num_outs +7 ) /8 + rest > hdr + hdr[0 ]; +} +/* * build a mixer unit control *
@@ -2137,6 +2154,9 @@ static int parse_audio_mixer_unit(structif (err <0 )return err; num_ins += iterm.channels; +if (mixer_bitmap_overflow (desc, state->mixer->protocol, + num_ins, num_outs)) +break ;for (; ich < num_ins; ich++) {int och, ich_has_controls =0 ;
Greg Kroah-Hartman
maintainerPATCH 61/143 ALSA: hda/ca0132 - Add new SBZ quirk
In reply to Greg Kroah-HartmanFrom: Paweł Rekowski <[email protected]>
commit 2ca371d847511f97ef991ef612a2ce805489840e upstream.
This patch adds a new PCI subsys ID for the SBZ, as found and tested by me and some reddit users.
--- sound/pci/hda/patch_ca0132.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_ca0132.c +1 -0
@@ -1175,6 +1175,7 @@ static const struct snd_pci_quirk ca0132SND_PCI_QUIRK (0x1028 ,0x0708 ,"Alienware 15 R2 2016" ,QUIRK_ALIENWARE ),SND_PCI_QUIRK (0x1102 ,0x0010 ,"Sound Blaster Z" ,QUIRK_SBZ ),SND_PCI_QUIRK (0x1102 ,0x0023 ,"Sound Blaster Z" ,QUIRK_SBZ ), +SND_PCI_QUIRK (0x1102 ,0x0027 ,"Sound Blaster Z" ,QUIRK_SBZ ),SND_PCI_QUIRK (0x1102 ,0x0033 ,"Sound Blaster ZxR" ,QUIRK_SBZ ),SND_PCI_QUIRK (0x1458 ,0xA016 ,"Recon3Di" ,QUIRK_R3DI ), SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI),
Greg Kroah-Hartman
maintainerPATCH 62/143 ALSA: line6: Fix memory leak at line6_init_pcm() error path
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 1bc8d18c75fef3b478dbdfef722aae09e2a9fde7 upstream.
I forgot to release the allocated object at the early error path in line6_init_pcm(). For addressing it, slightly shuffle the code so that the PCM destructor (pcm->private_free) is assigned properly before all error paths.
--- sound/usb/line6/pcm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
sound/usb/line6/pcm.c +9 -9
@@ -550,6 +550,15 @@ int line6_init_pcm(struct usb_line6 *lin line6pcm->volume_monitor =255 ; line6pcm->line6 = line6; +spin_lock_init (&line6pcm->out.lock); +spin_lock_init (&line6pcm->in.lock); + line6pcm->impulse_period =LINE6_IMPULSE_DEFAULT_PERIOD ; + + line6->line6pcm = line6pcm; + + pcm->private_data = line6pcm; + pcm->private_free = line6_cleanup_pcm; + line6pcm->max_packet_size_in =usb_maxpacket (line6->usbdev,usb_rcvisocpipe (line6->usbdev, ep_read),0 );
@@ -562,15 +571,6 @@ int line6_init_pcm(struct usb_line6 *linreturn -EINVAL ; } -spin_lock_init (&line6pcm->out.lock); -spin_lock_init (&line6pcm->in.lock); - line6pcm->impulse_period =LINE6_IMPULSE_DEFAULT_PERIOD ; - - line6->line6pcm = line6pcm; - - pcm->private_data = line6pcm; - pcm->private_free = line6_cleanup_pcm; - err =line6_create_audio_out_urbs (line6pcm);if (err <0 )return err;
Greg Kroah-Hartman
maintainerPATCH 63/143 ALSA: hda - Fixes inverted Conexant GPIO mic mute led
In reply to Greg Kroah-HartmanFrom: Jeronimo Borque <[email protected]>
commit f9ef724d4896763479f3921afd1ee61552fc9836 upstream.
"enabled" parameter historically referred to the device input or output, not to the led indicator. After the changes added with the led helper functions the mic mute led logic refers to the led and not to the mic input which caused led indicator to be negated. Fixing logic in cxt_update_gpio_led and updated cxt_fixup_gpio_mute_hook
Also updated debug messages to ease further debugging if necessary.
--- sound/pci/hda/patch_conexant.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
sound/pci/hda/patch_conexant.c +9 -8
@@ -611,18 +611,20 @@ static void cxt_fixup_hp_gate_mic_jack(s/* update LED status via GPIO */ static void cxt_update_gpio_led (struct hda_codec *codec,unsigned int mask, -bool enabled) +bool led_on) {struct conexant_spec *spec = codec->spec;unsigned int oldval = spec->gpio_led;if (spec->mute_led_polarity) - enabled = !enabled; + led_on = !led_on; -if (enabled) - spec->gpio_led &= ~mask; -else +if (led_on) spec->gpio_led |= mask; +else + spec->gpio_led &= ~mask; +codec_dbg (codec,"mask:%d enabled:%d gpio_led:%d\n" , + mask, led_on, spec->gpio_led);if (spec->gpio_led != oldval)snd_hda_codec_write (codec,0x01 ,0 ,AC_VERB_SET_GPIO_DATA , spec->gpio_led);
@@ -633,8 +635,8 @@ static void cxt_fixup_gpio_mute_hook(voi {struct hda_codec *codec = private_data;struct conexant_spec *spec = codec->spec; - -cxt_update_gpio_led (codec, spec->gpio_mute_led_mask, enabled); +/* muted -> LED on */ +cxt_update_gpio_led (codec, spec->gpio_mute_led_mask, !enabled); }/* turn on/off mic-mute LED via GPIO per capture hook */
@@ -656,7 +658,6 @@ static void cxt_fixup_mute_led_gpio(stru { 0x01, AC_VERB_SET_GPIO_DIRECTION, 0x03 }, {} }; -codec_info (codec,"action: %d gpio_led: %d\n" , action, spec->gpio_led);if (action ==HDA_FIXUP_ACT_PRE_PROBE ) { spec->gen.vmaster_mute.hook = cxt_fixup_gpio_mute_hook;
Greg Kroah-Hartman
maintainerPATCH 64/143 ALSA: seq: Fix potential concurrent access to the deleted pool
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 75545304eba6a3d282f923b96a466dc25a81e359 upstream.
The input pool of a client might be deleted via the resize ioctl, the the access to it should be covered by the proper locks. Currently the only missing place is the call in snd_seq_ioctl_get_client_pool(), and this patch papers over it.
--- sound/core/seq/seq_clientmgr.c | 3 +-- sound/core/seq/seq_fifo.c | 17 +++++++++++++++++ sound/core/seq/seq_fifo.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-)
sound/core/seq/seq_clientmgr.c +1 -2
@@ -1835,8 +1835,7 @@ static int snd_seq_ioctl_get_client_poolif (cptr->type ==USER_CLIENT ) { info->input_pool = cptr->data.user.fifo_pool_size; info->input_free = info->input_pool; -if (cptr->data.user.fifo) - info->input_free =snd_seq_unused_cells (cptr->data.user.fifo->pool); + info->input_free =snd_seq_fifo_unused_cells (cptr->data.user.fifo); }else { info->input_pool =0 ; info->input_free =0 ;
sound/core/seq/seq_fifo.c +17 -0
@@ -263,3 +263,20 @@ int snd_seq_fifo_resize(struct snd_seq_freturn 0 ; } + +/* get the number of unused cells safely */ +int snd_seq_fifo_unused_cells (struct snd_seq_fifo *f) +{ +unsigned long flags; +int cells; + +if (!f) +return 0 ; + +snd_use_lock_use (&f->use_lock); +spin_lock_irqsave (&f->lock, flags); + cells =snd_seq_unused_cells (f->pool); +spin_unlock_irqrestore (&f->lock, flags); +snd_use_lock_free (&f->use_lock); +return cells; +}
sound/core/seq/seq_fifo.h +2 -0
@@ -53,5 +53,7 @@ int snd_seq_fifo_poll_wait(struct snd_se/* resize pool in fifo */ int snd_seq_fifo_resize (struct snd_seq_fifo *f,int poolsize); +/* get the number of unused cells safely */ +int snd_seq_fifo_unused_cells (struct snd_seq_fifo *f);#endif
Greg Kroah-Hartman
maintainerPATCH 65/143 ALSA: usb-audio: Fix invalid NULL check in snd_emuusb_set_samplerate()
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 6de3c9e3f6b3eaf66859e1379b3f35dda781416b upstream.
The quirk function snd_emuusb_set_samplerate() has a NULL check for the mixer element, but this is useless in the current code. It used to be a check against mixer->id_elems[unitid] but it was changed later to the value after mixer_eleme_list_to_info() which is always non-NULL due to the container_of() usage.
This patch fixes the check before the conversion.
While we're at it, correct a typo in the comment in the function, too.
--- sound/usb/mixer_quirks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/usb/mixer_quirks.c +4 -4
@@ -1155,17 +1155,17 @@ void snd_emuusb_set_samplerate(struct sn {struct usb_mixer_interface *mixer;struct usb_mixer_elem_info *cval; -int unitid =12 ;/* SamleRate ExtensionUnit ID */ +int unitid =12 ;/* SampleRate ExtensionUnit ID */ list_for_each_entry (mixer, &chip->mixer_list, list) { - cval =mixer_elem_list_to_info (mixer->id_elems[unitid]); -if (cval) { +if (mixer->id_elems[unitid]) { + cval =mixer_elem_list_to_info (mixer->id_elems[unitid]);snd_usb_mixer_set_ctl_value (cval,UAC_SET_CUR , cval->control <<8 , samplerate_id);snd_usb_mixer_notify_id (mixer, unitid); +break ; } -break ; } }
Greg Kroah-Hartman
maintainerPATCH 66/143 ALSA: usb-audio: Add implicit fb quirk for Behringer UFX1604
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit 1a15718b41df026cffd0e42cfdc38a1384ce19f9 upstream.
Behringer UFX1604 requires the similar quirk to apply implicit fb like another Behringer model UFX1204 in order to fix the noisy playback.
--- sound/usb/pcm.c | 1 + 1 file changed, 1 insertion(+)
sound/usb/pcm.c +1 -0
@@ -339,6 +339,7 @@ static int set_sync_ep_implicit_fb_quirk ep =0x81 ; ifnum =2 ; goto add_sync_ep_from_ifnum; +case USB_ID (0x1397 ,0x0001 ):/* Behringer UFX1604 */ case USB_ID (0x1397 ,0x0002 ):/* Behringer UFX1204 */ ep =0x81 ; ifnum =1 ;
Greg Kroah-Hartman
maintainerPATCH 67/143 kvm: x86: skip populating logical dest map if apic is not sw enabled
In reply to Greg Kroah-HartmanFrom: Radim Krcmar <[email protected]>
commit b14c876b994f208b6b95c222056e1deb0a45de0e upstream.
recalculate_apic_map does not santize ldr and it's possible that multiple bits are set. In that case, a previous valid entry can potentially be overwritten by an invalid one.
This condition is hit when booting a 32 bit, >8 CPU, RHEL6 guest and then triggering a crash to boot a kdump kernel. This is the sequence of events:
1. Linux boots in bigsmp mode and enables PhysFlat, however, it still writes to the LDR which probably will never be used.
2. However, when booting into kdump, the stale LDR values remain as they are not cleared by the guest and there isn't a apic reset.
3. kdump boots with 1 cpu, and uses Logical Destination Mode but the logical map has been overwritten and points to an inactive vcpu.
--- arch/x86/kvm/lapic.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kvm/lapic.c +5 -0
@@ -212,6 +212,9 @@ static void recalculate_apic_map(structif (!apic_x2apic_mode (apic) && !new->phys_map[xapic_id]) new->phys_map[xapic_id] = apic; +if (!kvm_apic_sw_enabled (apic)) +continue ; + ldr =kvm_lapic_get_reg (apic,APIC_LDR );if (apic_x2apic_mode (apic)) {
@@ -254,6 +257,8 @@ static inline void apic_set_spiv(structstatic_key_slow_dec_deferred (&apic_sw_disabled); else static_key_slow_inc(&apic_sw_disabled.key); + +recalculate_apic_map (apic->vcpu->kvm); } }
Greg Kroah-Hartman
maintainerPATCH 68/143 KVM: x86: hyper-v: dont crash on KVM_GET_SUPPORTED_HV_CPUID when kvm_intel.nested is disabled
In reply to Greg Kroah-HartmanFrom: Vitaly Kuznetsov <[email protected]>
commit ea1529873ab18c204688cf31746df851c098cbea upstream.
If kvm_intel is loaded with nested=0 parameter an attempt to perform KVM_GET_SUPPORTED_HV_CPUID results in OOPS as nested_get_evmcs_version hook in kvm_x86_ops is NULL (we assign it in nested_vmx_hardware_setup() and this only happens in case nested is enabled).
Check that kvm_x86_ops->nested_get_evmcs_version is not NULL before calling it. With this, we can remove the stub from svm as it is no longer needed.
--- arch/x86/kvm/hyperv.c | 5 ++++- arch/x86/kvm/svm.c | 8 +------- arch/x86/kvm/vmx/vmx.c | 1 + 3 files changed, 6 insertions(+), 8 deletions(-)
arch/x86/kvm/hyperv.c +4 -1
@@ -1783,7 +1783,7 @@ int kvm_vm_ioctl_hv_eventfd(struct kvm *int kvm_vcpu_ioctl_get_hv_cpuid (struct kvm_vcpu *vcpu,struct kvm_cpuid2 *cpuid,struct kvm_cpuid_entry2 __user *entries) { -uint16_t evmcs_ver = kvm_x86_ops->nested_get_evmcs_version (vcpu); +uint16_t evmcs_ver =0 ;struct kvm_cpuid_entry2 cpuid_entries[] = { { .function =HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS }, { .function =HYPERV_CPUID_INTERFACE },
@@ -1795,6 +1795,9 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct k };int i, nent =ARRAY_SIZE (cpuid_entries); +if (kvm_x86_ops->nested_get_evmcs_version) + evmcs_ver = kvm_x86_ops->nested_get_evmcs_version (vcpu); +/* Skip NESTED_FEATURES if eVMCS is not supported */ if (!evmcs_ver) --nent;
arch/x86/kvm/svm.c +1 -7
@@ -7107,12 +7107,6 @@ failed:return ret; } -static uint16_t nested_get_evmcs_version (struct kvm_vcpu *vcpu) -{ -/* Not supported */ -return 0 ; -} -static int nested_enable_evmcs (struct kvm_vcpu *vcpu,uint16_t *vmcs_version) {
@@ -7283,7 +7277,7 @@ static struct kvm_x86_ops svm_x86_ops __ .mem_enc_unreg_region = svm_unregister_enc_region, .nested_enable_evmcs = nested_enable_evmcs, - .nested_get_evmcs_version = nested_get_evmcs_version, + .nested_get_evmcs_version = NULL, .need_emulation_on_page_fault = svm_need_emulation_on_page_fault, };
arch/x86/kvm/vmx/vmx.c +1 -0
@@ -7733,6 +7733,7 @@ static struct kvm_x86_ops vmx_x86_ops __ .set_nested_state = NULL, .get_vmcs12_pages = NULL, .nested_enable_evmcs = NULL, + .nested_get_evmcs_version = NULL, .need_emulation_on_page_fault = vmx_need_emulation_on_page_fault, };
Greg Kroah-Hartman
maintainerPATCH 69/143 KVM: x86: Dont update RIP or do single-step on faulting emulation
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
commit 75ee23b30dc712d80d2421a9a547e7ab6e379b44 upstream.
Don't advance RIP or inject a single-step #DB if emulation signals a fault. This logic applies to all state updates that are conditional on clean retirement of the emulation instruction, e.g. updating RFLAGS was previously handled by commit 38827dbd3fb85 ("KVM: x86: Do not update EFLAGS on faulting emulation").
Not advancing RIP is likely a nop, i.e. ctxt->eip isn't updated with ctxt->_eip until emulation "retires" anyways. Skipping #DB injection fixes a bug reported by Andy Lutomirski where a #UD on SYSCALL due to invalid state with EFLAGS.TF=1 would loop indefinitely due to emulation overwriting the #UD with #DB and thus restarting the bad SYSCALL over and over.
--- arch/x86/kvm/x86.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/x86/kvm/x86.c +5 -4
@@ -6547,12 +6547,13 @@ restart:unsigned long rflags = kvm_x86_ops->get_rflags (vcpu);toggle_interruptibility (vcpu, ctxt->interruptibility); vcpu->arch.emulate_regs_need_sync_to_vcpu = false; -kvm_rip_write (vcpu, ctxt->eip); -if (r ==EMULATE_DONE && ctxt->tf) -kvm_vcpu_do_singlestep (vcpu, &r);if (!ctxt->have_exception || -exception_type (ctxt->exception.vector) ==EXCPT_TRAP ) +exception_type (ctxt->exception.vector) ==EXCPT_TRAP ) { +kvm_rip_write (vcpu, ctxt->eip); +if (r ==EMULATE_DONE && ctxt->tf) +kvm_vcpu_do_singlestep (vcpu, &r);__kvm_set_rflags (vcpu, ctxt->eflags); + }/* * For STI, interrupts are shadowed; so KVM_REQ_EVENT will
Greg Kroah-Hartman
maintainerPATCH 70/143 uprobes/x86: Fix detection of 32-bit user mode
In reply to Greg Kroah-HartmanFrom: Sebastian Mayr <[email protected]>
commit 9212ec7d8357ea630031e89d0d399c761421c83b upstream.
32-bit processes running on a 64-bit kernel are not always detected correctly, causing the process to crash when uretprobes are installed.
The reason for the crash is that in_ia32_syscall() is used to determine the process's mode, which only works correctly when called from a syscall.
In the case of uretprobes, however, the function is called from a exception and always returns 'false' on a 64-bit kernel. In consequence this leads to corruption of the process's return address.
Fix this by using user_64bit_mode() instead of in_ia32_syscall(), which is correct in any situation.
[ tglx: Add a comment and the following historical info ]
This should have been detected by the rename which happened in commit
abfb9498ee13 ("x86/entry: Rename is_{ia32,x32}_task() to in_{ia32,x32}_syscall()")
which states in the changelog:
The is_ia32_task()/is_x32_task() function names are a big misnomer: they suggests that the compat-ness of a system call is a task property, which is not true, the compatness of a system call purely depends on how it was invoked through the system call layer.
.....
and then it went and blindly renamed every call site.
Sadly enough this was already mentioned here:
8faaed1b9f50 ("uprobes/x86: Introduce sizeof_long(), cleanup adjust_ret_addr() andarch_uretprobe_hijack_return_addr()")
where the changelog says:
TODO: is_ia32_task() is not what we actually want, TS_COMPAT does not necessarily mean 32bit. Fortunately syscall-like insns can't be probed so it actually works, but it would be better to rename and use is_ia32_frame().
and goes all the way back to:
0326f5a94dde ("uprobes/core: Handle breakpoint and singlestep exceptions")
Oh well. 7+ years until someone actually tried a uretprobe on a 32bit process on a 64bit kernel....
--- arch/x86/kernel/uprobes.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
arch/x86/kernel/uprobes.c +10 -7
@@ -508,9 +508,12 @@ struct uprobe_xol_ops {void (*abort)(struct arch_uprobe *,struct pt_regs *); }; -static inline int sizeof_long (void ) +static inline int sizeof_long (struct pt_regs *regs) { -return in_ia32_syscall () ?4 :8 ; +/* +* Check registers for mode as in_xxx_syscall() does not apply here. +*/ +return user_64bit_mode (regs) ?8 :4 ; }static int default_pre_xol_op (struct arch_uprobe *auprobe,struct pt_regs *regs)
@@ -521,9 +524,9 @@ static int default_pre_xol_op(struct arcstatic int emulate_push_stack (struct pt_regs *regs,unsigned long val) { -unsigned long new_sp = regs->sp -sizeof_long (); +unsigned long new_sp = regs->sp -sizeof_long (regs); -if (copy_to_user ((void __user *)new_sp, &val,sizeof_long ())) +if (copy_to_user ((void __user *)new_sp, &val,sizeof_long (regs)))return -EFAULT ; regs->sp = new_sp;
@@ -556,7 +559,7 @@ static int default_post_xol_op(struct arlong correction = utask->vaddr - utask->xol_vaddr; regs->ip += correction; }else if (auprobe->defparam.fixups &UPROBE_FIX_CALL ) { - regs->sp +=sizeof_long ();/* Pop incorrect return address */ + regs->sp +=sizeof_long (regs);/* Pop incorrect return address */ if (emulate_push_stack (regs, utask->vaddr + auprobe->defparam.ilen))return -ERESTART ; }
@@ -675,7 +678,7 @@ static int branch_post_xol_op(struct arc* "call" insn was executed out-of-line. Just restore ->sp and restart. * We could also restore ->ip and try to call branch_emulate_op() again. */ - regs->sp +=sizeof_long (); + regs->sp +=sizeof_long (regs);return -ERESTART ; }
@@ -1056,7 +1059,7 @@ bool arch_uprobe_skip_sstep(struct arch_unsigned long arch_uretprobe_hijack_return_addr (unsigned long trampoline_vaddr,struct pt_regs *regs) { -int rasize =sizeof_long (), nleft; +int rasize =sizeof_long (regs), nleft;unsigned long orig_ret_vaddr =0 ;/* clear high bits for 32-bit apps */ if (copy_from_user (&orig_ret_vaddr, (void __user *)regs->sp, rasize))
Greg Kroah-Hartman
maintainerPATCH 71/143 x86/mm/cpa: Prevent large page split when ftrace flips RW on kernel text
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit 7af0145067bc429a09ac4047b167c0971c9f0dc7 upstream.
ftrace does not use text_poke() for enabling trace functionality. It uses its own mechanism and flips the whole kernel text to RW and back to RO.
The CPA rework removed a loop based check of 4k pages which tried to preserve a large page by checking each 4k page whether the change would actually cover all pages in the large page.
This resulted in endless loops for nothing as in testing it turned out that it actually never preserved anything. Of course testing missed to include ftrace, which is the one and only case which benefitted from the 4k loop.
As a consequence enabling function tracing or ftrace based kprobes results in a full 4k split of the kernel text, which affects iTLB performance.
The kernel RO protection is the only valid case where this can actually preserve large pages.
All other static protections (RO data, data NX, PCI, BIOS) are truly static. So a conflict with those protections which results in a split should only ever happen when a change of memory next to a protected region is attempted. But these conflicts are rightfully splitting the large page to preserve the protected regions. In fact a change to the protected regions itself is a bug and is warned about.
Add an exception for the static protection check for kernel text RO when the to be changed region spawns a full large page which allows to preserve the large mappings. This also prevents the syslog to be spammed about CPA violations when ftrace is used.
The exception needs to be removed once ftrace switched over to text_poke() which avoids the whole issue.
--- arch/x86/mm/pageattr.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
arch/x86/mm/pageattr.c +18 -8
@@ -516,7 +516,7 @@ static inline void check_conflict(int wa*/ static inline pgprot_t static_protections (pgprot_t prot,unsigned long start,unsigned long pfn,unsigned long npg, -int warnlvl) +unsigned long lpsize,int warnlvl) {pgprotval_t forbidden, res;unsigned long end;
@@ -535,9 +535,17 @@ static inline pgprot_t static_protectioncheck_conflict (warnlvl, prot, res, start, end, pfn,"Text NX" ); forbidden = res; - res =protect_kernel_text_ro (start, end); -check_conflict (warnlvl, prot, res, start, end, pfn,"Text RO" ); - forbidden |= res; +/* +* Special case to preserve a large page. If the change spawns the +* full large page mapping then there is no point to split it +* up. Happens with ftrace and is going to be removed once ftrace +* switched to text_poke(). +*/ +if (lpsize != (npg *PAGE_SIZE ) || (start & (lpsize -1 ))) { + res =protect_kernel_text_ro (start, end); +check_conflict (warnlvl, prot, res, start, end, pfn,"Text RO" ); + forbidden |= res; + }/* Check the PFN directly */ res =protect_pci_bios (pfn, pfn + npg -1 );
@@ -819,7 +827,7 @@ static int __should_split_large_page(pte* extra conditional required here. */ chk_prot =static_protections (old_prot, lpaddr, old_pfn, numpages, -CPA_CONFLICT ); + psize,CPA_CONFLICT );if (WARN_ON_ONCE (pgprot_val (chk_prot) !=pgprot_val (old_prot))) {/*
@@ -855,7 +863,7 @@ static int __should_split_large_page(pte* protection requirement in the large page. */ new_prot =static_protections (req_prot, lpaddr, old_pfn, numpages, -CPA_DETECT ); + psize,CPA_DETECT );/* * If there is a conflict, split the large page.
@@ -906,7 +914,8 @@ static void split_set_pte(struct cpa_datif (!cpa->force_static_prot) goto set; - prot =static_protections (ref_prot, address, pfn, npg,CPA_PROTECT ); +/* Hand in lpsize = 0 to enforce the protection mechanism */ + prot =static_protections (ref_prot, address, pfn, npg,0 ,CPA_PROTECT );if (pgprot_val (prot) ==pgprot_val (ref_prot)) goto set;
@@ -1503,7 +1512,8 @@ repeat:pgprot_val (new_prot) |=pgprot_val (cpa->mask_set);cpa_inc_4k_install (); - new_prot =static_protections (new_prot, address, pfn,1 , +/* Hand in lpsize = 0 to enforce the protection mechanism */ + new_prot =static_protections (new_prot, address, pfn,1 ,0 ,CPA_PROTECT ); new_prot =pgprot_clear_protnone_bits (new_prot);
Greg Kroah-Hartman
maintainerPATCH 72/143 x86/apic: Do not initialize LDR and DFR for bigsmp
In reply to Greg Kroah-HartmanFrom: Bandan Das <[email protected]>
commit bae3a8d3308ee69a7dbdf145911b18dfda8ade0d upstream.
Legacy apic init uses bigsmp for smp systems with 8 and more CPUs. The bigsmp APIC implementation uses physical destination mode, but it nevertheless initializes LDR and DFR. The LDR even ends up incorrectly with multiple bit being set.
This does not cause a functional problem because LDR and DFR are ignored when physical destination mode is active, but it triggered a problem on a 32-bit KVM guest which jumps into a kdump kernel.
The multiple bits set unearthed a bug in the KVM APIC implementation. The code which creates the logical destination map for VCPUs ignores the disabled state of the APIC and ends up overwriting an existing valid entry and as a result, APIC calibration hangs in the guest during kdump initialization.
Remove the bogus LDR/DFR initialization.
This is not intended to work around the KVM APIC bug. The LDR/DFR ininitalization is wrong on its own.
The issue goes back into the pre git history. The fixes tag is the commit in the bitkeeper import which introduced bigsmp support in 2003.
git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
--- arch/x86/kernel/apic/bigsmp_32.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-)
arch/x86/kernel/apic/bigsmp_32.c +2 -22
@@ -38,32 +38,12 @@ static int bigsmp_early_logical_apicid(ireturn early_per_cpu (x86_cpu_to_apicid, cpu); } -static inline unsigned long calculate_ldr (int cpu) -{ -unsigned long val, id; - - val =apic_read (APIC_LDR ) & ~APIC_LDR_MASK ; - id =per_cpu (x86_bios_cpu_apicid, cpu); - val |=SET_APIC_LOGICAL_ID (id); - -return val; -} -/* -* Set up the logical destination ID. -* -* Intel recommends to set DFR, LDR and TPR before enabling -* an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel -* document number 292116). So here it goes... +* bigsmp enables physical destination mode +* and doesn't use LDR and DFR */ static void bigsmp_init_apic_ldr (void ) { -unsigned long val; -int cpu =smp_processor_id (); - -apic_write (APIC_DFR ,APIC_DFR_FLAT ); - val =calculate_ldr (cpu); -apic_write (APIC_LDR , val); }static void bigsmp_setup_apic_routing (void )
Greg Kroah-Hartman
maintainerPATCH 73/143 x86/apic: Include the LDR when clearing out APIC registers
In reply to Greg Kroah-HartmanFrom: Bandan Das <[email protected]>
commit 558682b5291937a70748d36fd9ba757fb25b99ae upstream.
Although APIC initialization will typically clear out the LDR before setting it, the APIC cleanup code should reset the LDR.
This was discovered with a 32-bit KVM guest jumping into a kdump kernel. The stale bits in the LDR triggered a bug in the KVM APIC implementation which caused the destination mapping for VCPUs to be corrupted.
Note that this isn't intended to paper over the KVM APIC bug. The kernel has to clear the LDR when resetting the APIC registers except when X2APIC is enabled.
This lacks a Fixes tag because missing to clear LDR goes way back into pre git history.
[ tglx: Made x2apic_enabled a function call as required ]
--- arch/x86/kernel/apic/apic.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/kernel/apic/apic.c +4 -0
@@ -1152,6 +1152,10 @@ void clear_local_APIC(void)apic_write (APIC_LVT0 , v |APIC_LVT_MASKED ); v =apic_read (APIC_LVT1 );apic_write (APIC_LVT1 , v |APIC_LVT_MASKED ); +if (!x2apic_enabled ()) { + v =apic_read (APIC_LDR ) & ~APIC_LDR_MASK ; +apic_write (APIC_LDR , v); + }if (maxlvt >=4 ) { v =apic_read (APIC_LVTPC );apic_write (APIC_LVTPC , v |APIC_LVT_MASKED );
Greg Kroah-Hartman
maintainerPATCH 74/143 HID: logitech-hidpp: remove support for the G700 over USB
In reply to Greg Kroah-Hartman[ Upstream commit a3384b8d9f63cc042711293bb97bdc92dca0391d ]
The G700 suffers from the same issue than the G502:
when plugging it in, the driver tries to contact it but it fails.
This timeout is problematic as it introduce a delay in the boot, and having only the mouse event node means that the hardware macros keys can not be relayed to the userspace.
--- drivers/hid/hid-logitech-hidpp.c | 2 -- 1 file changed, 2 deletions(-)
drivers/hid/hid-logitech-hidpp.c +0 -2
@@ -3769,8 +3769,6 @@ static const struct hid_device_id hidpp_devices[] = { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC332) }, {/* Logitech G502 Hero Gaming Mouse over USB */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08B) }, - { /* Logitech G700 Gaming Mouse over USB */ - HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC06B) }, { /* Logitech G700s Gaming Mouse over USB */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07C) }, { /* Logitech G703 Gaming Mouse over USB */
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/143 ftrace: Fix NULL pointer dereference in t_probe_next()
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
commit 7bd46644ea0f6021dc396a39a8bfd3a58f6f1f9f upstream.
LTP testsuite on powerpc results in the below crash:
Unable to handle kernel paging request for data at address 0x00000000 Faulting instruction address: 0xc00000000029d800 Oops: Kernel access of bad area, sig: 11 [#1] LE SMP NR_CPUS=2048 NUMA PowerNV ... CPU: 68 PID: 96584 Comm: cat Kdump: loaded Tainted: G W NIP: c00000000029d800 LR: c00000000029dac4 CTR: c0000000001e6ad0 REGS: c0002017fae8ba10 TRAP: 0300 Tainted: G W MSR: 9000000000009033 <SF,HV,EE,ME,IR,DR,RI,LE> CR: 28022422 XER: 20040000 CFAR: c00000000029d90c DAR: 0000000000000000 DSISR: 40000000 IRQMASK: 0 ... NIP [c00000000029d800] t_probe_next+0x60/0x180 LR [c00000000029dac4] t_mod_start+0x1a4/0x1f0 Call Trace: [c0002017fae8bc90] [c000000000cdbc40] _cond_resched+0x10/0xb0 (unreliable) [c0002017fae8bce0] [c0000000002a15b0] t_start+0xf0/0x1c0 [c0002017fae8bd30] [c0000000004ec2b4] seq_read+0x184/0x640 [c0002017fae8bdd0] [c0000000004a57bc] sys_read+0x10c/0x300 [c0002017fae8be30] [c00000000000b388] system_call+0x5c/0x70
The test (ftrace_set_ftrace_filter.sh) is part of ftrace stress tests and the crash happens when the test does 'cat $TRACING_PATH/set_ftrace_filter'.
The address points to the second line below, in t_probe_next(), where filter_hash is dereferenced:
hash = iter->probe->ops.func_hash->filter_hash;
size = 1 << hash->size_bits;
This happens due to a race with register_ftrace_function_probe(). A new ftrace_func_probe is created and added into the func_probes list in trace_array under ftrace_lock. However, before initializing the filter, we drop ftrace_lock, and re-acquire it after acquiring regex_lock. If another process is trying to read set_ftrace_filter, it will be able to acquire ftrace_lock during this window and it will end up seeing a NULL filter_hash.
Fix this by just checking for a NULL filter_hash in t_probe_next(). If the filter_hash is NULL, then this probe is just being added and we can simply return from here.
--- kernel/trace/ftrace.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/trace/ftrace.c +4 -0
@@ -3095,6 +3095,10 @@ t_probe_next(struct seq_file *m, loff_t hnd = &iter->probe_entry->hlist; hash = iter->probe->ops.func_hash->filter_hash; + +if (!hash) +return NULL ; + size =1 << hash->size_bits; retry:
Greg Kroah-Hartman
maintainerPATCH 76/143 ftrace: Check for successful allocation of hash
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
commit 5b0022dd32b7c2e15edf1827ba80aa1407edf9ff upstream.
In register_ftrace_function_probe(), we are not checking the return value of alloc_and_copy_ftrace_hash(). The subsequent call to ftrace_match_records() may end up dereferencing the same. Add a check to ensure this doesn't happen.
--- kernel/trace/ftrace.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/trace/ftrace.c +5 -0
@@ -4330,6 +4330,11 @@ register_ftrace_function_probe(char *glo old_hash = *orig_hash; hash =alloc_and_copy_ftrace_hash (FTRACE_HASH_DEFAULT_BITS , old_hash); +if (!hash) { + ret = -ENOMEM ; + goto out; + } + ret =ftrace_match_records (hash, glob,strlen (glob));/* Nothing found? */
Greg Kroah-Hartman
maintainerPATCH 77/143 ftrace: Check for empty hash and comment the race with registering probes
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 372e0d01da71c84dcecf7028598a33813b0d5256 upstream.
The race between adding a function probe and reading the probes that exist is very subtle. It needs a comment. Also, the issue can also happen if the probe has has the EMPTY_HASH as its func_hash.
--- kernel/trace/ftrace.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
kernel/trace/ftrace.c +9 -1
@@ -3096,7 +3096,11 @@ t_probe_next(struct seq_file *m, loff_t hash = iter->probe->ops.func_hash->filter_hash; -if (!hash) +/* +* A probe being registered may temporarily have an empty hash +* and it's at the end of the func_probes list. +*/ +if (!hash || hash ==EMPTY_HASH )return NULL ; size =1 << hash->size_bits;
@@ -4324,6 +4328,10 @@ register_ftrace_function_probe(char *glomutex_unlock (&ftrace_lock); +/* +* Note, there's a small window here that the func_hash->filter_hash +* may be NULL or empty. Need to be carefule when reading the loop. +*/ mutex_lock (&probe->ops.func_hash->regex_lock); orig_hash = &probe->ops.func_hash->filter_hash;
Greg Kroah-Hartman
maintainerPATCH 78/143 usbtmc: more sanity checking for packet size
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit de7b9aa633b693e77942e12f1769506efae6917b upstream.
A malicious device can make the driver divide ny zero with a nonsense maximum packet size.
--- drivers/usb/class/usbtmc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/class/usbtmc.c +3 -0
@@ -2362,8 +2362,11 @@ static int usbtmc_probe(struct usb_inter goto err_put; } + retcode = -EINVAL ; data->bulk_in = bulk_in->bEndpointAddress; data->wMaxPacketSize =usb_endpoint_maxp (bulk_in); +if (!data->wMaxPacketSize) + goto err_put;dev_dbg (&intf->dev,"Found bulk in endpoint at %u\n" , data->bulk_in); data->bulk_out = bulk_out->bEndpointAddress;
Greg Kroah-Hartman
maintainerPATCH 79/143 usb-storage: Add new JMS567 revision to unusual_devs
In reply to Greg Kroah-HartmanFrom: Henk van der Laan <[email protected]>
commit 08d676d1685c2a29e4d0e1b0242324e564d4589e upstream.
Revision 0x0117 suffers from an identical issue to earlier revisions, therefore it should be added to the quirks list.
--- drivers/usb/storage/unusual_devs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/unusual_devs.h +1 -1
@@ -2100,7 +2100,7 @@ UNUSUAL_DEV( 0x14cd, 0x6600, 0x0201, 0x US_FL_IGNORE_RESIDUE ),/* Reported by Michael Büsch <[email protected]> */ -UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0116, +UNUSUAL_DEV( 0x152d, 0x0567, 0x0114, 0x0117, "JMicron", "USB to ATA/ATAPI Bridge", USB_SC_DEVICE, USB_PR_DEVICE, NULL,
Greg Kroah-Hartman
maintainerPATCH 80/143 USB: cdc-wdm: fix race between write and disconnect due to flag abuse
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit 1426bd2c9f7e3126e2678e7469dca9fd9fc6dd3e upstream.
In case of a disconnect an ongoing flush() has to be made fail. Nevertheless we cannot be sure that any pending URB has already finished, so although they will never succeed, they still must not be touched.
The clean solution for this is to check for WDM_IN_USE and WDM_DISCONNECTED in flush(). There is no point in ever clearing WDM_IN_USE, as no further writes make sense.
The issue is as old as the driver.
--- drivers/usb/class/cdc-wdm.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/usb/class/cdc-wdm.c +12 -4
@@ -587,10 +587,20 @@ static int wdm_flush(struct file *file, {struct wdm_device *desc = file->private_data; -wait_event (desc->wait, !test_bit (WDM_IN_USE , &desc->flags)); +wait_event (desc->wait, +/* +* needs both flags. We cannot do with one +* because resetting it would cause a race +* with write() yet we need to signal +* a disconnect +*/ + !test_bit (WDM_IN_USE , &desc->flags) || +test_bit (WDM_DISCONNECTING , &desc->flags));/* cannot dereference desc->intf if WDM_DISCONNECTING */ -if (desc->werr <0 && !test_bit (WDM_DISCONNECTING , &desc->flags)) +if (test_bit (WDM_DISCONNECTING , &desc->flags)) +return -ENODEV ; +if (desc->werr <0 )dev_err (&desc->intf->dev,"Error in flush path: %d\n" , desc->werr);
@@ -974,8 +984,6 @@ static void wdm_disconnect(struct usb_inspin_lock_irqsave (&desc->iuspin, flags);set_bit (WDM_DISCONNECTING , &desc->flags);set_bit (WDM_READ , &desc->flags); -/* to terminate pending flushes */ -clear_bit (WDM_IN_USE , &desc->flags);spin_unlock_irqrestore (&desc->iuspin, flags);wake_up_all (&desc->wait);mutex_lock (&desc->rlock);
Greg Kroah-Hartman
maintainerPATCH 81/143 usb: hcd: use managed device resources
In reply to Greg Kroah-HartmanFrom: Schmid, Carsten <[email protected]>
commit 76da906ad727048a74bb8067031ee99fc070c7da upstream.
Using managed device resources in usb_hcd_pci_probe() allows devm usage for resource subranges, such as the mmio resource for the platform device created to control host/device mode mux, which is a xhci extended capability, and sits inside the xhci mmio region.
If managed device resources are not used then "parent" resource is released before subrange at driver removal as .remove callback is called before the devres list of resources for this device is walked and released.
This has been observed with the xhci extended capability driver causing a use-after-free which is now fixed.
An additional nice benefit is that error handling on driver initialisation is simplified much.
--- drivers/usb/core/hcd-pci.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-)
drivers/usb/core/hcd-pci.c +8 -22
@@ -216,17 +216,18 @@ int usb_hcd_pci_probe(struct pci_dev *de/* EHCI, OHCI */ hcd->rsrc_start =pci_resource_start (dev,0 ); hcd->rsrc_len =pci_resource_len (dev,0 ); -if (!request_mem_region (hcd->rsrc_start, hcd->rsrc_len, - driver->description)) { +if (!devm_request_mem_region (&dev->dev, hcd->rsrc_start, + hcd->rsrc_len, driver->description)) {dev_dbg (&dev->dev,"controller already in use\n" ); retval = -EBUSY ; goto put_hcd; } - hcd->regs =ioremap_nocache (hcd->rsrc_start, hcd->rsrc_len); + hcd->regs =devm_ioremap_nocache (&dev->dev, hcd->rsrc_start, + hcd->rsrc_len);if (hcd->regs ==NULL ) {dev_dbg (&dev->dev,"error mapping memory\n" ); retval = -EFAULT ; - goto release_mem_region; + goto put_hcd; } }else {
@@ -240,8 +241,8 @@ int usb_hcd_pci_probe(struct pci_dev *de hcd->rsrc_start =pci_resource_start (dev, region); hcd->rsrc_len =pci_resource_len (dev, region); -if (request_region (hcd->rsrc_start, hcd->rsrc_len, - driver->description)) +if (devm_request_region (&dev->dev, hcd->rsrc_start, + hcd->rsrc_len, driver->description))break ; }if (region ==PCI_ROM_RESOURCE ) {
@@ -275,20 +276,13 @@ int usb_hcd_pci_probe(struct pci_dev *de }if (retval !=0 ) - goto unmap_registers; + goto put_hcd;device_wakeup_enable (hcd->self.controller);if (pci_dev_run_wake (dev))pm_runtime_put_noidle (&dev->dev);return retval; -unmap_registers: -if (driver->flags &HCD_MEMORY ) { -iounmap (hcd->regs); -release_mem_region: -release_mem_region (hcd->rsrc_start, hcd->rsrc_len); - }else -release_region (hcd->rsrc_start, hcd->rsrc_len); put_hcd:usb_put_hcd (hcd); disable_pci:
@@ -347,14 +341,6 @@ void usb_hcd_pci_remove(struct pci_dev *dev_set_drvdata (&dev->dev,NULL );up_read (&companions_rwsem); } - -if (hcd->driver->flags &HCD_MEMORY ) { -iounmap (hcd->regs); -release_mem_region (hcd->rsrc_start, hcd->rsrc_len); - }else { -release_region (hcd->rsrc_start, hcd->rsrc_len); - } -usb_put_hcd (hcd);pci_disable_device (dev); }
Greg Kroah-Hartman
maintainerPATCH 82/143 usb: chipidea: udc: dont do hardware access if gadget has stopped
In reply to Greg Kroah-HartmanFrom: Peter Chen <[email protected]>
commit cbe85c88ce80fb92956a0793518d415864dcead8 upstream.
After _gadget_stop_activity is executed, we can consider the hardware operation for gadget has finished, and the udc can be stopped and enter low power mode. So, any later hardware operations (from usb_ep_ops APIs or usb_gadget_ops APIs) should be considered invalid, any deinitializatons has been covered at _gadget_stop_activity.
I meet this problem when I plug out usb cable from PC using mass_storage gadget, my callstack like: vbus interrupt->.vbus_session-> composite_disconnect ->pm_runtime_put_sync(&_gadget->dev), the composite_disconnect will call fsg_disable, but fsg_disable calls usb_ep_disable using async way, there are register accesses for usb_ep_disable. So sometimes, I get system hang due to visit register without clock, sometimes not.
The Linux Kernel USB maintainer Alan Stern suggests this kinds of solution.
See: http://marc.info/?l=linux-usb&m=138541769810983&w=2.
--- drivers/usb/chipidea/udc.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-)
drivers/usb/chipidea/udc.c +24 -8
@@ -709,12 +709,6 @@ static int _gadget_stop_activity(struct struct ci_hdrc *ci = container_of(gadget, struct ci_hdrc, gadget);unsigned long flags; -spin_lock_irqsave (&ci->lock, flags); - ci->gadget.speed =USB_SPEED_UNKNOWN ; - ci->remote_wakeup =0 ; - ci->suspended =0 ; -spin_unlock_irqrestore (&ci->lock, flags); -/* flush all endpoints */ gadget_for_each_ep (ep, gadget) {usb_ep_fifo_flush (ep);
@@ -732,6 +726,12 @@ static int _gadget_stop_activity(struct ci->status =NULL ; } +spin_lock_irqsave (&ci->lock, flags); + ci->gadget.speed =USB_SPEED_UNKNOWN ; + ci->remote_wakeup =0 ; + ci->suspended =0 ; +spin_unlock_irqrestore (&ci->lock, flags); +return 0 ; }
@@ -1303,6 +1303,10 @@ static int ep_disable(struct usb_ep *ep)return -EBUSY ;spin_lock_irqsave (hwep->lock, flags); +if (hwep->ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (hwep->lock, flags); +return 0 ; + }/* only internal SW should disable ctrl endpts */
@@ -1392,6 +1396,10 @@ static int ep_queue(struct usb_ep *ep, sreturn -EINVAL ;spin_lock_irqsave (hwep->lock, flags); +if (hwep->ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (hwep->lock, flags); +return 0 ; + } retval =_ep_queue (ep, req, gfp_flags);spin_unlock_irqrestore (hwep->lock, flags);return retval;
@@ -1415,8 +1423,8 @@ static int ep_dequeue(struct usb_ep *ep,return -EINVAL ;spin_lock_irqsave (hwep->lock, flags); - -hw_ep_flush (hwep->ci, hwep->num, hwep->dir); +if (hwep->ci->gadget.speed !=USB_SPEED_UNKNOWN ) +hw_ep_flush (hwep->ci, hwep->num, hwep->dir);list_for_each_entry_safe (node, tmpnode, &hwreq->tds, td) {dma_pool_free (hwep->td_pool, node->ptr, node->dma);
@@ -1487,6 +1495,10 @@ static void ep_fifo_flush(struct usb_ep }spin_lock_irqsave (hwep->lock, flags); +if (hwep->ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (hwep->lock, flags); +return ; + }hw_ep_flush (hwep->ci, hwep->num, hwep->dir);
@@ -1559,6 +1571,10 @@ static int ci_udc_wakeup(struct usb_gadgint ret =0 ;spin_lock_irqsave (&ci->lock, flags); +if (ci->gadget.speed ==USB_SPEED_UNKNOWN ) { +spin_unlock_irqrestore (&ci->lock, flags); +return 0 ; + }if (!ci->remote_wakeup) { ret = -EOPNOTSUPP ; goto out;
Greg Kroah-Hartman
maintainerPATCH 83/143 usb: host: ohci: fix a race condition between shutdown and irq
In reply to Greg Kroah-HartmanFrom: Yoshihiro Shimoda <[email protected]>
commit a349b95d7ca0cea71be4a7dac29830703de7eb62 upstream.
This patch fixes an issue that the following error is possible to happen when ohci hardware causes an interruption and the system is shutting down at the same time.
[ 34.851754] usb 2-1: USB disconnect, device number 2 [ 35.166658] irq 156: nobody cared (try booting with the "irqpoll" option) [ 35.173445] CPU: 0 PID: 22 Comm: kworker/0:1 Not tainted 5.3.0-rc5 #85 [ 35.179964] Hardware name: Renesas Salvator-X 2nd version board based on r8a77965 (DT) [ 35.187886] Workqueue: usb_hub_wq hub_event [ 35.192063] Call trace: [ 35.194509] dump_backtrace+0x0/0x150 [ 35.198165] show_stack+0x14/0x20 [ 35.201475] dump_stack+0xa0/0xc4 [ 35.204785] __report_bad_irq+0x34/0xe8 [ 35.208614] note_interrupt+0x2cc/0x318 [ 35.212446] handle_irq_event_percpu+0x5c/0x88 [ 35.216883] handle_irq_event+0x48/0x78 [ 35.220712] handle_fasteoi_irq+0xb4/0x188 [ 35.224802] generic_handle_irq+0x24/0x38 [ 35.228804] __handle_domain_irq+0x5c/0xb0 [ 35.232893] gic_handle_irq+0x58/0xa8 [ 35.236548] el1_irq+0xb8/0x180 [ 35.239681] __do_softirq+0x94/0x23c [ 35.243253] irq_exit+0xd0/0xd8 [ 35.246387] __handle_domain_irq+0x60/0xb0 [ 35.250475] gic_handle_irq+0x58/0xa8 [ 35.254130] el1_irq+0xb8/0x180 [ 35.257268] kernfs_find_ns+0x5c/0x120 [ 35.261010] kernfs_find_and_get_ns+0x3c/0x60 [ 35.265361] sysfs_unmerge_group+0x20/0x68 [ 35.269454] dpm_sysfs_remove+0x2c/0x68 [ 35.273284] device_del+0x80/0x370 [ 35.276683] hid_destroy_device+0x28/0x60 [ 35.280686] usbhid_disconnect+0x4c/0x80 [ 35.284602] usb_unbind_interface+0x6c/0x268 [ 35.288867] device_release_driver_internal+0xe4/0x1b0 [ 35.293998] device_release_driver+0x14/0x20 [ 35.298261] bus_remove_device+0x110/0x128 [ 35.302350] device_del+0x148/0x370 [ 35.305832] usb_disable_device+0x8c/0x1d0 [ 35.309921] usb_disconnect+0xc8/0x2d0 [ 35.313663] hub_event+0x6e0/0x1128 [ 35.317146] process_one_work+0x1e0/0x320 [ 35.321148] worker_thread+0x40/0x450 [ 35.324805] kthread+0x124/0x128 [ 35.328027] ret_from_fork+0x10/0x18 [ 35.331594] handlers: [ 35.333862] [<0000000079300c1d>] usb_hcd_irq [ 35.338126] [<0000000079300c1d>] usb_hcd_irq [ 35.342389] Disabling IRQ #156
ohci_shutdown() disables all the interrupt and rh_state is set to OHCI_RH_HALTED. In other hand, ohci_irq() is possible to enable OHCI_INTR_SF and OHCI_INTR_MIE on ohci_irq(). Note that OHCI_INTR_SF is possible to be set by start_ed_unlink() which is called:
ohci_irq()
-> process_done_list()
-> takeback_td()
-> start_ed_unlink()
So, ohci_irq() has the following condition, the issue happens by &ohci->regs->intrenable = OHCI_INTR_MIE | OHCI_INTR_SF and ohci->rh_state = OHCI_RH_HALTED:
/* interrupt for some other device? */ if (ints == 0 || unlikely(ohci->rh_state == OHCI_RH_HALTED)) return IRQ_NOTMINE;
To fix the issue, ohci_shutdown() holds the spin lock while disabling the interruption and changing the rh_state flag to prevent reenable the OHCI_INTR_MIE unexpectedly. Note that io_watchdog_func() also calls the ohci_shutdown() and it already held the spin lock, so that the patch makes a new function as _ohci_shutdown().
This patch is inspired by a Renesas R-Car Gen3 BSP patch from Tho Vu.
--- drivers/usb/host/ohci-hcd.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/usb/host/ohci-hcd.c +12 -3
@@ -418,8 +418,7 @@ static void ohci_usb_reset (struct ohci_* other cases where the next software may expect clean state from the * "firmware". this is bus-neutral, unlike shutdown() methods. */ -static void -ohci_shutdown (struct usb_hcd *hcd) +static void _ohci_shutdown (struct usb_hcd *hcd) {struct ohci_hcd *ohci;
@@ -435,6 +434,16 @@ ohci_shutdown (struct usb_hcd *hcd) ohci->rh_state =OHCI_RH_HALTED ; } +static void ohci_shutdown (struct usb_hcd *hcd) +{ +struct ohci_hcd *ohci =hcd_to_ohci (hcd); +unsigned long flags; + +spin_lock_irqsave (&ohci->lock, flags); +_ohci_shutdown (hcd); +spin_unlock_irqrestore (&ohci->lock, flags); +} +/*-------------------------------------------------------------------------* * HC functions *-------------------------------------------------------------------------*/
@@ -752,7 +761,7 @@ static void io_watchdog_func(struct time died:usb_hc_died (ohci_to_hcd (ohci));ohci_dump (ohci); -ohci_shutdown (ohci_to_hcd (ohci)); +_ohci_shutdown (ohci_to_hcd (ohci)); goto done; }else {/* No write back because the done queue was empty */
Greg Kroah-Hartman
maintainerPATCH 84/143 usb: host: xhci: rcar: Fix typo in compatible string matching
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
commit 636bd02a7ba9025ff851d0cfb92768c8fa865859 upstream.
It's spelled "renesas", not "renensas".
Due to this typo, RZ/G1M and RZ/G1N were not covered by the check.
--- drivers/usb/host/xhci-rcar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-rcar.c +1 -1
@@ -104,7 +104,7 @@ static int xhci_rcar_is_gen2(struct devireturn of_device_is_compatible (node,"renesas,xhci-r8a7790" ) ||of_device_is_compatible (node,"renesas,xhci-r8a7791" ) ||of_device_is_compatible (node,"renesas,xhci-r8a7793" ) || -of_device_is_compatible (node,"renensas,rcar-gen2-xhci" ); +of_device_is_compatible (node,"renesas,rcar-gen2-xhci" ); }static int xhci_rcar_is_gen3 (struct device *dev)
Greg Kroah-Hartman
maintainerPATCH 85/143 USB: storage: ums-realtek: Update module parameter description for auto_delink_en
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit f6445b6b2f2bb1745080af4a0926049e8bca2617 upstream.
The option named "auto_delink_en" is a bit misleading, as setting it to false doesn't really disable auto-delink but let auto-delink be firmware controlled.
Update the description to reflect the real usage of this parameter.
--- drivers/usb/storage/realtek_cr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/realtek_cr.c +1 -1
@@ -38,7 +38,7 @@ MODULE_LICENSE("GPL");static int auto_delink_en =1 ;module_param (auto_delink_en, int,S_IRUGO |S_IWUSR ); -MODULE_PARM_DESC (auto_delink_en,"enable auto delink" ); +MODULE_PARM_DESC (auto_delink_en,"auto delink mode (0=firmware, 1=software [default])" );#ifdef CONFIG_REALTEK_AUTOPM static int ss_en =1 ;
Greg Kroah-Hartman
maintainerPATCH 86/143 USB: storage: ums-realtek: Whitelist auto-delink support
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 1902a01e2bcc3abd7c9a18dc05e78c7ab4a53c54 upstream.
Auto-delink requires writing special registers to ums-realtek devices. Unconditionally enable auto-delink may break newer devices.
So only enable auto-delink by default for the original three IDs, 0x0138, 0x0158 and 0x0159.
Realtek is working on a patch to properly support auto-delink for other IDs.
--- drivers/usb/storage/realtek_cr.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/usb/storage/realtek_cr.c +8 -5
@@ -996,12 +996,15 @@ static int init_realtek_cr(struct us_dat goto INIT_FAIL; } -if (CHECK_FW_VER (chip,0x5888 ) ||CHECK_FW_VER (chip,0x5889 ) || -CHECK_FW_VER (chip,0x5901 )) -SET_AUTO_DELINK (chip); -if (STATUS_LEN (chip) ==16 ) { -if (SUPPORT_AUTO_DELINK (chip)) +if (CHECK_PID (chip,0x0138 ) ||CHECK_PID (chip,0x0158 ) || +CHECK_PID (chip,0x0159 )) { +if (CHECK_FW_VER (chip,0x5888 ) ||CHECK_FW_VER (chip,0x5889 ) || +CHECK_FW_VER (chip,0x5901 ))SET_AUTO_DELINK (chip); +if (STATUS_LEN (chip) ==16 ) { +if (SUPPORT_AUTO_DELINK (chip)) +SET_AUTO_DELINK (chip); + } }#ifdef CONFIG_REALTEK_AUTOPM if (ss_en)
Greg Kroah-Hartman
maintainerPATCH 87/143 tools/power turbostat: Fix caller parameter of get_tdp_amd()
In reply to Greg Kroah-HartmanFrom: Pu Wen <[email protected]>
commit 9cfa8e042f7cbb1994cc5923e46c78b36f6054f4 upstream.
Commit 9392bd98bba760be96ee ("tools/power turbostat: Add support for AMD Fam 17h (Zen) RAPL") add a function get_tdp_amd(), the parameter is CPU family. But the rapl_probe_amd() function use wrong model parameter. Fix the wrong caller parameter of get_tdp_amd() to use family.
--- tools/power/x86/turbostat/turbostat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.c +1 -1
@@ -4002,7 +4002,7 @@ void rapl_probe_amd(unsigned int family, rapl_energy_units =ldexp (1.0 , -(msr >>8 &0x1f )); rapl_power_units =ldexp (1.0 , -(msr &0xf )); - tdp =get_tdp_amd (model); + tdp =get_tdp_amd (family); rapl_joule_counter_range =0xFFFFFFFF * rapl_energy_units / tdp;if (!quiet)
Greg Kroah-Hartman
maintainerPATCH 88/143 KVM: PPC: Book3S: Fix incorrect guest-to-user-translation error handling
In reply to Greg Kroah-HartmanFrom: Alexey Kardashevskiy <[email protected]>
commit ddfd151f3def9258397fcde7a372205a2d661903 upstream.
H_PUT_TCE_INDIRECT handlers receive a page with up to 512 TCEs from a guest. Although we verify correctness of TCEs before we do anything with the existing tables, there is a small window when a check in kvmppc_tce_validate might pass and right after that the guest alters the page of TCEs, causing an early exit from the handler and leaving srcu_read_lock(&vcpu->kvm->srcu) (virtual mode) or lock_rmap(rmap) (real mode) locked.
This fixes the bug by jumping to the common exit code with an appropriate unlock.
--- arch/powerpc/kvm/book3s_64_vio.c | 6 ++++-- arch/powerpc/kvm/book3s_64_vio_hv.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
arch/powerpc/kvm/book3s_64_vio.c +4 -2
@@ -696,8 +696,10 @@ long kvmppc_h_put_tce_indirect(struct kv } tce =be64_to_cpu (tce); -if (kvmppc_tce_to_ua (vcpu->kvm, tce, &ua)) -return H_PARAMETER ; +if (kvmppc_tce_to_ua (vcpu->kvm, tce, &ua)) { + ret =H_PARAMETER ; + goto unlock_exit; + }list_for_each_entry_lockless (stit, &stt->iommu_tables, next) { ret = kvmppc_tce_iommu_map(vcpu->kvm, stt,
arch/powerpc/kvm/book3s_64_vio_hv.c +4 -2
@@ -556,8 +556,10 @@ long kvmppc_rm_h_put_tce_indirect(structunsigned long tce =be64_to_cpu (((u64 *)tces)[i]); ua =0 ; -if (kvmppc_rm_tce_to_ua (vcpu->kvm, tce, &ua,NULL )) -return H_PARAMETER ; +if (kvmppc_rm_tce_to_ua (vcpu->kvm, tce, &ua,NULL )) { + ret =H_PARAMETER ; + goto unlock_exit; + }list_for_each_entry_lockless (stit, &stt->iommu_tables, next) { ret = kvmppc_rm_tce_iommu_map(vcpu->kvm, stt,
Greg Kroah-Hartman
maintainerPATCH 89/143 KVM: arm/arm64: vgic: Fix potential deadlock when ap_list is long
In reply to Greg Kroah-HartmanFrom: Heyi Guo <[email protected]>
commit d4a8061a7c5f7c27a2dc002ee4cb89b3e6637e44 upstream.
If the ap_list is longer than 256 entries, merge_final() in list_sort() will call the comparison callback with the same element twice, causing a deadlock in vgic_irq_cmp().
Fix it by returning early when irqa == irqb.
--- virt/kvm/arm/vgic/vgic.c | 7 +++++++ 1 file changed, 7 insertions(+)
virt/kvm/arm/vgic/vgic.c +7 -0
@@ -254,6 +254,13 @@ static int vgic_irq_cmp(void *priv, strubool penda, pendb;int ret; +/* +* list_sort may call this function with the same element when +* the list is fairly long. +*/ +if (unlikely (irqa == irqb)) +return 0 ; +raw_spin_lock (&irqa->irq_lock);raw_spin_lock_nested (&irqb->irq_lock,SINGLE_DEPTH_NESTING );
Greg Kroah-Hartman
maintainerPATCH 90/143 KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit 82e40f558de566fdee214bec68096bbd5e64a6a4 upstream.
A guest is not allowed to inject a SGI (or clear its pending state) by writing to GICD_ISPENDR0 (resp. GICD_ICPENDR0), as these bits are defined as WI (as per ARM IHI 0048B 4.3.7 and 4.3.8).
Make sure we correctly emulate the architecture.
--- virt/kvm/arm/vgic/vgic-mmio.c | 18 ++++++++++++++++++ virt/kvm/arm/vgic/vgic-v2.c | 5 ++++- virt/kvm/arm/vgic/vgic-v3.c | 5 ++++- 3 files changed, 26 insertions(+), 2 deletions(-)
virt/kvm/arm/vgic/vgic-mmio.c +18 -0
@@ -195,6 +195,12 @@ static void vgic_hw_irq_spending(structvgic_irq_set_phys_active (irq, true); } +static bool is_vgic_v2_sgi (struct kvm_vcpu *vcpu,struct vgic_irq *irq) +{ +return (vgic_irq_is_sgi (irq->intid) && + vcpu->kvm->arch.vgic.vgic_model ==KVM_DEV_TYPE_ARM_VGIC_V2 ); +} +void vgic_mmio_write_spending (struct kvm_vcpu *vcpu,gpa_t addr,unsigned int len,unsigned long val)
@@ -207,6 +213,12 @@ void vgic_mmio_write_spending(struct kvmfor_each_set_bit (i, &val, len *8 ) {struct vgic_irq *irq =vgic_get_irq (vcpu->kvm, vcpu, intid + i); +/* GICD_ISPENDR0 SGI bits are WI */ +if (is_vgic_v2_sgi (vcpu, irq)) { +vgic_put_irq (vcpu->kvm, irq); +continue ; + } +raw_spin_lock_irqsave (&irq->irq_lock, flags);if (irq->hw)vgic_hw_irq_spending (vcpu, irq, is_uaccess);
@@ -254,6 +266,12 @@ void vgic_mmio_write_cpending(struct kvmfor_each_set_bit (i, &val, len *8 ) {struct vgic_irq *irq =vgic_get_irq (vcpu->kvm, vcpu, intid + i); +/* GICD_ICPENDR0 SGI bits are WI */ +if (is_vgic_v2_sgi (vcpu, irq)) { +vgic_put_irq (vcpu->kvm, irq); +continue ; + } +raw_spin_lock_irqsave (&irq->irq_lock, flags);if (irq->hw)
virt/kvm/arm/vgic/vgic-v2.c +4 -1
@@ -184,7 +184,10 @@ void vgic_v2_populate_lr(struct kvm_vcpuif (vgic_irq_is_sgi (irq->intid)) {u32 src =ffs (irq->source); -BUG_ON (!src); +if (WARN_RATELIMIT (!src,"No SGI source for INTID %d\n" , + irq->intid)) +return ; + val |= (src -1 ) <<GICH_LR_PHYSID_CPUID_SHIFT ; irq->source &= ~(1 << (src -1 ));if (irq->source) {
virt/kvm/arm/vgic/vgic-v3.c +4 -1
@@ -167,7 +167,10 @@ void vgic_v3_populate_lr(struct kvm_vcpu model == KVM_DEV_TYPE_ARM_VGIC_V2) {u32 src =ffs (irq->source); -BUG_ON (!src); +if (WARN_RATELIMIT (!src,"No SGI source for INTID %d\n" , + irq->intid)) +return ; + val |= (src -1 ) <<GICH_LR_PHYSID_CPUID_SHIFT ; irq->source &= ~(1 << (src -1 ));if (irq->source) {
Greg Kroah-Hartman
maintainerPATCH 91/143 mei: me: add Tiger Lake point LP device ID
In reply to Greg Kroah-HartmanFrom: Tomas Winkler <[email protected]>
commit 587f17407741a5be07f8a2d1809ec946c8120962 upstream.
Add Tiger Lake Point device ID for TGP LP.
--- drivers/misc/mei/hw-me-regs.h | 2 ++ drivers/misc/mei/pci-me.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/misc/mei/hw-me-regs.h +2 -0
@@ -81,6 +81,8 @@#define MEI_DEV_ID_ICP_LP 0x34E0/* Ice Lake Point LP */ +#define MEI_DEV_ID_TGP_LP 0xA0E0/* Tiger Lake Point LP */ +#define MEI_DEV_ID_MCC 0x4B70/* Mule Creek Canyon (EHL) */ #define MEI_DEV_ID_MCC_4 0x4B75/* Mule Creek Canyon 4 (EHL) */
drivers/misc/mei/pci-me.c +2 -0
@@ -98,6 +98,8 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)},
Greg Kroah-Hartman
maintainerPATCH 92/143 Revert "mmc: sdhci-tegra: drop ->get_ro() implementation"
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit 0f686ca933597cfcc0636253fc1740423c062ec7 upstream.
The WRITE_PROTECT bit is always in a "protected mode" on Tegra and WP-GPIO state need to be used instead. In a case of the GPIO absence, write-enable should be assumed. External SD is writable once again as a result of this patch because the offending commit changed behaviour for the case of a missing WP-GPIO to fall back to WRITE_PROTECT bit-checking, which is incorrect for Tegra.
--- drivers/mmc/host/sdhci-tegra.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-tegra.c +14 -0
@@ -258,6 +258,16 @@ static void tegra210_sdhci_writew(struct } } +static unsigned int tegra_sdhci_get_ro (struct sdhci_host *host) +{ +/* +* Write-enable shall be assumed if GPIO is missing in a board's +* device-tree because SDHCI's WRITE_PROTECT bit doesn't work on +* Tegra. +*/ +return mmc_gpio_get_ro (host->mmc); +} +static bool tegra_sdhci_is_pad_and_regulator_valid (struct sdhci_host *host) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);
@@ -1224,6 +1234,7 @@ static const struct cqhci_host_ops sdhci };static const struct sdhci_ops tegra_sdhci_ops = { + .get_ro = tegra_sdhci_get_ro, .read_w = tegra_sdhci_readw, .write_l = tegra_sdhci_writel, .set_clock = tegra_sdhci_set_clock,
@@ -1279,6 +1290,7 @@ static const struct sdhci_tegra_soc_data };static const struct sdhci_ops tegra114_sdhci_ops = { + .get_ro = tegra_sdhci_get_ro, .read_w = tegra_sdhci_readw, .write_w = tegra_sdhci_writew, .write_l = tegra_sdhci_writel,
@@ -1332,6 +1344,7 @@ static const struct sdhci_tegra_soc_data };static const struct sdhci_ops tegra210_sdhci_ops = { + .get_ro = tegra_sdhci_get_ro, .read_w = tegra_sdhci_readw, .write_w = tegra210_sdhci_writew, .write_l = tegra_sdhci_writel,
@@ -1366,6 +1379,7 @@ static const struct sdhci_tegra_soc_data };static const struct sdhci_ops tegra186_sdhci_ops = { + .get_ro = tegra_sdhci_get_ro, .read_w = tegra_sdhci_readw, .write_l = tegra_sdhci_writel, .set_clock = tegra_sdhci_set_clock,
Greg Kroah-Hartman
maintainerPATCH 93/143 mmc: sdhci-of-at91: add quirk for broken HS200
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
commit 7871aa60ae0086fe4626abdf5ed13eeddf306c61 upstream.
HS200 is not implemented in the driver, but the controller claims it through caps. Remove it via a quirk, to make sure the mmc core do not try to enable HS200, as it causes the eMMC initialization to fail.
--- drivers/mmc/host/sdhci-of-at91.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/sdhci-of-at91.c +3 -0
@@ -357,6 +357,9 @@ static int sdhci_at91_probe(struct platfpm_runtime_set_autosuspend_delay (&pdev->dev,50 );pm_runtime_use_autosuspend (&pdev->dev); +/* HS200 is broken at this moment */ + host->quirks2 =SDHCI_QUIRK2_BROKEN_HS200 ; + ret =sdhci_add_host (host);if (ret) goto pm_runtime_disable;
Greg Kroah-Hartman
maintainerPATCH 94/143 mmc: sdhci-cadence: enable v4_mode to fix ADMA 64-bit addressing
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
commit e73a3896eaca95ea5fc895720502a3f040eb4b39 upstream.
The IP datasheet says this controller is compatible with SD Host Specification Version v4.00.
As it turned out, the ADMA of this IP does not work with 64-bit mode when it is in the Version 3.00 compatible mode; it understands the old 64-bit descriptor table (as defined in SDHCI v2), but the ADMA System Address Register (SDHCI_ADMA_ADDRESS) cannot point to the 64-bit address.
I noticed this issue only after commit bd2e75633c80 ("dma-contiguous:
use fallback alloc_pages for single pages"). Prior to that commit, dma_set_mask_and_coherent() returned the dma address that fits in 32-bit range, at least for the default arm64 configuration (arch/arm64/configs/defconfig). Now the host->adma_addr exceeds the 32-bit limit, causing the real problem for the Socionext SoCs. (As a side-note, I was also able to reproduce the issue for older kernels by turning off CONFIG_DMA_CMA.)
Call sdhci_enable_v4_mode() to fix this.
--- drivers/mmc/host/sdhci-cadence.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/sdhci-cadence.c +1 -0
@@ -369,6 +369,7 @@ static int sdhci_cdns_probe(struct platf host->mmc_host_ops.execute_tuning = sdhci_cdns_execute_tuning; host->mmc_host_ops.hs400_enhanced_strobe = sdhci_cdns_hs400_enhanced_strobe; +sdhci_enable_v4_mode (host);sdhci_get_of_property (pdev);
Greg Kroah-Hartman
maintainerPATCH 95/143 mmc: core: Fix init of SD cards reporting an invalid VDD range
In reply to Greg Kroah-HartmanFrom: Ulf Hansson <[email protected]>
commit 72741084d903e65e121c27bd29494d941729d4a1 upstream.
The OCR register defines the supported range of VDD voltages for SD cards. However, it has turned out that some SD cards reports an invalid voltage range, for example having bit7 set.
When a host supports MMC_CAP2_FULL_PWR_CYCLE and some of the voltages from the invalid VDD range, this triggers the core to run a power cycle of the card to try to initialize it at the lowest common supported voltage. Obviously this fails, since the card can't support it.
Let's fix this problem, by clearing invalid bits from the read OCR register for SD cards, before proceeding with the VDD voltage negotiation.
--- drivers/mmc/core/sd.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mmc/core/sd.c +6 -0
@@ -1292,6 +1292,12 @@ int mmc_attach_sd(struct mmc_host *host) goto err; } +/* +* Some SD cards claims an out of spec VDD voltage range. Let's treat +* these bits as being in-valid and especially also bit7. +*/ + ocr &= ~0x7FFF ; + rocr =mmc_select_voltage (host, ocr);/*
Greg Kroah-Hartman
maintainerPATCH 96/143 mmc: sdhci-sprd: fixed incorrect clock divider
In reply to Greg Kroah-HartmanFrom: Chunyan Zhang <[email protected]>
commit efdaf27517a892238e0dfa046cd91184b039d681 upstream.
The register SDHCI_CLOCK_CONTROL should be cleared before config clock divider, otherwise the frequency configured maybe lower than we expected.
--- drivers/mmc/host/sdhci-sprd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci-sprd.c +4 -3
@@ -174,10 +174,11 @@ static inline void _sdhci_sprd_set_clockstruct sdhci_sprd_host *sprd_host =TO_SPRD_HOST (host);u32 div, val, mask; - div =sdhci_sprd_calc_div (sprd_host->base_rate, clk); +sdhci_writew (host,0 ,SDHCI_CLOCK_CONTROL ); - clk |= ((div &0x300 ) >>2 ) | ((div &0xFF ) <<8 ); -sdhci_enable_clk (host, clk); + div =sdhci_sprd_calc_div (sprd_host->base_rate, clk); + div = ((div &0x300 ) >>2 ) | ((div &0xFF ) <<8 ); +sdhci_enable_clk (host, div);/* enable auto gate sdhc_enable_auto_gate */ val =sdhci_readl (host,SDHCI_SPRD_REG_32_BUSY_POSI );
Greg Kroah-Hartman
maintainerPATCH 97/143 mmc: sdhci-sprd: add SDHCI_QUIRK2_PRESET_VALUE_BROKEN
In reply to Greg Kroah-HartmanFrom: Chunyan Zhang <[email protected]>
commit 6a526f66ab1494b63c71cd6639d9d96fd7216add upstream.
The bit of PRESET_VAL_ENABLE in HOST_CONTROL2 register is reserved on sprd's sd host controller, set quirk2 to disable configuring this.
--- drivers/mmc/host/sdhci-sprd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sprd.c +2 -1
@@ -321,7 +321,8 @@ static void sdhci_sprd_request(struct mmstatic const struct sdhci_pltfm_data sdhci_sprd_pdata = { .quirks =SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK , .quirks2 =SDHCI_QUIRK2_BROKEN_HS200 | -SDHCI_QUIRK2_USE_32BIT_BLK_CNT , +SDHCI_QUIRK2_USE_32BIT_BLK_CNT | +SDHCI_QUIRK2_PRESET_VALUE_BROKEN , .ops = &sdhci_sprd_ops, };
Greg Kroah-Hartman
maintainerPATCH 98/143 stm class: Fix a double free of stm_source_device
In reply to Greg Kroah-HartmanFrom: Ding Xiang <[email protected]>
commit 961b6ffe0e2c403b09a8efe4a2e986b3c415391a upstream.
In the error path of stm_source_register_device(), the kfree is unnecessary, as the put_device() before it ends up calling stm_source_device_release() to free stm_source_device, leading to a double free at the outer kfree() call. Remove it.
--- drivers/hwtracing/stm/core.c | 1 - 1 file changed, 1 deletion(-)
drivers/hwtracing/stm/core.c +0 -1
@@ -1276,7 +1276,6 @@ int stm_source_register_device(struct de err:put_device (&src->dev); -kfree (src);return err; }
Greg Kroah-Hartman
maintainerPATCH 99/143 intel_th: pci: Add support for another Lewisburg PCH
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit 164eb56e3b64f3a816238d410c9efec7567a82ef upstream.
Add support for the Trace Hub in another Lewisburg PCH.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -165,6 +165,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)0, }, { +/* Lewisburg PCH */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa226), + .driver_data = (kernel_ulong_t )0 , + }, + {/* Gemini Lake */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x318e ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 100/143 intel_th: pci: Add Tiger Lake support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
commit 9c78255fdde45c6b9a1ee30f652f7b34c727f5c7 upstream.
This adds support for the Trace Hub in Tiger Lake PCH.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -204,6 +204,11 @@ static const struct pci_device_id intel_ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x45c5), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { +/* Tiger Lake PCH */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa0a6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };
Greg Kroah-Hartman
maintainerPATCH 101/143 typec: tcpm: fix a typo in the comparison of pdo_max_voltage
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit a684d8fd87182090ee96e34519ecdf009cef093a upstream.
There appears to be a typo in the comparison of pdo_max_voltage[i] with the previous value, currently it is checking against the array pdo_min_voltage rather than pdo_max_voltage. I believe this is a typo. Fix this.
Addresses-Coverity: ("Copy-paste error")
--- drivers/usb/typec/tcpm/tcpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/tcpm/tcpm.c +1 -1
@@ -1446,7 +1446,7 @@ static enum pdo_err tcpm_caps_err(structelse if ((pdo_min_voltage (pdo[i]) ==pdo_min_voltage (pdo[i -1 ])) && (pdo_max_voltage (pdo[i]) == -pdo_min_voltage (pdo[i -1 ]))) +pdo_max_voltage (pdo[i -1 ])))return PDO_ERR_DUPE_PDO ;break ;/*
Greg Kroah-Hartman
maintainerPATCH 102/143 fsi: scom: Dont abort operations for minor errors
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
commit 8919dfcb31161fae7d607bbef5247e5e82fd6457 upstream.
The scom driver currently fails out of operations if certain system errors are flagged in the status register; system checkstop, special attention, or recoverable error. These errors won't impact the ability of the scom engine to perform operations, so the driver should continue under these conditions.
Also, don't do a PIB reset for these conditions, since it won't help.
--- drivers/fsi/fsi-scom.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/fsi/fsi-scom.c +1 -7
@@ -38,8 +38,7 @@#define SCOM_STATUS_PIB_RESP_MASK 0x00007000#define SCOM_STATUS_PIB_RESP_SHIFT 12 -#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_ERR_SUMMARY | \ - SCOM_STATUS_PROTECTION | \ +#define SCOM_STATUS_ANY_ERR (SCOM_STATUS_PROTECTION | \ SCOM_STATUS_PARITY | \ SCOM_STATUS_PIB_ABORT | \ SCOM_STATUS_PIB_RESP_MASK)
@@ -251,11 +250,6 @@ static int handle_fsi2pib_status(struct/* Return -EBUSY on PIB abort to force a retry */ if (status &SCOM_STATUS_PIB_ABORT )return -EBUSY ; -if (status &SCOM_STATUS_ERR_SUMMARY ) { -fsi_device_write (scom->fsi_dev,SCOM_FSI2PIB_RESET_REG , &dummy, -sizeof (uint32_t )); -return -EIO ; - }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 103/143 lkdtm/bugs: fix build error in lkdtm_EXHAUST_STACK
In reply to Greg Kroah-HartmanFrom: Raul E Rangel <[email protected]>
commit b9bc7b8b1e9e815b231c1ca0b566ee723f480987 upstream.
lkdtm/bugs.c:94:2: error: format '%d' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Werror=format=]
pr_info("Calling function with %d frame size to depth %d ...\n",
^THREAD_SIZE is defined as a unsigned long, cast CONFIG_FRAME_WARN to
unsigned long as well.
--- drivers/misc/lkdtm/bugs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/lkdtm/bugs.c +2 -2
@@ -22,7 +22,7 @@ struct lkdtm_list {* recurse past the end of THREAD_SIZE by default. */ #if defined(CONFIG_FRAME_WARN ) && (CONFIG_FRAME_WARN >0 ) -#define REC_STACK_SIZE (CONFIG_FRAME_WARN / 2) +#define REC_STACK_SIZE (_AC(CONFIG_FRAME_WARN, UL) / 2)#else #define REC_STACK_SIZE (THREAD_SIZE / 8)#endif
@@ -91,7 +91,7 @@ void lkdtm_LOOP(void)void lkdtm_EXHAUST_STACK (void ) { -pr_info ("Calling function with %d frame size to depth %d ...\n" , +pr_info ("Calling function with %lu frame size to depth %d ...\n" ,REC_STACK_SIZE , recur_count);recursive_loop (recur_count);pr_info ("FAIL: survived without exhausting stack?!\n" );
Greg Kroah-Hartman
maintainerPATCH 104/143 NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend()
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit f4340e9314dbfadc48758945f85fc3b16612d06f upstream.
If the attempt to resend the pages fails, we need to ensure that we clean up those pages that were not transmitted.
--- fs/nfs/pagelist.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
fs/nfs/pagelist.c +9 -7
@@ -1253,20 +1253,22 @@ static void nfs_pageio_complete_mirror(sint nfs_pageio_resend (struct nfs_pageio_descriptor *desc,struct nfs_pgio_header *hdr) { -LIST_HEAD (failed); +LIST_HEAD (pages); desc->pg_io_completion = hdr->io_completion; desc->pg_dreq = hdr->dreq; -while (!list_empty (&hdr->pages)) { -struct nfs_page *req =nfs_list_entry (hdr->pages.next); +list_splice_init (&hdr->pages, &pages); +while (!list_empty (&pages)) { +struct nfs_page *req =nfs_list_entry (pages.next);if (!nfs_pageio_add_request (desc, req)) -nfs_list_move_request (req, &failed); +break ; }nfs_pageio_complete (desc); -if (!list_empty (&failed)) { -list_move (&failed, &hdr->pages); -return desc->pg_error <0 ? desc->pg_error : -EIO ; +if (!list_empty (&pages)) { +int err = desc->pg_error <0 ? desc->pg_error : -EIO ; + hdr->completion_ops->error_cleanup (&pages, err); +return err; }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 105/143 NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit eb2c50da9e256dbbb3ff27694440e4c1900cfef8 upstream.
If the attempt to resend the I/O results in no bytes being read/written, we must ensure that we report the error.
--- fs/nfs/direct.c | 27 ++++++++++++++++++--------- fs/nfs/pagelist.c | 1 + 2 files changed, 19 insertions(+), 9 deletions(-)
fs/nfs/direct.c +18 -9
@@ -401,15 +401,21 @@ static void nfs_direct_read_completion(sunsigned long bytes =0 ;struct nfs_direct_req *dreq = hdr->dreq; -if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) - goto out_put; -spin_lock (&dreq->lock); -if (test_bit (NFS_IOHDR_ERROR , &hdr->flags) && (hdr->good_bytes ==0 )) +if (test_bit (NFS_IOHDR_ERROR , &hdr->flags)) dreq->error = hdr->error; -else + +if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) { +spin_unlock (&dreq->lock); + goto out_put; + } + +if (hdr->good_bytes !=0 )nfs_direct_good_bytes (dreq, hdr); +if (test_bit (NFS_IOHDR_EOF , &hdr->flags)) + dreq->error =0 ; +spin_unlock (&dreq->lock);while (!list_empty (&hdr->pages)) {
@@ -782,16 +788,19 @@ static void nfs_direct_write_completion(bool request_commit = false;struct nfs_page *req =nfs_list_entry (hdr->pages.next); -if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) - goto out_put; -nfs_init_cinfo_from_dreq (&cinfo, dreq);spin_lock (&dreq->lock);if (test_bit (NFS_IOHDR_ERROR , &hdr->flags)) dreq->error = hdr->error; -if (dreq->error ==0 ) { + +if (test_bit (NFS_IOHDR_REDO , &hdr->flags)) { +spin_unlock (&dreq->lock); + goto out_put; + } + +if (hdr->good_bytes !=0 ) {nfs_direct_good_bytes (dreq, hdr);if (nfs_write_need_commit (hdr)) {if (dreq->flags ==NFS_ODIRECT_RESCHED_WRITES )
fs/nfs/pagelist.c +1 -0
@@ -1268,6 +1268,7 @@ int nfs_pageio_resend(struct nfs_pageio_if (!list_empty (&pages)) {int err = desc->pg_error <0 ? desc->pg_error : -EIO ; hdr->completion_ops->error_cleanup (&pages, err); +nfs_set_pgio_error (hdr, err, hdr->io_start);return err; }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 106/143 Revert "NFSv4/flexfiles: Abort I/O early if the layout segment was invalidated"
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit d5711920ec6e578f51db95caa6f185f5090b865e upstream.
This reverts commit a79f194aa4879e9baad118c3f8bb2ca24dbef765. The mechanism for aborting I/O is racy, since we are not guaranteed that the request is asleep while we're changing both task->tk_status and task->tk_action.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 17 ----------------- include/linux/sunrpc/sched.h | 1 - net/sunrpc/xprt.c | 7 ------- 3 files changed, 25 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +0 -17
@@ -1128,8 +1128,6 @@ static int ff_layout_async_handle_error_break ;case -NFS4ERR_RETRY_UNCACHED_REP :break ; -case -EAGAIN : -return -NFS4ERR_RESET_TO_PNFS ;/* Invalidate Layout errors */ case -NFS4ERR_PNFS_NO_LAYOUT :case -ESTALE :/* mapped NFS4ERR_STALE */
@@ -1190,7 +1188,6 @@ static int ff_layout_async_handle_error_case -EBADHANDLE :case -ELOOP :case -ENOSPC : -case -EAGAIN :break ;case -EJUKEBOX :nfs_inc_stats (lseg->pls_layout->plh_inode,NFSIOS_DELAY );
@@ -1425,16 +1422,6 @@ static void ff_layout_read_prepare_v4(stff_layout_read_prepare_common (task, hdr); } -static void -ff_layout_io_prepare_transmit (struct rpc_task *task, -void *data) -{ -struct nfs_pgio_header *hdr = data; - -if (!pnfs_is_valid_lseg (hdr->lseg)) -rpc_exit (task, -EAGAIN ); -} -static void ff_layout_read_call_done (struct rpc_task *task,void *data) {struct nfs_pgio_header *hdr = data;
@@ -1720,7 +1707,6 @@ static void ff_layout_commit_release(voistatic const struct rpc_call_ops ff_layout_read_call_ops_v3 = { .rpc_call_prepare = ff_layout_read_prepare_v3, - .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, .rpc_call_done = ff_layout_read_call_done, .rpc_count_stats = ff_layout_read_count_stats, .rpc_release = ff_layout_read_release,
@@ -1728,7 +1714,6 @@ static const struct rpc_call_ops ff_layostatic const struct rpc_call_ops ff_layout_read_call_ops_v4 = { .rpc_call_prepare = ff_layout_read_prepare_v4, - .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, .rpc_call_done = ff_layout_read_call_done, .rpc_count_stats = ff_layout_read_count_stats, .rpc_release = ff_layout_read_release,
@@ -1736,7 +1721,6 @@ static const struct rpc_call_ops ff_layostatic const struct rpc_call_ops ff_layout_write_call_ops_v3 = { .rpc_call_prepare = ff_layout_write_prepare_v3, - .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, .rpc_call_done = ff_layout_write_call_done, .rpc_count_stats = ff_layout_write_count_stats, .rpc_release = ff_layout_write_release,
@@ -1744,7 +1728,6 @@ static const struct rpc_call_ops ff_layostatic const struct rpc_call_ops ff_layout_write_call_ops_v4 = { .rpc_call_prepare = ff_layout_write_prepare_v4, - .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, .rpc_call_done = ff_layout_write_call_done, .rpc_count_stats = ff_layout_write_count_stats, .rpc_release = ff_layout_write_release,
include/linux/sunrpc/sched.h +0 -1
@@ -98,7 +98,6 @@ typedef void (*rpc_action)(struct rpc_struct rpc_call_ops {void (*rpc_call_prepare)(struct rpc_task *,void *); -void (*rpc_call_prepare_transmit)(struct rpc_task *,void *);void (*rpc_call_done)(struct rpc_task *,void *);void (*rpc_count_stats)(struct rpc_task *,void *);void (*rpc_release)(void *);
net/sunrpc/xprt.c +0 -7
@@ -1380,13 +1380,6 @@ xprt_request_transmit(struct rpc_rqst *r status = -EBADMSG ; goto out_dequeue; } -if (task->tk_ops->rpc_call_prepare_transmit) { - task->tk_ops->rpc_call_prepare_transmit (task, - task->tk_calldata); - status = task->tk_status; -if (status <0 ) - goto out_dequeue; - }if (RPC_SIGNALLED (task)) { status = -ERESTARTSYS ; goto out_dequeue;
Greg Kroah-Hartman
maintainerPATCH 107/143 lib: logic_pio: Fix RCU usage
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
commit 06709e81c668f5f56c65b806895b278517bd44e0 upstream.
The traversing of io_range_list with list_for_each_entry_rcu() is not properly protected by rcu_read_lock() and rcu_read_unlock(), so add them.
These functions mark the critical section scope where the list is protected for the reader, it cannot be "reclaimed". Any updater - in this case, the logical PIO registration functions - cannot update the list until the reader exits this critical section.
In addition, the list traversing used in logic_pio_register_range() does not need to use the rcu variant.
This is because we are already using io_range_mutex to guarantee mutual exclusion from mutating the list.
--- lib/logic_pio.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-)
lib/logic_pio.c +35 -14
@@ -46,7 +46,7 @@ int logic_pio_register_range(struct logi end = new_range->hw_start + new_range->size;mutex_lock (&io_range_mutex); -list_for_each_entry_rcu (range, &io_range_list, list) { +list_for_each_entry (range, &io_range_list, list) {if (range->fwnode == new_range->fwnode) {/* range already there */ goto end_register;
@@ -108,26 +108,38 @@ end_register:*/ struct logic_pio_hwaddr *find_io_range_by_fwnode (struct fwnode_handle *fwnode) { -struct logic_pio_hwaddr *range; +struct logic_pio_hwaddr *range, *found_range =NULL ; +rcu_read_lock ();list_for_each_entry_rcu (range, &io_range_list, list) { -if (range->fwnode == fwnode) -return range; +if (range->fwnode == fwnode) { + found_range = range; +break ; + } } -return NULL ; +rcu_read_unlock (); + +return found_range; }/* Return a registered range given an input PIO token */ static struct logic_pio_hwaddr *find_io_range (unsigned long pio) { -struct logic_pio_hwaddr *range; +struct logic_pio_hwaddr *range, *found_range =NULL ; +rcu_read_lock ();list_for_each_entry_rcu (range, &io_range_list, list) { -if (in_range (pio, range->io_start, range->size)) -return range; +if (in_range (pio, range->io_start, range->size)) { + found_range = range; +break ; + } } -pr_err ("PIO entry token %lx invalid\n" , pio); -return NULL ; +rcu_read_unlock (); + +if (!found_range) +pr_err ("PIO entry token 0x%lx invalid\n" , pio); + +return found_range; }/**
@@ -180,14 +192,23 @@ unsigned long logic_pio_trans_cpuaddr(re {struct logic_pio_hwaddr *range; +rcu_read_lock ();list_for_each_entry_rcu (range, &io_range_list, list) {if (range->flags !=LOGIC_PIO_CPU_MMIO )continue ; -if (in_range (addr, range->hw_start, range->size)) -return addr - range->hw_start + range->io_start; +if (in_range (addr, range->hw_start, range->size)) { +unsigned long cpuaddr; + + cpuaddr = addr - range->hw_start + range->io_start; + +rcu_read_unlock (); +return cpuaddr; + } } -pr_err ("addr %llx not registered in io_range_list\n" , - (unsigned long long ) addr); +rcu_read_unlock (); + +pr_err ("addr %pa not registered in io_range_list\n" , &addr); +return ~0UL ; }
Greg Kroah-Hartman
maintainerPATCH 108/143 lib: logic_pio: Avoid possible overlap for unregistering regions
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
commit 0a27142bd1ee259e24a0be2b0133e5ca5df8da91 upstream.
The code was originally written to not support unregistering logical PIO regions.
To accommodate supporting unregistering logical PIO regions, subtly modify LOGIC_PIO_CPU_MMIO region registration code, such that the "end" of the registered regions is the "end" of the last region, and not the sum of the sizes of all the registered regions.
--- lib/logic_pio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
lib/logic_pio.c +5 -5
@@ -35,7 +35,7 @@ int logic_pio_register_range(struct logistruct logic_pio_hwaddr *range;resource_size_t start;resource_size_t end; -resource_size_t mmio_sz =0 ; +resource_size_t mmio_end =0 ;resource_size_t iio_sz =MMIO_UPPER_LIMIT ;int ret =0 ;
@@ -56,7 +56,7 @@ int logic_pio_register_range(struct logi/* for MMIO ranges we need to check for overlap */ if (start >= range->hw_start + range->size || end < range->hw_start) { - mmio_sz += range->size; + mmio_end = range->io_start + range->size; }else { ret = -EFAULT ; goto end_register;
@@ -69,16 +69,16 @@ int logic_pio_register_range(struct logi/* range not registered yet, check for available space */ if (new_range->flags ==LOGIC_PIO_CPU_MMIO ) { -if (mmio_sz + new_range->size -1 >MMIO_UPPER_LIMIT ) { +if (mmio_end + new_range->size -1 >MMIO_UPPER_LIMIT ) {/* if it's too big check if 64K space can be reserved */ -if (mmio_sz +SZ_64K -1 >MMIO_UPPER_LIMIT ) { +if (mmio_end +SZ_64K -1 >MMIO_UPPER_LIMIT ) { ret = -E2BIG ; goto end_register; } new_range->size =SZ_64K ;pr_warn ("Requested IO range too big, new size set to 64K\n" ); } - new_range->io_start = mmio_sz; + new_range->io_start = mmio_end; }else if (new_range->flags ==LOGIC_PIO_INDIRECT ) {if (iio_sz + new_range->size -1 >IO_SPACE_LIMIT ) { ret = -E2BIG ;
Greg Kroah-Hartman
maintainerPATCH 109/143 lib: logic_pio: Add logic_pio_unregister_range()
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
commit b884e2de2afc68ce30f7093747378ef972dde253 upstream.
Add a function to unregister a logical PIO range.
Logical PIO space can still be leaked when unregistering certain LOGIC_PIO_CPU_MMIO regions, but this acceptable for now since there are no callers to unregister LOGIC_PIO_CPU_MMIO regions, and the logical PIO region allocation scheme would need significant work to improve this.
--- include/linux/logic_pio.h | 1 + lib/logic_pio.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+)
include/linux/logic_pio.h +1 -0
@@ -117,6 +117,7 @@ struct logic_pio_hwaddr *find_io_range_bunsigned long logic_pio_trans_hwaddr (struct fwnode_handle *fwnode,resource_size_t hw_addr,resource_size_t size);int logic_pio_register_range (struct logic_pio_hwaddr *newrange); +void logic_pio_unregister_range (struct logic_pio_hwaddr *range);resource_size_t logic_pio_to_hwaddr (unsigned long pio);unsigned long logic_pio_trans_cpuaddr (resource_size_t hw_addr);
lib/logic_pio.c +14 -0
@@ -99,6 +99,20 @@ end_register: }/** +* logic_pio_unregister_range - unregister a logical PIO range for a host +* @range: pointer to the IO range which has been already registered. +* +* Unregister a previously-registered IO range node. +*/ +void logic_pio_unregister_range (struct logic_pio_hwaddr *range) +{ +mutex_lock (&io_range_mutex); +list_del_rcu (&range->list); +mutex_unlock (&io_range_mutex); +synchronize_rcu (); +} + +/** * find_io_range_by_fwnode - find logical PIO range for given FW node * @fwnode: FW node handle associated with logical PIO range *
Greg Kroah-Hartman
maintainerPATCH 110/143 drm/amdgpu: Add APTX quirk for Dell Latitude 5495
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 317a3aaef94d73ba6be88aea11b41bb631b2d581 upstream.
Needs ATPX rather than _PR3 to really turn off the dGPU. This can save ~5W when dGPU is runtime-suspended.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +1 -0
@@ -574,6 +574,7 @@ static const struct amdgpu_px_quirk amdg { 0x1002, 0x6900, 0x1002, 0x0124, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1028, 0x0812, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1028, 0x0813, AMDGPU_PX_QUIRK_FORCE_ATPX }, + { 0x1002, 0x699f, 0x1028, 0x0814, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x1025, 0x125A, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0x1002, 0x6900, 0x17AA, 0x3806, AMDGPU_PX_QUIRK_FORCE_ATPX }, { 0, 0, 0, 0, 0 },
Greg Kroah-Hartman
maintainerPATCH 111/143 drm/amdgpu: fix GFXOFF on Picasso and Raven2
In reply to Greg Kroah-HartmanFrom: Aaron Liu <[email protected]>
commit 41940ff50f6c347f3541163702566cd526200d98 upstream.
For picasso(adev->pdev->device == 0x15d8)&raven2(adev->rev_id >= 0x8), firmware is sufficient to support gfxoff.
In commit 98f58ada2d37e, for picasso&raven2,
return directly and cause gfxoff disabled.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +7 -7
@@ -588,14 +588,14 @@ static void gfx_v9_0_check_if_need_gfxofcase CHIP_VEGA20 :break ;case CHIP_RAVEN : -if (adev->rev_id >=0x8 || adev->pdev->device ==0x15d8 ) -break ; -if ((adev->gfx.rlc_fw_version !=106 && - adev->gfx.rlc_fw_version <531 ) || - (adev->gfx.rlc_fw_version ==53815 ) || - (adev->gfx.rlc_feature_version <1 ) || - !adev->gfx.rlc.is_rlc_v2_1) +if (!(adev->rev_id >=0x8 || adev->pdev->device ==0x15d8 ) + &&((adev->gfx.rlc_fw_version !=106 && + adev->gfx.rlc_fw_version <531 ) || + (adev->gfx.rlc_fw_version ==53815 ) || + (adev->gfx.rlc_feature_version <1 ) || + !adev->gfx.rlc.is_rlc_v2_1)) adev->pm.pp_feature &= ~PP_GFXOFF_MASK ; +if (adev->pm.pp_feature &PP_GFXOFF_MASK ) adev->pg_flags |=AMD_PG_SUPPORT_GFX_PG | AMD_PG_SUPPORT_CP |
Greg Kroah-Hartman
maintainerPATCH 112/143 drm/i915: Dont deballoon unused ggtt drm_mm_node in linux guest
In reply to Greg Kroah-HartmanFrom: Xiong Zhang <[email protected]>
commit 0a3dfbb5cd9033752639ef33e319c2f2863c713a upstream.
The following call trace may exist in linux guest dmesg when guest i915 driver is unloaded.
[ 90.776610] [drm:vgt_deballoon_space.isra.0 [i915]] deballoon space: range [0x0 - 0x0] 0 KiB. [ 90.776621] BUG: unable to handle kernel NULL pointer dereference at 00000000000000c0 [ 90.776691] IP: drm_mm_remove_node+0x4d/0x320 [drm] [ 90.776718] PGD 800000012c7d0067 P4D 800000012c7d0067 PUD 138e4c067 PMD 0 [ 90.777091] task: ffff9adab60f2f00 task.stack: ffffaf39c0fe0000 [ 90.777142] RIP: 0010:drm_mm_remove_node+0x4d/0x320 [drm] [ 90.777573] Call Trace: [ 90.777653] intel_vgt_deballoon+0x4c/0x60 [i915] [ 90.777729] i915_ggtt_cleanup_hw+0x121/0x190 [i915] [ 90.777792] i915_driver_unload+0x145/0x180 [i915] [ 90.777856] i915_pci_remove+0x15/0x20 [i915] [ 90.777890] pci_device_remove+0x3b/0xc0 [ 90.777916] device_release_driver_internal+0x157/0x220 [ 90.777945] driver_detach+0x39/0x70 [ 90.777967] bus_remove_driver+0x51/0xd0 [ 90.777990] pci_unregister_driver+0x23/0x90 [ 90.778019] SyS_delete_module+0x1da/0x240 [ 90.778045] entry_SYSCALL_64_fastpath+0x24/0x87 [ 90.778072] RIP: 0033:0x7f34312af067 [ 90.778092] RSP: 002b:00007ffdea3da0d8 EFLAGS: 00000206 [ 90.778297] RIP: drm_mm_remove_node+0x4d/0x320 [drm] RSP: ffffaf39c0fe3dc0 [ 90.778344] ---[ end trace f4b1bc8305fc59dd ]---
Four drm_mm_node are used to reserve guest ggtt space, but some of them may be skipped and not initialised due to space constraints in intel_vgt_balloon(). If drm_mm_remove_node() is called with uninitialized drm_mm_node, the above call trace occurs.
This patch check drm_mm_node's validity before calling drm_mm_remove_node().
--- drivers/gpu/drm/i915/i915_vgpu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_vgpu.c +3 -0
@@ -101,6 +101,9 @@ static struct _balloon_info_ bl_info;static void vgt_deballoon_space (struct i915_ggtt *ggtt,struct drm_mm_node *node) { +if (!drm_mm_node_allocated (node)) +return ; + DRM_DEBUG_DRIVER("deballoon space: range [0x%llx - 0x%llx] %llu KiB.\n", node->start, node->start + node->size,
Greg Kroah-Hartman
maintainerPATCH 113/143 drm/i915: Call dma_set_max_seg_size() in i915_driver_hw_probe()
In reply to Greg Kroah-HartmanFrom: Lyude Paul <[email protected]>
commit 32f0a982650b123bdab36865617d3e03ebcacf3b upstream.
Currently, we don't call dma_set_max_seg_size() for i915 because we intentionally do not limit the segment length that the device supports. However, this results in a warning being emitted if we try to map anything larger than SZ_64K on a kernel with CONFIG_DMA_API_DEBUG_SG enabled:
[ 7.751926] DMA-API: i915 0000:00:02.0: mapping sg segment longer than device claims to support [len=98304] [max=65536] [ 7.751934] WARNING: CPU: 5 PID: 474 at kernel/dma/debug.c:1220
debug_dma_map_sg+0x20f/0x340
This was originally brought up on
https://bugs.freedesktop.org/show_bug.cgi?id=108517 , and the consensus there was it wasn't really useful to set a limit (and that dma-debug isn't really all that useful for i915 in the first place). Unfortunately though, CONFIG_DMA_API_DEBUG_SG is enabled in the debug configs for various distro kernels. Since a WARN_ON() will disable automatic problem reporting (and cause any CI with said option enabled to start complaining), we really should just fix the problem.
Note that as me and Chris Wilson discussed, the other solution for this would be to make DMA-API not make such assumptions when a driver hasn't explicitly set a maximum segment size. But, taking a look at the commit which originally introduced this behavior, commit 78c47830a5cb ("dma-debug: check scatterlist segments"), there is an explicit mention of this assumption and how it applies to devices with no segment size:
Conversely, devices which are less limited than the rather conservative defaults, or indeed have no limitations at all (e.g. GPUs with their own internal MMU), should be encouraged to set appropriate dma_parms, as they may get more efficient DMA mapping performance out of it.
So unless there's any concerns (I'm open to discussion!), let's just follow suite and call dma_set_max_seg_size() with UINT_MAX as our limit to silence any warnings.
Changes since v3:
* Drop patch for enabling CONFIG_DMA_API_DEBUG_SG in CI. It looks like just turning it on causes the kernel to spit out bogus WARN_ONs() during some igt tests which would otherwise require teaching igt to disable the various DMA-API debugging options causing this. This is too much work to be worth it, since DMA-API debugging is useless for us. So, we'll just settle with this single patch to squelch WARN_ONs() during driver load for users that have CONFIG_DMA_API_DEBUG_SG turned on for some reason.
* Move dma_set_max_seg_size() call into i915_driver_hw_probe() - Chris Wilson
--- drivers/gpu/drm/i915/i915_drv.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +6 -0
@@ -1569,6 +1569,12 @@ static int i915_driver_init_hw(struct drpci_set_master (pdev); +/* +* We don't have a max segment size, so set it to the max so sg's +* debugging layer doesn't complain +*/ +dma_set_max_seg_size (&pdev->dev,UINT_MAX ); +/* overlay on gen2 is broken and can't address above 1G */ if (IS_GEN (dev_priv,2 )) { ret =dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (30 ));
Greg Kroah-Hartman
maintainerPATCH 114/143 i2c: piix4: Fix port selection for AMD Family 16h Model 30h
In reply to Greg Kroah-HartmanFrom: Andrew Cooks <[email protected]>
commit c7c06a1532f3fe106687ac82a13492c6a619ff1c upstream.
Family 16h Model 30h SMBus controller needs the same port selection fix as described and fixed in commit 0fe16195f891 ("i2c: piix4: Fix SMBus port selection for AMD Family 17h chips")
commit 6befa3fde65f ("i2c: piix4: Support alternative port selection register") also fixed the port selection for Hudson2, but unfortunately this is not the exact same device and the AMD naming and PCI Device IDs aren't particularly helpful here.
The SMBus port selection register is common to the following Families and models, as documented in AMD's publicly available BIOS and Kernel Developer Guides:
50742 - Family 15h Model 60h-6Fh (PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) 55072 - Family 15h Model 70h-7Fh (PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) 52740 - Family 16h Model 30h-3Fh (PCI_DEVICE_ID_AMD_HUDSON2_SMBUS)
The Hudson2 PCI Device ID (PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) is shared between Bolton FCH and Family 16h Model 30h, but the location of the SmBus0Sel port selection bits are different:
51192 - Bolton Register Reference Guide
We distinguish between Bolton and Family 16h Model 30h using the PCI Revision ID:
Bolton is device 0x780b, revision 0x15
Family 16h Model 30h is device 0x780b, revision 0x1F Family 15h Model 60h and 70h are both device 0x790b, revision 0x4A.
The following additional public AMD BKDG documents were checked and do not share the same port selection register:
42301 - Family 15h Model 00h-0Fh doesn't mention any 42300 - Family 15h Model 10h-1Fh doesn't mention any 49125 - Family 15h Model 30h-3Fh doesn't mention any
48751 - Family 16h Model 00h-0Fh uses the previously supported
index register SB800_PIIX4_PORT_IDX_ALT at 0x2e
--- drivers/i2c/busses/i2c-piix4.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/i2c/busses/i2c-piix4.c +5 -7
@@ -91,7 +91,7 @@#define SB800_PIIX4_PORT_IDX_MASK 0x06#define SB800_PIIX4_PORT_IDX_SHIFT 1 -/* On kerncz, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */ +/* On kerncz and Hudson2, SmBus0Sel is at bit 20:19 of PMx00 DecodeEn */ #define SB800_PIIX4_PORT_IDX_KERNCZ 0x02#define SB800_PIIX4_PORT_IDX_MASK_KERNCZ 0x18#define SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ 3
@@ -358,18 +358,16 @@ static int piix4_setup_sb800(struct pci_/* Find which register is used for port selection */ if (PIIX4_dev->vendor ==PCI_VENDOR_ID_AMD || PIIX4_dev->vendor ==PCI_VENDOR_ID_HYGON ) { -switch (PIIX4_dev->device) { -case PCI_DEVICE_ID_AMD_KERNCZ_SMBUS : +if (PIIX4_dev->device ==PCI_DEVICE_ID_AMD_KERNCZ_SMBUS || + (PIIX4_dev->device ==PCI_DEVICE_ID_AMD_HUDSON2_SMBUS && + PIIX4_dev->revision >=0x1F )) { piix4_port_sel_sb800 =SB800_PIIX4_PORT_IDX_KERNCZ ; piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK_KERNCZ ; piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT_KERNCZ ; -break ; -case PCI_DEVICE_ID_AMD_HUDSON2_SMBUS : -default : + }else { piix4_port_sel_sb800 =SB800_PIIX4_PORT_IDX_ALT ; piix4_port_mask_sb800 =SB800_PIIX4_PORT_IDX_MASK ; piix4_port_shift_sb800 =SB800_PIIX4_PORT_IDX_SHIFT ; -break ; } } else { if (!request_muxed_region(SB800_PIIX4_SMB_IDX, 2,
Greg Kroah-Hartman
maintainerPATCH 115/143 bus: hisi_lpc: Unregister logical PIO range to avoid potential use-after-free
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
commit 1b15a5632a809ab57d403fd972ca68785363b654 upstream.
If, after registering a logical PIO range, the driver probe later fails, the logical PIO range memory will be released automatically.
This causes an issue, in that the logical PIO range is not unregistered and the released range memory may be later referenced.
Fix by unregistering the logical PIO range.
And since we now unregister the logical PIO range for probe failure, avoid the special ordering of setting logical PIO range ops, which was the previous (poor) attempt at a safeguard against this.
--- drivers/bus/hisi_lpc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/bus/hisi_lpc.c +6 -5
@@ -606,24 +606,25 @@ static int hisi_lpc_probe(struct platfor range->fwnode = dev->fwnode; range->flags =LOGIC_PIO_INDIRECT ; range->size =PIO_INDIRECT_SIZE ; + range->hostdata = lpcdev; + range->ops = &hisi_lpc_ops; + lpcdev->io_host = range; ret =logic_pio_register_range (range);if (ret) {dev_err (dev,"register IO range failed (%d)!\n" , ret);return ret; } - lpcdev->io_host = range;/* register the LPC host PIO resources */ if (acpi_device) ret =hisi_lpc_acpi_probe (dev);else ret =of_platform_populate (dev->of_node,NULL ,NULL , dev); -if (ret) +if (ret) { +logic_pio_unregister_range (range);return ret; - - lpcdev->io_host->hostdata = lpcdev; - lpcdev->io_host->ops = &hisi_lpc_ops; + } io_end = lpcdev->io_host->io_start + lpcdev->io_host->size; dev_info(dev, "registered range [%pa - %pa]\n",
Greg Kroah-Hartman
maintainerPATCH 116/143 bus: hisi_lpc: Add .remove method to avoid driver unbind crash
In reply to Greg Kroah-HartmanFrom: John Garry <[email protected]>
commit 10e62b47973b0b0ceda076255bcb147b83e20517 upstream.
The original driver author seemed to be under the impression that a driver cannot be removed if it does not have a .remove method. Or maybe if it is a built-in platform driver.
This is not true. This crash can be created:
root@ubuntu:/sys/bus/platform/drivers/hisi-lpc# echo HISI0191\:00 > unbind root@ubuntu:/sys/bus/platform/drivers/hisi-lpc# ipmitool raw 6 1 Unable to handle kernel paging request at virtual address ffff000010035010 Mem abort info: ESR = 0x96000047 Exception class = DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 Data abort info: ISV = 0, ISS = 0x00000047 CM = 0, WnR = 1 swapper pgtable: 4k pages, 48-bit VAs, pgdp=000000000118b000 [ffff000010035010] pgd=0000041ffbfff003, pud=0000041ffbffe003, pmd=0000041ffbffd003, pte=0000000000000000 Internal error: Oops: 96000047 [#1] PREEMPT SMP Modules linked in: CPU: 17 PID: 1473 Comm: ipmitool Not tainted 5.2.0-rc5-00003-gf68c53b414a3-dirty #198 Hardware name: Huawei Taishan 2280 /D05, BIOS Hisilicon D05 IT21 Nemo 2.0 RC0 04/18/2018 pstate: 20000085 (nzCv daIf -PAN -UAO) pc : hisi_lpc_target_in+0x7c/0x120 lr : hisi_lpc_target_in+0x70/0x120 sp : ffff00001efe3930 x29: ffff00001efe3930 x28: ffff841f9f599200 x27: 0000000000000002 x26: 0000000000000000 x25: 0000000000000080 x24: 00000000000000e4 x23: 0000000000000000 x22: 0000000000000064 x21: ffff801fb667d280 x20: 0000000000000001 x19: ffff00001efe39ac x18: 0000000000000000 x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000000 x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000000 x8 : ffff841febe60340 x7 : ffff801fb55c52e8 x6 : 0000000000000000 x5 : 0000000000ffc0e3 x4 : 0000000000000001 x3 : ffff801fb667d280 x2 : 0000000000000001 x1 : ffff000010035010 x0 : ffff000010035000 Call trace: hisi_lpc_target_in+0x7c/0x120 hisi_lpc_comm_in+0x88/0x98 logic_inb+0x5c/0xb8 port_inb+0x18/0x20 bt_event+0x38/0x808 smi_event_handler+0x4c/0x5a0 check_start_timer_thread.part.4+0x40/0x58 sender+0x78/0x88 smi_send.isra.6+0x94/0x108 i_ipmi_request+0x2c4/0x8f8 ipmi_request_settime+0x124/0x160 handle_send_req+0x19c/0x208 ipmi_ioctl+0x2c0/0x990 do_vfs_ioctl+0xb8/0x8f8 ksys_ioctl+0x80/0xb8 __arm64_sys_ioctl+0x1c/0x28 el0_svc_common.constprop.0+0x64/0x160 el0_svc_handler+0x28/0x78 el0_svc+0x8/0xc Code: 941d1511 aa0003f9 f94006a0 91004001 (b9000034) ---[ end trace aa842b86af7069e4 ]---
The problem here is that the host goes away but the associated logical PIO region remains registered, as do the children devices.
Fix by adding a .remove method to tidy-up by removing the child devices and unregistering the logical PIO region.
--- drivers/bus/hisi_lpc.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
drivers/bus/hisi_lpc.c +36 -2
@@ -456,6 +456,17 @@ struct hisi_lpc_acpi_cell {size_t pdata_size; }; +static void hisi_lpc_acpi_remove (struct device *hostdev) +{ +struct acpi_device *adev =ACPI_COMPANION (hostdev); +struct acpi_device *child; + +device_for_each_child (hostdev,NULL , hisi_lpc_acpi_remove_subdev); + +list_for_each_entry (child, &adev->children, node) +acpi_device_clear_enumerated (child); +} +/* * hisi_lpc_acpi_probe - probe children for ACPI FW * @hostdev: LPC host device pointer
@@ -555,8 +566,7 @@ static int hisi_lpc_acpi_probe(struct dereturn 0 ; fail: -device_for_each_child (hostdev,NULL , - hisi_lpc_acpi_remove_subdev); +hisi_lpc_acpi_remove (hostdev);return ret; }
@@ -569,6 +579,10 @@ static int hisi_lpc_acpi_probe(struct de {return -ENODEV ; } + +static void hisi_lpc_acpi_remove (struct device *hostdev) +{ +}#endif // CONFIG_ACPI /*
@@ -626,6 +640,8 @@ static int hisi_lpc_probe(struct platforreturn ret; } +dev_set_drvdata (dev, lpcdev); + io_end = lpcdev->io_host->io_start + lpcdev->io_host->size;dev_info (dev,"registered range [%pa - %pa]\n" , &lpcdev->io_host->io_start, &io_end);
@@ -633,6 +649,23 @@ static int hisi_lpc_probe(struct platforreturn ret; } +static int hisi_lpc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct acpi_device *acpi_device =ACPI_COMPANION (dev); +struct hisi_lpc_dev *lpcdev =dev_get_drvdata (dev); +struct logic_pio_hwaddr *range = lpcdev->io_host; + +if (acpi_device) +hisi_lpc_acpi_remove (dev); +else +of_platform_depopulate (dev); + +logic_pio_unregister_range (range); + +return 0 ; +} +static const struct of_device_id hisi_lpc_of_match[] = { { .compatible ="hisilicon,hip06-lpc" , }, { .compatible ="hisilicon,hip07-lpc" , },
@@ -646,5 +679,6 @@ static struct platform_driver hisi_lpc_d .acpi_match_table = ACPI_PTR(hisi_lpc_acpi_match), }, .probe = hisi_lpc_probe, + .remove = hisi_lpc_remove, };builtin_platform_driver (hisi_lpc_driver);
Greg Kroah-Hartman
maintainerPATCH 117/143 VMCI: Release resource if the work is already queued
In reply to Greg Kroah-HartmanFrom: Nadav Amit <[email protected]>
commit ba03a9bbd17b149c373c0ea44017f35fc2cd0f28 upstream.
Francois reported that VMware balloon gets stuck after a balloon reset, when the VMCI doorbell is removed. A similar error can occur when the balloon driver is removed with the following splat:
[ 1088.622000] INFO: task modprobe:3565 blocked for more than 120 seconds. [ 1088.622035] Tainted: G W 5.2.0 #4 [ 1088.622087] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1088.622205] modprobe D 0 3565 1450 0x00000000 [ 1088.622210] Call Trace: [ 1088.622246] __schedule+0x2a8/0x690 [ 1088.622248] schedule+0x2d/0x90 [ 1088.622250] schedule_timeout+0x1d3/0x2f0 [ 1088.622252] wait_for_completion+0xba/0x140 [ 1088.622320] ? wake_up_q+0x80/0x80 [ 1088.622370] vmci_resource_remove+0xb9/0xc0 [vmw_vmci] [ 1088.622373] vmci_doorbell_destroy+0x9e/0xd0 [vmw_vmci] [ 1088.622379] vmballoon_vmci_cleanup+0x6e/0xf0 [vmw_balloon] [ 1088.622381] vmballoon_exit+0x18/0xcc8 [vmw_balloon] [ 1088.622394] __x64_sys_delete_module+0x146/0x280 [ 1088.622408] do_syscall_64+0x5a/0x130 [ 1088.622410] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [ 1088.622415] RIP: 0033:0x7f54f62791b7 [ 1088.622421] Code: Bad RIP value. [ 1088.622421] RSP: 002b:00007fff2a949008 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0 [ 1088.622426] RAX: ffffffffffffffda RBX: 000055dff8b55d00 RCX: 00007f54f62791b7 [ 1088.622426] RDX: 0000000000000000 RSI: 0000000000000800 RDI: 000055dff8b55d68 [ 1088.622427] RBP: 000055dff8b55d00 R08: 00007fff2a947fb1 R09: 0000000000000000 [ 1088.622427] R10: 00007f54f62f5cc0 R11: 0000000000000206 R12: 000055dff8b55d68 [ 1088.622428] R13: 0000000000000001 R14: 000055dff8b55d68 R15: 00007fff2a94a3f0
The cause for the bug is that when the "delayed" doorbell is invoked, it takes a reference on the doorbell entry and schedules work that is supposed to run the appropriate code and drop the doorbell entry reference. The code ignores the fact that if the work is already queued, it will not be scheduled to run one more time. As a result one of the references would not be dropped. When the code waits for the reference to get to zero, during balloon reset or module removal, it gets stuck.
Fix it. Drop the reference if schedule_work() indicates that the work is already queued.
Note that this bug got more apparent (or apparent at all) due to commit ce664331b248 ("vmw_balloon: VMCI_DOORBELL_SET does not check status").
--- drivers/misc/vmw_vmci/vmci_doorbell.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/misc/vmw_vmci/vmci_doorbell.c +4 -2
@@ -310,7 +310,8 @@ int vmci_dbell_host_context_notify(u32 s entry = container_of(resource, struct dbell_entry, resource);if (entry->run_delayed) { -schedule_work (&entry->work); +if (!schedule_work (&entry->work)) +vmci_resource_put (resource); }else { entry->notify_cb (entry->client_data);vmci_resource_put (resource);
@@ -361,7 +362,8 @@ static void dbell_fire_entries(u32 notif atomic_read(&dbell->active) == 1) {if (dbell->run_delayed) {vmci_resource_get (&dbell->resource); -schedule_work (&dbell->work); +if (!schedule_work (&dbell->work)) +vmci_resource_put (&dbell->resource); }else { dbell->notify_cb (dbell->client_data); }
Greg Kroah-Hartman
maintainerPATCH 118/143 crypto: ccp - Ignore unconfigured CCP device on suspend/resume
In reply to Greg Kroah-HartmanFrom: Gary R Hook <[email protected]>
commit 5871cd93692c8071fb9358daccb715b5081316ac upstream.
If a CCP is unconfigured (e.g. there are no available queues) then there will be no data structures allocated for the device. Thus, we must check for validity of a pointer before trying to access structure members.
--- drivers/crypto/ccp/ccp-dev.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/crypto/ccp/ccp-dev.c +8 -0
@@ -540,6 +540,10 @@ int ccp_dev_suspend(struct sp_device *spunsigned long flags;unsigned int i; +/* If there's no device there's nothing to do */ +if (!ccp) +return 0 ; +spin_lock_irqsave (&ccp->cmd_lock, flags); ccp->suspending =1 ;
@@ -564,6 +568,10 @@ int ccp_dev_resume(struct sp_device *sp)unsigned long flags;unsigned int i; +/* If there's no device there's nothing to do */ +if (!ccp) +return 0 ; +spin_lock_irqsave (&ccp->cmd_lock, flags); ccp->suspending =0 ;
Greg Kroah-Hartman
maintainerPATCH 119/143 SUNRPC: Dont handle errors if the bind/connect succeeded
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
commit bd736ed3e2d1088d9b4050f727342e1e619c3841 upstream.
Don't handle errors in call_bind_status()/call_connect_status() if it turns out that a previous call caused it to succeed.
--- net/sunrpc/clnt.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-)
net/sunrpc/clnt.c +24 -11
@@ -1893,6 +1893,7 @@ call_bind(struct rpc_task *task)static void call_bind_status (struct rpc_task *task) { +struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;int status = -EIO ;if (rpc_task_transmitted (task)) {
@@ -1900,14 +1901,15 @@ call_bind_status(struct rpc_task *task)return ; } -if (task->tk_status >=0 ) { -dprint_status (task); +dprint_status (task); +trace_rpc_bind_status (task); +if (task->tk_status >=0 ) + goto out_next; +if (xprt_bound (xprt)) { task->tk_status =0 ; - task->tk_action = call_connect; -return ; + goto out_next; } -trace_rpc_bind_status (task);switch (task->tk_status) {case -ENOMEM :dprintk ("RPC: %5u rpcbind out of memory\n" , task->tk_pid);
@@ -1966,7 +1968,9 @@ call_bind_status(struct rpc_task *task)rpc_call_rpcerror (task, status);return ; - +out_next: + task->tk_action = call_connect; +return ; retry_timeout: task->tk_status =0 ; task->tk_action = call_bind;
@@ -2013,6 +2017,7 @@ call_connect(struct rpc_task *task)static void call_connect_status (struct rpc_task *task) { +struct rpc_xprt *xprt = task->tk_rqstp->rq_xprt;struct rpc_clnt *clnt = task->tk_client;int status = task->tk_status;
@@ -2022,8 +2027,17 @@ call_connect_status(struct rpc_task *tas }dprint_status (task); -trace_rpc_connect_status (task); + +if (task->tk_status ==0 ) { + clnt->cl_stats->netreconn++; + goto out_next; + } +if (xprt_connected (xprt)) { + task->tk_status =0 ; + goto out_next; + } + task->tk_status =0 ;switch (status) {case -ECONNREFUSED :
@@ -2054,13 +2068,12 @@ call_connect_status(struct rpc_task *tascase -EAGAIN :case -ETIMEDOUT : goto out_retry; -case 0 : - clnt->cl_stats->netreconn++; - task->tk_action = call_transmit; -return ; }rpc_call_rpcerror (task, status);return ; +out_next: + task->tk_action = call_transmit; +return ; out_retry:/* Check for timeouts before looping back to call_bind */ task->tk_action = call_bind;
Greg Kroah-Hartman
maintainerPATCH 120/143 mt76: mt76x0u: do not reset radio on resume
In reply to Greg Kroah-HartmanFrom: Stanislaw Gruszka <[email protected]>
commit 8f2d163cb26da87e7d8e1677368b8ba1ba4d30b3 upstream.
On some machines mt76x0u firmware can hung during resume, what result on messages like below:
[ 475.480062] mt76x0 1-8:1.0: Error: MCU response pre-completed! [ 475.990066] mt76x0 1-8:1.0: Error: send MCU cmd failed:-110 [ 475.990075] mt76x0 1-8:1.0: Error: MCU response pre-completed! [ 476.500003] mt76x0 1-8:1.0: Error: send MCU cmd failed:-110 [ 476.500012] mt76x0 1-8:1.0: Error: MCU response pre-completed! [ 477.010046] mt76x0 1-8:1.0: Error: send MCU cmd failed:-110 [ 477.010055] mt76x0 1-8:1.0: Error: MCU response pre-completed! [ 477.529997] mt76x0 1-8:1.0: Error: send MCU cmd failed:-110 [ 477.530006] mt76x0 1-8:1.0: Error: MCU response pre-completed! [ 477.824907] mt76x0 1-8:1.0: Error: send MCU cmd failed:-71 [ 477.824916] mt76x0 1-8:1.0: Error: MCU response pre-completed! [ 477.825029] usb 1-8: USB disconnect, device number 6
and possible whole system freeze.
This can be avoided, if we do not perform mt76x0_chip_onoff() reset.
--- drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +4 -4
@@ -136,11 +136,11 @@ static const struct ieee80211_ops mt76x0 .release_buffered_frames = mt76_release_buffered_frames, }; -static int mt76x0u_init_hardware (struct mt76x02_dev *dev) +static int mt76x0u_init_hardware (struct mt76x02_dev *dev,bool reset) {int err; -mt76x0_chip_onoff (dev, true, true); +mt76x0_chip_onoff (dev, true, reset);if (!mt76x02_wait_for_mac (&dev->mt76))return -ETIMEDOUT ;
@@ -173,7 +173,7 @@ static int mt76x0u_register_device(strucif (err <0 ) goto out_err; - err =mt76x0u_init_hardware (dev); + err =mt76x0u_init_hardware (dev, true);if (err <0 ) goto out_err;
@@ -309,7 +309,7 @@ static int __maybe_unused mt76x0_resume(if (ret <0 ) goto err; - ret =mt76x0u_init_hardware (dev); + ret =mt76x0u_init_hardware (dev, false);if (ret) goto err;
Greg Kroah-Hartman
maintainerPATCH 121/143 mms: sdhci-sprd: add SDHCI_QUIRK_BROKEN_CARD_DETECTION
In reply to Greg Kroah-HartmanFrom: Chunyan Zhang <[email protected]>
commit 4324e54bbea0107b054336f20075a26939b2bd51 upstream.
sprd's sd host controller doesn't support detection to card insert or remove.
--- drivers/mmc/host/sdhci-sprd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sprd.c +2 -1
@@ -319,7 +319,8 @@ static void sdhci_sprd_request(struct mm }static const struct sdhci_pltfm_data sdhci_sprd_pdata = { - .quirks =SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK , + .quirks =SDHCI_QUIRK_BROKEN_CARD_DETECTION | +SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK , .quirks2 =SDHCI_QUIRK2_BROKEN_HS200 |SDHCI_QUIRK2_USE_32BIT_BLK_CNT |SDHCI_QUIRK2_PRESET_VALUE_BROKEN ,
Greg Kroah-Hartman
maintainerPATCH 122/143 mm, memcg: partially revert "mm/memcontrol.c: keep local VM counters in sync with the hierarchical ones"
In reply to Greg Kroah-HartmanFrom: Roman Gushchin <[email protected]>
commit b4c46484dc3fa3721d68fdfae85c1d7b1f6b5472 upstream.
Commit 766a4c19d880 ("mm/memcontrol.c: keep local VM counters in sync with the hierarchical ones") effectively decreased the precision of per-memcg vmstats_local and per-memcg-per-node lruvec percpu counters.
That's good for displaying in memory.stat, but brings a serious regression into the reclaim process.
One issue I've discovered and debugged is the following:lruvec_lru_size() can return 0 instead of the actual number of pages in the lru list, preventing the kernel to reclaim last remaining pages. Result is yet another dying memory cgroups flooding. The opposite is also happening: scanning an empty lru list is the waste of cpu time.
Also, inactive_list_is_low() can return incorrect values, preventing the active lru from being scanned and freed. It can fail both because the size of active and inactive lists are inaccurate, and because the number of workingset refaults isn't precise. In other words, the result is pretty random.
I'm not sure, if using the approximate number of slab pages in count_shadow_number() is acceptable, but issues described above are enough to partially revert the patch.
Let's keep per-memcg vmstat_local batched (they are only used for displaying stats to the userspace), but keep lruvec stats precise. This change fixes the dead memcg flooding on my setup.
--- mm/memcontrol.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
mm/memcontrol.c +3 -5
@@ -748,15 +748,13 @@ void __mod_lruvec_state(struct lruvec *l/* Update memcg */ __mod_memcg_state (memcg, idx, val); +/* Update lruvec */ +__this_cpu_add (pn->lruvec_stat_local->count[idx], val); + x = val +__this_cpu_read (pn->lruvec_stat_cpu->count[idx]);if (unlikely (abs (x) >MEMCG_CHARGE_BATCH )) {struct mem_cgroup_per_node *pi; -/* -* Batch local counters to keep them in sync with -* the hierarchical ones. -*/ -__this_cpu_add (pn->lruvec_stat_local->count[idx], x);for (pi = pn; pi; pi =parent_nodeinfo (pi, pgdat->node_id))atomic_long_add (x, &pi->lruvec_stat[idx]); x =0 ;
Greg Kroah-Hartman
maintainerPATCH 123/143 mm: memcontrol: fix percpu vmstats and vmevents flush
In reply to Greg Kroah-HartmanFrom: Shakeel Butt <[email protected]>
commit 6c1c280805ded72eceb2afc1a0d431b256608554 upstream.
Instead of using raw_cpu_read() use per_cpu() to read the actual data of the corresponding cpu otherwise we will be reading the data of the current cpu for the number of online CPUs.
--- mm/memcontrol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
mm/memcontrol.c +5 -5
@@ -3159,7 +3159,7 @@ static void memcg_flush_percpu_vmstats(sfor_each_online_cpu (cpu)for (i =0 ; i <MEMCG_NR_STAT ; i++) - stat[i] +=raw_cpu_read (memcg->vmstats_percpu->stat[i]); + stat[i] +=per_cpu (memcg->vmstats_percpu->stat[i], cpu);for (mi = memcg; mi; mi =parent_mem_cgroup (mi))for (i =0 ; i <MEMCG_NR_STAT ; i++)
@@ -3174,8 +3174,8 @@ static void memcg_flush_percpu_vmstats(sfor_each_online_cpu (cpu)for (i =0 ; i <NR_VM_NODE_STAT_ITEMS ; i++) - stat[i] +=raw_cpu_read ( - pn->lruvec_stat_cpu->count[i]); + stat[i] +=per_cpu ( + pn->lruvec_stat_cpu->count[i], cpu);for (pi = pn; pi; pi =parent_nodeinfo (pi, node))for (i =0 ; i <NR_VM_NODE_STAT_ITEMS ; i++)
@@ -3194,8 +3194,8 @@ static void memcg_flush_percpu_vmevents(for_each_online_cpu (cpu)for (i =0 ; i <NR_VM_EVENT_ITEMS ; i++) - events[i] +=raw_cpu_read ( - memcg->vmstats_percpu->events[i]); + events[i] +=per_cpu (memcg->vmstats_percpu->events[i], + cpu);for (mi = memcg; mi; mi =parent_mem_cgroup (mi))for (i =0 ; i <NR_VM_EVENT_ITEMS ; i++)
Greg Kroah-Hartman
maintainerPATCH 124/143 Revert "cfg80211: fix processing world regdomain when non modular"
In reply to Greg Kroah-HartmanFrom: Hodaszi, Robert <[email protected]>
commit 0d31d4dbf38412f5b8b11b4511d07b840eebe8cb upstream.
This reverts commit 96cce12ff6e0 ("cfg80211: fix processing world regdomain when non modular").
Re-triggering a reg_process_hint with the last request on all events, can make the regulatory domain fail in case of multiple WiFi modules. On slower boards (espacially with mdev), enumeration of the WiFi modules can end up in an intersected regulatory domain, and user cannot set it with 'iw reg set' anymore.
This is happening, because:
- 1st module enumerates, queues up a regulatory request
- request gets processed by __reg_process_hint_driver():
- checks if previous was set by CORE -> yes
- checks if regulator domain changed -> yes, from '00' to e.g. 'US' -> sends request to the 'crda'
- 2nd module enumerates, queues up a regulator request (which triggers the reg_todo() work)
- reg_todo() -> reg_process_pending_hints() sees, that the last request is not processed yet, so it tries to process it again. __reg_process_hint driver() will run again, and:
- checks if the last request's initiator was the core -> no, it was the driver (1st WiFi module)
- checks, if the previous initiator was the driver -> yes
- checks if the regulator domain changed -> yes, it was '00' (set by core, and crda call did not return yet), and should be changed to 'US'
------> __reg_process_hint_driver calls an intersect
Besides, the reg_process_hint call with the last request is meaningless since the crda call has a timeout work. If that timeout expires, the first module's request will lost.
--- net/wireless/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/reg.c +1 -1
@@ -2788,7 +2788,7 @@ static void reg_process_pending_hints(vo/* When last_request->processed becomes true this will be rescheduled */ if (lr && !lr->processed) { -reg_process_hint (lr); +pr_debug ("Pending regulatory request, waiting for it to be processed...\n" );return ; }
Greg Kroah-Hartman
maintainerPATCH 125/143 mac80211: fix possible sta leak
In reply to Greg Kroah-HartmanFrom: Johannes Berg <[email protected]>
commit 5fd2f91ad483baffdbe798f8a08f1b41442d1e24 upstream.
If TDLS station addition is rejected, the sta memory is leaked. Avoid this by moving the check before the allocation.
--- net/mac80211/cfg.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/mac80211/cfg.c +5 -4
@@ -1543,6 +1543,11 @@ static int ieee80211_add_station(structif (is_multicast_ether_addr (mac))return -EINVAL ; +if (params->sta_flags_set &BIT (NL80211_STA_FLAG_TDLS_PEER ) && + sdata->vif.type ==NL80211_IFTYPE_STATION && + !sdata->u.mgd.associated) +return -EINVAL ; + sta =sta_info_alloc (sdata, mac,GFP_KERNEL );if (!sta)return -ENOMEM ;
@@ -1550,10 +1555,6 @@ static int ieee80211_add_station(structif (params->sta_flags_set &BIT (NL80211_STA_FLAG_TDLS_PEER )) sta->sta.tdls = true; -if (sta->sta.tdls && sdata->vif.type ==NL80211_IFTYPE_STATION && - !sdata->u.mgd.associated) -return -EINVAL ; - err =sta_apply_parameters (local, sta, params);if (err) {sta_info_free (local, sta);
Greg Kroah-Hartman
maintainerPATCH 126/143 cfg80211: Fix Extended Key ID key install checks
In reply to Greg Kroah-HartmanFrom: Alexander Wetzel <[email protected]>
commit b67fd72e84a88cae64cea8ab47ccdaab3bb3094d upstream.
Fix two shortcomings in the Extended Key ID API:
1) Allow the userspace to install pairwise keys using keyid 1 without NL80211_KEY_NO_TX set. This allows the userspace to install and activate pairwise keys with keyid 1 in the same way as for keyid 0, simplifying the API usage for e.g. FILS and FT key installs.
2) IEEE 802.11 - 2016 restricts Extended Key ID usage to CCMP/GCMP ciphers in IEEE 802.11 - 2016 "9.4.2.25.4 RSN capabilities". Enforce that when installing a key.
--- net/wireless/util.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
net/wireless/util.c +14 -9
@@ -233,25 +233,30 @@ int cfg80211_validate_key_settings(strucswitch (params->cipher) {case WLAN_CIPHER_SUITE_TKIP : +/* Extended Key ID can only be used with CCMP/GCMP ciphers */ +if ((pairwise && key_idx) || + params->mode !=NL80211_KEY_RX_TX ) +return -EINVAL ; +break ;case WLAN_CIPHER_SUITE_CCMP :case WLAN_CIPHER_SUITE_CCMP_256 :case WLAN_CIPHER_SUITE_GCMP :case WLAN_CIPHER_SUITE_GCMP_256 : -/* IEEE802.11-2016 allows only 0 and - when using Extended Key -* ID - 1 as index for pairwise keys. +/* IEEE802.11-2016 allows only 0 and - when supporting +* Extended Key ID - 1 as index for pairwise keys. * @NL80211_KEY_NO_TX is only allowed for pairwise keys when * the driver supports Extended Key ID. * @NL80211_KEY_SET_TX can't be set when installing and * validating a key. */ -if (params->mode ==NL80211_KEY_NO_TX ) { -if (!wiphy_ext_feature_isset (&rdev->wiphy, -NL80211_EXT_FEATURE_EXT_KEY_ID )) -return -EINVAL ; -else if (!pairwise || key_idx <0 || key_idx >1 ) +if ((params->mode ==NL80211_KEY_NO_TX && !pairwise) || + params->mode ==NL80211_KEY_SET_TX ) +return -EINVAL ; +if (wiphy_ext_feature_isset (&rdev->wiphy, +NL80211_EXT_FEATURE_EXT_KEY_ID )) { +if (pairwise && (key_idx <0 || key_idx >1 ))return -EINVAL ; - }else if ((pairwise && key_idx) || - params->mode ==NL80211_KEY_SET_TX ) { + }else if (pairwise && key_idx) {return -EINVAL ; }break ;
Greg Kroah-Hartman
maintainerPATCH 127/143 mac80211: Dont memset RXCB prior to PAE intercept
In reply to Greg Kroah-HartmanFrom: Denis Kenzior <[email protected]>
commit c8a41c6afa27b8c3f61622dfd882b912da9d6721 upstream.
In ieee80211_deliver_skb_to_local_stack intercepts EAPoL frames if mac80211 is configured to do so and forwards the contents over nl80211. During this process some additional data is also forwarded, including whether the frame was received encrypted or not. Unfortunately just prior to the call to ieee80211_deliver_skb_to_local_stack, skb->cb is cleared, resulting in incorrect data being exposed over nl80211.
--- net/mac80211/rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mac80211/rx.c +2 -2
@@ -2452,6 +2452,8 @@ static void ieee80211_deliver_skb_to_loccfg80211_rx_control_port (dev, skb, noencrypt);dev_kfree_skb (skb); }else { +memset (skb->cb,0 ,sizeof (skb->cb)); +/* deliver to local stack */ if (rx->napi)napi_gro_receive (rx->napi, skb);
@@ -2546,8 +2548,6 @@ ieee80211_deliver_skb(struct ieee80211_rif (skb) { skb->protocol =eth_type_trans (skb, dev); -memset (skb->cb,0 ,sizeof (skb->cb)); -ieee80211_deliver_skb_to_local_stack (skb, rx); }
Greg Kroah-Hartman
maintainerPATCH 128/143 mac80211: Correctly set noencrypt for PAE frames
In reply to Greg Kroah-HartmanFrom: Denis Kenzior <[email protected]>
commit f8b43c5cf4b62a19f2210a0f5367b84e1eff1ab9 upstream.
The noencrypt flag was intended to be set if the "frame was received unencrypted" according to include/uapi/linux/nl80211.h. However, the current behavior is opposite of this.
--- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rx.c +1 -1
@@ -2447,7 +2447,7 @@ static void ieee80211_deliver_skb_to_loc skb->protocol == cpu_to_be16(ETH_P_PREAUTH)) && sdata->control_port_over_nl80211)) {struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb); -bool noencrypt = status->flag &RX_FLAG_DECRYPTED ; +bool noencrypt = !(status->flag &RX_FLAG_DECRYPTED );cfg80211_rx_control_port (dev, skb, noencrypt);dev_kfree_skb (skb);
Greg Kroah-Hartman
maintainerPATCH 129/143 mmc: sdhci-sprd: clear the UHS-I modes read from registers
In reply to Greg Kroah-Hartman[ Upstream commit 2f765c175e1d1acae911f889e71e5933c6488929 ]
sprd's sd host controller supports SDR50/SDR104/DDR50 though, the UHS-I mode used by the specific card can be selected via devicetree only.
--- drivers/mmc/host/sdhci-sprd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sprd.c +12 -1
@@ -320,7 +320,8 @@ static void sdhci_sprd_request(struct mmc_host *mmc, struct mmc_request *mrq)static const struct sdhci_pltfm_data sdhci_sprd_pdata = { .quirks =SDHCI_QUIRK_BROKEN_CARD_DETECTION | -SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK , +SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | +SDHCI_QUIRK_MISSING_CAPS , .quirks2 =SDHCI_QUIRK2_BROKEN_HS200 |SDHCI_QUIRK2_USE_32BIT_BLK_CNT |SDHCI_QUIRK2_PRESET_VALUE_BROKEN ,
@@ -389,6 +390,16 @@ static int sdhci_sprd_probe(struct platform_device *pdev)sdhci_enable_v4_mode (host); +/* +* Supply the existing CAPS, but clear the UHS-I modes. This +* will allow these modes to be specified only by device +* tree properties through mmc_of_parse(). +*/ + host->caps =sdhci_readl (host,SDHCI_CAPABILITIES ); + host->caps1 =sdhci_readl (host,SDHCI_CAPABILITIES_1 ); + host->caps1 &= ~(SDHCI_SUPPORT_SDR50 |SDHCI_SUPPORT_SDR104 | +SDHCI_SUPPORT_DDR50 ); + ret =sdhci_setup_host (host);if (ret) goto pm_runtime_disable;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/143 mmc: sdhci-sprd: Implement the get_max_timeout_count() interface
In reply to Greg Kroah-Hartman[ Upstream commit 7486831d7d6aebcf851f9a4bbe65080351d5c9fb ]
Implement the get_max_timeout_count() interface to set the Spredtrum SD host controller actual maximum timeout count.
--- drivers/mmc/host/sdhci-sprd.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/mmc/host/sdhci-sprd.c +7 -0
@@ -285,6 +285,12 @@ static void sdhci_sprd_hw_reset(struct sdhci_host *host)usleep_range (300 ,500 ); } +static unsigned int sdhci_sprd_get_max_timeout_count (struct sdhci_host *host) +{ +/* The Spredtrum controller actual maximum timeout count is 1 << 31 */ +return 1 <<31 ; +} +static struct sdhci_ops sdhci_sprd_ops = { .read_l = sdhci_sprd_readl, .write_l = sdhci_sprd_writel,
@@ -296,6 +302,7 @@ static struct sdhci_ops sdhci_sprd_ops = { .reset = sdhci_reset, .set_uhs_signaling = sdhci_sprd_set_uhs_signaling, .hw_reset = sdhci_sprd_hw_reset, + .get_max_timeout_count = sdhci_sprd_get_max_timeout_count, };static void sdhci_sprd_request (struct mmc_host *mmc,struct mmc_request *mrq)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/143 mmc: sdhci-sprd: add get_ro hook function
In reply to Greg Kroah-Hartman[ Upstream commit 4eae8cbdff942a423926486be4e781a77d619966 ]
sprd's sd host controller doesn't support write protect to sd card.
--- drivers/mmc/host/sdhci-sprd.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mmc/host/sdhci-sprd.c +6 -0
@@ -291,6 +291,11 @@ static unsigned int sdhci_sprd_get_max_timeout_count(struct sdhci_host *host)return 1 <<31 ; } +static unsigned int sdhci_sprd_get_ro (struct sdhci_host *host) +{ +return 0 ; +} +static struct sdhci_ops sdhci_sprd_ops = { .read_l = sdhci_sprd_readl, .write_l = sdhci_sprd_writel,
@@ -303,6 +308,7 @@ static struct sdhci_ops sdhci_sprd_ops = { .set_uhs_signaling = sdhci_sprd_set_uhs_signaling, .hw_reset = sdhci_sprd_hw_reset, .get_max_timeout_count = sdhci_sprd_get_max_timeout_count, + .get_ro = sdhci_sprd_get_ro, };static void sdhci_sprd_request (struct mmc_host *mmc,struct mmc_request *mrq)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/143 iwlwifi: add new cards for 22000 and fix struct name
In reply to Greg Kroah-Hartman[ Upstream commit d151b0a2efa128cb4f643b11baf54b1e4de2c528 ]
add few PCI ID'S for 22000 and fix the wrong name for one of the structs
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 20 ++++++++++++---- .../net/wireless/intel/iwlwifi/iwl-config.h | 5 ++-- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 23 +++++++++++++------ .../net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++-- 4 files changed, 37 insertions(+), 15 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +16 -4
@@ -241,6 +241,18 @@ const struct iwl_cfg iwl_ax101_cfg_qu_hr = { .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, }; +const struct iwl_cfg iwl_ax201_cfg_qu_hr = { + .name ="Intel(R) Wi-Fi 6 AX201 160MHz" , + .fw_name_pre =IWL_22000_QU_B_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; +const struct iwl_cfg iwl_ax101_cfg_quz_hr = { .name ="Intel(R) Wi-Fi 6 AX101" , .fw_name_pre =IWL_QUZ_A_HR_B_FW_PRE ,
@@ -424,12 +436,12 @@ const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = { };const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0 = { - .name ="Intel(R) Wi-Fi 6 AX201 160MHz" , + .name ="Intel(R) Wi-Fi 7 AX210 160MHz" , .fw_name_pre =IWL_22000_SO_A_HR_B_FW_PRE ,IWL_DEVICE_AX210 , }; -const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0 = { +const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0 = { .name ="Intel(R) Wi-Fi 7 AX211 160MHz" , .fw_name_pre =IWL_22000_SO_A_GF_A_FW_PRE , .uhb_supported = true,
@@ -443,8 +455,8 @@ const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0 = { IWL_DEVICE_AX210, }; -const struct iwl_cfg iwlax210_2ax_cfg_so_gf4_a0 = { - .name ="Intel(R) Wi-Fi 7 AX210 160MHz" , +const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0 = { + .name ="Intel(R) Wi-Fi 7 AX411 160MHz" , .fw_name_pre =IWL_22000_SO_A_GF4_A_FW_PRE ,IWL_DEVICE_AX210 , };
drivers/net/wireless/intel/iwlwifi/iwl-config.h +3 -2
@@ -562,6 +562,7 @@ extern const struct iwl_cfg iwl_ax101_cfg_qu_hr;extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;extern const struct iwl_cfg iwl22000_2ax_cfg_hr;extern const struct iwl_cfg iwl_ax200_cfg_cc; +extern const struct iwl_cfg iwl_ax201_cfg_qu_hr;extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;extern const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0;extern const struct iwl_cfg killer1650x_2ax_cfg;
@@ -580,9 +581,9 @@ extern const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0;extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0; -extern const struct iwl_cfg iwlax210_2ax_cfg_so_gf_a0; +extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0; -extern const struct iwl_cfg iwlax210_2ax_cfg_so_gf4_a0; +extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0;#endif /* CPTCFG_IWLMVM || CPTCFG_IWLFMAC */ #endif /* __IWL_CONFIG_H__ */
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +16 -7
@@ -897,6 +897,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x02F0, 0x0310, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x02F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)}, {IWL_PCI_DEVICE(0x02F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)}, + {IWL_PCI_DEVICE(0x02F0, 0x2074, iwl_ax201_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x02F0, 0x4070, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x06F0, 0x0070, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x06F0, 0x0074, iwl_ax101_cfg_qu_hr)},
@@ -905,6 +906,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x06F0, 0x0310, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x06F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)}, {IWL_PCI_DEVICE(0x06F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)}, + {IWL_PCI_DEVICE(0x06F0, 0x2074, iwl_ax201_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x06F0, 0x4070, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x2720, 0x0000, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x2720, 0x0040, iwl_ax101_cfg_qu_hr)},
@@ -918,6 +920,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2720, 0x1080, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x2720, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)}, {IWL_PCI_DEVICE(0x2720, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)}, + {IWL_PCI_DEVICE(0x2720, 0x2074, iwl_ax201_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x2720, 0x4070, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x34F0, 0x0040, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x34F0, 0x0070, iwl_ax101_cfg_qu_hr)},
@@ -927,6 +930,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x34F0, 0x0310, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x34F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)}, {IWL_PCI_DEVICE(0x34F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)}, + {IWL_PCI_DEVICE(0x34F0, 0x2074, iwl_ax201_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x34F0, 0x4070, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x43F0, 0x0040, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x43F0, 0x0070, iwl_ax101_cfg_qu_hr)},
@@ -935,6 +939,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x43F0, 0x007C, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x43F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)}, {IWL_PCI_DEVICE(0x43F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)}, + {IWL_PCI_DEVICE(0x43F0, 0x2074, iwl_ax201_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x43F0, 0x4070, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0xA0F0, 0x0000, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0xA0F0, 0x0040, iwl_ax101_cfg_qu_hr)},
@@ -946,6 +951,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0xA0F0, 0x0A10, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0xA0F0, 0x1651, killer1650s_2ax_cfg_qu_b0_hr_b0)}, {IWL_PCI_DEVICE(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0)}, + {IWL_PCI_DEVICE(0xA0F0, 0x2074, iwl_ax201_cfg_qu_hr)}, {IWL_PCI_DEVICE(0xA0F0, 0x4070, iwl_ax101_cfg_qu_hr)}, {IWL_PCI_DEVICE(0x2723, 0x0080, iwl_ax200_cfg_cc)},
@@ -958,13 +964,16 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2723, 0x4080, iwl_ax200_cfg_cc)}, {IWL_PCI_DEVICE(0x2723, 0x4088, iwl_ax200_cfg_cc)}, - {IWL_PCI_DEVICE(0x2725, 0x0090, iwlax210_2ax_cfg_so_hr_a0)}, - {IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax210_2ax_cfg_so_hr_a0)}, - {IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax210_2ax_cfg_so_hr_a0)}, - {IWL_PCI_DEVICE(0x2725, 0x0020, iwlax210_2ax_cfg_so_hr_a0)}, - {IWL_PCI_DEVICE(0x2725, 0x0310, iwlax210_2ax_cfg_so_hr_a0)}, - {IWL_PCI_DEVICE(0x2725, 0x0A10, iwlax210_2ax_cfg_so_hr_a0)}, - {IWL_PCI_DEVICE(0x2725, 0x00B0, iwlax210_2ax_cfg_so_hr_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x0090, iwlax211_2ax_cfg_so_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x0020, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x0310, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x0510, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x0A10, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x00B0, iwlax411_2ax_cfg_so_gf4_a0)}, + {IWL_PCI_DEVICE(0x7A70, 0x0090, iwlax211_2ax_cfg_so_gf_a0)}, + {IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax211_2ax_cfg_so_gf_a0)}, + {IWL_PCI_DEVICE(0x7A70, 0x0510, iwlax211_2ax_cfg_so_gf_a0)}, + {IWL_PCI_DEVICE(0x7A70, 0x0A10, iwlax211_2ax_cfg_so_gf_a0)}, #endif /* CONFIG_IWLMVM */
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +2 -2
@@ -3569,10 +3569,10 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, trans->cfg = &iwlax210_2ax_cfg_so_jf_a0; }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (trans->hw_rf_id) ==CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_GF )) { - trans->cfg = &iwlax210_2ax_cfg_so_gf_a0; + trans->cfg = &iwlax211_2ax_cfg_so_gf_a0; }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (trans->hw_rf_id) ==CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_GF4 )) { - trans->cfg = &iwlax210_2ax_cfg_so_gf4_a0; + trans->cfg = &iwlax411_2ax_cfg_so_gf4_a0; } }else if (cfg == &iwl_ax101_cfg_qu_hr) { if ((CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/143 iwlwifi: add new cards for 22000 and change wrong structs
In reply to Greg Kroah-Hartman[ Upstream commit a976bfb44bdbc1b69365dc31f7c1339fff436c95 ]
add few PCI ID'S for 22000 and chainge few cards structs names
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 36 ++++++ .../net/wireless/intel/iwlwifi/iwl-config.h | 3 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 122 +++++++++--------- .../net/wireless/intel/iwlwifi/pcie/trans.c | 5 +- 4 files changed, 103 insertions(+), 63 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +36 -0
@@ -265,6 +265,42 @@ const struct iwl_cfg iwl_ax101_cfg_quz_hr = { .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, }; +const struct iwl_cfg iwl_ax201_cfg_quz_hr = { + .name ="Intel(R) Wi-Fi 6 AX201 160MHz" , + .fw_name_pre =IWL_QUZ_A_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; + +const struct iwl_cfg iwl_ax1650s_cfg_quz_hr = { + .name ="Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)" , + .fw_name_pre =IWL_QUZ_A_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; + +const struct iwl_cfg iwl_ax1650i_cfg_quz_hr = { + .name ="Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)" , + .fw_name_pre =IWL_QUZ_A_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; +const struct iwl_cfg iwl_ax200_cfg_cc = { .name ="Intel(R) Wi-Fi 6 AX200 160MHz" , .fw_name_pre =IWL_CC_A_FW_PRE ,
drivers/net/wireless/intel/iwlwifi/iwl-config.h +3 -0
@@ -563,6 +563,9 @@ extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;extern const struct iwl_cfg iwl22000_2ax_cfg_hr;extern const struct iwl_cfg iwl_ax200_cfg_cc;extern const struct iwl_cfg iwl_ax201_cfg_qu_hr; +extern const struct iwl_cfg iwl_ax201_cfg_quz_hr; +extern const struct iwl_cfg iwl_ax1650i_cfg_quz_hr; +extern const struct iwl_cfg iwl_ax1650s_cfg_quz_hr;extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;extern const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0;extern const struct iwl_cfg killer1650x_2ax_cfg;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +61 -61
222 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +3 -2
@@ -3601,8 +3601,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (trans->hw_rf_id) ==CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_HR ) && ((trans->cfg != &iwl_ax200_cfg_cc && - trans->cfg != &killer1650x_2ax_cfg && - trans->cfg != &killer1650w_2ax_cfg) || + trans->cfg != &killer1650x_2ax_cfg && + trans->cfg != &killer1650w_2ax_cfg && + trans->cfg != &iwl_ax201_cfg_quz_hr) || trans->hw_rev ==CSR_HW_REV_TYPE_QNJ_B0 )) {u32 hw_status;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/143 iwlwifi: add new cards for 9000 and 20000 series
In reply to Greg Kroah-Hartman[ Upstream commit ffcb60a54f245528e1d49f957ca2d20d6079577c ]
add two new PCI ID's for 9000 and 20000 series
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +2 -0
@@ -604,6 +604,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2526, 0x40A4, iwl9460_2ac_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x4234, iwl9560_2ac_cfg_soc)}, {IWL_PCI_DEVICE(0x2526, 0x42A4, iwl9462_2ac_cfg_soc)}, + {IWL_PCI_DEVICE(0x2526, 0x6014, iwl9260_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x8014, iwl9260_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0x8010, iwl9260_2ac_160_cfg)}, {IWL_PCI_DEVICE(0x2526, 0xA014, iwl9260_2ac_160_cfg)},
@@ -971,6 +972,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x7A70, 0x0310, iwlax211_2ax_cfg_so_gf_a0)}, {IWL_PCI_DEVICE(0x7A70, 0x0510, iwlax211_2ax_cfg_so_gf_a0)}, {IWL_PCI_DEVICE(0x7A70, 0x0A10, iwlax211_2ax_cfg_so_gf_a0)}, + {IWL_PCI_DEVICE(0x7AF0, 0x0090, iwlax211_2ax_cfg_so_gf_a0)}, {IWL_PCI_DEVICE(0x7AF0, 0x0310, iwlax211_2ax_cfg_so_gf_a0)}, {IWL_PCI_DEVICE(0x7AF0, 0x0510, iwlax211_2ax_cfg_so_gf_a0)}, {IWL_PCI_DEVICE(0x7AF0, 0x0A10, iwlax211_2ax_cfg_so_gf_a0)},
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/143 iwlwifi: change 0x02F0 fw from qu to quz
In reply to Greg Kroah-Hartman[ Upstream commit 658521fc1bf1457a944d8408b8a792b31ed9cc20 ]
change the fw of 0x02F0 platform from qu to quz
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 88 +++++++++++++++ .../net/wireless/intel/iwlwifi/iwl-config.h | 6 ++ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 100 +++++++++--------- 3 files changed, 144 insertions(+), 50 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +88 -0
@@ -82,6 +82,7 @@#define IWL_22000_HR_A0_FW_PRE "iwlwifi-QuQnj-a0-hr-a0-"#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0-"#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0-" +#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0-"#define IWL_QNJ_B_JF_B_FW_PRE "iwlwifi-QuQnj-b0-jf-b0-"#define IWL_CC_A_FW_PRE "iwlwifi-cc-a0-"#define IWL_22000_SO_A_JF_B_FW_PRE "iwlwifi-so-a0-jf-b0-"
@@ -106,6 +107,8 @@ IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE (api) \ IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode" +#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE (api) \ + IWL_QUZ_A_JF_B_FW_PRE __stringify(api) ".ucode"#define IWL_QU_B_JF_B_MODULE_FIRMWARE (api) \ IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE (api) \
@@ -381,6 +384,90 @@ const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = { .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, }; +const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc = { + .name ="Intel(R) Wireless-AC 9560 160MHz" , + .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .integrated = true, + .soc_latency =5000 , +}; + +const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc = { + .name ="Intel(R) Wireless-AC 9560 160MHz" , + .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .integrated = true, + .soc_latency =5000 , +}; + +const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc = { + .name ="Intel(R) Dual Band Wireless AC 9461" , + .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .integrated = true, + .soc_latency =5000 , +}; + +const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc = { + .name ="Intel(R) Dual Band Wireless AC 9462" , + .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .integrated = true, + .soc_latency =5000 , +}; + +const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc = { + .name ="Killer (R) Wireless-AC 1550s Wireless Network Adapter (9560NGW)" , + .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .integrated = true, + .soc_latency =5000 , +}; + +const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc = { + .name ="Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)" , + .fw_name_pre =IWL_QUZ_A_JF_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , + .integrated = true, + .soc_latency =5000 , +}; +const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = { .name ="Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)" , .fw_name_pre =IWL_QU_B_JF_B_FW_PRE ,
@@ -505,6 +592,7 @@ MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));MODULE_FIRMWARE (IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QU_B_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QUZ_A_HR_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX )); +MODULE_FIRMWARE (IWL_QUZ_A_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QNJ_B_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_CC_A_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_22000_SO_A_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));
drivers/net/wireless/intel/iwlwifi/iwl-config.h +6 -0
@@ -540,14 +540,20 @@ extern const struct iwl_cfg iwl9260_killer_2ac_cfg;extern const struct iwl_cfg iwl9270_2ac_cfg;extern const struct iwl_cfg iwl9460_2ac_cfg;extern const struct iwl_cfg iwl9560_2ac_cfg; +extern const struct iwl_cfg iwl9560_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_160_cfg; +extern const struct iwl_cfg iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9460_2ac_cfg_soc;extern const struct iwl_cfg iwl9461_2ac_cfg_soc; +extern const struct iwl_cfg iwl9461_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9462_2ac_cfg_soc; +extern const struct iwl_cfg iwl9462_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9560_2ac_cfg_soc;extern const struct iwl_cfg iwl9560_2ac_160_cfg_soc;extern const struct iwl_cfg iwl9560_killer_2ac_cfg_soc;extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_soc; +extern const struct iwl_cfg iwl9560_killer_i_2ac_cfg_quz_a0_jf_b0_soc; +extern const struct iwl_cfg iwl9560_killer_s_2ac_cfg_quz_a0_jf_b0_soc;extern const struct iwl_cfg iwl9460_2ac_cfg_shared_clk;extern const struct iwl_cfg iwl9461_2ac_cfg_shared_clk;extern const struct iwl_cfg iwl9462_2ac_cfg_shared_clk;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +50 -50
106 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/143 iwlwifi: pcie: add support for qu c-step devices
In reply to Greg Kroah-Hartman[ Upstream commit a7d544d63120061f89459585f06ca44d30842a22 ]
Add support for C-step devices. Currently we don't have a nice way of matching the step and choosing the proper configuration, so we need to switch the config structs one by one.
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 53 +++++++++++++++++++ .../net/wireless/intel/iwlwifi/iwl-config.h | 7 +++ drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 2 + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 21 ++++++++ 4 files changed, 83 insertions(+)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +53 -0
@@ -80,7 +80,9 @@#define IWL_22000_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0-"#define IWL_22000_HR_B_FW_PRE "iwlwifi-QuQnj-b0-hr-b0-"#define IWL_22000_HR_A0_FW_PRE "iwlwifi-QuQnj-a0-hr-a0-" +#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0-"#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0-" +#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0-"#define IWL_QUZ_A_HR_B_FW_PRE "iwlwifi-QuZ-a0-hr-b0-"#define IWL_QUZ_A_JF_B_FW_PRE "iwlwifi-QuZ-a0-jf-b0-"#define IWL_QNJ_B_JF_B_FW_PRE "iwlwifi-QuQnj-b0-jf-b0-"
@@ -109,6 +111,8 @@ IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE (api) \ IWL_QUZ_A_JF_B_FW_PRE __stringify(api) ".ucode" +#define IWL_QU_C_HR_B_MODULE_FIRMWARE (api) \ + IWL_QU_C_HR_B_FW_PRE __stringify(api) ".ucode"#define IWL_QU_B_JF_B_MODULE_FIRMWARE (api) \ IWL_QU_B_JF_B_FW_PRE __stringify(api) ".ucode"#define IWL_QNJ_B_JF_B_MODULE_FIRMWARE (api) \
@@ -256,6 +260,30 @@ const struct iwl_cfg iwl_ax201_cfg_qu_hr = { .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, }; +const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0 = { + .name ="Intel(R) Wi-Fi 6 AX101" , + .fw_name_pre =IWL_QU_C_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; + +const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0 = { + .name ="Intel(R) Wi-Fi 6 AX201 160MHz" , + .fw_name_pre =IWL_QU_C_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; +const struct iwl_cfg iwl_ax101_cfg_quz_hr = { .name ="Intel(R) Wi-Fi 6 AX101" , .fw_name_pre =IWL_QUZ_A_HR_B_FW_PRE ,
@@ -372,6 +400,30 @@ const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = { IWL_DEVICE_22500, }; +const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0 = { + .name ="Intel(R) Wireless-AC 9461" , + .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , +IWL_DEVICE_22500 , +}; + +const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0 = { + .name ="Intel(R) Wireless-AC 9462" , + .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , +IWL_DEVICE_22500 , +}; + +const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0 = { + .name ="Intel(R) Wireless-AC 9560" , + .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , +IWL_DEVICE_22500 , +}; + +const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0 = { + .name ="Intel(R) Wireless-AC 9560 160MHz" , + .fw_name_pre =IWL_QU_C_JF_B_FW_PRE , +IWL_DEVICE_22500 , +}; +const struct iwl_cfg iwl9560_2ac_cfg_qnj_jf_b0 = { .name ="Intel(R) Wireless-AC 9560 160MHz" , .fw_name_pre =IWL_QNJ_B_JF_B_FW_PRE ,
@@ -590,6 +642,7 @@ MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));MODULE_FIRMWARE (IWL_22000_HR_B_F0_QNJ_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_22000_HR_B_QNJ_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX )); +MODULE_FIRMWARE (IWL_QU_C_HR_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QU_B_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QUZ_A_HR_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));MODULE_FIRMWARE (IWL_QUZ_A_JF_B_MODULE_FIRMWARE (IWL_22000_UCODE_API_MAX ));
drivers/net/wireless/intel/iwlwifi/iwl-config.h +7 -0
@@ -565,10 +565,13 @@ extern const struct iwl_cfg iwl22000_2ac_cfg_hr;extern const struct iwl_cfg iwl22000_2ac_cfg_hr_cdb;extern const struct iwl_cfg iwl22000_2ac_cfg_jf;extern const struct iwl_cfg iwl_ax101_cfg_qu_hr; +extern const struct iwl_cfg iwl_ax101_cfg_qu_c0_hr_b0;extern const struct iwl_cfg iwl_ax101_cfg_quz_hr;extern const struct iwl_cfg iwl22000_2ax_cfg_hr;extern const struct iwl_cfg iwl_ax200_cfg_cc;extern const struct iwl_cfg iwl_ax201_cfg_qu_hr; +extern const struct iwl_cfg iwl_ax201_cfg_qu_hr; +extern const struct iwl_cfg iwl_ax201_cfg_qu_c0_hr_b0;extern const struct iwl_cfg iwl_ax201_cfg_quz_hr;extern const struct iwl_cfg iwl_ax1650i_cfg_quz_hr;extern const struct iwl_cfg iwl_ax1650s_cfg_quz_hr;
@@ -580,6 +583,10 @@ extern const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0;extern const struct iwl_cfg iwl9462_2ac_cfg_qu_b0_jf_b0;extern const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0;extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0; +extern const struct iwl_cfg iwl9461_2ac_cfg_qu_c0_jf_b0; +extern const struct iwl_cfg iwl9462_2ac_cfg_qu_c0_jf_b0; +extern const struct iwl_cfg iwl9560_2ac_cfg_qu_c0_jf_b0; +extern const struct iwl_cfg iwl9560_2ac_160_cfg_qu_c0_jf_b0;extern const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0;extern const struct iwl_cfg killer1550s_2ac_cfg_qu_b0_jf_b0;extern const struct iwl_cfg iwl22000_2ax_cfg_jf;
drivers/net/wireless/intel/iwlwifi/iwl-csr.h +2 -0
@@ -328,6 +328,8 @@ enum {#define CSR_HW_REV_TYPE_NONE (0x00001F0)#define CSR_HW_REV_TYPE_QNJ (0x0000360)#define CSR_HW_REV_TYPE_QNJ_B0 (0x0000364) +#define CSR_HW_REV_TYPE_QU_B0 (0x0000334) +#define CSR_HW_REV_TYPE_QU_C0 (0x0000338)#define CSR_HW_REV_TYPE_QUZ (0x0000354)#define CSR_HW_REV_TYPE_HR_CDB (0x0000340)#define CSR_HW_REV_TYPE_SO (0x0000370)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +21 -0
@@ -1039,6 +1039,27 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } iwl_trans->cfg = cfg; } + +/* +* This is a hack to switch from Qu B0 to Qu C0. We need to +* do this for all cfgs that use Qu B0. All this code is in +* urgent need for a refactor, but for now this is the easiest +* thing to do to support Qu C-step. +*/ +if (iwl_trans->hw_rev ==CSR_HW_REV_TYPE_QU_C0 ) { +if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr) + iwl_trans->cfg = &iwl_ax101_cfg_qu_c0_hr_b0; +else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr) + iwl_trans->cfg = &iwl_ax201_cfg_qu_c0_hr_b0; +else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0) + iwl_trans->cfg = &iwl9461_2ac_cfg_qu_c0_jf_b0; +else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0) + iwl_trans->cfg = &iwl9462_2ac_cfg_qu_c0_jf_b0; +else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0) + iwl_trans->cfg = &iwl9560_2ac_cfg_qu_c0_jf_b0; +else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) + iwl_trans->cfg = &iwl9560_2ac_160_cfg_qu_c0_jf_b0; + }#endif pci_set_drvdata (pdev, iwl_trans);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/143 iwlwifi: pcie: dont switch FW to qnj when ax201 is detected
In reply to Greg Kroah-Hartman[ Upstream commit 17e40e6979aaf60f356331bac129df20e1fd74a0 ]
We have a too generic condition that switches from Qu configurations to QnJ configurations. We need to exclude some configurations so that they are not erroneously switched. Add the ax201 configuration to the list of exclusions.
--- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +1 -0
@@ -3601,6 +3601,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) == CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) && ((trans->cfg != &iwl_ax200_cfg_cc && + trans->cfg != &iwl_ax201_cfg_qu_hr && trans->cfg != &killer1650x_2ax_cfg && trans->cfg != &killer1650w_2ax_cfg && trans->cfg != &iwl_ax201_cfg_quz_hr) ||
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/143 iwlwifi: pcie: handle switching killer Qu B0 NICs to C0
In reply to Greg Kroah-Hartman[ Upstream commit b9500577d361522a3d9f14da8cf41dc1d824904e ]
We need to use a different firmware for C0 versions of killer Qu NICs. Add structures for them and handle them in the if block that detects C0 revisions.
Additionally, instead of having an inclusive check for QnJ devices, make the selection exclusive, so that switching to QnJ is the exception, not the default. This prevents us from having to add all the non-QnJ cards to an exclusion list. To do so, only go into the QnJ block if the device has an RF ID type HR and HW revision QnJ.
--- .../net/wireless/intel/iwlwifi/cfg/22000.c | 24 +++++++++++++++++++ .../net/wireless/intel/iwlwifi/iwl-config.h | 2 ++ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 ++++ .../net/wireless/intel/iwlwifi/pcie/trans.c | 7 +----- 4 files changed, 31 insertions(+), 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/cfg/22000.c +24 -0
@@ -556,6 +556,30 @@ const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0 = { .max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT, }; +const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0 = { + .name ="Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless Network Adapter (201NGW)" , + .fw_name_pre =IWL_QU_C_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; + +const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0 = { + .name ="Killer(R) Wi-Fi 6 AX1650s 160MHz Wireless Network Adapter (201D2W)" , + .fw_name_pre =IWL_QU_C_HR_B_FW_PRE , +IWL_DEVICE_22500 , +/* +* This device doesn't support receiving BlockAck with a large bitmap +* so we need to restrict the size of transmitted aggregation to the +* HT size; mac80211 would otherwise pick the HE max (256) by default. +*/ + .max_tx_agg_size =IEEE80211_MAX_AMPDU_BUF_HT , +}; +const struct iwl_cfg iwl22000_2ax_cfg_jf = { .name ="Intel(R) Dual Band Wireless AX 22000" , .fw_name_pre =IWL_QU_B_JF_B_FW_PRE ,
drivers/net/wireless/intel/iwlwifi/iwl-config.h +2 -0
@@ -577,6 +577,8 @@ extern const struct iwl_cfg iwl_ax1650i_cfg_quz_hr;extern const struct iwl_cfg iwl_ax1650s_cfg_quz_hr;extern const struct iwl_cfg killer1650s_2ax_cfg_qu_b0_hr_b0;extern const struct iwl_cfg killer1650i_2ax_cfg_qu_b0_hr_b0; +extern const struct iwl_cfg killer1650s_2ax_cfg_qu_c0_hr_b0; +extern const struct iwl_cfg killer1650i_2ax_cfg_qu_c0_hr_b0;extern const struct iwl_cfg killer1650x_2ax_cfg;extern const struct iwl_cfg killer1650w_2ax_cfg;extern const struct iwl_cfg iwl9461_2ac_cfg_qu_b0_jf_b0;
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +4 -0
@@ -1059,6 +1059,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) iwl_trans->cfg = &iwl9560_2ac_cfg_qu_c0_jf_b0; else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) iwl_trans->cfg = &iwl9560_2ac_160_cfg_qu_c0_jf_b0; + else if (iwl_trans->cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0) + iwl_trans->cfg = &killer1650s_2ax_cfg_qu_c0_hr_b0; + else if (iwl_trans->cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0) + iwl_trans->cfg = &killer1650i_2ax_cfg_qu_c0_hr_b0; }#endif
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +1 -6
@@ -3600,12 +3600,7 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, } }else if (CSR_HW_RF_ID_TYPE_CHIP_ID (trans->hw_rf_id) ==CSR_HW_RF_ID_TYPE_CHIP_ID (CSR_HW_RF_ID_TYPE_HR ) && - ((trans->cfg != &iwl_ax200_cfg_cc && - trans->cfg != &iwl_ax201_cfg_qu_hr && - trans->cfg != &killer1650x_2ax_cfg && - trans->cfg != &killer1650w_2ax_cfg && - trans->cfg != &iwl_ax201_cfg_quz_hr) || - trans->hw_rev ==CSR_HW_REV_TYPE_QNJ_B0 )) { + trans->hw_rev ==CSR_HW_REV_TYPE_QNJ_B0 ) {u32 hw_status; hw_status =iwl_read_prph (trans,UMAG_GEN_HW_STATUS );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/143 drm/i915: Do not create a new max_bpc prop for MST connectors
In reply to Greg Kroah-Hartman[ Upstream commit 1b9bd09630d4db4827cc04d358a41a16a6bc2cb0 ]
We're not allowed to create new properties after device registration so for MST connectors we need to either create the max_bpc property earlier, or we reuse one we already have. Let's do the latter apporach since the corresponding SST connector already has the prop and its min/max are correct also for the MST connector.
The problem was highlighted by commit 4f5368b5541a ("drm/kms:
Catch mode_object lifetime errors") which results in the following spew:
[ 1330.878941] WARNING: CPU: 2 PID: 1554 at drivers/gpu/drm/drm_mode_object.c:45 __drm_mode_object_add+0xa0/0xb0 [drm] ... [ 1330.879008] Call Trace: [ 1330.879023] drm_property_create+0xba/0x180 [drm] [ 1330.879036] drm_property_create_range+0x15/0x30 [drm] [ 1330.879048] drm_connector_attach_max_bpc_property+0x62/0x80 [drm] [ 1330.879086] intel_dp_add_mst_connector+0x11f/0x140 [i915] [ 1330.879094] drm_dp_add_port.isra.20+0x20b/0x440 [drm_kms_helper]
...
--- drivers/gpu/drm/i915/intel_dp_mst.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp_mst.c +9 -1
@@ -535,7 +535,15 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolointel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector); -drm_connector_attach_max_bpc_property (connector,6 ,12 ); + +/* +* Reuse the prop from the SST connector because we're +* not allowed to create new props after device registration. +*/ + connector->max_bpc_property = + intel_dp->attached_connector->base.max_bpc_property; +if (connector->max_bpc_property) +drm_connector_attach_max_bpc_property (connector,6 ,12 );return connector;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 140/143 drm/i915/dp: Fix DSC enable code to use cpu_transcoder instead of encoder->type
In reply to Greg Kroah-Hartman[ Upstream commit d4c61c4a16decd8ace8660f22c81609a539fccba ]
This patch fixes the intel_configure_pps_for_dsc_encoder() function to use cpu_transcoder instead of encoder->type to select the correct DSC registers that was wrongly used in the original patch for one DSC register isntance.
--- drivers/gpu/drm/i915/intel_vdsc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_vdsc.c +1 -1
@@ -539,7 +539,7 @@ static void intel_configure_pps_for_dsc_encoder(struct intel_encoder *encoder, pps_val |=DSC_PIC_HEIGHT (vdsc_cfg->pic_height) |DSC_PIC_WIDTH (vdsc_cfg->pic_width / num_vdsc_instances);DRM_INFO ("PPS2 = 0x%08x\n" , pps_val); -if (encoder->type ==INTEL_OUTPUT_EDP ) { +if (cpu_transcoder ==TRANSCODER_EDP ) {I915_WRITE (DSCA_PICTURE_PARAMETER_SET_2 , pps_val);/* * If 2 VDSC instances are needed, configure PPS for second
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 141/143 x86/ptrace: fix up botched merge of spectrev1 fix
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
I incorrectly merged commit 31a2fbb390fe ("x86/ptrace: Fix possible spectre-v1 in ptrace_get_debugreg()") when backporting it, as was graciously pointed out at
https://grsecurity.net/teardown_of_a_failed_linux_lts_spectre_fix.php
Resolve the upstream difference with the stable kernel merge to properly protect things.
--- arch/x86/kernel/ptrace.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kernel/ptrace.c +1 -2
@@ -644,11 +644,10 @@ static unsigned long ptrace_get_debugreg {struct thread_struct *thread = &tsk->thread;unsigned long val =0 ; -int index = n;if (n <HBP_NUM ) { +int index =array_index_nospec (n,HBP_NUM );struct perf_event *bp = thread->ptrace_bps[index]; - index =array_index_nospec (index,HBP_NUM );if (bp) val = bp->hw.info.address;
Greg Kroah-Hartman
maintainerPATCH 142/143 bpf: fix use after free in prog symbol exposure
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
commit c751798aa224fadc5124b49eeb38fb468c0fa039 upstream.
syzkaller managed to trigger the warning in bpf_jit_free() which checks via bpf_prog_kallsyms_verify_off() for potentially unlinked JITed BPF progs in kallsyms, and subsequently trips over GPF when walking kallsyms entries:
[...]
8021q: adding VLAN 0 to HW filter on device batadv0 8021q: adding VLAN 0 to HW filter on device batadv0
WARNING: CPU: 0 PID: 9869 at kernel/bpf/core.c:810 bpf_jit_free+0x1e8/0x2a0 Kernel panic - not syncing: panic_on_warn set ... CPU: 0 PID: 9869 Comm: kworker/0:7 Not tainted 5.0.0-rc8+ #1 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: events bpf_prog_free_deferred Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x113/0x167 lib/dump_stack.c:113 panic+0x212/0x40b kernel/panic.c:214 __warn.cold.8+0x1b/0x38 kernel/panic.c:571 report_bug+0x1a4/0x200 lib/bug.c:186 fixup_bug arch/x86/kernel/traps.c:178 [inline] do_error_trap+0x11b/0x200 arch/x86/kernel/traps.c:271 do_invalid_op+0x36/0x40 arch/x86/kernel/traps.c:290 invalid_op+0x14/0x20 arch/x86/entry/entry_64.S:973 RIP: 0010:bpf_jit_free+0x1e8/0x2a0 Code: 02 4c 89 e2 83 e2 07 38 d0 7f 08 84 c0 0f 85 86 00 00 00 48 ba 00 02 00 00 00 00 ad de 0f b6 43 02 49 39 d6 0f 84 5f fe ff ff <0f> 0b e9 58 fe ff ff 48 b8 00 00 00 00 00 fc ff df 4c 89 e2 48 c1 RSP: 0018:ffff888092f67cd8 EFLAGS: 00010202 RAX: 0000000000000007 RBX: ffffc90001947000 RCX: ffffffff816e9d88 RDX: dead000000000200 RSI: 0000000000000008 RDI: ffff88808769f7f0 RBP: ffff888092f67d00 R08: fffffbfff1394059 R09: fffffbfff1394058 R10: fffffbfff1394058 R11: ffffffff89ca02c7 R12: ffffc90001947002 R13: ffffc90001947020 R14: ffffffff881eca80 R15: ffff88808769f7e8 BUG: unable to handle kernel paging request at fffffbfff400d000 #PF error: [normal kernel read fault] PGD 21ffee067 P4D 21ffee067 PUD 21ffed067 PMD 9f942067 PTE 0 Oops: 0000 [#1] PREEMPT SMP KASAN CPU: 0 PID: 9869 Comm: kworker/0:7 Not tainted 5.0.0-rc8+ #1 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Workqueue: events bpf_prog_free_deferred RIP: 0010:bpf_get_prog_addr_region kernel/bpf/core.c:495 [inline] RIP: 0010:bpf_tree_comp kernel/bpf/core.c:558 [inline] RIP: 0010:__lt_find include/linux/rbtree_latch.h:115 [inline] RIP: 0010:latch_tree_find include/linux/rbtree_latch.h:208 [inline] RIP: 0010:bpf_prog_kallsyms_find+0x107/0x2e0 kernel/bpf/core.c:632 Code: 00 f0 ff ff 44 38 c8 7f 08 84 c0 0f 85 fa 00 00 00 41 f6 45 02 01 75 02 0f 0b 48 39 da 0f 82 92 00 00 00 48 89 d8 48 c1 e8 03 <42> 0f b6 04 30 84 c0 74 08 3c 03 0f 8e 45 01 00 00 8b 03 48 c1 e0 [...]
Upon further debugging, it turns out that whenever we trigger this issue, the kallsyms removal in bpf_prog_ksym_node_del() was /skipped/ but yet bpf_jit_free() reported that the entry is /in use/.
Problem is that symbol exposure via bpf_prog_kallsyms_add() but also perf_event_bpf_event() were done /after/ bpf_prog_new_fd(). Once the fd is exposed to the public, a parallel close request came in right before we attempted to do the bpf_prog_kallsyms_add().
Given at this time the prog reference count is one, we start to rip everything underneath us via bpf_prog_release() -> bpf_prog_put(). The memory is eventually released via deferred free, so we're seeing that bpf_jit_free() has a kallsym entry because we added it from bpf_prog_load() but /after/ bpf_prog_put() from the remote CPU.
Therefore, move both notifications /before/ we install the fd. The issue was never seen between bpf_prog_alloc_id() and bpf_prog_new_fd() because upon bpf_prog_get_fd_by_id() we'll take another reference to the BPF prog, so we're still holding the original reference from the bpf_prog_load().
--- kernel/bpf/syscall.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)
kernel/bpf/syscall.c +18 -12
@@ -1686,20 +1686,26 @@ static int bpf_prog_load(union bpf_attrif (err) goto free_used_maps; - err =bpf_prog_new_fd (prog); -if (err <0 ) { -/* failed to allocate fd. -* bpf_prog_put() is needed because the above -* bpf_prog_alloc_id() has published the prog -* to the userspace and the userspace may -* have refcnt-ed it through BPF_PROG_GET_FD_BY_ID. -*/ -bpf_prog_put (prog); -return err; - } - +/* Upon success of bpf_prog_alloc_id(), the BPF prog is +* effectively publicly exposed. However, retrieving via +* bpf_prog_get_fd_by_id() will take another reference, +* therefore it cannot be gone underneath us. +* +* Only for the time /after/ successful bpf_prog_new_fd() +* and before returning to userspace, we might just hold +* one reference and any parallel close on that fd could +* rip everything out. Hence, below notifications must +* happen before bpf_prog_new_fd(). +* +* Also, any failure handling from this point onwards must +* be using bpf_prog_put() given the program is exposed. +*/ bpf_prog_kallsyms_add (prog);perf_event_bpf_event (prog,PERF_BPF_EVENT_PROG_LOAD ,0 ); + + err =bpf_prog_new_fd (prog); +if (err <0 ) +bpf_prog_put (prog);return err; free_used_maps:
Greg Kroah-Hartman
maintainerPATCH 143/143 hsr: implement dellink to clean up resources
In reply to Greg Kroah-HartmanFrom: Cong Wang <[email protected]>
commit b9a1e627405d68d475a3c1f35e685ccfb5bbe668 upstream.
hsr_link_ops implements ->newlink() but not ->dellink(), which leads that resources not released after removing the device, particularly the entries in self_node_db and node_db.
So add ->dellink() implementation to replace the priv_destructor. This also makes the code slightly easier to understand.
--- net/hsr/hsr_device.c | 13 +++++-------- net/hsr/hsr_device.h | 1 + net/hsr/hsr_framereg.c | 11 ++++++++++- net/hsr/hsr_framereg.h | 3 ++- net/hsr/hsr_netlink.c | 7 +++++++ 5 files changed, 25 insertions(+), 10 deletions(-)
net/hsr/hsr_device.c +5 -8
@@ -344,10 +344,7 @@ static void hsr_announce(struct timer_lircu_read_unlock (); } -/* According to comments in the declaration of struct net_device, this function -* is "Called from unregister, can be used to call free_netdev". Ok then... -*/ -static void hsr_dev_destroy (struct net_device *hsr_dev) +void hsr_dev_destroy (struct net_device *hsr_dev) {struct hsr_priv *hsr;struct hsr_port *port;
@@ -356,15 +353,16 @@ static void hsr_dev_destroy(struct net_dhsr_debugfs_term (hsr); -rtnl_lock ();hsr_for_each_port (hsr, port)hsr_del_port (port); -rtnl_unlock ();del_timer_sync (&hsr->prune_timer);del_timer_sync (&hsr->announce_timer);synchronize_rcu (); + +hsr_del_self_node (&hsr->self_node_db); +hsr_del_nodes (&hsr->node_db); }static const struct net_device_ops hsr_device_ops = {
@@ -391,7 +389,6 @@ void hsr_dev_setup(struct net_device *de dev->priv_flags |=IFF_NO_QUEUE ; dev->needs_free_netdev = true; - dev->priv_destructor = hsr_dev_destroy; dev->hw_features =NETIF_F_SG |NETIF_F_FRAGLIST |NETIF_F_HIGHDMA | NETIF_F_GSO_MASK | NETIF_F_HW_CSUM |
@@ -495,7 +492,7 @@ fail:hsr_for_each_port (hsr, port)hsr_del_port (port); err_add_port: -hsr_del_node (&hsr->self_node_db); +hsr_del_self_node (&hsr->self_node_db);return res; }
net/hsr/hsr_device.h +1 -0
@@ -14,6 +14,7 @@void hsr_dev_setup (struct net_device *dev);int hsr_dev_finalize (struct net_device *hsr_dev,struct net_device *slave[2 ],unsigned char multicast_spec,u8 protocol_version); +void hsr_dev_destroy (struct net_device *hsr_dev);void hsr_check_carrier_and_operstate (struct hsr_priv *hsr);bool is_hsr_master (struct net_device *dev);int hsr_get_max_mtu (struct hsr_priv *hsr);
net/hsr/hsr_framereg.c +10 -1
@@ -104,7 +104,7 @@ int hsr_create_self_node(struct list_heareturn 0 ; } -void hsr_del_node (struct list_head *self_node_db) +void hsr_del_self_node (struct list_head *self_node_db) {struct hsr_node *node;
@@ -117,6 +117,15 @@ void hsr_del_node(struct list_head *self } } +void hsr_del_nodes (struct list_head *node_db) +{ +struct hsr_node *node; +struct hsr_node *tmp; + +list_for_each_entry_safe (node, tmp, node_db, mac_list) +kfree (node); +} +/* Allocate an hsr_node and add it to node_db. 'addr' is the node's address_A; * seq_out is used to initialize filtering of outgoing duplicate frames * originating from the newly added node.
net/hsr/hsr_framereg.h +2 -1
@@ -12,7 +12,8 @@struct hsr_node ; -void hsr_del_node (struct list_head *self_node_db); +void hsr_del_self_node (struct list_head *self_node_db); +void hsr_del_nodes (struct list_head *node_db);struct hsr_node *hsr_add_node (struct list_head *node_db,unsigned char addr[],u16 seq_out); struct hsr_node *hsr_get_node(struct hsr_port *port, struct sk_buff *skb,
net/hsr/hsr_netlink.c +7 -0
@@ -69,6 +69,12 @@ static int hsr_newlink(struct net *src_nreturn hsr_dev_finalize (dev, link, multicast_spec, hsr_version); } +static void hsr_dellink (struct net_device *hsr_dev,struct list_head *head) +{ +hsr_dev_destroy (hsr_dev); +unregister_netdevice_queue (hsr_dev, head); +} +static int hsr_fill_info (struct sk_buff *skb,const struct net_device *dev) {struct hsr_priv *hsr;
@@ -113,6 +119,7 @@ static struct rtnl_link_ops hsr_link_ops .priv_size = sizeof(struct hsr_priv), .setup = hsr_dev_setup, .newlink = hsr_newlink, + .dellink = hsr_dellink, .fill_info = hsr_fill_info, };
Sasha Levin
maintainerRe: [PATCH 5.2 143/143] hsr: implement dellink to clean up resources
Quoted 8 lines · Greg Kroah-Hartman
From: Cong Wang <[email protected]>
commit
b9a1e627405d68d475a3c1f35e685ccfb5bbe668upstream.
hsr_link_opsimplements ->newlink() but not ->dellink(), which leads that resources not released after removing the device, particularly the entries inself_node_dbandnode_db.
Quoted 8 lines
So add ->dellink() implementation to replace the
priv_destructor. This also makes the code slightly easier to understand.Reported-by [email protected]Cc Arvid Brodin <[email protected]>Signed-off-by Cong Wang <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
If the airport gods cooperate, I'm going to queue:
edf070a0fb45a ("hsr: fix a NULL pointer deref in hsr_dev_xmit()") 311633b604063 ("hsr: switch ->dellink() to ->ndo_uninit()")
as fixes for this commit.
--
Thanks,
Sasha
Greg Kroah-Hartman
maintainerRe: [PATCH 5.2 143/143] hsr: implement dellink to clean up resources
Quoted 18 lines · Sasha Levin
Quoted 8 lines · Greg Kroah-Hartman
From: Cong Wang <[email protected]>
commit
b9a1e627405d68d475a3c1f35e685ccfb5bbe668upstream.
hsr_link_opsimplements ->newlink() but not ->dellink(), which leads that resources not released after removing the device, particularly the entries inself_node_dbandnode_db.Quoted 8 lines
So add ->dellink() implementation to replace the
priv_destructor. This also makes the code slightly easier to understand.Reported-by [email protected]Cc Arvid Brodin <[email protected]>Signed-off-by Cong Wang <[email protected]>Signed-off-by David S. Miller <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 6 lines
If the airport gods cooperate, I'm going to queue:
edf070a0fb45a("hsr: fix a NULL pointer deref inhsr_dev_xmit()")311633b604063("hsr: switch ->dellink() to ->ndo_uninit()")as fixes for this commit.
Ugh, sorry about that, I need to fix up my scripts :(
greg k-h
stable-rc/linux-5.2.y boot: 157 boots: 4 failed, 145 passed with 8 offline (v5.2.11-144-gb6eedcb8cf66)
stable-rc/linux-5.2.y boot: 157 boots: 4 failed, 145 passed with 8 offline (v5.2.11-144-gb6eedcb8cf66)
Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-5.2.y/kernel/v5.2.11-144-gb6eedcb8cf66/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-5.2.y/kernel/v5.2.11-144-gb6eedcb8cf66/
Tree: stable-rc
Branch: linux-5.2.y
Git Describe: v5.2.11-144-gb6eedcb8cf66
Git Commit: b6eedcb8cf6670234e137d277a5ae1cdf5cd141c
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 85 unique boards, 27 SoC families, 17 builds out of 209
Boot Failures Detected:
arm:
vexpress_defconfig:
gcc-8:
qemu_arm-virt-gicv3: 4 failed labs
Offline Platforms:
arm64:
defconfig:
gcc-8
apq8016-sbc: 1 offline labarm:
multi_v7_defconfig:
gcc-8
qcom-apq8064-cm-qs600: 1 offline lab
qcom-apq8064-ifc6410: 1 offline lab
sun5i-r8-chip: 1 offline lab
davinci_all_defconfig:
gcc-8
dm365evm,legacy: 1 offline lab
qcom_defconfig:
gcc-8
qcom-apq8064-cm-qs600: 1 offline lab
qcom-apq8064-ifc6410: 1 offline lab
sunxi_defconfig:
gcc-8
sun5i-r8-chip: 1 offline lab---
For more info write to <[email protected]>
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 15 lines · shuah
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. 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.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Thanks for testing all of these and letting me know.
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 390 pass: 390 fail: 0
Guenter
Greg Kroah-Hartman
maintainerQuoted 6 lines · Guenter Roeck
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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.
Quoted 8 lines
Quoted 3 lines
Responses should be made by Fri 06 Sep 2019 05:50:23 PM UTC. Anything received after that time might be too late.
Build results:
total: 159 pass: 159 fail: 0 Qemu test results: total: 390 pass: 390 fail: 0
Thanks for testing all of these and letting me know.
greg k-h
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
Summary
------------------------------------------------------------------------
kernel: 5.2.12-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.2.y
git commit: b6eedcb8cf6670234e137d277a5ae1cdf5cd141c
git describe: v5.2.11-144-gb6eedcb8cf66
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-5.2-oe/build/v5.2.11-144-gb6eedcb8cf66
No regressions (compared to build v5.2.11)
No fixes (compared to build v5.2.11)
Ran 22474 total tests in the following environments and test suites.
Environments
--------------
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15
- x86
Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libgpiod
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* perf
* spectre-meltdown-checker-test
* v4l2-compliance
* network-basic-tests
* ltp-fs-tests
* ltp-open-posix-tests
* kvm-unit-tests
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none
* ssuite
Greetings!
Daniel Díaz
[email protected]
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 17 lines · Daniel Díaz
Hello!
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. 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.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 3 lines
thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm,x86_64, and i386.
Thanks for testing all of these and letting me know.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.thanks,
greg k-h
Compiled, booted, and no regressions on my system.
-Kelsey
Greg Kroah-Hartman
maintainerQuoted 15 lines · Kelsey Skunberg
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. 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.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.
Quoted 5 lines
Quoted 3 lines
thanks,
greg k-h
Compiled, booted, and no regressions on my system.
Thanks for testing all of these and letting me know.
greg k-h
Jon Hunter
maintainerQuoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.2:
12 builds: 12 pass, 0 fail
22 boots: 22 pass, 0 fail
38 tests: 38 pass, 0 failLinux version: 5.2.12-rc1-gb6eedcb8cf66
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04Cheers
Jon
Signature · 1 line
nvpublic
Greg Kroah-Hartman
maintainerQuoted 23 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.2.12 release. There are 143 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 Fri 06 Sep 2019 05:50:23 PM UTC. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.12-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.2.y
and the diffstat can be found below.thanks,
greg k-h
All tests are passing for Tegra ...
Test results for stable-v5.2:
Quoted 8 lines
12 builds: 12 pass, 0 fail 22 boots: 22 pass, 0 fail 38 tests: 38 pass, 0 failLinux version: 5.2.12-rc1-gb6eedcb8cf66
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra30-cardhu-a04
Thanks for testing all of these and letting me know.
greg k-h