4.17.19-stable review
Subsystems (9)
Greg Kroah-Hartman
maintainercover 4.17.19-stable review
NOTE, this is going to be the LAST 4.17.y kernel release. Please move to the 4.18.y tree at this point in time if you have not already. After this release, 4.17.y will be end-of-life.
This is the start of the stable review cycle for the 4.17.19 release. There are 324 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 Sat Aug 25 07:48:40 UTC 2018. 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/v4.x/stable-review/patch-4.17.19-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-4.17.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.17.19-rc1
Jann Horn <[email protected]>
reiserfs: fix broken xattr handling (heap corruption, bad retval)
Esben Haabendal <[email protected]>
i2c: imx: Fix race condition in dma read
Hans de Goede <[email protected]>
i2c: core: ACPI: Properly set status byte to 0 for multi-byte writes
Lukas Wunner <[email protected]>
PCI: pciehp: Fix unprotected list iteration in IRQ handler
Lukas Wunner <[email protected]>
PCI: pciehp: Fix use-after-free on unplug
Myron Stowe <[email protected]>
PCI: Skip MPS logic for Virtual Functions (VFs)
Lukas Wunner <[email protected]>
PCI: hotplug: Don't leak pci_slot on registration failure
Rafael J. Wysocki <[email protected]>
PCI / ACPI / PM: Resume all bridges on suspend-to-RAM
Christian König <[email protected]>
PCI: Restore resized BAR state on resume
Ursula Braun <[email protected]>
net/smc: no shutdown in state SMC_LISTEN
Willem de Bruijn <[email protected]>
packet: refine ring v3 block size test to hold one frame
Florian Westphal <[email protected]>
netfilter: conntrack: dccp: treat SYNC/SYNCACK as invalid if no prior state
Eric Dumazet <[email protected]>
xfrm_user: prevent leaking 2 bytes of kernel memory
John David Anglin <[email protected]>
parisc: Remove ordered stores from syscall.S
John David Anglin <[email protected]>
parisc: Remove unnecessary barriers from spinlock.h
Gustavo A. R. Silva <[email protected]>
drm/amdgpu/pm: Fix potential Spectre v1
Gustavo A. R. Silva <[email protected]>
drm/i915/kvmgt: Fix potential Spectre v1
Jeremy Cline <[email protected]>
ext4: fix spectre gadget in ext4_mb_regular_allocator()
Dave Hansen <[email protected]>
x86/mm/init: Remove freed kernel image areas from alias mapping
Dave Hansen <[email protected]>
x86/mm/init: Add helper for freeing kernel image pages
Dave Hansen <[email protected]>
x86/mm/init: Pass unconverted symbol addresses to free_init_pages()
Dave Hansen <[email protected]>
mm: Allow non-direct-map arguments to free_reserved_area()
Matthijs van Duin <[email protected]>
pty: fix O_CLOEXEC for TIOCGPTPEER
Takashi Iwai <[email protected]>
EDAC: Add missing MEM_LRDDR4 entry in edac_mem_types[]
Linus Torvalds <[email protected]>
mm: make vm_area_alloc() initialize core fields
Linus Torvalds <[email protected]>
mm: make vm_area_dup() actually copy the old vma data
Linus Torvalds <[email protected]>
mm: use helper functions for allocating and freeing vm_area structs
Roland Dreier <[email protected]>
nvme: fix handling of metadata_len for NVME_IOCTL_IO_CMD
Damien Thébault <[email protected]>
platform/x86: dell-laptop: Fix backlight detection
Uwe Kleine-König <[email protected]>
ARM: dts: imx6: RDU2: fix irq type for mv88e6xxx switch
Robin H. Johnson <[email protected]>
ACPI / EC: Use ec_no_wakeup on more Thinkpad X1 Carbon 6th systems
Anson Huang <[email protected]>
soc: imx: gpc: restrict register range for regmap access
Randy Dunlap <[email protected]>
tcp: identify cryptic messages as TCP seq # bugs
Alexander Sverdlin <[email protected]>
net: cavium: Add fine-granular dependencies on PCI
Stefan Wahren <[email protected]>
net: qca_spi: Fix log level if probe fails
Stefan Wahren <[email protected]>
net: qca_spi: Make sure the QCA7000 reset is triggered
Stefan Wahren <[email protected]>
net: qca_spi: Avoid packet drop during initial sync
Sergei Shtylyov <[email protected]>
PCI: v3-semi: Fix I/O space page leak
Sergei Shtylyov <[email protected]>
PCI: mediatek: Fix I/O space page leak
Sergei Shtylyov <[email protected]>
PCI: faraday: Fix I/O space page leak
Sergei Shtylyov <[email protected]>
PCI: aardvark: Fix I/O space page leak
Sergei Shtylyov <[email protected]>
PCI: designware: Fix I/O space page leak
Sergei Shtylyov <[email protected]>
PCI: versatile: Fix I/O space page leak
Sergei Shtylyov <[email protected]>
PCI: xgene: Fix I/O space page leak
Sergei Shtylyov <[email protected]>
PCI: OF: Fix I/O space page leak
Karsten Graul <[email protected]>
net/smc: reset recv timeout after clc handshake
Peng Hao <[email protected]>
kvmclock: fix TSC calibration for nested guests
David Lechner <[email protected]>
net: usb: rtl8150: demote allmulti message to dev_dbg()
Alexander Sverdlin <[email protected]>
octeon_mgmt: Fix MIX registers configuration on MTU setup
Scott Bauer <[email protected]>
nvme: ensure forward progress during Admin passthru
Qu Wenruo <[email protected]>
btrfs: scrub: Don't use inode page cache in scrub_handle_errored_block()
Pavel Machek <[email protected]>
ARM: dts: omap4-droid4: fix dts w.r.t. pwm
John Allen <[email protected]>
ibmvnic: Fix error recovery on login failure
Randy Dunlap <[email protected]>
net/ethernet/freescale/fman: fix cross-build error
Stephen Hemminger <[email protected]>
hv/netvsc: fix handling of fallback to single queue mode
Thomas Falcon <[email protected]>
ibmvnic: Revise RX/TX queue error messages
Frank Rowand <[email protected]>
of: overlay: update phandle cache on overlay apply and remove
Dan Carpenter <[email protected]>
drm/nouveau/gem: off by one bugs in nouveau_gem_pushbuf_reloc_apply()
Juri Lelli <[email protected]>
sched/deadline: Fix switched_from_dl() warning
Jim Mattson <[email protected]>
kvm: nVMX: Restore exit qual for VM-entry failure due to MSR loading
piaojun <[email protected]>
net/9p/client.c: put refcount of trans_mod in error case in parse_opts()
Wei Yongjun <[email protected]>
pinctrl: nsp: Fix potential NULL dereference
Dan Carpenter <[email protected]>
pinctrl: nsp: off by ones in nsp_pinmux_enable()
Paul Cercueil <[email protected]>
pinctrl: ingenic: Fix inverted direction for < JZ4770
Yuchung Cheng <[email protected]>
tcp: remove DELAYED ACK events in DCTCP
Dan Carpenter <[email protected]>
qlogic: check kstrtoul() for errors
Alexandre Belloni <[email protected]>
rtc: fix alarm read and set offset
Willem de Bruijn <[email protected]>
packet: reset network header if packet shorter than ll reserved space
Bert Kenward <[email protected]>
sfc: hold filter_sem consistently during reset
Bert Kenward <[email protected]>
sfc: avoid hang from nested use of the filter_sem
Masahiro Yamada <[email protected]>
kbuild: suppress warnings from 'getconf LFS_*'
Laura Abbott <[email protected]>
tools: build: Use HOSTLDFLAGS with fixdep
Laura Abbott <[email protected]>
tools: build: Fixup host c flags
Dan Carpenter <[email protected]>
ixgbe: Off by one in ixgbe_ipsec_tx()
David Francis <[email protected]>
amd/dc/dce100: On dce100, set clocks to 0 on suspend
Alexander Duyck <[email protected]>
ixgbe: Be more careful when modifying MAC filters
Adam Ford <[email protected]>
ARM: dts: am3517.dtsi: Disable reference to OMAP3 OTG controller
Nishanth Menon <[email protected]>
ARM: DRA7/OMAP5: Enable ACTLR[0] (Enable invalidates of BTB) for secondary cores
Russell King <[email protected]>
sfp: fix module initialisation with netdev already up
Russell King <[email protected]>
sfp: ensure we clean up properly on bus registration failure
Steven Rostedt (VMware) <[email protected]>
ARM: 8780/1: ftrace: Only set kernel memory back to read-only after boot
Kamal Heib <[email protected]>
RDMA/mlx5: Fix memory leak in mlx5_ib_create_srq() error path
Dave Jiang <[email protected]>
nfit: fix unchecked dereference in acpi_nfit_ctl
Jeremy Cline <[email protected]>
perf tools: Use python-config --includes rather than --cflags
Janne Huttunen <[email protected]>
perf script python: Fix dict reference counting
Jiri Olsa <[email protected]>
perf tools: Fix compilation errors on gcc8
Kim Phillips <[email protected]>
perf test shell: Prevent temporary editor files from being considered test scripts
Kim Phillips <[email protected]>
perf llvm-utils: Remove bashism from kernel include fetch script
Manish Rangankar <[email protected]>
scsi: qedi: Send driver state to MFW
Saurav Kashyap <[email protected]>
scsi: qedf: Send the driver state to MFW
Don Brace <[email protected]>
scsi: hpsa: correct enclosure sas address
Taeung Song <[email protected]>
samples/bpf: Fix tc and ip paths in xdp2skb_meta.sh
Vikas Gupta <[email protected]>
bnxt_en: Fix for system hang if request_irq fails
Michael Chan <[email protected]>
bnxt_en: Do not modify max IRQ count after RDMA driver requests/frees IRQs.
Michael Chan <[email protected]>
bnxt_en: Always set output parameters in bnxt_get_max_rings().
Michael Chan <[email protected]>
bnxt_en: Fix inconsistent BNXT_FLAG_AGG_RINGS logic.
Venkat Duvvuru <[email protected]>
bnxt_en: Fix the vlan_tci exact match check.
Peter Zijlstra <[email protected]>
ARC: Improve cmpxchg syscall implementation
Gustavo Pimentel <[email protected]>
ARC: [plat-hsdk]: Configure APB GPIO controller on ARC HSDK platform
Andrey Ryabinin <[email protected]>
netfilter: nf_conntrack: Fix possible possible crash on module loading.
Florian Westphal <[email protected]>
netfilter: nft_compat: explicitly reject ERROR and standard target
Russell King <[email protected]>
drm/armada: fix irq handling
Russell King <[email protected]>
drm/armada: fix colorkey mode property
Michael Hennerich <[email protected]>
net: ieee802154: adf7242: Fix OCL calibration runs
Michael Hennerich <[email protected]>
net: ieee802154: adf7242: Fix erroneous RX enable
Mikko Perttunen <[email protected]>
drm/tegra: Fix comparison operator for buffer size
Dmitry Osipenko <[email protected]>
gpu: host1x: Check whether size of unpin isn't 0
Dmitry Osipenko <[email protected]>
gpu: host1x: Skip IOMMU initialization if firewall is enabled
Stefan Schmidt <[email protected]>
ieee802154: fakelb: switch from BUG_ON() to WARN_ON() on problem
Stefan Schmidt <[email protected]>
ieee802154: at86rf230: use __func__ macro for debug messages
Stefan Schmidt <[email protected]>
ieee802154: at86rf230: switch from BUG_ON() to WARN_ON() on problem
Arnd Bergmann <[email protected]>
drm/sun4i: link in front-end code if needed
Paolo Abeni <[email protected]>
ipfrag: really prevent allocation on netns exit
John Fastabend <[email protected]>
bpf: fix sk_skb programs without skb->dev assigned
Douglas Anderson <[email protected]>
nvmem: Don't let a NULL cell_id for nvmem_cell_get() crash us
Davide Caratti <[email protected]>
net/sched: act_tunnel_key: fix NULL dereference when 'goto chain' is used
Davide Caratti <[email protected]>
net/sched: act_csum: fix NULL dereference when 'goto chain' is used
Harini Katakam <[email protected]>
net: macb: Free RX ring for all queues
Daniel Mack <[email protected]>
ARM: pxa: irq: fix handling of ICMR registers in suspend/resume
Casey Leedom <[email protected]>
cxgb4: assume flash part size to be 4MB, if it can't be determined
Jon Maloy <[email protected]>
tipc: make function tipc_net_finalize() thread safe
Jon Maloy <[email protected]>
tipc: fix correct setting of message type in second discoverer
Jon Maloy <[email protected]>
tipc: correct discovery message handling during address trial period
Jon Maloy <[email protected]>
tipc: fix wrong return value from function tipc_node_try_addr()
Vladimir Zapolskiy <[email protected]>
ravb: fix invalid context bug while changing link options by ethtool
Vladimir Zapolskiy <[email protected]>
ravb: fix invalid context bug while calling auto-negotiation by ethtool
Vladimir Zapolskiy <[email protected]>
sh_eth: fix invalid context bug while changing link options by ethtool
Vladimir Zapolskiy <[email protected]>
sh_eth: fix invalid context bug while calling auto-negotiation by ethtool
Arun Kumar Neelakantam <[email protected]>
net: qrtr: Reset the node and port ID of broadcast messages
Arun Kumar Neelakantam <[email protected]>
net: qrtr: Broadcast messages only from control port
Paul Moore <[email protected]>
ipv6: make ipv6_renew_options() interrupt/kernel safe
Dan Carpenter <[email protected]>
qed: off by one in qed_parse_mcp_trace_buf()
Florian Westphal <[email protected]>
netfilter: x_tables: set module owner for icmp(6) matches
Lubomir Rintel <[email protected]>
ieee802154: 6lowpan: set IFLA_LINK
Arnd Bergmann <[email protected]>
ieee802154: mcr20a: add missing includes
Taeung Song <[email protected]>
samples/bpf: Check the error of write() and read()
Taeung Song <[email protected]>
samples/bpf: Check the result of system()
Taeung Song <[email protected]>
samples/bpf: add missing <linux/if_vlan.h>
Jim Wilson <[email protected]>
RISC-V: Fix PTRACE_SETREGSET bug.
Palmer Dabbelt <[email protected]>
RISC-V: Don't include irq-riscv-intc.h
Andreas Schwab <[email protected]>
RISC-V: fix R_RISCV_ADD32/R_RISCV_SUB32 relocations
Maciej Purski <[email protected]>
drm/bridge/sii8620: Fix display of packed pixel modes
Yuiko Oshino <[email protected]>
smsc75xx: Add workaround for gigabit link up hardware errata.
Wang Dongsheng <[email protected]>
net: phy: marvell: change default m88e1510 LED configuration
Zhen Lei <[email protected]>
kasan: fix shadow_size calculation error in kasan_module_alloc
Mathieu Malaterre <[email protected]>
tracing: Use __printf markup to silence compiler
Mauricio Vasquez B <[email protected]>
bpf: hash map: decrement counter on error
Heiner Kallweit <[email protected]>
r8169: fix mac address change
Doron Roberts-Kedes <[email protected]>
tls: fix skb_to_sgvec returning unhandled error.
Fabio Estevam <[email protected]>
ARM: imx_v4_v5_defconfig: Select ULPI support
Fabio Estevam <[email protected]>
ARM: imx_v6_v7_defconfig: Select ULPI support
Jason Gerecke <[email protected]>
HID: wacom: Correct touch maximum XY of 2nd-gen Intuos
Zhenzhong Duan <[email protected]>
x86/mm/32: Initialize the CR4 shadow before __flush_tlb_all()
Peter Zijlstra <[email protected]>
kthread, sched/core: Fix kthread_parkme() (again...)
Vincent Guittot <[email protected]>
sched/util_est: Fix util_est_dequeue() for throttled cfs_rq
Xunlei Pang <[email protected]>
sched/fair: Fix bandwidth timer clock drift condition
Frederic Weisbecker <[email protected]>
sched/nohz: Skip remote tick on idle task entirely
Greentime Hu <[email protected]>
nds32: Fix the dts pointer is not passed correctly issue.
Alex Deucher <[email protected]>
drm/amdgpu: fix swapped emit_ib_size in vce3
Kai-Heng Feng <[email protected]>
usb: xhci: dbc: Don't decrement runtime PM counter if DBC is not started
Hangbin Liu <[email protected]>
ipvlan: call dev_change_flags when ipvlan mode is reset
Josh Poimboeuf <[email protected]>
objtool: Support GCC 8 '-fnoreorder-functions'
Greg Ungerer <[email protected]>
m68k: fix "bad page state" oops on ColdFire boot
Eric Biggers <[email protected]>
crypto: arm/speck - fix building in Thumb2 mode
Stafford Horne <[email protected]>
openrisc: entry: Fix delay slot exception detection
Vishal Verma <[email protected]>
tools/testing/nvdimm: advertise a write cache for nfit_test
Dave Jiang <[email protected]>
acpi/nfit: fix cmd_rc for acpi_nfit_ctl to always return a value
Julian Wiedmann <[email protected]>
s390/qeth: consistently re-enable device features
Madalin Bucur <[email protected]>
dpaa_eth: DPAA SGT needs to be 256B
Madalin Bucur <[email protected]>
fsl/fman: fix parser reporting bad checksum on short frames
Sudarsana Reddy Kalluru <[email protected]>
bnx2x: Fix receiving tx-timeout in error or recovery state.
Nicholas Mc Guire <[email protected]>
PCI: faraday: Add missing of_node_put()
Nicholas Mc Guire <[email protected]>
PCI: xilinx-nwl: Add missing of_node_put()
Nicholas Mc Guire <[email protected]>
PCI: xilinx: Add missing of_node_put()
Daniel Borkmann <[email protected]>
bpf, s390: fix potential memleak when later bpf_jit_prog fails
Bart Van Assche <[email protected]>
drbd: Fix drbd_request_prepare() discard handling
Jens Axboe <[email protected]>
blk-mq: don't queue more if we get a busy return
Marek Szyprowski <[email protected]>
drm/exynos: decon5433: Fix WINCONx reset value
Marek Szyprowski <[email protected]>
drm/exynos: decon5433: Fix per-plane global alpha for XRGB modes
Marek Szyprowski <[email protected]>
drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes
Johannes Berg <[email protected]>
nl80211: check nla_parse_nested() return values
Bob Copeland <[email protected]>
nl80211: relax ht operation checks for mesh
Denis Kenzior <[email protected]>
mac80211: disable BHs/preemption in ieee80211_tx_control_port()
Jeff Moyer <[email protected]>
dev-dax: check_vma: ratelimit dev_info-s
BingJing Chang <[email protected]>
md/raid10: fix that replacement cannot complete recovery after reassemble
Evan Quan <[email protected]>
drm/amd/powerplay: correct vega12 thermal support as true
Ryan Hsu <[email protected]>
ath10k: update the phymode along with bandwidth change request
Dan Carpenter <[email protected]>
dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
Marek Szyprowski <[email protected]>
dmaengine: pl330: report BURST residue granularity
Martin Blumenstingl <[email protected]>
ARM64: dts: meson-gxl: fix Mali GPU compatible string
Jerome Brunet <[email protected]>
ARM64: dts: meson-axg: fix ethernet stability issue
Will Deacon <[email protected]>
arm64: Avoid flush_icache_range() in alternatives patching code
Katsuhiro Suzuki <[email protected]>
arm64: dts: uniphier: fix widget name of headphone for LD11/LD20 boards
Keerthy <[email protected]>
ARM: dts: da850: Fix interrups property for gpio
Andy Lutomirski <[email protected]>
selftests/x86/sigreturn: Do minor cleanups
Andy Lutomirski <[email protected]>
selftests/x86/sigreturn/64: Fix spurious failures on AMD CPUs
Chengguang Xu <[email protected]>
nfp: cast sizeof() to int when comparing with error code
Sowmini Varadhan <[email protected]>
rds: clean up loopback rds_connections on netns deletion
Eli Cohen <[email protected]>
net/mlx5: E-Switch, Disallow vlan/spoofcheck setup if not being esw manager
Yan, Zheng <[email protected]>
ceph: fix dentry leak in splice_dentry()
Jann Horn <[email protected]>
netfilter: nf_log: fix uninit read in nf_log_proc_dostring
Adam Ford <[email protected]>
ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD
Peter Chen <[email protected]>
usb: chipidea: host: fix disconnection detect issue
Dan Carpenter <[email protected]>
clk: davinci: cfgchip: testing the wrong variable
Ravi Bangoria <[email protected]>
perf tools: Fix crash caused by accessing feat_ops[HEADER_LAST_FEATURE]
Ravi Bangoria <[email protected]>
perf script: Fix crash because of missing evsel->priv
Jiri Olsa <[email protected]>
perf bench: Fix numa report output code
Yonghong Song <[email protected]>
perf tools: Fix a clang 7.0 compilation error
Jiri Olsa <[email protected]>
perf tests: Add event parsing error handling to parse events test
Sandipan Das <[email protected]>
perf report powerpc: Fix crash if callchain is empty
Thomas Richter <[email protected]>
perf test session topology: Fix test on s390
Thomas Richter <[email protected]>
perf record: Support s390 random socket_id assignment
Dirk Gouders <[email protected]>
kconfig: fix line numbers for if-entries in menu tree
Dan Carpenter <[email protected]>
typec: tcpm: Fix a msecs vs jiffies bug
Hans de Goede <[email protected]>
NFC: pn533: Fix wrong GFP flag usage
Ajay Gupta <[email protected]>
usb: xhci: increase CRS timeout value
Dongjiu Geng <[email protected]>
usb: xhci: remove the code build warning
Jakub Kicinski <[email protected]>
nfp: bpf: don't stop offload if replace failed
Takashi Iwai <[email protected]>
ALSA: seq: Fix UBSAN warning at SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT ioctl
Daniel Mack <[email protected]>
ARM: dts: am437x: make edt-ft5x06 a wakeup source
Haiyue Wang <[email protected]>
ipmi: kcs_bmc: fix IRQ exception if the channel is not open
Michael Trimarchi <[email protected]>
brcmfmac: stop watchdog before detach and free everything
Tomasz Duszynski <[email protected]>
iio: pressure: bmp280: fix relative humidity unit
Ganesh Goudar <[email protected]>
cxgb4: when disabling dcb set txq dcb priority to 0
Linus Lüssing <[email protected]>
batman-adv: Fix multicast TT issues with bogus ROAM flags
Linus Lüssing <[email protected]>
batman-adv: Avoid storing non-TT-sync flags on singular entries too
Sven Eckelmann <[email protected]>
batman-adv: Fix debugfs path for renamed softif
Sven Eckelmann <[email protected]>
batman-adv: Fix debugfs path for renamed hardif
Sven Eckelmann <[email protected]>
batman-adv: Fix bat_v best gw refcnt after netlink dump
Sven Eckelmann <[email protected]>
batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
Rob Herring <[email protected]>
arm64: dts: msm8916: fix Coresight ETF graph connections
Casey Schaufler <[email protected]>
Smack: Mark inode instant in smack_task_to_inode
Hangbin Liu <[email protected]>
ipv6: mcast: fix unsolicited report interval after receiving querys
Zhenzhong Duan <[email protected]>
x86/microcode/intel: Fix memleak in save_microcode_patch()
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Fix reprogramming of redistributors on CPU hotplug
Marc Zyngier <[email protected]>
irqchip/gic-v2m: Fix SPI release on error path
Geert Uytterhoeven <[email protected]>
mtd: dataflash: Use ULL suffix for 64-bit constants
Jeffrin Jose T <[email protected]>
selftests: bpf: notification about privilege required to run test_kmod.sh testing script
Steven Rostedt (VMware) <[email protected]>
locking/lockdep: Do not record IRQ state within lockdep code
Masahiro Yamada <[email protected]>
clk: sunxi-ng: replace lib-y with obj-y
Jianchao Wang <[email protected]>
nvme-pci: move nvme_kill_queues to nvme_remove_dead_ctrl
Maciej Purski <[email protected]>
drm/bridge/sii8620: fix display of packed pixel modes in MHL2
Ard Biesheuvel <[email protected]>
KVM: arm/arm64: Drop resource size check for GICV window
Marcelo Ricardo Leitner <[email protected]>
sctp: fix erroneous inc of snmp SctpFragUsrMsgs
Bartosz Golaszewski <[email protected]>
net: davinci_emac: match the mdio device against its compatible if possible
Doron Roberts-Kedes <[email protected]>
nbd: Add the nbd NBD_DISCONNECT_ON_CLOSE config flag.
Anders Roxell <[email protected]>
selftests: net: add config fragments
Alexey Brodkin <[email protected]>
ARC: Enable machine_desc->init_per_cpu for !CONFIG_SMP
Dan Carpenter <[email protected]>
block: sed-opal: Fix a couple off by one bugs
Dan Carpenter <[email protected]>
blk-mq-debugfs: Off by one in blk_mq_rq_state_name()
Max Gurtuvoy <[email protected]>
nvmet: reset keep alive timer in controller enable
Israel Rukshin <[email protected]>
nvme-rdma: Fix command completion race at error recovery
Sagi Grimberg <[email protected]>
nvme-rdma: fix possible double free condition when failing to create a controller
Dinh Nguyen <[email protected]>
net: stmmac: socfpga: add additional ocp reset line for Stratix10
Li RongQing <[email protected]>
net: propagate dev_get_valid_name return code
Stefan Agner <[email protected]>
net: hamradio: use eth_broadcast_addr
Govindarajulu Varadarajan <[email protected]>
enic: initialize enic->rfs_h.lock in enic_probe
Sudarsana Reddy Kalluru <[email protected]>
qed: Do not advertise DCBX_LLD_MANAGED capability.
Sudarsana Reddy Kalluru <[email protected]>
qed: Add sanity check for SIMD fastpath handler.
Sudarsana Reddy Kalluru <[email protected]>
qed: Fix possible memory leak in Rx error path handling.
Zhizhou Zhang <[email protected]>
arm64: make secondary_start_kernel() notrace
Marek Szyprowski <[email protected]>
arm64: dma-mapping: clear buffers allocated with FORCE_CONTIGUOUS flag
Zhouyang Jia <[email protected]>
xen/scsiback: add error handling for xenbus_printf
Zhouyang Jia <[email protected]>
scsi: xen-scsifront: add error handling for xenbus_printf
Trond Myklebust <[email protected]>
pNFS: Always free the session slot on error in nfs4_layoutget_handle_exception
Zhouyang Jia <[email protected]>
xen: add error handling for xenbus_printf
Nicholas Piggin <[email protected]>
powerpc: smp_send_stop do not offline stopped CPUs
Minas Harutyunyan <[email protected]>
dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation
Grigor Tovmasyan <[email protected]>
usb: gadget: dwc2: fix memory leak in gadget_init()
Chunfeng Yun <[email protected]>
usb: gadget: composite: fix delayed_status race condition when set_interface
William Wu <[email protected]>
usb: dwc2: fix isoc split in transfer with no data
William Wu <[email protected]>
usb: dwc2: alloc dma aligned buffer for isoc split in
Artur Petrosyan <[email protected]>
usb: dwc2: Fix host exit from hibernation flow.
Janusz Krzysztofik <[email protected]>
dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity
John Garry <[email protected]>
libahci: Fix possible Spectre-v1 pmp indexing in ahci_led_store()
Vijay Immanuel <[email protected]>
IB/rxe: Fix missing completion for mem_reg work requests
Ayan Kumar Halder <[email protected]>
drm/mali-dp: Rectify the width and height passed to rotmem_required()
Ayan Kumar Halder <[email protected]>
drm/arm/malidp: Preserve LAYER_FORMAT contents when setting format
Alison Wang <[email protected]>
drm: mali-dp: Enable Global SE interrupts mask for DP500
Ayan Kumar Halder <[email protected]>
drm/arm/malidp: Ensure that the crtcs are shutdown before removing any encoder/connector
Hoan Tran <[email protected]>
drivers/perf: xgene_pmu: Fix IOB SLOW PMU parser error
Ray Jui <[email protected]>
arm64: dts: Stingray: Fix I2C controller interrupt type
Ray Jui <[email protected]>
arm64: dts: ns2: Fix PCIe controller interrupt type
Ray Jui <[email protected]>
arm64: dts: ns2: Fix I2C controller interrupt type
Scott Branden <[email protected]>
arm64: dts: specify 1.8V EMMC capabilities for bcm958742t
Scott Branden <[email protected]>
arm64: dts: specify 1.8V EMMC capabilities for bcm958742k
Ray Jui <[email protected]>
ARM: dts: Cygnus: Fix PCIe controller interrupt type
Ray Jui <[email protected]>
ARM: dts: Cygnus: Fix I2C controller interrupt type
Florian Fainelli <[email protected]>
ARM: dts: BCM5301x: Fix i2c controller interrupt type
Florian Fainelli <[email protected]>
ARM: dts: HR2: Fix interrupt types for i2c and PCIe
Florian Fainelli <[email protected]>
ARM: dts: NSP: Fix PCIe controllers interrupt types
Florian Fainelli <[email protected]>
ARM: dts: NSP: Fix i2c controller interrupt type
Fathi Boudra <[email protected]>
selftests: sync: add config fragment for testing sync framework
Shuah Khan (Samsung OSG) <[email protected]>
selftests: vm: return Kselftest Skip code for skipped tests
Shuah Khan (Samsung OSG) <[email protected]>
selftests: zram: return Kselftest Skip code for skipped tests
Shuah Khan (Samsung OSG) <[email protected]>
selftests: user: return Kselftest Skip code for skipped tests
Shuah Khan (Samsung OSG) <[email protected]>
selftests: sysctl: return Kselftest Skip code for skipped tests
Shuah Khan (Samsung OSG) <[email protected]>
selftests: static_keys: return Kselftest Skip code for skipped tests
Shuah Khan (Samsung OSG) <[email protected]>
selftests: pstore: return Kselftest Skip code for skipped tests
Gao Feng <[email protected]>
netfilter: nf_ct_helper: Fix possible panic after nf_conntrack_helper_unregister
Eric Dumazet <[email protected]>
netfilter: ipv6: nf_defrag: reduce struct net memory waste
Mika Westerberg <[email protected]>
ACPI / EC: Use ec_no_wakeup on Thinkpad X1 Carbon 6th
Johan Hovold <[email protected]>
usb: dwc3: of-simple: fix use-after-free on remove
Minas Harutyunyan <[email protected]>
usb: dwc2: gadget: Fix issue in dwc2_gadget_start_isoc()
Vincent Pelletier <[email protected]>
usb: gadget: ffs: Fix BUG when userland exits with submitted AIO transfers
Heikki Krogerus <[email protected]>
usb: dwc3: pci: add support for Intel IceLake
Anson Huang <[email protected]>
soc: imx: gpcv2: correct PGC offset
Guenter Roeck <[email protected]>
hwmon: (nct6775) Fix loop limit
Helge Eichelberg <[email protected]>
hwmon: (dell-smm) Disable fan support for Dell XPS13 9333
Steve French <[email protected]>
smb3: increase initial number of credits requested to allow write
Jakub Kicinski <[email protected]>
selftests/bpf: test offloads even with BPF programs present
Alexey Brodkin <[email protected]>
ARC: Explicitly add -mmedium-calls to CFLAGS
Maciej Purski <[email protected]>
drm/bridge/sii8620: fix potential buffer overflow
Maciej Purski <[email protected]>
drm/bridge/sii8620: fix display modes validation
Andrzej Hajda <[email protected]>
drm/bridge/sii8620: fix loops in EDID fetch logic
Julia Lawall <[email protected]>
clocksource/drivers/stm32: Fix error return code
Christophe Jaillet <[email protected]>
IB/mlx4: Fix an error handling path in 'mlx4_ib_rereg_user_mr()'
Lucas Stach <[email protected]>
Input: synaptics-rmi4 - fix axis-swap behavior
Kalderon, Michal <[email protected]>
RDMA/qedr: Fix NULL pointer dereference when running over iWARP without RDMA-CM
Zhu Yanjun <[email protected]>
IB/rxe: avoid double kfree skb
Nicolas Boichat <[email protected]>
HID: google: Add support for whiskers
Jiri Olsa <[email protected]>
perf tools: Fix error index for pmu event parser
Dong Jia Shi <[email protected]>
vfio: ccw: fix error return in vfio_ccw_sch_event
Viresh Kumar <[email protected]>
arm: dts: armada: Fix "#cooling-cells" property's name
-------------
Diffstat:
Makefile | 10 +- arch/arc/Makefile | 15 +-- arch/arc/include/asm/mach_desc.h | 2 - arch/arc/kernel/irq.c | 2 +- arch/arc/kernel/process.c | 47 ++++++-- arch/arc/plat-hsdk/platform.c | 62 +++++++++++ arch/arm/boot/dts/am3517.dtsi | 5 + arch/arm/boot/dts/am437x-sk-evm.dts | 2 + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- arch/arm/boot/dts/bcm-cygnus.dtsi | 24 ++-- arch/arm/boot/dts/bcm-hr2.dtsi | 24 ++-- arch/arm/boot/dts/bcm-nsp.dtsi | 32 +++--- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- arch/arm/boot/dts/da850.dtsi | 6 +- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 2 +- arch/arm/boot/dts/omap4-droid4-xt894.dts | 9 +- arch/arm/configs/imx_v4_v5_defconfig | 2 + arch/arm/configs/imx_v6_v7_defconfig | 2 + arch/arm/crypto/speck-neon-core.S | 6 +- arch/arm/mach-davinci/board-da850-evm.c | 2 +- arch/arm/mach-omap2/omap-smp.c | 41 +++++++ arch/arm/mach-pxa/irq.c | 4 +- arch/arm/mm/init.c | 9 ++ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 15 ++- arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 2 +- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 8 +- .../boot/dts/broadcom/stingray/bcm958742k.dts | 4 + .../boot/dts/broadcom/stingray/bcm958742t.dts | 4 + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 +- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- .../boot/dts/socionext/uniphier-ld11-global.dts | 2 +- .../boot/dts/socionext/uniphier-ld20-global.dts | 2 +- arch/arm64/include/asm/alternative.h | 7 +- arch/arm64/kernel/alternative.c | 51 +++++++-- arch/arm64/kernel/module.c | 5 +- arch/arm64/kernel/smp.c | 2 +- arch/arm64/mm/dma-mapping.c | 9 +- arch/ia64/kernel/perfmon.c | 6 +- arch/ia64/mm/init.c | 12 +- arch/m68k/include/asm/mcf_pgalloc.h | 4 +- arch/nds32/kernel/setup.c | 3 +- arch/openrisc/kernel/entry.S | 8 +- arch/openrisc/kernel/head.S | 9 +- arch/openrisc/kernel/traps.c | 2 +- arch/parisc/include/asm/spinlock.h | 8 +- arch/parisc/kernel/syscall.S | 24 ++-- arch/powerpc/kernel/smp.c | 6 - arch/riscv/kernel/irq.c | 4 - arch/riscv/kernel/module.c | 4 +- arch/riscv/kernel/ptrace.c | 2 +- arch/s390/net/bpf_jit_comp.c | 1 + arch/x86/include/asm/processor.h | 1 + arch/x86/include/asm/set_memory.h | 1 + arch/x86/kernel/cpu/microcode/intel.c | 5 +- arch/x86/kernel/kvmclock.c | 1 + arch/x86/kernel/smpboot.c | 5 + arch/x86/kvm/vmx.c | 9 +- arch/x86/mm/init.c | 37 ++++++- arch/x86/mm/init_64.c | 8 +- arch/x86/mm/pageattr.c | 13 +++ block/blk-mq-debugfs.c | 2 +- block/blk-mq.c | 12 ++ block/sed-opal.c | 4 +- drivers/acpi/ec.c | 20 ++++ drivers/acpi/nfit/core.c | 4 + drivers/ata/libahci.c | 7 +- drivers/block/drbd/drbd_req.c | 4 +- drivers/block/nbd.c | 40 +++++-- drivers/char/ipmi/kcs_bmc.c | 31 ++---- drivers/clk/Makefile | 2 +- drivers/clk/davinci/da8xx-cfgchip.c | 2 +- drivers/clk/sunxi-ng/Makefile | 39 +++---- drivers/clocksource/timer-stm32.c | 4 +- drivers/dax/device.c | 12 +- drivers/dma/k3dma.c | 2 +- drivers/dma/omap-dma.c | 6 +- drivers/dma/pl330.c | 2 +- drivers/edac/edac_mc.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +- .../drm/amd/display/dc/dce100/dce100_resource.c | 19 +++- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 1 + drivers/gpu/drm/arm/malidp_drv.c | 3 +- drivers/gpu/drm/arm/malidp_hw.c | 3 +- drivers/gpu/drm/arm/malidp_planes.c | 9 +- drivers/gpu/drm/armada/armada_crtc.c | 12 +- drivers/gpu/drm/armada/armada_hw.h | 1 + drivers/gpu/drm/armada/armada_overlay.c | 30 +++-- drivers/gpu/drm/bridge/sil-sii8620.c | 121 +++++++++++---------- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 29 +++-- drivers/gpu/drm/exynos/regs-gsc.h | 1 + drivers/gpu/drm/i915/gvt/kvmgt.c | 9 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- drivers/gpu/drm/sun4i/Makefile | 5 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/host1x/dev.c | 3 + drivers/gpu/host1x/job.c | 3 +- drivers/hid/hid-google-hammer.c | 2 + drivers/hid/hid-ids.h | 1 + drivers/hid/wacom_wac.c | 10 +- drivers/hwmon/dell-smm-hwmon.c | 7 ++ drivers/hwmon/nct6775.c | 2 +- drivers/i2c/busses/i2c-imx.c | 8 +- drivers/i2c/i2c-core-acpi.c | 11 +- drivers/iio/pressure/bmp280-core.c | 5 +- drivers/infiniband/hw/mlx4/mr.c | 7 +- drivers/infiniband/hw/mlx5/srq.c | 18 ++- drivers/infiniband/hw/qedr/verbs.c | 3 + drivers/infiniband/sw/rxe/rxe_req.c | 5 +- drivers/input/rmi4/rmi_2d_sensor.c | 34 +++--- drivers/irqchip/irq-gic-v2m.c | 2 +- drivers/irqchip/irq-gic-v3-its.c | 10 ++ drivers/md/raid10.c | 7 ++ drivers/mtd/devices/mtd_dataflash.c | 4 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 15 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 - drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 30 ++++- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 - drivers/net/ethernet/cadence/macb_main.c | 11 +- drivers/net/ethernet/cavium/Kconfig | 12 +- drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 14 ++- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 35 +++--- drivers/net/ethernet/cisco/enic/enic_clsf.c | 3 +- drivers/net/ethernet/cisco/enic/enic_main.c | 3 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 15 +-- drivers/net/ethernet/freescale/fman/fman_port.c | 8 ++ drivers/net/ethernet/ibm/ibmvnic.c | 43 +++++--- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 12 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 12 +- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 - drivers/net/ethernet/netronome/nfp/bpf/main.c | 6 +- .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 11 +- drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 11 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 12 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 2 + drivers/net/ethernet/qualcomm/qca_spi.c | 21 ++-- drivers/net/ethernet/realtek/r8169.c | 1 + drivers/net/ethernet/renesas/ravb_main.c | 56 +++------- drivers/net/ethernet/renesas/sh_eth.c | 59 +++------- drivers/net/ethernet/sfc/ef10.c | 30 +++-- drivers/net/ethernet/sfc/efx.c | 17 ++- drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 18 ++- drivers/net/ethernet/ti/davinci_emac.c | 4 + drivers/net/hamradio/bpqether.c | 8 +- drivers/net/hyperv/rndis_filter.c | 1 + drivers/net/ieee802154/adf7242.c | 34 +++++- drivers/net/ieee802154/at86rf230.c | 15 +-- drivers/net/ieee802154/fakelb.c | 2 +- drivers/net/ieee802154/mcr20a.c | 3 +- drivers/net/ipvlan/ipvlan_main.c | 36 ++++-- drivers/net/phy/marvell.c | 54 ++++++--- drivers/net/phy/sfp-bus.c | 35 ++++-- drivers/net/usb/rtl8150.c | 2 +- drivers/net/usb/smsc75xx.c | 62 +++++++++++ drivers/net/wireless/ath/ath10k/mac.c | 16 ++- drivers/net/wireless/ath/ath10k/wmi.h | 1 + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 ++ drivers/nfc/pn533/usb.c | 4 +- drivers/nvme/host/core.c | 52 ++++----- drivers/nvme/host/pci.c | 2 +- drivers/nvme/host/rdma.c | 28 +++-- drivers/nvme/target/core.c | 8 ++ drivers/nvmem/core.c | 4 + drivers/of/base.c | 6 +- drivers/of/of_private.h | 2 + drivers/of/overlay.c | 11 ++ drivers/pci/dwc/pcie-designware-host.c | 3 +- drivers/pci/host/pci-aardvark.c | 2 +- drivers/pci/host/pci-ftpci100.c | 4 +- drivers/pci/host/pci-v3-semi.c | 2 +- drivers/pci/host/pci-versatile.c | 2 +- drivers/pci/host/pci-xgene.c | 2 +- drivers/pci/host/pcie-mediatek.c | 2 +- drivers/pci/host/pcie-xilinx-nwl.c | 2 +- drivers/pci/host/pcie-xilinx.c | 1 + drivers/pci/hotplug/pci_hotplug_core.c | 9 ++ drivers/pci/hotplug/pciehp.h | 1 + drivers/pci/hotplug/pciehp_core.c | 7 ++ drivers/pci/hotplug/pciehp_hpc.c | 18 +-- drivers/pci/of.c | 2 +- drivers/pci/pci-acpi.c | 6 +- drivers/pci/pci.c | 66 +++++++++++ drivers/pci/probe.c | 4 + drivers/perf/xgene_pmu.c | 2 +- drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 6 +- drivers/pinctrl/pinctrl-ingenic.c | 2 +- drivers/platform/x86/dell-laptop.c | 2 +- drivers/rtc/interface.c | 8 +- drivers/s390/cio/vfio_ccw_drv.c | 5 +- drivers/s390/net/qeth_core.h | 2 +- drivers/s390/net/qeth_core_main.c | 23 ++-- drivers/s390/net/qeth_l2_main.c | 5 +- drivers/s390/net/qeth_l3_main.c | 3 +- drivers/scsi/hpsa.c | 25 ++++- drivers/scsi/hpsa.h | 1 + drivers/scsi/qedf/qedf_main.c | 12 ++ drivers/scsi/qedi/qedi_main.c | 11 ++ drivers/scsi/xen-scsifront.c | 33 ++++-- drivers/soc/imx/gpc.c | 21 ++++ drivers/soc/imx/gpcv2.c | 13 ++- drivers/tty/pty.c | 2 +- drivers/usb/chipidea/host.c | 5 +- drivers/usb/dwc2/core.h | 3 + drivers/usb/dwc2/gadget.c | 15 ++- drivers/usb/dwc2/hcd.c | 93 +++++++++++++++- drivers/usb/dwc2/hcd.h | 8 ++ drivers/usb/dwc2/hcd_intr.c | 11 +- drivers/usb/dwc2/hcd_queue.c | 3 + drivers/usb/dwc3/dwc3-of-simple.c | 3 +- drivers/usb/dwc3/dwc3-pci.c | 2 + drivers/usb/gadget/composite.c | 3 + drivers/usb/gadget/function/f_fs.c | 26 +++-- drivers/usb/host/xhci-dbgcap.c | 12 +- drivers/usb/host/xhci-tegra.c | 2 +- drivers/usb/host/xhci.c | 7 +- drivers/usb/typec/tcpm.c | 3 +- drivers/xen/manage.c | 18 ++- drivers/xen/xen-scsiback.c | 16 ++- fs/btrfs/scrub.c | 17 +-- fs/ceph/inode.c | 1 + fs/cifs/smb2pdu.c | 5 +- fs/exec.c | 6 +- fs/ext4/mballoc.c | 4 +- fs/nfs/nfs4proc.c | 17 +-- fs/reiserfs/xattr.c | 4 +- include/linux/fsl/guts.h | 1 + include/linux/kthread.h | 1 - include/linux/marvell_phy.h | 2 + include/linux/mm.h | 4 +- include/linux/pci.h | 2 + include/linux/sched.h | 2 +- include/net/ipv6.h | 9 +- include/net/net_namespace.h | 1 + include/net/netns/ipv6.h | 1 - include/net/tc_act/tc_csum.h | 1 - include/net/tc_act/tc_tunnel_key.h | 1 - include/net/tcp.h | 2 - include/uapi/linux/nbd.h | 3 + kernel/bpf/hashtab.c | 16 ++- kernel/fork.c | 35 +++++- kernel/kthread.c | 30 ++++- kernel/locking/lockdep.c | 12 +- kernel/sched/core.c | 67 ++++++------ kernel/sched/deadline.c | 11 +- kernel/sched/fair.c | 30 ++--- kernel/sched/sched.h | 6 +- kernel/trace/trace.c | 5 + mm/kasan/kasan.c | 5 +- mm/mmap.c | 35 ++---- mm/nommu.c | 10 +- mm/page_alloc.c | 16 ++- net/9p/client.c | 3 +- net/batman-adv/bat_iv_ogm.c | 4 +- net/batman-adv/bat_v.c | 4 +- net/batman-adv/debugfs.c | 40 +++++++ net/batman-adv/debugfs.h | 11 ++ net/batman-adv/hard-interface.c | 37 ++++++- net/batman-adv/translation-table.c | 7 +- net/core/dev.c | 4 +- net/core/filter.c | 3 +- net/ieee802154/6lowpan/core.c | 6 + net/ipv4/inet_fragment.c | 2 +- net/ipv4/netfilter/ip_tables.c | 1 + net/ipv4/tcp.c | 4 +- net/ipv4/tcp_dctcp.c | 25 ----- net/ipv4/tcp_output.c | 4 - net/ipv6/calipso.c | 9 +- net/ipv6/exthdrs.c | 111 +++++-------------- net/ipv6/ipv6_sockglue.c | 27 +++-- net/ipv6/mcast.c | 9 +- net/ipv6/netfilter/ip6_tables.c | 1 + net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +- net/mac80211/tx.c | 2 + net/netfilter/nf_conntrack_core.c | 2 +- net/netfilter/nf_conntrack_helper.c | 5 + net/netfilter/nf_conntrack_proto_dccp.c | 8 +- net/netfilter/nf_log.c | 4 + net/netfilter/nft_compat.c | 13 +++ net/packet/af_packet.c | 12 +- net/qrtr/qrtr.c | 13 ++- net/rds/connection.c | 11 +- net/rds/loop.c | 56 ++++++++++ net/rds/loop.h | 2 + net/sched/act_csum.c | 6 +- net/sched/act_tunnel_key.c | 6 +- net/sctp/chunk.c | 4 +- net/smc/af_smc.c | 3 +- net/smc/smc_clc.c | 3 +- net/tipc/discover.c | 18 +-- net/tipc/net.c | 17 ++- net/tipc/node.c | 7 +- net/tls/tls_sw.c | 5 + net/wireless/nl80211.c | 35 +++--- net/xfrm/xfrm_user.c | 8 +- samples/bpf/parse_varlen.c | 6 +- samples/bpf/test_overhead_user.c | 19 +++- samples/bpf/trace_event_user.c | 27 ++++- samples/bpf/xdp2skb_meta.sh | 6 +- scripts/kconfig/zconf.y | 4 +- security/smack/smack_lsm.c | 1 + sound/core/seq/seq_clientmgr.c | 3 +- tools/build/Build.include | 2 +- tools/build/Makefile | 2 +- tools/objtool/elf.c | 41 ++++--- tools/perf/Makefile.config | 3 +- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 2 +- tools/perf/arch/x86/util/perf_regs.c | 2 +- tools/perf/bench/numa.c | 5 +- tools/perf/builtin-annotate.c | 11 +- tools/perf/builtin-report.c | 3 +- tools/perf/builtin-script.c | 25 ++++- tools/perf/jvmti/jvmti_agent.c | 3 +- tools/perf/pmu-events/Build | 2 +- tools/perf/tests/builtin-test.c | 2 +- tools/perf/tests/parse-events.c | 8 +- tools/perf/tests/topology.c | 1 + tools/perf/util/c++/clang.cpp | 11 +- tools/perf/util/header.c | 12 +- tools/perf/util/llvm-utils.c | 6 +- tools/perf/util/parse-events.y | 5 + .../util/scripting-engines/trace-event-python.c | 8 +- tools/testing/nvdimm/test/nfit.c | 3 +- tools/testing/selftests/bpf/test_kmod.sh | 9 ++ tools/testing/selftests/bpf/test_offload.py | 12 +- tools/testing/selftests/net/config | 2 + .../selftests/pstore/pstore_post_reboot_tests | 5 +- .../selftests/static_keys/test_static_keys.sh | 13 +++ tools/testing/selftests/sync/config | 4 + tools/testing/selftests/sysctl/sysctl.sh | 20 ++-- tools/testing/selftests/user/test_user_copy.sh | 7 ++ tools/testing/selftests/vm/compaction_test.c | 4 +- tools/testing/selftests/vm/mlock2-tests.c | 12 +- tools/testing/selftests/vm/run_vmtests | 5 +- tools/testing/selftests/vm/userfaultfd.c | 4 +- tools/testing/selftests/x86/sigreturn.c | 59 ++++++---- tools/testing/selftests/zram/zram.sh | 5 +- tools/testing/selftests/zram/zram_lib.sh | 5 +- virt/kvm/arm/vgic/vgic-v3.c | 5 - 347 files changed, 2652 insertions(+), 1285 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/324 arm: dts: armada: Fix "#cooling-cells" propertys name
4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viresh Kumar <[email protected]>
[ Upstream commit ac62cc9d9cd6fa4c79e171c13dc8d58c3862b678 ]
It should be "#cooling-cells" instead of "cooling-cells". Fix it.
--- arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/armada-385-synology-ds116.dts +1 -1
@@ -139,7 +139,7 @@ 3700 5 3900 6 4000 7>; - cooling-cells = <2>; + #cooling-cells = <2>; }; gpio-leds {
Greg Kroah-Hartman
maintainerPATCH 2/324 vfio: ccw: fix error return in vfio_ccw_sch_event
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dong Jia Shi <[email protected]>
[ Upstream commit 2c861d89ccda2fbcea9358eff9cc5f8fae548be5 ]
If the device has not been registered, or there is work pending, we should reschedule a sch_event call again.
Message-Id: <[email protected]>
--- drivers/s390/cio/vfio_ccw_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/s390/cio/vfio_ccw_drv.c +4 -1
@@ -177,6 +177,7 @@ static int vfio_ccw_sch_event(struct sub {struct vfio_ccw_private *private =dev_get_drvdata (&sch->dev);unsigned long flags; +int rc = -EAGAIN ;spin_lock_irqsave (sch->lock, flags);if (!device_is_registered (&sch->dev))
@@ -187,6 +188,7 @@ static int vfio_ccw_sch_event(struct subif (cio_update_schib (sch)) {vfio_ccw_fsm_event (private,VFIO_CCW_EVENT_NOT_OPER ); + rc =0 ; goto out_unlock; }
@@ -195,11 +197,12 @@ static int vfio_ccw_sch_event(struct sub private->state = private->mdev ?VFIO_CCW_STATE_IDLE :VFIO_CCW_STATE_STANDBY ; } + rc =0 ; out_unlock:spin_unlock_irqrestore (sch->lock, flags); -return 0 ; +return rc; }static struct css_device_id vfio_ccw_sch_ids[] = {
Greg Kroah-Hartman
maintainerPATCH 3/324 perf tools: Fix error index for pmu event parser
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit f7fa827f5f432a0b1f34e10fc49da93aeef9f817 ]
For events we provide specific error message we need to set error column index, PMU parser is missing that, adding it.
Before:
$ perf stat -e cycles,krava/cycles/ kill
event syntax error: 'cycles,krava/cycles/'
\___ Cannot find PMU `krava'. Missing kernel support?After:
$ perf stat -e cycles,krava/cycles/ kill
event syntax error: 'cycles,krava/cycles/'
\___ Cannot find PMU `krava'. Missing kernel support?--- tools/perf/util/parse-events.y | 5 +++++ 1 file changed, 5 insertions(+)
tools/perf/util/parse-events.y +5 -0
@@ -227,11 +227,16 @@ event_def: event_pmu | event_pmu: PE_NAME opt_pmu_config { + struct parse_events_state *parse_state = _parse_state; + struct parse_events_error *error = parse_state->error; struct list_head *list, *orig_terms, *terms; if (parse_events_copy_term_list($2, &orig_terms)) YYABORT; + if (error) + error->idx = @1.first_column; + ALLOC_LIST(list); if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { struct perf_pmu *pmu = NULL;
Greg Kroah-Hartman
maintainerPATCH 4/324 HID: google: Add support for whiskers
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Boichat <[email protected]>
[ Upstream commit 3e84c7651dde7cca43c5cfd7385086599cce5a5d ]
Another device in the hammer class, with USB id 0x5030.
--- drivers/hid/hid-google-hammer.c | 2 ++ drivers/hid/hid-ids.h | 1 + 2 files changed, 3 insertions(+)
drivers/hid/hid-google-hammer.c +2 -0
@@ -124,6 +124,8 @@ static const struct hid_device_id hammer USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_STAFF) }, { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WAND) }, + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, + USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WHISKERS) }, { } };MODULE_DEVICE_TABLE (hid, hammer_devices);
drivers/hid/hid-ids.h +1 -0
@@ -452,6 +452,7 @@#define USB_DEVICE_ID_GOOGLE_TOUCH_ROSE 0x5028#define USB_DEVICE_ID_GOOGLE_STAFF 0x502b#define USB_DEVICE_ID_GOOGLE_WAND 0x502d +#define USB_DEVICE_ID_GOOGLE_WHISKERS 0x5030#define USB_VENDOR_ID_GOTOP 0x08f2#define USB_DEVICE_ID_SUPER_Q2 0x007f
Greg Kroah-Hartman
maintainerPATCH 5/324 IB/rxe: avoid double kfree skb
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Yanjun <[email protected]>
[ Upstream commit 828d810550abc1fffff9b20545fec4bc150d5e82 ]
In rxe_send, when network_type is not RDMA_NETWORK_IPV4 or RDMA_NETWORK_IPV6, skb is freed and -EINVAL is returned. Then rxe_xmit_packet will return -EINVAL, too. In rxe_requester, this skb is double freed.
In rxe_requester, kfree_skb is needed only after fill_packet fails. So kfree_skb is moved from label err to test fill_packet.
--- drivers/infiniband/sw/rxe/rxe_req.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_req.c +1 -1
@@ -709,6 +709,7 @@ next_wqe:if (fill_packet (qp, wqe, &pkt, skb, payload)) {pr_debug ("qp#%d Error during fill packet\n" ,qp_num (qp)); +kfree_skb (skb); goto err; }
@@ -740,7 +741,6 @@ next_wqe: goto next_wqe; err: -kfree_skb (skb); wqe->status =IB_WC_LOC_PROT_ERR ; wqe->state = wqe_state_error;__rxe_do_task (&qp->comp.task);
Greg Kroah-Hartman
maintainerPATCH 6/324 RDMA/qedr: Fix NULL pointer dereference when running over iWARP without RDMA-CM
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Kalderon, Michal" <[email protected]>
[ Upstream commit 425cf5c1350a98b81f3ddda160b99c3be613a213 ]
Some RoCE specific code in qedr_modify_qp was run over an iWARP device when running perftest benchmarks without the -R option.
The commit 3e44e0ee0893 ("IB/providers: Avoid null netdev check for RoCE") exposed this. Dropping the check for NULL pointer on ndev in qedr_modify_qp lead to a null pointer dereference when running over iWARP. Before the code would identify ndev as being NULL and return an error.
--- drivers/infiniband/hw/qedr/verbs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/hw/qedr/verbs.c +3 -0
@@ -1957,6 +1957,9 @@ int qedr_modify_qp(struct ib_qp *ibqp, s }if (attr_mask & (IB_QP_AV |IB_QP_PATH_MTU )) { +if (rdma_protocol_iwarp (&dev->ibdev,1 )) +return -EINVAL ; +if (attr_mask &IB_QP_PATH_MTU ) {if (attr->path_mtu <IB_MTU_256 || attr->path_mtu >IB_MTU_4096 ) {
Greg Kroah-Hartman
maintainerPATCH 7/324 Input: synaptics-rmi4 - fix axis-swap behavior
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucas Stach <[email protected]>
[ Upstream commit 645a397d325db6e1bb36588095ae637738b37693 ]
The documentation for the touchscreen-swapped-x-y property states that swapping is done after inverting if both are used. RMI4 did it the other way around, leading to inconsistent behavior with regard to other touchscreens.
--- drivers/input/rmi4/rmi_2d_sensor.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/input/rmi4/rmi_2d_sensor.c +16 -18
@@ -32,15 +32,15 @@ void rmi_2d_sensor_abs_process(struct rmif (obj->type ==RMI_2D_OBJECT_NONE )return ; -if (axis_align->swap_axes) -swap (obj->x, obj->y); -if (axis_align->flip_x) obj->x = sensor->max_x - obj->x;if (axis_align->flip_y) obj->y = sensor->max_y - obj->y; +if (axis_align->swap_axes) +swap (obj->x, obj->y); +/* * Here checking if X offset or y offset are specified is * redundant. We just add the offsets or clip the values.
@@ -120,15 +120,15 @@ void rmi_2d_sensor_rel_report(struct rmi x =min (RMI_2D_REL_POS_MAX ,max (RMI_2D_REL_POS_MIN , (int )x)); y =min (RMI_2D_REL_POS_MAX ,max (RMI_2D_REL_POS_MIN , (int )y)); -if (axis_align->swap_axes) -swap (x, y); -if (axis_align->flip_x) x =min (RMI_2D_REL_POS_MAX , -x);if (axis_align->flip_y) y =min (RMI_2D_REL_POS_MAX , -y); +if (axis_align->swap_axes) +swap (x, y); +if (x || y) {input_report_rel (sensor->input,REL_X , x);input_report_rel (sensor->input,REL_Y , y);
@@ -141,17 +141,10 @@ static void rmi_2d_sensor_set_input_parastruct input_dev *input = sensor->input;int res_x;int res_y; +int max_x, max_y;int input_flags =0 ;if (sensor->report_abs) { -if (sensor->axis_align.swap_axes) { -swap (sensor->max_x, sensor->max_y); -swap (sensor->axis_align.clip_x_low, - sensor->axis_align.clip_y_low); -swap (sensor->axis_align.clip_x_high, - sensor->axis_align.clip_y_high); - } - sensor->min_x = sensor->axis_align.clip_x_low;if (sensor->axis_align.clip_x_high) sensor->max_x = min(sensor->max_x,
@@ -163,14 +156,19 @@ static void rmi_2d_sensor_set_input_para sensor->axis_align.clip_y_high);set_bit (EV_ABS , input->evbit); -input_set_abs_params (input,ABS_MT_POSITION_X ,0 , sensor->max_x, -0 ,0 ); -input_set_abs_params (input,ABS_MT_POSITION_Y ,0 , sensor->max_y, -0 ,0 ); + + max_x = sensor->max_x; + max_y = sensor->max_y; +if (sensor->axis_align.swap_axes) +swap (max_x, max_y); +input_set_abs_params (input,ABS_MT_POSITION_X ,0 , max_x,0 ,0 ); +input_set_abs_params (input,ABS_MT_POSITION_Y ,0 , max_y,0 ,0 );if (sensor->x_mm && sensor->y_mm) { res_x = (sensor->max_x - sensor->min_x) / sensor->x_mm; res_y = (sensor->max_y - sensor->min_y) / sensor->y_mm; +if (sensor->axis_align.swap_axes) +swap (res_x, res_y);input_abs_set_res (input,ABS_X , res_x);input_abs_set_res (input,ABS_Y , res_y);
Greg Kroah-Hartman
maintainerPATCH 8/324 IB/mlx4: Fix an error handling path in mlx4_ib_rereg_user_mr()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Jaillet <[email protected]>
[ Upstream commit 3dc7c7badb7502ec3e3aa817a8bdd9e53aa54c52 ]
Before returning -EPERM we should release some resources, as already done in the other error handling path of the function.
--- drivers/infiniband/hw/mlx4/mr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx4/mr.c +5 -2
@@ -486,8 +486,11 @@ int mlx4_ib_rereg_user_mr(struct ib_mr * }if (flags &IB_MR_REREG_ACCESS ) { -if (ib_access_writable (mr_access_flags) && !mmr->umem->writable) -return -EPERM ; +if (ib_access_writable (mr_access_flags) && + !mmr->umem->writable) { + err = -EPERM ; + goto release_mpt_entry; + } err =mlx4_mr_hw_change_access (dev->dev, *pmpt_entry,convert_access (mr_access_flags));
Greg Kroah-Hartman
maintainerPATCH 9/324 clocksource/drivers/stm32: Fix error return code
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julia Lawall <[email protected]>
[ Upstream commit a26ed66c20f080c510fcf5bd448bce204f2c19d7 ]
Return an error code on failure.
Problem found using Coccinelle.
--- drivers/clocksource/timer-stm32.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/clocksource/timer-stm32.c +3 -1
@@ -304,8 +304,10 @@ static int __init stm32_timer_init(struc to->private_data =kzalloc (sizeof (struct stm32_timer_private ),GFP_KERNEL ); -if (!to->private_data) +if (!to->private_data) { + ret = -ENOMEM ; goto deinit; + } rstc =of_reset_control_get (node,NULL );if (!IS_ERR (rstc)) {
Greg Kroah-Hartman
maintainerPATCH 10/324 drm/bridge/sii8620: fix loops in EDID fetch logic
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrzej Hajda <[email protected]>
[ Upstream commit 8e627a1b1ce8feb3e1da4428b71b9b4905f04888 ]
Function should constantly check if cable is connected and finish in finite time.
--- drivers/gpu/drm/bridge/sil-sii8620.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/gpu/drm/bridge/sil-sii8620.c +20 -11
@@ -807,6 +807,7 @@ static void sii8620_burst_rx_all(structstatic void sii8620_fetch_edid (struct sii8620 *ctx) {u8 lm_ddc, ddc_cmd, int3, cbus; +unsigned long timeout;int fetched, i;int edid_len =EDID_LENGTH ;u8 *edid;
@@ -856,23 +857,31 @@ static void sii8620_fetch_edid(struct siREG_DDC_CMD , ddc_cmd |VAL_DDC_CMD_ENH_DDC_READ_NO_ACK ); -do { - int3 =sii8620_readb (ctx,REG_INTR3 ); + int3 =0 ; + timeout = jiffies +msecs_to_jiffies (200 ); +for (;;) { cbus =sii8620_readb (ctx,REG_CBUS_STATUS ); - -if (int3 &BIT_DDC_CMD_DONE ) -break ; - -if (!(cbus &BIT_CBUS_STATUS_CBUS_CONNECTED )) { +if (~cbus &BIT_CBUS_STATUS_CBUS_CONNECTED ) { +kfree (edid); + edid =NULL ; + goto end; + } +if (int3 &BIT_DDC_CMD_DONE ) { +if (sii8620_readb (ctx,REG_DDC_DOUT_CNT ) + >=FETCH_SIZE ) +break ; + }else { + int3 =sii8620_readb (ctx,REG_INTR3 ); + } +if (time_is_before_jiffies (timeout)) { + ctx->error = -ETIMEDOUT ; +dev_err (ctx->dev,"timeout during EDID read\n" );kfree (edid); edid =NULL ; goto end; } - }while (1 ); - -sii8620_readb (ctx,REG_DDC_STATUS ); -while (sii8620_readb (ctx,REG_DDC_DOUT_CNT ) <FETCH_SIZE )usleep_range (10 ,20 ); + }sii8620_read_buf (ctx,REG_DDC_DATA , edid + fetched,FETCH_SIZE );if (fetched +FETCH_SIZE ==EDID_LENGTH ) {
Greg Kroah-Hartman
maintainerPATCH 11/324 drm/bridge/sii8620: fix display modes validation
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Purski <[email protected]>
[ Upstream commit ecba7cfa3afbe489288f2c819158b7402afd7ee9 ]
Current implementation of mode_valid() and mode_fixup() callbacks handle packed pixel modes improperly.
Fix it by using proper maximum clock values from the documentation.
--- drivers/gpu/drm/bridge/sil-sii8620.c | 78 +++++++++++++++++------------------ 1 file changed, 40 insertions(+), 38 deletions(-)
drivers/gpu/drm/bridge/sil-sii8620.c +40 -38
@@ -36,8 +36,11 @@#define SII8620_BURST_BUF_LEN 288#define VAL_RX_HDMI_CTRL2_DEFVAL VAL_RX_HDMI_CTRL2_IDLE_CNT(3) -#define MHL1_MAX_LCLK 225000 -#define MHL3_MAX_LCLK 600000 + +#define MHL1_MAX_PCLK 75000 +#define MHL1_MAX_PCLK_PP_MODE 150000 +#define MHL3_MAX_PCLK 200000 +#define MHL3_MAX_PCLK_PP_MODE 300000enum sii8620_mode {CM_DISCONNECTED ,
@@ -2277,17 +2280,43 @@ static void sii8620_detach(struct drm_brrc_unregister_device (ctx->rc_dev); } +static int sii8620_is_packing_required (struct sii8620 *ctx, +const struct drm_display_mode *mode) +{ +int max_pclk, max_pclk_pp_mode; + +if (sii8620_is_mhl3 (ctx)) { + max_pclk =MHL3_MAX_PCLK ; + max_pclk_pp_mode =MHL3_MAX_PCLK_PP_MODE ; + }else { + max_pclk =MHL1_MAX_PCLK ; + max_pclk_pp_mode =MHL1_MAX_PCLK_PP_MODE ; + } + +if (mode->clock < max_pclk) +return 0 ; +else if (mode->clock < max_pclk_pp_mode) +return 1 ; +else +return -1 ; +} +static enum drm_mode_status sii8620_mode_valid (struct drm_bridge *bridge,const struct drm_display_mode *mode) {struct sii8620 *ctx =bridge_to_sii8620 (bridge); +int pack_required =sii8620_is_packing_required (ctx, mode);bool can_pack = ctx->devcap[MHL_DCAP_VID_LINK_MODE ] &MHL_DCAP_VID_LINK_PPIXEL ; -unsigned int max_pclk =sii8620_is_mhl3 (ctx) ?MHL3_MAX_LCLK : -MHL1_MAX_LCLK ; - max_pclk /= can_pack ?2 :3 ; -return (mode->clock > max_pclk) ?MODE_CLOCK_HIGH :MODE_OK ; +switch (pack_required) { +case 0 : +return MODE_OK ; +case 1 : +return (can_pack) ?MODE_OK :MODE_CLOCK_HIGH ; +default : +return MODE_CLOCK_HIGH ; + } } static bool sii8620_mode_fixup(struct drm_bridge *bridge,
@@ -2295,43 +2324,16 @@ static bool sii8620_mode_fixup(struct dr struct drm_display_mode *adjusted_mode) {struct sii8620 *ctx =bridge_to_sii8620 (bridge); -int max_lclk; -bool ret = true;mutex_lock (&ctx->lock); - max_lclk =sii8620_is_mhl3 (ctx) ?MHL3_MAX_LCLK :MHL1_MAX_LCLK ; -if (max_lclk >3 * adjusted_mode->clock) { - ctx->use_packed_pixel =0 ; - goto end; - } -if ((ctx->devcap[MHL_DCAP_VID_LINK_MODE ] &MHL_DCAP_VID_LINK_PPIXEL ) && - max_lclk >2 * adjusted_mode->clock) { - ctx->use_packed_pixel =1 ; - goto end; - } - ret = false; -end: -if (ret) { -u8 vic =drm_match_cea_mode (adjusted_mode); + ctx->use_packed_pixel =sii8620_is_packing_required (ctx, adjusted_mode); + ctx->video_code =drm_match_cea_mode (adjusted_mode); + ctx->pixel_clock = adjusted_mode->clock; -if (!vic) { -union hdmi_infoframe frm; -u8 mhl_vic[] = {0 ,95 ,94 ,93 ,98 }; - -/* FIXME: We need the connector here */ -drm_hdmi_vendor_infoframe_from_display_mode ( - &frm.vendor.hdmi,NULL , adjusted_mode); - vic = frm.vendor.hdmi.vic; -if (vic >=ARRAY_SIZE (mhl_vic)) - vic =0 ; - vic = mhl_vic[vic]; - } - ctx->video_code = vic; - ctx->pixel_clock = adjusted_mode->clock; - }mutex_unlock (&ctx->lock); -return ret; + +return true; }static const struct drm_bridge_funcs sii8620_bridge_funcs = {
Greg Kroah-Hartman
maintainerPATCH 12/324 drm/bridge/sii8620: fix potential buffer overflow
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Purski <[email protected]>
[ Upstream commit 9378cecb1ce5d618b8aff4d65113ddcf72fc1011 ]
Buffer overflow error should not occur, as mode_fixup() callback filters pixel clock value and it should never exceed 600000. However, current implementation is not obviously safe and relies on implementation of mode_fixup().
Make 'i' variable never reach unsafe value in order to avoid buffer overflow error.
--- drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bridge/sil-sii8620.c +1 -1
@@ -1228,7 +1228,7 @@ static void sii8620_start_video(struct sint clk = ctx->pixel_clock * (ctx->use_packed_pixel ?2 :3 );int i; -for (i =0 ; i <ARRAY_SIZE (clk_spec); ++i) +for (i =0 ; i <ARRAY_SIZE (clk_spec) -1 ; ++i)if (clk < clk_spec[i].max_clk)break ;
Greg Kroah-Hartman
maintainerPATCH 13/324 ARC: Explicitly add -mmedium-calls to CFLAGS
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Brodkin <[email protected]>
[ Upstream commit 74c11e300c103af47db5b658fdcf28002421e250 ]
GCC built for arc*-*-linux has "-mmedium-calls" implicitly enabled by default thus we don't see any problems during Linux kernel compilation. ----------------------------->8------------------------ arc-linux-gcc -mcpu=arc700 -Q --help=target | grep calls
-mlong-calls [disabled]
-mmedium-calls [enabled]
----------------------------->8------------------------
But if we try to use so-called Elf32 toolchain with GCC configured for arc*-*-elf* then we'd see the following failure:
----------------------------->8------------------------ init/do_mounts.o: In function 'init_rootfs':
do_mounts.c:(.init.text+0x108): relocation truncated to fit: R_ARC_S21W_PCREL against symbol 'unregister_filesystem' defined in .text section in fs/filesystems.o
arc-elf32-ld: final link failed: Symbol needs debug section which does not exist
make: *** [vmlinux] Error 1 ----------------------------->8------------------------
That happens because neither "-mmedium-calls" nor "-mlong-calls" are enabled in Elf32 GCC:
----------------------------->8------------------------ arc-elf32-gcc -mcpu=arc700 -Q --help=target | grep calls
-mlong-calls [disabled]
-mmedium-calls [disabled]
----------------------------->8------------------------
Now to make it possible to use Elf32 toolchain for building Linux kernel we're explicitly add "-mmedium-calls" to CFLAGS.
And since we add "-mmedium-calls" to the global CFLAGS there's no point in having per-file copies thus removing them.
--- arch/arc/Makefile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
arch/arc/Makefile +1 -14
@@ -16,7 +16,7 @@ endif KBUILD_DEFCONFIG := nsim_700_defconfig -cflags-y += -fno-common -pipe -fno-builtin -D__linux__ +cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__ cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7 cflags-$(CONFIG_ISA_ARCV2) += -mcpu=archs
@@ -140,16 +140,3 @@ dtbs: scripts archclean: $(Q)$(MAKE) $(clean)=$(boot) - -# Hacks to enable final link due to absence of link-time branch relexation -# and gcc choosing optimal(shorter) branches at -O3 -# -# vineetg Feb 2010: -mlong-calls switched off for overall kernel build -# However lib/decompress_inflate.o (.init.text) calls -# zlib_inflate_workspacesize (.text) causing relocation errors. -# Thus forcing all exten calls in this file to be long calls -export CFLAGS_decompress_inflate.o = -mmedium-calls -export CFLAGS_initramfs.o = -mmedium-calls -ifdef CONFIG_SMP -export CFLAGS_core.o = -mmedium-calls -endif
Greg Kroah-Hartman
maintainerPATCH 14/324 selftests/bpf: test offloads even with BPF programs present
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 47cf52a246e526e2092d60ac01c54af9bd45dcc9 ]
Modern distroes increasingly make use of BPF programs. Default Ubuntu 18.04 installation boots with a number of cgroup_skb programs loaded.
test_offloads.py tries to check if programs and maps are not leaked on error paths by confirming the list of programs on the system is empty between tests.
Since we can no longer expect the system to have no BPF objects at boot try to remember the programs and maps present at the start, and skip those when scanning the system.
--- tools/testing/selftests/bpf/test_offload.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/test_offload.py +10 -2
@@ -163,6 +163,10 @@ def bpftool(args, JSON=True, ns="", fail def bpftool_prog_list(expected=None, ns=""): _, progs = bpftool("prog show", JSON=True, ns=ns, fail=True) + # Remove the base progs + for p in base_progs: + if p in progs: + progs.remove(p) if expected is not None: if len(progs) != expected: fail(True, "%d BPF programs loaded, expected %d" %
@@ -171,6 +175,10 @@ def bpftool_prog_list(expected=None, ns= def bpftool_map_list(expected=None, ns=""): _, maps = bpftool("map show", JSON=True, ns=ns, fail=True) + # Remove the base maps + for m in base_maps: + if m in maps: + maps.remove(m) if expected is not None: if len(maps) != expected: fail(True, "%d BPF maps loaded, expected %d" %
@@ -585,8 +593,8 @@ skip(os.getuid() != 0, "test must be run # Check tools ret, progs = bpftool("prog", fail=False) skip(ret != 0, "bpftool not installed") -# Check no BPF programs are loaded -skip(len(progs) != 0, "BPF programs already loaded on the system") +base_progs = progs +_, base_maps = bpftool("map") # Check netdevsim ret, out = cmd("modprobe netdevsim", fail=False)
Greg Kroah-Hartman
maintainerPATCH 15/324 smb3: increase initial number of credits requested to allow write
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steve French <[email protected]>
[ Upstream commit d409014e4feeab486fb36b350abfc4c94de8be37 ]
Compared to other clients the Linux smb3 client ramps up credits very slowly, taking more than 128 operations before a maximum size write could be sent (since the number of credits requested is only 2 per small operation, causing the credit limit to grow very slowly).
This lack of credits initially would impact large i/o performance, when large i/o is tried early before enough credits are built up.
--- fs/cifs/smb2pdu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/cifs/smb2pdu.c +3 -2
@@ -923,8 +923,9 @@ SMB2_sess_alloc_buffer(struct SMB2_sess_ req->PreviousSessionId = sess_data->previous_session; req->Flags =0 ;/* MBZ */ -/* to enable echos and oplocks */ - req->sync_hdr.CreditRequest =cpu_to_le16 (3 ); + +/* enough to enable echos and oplocks and one max size write */ + req->sync_hdr.CreditRequest =cpu_to_le16 (130 );/* only one of SMB2 signing flags may be set in SMB2 request */ if (server->sign)
A message that is not in the archive (sent off-list or not yet received): CAMXdgSCTnXuR=N052yAJt2YEmCX4k=k35gD0cncx7TgM9-S9Lg@mail.gmail.com
Greg Kroah-Hartman
maintainerRe: [PATCH 4.17 015/324] smb3: increase initial number of credits requested to allow write
Quoted 1 line · Scott French
Please remove the stfrench @ gmail address. I am not Steve
Now removed, sorry for the noise.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 17/324 hwmon: (nct6775) Fix loop limit
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 91bb8f45f73f19a0150c233c0f11cdeb6d71d1e9 ]
Commit cc66b3038254 ("hwmon: (nct6775) Rework temperature source and label handling") changed a loop limit from "data->temp_label_num - 1" to "32", as part of moving from a string array to a bit mask. This results in the following error, reported by UBSAN.
UBSAN: Undefined behaviour in drivers/hwmon/nct6775.c:4179:27
shift exponent 32 is too large for 32-bit type 'long unsigned int'
Similar to the original loop, the limit has to be one less than the number of bits.
--- drivers/hwmon/nct6775.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/nct6775.c +1 -1
@@ -4175,7 +4175,7 @@ static int nct6775_probe(struct platform* The temperature is already monitored if the respective bit in <mask> * is set. */ -for (i =0 ; i <32 ; i++) { +for (i =0 ; i <31 ; i++) {if (!(data->temp_mask &BIT (i +1 )))continue ;if (!reg_temp_alternate[i])
Greg Kroah-Hartman
maintainerPATCH 18/324 soc: imx: gpcv2: correct PGC offset
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anson Huang <[email protected]>
[ Upstream commit 3637f12faf507b0a4b8ac1e7115fc99583ab1db3 ]
Correct MIPI/PCIe/USB_HSIC's PGC offset based on design RTL, the values in the Reference Manual (Rev. 1, 01/2018 and the older ones) are incorrect.
The correct offset values should be as below:
0x800 ~ 0x83F: PGC for core0 of A7 platform;0x840 ~ 0x87F: PGC for core1 of A7 platform;0x880 ~ 0x8BF: PGC for SCU of A7 platform;0xA00 ~ 0xA3F: PGC for fastmix/megamix;0xC00 ~ 0xC3F: PGC for MIPI PHY;0xC40 ~ 0xC7F: PGC for PCIe_PHY;0xC80 ~ 0xCBF: PGC for USB OTG1 PHY;0xCC0 ~ 0xCFF: PGC for USB OTG2 PHY;0xD00 ~ 0xD3F: PGC for USB HSIC PHY;
--- drivers/soc/imx/gpcv2.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/soc/imx/gpcv2.c +9 -4
@@ -39,10 +39,15 @@#define GPC_M4_PU_PDN_FLG 0x1bc - -#define PGC_MIPI 4 -#define PGC_PCIE 5 -#define PGC_USB_HSIC 8 +/* +* The PGC offset values in Reference Manual +* (Rev. 1, 01/2018 and the older ones) GPC chapter's +* GPC_PGC memory map are incorrect, below offset +* values are from design RTL. +*/ +#define PGC_MIPI 16 +#define PGC_PCIE 17 +#define PGC_USB_HSIC 20#define GPC_PGC_CTRL (n) (0x800 + (n) * 0x40)#define GPC_PGC_SR (n) (GPC_PGC_CTRL(n) + 0xc)
Greg Kroah-Hartman
maintainerPATCH 19/324 usb: dwc3: pci: add support for Intel IceLake
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heikki Krogerus <[email protected]>
[ Upstream commit 00908693c481f7298adf8cf4d2ff3dfbea8c375f ]
PCI IDs for Intel IceLake.
--- drivers/usb/dwc3/dwc3-pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc3/dwc3-pci.c +2 -0
@@ -34,6 +34,7 @@#define PCI_DEVICE_ID_INTEL_GLK 0x31aa#define PCI_DEVICE_ID_INTEL_CNPLP 0x9dee#define PCI_DEVICE_ID_INTEL_CNPH 0xa36e +#define PCI_DEVICE_ID_INTEL_ICLLP 0x34ee#define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"#define PCI_INTEL_BXT_FUNC_PMU_PWR 4
@@ -289,6 +290,7 @@ static const struct pci_device_id dwc3_p { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_GLK), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CNPLP), }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CNPH), }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICLLP), }, { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_NL_USB), }, { } /* Terminating Entry */ };
Greg Kroah-Hartman
maintainerPATCH 20/324 usb: gadget: ffs: Fix BUG when userland exits with submitted AIO transfers
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Pelletier <[email protected]>
[ Upstream commit d52e4d0c0c428bf2ba35074a7495cdb28e2efbae ]
This bug happens only when the UDC needs to sleep during usb_ep_dequeue, as is the case for (at least) dwc3.
[ 382.200896] BUG: scheduling while atomic: screen/1808/0x00000100
[ 382.207124] 4 locks held by screen/1808:
[ 382.211266] #0: (rcu_callback){....}, at: [<c10b4ff0>] rcu_process_callbacks+0x260/0x440
[ 382.219949] #1: (rcu_read_lock_sched){....}, at: [<c1358ba0>] percpu_ref_switch_to_atomic_rcu+0xb0/0x130
[ 382.230034] #2: (&(&ctx->ctx_lock)->rlock){....}, at: [<c11f0c73>] free_ioctx_users+0x23/0xd0
[ 382.230096] #3: (&(&ffs->eps_lock)->rlock){....}, at: [<f81e7710>] ffs_aio_cancel+0x20/0x60 [usb_f_fs]
[ 382.230160] Modules linked in: usb_f_fs libcomposite configfs bnep btsdio bluetooth ecdh_generic brcmfmac brcmutil intel_powerclamp coretemp dwc3 kvm_intel ulpi udc_core kvm irqbypass crc32_pclmul crc32c_intel pcbc dwc3_pci aesni_intel aes_i586 crypto_simd cryptd ehci_pci ehci_hcd gpio_keys usbcore basincove_gpadc industrialio usb_common
[ 382.230407] CPU: 1 PID: 1808 Comm: screen Not tainted 4.14.0-edison+ #117
[ 382.230416] Hardware name: Intel Corporation Merrifield/BODEGA BAY, BIOS 542 2015.01.21:18.19.48
[ 382.230425] Call Trace:
[ 382.230438] <SOFTIRQ>
[ 382.230466] dump_stack+0x47/0x62
[ 382.230498] __schedule_bug+0x61/0x80
[ 382.230522] __schedule+0x43/0x7a0
[ 382.230587] schedule+0x5f/0x70
[ 382.230625] dwc3_gadget_ep_dequeue+0x14c/0x270 [dwc3]
[ 382.230669] ? do_wait_intr_irq+0x70/0x70
[ 382.230724] usb_ep_dequeue+0x19/0x90 [udc_core]
[ 382.230770] ffs_aio_cancel+0x37/0x60 [usb_f_fs]
[ 382.230798] kiocb_cancel+0x31/0x40
[ 382.230822] free_ioctx_users+0x4d/0xd0
[ 382.230858] percpu_ref_switch_to_atomic_rcu+0x10a/0x130
[ 382.230881] ? percpu_ref_exit+0x40/0x40
[ 382.230904] rcu_process_callbacks+0x2b3/0x440
[ 382.230965] __do_softirq+0xf8/0x26b
[ 382.231011] ? __softirqentry_text_start+0x8/0x8
[ 382.231033] do_softirq_own_stack+0x22/0x30
[ 382.231042] </SOFTIRQ>
[ 382.231071] irq_exit+0x45/0xc0
[ 382.231089] smp_apic_timer_interrupt+0x13c/0x150
[ 382.231118] apic_timer_interrupt+0x35/0x3c
[ 382.231132] EIP: __copy_user_ll+0xe2/0xf0
[ 382.231142] EFLAGS: 00210293 CPU: 1
[ 382.231154] EAX: bfd4508c EBX: 00000004 ECX: 00000003 EDX: f3d8fe50
[ 382.231165] ESI: f3d8fe51 EDI: bfd4508d EBP: f3d8fe14 ESP: f3d8fe08
[ 382.231176] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
[ 382.231265] core_sys_select+0x25f/0x320
[ 382.231346] ? __wake_up_common_lock+0x62/0x80
[ 382.231399] ? tty_ldisc_deref+0x13/0x20
[ 382.231438] ? ldsem_up_read+0x1b/0x40
[ 382.231459] ? tty_ldisc_deref+0x13/0x20
[ 382.231479] ? tty_write+0x29f/0x2e0
[ 382.231514] ? n_tty_ioctl+0xe0/0xe0
[ 382.231541] ? tty_write_unlock+0x30/0x30
[ 382.231566] ? __vfs_write+0x22/0x110
[ 382.231604] ? security_file_permission+0x2f/0xd0
[ 382.231635] ? rw_verify_area+0xac/0x120
[ 382.231677] ? vfs_write+0x103/0x180
[ 382.231711] SyS_select+0x87/0xc0
[ 382.231739] ? SyS_write+0x42/0x90
[ 382.231781] do_fast_syscall_32+0xd6/0x1a0
[ 382.231836] entry_SYSENTER_32+0x47/0x71
[ 382.231848] EIP: 0xb7f75b05
[ 382.231857] EFLAGS: 00000246 CPU: 1
[ 382.231868] EAX: ffffffda EBX: 00000400 ECX: bfd4508c EDX: bfd4510c
[ 382.231878] ESI: 00000000 EDI: 00000000 EBP: 00000000 ESP: bfd45020
[ 382.231889] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b
[ 382.232281] softirq: huh, entered softirq 9 RCU c10b4d90 with preempt_count 00000100, exited with 00000000?--- drivers/usb/gadget/function/f_fs.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
drivers/usb/gadget/function/f_fs.c +18 -8
@@ -215,6 +215,7 @@ struct ffs_io_data {struct mm_struct *mm;struct work_struct work; +struct work_struct cancellation_work;struct usb_ep *ep;struct usb_request *req;
@@ -1072,22 +1073,31 @@ ffs_epfile_open(struct inode *inode, strreturn 0 ; } +static void ffs_aio_cancel_worker (struct work_struct *work) +{ + struct ffs_io_data *io_data = container_of(work, struct ffs_io_data, + cancellation_work); + +ENTER (); + +usb_ep_dequeue (io_data->ep, io_data->req); +} +static int ffs_aio_cancel (struct kiocb *kiocb) {struct ffs_io_data *io_data = kiocb->private; -struct ffs_epfile *epfile = kiocb->ki_filp->private_data; +struct ffs_data *ffs = io_data->ffs;int value;ENTER (); -spin_lock_irq (&epfile->ffs->eps_lock); - -if (likely (io_data && io_data->ep && io_data->req)) - value =usb_ep_dequeue (io_data->ep, io_data->req); -else +if (likely (io_data && io_data->ep && io_data->req)) { +INIT_WORK (&io_data->cancellation_work, ffs_aio_cancel_worker); +queue_work (ffs->io_completion_wq, &io_data->cancellation_work); + value = -EINPROGRESS ; + }else { value = -EINVAL ; - -spin_unlock_irq (&epfile->ffs->eps_lock); + }return value; }
Greg Kroah-Hartman
maintainerPATCH 21/324 usb: dwc2: gadget: Fix issue in dwc2_gadget_start_isoc()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minas Harutyunyan <[email protected]>
[ Upstream commit 1ffba9058737af2ddeebc813faa8ea9b16bc892a ]
In case of requests queue is empty reset EP target_frame to initial value.
This allow restarting ISOC traffic in case when function driver queued requests with interruptions.
--- drivers/usb/dwc2/gadget.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc2/gadget.c +1 -0
@@ -892,6 +892,7 @@ static void dwc2_gadget_start_isoc_ddma(u32 ctrl;if (list_empty (&hs_ep->queue)) { + hs_ep->target_frame =TARGET_FRAME_INITIAL ;dev_dbg (hsotg->dev,"%s: No requests in queue\n" , __func__);return ; }
Greg Kroah-Hartman
maintainerPATCH 22/324 usb: dwc3: of-simple: fix use-after-free on remove
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit 896e518883f18e601335908192e33426c1f599a4 ]
The clocks have already been explicitly disabled and put as part of remove() so the runtime suspend callback must not be run when balancing the runtime PM usage count before returning.
--- drivers/usb/dwc3/dwc3-of-simple.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-of-simple.c +2 -1
@@ -165,8 +165,9 @@ static int dwc3_of_simple_remove(structreset_control_put (simple->resets); -pm_runtime_put_sync (dev);pm_runtime_disable (dev); +pm_runtime_put_noidle (dev); +pm_runtime_set_suspended (dev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 23/324 ACPI / EC: Use ec_no_wakeup on Thinkpad X1 Carbon 6th
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Westerberg <[email protected]>
[ Upstream commit 8195a655e5ce09550aff81b2573d9b015d520cb9 ]
On this system EC interrupt triggers constantly kicking devices out of low power states and thus blocking power management. The system also has a PCIe root port hosting Alpine Ridge Thunderbolt controller and it never gets a chance to go to D3cold because of this.
Since the power button works the same regardless if EC interrupt is enabled or not during s2idle, add a quirk for this machine that sets ec_no_wakeup=true preventing spurious wakeups.
--- drivers/acpi/ec.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/acpi/ec.c +20 -0
@@ -2031,6 +2031,17 @@ static inline void acpi_ec_query_exit(vo } } +static const struct dmi_system_id acpi_ec_no_wakeup[] = { + { + .ident ="Thinkpad X1 Carbon 6th" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"20KGS3JF01" ), + }, + }, + { }, +}; +int __init acpi_ec_init (void ) {int result;
@@ -2041,6 +2052,15 @@ int __init acpi_ec_init(void)if (result)return result; +/* +* Disable EC wakeup on following systems to prevent periodic +* wakeup from EC GPE. +*/ +if (dmi_check_system (acpi_ec_no_wakeup)) { + ec_no_wakeup = true; +pr_debug ("Disabling EC wakeup on suspend-to-idle\n" ); + } +/* Drivers must be started after acpi_ec_query_init() */ dsdt_fail =acpi_bus_register_driver (&acpi_ec_driver);/*
Greg Kroah-Hartman
maintainerPATCH 24/324 netfilter: ipv6: nf_defrag: reduce struct net memory waste
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9ce7bc036ae4cfe3393232c86e9e1fea2153c237 ]
It is a waste of memory to use a full "struct netns_sysctl_ipv6" while only one pointer is really used, considering netns_sysctl_ipv6 keeps growing.
Also, since "struct netns_frags" has cache line alignment, it is better to move the frags_hdr pointer outside, otherwise we spend a full cache line for this pointer.
This saves 192 bytes of memory per netns.
--- include/net/net_namespace.h | 1 + include/net/netns/ipv6.h | 1 - net/ipv6/netfilter/nf_conntrack_reasm.c | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-)
include/net/net_namespace.h +1 -0
@@ -128,6 +128,7 @@ struct net {#endif #if IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 )struct netns_nf_frag nf_frag; +struct ctl_table_header *nf_frag_frags_hdr;#endif struct sock *nfnl;struct sock *nfnl_stash;
include/net/netns/ipv6.h +0 -1
@@ -107,7 +107,6 @@ struct netns_ipv6 {#if IS_ENABLED (CONFIG_NF_DEFRAG_IPV6 )struct netns_nf_frag { -struct netns_sysctl_ipv6 sysctl;struct netns_frags frags; };#endif
net/ipv6/netfilter/nf_conntrack_reasm.c +3 -3
@@ -107,7 +107,7 @@ static int nf_ct_frag6_sysctl_register(sif (hdr ==NULL ) goto err_reg; - net->nf_frag.sysctl.frags_hdr = hdr; + net->nf_frag_frags_hdr = hdr;return 0 ; err_reg:
@@ -121,8 +121,8 @@ static void __net_exit nf_ct_frags6_sysc {struct ctl_table *table; - table = net->nf_frag.sysctl.frags_hdr->ctl_table_arg; -unregister_net_sysctl_table (net->nf_frag.sysctl.frags_hdr); + table = net->nf_frag_frags_hdr->ctl_table_arg; +unregister_net_sysctl_table (net->nf_frag_frags_hdr);if (!net_eq (net, &init_net))kfree (table); }
Greg Kroah-Hartman
maintainerPATCH 25/324 netfilter: nf_ct_helper: Fix possible panic after nf_conntrack_helper_unregister
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Feng <[email protected]>
[ Upstream commit ad9852af97587b8abe8102f9ddcb05c9769656f6 ]
The helper module would be unloaded after nf_conntrack_helper_unregister, so it may cause a possible panic caused by race.
nf_ct_iterate_destroy(unhelp, me) reset the helper of conntrack as NULL, but maybe someone has gotten the helper pointer during this period. Then it would panic, when it accesses the helper and the module was unloaded.
Take an example as following:
CPU0 CPU1ctnetlink_dump_helpinfo
helper = rcu_dereference(help->helper);
unhelp set helper as NULL unload helper modulehelper->to_nlattr(skb, ct);
As above, the cpu0 tries to access the helper and its module is unloaded, then the panic happens.
--- net/netfilter/nf_conntrack_helper.c | 5 +++++ 1 file changed, 5 insertions(+)
net/netfilter/nf_conntrack_helper.c +5 -0
@@ -465,6 +465,11 @@ void nf_conntrack_helper_unregister(strunf_ct_expect_iterate_destroy (expect_iter_me,NULL );nf_ct_iterate_destroy (unhelp, me); + +/* Maybe someone has gotten the helper already when unhelp above. +* So need to wait it. +*/ +synchronize_rcu (); }EXPORT_SYMBOL_GPL (nf_conntrack_helper_unregister);
Greg Kroah-Hartman
maintainerPATCH 26/324 selftests: pstore: return Kselftest Skip code for skipped tests
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Shuah Khan (Samsung OSG)" <[email protected]>
[ Upstream commit 856e7c4b619af622d56b3b454f7bec32a170ac99 ]
When pstore_post_reboot test gets skipped because of unmet dependencies and/or unsupported configuration, it returns 0 which is treated as a pass by the Kselftest framework. This leads to false positive result even when the test could not be run.
Change it to return kselftest skip code when a test gets skipped to clearly report that the test could not be run.
Kselftest framework SKIP code is 4 and the framework prints appropriate messages to indicate that the test is skipped.
--- tools/testing/selftests/pstore/pstore_post_reboot_tests | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/pstore/pstore_post_reboot_tests +4 -1
@@ -7,13 +7,16 @@ # # Released under the terms of the GPL v2. +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + . ./common_tests if [ -e $REBOOT_FLAG ]; then rm $REBOOT_FLAG else prlog "pstore_crash_test has not been executed yet. we skip further tests." - exit 0 + exit $ksft_skip fi prlog -n "Mounting pstore filesystem ... "
Greg Kroah-Hartman
maintainerPATCH 27/324 selftests: static_keys: return Kselftest Skip code for skipped tests
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Shuah Khan (Samsung OSG)" <[email protected]>
[ Upstream commit 8781578087b8fb8829558bac96c3c24e5ba26f82 ]
When static_keys test is skipped because of unmet dependencies and/or unsupported configuration, it exits with error which is treated as a fail by the Kselftest framework. This leads to false negative result even when the test could not be run.
Change it to return kselftest skip code when a test gets skipped to clearly report that the test could not be run.
Added an explicit searches for test_static_key_base and test_static_keys modules and return skip code if they aren't found to differentiate between the failure to load the module condition and module not found condition.
Kselftest framework SKIP code is 4 and the framework prints appropriate messages to indicate that the test is skipped.
--- tools/testing/selftests/static_keys/test_static_keys.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+)
tools/testing/selftests/static_keys/test_static_keys.sh +13 -0
@@ -2,6 +2,19 @@ # SPDX-License-Identifier: GPL-2.0 # Runs static keys kernel module tests +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + +if ! /sbin/modprobe -q -n test_static_key_base; then + echo "static_key: module test_static_key_base is not found [SKIP]" + exit $ksft_skip +fi + +if ! /sbin/modprobe -q -n test_static_keys; then + echo "static_key: module test_static_keys is not found [SKIP]" + exit $ksft_skip +fi + if /sbin/modprobe -q test_static_key_base; then if /sbin/modprobe -q test_static_keys; then echo "static_key: ok"
Greg Kroah-Hartman
maintainerPATCH 28/324 selftests: sysctl: return Kselftest Skip code for skipped tests
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Shuah Khan (Samsung OSG)" <[email protected]>
[ Upstream commit c7db6ffb831fd36a03485a0d88b1e505378975ad ]
When sysctl test is skipped because of unmet dependencies and/or unsupported configuration, it exits with error which is treated as a fail by the Kselftest framework. This leads to false negative result even when the test could not be run.
Change it to return kselftest skip code when a test gets skipped to clearly report that the test could not be run.
Changed return code to kselftest skip code in skip error legs that check requirements and module probe test error leg.
Kselftest framework SKIP code is 4 and the framework prints appropriate messages to indicate that the test is skipped.
--- tools/testing/selftests/sysctl/sysctl.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
tools/testing/selftests/sysctl/sysctl.sh +13 -7
@@ -14,6 +14,9 @@ # This performs a series tests against the proc sysctl interface. +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + TEST_NAME="sysctl" TEST_DRIVER="test_${TEST_NAME}" TEST_DIR=$(dirname $0)
@@ -41,7 +44,7 @@ test_modprobe() echo "$0: $DIR not present" >&2 echo "You must have the following enabled in your kernel:" >&2 cat $TEST_DIR/config >&2 - exit 1 + exit $ksft_skip fi }
@@ -98,28 +101,30 @@ test_reqs() uid=$(id -u) if [ $uid -ne 0 ]; then echo $msg must be run as root >&2 - exit 0 + exit $ksft_skip fi if ! which perl 2> /dev/null > /dev/null; then echo "$0: You need perl installed" - exit 1 + exit $ksft_skip fi if ! which getconf 2> /dev/null > /dev/null; then echo "$0: You need getconf installed" - exit 1 + exit $ksft_skip fi if ! which diff 2> /dev/null > /dev/null; then echo "$0: You need diff installed" - exit 1 + exit $ksft_skip fi } function load_req_mod() { - trap "test_modprobe" EXIT - if [ ! -d $DIR ]; then + if ! modprobe -q -n $TEST_DRIVER; then + echo "$0: module $TEST_DRIVER not found [SKIP]" + exit $ksft_skip + fi modprobe $TEST_DRIVER if [ $? -ne 0 ]; then exit
@@ -765,6 +770,7 @@ function parse_args() test_reqs allow_user_defaults check_production_sysctl_writes_strict +test_modprobe load_req_mod trap "test_finish" EXIT
Greg Kroah-Hartman
maintainerPATCH 29/324 selftests: user: return Kselftest Skip code for skipped tests
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Shuah Khan (Samsung OSG)" <[email protected]>
[ Upstream commit d7d5311d4aa9611fe1a5a851e6f75733237a668a ]
When user test is skipped because of unmet dependencies and/or unsupported configuration, it exits with error which is treated as a fail by the Kselftest framework. This leads to false negative result even when the test could not be run.
Change it to return kselftest skip code when a test gets skipped to clearly report that the test could not be run. Add an explicit check for module presence and return skip code if module isn't present.
Kselftest framework SKIP code is 4 and the framework prints appropriate messages to indicate that the test is skipped.
--- tools/testing/selftests/user/test_user_copy.sh | 7 +++++++ 1 file changed, 7 insertions(+)
tools/testing/selftests/user/test_user_copy.sh +7 -0
@@ -2,6 +2,13 @@ # SPDX-License-Identifier: GPL-2.0 # Runs copy_to/from_user infrastructure using test_user_copy kernel module +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + +if ! /sbin/modprobe -q -n test_user_copy; then + echo "user: module test_user_copy is not found [SKIP]" + exit $ksft_skip +fi if /sbin/modprobe -q test_user_copy; then /sbin/modprobe -q -r test_user_copy echo "user_copy: ok"
Greg Kroah-Hartman
maintainerPATCH 30/324 selftests: zram: return Kselftest Skip code for skipped tests
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Shuah Khan (Samsung OSG)" <[email protected]>
[ Upstream commit 685814466bf8398192cf855415a0bb2cefc1930e ]
When zram test is skipped because of unmet dependencies and/or unsupported configuration, it exits with error which is treated as a fail by the Kselftest framework. This leads to false negative result even when the test could not be run.
Change it to return kselftest skip code when a test gets skipped to clearly report that the test could not be run.
Kselftest framework SKIP code is 4 and the framework prints appropriate messages to indicate that the test is skipped.
--- tools/testing/selftests/zram/zram.sh | 5 ++++- tools/testing/selftests/zram/zram_lib.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)
tools/testing/selftests/zram/zram.sh +4 -1
@@ -2,6 +2,9 @@ # SPDX-License-Identifier: GPL-2.0 TCID="zram.sh" +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + . ./zram_lib.sh run_zram () {
@@ -24,5 +27,5 @@ elif [ -b /dev/zram0 ]; then else echo "$TCID : No zram.ko module or /dev/zram0 device file not found" echo "$TCID : CONFIG_ZRAM is not set" - exit 1 + exit $ksft_skip fi
tools/testing/selftests/zram/zram_lib.sh +4 -1
@@ -18,6 +18,9 @@ MODULE=0 dev_makeswap=-1 dev_mounted=-1 +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + trap INT check_prereqs()
@@ -27,7 +30,7 @@ check_prereqs() if [ $uid -ne 0 ]; then echo $msg must be run as root >&2 - exit 0 + exit $ksft_skip fi }
Greg Kroah-Hartman
maintainerPATCH 31/324 selftests: vm: return Kselftest Skip code for skipped tests
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Shuah Khan (Samsung OSG)" <[email protected]>
[ Upstream commit a4d7537789724985cafbc9260a31ca4f2b7cf123 ]
When vm test is skipped because of unmet dependencies and/or unsupported configuration, it exits with error which is treated as a fail by the Kselftest framework. This leads to false negative result even when the test could not be run.
Change it to return kselftest skip code when a test gets skipped to clearly report that the test could not be run.
Kselftest framework SKIP code is 4 and the framework prints appropriate messages to indicate that the test is skipped.
--- tools/testing/selftests/vm/compaction_test.c | 4 +++- tools/testing/selftests/vm/mlock2-tests.c | 12 +++++++----- tools/testing/selftests/vm/run_vmtests | 5 ++++- tools/testing/selftests/vm/userfaultfd.c | 4 +++- 4 files changed, 17 insertions(+), 8 deletions(-)
tools/testing/selftests/vm/compaction_test.c +3 -1
@@ -16,6 +16,8 @@#include <unistd.h> #include <string.h> +#include "../kselftest.h" +#define MAP_SIZE 1048576struct map_list {
@@ -169,7 +171,7 @@ int main(int argc, char **argv)printf ("Either the sysctl compact_unevictable_allowed is not\n" "set to 1 or couldn't read the proc file.\n" "Skipping the test\n" ); -return 0 ; +return KSFT_SKIP ; } lim.rlim_cur =RLIM_INFINITY ;
tools/testing/selftests/vm/mlock2-tests.c +7 -5
@@ -9,6 +9,8 @@#include <stdbool.h> #include "mlock2.h" +#include "../kselftest.h" +struct vm_boundaries {unsigned long start;unsigned long end;
@@ -303,7 +305,7 @@ static int test_mlock_lock()if (mlock2_ (map,2 * page_size,0 )) {if (errno ==ENOSYS ) {printf ("Cannot call new mlock family, skipping test\n" ); -_exit (0 ); +_exit (KSFT_SKIP ); }perror ("mlock2(0)" ); goto unmap;
@@ -412,7 +414,7 @@ static int test_mlock_onfault()if (mlock2_ (map,2 * page_size,MLOCK_ONFAULT )) {if (errno ==ENOSYS ) {printf ("Cannot call new mlock family, skipping test\n" ); -_exit (0 ); +_exit (KSFT_SKIP ); }perror ("mlock2(MLOCK_ONFAULT)" ); goto unmap;
@@ -425,7 +427,7 @@ static int test_mlock_onfault()if (munlock (map,2 * page_size)) {if (errno ==ENOSYS ) {printf ("Cannot call new mlock family, skipping test\n" ); -_exit (0 ); +_exit (KSFT_SKIP ); }perror ("munlock()" ); goto unmap;
@@ -457,7 +459,7 @@ static int test_lock_onfault_of_present(if (mlock2_ (map,2 * page_size,MLOCK_ONFAULT )) {if (errno ==ENOSYS ) {printf ("Cannot call new mlock family, skipping test\n" ); -_exit (0 ); +_exit (KSFT_SKIP ); }perror ("mlock2(MLOCK_ONFAULT)" ); goto unmap;
@@ -583,7 +585,7 @@ static int test_vma_management(bool callif (call_mlock &&mlock2_ (map,3 * page_size,MLOCK_ONFAULT )) {if (errno ==ENOSYS ) {printf ("Cannot call new mlock family, skipping test\n" ); -_exit (0 ); +_exit (KSFT_SKIP ); }perror ("mlock(ONFAULT)\n" ); goto out;
tools/testing/selftests/vm/run_vmtests +4 -1
@@ -2,6 +2,9 @@ # SPDX-License-Identifier: GPL-2.0 #please run as root +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + mnt=./huge exitcode=0
@@ -36,7 +39,7 @@ if [ -n "$freepgs" ] && [ -n "$hpgsize_K echo $(( $lackpgs + $nr_hugepgs )) > /proc/sys/vm/nr_hugepages if [ $? -ne 0 ]; then echo "Please run this test as root" - exit 1 + exit $ksft_skip fi while read name size unit; do if [ "$name" = "HugePages_Free:" ]; then
tools/testing/selftests/vm/userfaultfd.c +3 -1
@@ -69,6 +69,8 @@#include <setjmp.h> #include <stdbool.h> +#include "../kselftest.h" +#ifdef __NR_userfaultfdstatic unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size;
@@ -1322,7 +1324,7 @@ int main(int argc, char **argv)int main (void ) {printf ("skip: Skipping userfaultfd test (missing __NR_userfaultfd)\n" ); -return 0 ; +return KSFT_SKIP ; }#endif /* __NR_userfaultfd */
Greg Kroah-Hartman
maintainerPATCH 32/324 selftests: sync: add config fragment for testing sync framework
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fathi Boudra <[email protected]>
[ Upstream commit d6a3e55131fcb1e5ca1753f4b6f297a177b2fc91 ]
Unless the software synchronization objects (CONFIG_SW_SYNC) is enabled, the sync test will be skipped:
TAP version 13
1..0 # Skipped: Sync framework not supported by kernel
Add a config fragment file to be able to run "make kselftest-merge" to enable relevant configuration required in order to run the sync test.
--- tools/testing/selftests/sync/config | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 tools/testing/selftests/sync/config
tools/testing/selftests/sync/config new file +4 -0
@@ -0,0 +1,4 @@ +CONFIG_STAGING=y +CONFIG_ANDROID=y +CONFIG_SYNC=y +CONFIG_SW_SYNC=y
Greg Kroah-Hartman
maintainerPATCH 33/324 ARM: dts: NSP: Fix i2c controller interrupt type
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit a3e32e78a40017756c71ef6dad429ffe3301126a ]
The i2c controller should use IRQ_TYPE_LEVEL_HIGH instead of IRQ_TYPE_NONE.
--- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -391,7 +391,7 @@ reg = <0x38000 0x50>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; dma-coherent; status = "disabled";
Greg Kroah-Hartman
maintainerPATCH 34/324 ARM: dts: NSP: Fix PCIe controllers interrupt types
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit 403fde644855bc71318c8db65646383e22653b13 ]
The interrupts for the PCIe controllers should all be of type IRQ_TYPE_LEVEL_HIGH instead of IRQ_TYPE_NONE.
--- arch/arm/boot/dts/bcm-nsp.dtsi | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +15 -15
@@ -496,7 +496,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <0>;
@@ -519,10 +519,10 @@ compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 127 IRQ_TYPE_NONE>, - <GIC_SPI 128 IRQ_TYPE_NONE>, - <GIC_SPI 129 IRQ_TYPE_NONE>, - <GIC_SPI 130 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>; brcm,pcie-msi-inten; }; };
@@ -533,7 +533,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <1>;
@@ -556,10 +556,10 @@ compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 133 IRQ_TYPE_NONE>, - <GIC_SPI 134 IRQ_TYPE_NONE>, - <GIC_SPI 135 IRQ_TYPE_NONE>, - <GIC_SPI 136 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>; brcm,pcie-msi-inten; }; };
@@ -570,7 +570,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <2>;
@@ -593,10 +593,10 @@ compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>, - <GIC_SPI 140 IRQ_TYPE_NONE>, - <GIC_SPI 141 IRQ_TYPE_NONE>, - <GIC_SPI 142 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>; brcm,pcie-msi-inten; }; };
Greg Kroah-Hartman
maintainerPATCH 35/324 ARM: dts: HR2: Fix interrupt types for i2c and PCIe
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit dbe4a39331b7aa8bcac8ef2da780724e1af1619a ]
The i2c and PCIe controllers had an incorrect type which should have been set to IRQ_TYPE_LEVEL_HIGH, fix that.
--- arch/arm/boot/dts/bcm-hr2.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/bcm-hr2.dtsi +12 -12
@@ -264,7 +264,7 @@ reg = <0x38000 0x50>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 95 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; };
@@ -279,7 +279,7 @@ reg = <0x3b000 0x50>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; }; };
@@ -300,7 +300,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 186 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <0>;
@@ -322,10 +322,10 @@ compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 182 IRQ_TYPE_NONE>, - <GIC_SPI 183 IRQ_TYPE_NONE>, - <GIC_SPI 184 IRQ_TYPE_NONE>, - <GIC_SPI 185 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>; brcm,pcie-msi-inten; }; };
@@ -336,7 +336,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 192 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <1>;
@@ -358,10 +358,10 @@ compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 188 IRQ_TYPE_NONE>, - <GIC_SPI 189 IRQ_TYPE_NONE>, - <GIC_SPI 190 IRQ_TYPE_NONE>, - <GIC_SPI 191 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>; brcm,pcie-msi-inten; }; };
Greg Kroah-Hartman
maintainerPATCH 36/324 ARM: dts: BCM5301x: Fix i2c controller interrupt type
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Fainelli <[email protected]>
[ Upstream commit a0a8338e905734518ab9b10b06e7fd0201228f8b ]
The i2c controller should be using IRQ_TYPE_LEVEL_HIGH, fix that.
--- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm5301x.dtsi +1 -1
@@ -365,7 +365,7 @@ i2c0: i2c@18009000 { compatible = "brcm,iproc-i2c"; reg = <0x18009000 0x50>; - interrupts = <GIC_SPI 121 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; clock-frequency = <100000>;
Greg Kroah-Hartman
maintainerPATCH 37/324 ARM: dts: Cygnus: Fix I2C controller interrupt type
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ray Jui <[email protected]>
[ Upstream commit 71ca3409703b62b6a092d0d9d13f366c121bc5d3 ]
Fix I2C controller interrupt to use IRQ_TYPE_LEVEL_HIGH for Broadcom Cygnus SoC.
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +2 -2
@@ -216,7 +216,7 @@ reg = <0x18008000 0x100>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; status = "disabled"; };
@@ -245,7 +245,7 @@ reg = <0x1800b000 0x100>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 38/324 ARM: dts: Cygnus: Fix PCIe controller interrupt type
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ray Jui <[email protected]>
[ Upstream commit 6cb1628ad3506b315cdddd7676db0ff2af378d28 ]
Fix PCIe controller interrupt to use IRQ_TYPE_LEVEL_HIGH for Broadcom Cygnus SoC
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +10 -10
@@ -256,7 +256,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <0>;
@@ -278,10 +278,10 @@ compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>, - <GIC_SPI 97 IRQ_TYPE_NONE>, - <GIC_SPI 98 IRQ_TYPE_NONE>, - <GIC_SPI 99 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; }; };
@@ -291,7 +291,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <1>;
@@ -313,10 +313,10 @@ compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; - interrupts = <GIC_SPI 102 IRQ_TYPE_NONE>, - <GIC_SPI 103 IRQ_TYPE_NONE>, - <GIC_SPI 104 IRQ_TYPE_NONE>, - <GIC_SPI 105 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; }; };
Greg Kroah-Hartman
maintainerPATCH 39/324 arm64: dts: specify 1.8V EMMC capabilities for bcm958742k
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Scott Branden <[email protected]>
[ Upstream commit eba92503e980c08ac353d0d669d0bb143979abcd ]
Specify 1.8V EMMC capabilities for bcm958742k board to indicate support for UHS mode.
--- arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/broadcom/stingray/bcm958742k.dts +4 -0
@@ -43,6 +43,10 @@ enet-phy-lane-swap; }; +&sdio0 { + mmc-ddr-1_8v; +}; + &uart2 { status = "okay"; };
Greg Kroah-Hartman
maintainerPATCH 40/324 arm64: dts: specify 1.8V EMMC capabilities for bcm958742t
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Scott Branden <[email protected]>
[ Upstream commit 37c2bd81a86ebb1cc934bf52a29c33d6f9abff7f ]
Specify 1.8V EMMC capabilities for bcm958742t board to indicate support for UHS mode.
--- arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/broadcom/stingray/bcm958742t.dts +4 -0
@@ -42,3 +42,7 @@ &gphy0 { enet-phy-lane-swap; }; + +&sdio0 { + mmc-ddr-1_8v; +};
Greg Kroah-Hartman
maintainerPATCH 41/324 arm64: dts: ns2: Fix I2C controller interrupt type
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ray Jui <[email protected]>
[ Upstream commit e605c287deed45624e8d35a15e3f0b4faab1a62d ]
Fix I2C controller interrupt to use IRQ_TYPE_LEVEL_HIGH for Broadcom NS2 SoC.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +2 -2
@@ -566,7 +566,7 @@ reg = <0x66080000 0x100>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 394 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; status = "disabled"; };
@@ -594,7 +594,7 @@ reg = <0x660b0000 0x100>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 395 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 42/324 arm64: dts: ns2: Fix PCIe controller interrupt type
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ray Jui <[email protected]>
[ Upstream commit d0b8aed9e80ab526dbb04020bfc94ecea7bddb44 ]
Fix PCIe controller interrupt to use IRQ_TYPE_LEVEL_HIGH for Broadcom NS2 SoC.
--- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +2 -2
@@ -118,7 +118,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <0>;
@@ -149,7 +149,7 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_NONE>; + interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>; linux,pci-domain = <4>;
Greg Kroah-Hartman
maintainerPATCH 43/324 arm64: dts: Stingray: Fix I2C controller interrupt type
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ray Jui <[email protected]>
[ Upstream commit 75af23c4736c5633894ea0baf9bca1cf6b248ca4 ]
Fix I2C controller interrupt to use IRQ_TYPE_LEVEL_HIGH for Broadcom Stingray SoC.
--- arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +2 -2
@@ -409,7 +409,7 @@ reg = <0x000b0000 0x100>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 177 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; status = "disabled"; };
@@ -453,7 +453,7 @@ reg = <0x000e0000 0x100>; #address-cells = <1>; #size-cells = <0>; - interrupts = <GIC_SPI 178 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>; clock-frequency = <100000>; status = "disabled"; };
Greg Kroah-Hartman
maintainerPATCH 44/324 drivers/perf: xgene_pmu: Fix IOB SLOW PMU parser error
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hoan Tran <[email protected]>
[ Upstream commit a45fc268db20ecd859bb61e25045912b3194b5e6 ]
This patch fixes the below parser error of the IOB SLOW PMU.
# perf stat -a -e iob-slow0/cycle-count/ sleep 1
evenf syntax error: 'iob-slow0/cycle-count/'
\___ parser errorIt replaces the "-" character by "_" character inside the PMU name.
--- drivers/perf/xgene_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/perf/xgene_pmu.c +1 -1
@@ -1463,7 +1463,7 @@ static char *xgene_pmu_dev_name(struct dcase PMU_TYPE_IOB :return devm_kasprintf (dev,GFP_KERNEL ,"iob%d" , id);case PMU_TYPE_IOB_SLOW : -return devm_kasprintf (dev,GFP_KERNEL ,"iob-slow%d" , id); +return devm_kasprintf (dev,GFP_KERNEL ,"iob_slow%d" , id);case PMU_TYPE_MCB :return devm_kasprintf (dev,GFP_KERNEL ,"mcb%d" , id);case PMU_TYPE_MC :
Greg Kroah-Hartman
maintainerPATCH 45/324 drm/arm/malidp: Ensure that the crtcs are shutdown before removing any encoder/connector
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ayan Kumar Halder <[email protected]>
[ Upstream commit 109c4d18e57445afcaf728b8716a69375a3daab2 ]
One needs to ensure that the crtcs are shutdown so that the drm_crtc_state->connector_mask reflects that no connectors are currently active. Further, it reduces the reference count for each connector. This ensures that the connectors and encoders can be cleanly removed either when _unbind
is called for the corresponding drivers or by drm_mode_config_cleanup().
We need drm_atomic_helper_shutdown() to be called before component_unbind_all() otherwise the connectors attached to the component device will have the wrong reference count value and will not be cleanly removed.
--- drivers/gpu/drm/arm/malidp_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/malidp_drv.c +2 -1
@@ -278,7 +278,6 @@ static int malidp_init(struct drm_devicestatic void malidp_fini (struct drm_device *drm) { -drm_atomic_helper_shutdown (drm);drm_mode_config_cleanup (drm); }
@@ -646,6 +645,7 @@ vblank_fail:malidp_de_irq_fini (drm); drm->irq_enabled = false; irq_init_fail: +drm_atomic_helper_shutdown (drm);component_unbind_all (dev, drm); bind_fail:of_node_put (malidp->crtc.port);
@@ -681,6 +681,7 @@ static void malidp_unbind(struct devicemalidp_se_irq_fini (drm);malidp_de_irq_fini (drm); drm->irq_enabled = false; +drm_atomic_helper_shutdown (drm);component_unbind_all (dev, drm);of_node_put (malidp->crtc.port); malidp->crtc.port =NULL ;
Greg Kroah-Hartman
maintainerPATCH 47/324 drm/arm/malidp: Preserve LAYER_FORMAT contents when setting format
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ayan Kumar Halder <[email protected]>
[ Upstream commit ad7fda2e378f4356df621a39655f7c200b495d81 ]
On some Mali-DP processors, the LAYER_FORMAT register contains fields other than the format. These bits were unconditionally cleared when setting the pixel format, whereas they should be preserved at their reset values.
--- drivers/gpu/drm/arm/malidp_planes.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/arm/malidp_planes.c +4 -1
@@ -23,6 +23,7 @@/* Layer specific register offsets */ #define MALIDP_LAYER_FORMAT 0x000 +#define LAYER_FORMAT_MASK 0x3f#define MALIDP_LAYER_CONTROL 0x004#define LAYER_ENABLE (1 << 0)#define LAYER_FLOWCFG_MASK 7
@@ -337,7 +338,9 @@ static void malidp_de_plane_update(struc dest_w = plane->state->crtc_w; dest_h = plane->state->crtc_h; -malidp_hw_write (mp->hwdev, ms->format, mp->layer->base); + val =malidp_hw_read (mp->hwdev, mp->layer->base); + val = (val & ~LAYER_FORMAT_MASK ) | ms->format; +malidp_hw_write (mp->hwdev, val, mp->layer->base);for (i =0 ; i < ms->n_planes; i++) {/* calculate the offset for the layer's plane registers */
Greg Kroah-Hartman
maintainerPATCH 48/324 drm/mali-dp: Rectify the width and height passed to rotmem_required()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ayan Kumar Halder <[email protected]>
[ Upstream commit c6cf387ec56c19028333274747bbb4ae145a2d13 ]
The width and height needs to be swapped
--- drivers/gpu/drm/arm/malidp_planes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/arm/malidp_planes.c +2 -2
@@ -236,8 +236,8 @@ static int malidp_de_plane_check(structif (state->rotation &MALIDP_ROTATED_MASK ) {int val; - val = mp->hwdev->hw->rotmem_required (mp->hwdev, state->crtc_h, - state->crtc_w, + val = mp->hwdev->hw->rotmem_required (mp->hwdev, state->crtc_w, + state->crtc_h, fb->format->format);if (val <0 )return val;
Greg Kroah-Hartman
maintainerPATCH 49/324 IB/rxe: Fix missing completion for mem_reg work requests
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vijay Immanuel <[email protected]>
[ Upstream commit 375dc53d032fc11e98036b5f228ad13f7c5933f5 ]
Run the completer task to post a work completion after processing a memory registration or invalidate work request. This covers the case where the memory registration or invalidate was the last work request posted to the qp.
--- drivers/infiniband/sw/rxe/rxe_req.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/sw/rxe/rxe_req.c +3 -0
@@ -645,6 +645,9 @@ next_wqe: }else { goto exit; } +if ((wqe->wr.send_flags &IB_SEND_SIGNALED ) || + qp->sq_sig_type ==IB_SIGNAL_ALL_WR ) +rxe_run_task (&qp->comp.task,1 ); qp->req.wqe_index =next_index (qp->sq.queue, qp->req.wqe_index); goto next_wqe;
Greg Kroah-Hartman
maintainerPATCH 50/324 libahci: Fix possible Spectre-v1 pmp indexing in ahci_led_store()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit fae2a63737e5973f1426bc139935a0f42e232844 ]
Currently smatch warns of possible Spectre-V1 issue in ahci_led_store():drivers/ata/libahci.c:1150 ahci_led_store() warn: potential spectre issue 'pp->em_priv' (local cap)
Userspace controls @pmp from following callchain:em_message->store()
->ata_scsi_em_message_store()
-->ap->ops->em_store()
--->ahci_led_store()
After the mask+shift @pmp is effectively an 8b value, which is used to index into an array of length 8, so sanitize the array index.
--- drivers/ata/libahci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/ata/libahci.c +5 -2
@@ -35,6 +35,7 @@#include <linux/kernel.h> #include <linux/gfp.h> #include <linux/module.h> +#include <linux/nospec.h> #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h>
@@ -1146,10 +1147,12 @@ static ssize_t ahci_led_store(struct ata/* get the slot number from the message */ pmp = (state &EM_MSG_LED_PMP_SLOT ) >>8 ; -if (pmp <EM_MAX_SLOTS ) +if (pmp <EM_MAX_SLOTS ) { + pmp =array_index_nospec (pmp,EM_MAX_SLOTS ); emp = &pp->em_priv[pmp]; -else + }else {return -EINVAL ; + }/* mask off the activity bits if we are in sw_activity * mode, user should turn off sw_activity before setting
Greg Kroah-Hartman
maintainerPATCH 51/324 dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Janusz Krzysztofik <[email protected]>
[ Upstream commit c9bd0946da243a8eb86b44ff613e2c813f9b683b ]
Commit 0198d7bb8a0c ("ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm") resulted in broken audio playback on OMAP1510 (discovered on Amstrad Delta).
When running on OMAP1510, omap-pcm used to obtain DMA offset from snd_dmaengine_pcm_pointer_no_residue() based on DMA interrupt triggered software calculations instead of snd_dmaengine_pcm_pointer() which depended on residue value calculated from omap_dma_get_src_pos(). Similar code path is still available in now used sound/soc/soc-generic-dmaengine-pcm.c but it is not triggered.
It was verified already before that omap_get_dma_src_pos() from arch/arm/plat-omap/dma.c didn't work correctly for OMAP1510 - see commit 1bdd7419910c ("ASoC: OMAP: fix OMAP1510 broken PCM pointer callback") for details. Apparently the same applies to its successor, omap_dma_get_src_pos() from drivers/dma/ti/omap-dma.c.
On the other hand, snd_dmaengine_pcm_pointer_no_residue() is described as depreciated and discouraged for use in new drivers because of its unreliable accuracy. However, it seems the only working option for OPAM1510 now, as long as a software calculated residue is not implemented as OMAP1510 fallback in omap-dma.
Using snd_dmaengine_pcm_pointer_no_residue() code path instead of snd_dmaengine_pcm_pointer() in sound/soc/soc-generic-dmaengine-pcm.c can be triggered in two ways:
- by passing pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE from sound/soc/omap/sdma-pcm.c,
- by passing dma_caps.residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR from DMA engine.
Let's do the latter.
--- drivers/dma/omap-dma.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/dma/omap-dma.c +5 -1
@@ -1485,7 +1485,11 @@ static int omap_dma_probe(struct platfor od->ddev.src_addr_widths =OMAP_DMA_BUSWIDTHS ; od->ddev.dst_addr_widths =OMAP_DMA_BUSWIDTHS ; od->ddev.directions =BIT (DMA_DEV_TO_MEM ) |BIT (DMA_MEM_TO_DEV ); - od->ddev.residue_granularity =DMA_RESIDUE_GRANULARITY_BURST ; +if (__dma_omap15xx (od->plat->dma_attr)) + od->ddev.residue_granularity = +DMA_RESIDUE_GRANULARITY_DESCRIPTOR ; +else + od->ddev.residue_granularity =DMA_RESIDUE_GRANULARITY_BURST ; od->ddev.max_burst =SZ_16M -1 ;/* CCEN: 24bit unsigned */ od->ddev.dev = &pdev->dev;INIT_LIST_HEAD (&od->ddev.channels);
Greg Kroah-Hartman
maintainerPATCH 52/324 usb: dwc2: Fix host exit from hibernation flow.
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artur Petrosyan <[email protected]>
[ Upstream commit 22bb5cfdf13ae70c6a34508a16cfeee48f162443 ]
In case when a hub is connected to DWC2 host
auto suspend occurs and host goes to
hibernation. When any device connected to hub
host hibernation exiting incorrectly.
- Added dwc2_hcd_rem_wakeup() function call to
exit from suspend state by remote wakeup.
- Increase timeout value for port suspend bit to be set.
--- drivers/usb/dwc2/hcd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/dwc2/hcd.c +3 -1
@@ -5437,7 +5437,7 @@ int dwc2_host_enter_hibernation(struct ddwc2_writel (hprt0, hsotg->regs +HPRT0 );/* Wait for the HPRT0.PrtSusp register field to be set */ -if (dwc2_hsotg_wait_bit_set (hsotg,HPRT0 ,HPRT0_SUSP ,300 )) +if (dwc2_hsotg_wait_bit_set (hsotg,HPRT0 ,HPRT0_SUSP ,3000 ))dev_warn (hsotg->dev,"Suspend wasn't generated\n" );/*
@@ -5618,6 +5618,8 @@ int dwc2_host_exit_hibernation(struct dwreturn ret; } +dwc2_hcd_rem_wakeup (hsotg); + hsotg->hibernated =0 ; hsotg->bus_suspended =0 ; hsotg->lx_state =DWC2_L0 ;
Greg Kroah-Hartman
maintainerPATCH 53/324 usb: dwc2: alloc dma aligned buffer for isoc split in
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Wu <[email protected]>
[ Upstream commit af424a410749ed7e0c2bffd3cedbc7c274d0ff6f ]
The commit 3bc04e28a030 ("usb: dwc2: host: Get aligned DMA in a more supported way") rips out a lot of code to simply the allocation of aligned DMA. However, it also introduces a new issue when use isoc split in transfer.
In my test case, I connect the dwc2 controller with an usb hs Hub (GL852G-12), and plug an usb fs audio device (Plantronics headset) into the downstream port of Hub. Then use the usb mic to record, we can find noise when playback.
It's because that the usb Hub uses an MDATA for the first transaction and a DATA0 for the second transaction for the isoc split in transaction. An typical isoc split in transaction sequence like this:
- SSPLIT IN transaction
- CSPLIT IN transaction
- MDATA packet
- CSPLIT IN transaction
- DATA0 packet
The DMA address of MDATA (urb->dma) is always DWORD-aligned, but the DMA address of DATA0 (urb->dma + qtd->isoc_split_offset) may not be DWORD-aligned, it depends on the qtd->isoc_split_offset (the length of MDATA). In my test case, the length of MDATA is usually unaligned, this cause DATA0 packet transmission error.
This patch use kmem_cache to allocate aligned DMA buf for isoc split in transaction. Note that according to usb 2.0 spec, the maximum data payload size is 1023 bytes for each fs isoc ep, and the maximum allowable interrupt data payload size is 64 bytes or less for fs interrupt ep. So we set the size of object to be 1024 bytes in the kmem cache.
--- drivers/usb/dwc2/core.h | 3 + drivers/usb/dwc2/hcd.c | 89 ++++++++++++++++++++++++++++++++++++++++--- drivers/usb/dwc2/hcd.h | 8 +++ drivers/usb/dwc2/hcd_intr.c | 8 +++ drivers/usb/dwc2/hcd_queue.c | 3 + 5 files changed, 106 insertions(+), 5 deletions(-)
drivers/usb/dwc2/core.h +3 -0
@@ -915,6 +915,7 @@ struct dwc2_hregs_backup {* @frame_list_sz: Frame list size * @desc_gen_cache: Kmem cache for generic descriptors * @desc_hsisoc_cache: Kmem cache for hs isochronous descriptors +* @unaligned_cache: Kmem cache for DMA mode to handle non-aligned buf * * These are for peripheral mode: *
@@ -1061,6 +1062,8 @@ struct dwc2_hsotg {u32 frame_list_sz;struct kmem_cache *desc_gen_cache;struct kmem_cache *desc_hsisoc_cache; +struct kmem_cache *unaligned_cache; +#define DWC2_KMEM_UNALIGNED_BUF_SIZE 1024#endif /* CONFIG_USB_DWC2_HOST || CONFIG_USB_DWC2_DUAL_ROLE */
drivers/usb/dwc2/hcd.c +84 -5
129 lines not on this page · raw message
drivers/usb/dwc2/hcd.h +8 -0
@@ -76,6 +76,8 @@ struct dwc2_qh;* (micro)frame * @xfer_buf: Pointer to current transfer buffer position * @xfer_dma: DMA address of xfer_buf +* @align_buf: In Buffer DMA mode this will be used if xfer_buf is not +* DWORD aligned * @xfer_len: Total number of bytes to transfer * @xfer_count: Number of bytes transferred so far * @start_pkt_count: Packet count at start of transfer
@@ -133,6 +135,7 @@ struct dwc2_host_chan {u8 *xfer_buf;dma_addr_t xfer_dma; +dma_addr_t align_buf;u32 xfer_len;u32 xfer_count;u16 start_pkt_count;
@@ -303,6 +306,9 @@ struct dwc2_hs_transfer_time {* is tightly packed. * @ls_duration_us: Duration on the low speed bus schedule. * @ntd: Actual number of transfer descriptors in a list +* @dw_align_buf: Used instead of original buffer if its physical address +* is not dword-aligned +* @dw_align_buf_dma: DMA address for dw_align_buf * @qtd_list: List of QTDs for this QH * @channel: Host channel currently processing transfers for this QH * @qh_list_entry: Entry for QH in either the periodic or non-periodic
@@ -350,6 +356,8 @@ struct dwc2_qh {struct dwc2_hs_transfer_time hs_transfers[DWC2_HS_SCHEDULE_UFRAMES ];u32 ls_start_schedule_slice;u16 ntd; +u8 *dw_align_buf; +dma_addr_t dw_align_buf_dma;struct list_head qtd_list;struct dwc2_host_chan *channel;struct list_head qh_list_entry;
drivers/usb/dwc2/hcd_intr.c +8 -0
@@ -938,6 +938,14 @@ static int dwc2_xfercomp_isoc_split_in(s frame_desc->actual_length += len; +if (chan->align_buf) { +dev_vdbg (hsotg->dev,"non-aligned buffer\n" ); +dma_unmap_single (hsotg->dev, chan->qh->dw_align_buf_dma, +DWC2_KMEM_UNALIGNED_BUF_SIZE ,DMA_FROM_DEVICE ); +memcpy (qtd->urb->buf + (chan->xfer_dma - qtd->urb->dma), + chan->qh->dw_align_buf, len); + } + qtd->isoc_split_offset += len; hctsiz =dwc2_readl (hsotg->regs +HCTSIZ (chnum));
drivers/usb/dwc2/hcd_queue.c +3 -0
@@ -1695,6 +1695,9 @@ void dwc2_hcd_qh_free(struct dwc2_hsotgif (qh->desc_list)dwc2_hcd_qh_free_ddma (hsotg, qh); +else if (hsotg->unaligned_cache && qh->dw_align_buf) +kmem_cache_free (hsotg->unaligned_cache, qh->dw_align_buf); +kfree (qh); }
Greg Kroah-Hartman
maintainerPATCH 54/324 usb: dwc2: fix isoc split in transfer with no data
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: William Wu <[email protected]>
[ Upstream commit 70c3c8cb83856758025c2a211dd022bc0478922a ]
If isoc split in transfer with no data (the length of DATA0 packet is zero), we can't simply return immediately. Because the DATA0 can be the first transaction or the second transaction for the isoc split in transaction. If the DATA0 packet with no data is in the first transaction, we can return immediately. But if the DATA0 packet with no data is in the second transaction of isoc split in transaction sequence, we need to increase the qtd->isoc_frame_index and giveback urb to device driver if needed, otherwise, the MDATA packet will be lost.
A typical test case is that connect the dwc2 controller with an usb hs Hub (GL852G-12), and plug an usb fs audio device (Plantronics headset) into the downstream port of Hub. Then use the usb mic to record, we can find noise when playback.
In the case, the isoc split in transaction sequence like this:
- SSPLIT IN transaction
- CSPLIT IN transaction
- MDATA packet (176 bytes)
- CSPLIT IN transaction
- DATA0 packet (0 byte)
This patch use both the length of DATA0 and qtd->isoc_split_offset to check if the DATA0 is in the second transaction.
--- drivers/usb/dwc2/hcd_intr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/dwc2/hcd_intr.c +1 -2
@@ -930,9 +930,8 @@ static int dwc2_xfercomp_isoc_split_in(s frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index]; len =dwc2_get_actual_xfer_length (hsotg, chan, chnum, qtd,DWC2_HC_XFER_COMPLETE ,NULL ); -if (!len) { +if (!len && !qtd->isoc_split_offset) { qtd->complete_split =0 ; - qtd->isoc_split_offset =0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 55/324 usb: gadget: composite: fix delayed_status race condition when set_interface
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chunfeng Yun <[email protected]>
[ Upstream commit 980900d6318066b9f8314bfb87329a20fd0d1ca4 ]
It happens when enable debug log, if set_alt() returns USB_GADGET_DELAYED_STATUS and usb_composite_setup_continue() is called before increasing count of @delayed_status, so fix it by using spinlock of @cdev->lock.
--- drivers/usb/gadget/composite.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/gadget/composite.c +3 -0
@@ -1719,6 +1719,8 @@ composite_setup(struct usb_gadget *gadge*/ if (w_value && !f->get_alt)break ; + +spin_lock (&cdev->lock); value = f->set_alt (f, w_index, w_value);if (value ==USB_GADGET_DELAYED_STATUS ) { DBG(cdev,
@@ -1728,6 +1730,7 @@ composite_setup(struct usb_gadget *gadgeDBG (cdev,"delayed_status count %d\n" , cdev->delayed_status); } +spin_unlock (&cdev->lock);break ;case USB_REQ_GET_INTERFACE :if (ctrl->bRequestType != (USB_DIR_IN |USB_RECIP_INTERFACE ))
Greg Kroah-Hartman
maintainerPATCH 56/324 usb: gadget: dwc2: fix memory leak in gadget_init()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grigor Tovmasyan <[email protected]>
[ Upstream commit 9bb073a053f0464ea74a4d4c331fdb7da58568d6 ]
Freed allocated request for ep0 to prevent memory leak in case when dwc2_driver_probe() failed.
--- drivers/usb/dwc2/gadget.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/dwc2/gadget.c +5 -2
@@ -4721,9 +4721,11 @@ int dwc2_gadget_init(struct dwc2_hsotg * } ret =usb_add_gadget_udc (dev, &hsotg->gadget); -if (ret) +if (ret) { +dwc2_hsotg_ep_free_request (&hsotg->eps_out[0 ]->ep, + hsotg->ctrl_req);return ret; - + }dwc2_hsotg_dump (hsotg);return 0 ;
@@ -4736,6 +4738,7 @@ int dwc2_gadget_init(struct dwc2_hsotg *int dwc2_hsotg_remove (struct dwc2_hsotg *hsotg) {usb_del_gadget_udc (&hsotg->gadget); +dwc2_hsotg_ep_free_request (&hsotg->eps_out[0 ]->ep, hsotg->ctrl_req);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 57/324 dwc2: gadget: Fix ISOC IN DDMA PID bitfield value calculation
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minas Harutyunyan <[email protected]>
[ Upstream commit 1d8e5c00275825fc42aaa5597dab1d0b5b26bb64 ]
PID bitfield in descriptor should be set based on particular request length, not based on EP's mc value. PID value can't be set to 0 even request length is 0.
--- drivers/usb/dwc2/gadget.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/dwc2/gadget.c +6 -1
@@ -808,6 +808,7 @@ static int dwc2_gadget_fill_isoc_desc(stu32 index;u32 maxsize =0 ;u32 mask =0 ; +u8 pid =0 ; maxsize =dwc2_gadget_get_desc_params (hs_ep, &mask);if (len > maxsize) {
@@ -853,7 +854,11 @@ static int dwc2_gadget_fill_isoc_desc(st ((len << DEV_DMA_NBYTES_SHIFT) & mask));if (hs_ep->dir_in) { - desc->status |= ((hs_ep->mc <<DEV_DMA_ISOC_PID_SHIFT ) & +if (len) + pid =DIV_ROUND_UP (len, hs_ep->ep.maxpacket); +else + pid =1 ; + desc->status |= ((pid <<DEV_DMA_ISOC_PID_SHIFT ) &DEV_DMA_ISOC_PID_MASK ) | ((len % hs_ep->ep.maxpacket) ? DEV_DMA_SHORT : 0) |
Greg Kroah-Hartman
maintainerPATCH 58/324 powerpc: smp_send_stop do not offline stopped CPUs
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Piggin <[email protected]>
[ Upstream commit de6e5d38417e6cdb005843db420a2974993d36ff ]
Marking CPUs stopped by smp_send_stop as offline can cause warnings due to cross-CPU wakeups. This trace was noticed on a busy system running a sysrq+c crash test, after the injected crash:
WARNING: CPU: 51 PID: 1546 at kernel/sched/core.c:1179 set_task_cpu+0x22c/0x240 CPU: 51 PID: 1546 Comm: kworker/u352:1 Tainted: G D Workqueue: mlx5e mlx5e_update_stats_work [mlx5_core] [...] NIP [c00000000017c21c] set_task_cpu+0x22c/0x240 LR [c00000000017d580] try_to_wake_up+0x230/0x720 Call Trace: [c000000001017700] runqueues+0x0/0xb00 (unreliable) [c00000000017d580] try_to_wake_up+0x230/0x720 [c00000000015a214] insert_work+0x104/0x140 [c00000000015adb0] __queue_work+0x230/0x690 [c000003fc5007910] [c00000000015b26c] queue_work_on+0x5c/0x90 [c0080000135fc8f8] mlx5_cmd_exec+0x538/0xcb0 [mlx5_core] [c008000013608fd0] mlx5_core_access_reg+0x140/0x1d0 [mlx5_core] [c00800001362777c] mlx5e_update_pport_counters.constprop.59+0x6c/0x90 [mlx5_core] [c008000013628868] mlx5e_update_ndo_stats+0x28/0x90 [mlx5_core] [c008000013625558] mlx5e_update_stats_work+0x68/0xb0 [mlx5_core] [c00000000015bcec] process_one_work+0x1bc/0x5f0 [c00000000015ecac] worker_thread+0xac/0x6b0 [c000000000168338] kthread+0x168/0x1b0 [c00000000000b628] ret_from_kernel_thread+0x5c/0xb4
This happens because firstly the CPU is not really offline in the usual sense, processes and interrupts have not been migrated away. Secondly smp_send_stop does not happen atomically on all CPUs, so one CPU can have marked itself offline, while another CPU is still running processes or interrupts which can affect the first CPU.
Fix this by just not marking the CPU as offline. It's more like frozen in time, so offline does not really reflect its state properly anyway. There should be nothing in the crash/panic path that walks online CPUs and synchronously waits for them, so this change should not introduce new hangs.
--- arch/powerpc/kernel/smp.c | 6 ------ 1 file changed, 6 deletions(-)
arch/powerpc/kernel/smp.c +0 -6
@@ -579,9 +579,6 @@ static void nmi_stop_this_cpu(struct pt_ nmi_ipi_busy_count--;nmi_ipi_unlock (); -/* Remove this CPU */ -set_cpu_online (smp_processor_id (), false); -spin_begin ();while (1 )spin_cpu_relax ();
@@ -596,9 +593,6 @@ void smp_send_stop(void)static void stop_this_cpu (void *dummy) { -/* Remove this CPU */ -set_cpu_online (smp_processor_id (), false); -hard_irq_disable ();spin_begin ();while (1 )
Greg Kroah-Hartman
maintainerPATCH 59/324 xen: add error handling for xenbus_printf
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhouyang Jia <[email protected]>
[ Upstream commit 84c029a73327cef571eaa61c7d6e67e8031b52ec ]
When xenbus_printf fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling xenbus_printf.
--- drivers/xen/manage.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/xen/manage.c +15 -3
@@ -289,8 +289,15 @@ static void sysrq_handler(struct xenbus_return ; } -if (sysrq_key !='\0' ) -xenbus_printf (xbt,"control" ,"sysrq" ,"%c" ,'\0' ); +if (sysrq_key !='\0' ) { + err =xenbus_printf (xbt,"control" ,"sysrq" ,"%c" ,'\0' ); +if (err) { +pr_err ("%s: Error %d writing sysrq in control/sysrq\n" , + __func__, err); +xenbus_transaction_end (xbt,1 ); +return ; + } + } err =xenbus_transaction_end (xbt,0 );if (err == -EAGAIN )
@@ -342,7 +349,12 @@ static int setup_shutdown_watcher(void)continue ;snprintf (node,FEATURE_PATH_SIZE ,"feature-%s" , shutdown_handlers[idx].command); -xenbus_printf (XBT_NIL ,"control" , node,"%u" ,1 ); + err =xenbus_printf (XBT_NIL ,"control" , node,"%u" ,1 ); +if (err) { +pr_err ("%s: Error %d writing %s\n" , __func__, + err, node); +return err; + } }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 60/324 pNFS: Always free the session slot on error in nfs4_layoutget_handle_exception
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
[ Upstream commit 2dbf8dffbf35fd8f611083b9d9fe74fdccf912a3 ]
Right now, we can call nfs_commit_inode() while holding the session slot, which could lead to NFSv4 deadlocks. Ensure we only keep the slot if the server returned a layout that we have to process.
--- fs/nfs/nfs4proc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
fs/nfs/nfs4proc.c +10 -7
@@ -8620,6 +8620,8 @@ nfs4_layoutget_handle_exception(struct rdprintk ("--> %s tk_status => %d\n" , __func__, -task->tk_status); +nfs4_sequence_free_slot (&lgp->res.seq_res); +switch (nfs4err) {case 0 : goto out;
@@ -8684,7 +8686,6 @@ nfs4_layoutget_handle_exception(struct r goto out; } -nfs4_sequence_free_slot (&lgp->res.seq_res); err =nfs4_handle_exception (server, nfs4err, exception);if (!status) {if (exception->retry)
@@ -8810,20 +8811,22 @@ nfs4_proc_layoutget(struct nfs4_layoutgeif (IS_ERR (task))return ERR_CAST (task); status =rpc_wait_for_completion_task (task); -if (status ==0 ) { +if (status !=0 ) + goto out; + +/* if layoutp->len is 0, nfs4_layoutget_prepare called rpc_exit */ +if (task->tk_status <0 || lgp->res.layoutp->len ==0 ) { status =nfs4_layoutget_handle_exception (task, lgp, &exception); *timeout = exception.timeout; - } - + }else + lseg =pnfs_layout_process (lgp); +out:trace_nfs4_layoutget (lgp->args.ctx, &lgp->args.range, &lgp->res.range, &lgp->res.stateid, status); -/* if layoutp->len is 0, nfs4_layoutget_prepare called rpc_exit */ -if (status ==0 && lgp->res.layoutp->len) - lseg =pnfs_layout_process (lgp);rpc_put_task (task);dprintk ("<-- %s status=%d\n" , __func__, status);if (status)
Greg Kroah-Hartman
maintainerPATCH 61/324 scsi: xen-scsifront: add error handling for xenbus_printf
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhouyang Jia <[email protected]>
[ Upstream commit 93efbd39870474cc536b9caf4a6efeb03b0bc56f ]
When xenbus_printf fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling xenbus_printf.
--- drivers/scsi/xen-scsifront.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-)
drivers/scsi/xen-scsifront.c +26 -7
@@ -654,10 +654,17 @@ static int scsifront_dev_reset_handler(sstatic int scsifront_sdev_configure (struct scsi_device *sdev) {struct vscsifrnt_info *info =shost_priv (sdev->host); +int err; -if (info && current == info->curr) -xenbus_printf (XBT_NIL , info->dev->nodename, +if (info && current == info->curr) { + err =xenbus_printf (XBT_NIL , info->dev->nodename, info->dev_state_path,"%d" , XenbusStateConnected); +if (err) { +xenbus_dev_error (info->dev, err, +"%s: writing dev_state_path" , __func__); +return err; + } + }return 0 ; }
@@ -665,10 +672,15 @@ static int scsifront_sdev_configure(strustatic void scsifront_sdev_destroy (struct scsi_device *sdev) {struct vscsifrnt_info *info =shost_priv (sdev->host); +int err; -if (info && current == info->curr) -xenbus_printf (XBT_NIL , info->dev->nodename, +if (info && current == info->curr) { + err =xenbus_printf (XBT_NIL , info->dev->nodename, info->dev_state_path,"%d" , XenbusStateClosed); +if (err) +xenbus_dev_error (info->dev, err, +"%s: writing dev_state_path" , __func__); + } }static struct scsi_host_template scsifront_sht = {
@@ -1003,9 +1015,12 @@ static void scsifront_do_lun_hotplug(strif (scsi_add_device (info->host, chn, tgt, lun)) {dev_err (&dev->dev,"scsi_add_device\n" ); -xenbus_printf (XBT_NIL , dev->nodename, + err =xenbus_printf (XBT_NIL , dev->nodename, info->dev_state_path,"%d" , XenbusStateClosed); +if (err) +xenbus_dev_error (dev, err, +"%s: writing dev_state_path" , __func__); }break ;case VSCSIFRONT_OP_DEL_LUN :
@@ -1019,10 +1034,14 @@ static void scsifront_do_lun_hotplug(str }break ;case VSCSIFRONT_OP_READD_LUN : -if (device_state == XenbusStateConnected) -xenbus_printf (XBT_NIL , dev->nodename, +if (device_state == XenbusStateConnected) { + err =xenbus_printf (XBT_NIL , dev->nodename, info->dev_state_path,"%d" , XenbusStateConnected); +if (err) +xenbus_dev_error (dev, err, +"%s: writing dev_state_path" , __func__); + }break ;default :break ;
Greg Kroah-Hartman
maintainerPATCH 62/324 xen/scsiback: add error handling for xenbus_printf
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhouyang Jia <[email protected]>
[ Upstream commit 7c63ca24c878e0051c91904b72174029320ef4bd ]
When xenbus_printf fails, the lack of error-handling code may cause unexpected results.
This patch adds error-handling code after calling xenbus_printf.
--- drivers/xen/xen-scsiback.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/xen/xen-scsiback.c +13 -3
@@ -1012,6 +1012,7 @@ static void scsiback_do_add_lun(struct v {struct v2p_entry *entry;unsigned long flags; +int err;if (try) {spin_lock_irqsave (&info->v2p_lock, flags);
@@ -1027,8 +1028,11 @@ static void scsiback_do_add_lun(struct vscsiback_del_translation_entry (info, vir); } }else if (!try) { -xenbus_printf (XBT_NIL , info->dev->nodename, state, + err =xenbus_printf (XBT_NIL , info->dev->nodename, state,"%d" , XenbusStateClosed); +if (err) +xenbus_dev_error (info->dev, err, +"%s: writing %s" , __func__, state); } }
@@ -1067,8 +1071,11 @@ static void scsiback_do_1lun_hotplug(strsnprintf (str,sizeof (str),"vscsi-devs/%s/p-dev" , ent); val =xenbus_read (XBT_NIL , dev->nodename, str,NULL );if (IS_ERR (val)) { -xenbus_printf (XBT_NIL , dev->nodename, state, + err =xenbus_printf (XBT_NIL , dev->nodename, state,"%d" , XenbusStateClosed); +if (err) +xenbus_dev_error (info->dev, err, +"%s: writing %s" , __func__, state);return ; }strlcpy (phy, val,VSCSI_NAMELEN );
@@ -1079,8 +1086,11 @@ static void scsiback_do_1lun_hotplug(str err =xenbus_scanf (XBT_NIL , dev->nodename, str,"%u:%u:%u:%u" , &vir.hst, &vir.chn, &vir.tgt, &vir.lun);if (XENBUS_EXIST_ERR (err)) { -xenbus_printf (XBT_NIL , dev->nodename, state, + err =xenbus_printf (XBT_NIL , dev->nodename, state,"%d" , XenbusStateClosed); +if (err) +xenbus_dev_error (info->dev, err, +"%s: writing %s" , __func__, state);return ; }
Greg Kroah-Hartman
maintainerPATCH 63/324 arm64: dma-mapping: clear buffers allocated with FORCE_CONTIGUOUS flag
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit dd65a941f6ba473a5cb9d013d57fa43b48450a04 ]
dma_alloc_*() buffers might be exposed to userspace via mmap() call, so they should be cleared on allocation. In case of IOMMU-based dma-mapping implementation such buffer clearing was missing in the code path for DMA_ATTR_FORCE_CONTIGUOUS flag handling, because dma_alloc_from_contiguous() doesn't honor __GFP_ZERO flag. This patch fixes this issue. For more information on clearing buffers allocated by dma_alloc_* functions, see commit 6829e274a623 ("arm64: dma-mapping: always clear allocated buffers").
--- arch/arm64/mm/dma-mapping.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/arm64/mm/dma-mapping.c +5 -4
@@ -588,13 +588,14 @@ static void *__iommu_alloc_attrs(struct size >> PAGE_SHIFT);return NULL ; } -if (!coherent) -__dma_flush_area (page_to_virt (page), iosize); - addr =dma_common_contiguous_remap (page, size,VM_USERMAP , prot,__builtin_return_address (0 )); -if (!addr) { +if (addr) { +memset (addr,0 , size); +if (!coherent) +__dma_flush_area (page_to_virt (page), iosize); + }else {iommu_dma_unmap_page (dev, *handle, iosize,0 , attrs);dma_release_from_contiguous (dev, page, size >>PAGE_SHIFT );
Greg Kroah-Hartman
maintainerPATCH 64/324 arm64: make secondary_start_kernel() notrace
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhizhou Zhang <[email protected]>
[ Upstream commit b154886f7892499d0d3054026e19dfb9a731df61 ]
We can't call function trace hook before setup percpu offset. When entering secondary_start_kernel(), percpu offset has not been initialized. So this lead hotplug malfunction. Here is the flow to reproduce this bug:
echo 0 > /sys/devices/system/cpu/cpu1/online echo function > /sys/kernel/debug/tracing/current_tracer echo 1 > /sys/kernel/debug/tracing/tracing_on echo 1 > /sys/devices/system/cpu/cpu1/online
--- arch/arm64/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/smp.c +1 -1
@@ -179,7 +179,7 @@ int __cpu_up(unsigned int cpu, struct ta* This is the secondary CPU boot entry. We're using this CPUs * idle thread stack, but a set of temporary page tables. */ -asmlinkage void secondary_start_kernel(void) +asmlinkage notrace void secondary_start_kernel(void) {u64 mpidr =read_cpuid_mpidr () &MPIDR_HWID_BITMASK ;struct mm_struct *mm = &init_mm;
Greg Kroah-Hartman
maintainerPATCH 65/324 qed: Fix possible memory leak in Rx error path handling.
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudarsana Reddy Kalluru <[email protected]>
[ Upstream commit 4f9de4df901fb84709fe3a864dfa4eaf35700f68 ]
Memory for packet buffers need to be freed in the error paths as there is no consumer (e.g., upper layer) for such packets and that memory will never get freed.
The issue was uncovered when port was attacked with flood of isatap packets, these are multicast packets hence were directed at all the PFs. For foce PF, this meant they were routed to the ll2 module which in turn drops such packets.
--- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_ll2.c +9 -2
@@ -201,8 +201,9 @@ void qed_ll2b_complete_rx_packet(void *c skb =build_skb (buffer->data,0 );if (!skb) { - rc = -ENOMEM ; - goto out_post; +DP_INFO (cdev,"Failed to build SKB\n" ); +kfree (buffer->data); + goto out_post1; } data->u.placement_offset +=NET_SKB_PAD ;
@@ -224,8 +225,14 @@ void qed_ll2b_complete_rx_packet(void *c cdev->ll2->cbs->rx_cb (cdev->ll2->cb_cookie, skb, data->opaque_data_0, data->opaque_data_1); + }else { +DP_VERBOSE (p_hwfn, (NETIF_MSG_RX_STATUS |NETIF_MSG_PKTDATA | +QED_MSG_LL2 |QED_MSG_STORAGE ), +"Dropping the packet\n" ); +kfree (buffer->data); } +out_post1:/* Update Buffer information and update FW producer */ buffer->data = new_data; buffer->phys_addr = new_phys_addr;
Greg Kroah-Hartman
maintainerPATCH 66/324 qed: Add sanity check for SIMD fastpath handler.
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudarsana Reddy Kalluru <[email protected]>
[ Upstream commit 3935a70968820c3994db4de7e6e1c7e814bff875 ]
Avoid calling a SIMD fastpath handler if it is NULL. The check is needed to handle an unlikely scenario where unsolicited interrupt is destined to a PF in INTa mode.
--- drivers/net/ethernet/qlogic/qed/qed_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_main.c +10 -2
@@ -566,8 +566,16 @@ static irqreturn_t qed_single_int(int ir/* Fastpath interrupts */ for (j =0 ; j <64 ; j++) {if ((0x2ULL << j) & status) { - hwfn->simd_proto_handler[j].func ( - hwfn->simd_proto_handler[j].token); +struct qed_simd_fp_handler *p_handler = + &hwfn->simd_proto_handler[j]; + +if (p_handler->func) + p_handler->func (p_handler->token); +else +DP_NOTICE (hwfn, +"Not calling fastpath handler as it is NULL [handler #%d, status 0x%llx]\n" , + j, status); + status &= ~(0x2ULL << j); rc =IRQ_HANDLED ; }
Greg Kroah-Hartman
maintainerPATCH 67/324 qed: Do not advertise DCBX_LLD_MANAGED capability.
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudarsana Reddy Kalluru <[email protected]>
[ Upstream commit ff54d5cd9ec15546abc870452dd0b66eef4b4606 ]
Do not advertise DCBX_LLD_MANAGED capability i.e., do not allow external agent to manage the dcbx/lldp negotiation. MFW acts as lldp agent for qed* devices, and no other lldp agent is allowed to coexist with mfw.
Also updated a debug print, to not to display the redundant info.
--- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/net/ethernet/qlogic/qed/qed_dcbx.c +4 -7
@@ -255,9 +255,8 @@ qed_dcbx_get_app_protocol_type(struct qe *type =DCBX_PROTOCOL_ROCE_V2 ; }else { *type =DCBX_MAX_PROTOCOL_TYPE ; -DP_ERR (p_hwfn, -"No action required, App TLV id = 0x%x app_prio_bitmap = 0x%x\n" , - id, app_prio_bitmap); +DP_ERR (p_hwfn,"No action required, App TLV entry = 0x%x\n" , + app_prio_bitmap);return false; }
@@ -1469,8 +1468,8 @@ static u8 qed_dcbnl_getcap(struct qed_de *cap =0x80 ;break ;case DCB_CAP_ATTR_DCBX : - *cap = (DCB_CAP_DCBX_LLD_MANAGED |DCB_CAP_DCBX_VER_CEE | -DCB_CAP_DCBX_VER_IEEE |DCB_CAP_DCBX_STATIC ); + *cap = (DCB_CAP_DCBX_VER_CEE |DCB_CAP_DCBX_VER_IEEE | +DCB_CAP_DCBX_STATIC );break ;default : *cap = false;
@@ -1538,8 +1537,6 @@ static u8 qed_dcbnl_getdcbx(struct qed_dif (!dcbx_info)return 0 ; -if (dcbx_info->operational.enabled) - mode |=DCB_CAP_DCBX_LLD_MANAGED ;if (dcbx_info->operational.ieee) mode |=DCB_CAP_DCBX_VER_IEEE ;if (dcbx_info->operational.cee)
Greg Kroah-Hartman
maintainerPATCH 68/324 enic: initialize enic->rfs_h.lock in enic_probe
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Govindarajulu Varadarajan <[email protected]>
[ Upstream commit 3256d29fc7aecdf99feb1cb9475ed2252769a8a7 ]
lockdep spotted that we are using rfs_h.lock in enic_get_rxnfc() without initializing. rfs_h.lock is initialized in enic_open(). But ethtool_ops can be called when interface is down.
Move enic_rfs_flw_tbl_init to enic_probe.
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
CPU: 18 PID: 1189 Comm: ethtool Not tainted 4.17.0-rc7-devel+ #27 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-20171110_100015-anatol 04/01/2014 Call Trace: dump_stack+0x85/0xc0 register_lock_class+0x550/0x560 ? __handle_mm_fault+0xa8b/0x1100 __lock_acquire+0x81/0x670 lock_acquire+0xb9/0x1e0 ? enic_get_rxnfc+0x139/0x2b0 [enic] _raw_spin_lock_bh+0x38/0x80 ? enic_get_rxnfc+0x139/0x2b0 [enic] enic_get_rxnfc+0x139/0x2b0 [enic] ethtool_get_rxnfc+0x8d/0x1c0 dev_ethtool+0x16c8/0x2400 ? __mutex_lock+0x64d/0xa00 ? dev_load+0x6a/0x150 dev_ioctl+0x253/0x4b0 sock_do_ioctl+0x9a/0x130 sock_ioctl+0x1af/0x350 do_vfs_ioctl+0x8e/0x670 ? syscall_trace_enter+0x1e2/0x380 ksys_ioctl+0x60/0x90 __x64_sys_ioctl+0x16/0x20 do_syscall_64+0x5a/0x170 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/net/ethernet/cisco/enic/enic_clsf.c | 3 +-- drivers/net/ethernet/cisco/enic/enic_main.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/cisco/enic/enic_clsf.c +1 -2
@@ -79,7 +79,6 @@ void enic_rfs_flw_tbl_init(struct enic * enic->rfs_h.max = enic->config.num_arfs; enic->rfs_h.free = enic->rfs_h.max; enic->rfs_h.toclean =0 ; -enic_rfs_timer_start (enic); }void enic_rfs_flw_tbl_free (struct enic *enic)
@@ -88,7 +87,6 @@ void enic_rfs_flw_tbl_free(struct enic *enic_rfs_timer_stop (enic);spin_lock_bh (&enic->rfs_h.lock); - enic->rfs_h.free =0 ;for (i =0 ; i < (1 <<ENIC_RFS_FLW_BITSHIFT ); i++) {struct hlist_head *hhead;struct hlist_node *tmp;
@@ -99,6 +97,7 @@ void enic_rfs_flw_tbl_free(struct enic *enic_delfltr (enic, n->fltr_id);hlist_del (&n->node);kfree (n); + enic->rfs_h.free++; } }spin_unlock_bh (&enic->rfs_h.lock);
drivers/net/ethernet/cisco/enic/enic_main.c +2 -1
@@ -1971,7 +1971,7 @@ static int enic_open(struct net_device *vnic_intr_unmask (&enic->intr[i]);enic_notify_timer_start (enic); -enic_rfs_flw_tbl_init (enic); +enic_rfs_timer_start (enic);return 0 ;
@@ -2895,6 +2895,7 @@ static int enic_probe(struct pci_dev *pdtimer_setup (&enic->notify_timer, enic_notify_timer,0 ); +enic_rfs_flw_tbl_init (enic);enic_set_rx_coal_setting (enic);INIT_WORK (&enic->reset, enic_reset);INIT_WORK (&enic->tx_hang_reset, enic_tx_hang_reset);
Greg Kroah-Hartman
maintainerPATCH 69/324 net: hamradio: use eth_broadcast_addr
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Agner <[email protected]>
[ Upstream commit 4e8439aa34802deab11cee68b0ecb18f887fb153 ]
The array bpq_eth_addr is only used to get the size of an address, whereas the bcast_addr is used to set the broadcast address. This leads to a warning when using clang:drivers/net/hamradio/bpqether.c:94:13: warning: variable 'bpq_eth_addr' is not
needed and will not be emitted [-Wunneeded-internal-declaration]
static char bpq_eth_addr[6];
^Remove both variables and use the common eth_broadcast_addr to set the broadcast address.
--- drivers/net/hamradio/bpqether.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/hamradio/bpqether.c +2 -6
@@ -89,10 +89,6 @@ static const char banner[] __initconst = KERN_INFO \"AX.25: bpqether driver version 004\n" ; -static char bcast_addr[6 ]={0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF }; - -static char bpq_eth_addr[6 ]; -static int bpq_rcv (struct sk_buff *,struct net_device *,struct packet_type *,struct net_device *);static int bpq_device_event (struct notifier_block *,unsigned long ,void *);
@@ -515,8 +511,8 @@ static int bpq_new_device(struct net_dev bpq->ethdev = edev; bpq->axdev = ndev; -memcpy (bpq->dest_addr, bcast_addr,sizeof (bpq_eth_addr)); -memcpy (bpq->acpt_addr, bcast_addr,sizeof (bpq_eth_addr)); +eth_broadcast_addr (bpq->dest_addr); +eth_broadcast_addr (bpq->acpt_addr); err =register_netdevice (ndev);if (err)
Greg Kroah-Hartman
maintainerPATCH 70/324 net: propagate dev_get_valid_name return code
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit 7892bd081045222b9e4027fec279a28d6fe7aa66 ]
if dev_get_valid_name failed, propagate its return code
and remove the setting err to ENODEV, it will be set to 0 again before dev_change_net_namespace exits.
--- net/core/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/dev.c +2 -2
@@ -8608,7 +8608,8 @@ int dev_change_net_namespace(struct net_/* We get here if we can't use the current device name */ if (!pat) goto out; -if (dev_get_valid_name (net, dev, pat) <0 ) + err =dev_get_valid_name (net, dev, pat); +if (err <0 ) goto out; }
@@ -8620,7 +8621,6 @@ int dev_change_net_namespace(struct net_dev_close (dev);/* And unlink it from device chain */ - err = -ENODEV ;unlist_netdevice (dev);synchronize_net ();
Greg Kroah-Hartman
maintainerPATCH 71/324 net: stmmac: socfpga: add additional ocp reset line for Stratix10
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dinh Nguyen <[email protected]>
[ Upstream commit bc8a2d9bcbf1ca548b1deb315d14e1da81945bea ]
The Stratix10 platform has an additional reset line, OCP(Open Core Protocol), that also needs to get deasserted for the stmmac ethernet controller to work. Thus we need to update the Kconfig to include ARCH_STRATIX10 in order to build dwmac-socfpga.
Also, remove the redundant check for the reset controller pointer. The reset driver already checks for the pointer and returns 0 if the pointer is NULL.
--- drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-)
drivers/net/ethernet/stmicro/stmmac/Kconfig +1 -1
@@ -111,7 +111,7 @@ config DWMAC_ROCKCHIP config DWMAC_SOCFPGA tristate "SOCFPGA dwmac support" default ARCH_SOCFPGA - depends on OF && (ARCH_SOCFPGA || COMPILE_TEST) + depends on OF && (ARCH_SOCFPGA || ARCH_STRATIX10 || COMPILE_TEST) select MFD_SYSCON help Support for ethernet controller on Altera SOCFPGA
drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +14 -4
@@ -55,6 +55,7 @@ struct socfpga_dwmac {struct device *dev;struct regmap *sys_mgr_base_addr;struct reset_control *stmmac_rst; +struct reset_control *stmmac_ocp_rst;void __iomem *splitter_base;bool f2h_ptp_ref_clk;struct tse_pcs pcs;
@@ -262,8 +263,8 @@ static int socfpga_dwmac_set_phy_mode(st val =SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII ;/* Assert reset to the enet controller before changing the phy mode */ -if (dwmac->stmmac_rst) -reset_control_assert (dwmac->stmmac_rst); +reset_control_assert (dwmac->stmmac_ocp_rst); +reset_control_assert (dwmac->stmmac_rst);regmap_read (sys_mgr_base_addr, reg_offset, &ctrl); ctrl &= ~(SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << reg_shift);
@@ -288,8 +289,8 @@ static int socfpga_dwmac_set_phy_mode(st/* Deassert reset for the phy configuration to be sampled by * the enet controller, and operation to start in requested mode */ -if (dwmac->stmmac_rst) -reset_control_deassert (dwmac->stmmac_rst); +reset_control_deassert (dwmac->stmmac_ocp_rst); +reset_control_deassert (dwmac->stmmac_rst);if (phymode ==PHY_INTERFACE_MODE_SGMII ) {if (tse_pcs_init (dwmac->pcs.tse_pcs_base, &dwmac->pcs) !=0 ) {dev_err (dwmac->dev,"Unable to initialize TSE PCS" );
@@ -324,6 +325,15 @@ static int socfpga_dwmac_probe(struct pl goto err_remove_config_dt; } + dwmac->stmmac_ocp_rst =devm_reset_control_get_optional (dev,"stmmaceth-ocp" ); +if (IS_ERR (dwmac->stmmac_ocp_rst)) { + ret =PTR_ERR (dwmac->stmmac_ocp_rst); +dev_err (dev,"error getting reset control of ocp %d\n" , ret); + goto err_remove_config_dt; + } + +reset_control_deassert (dwmac->stmmac_ocp_rst); + ret =socfpga_dwmac_parse_data (dwmac, dev);if (ret) {dev_err (dev,"Unable to parse OF data\n" );
Greg Kroah-Hartman
maintainerPATCH 72/324 nvme-rdma: fix possible double free condition when failing to create a controller
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sagi Grimberg <[email protected]>
[ Upstream commit 3d0641015bf73aaa1cb54c936674959e7805070f ]
Failures after nvme_init_ctrl will defer resource cleanups to .free_ctrl when the reference is released, hence we should not free the controller queues for these failures.
Fix that by moving controller queues allocation before controller initialization and correctly freeing them for failures before initialization and skip them for failures after initialization.
--- drivers/nvme/host/rdma.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvme/host/rdma.c +10 -10
@@ -888,9 +888,9 @@ static void nvme_rdma_free_ctrl(struct nlist_del (&ctrl->list);mutex_unlock (&nvme_rdma_ctrl_mutex); -kfree (ctrl->queues);nvmf_free_options (nctrl->opts); free_ctrl: +kfree (ctrl->queues);kfree (ctrl); }
@@ -1916,11 +1916,6 @@ static struct nvme_ctrl *nvme_rdma_creat goto out_free_ctrl; } - ret =nvme_init_ctrl (&ctrl->ctrl, dev, &nvme_rdma_ctrl_ops, -0 /* no quirks, we're perfect! */ ); -if (ret) - goto out_free_ctrl; -INIT_DELAYED_WORK (&ctrl->reconnect_work, nvme_rdma_reconnect_ctrl_work);INIT_WORK (&ctrl->err_work, nvme_rdma_error_recovery_work);
@@ -1934,14 +1929,19 @@ static struct nvme_ctrl *nvme_rdma_creat ctrl->queues =kcalloc (ctrl->ctrl.queue_count,sizeof (*ctrl->queues),GFP_KERNEL );if (!ctrl->queues) - goto out_uninit_ctrl; + goto out_free_ctrl; + + ret =nvme_init_ctrl (&ctrl->ctrl, dev, &nvme_rdma_ctrl_ops, +0 /* no quirks, we're perfect! */ ); +if (ret) + goto out_kfree_queues; changed =nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_CONNECTING );WARN_ON_ONCE (!changed); ret =nvme_rdma_configure_admin_queue (ctrl, true);if (ret) - goto out_kfree_queues; + goto out_uninit_ctrl;/* sanity check icdoff */ if (ctrl->ctrl.icdoff) {
@@ -1997,14 +1997,14 @@ static struct nvme_ctrl *nvme_rdma_creat out_remove_admin_queue:nvme_rdma_destroy_admin_queue (ctrl, true); -out_kfree_queues: -kfree (ctrl->queues); out_uninit_ctrl:nvme_uninit_ctrl (&ctrl->ctrl);nvme_put_ctrl (&ctrl->ctrl);if (ret >0 ) ret = -EIO ;return ERR_PTR (ret); +out_kfree_queues: +kfree (ctrl->queues); out_free_ctrl:kfree (ctrl);return ERR_PTR (ret);
Greg Kroah-Hartman
maintainerPATCH 73/324 nvme-rdma: Fix command completion race at error recovery
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Israel Rukshin <[email protected]>
[ Upstream commit c947657b15379505a9bba36a02005882b66abe57 ]
The race is between completing the request at error recovery work and rdma completions. If we cancel the request before getting the good rdma completion we get a NULL deref of the request MR at nvme_rdma_process_nvme_rsp().
When Canceling the request we return its mr to the mr pool (set mr to NULL) and also unmap its data. Canceling the requests while the rdma queues are active is not safe. Because rdma queues are active and we get good rdma completions that can use the mr pointer which may be NULL. Completing the request too soon may lead also to performing DMA to/from user buffers which might have been already unmapped.
The commit fixes the race by draining the QP before starting the abort commands mechanism.
--- drivers/nvme/host/rdma.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/nvme/host/rdma.c +6 -2
@@ -734,7 +734,6 @@ out:static void nvme_rdma_destroy_admin_queue (struct nvme_rdma_ctrl *ctrl,bool remove) { -nvme_rdma_stop_queue (&ctrl->queues[0 ]);if (remove) {blk_cleanup_queue (ctrl->ctrl.admin_q);nvme_rdma_free_tagset (&ctrl->ctrl, ctrl->ctrl.admin_tagset);
@@ -819,7 +818,6 @@ out_free_queue:static void nvme_rdma_destroy_io_queues (struct nvme_rdma_ctrl *ctrl,bool remove) { -nvme_rdma_stop_io_queues (ctrl);if (remove) {blk_cleanup_queue (ctrl->ctrl.connect_q);nvme_rdma_free_tagset (&ctrl->ctrl, ctrl->ctrl.tagset);
@@ -949,6 +947,7 @@ static void nvme_rdma_reconnect_ctrl_worreturn ; destroy_admin: +nvme_rdma_stop_queue (&ctrl->queues[0 ]);nvme_rdma_destroy_admin_queue (ctrl, false); requeue: dev_info(ctrl->ctrl.device, "Failed reconnect attempt %d\n",
@@ -965,12 +964,14 @@ static void nvme_rdma_error_recovery_worif (ctrl->ctrl.queue_count >1 ) {nvme_stop_queues (&ctrl->ctrl); +nvme_rdma_stop_io_queues (ctrl);blk_mq_tagset_busy_iter (&ctrl->tag_set, nvme_cancel_request, &ctrl->ctrl);nvme_rdma_destroy_io_queues (ctrl, false); }blk_mq_quiesce_queue (ctrl->ctrl.admin_q); +nvme_rdma_stop_queue (&ctrl->queues[0 ]);blk_mq_tagset_busy_iter (&ctrl->admin_tag_set, nvme_cancel_request, &ctrl->ctrl);nvme_rdma_destroy_admin_queue (ctrl, false);
@@ -1720,6 +1721,7 @@ static void nvme_rdma_shutdown_ctrl(stru {if (ctrl->ctrl.queue_count >1 ) {nvme_stop_queues (&ctrl->ctrl); +nvme_rdma_stop_io_queues (ctrl);blk_mq_tagset_busy_iter (&ctrl->tag_set, nvme_cancel_request, &ctrl->ctrl);nvme_rdma_destroy_io_queues (ctrl, shutdown);
@@ -1731,6 +1733,7 @@ static void nvme_rdma_shutdown_ctrl(strunvme_disable_ctrl (&ctrl->ctrl, ctrl->ctrl.cap);blk_mq_quiesce_queue (ctrl->ctrl.admin_q); +nvme_rdma_stop_queue (&ctrl->queues[0 ]);blk_mq_tagset_busy_iter (&ctrl->admin_tag_set, nvme_cancel_request, &ctrl->ctrl);blk_mq_unquiesce_queue (ctrl->ctrl.admin_q);
@@ -1996,6 +1999,7 @@ static struct nvme_ctrl *nvme_rdma_creatreturn &ctrl->ctrl; out_remove_admin_queue: +nvme_rdma_stop_queue (&ctrl->queues[0 ]);nvme_rdma_destroy_admin_queue (ctrl, true); out_uninit_ctrl:nvme_uninit_ctrl (&ctrl->ctrl);
Greg Kroah-Hartman
maintainerPATCH 74/324 nvmet: reset keep alive timer in controller enable
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Gurtuvoy <[email protected]>
[ Upstream commit d68a90e148f5a82aa67654c5012071e31c0e4baa ]
Controllers that are not yet enabled should not really enforce keep alive timeouts, but we still want to track a timeout and cleanup in case a host died before it enabled the controller. Hence, simply reset the keep alive timer when the controller is enabled.
--- drivers/nvme/target/core.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/nvme/target/core.c +8 -0
@@ -624,6 +624,14 @@ static void nvmet_start_ctrl(struct nvme } ctrl->csts =NVME_CSTS_RDY ; + +/* +* Controllers that are not yet enabled should not really enforce the +* keep alive timeout, but we still want to track a timeout and cleanup +* in case a host died before it enabled the controller. Hence, simply +* reset the keep alive timer when the controller is enabled. +*/ +mod_delayed_work (system_wq, &ctrl->ka_work, ctrl->kato *HZ ); }static void nvmet_clear_ctrl (struct nvmet_ctrl *ctrl)
Greg Kroah-Hartman
maintainerPATCH 75/324 blk-mq-debugfs: Off by one in blk_mq_rq_state_name()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit a1e79188628580465ac6d7a93a313336ee3364f1 ]
If rq_state == ARRAY_SIZE() then we read one element beyond the end of the blk_mq_rq_state_name_array[] array.
--- block/blk-mq-debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/blk-mq-debugfs.c +1 -1
@@ -357,7 +357,7 @@ static const char *const blk_mq_rq_statestatic const char *blk_mq_rq_state_name (enum mq_rq_state rq_state) { -if (WARN_ON_ONCE ((unsigned int )rq_state > +if (WARN_ON_ONCE ((unsigned int )rq_state >=ARRAY_SIZE (blk_mq_rq_state_name_array)))return "(?)" ;return blk_mq_rq_state_name_array[rq_state];
Greg Kroah-Hartman
maintainerPATCH 76/324 block: sed-opal: Fix a couple off by one bugs
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit ce042c183bcb94eb2919e8036473a1fc203420f9 ]
resp->num is the number of tokens in resp->tok[]. It gets set in response_parse(). So if n == resp->num then we're reading beyond the end of the data.
--- block/sed-opal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/sed-opal.c +2 -2
@@ -877,7 +877,7 @@ static size_t response_get_string(constreturn 0 ; } -if (n > resp->num) { +if (n >= resp->num) {pr_debug ("Response has %d tokens. Can't access %d\n" , resp->num, n);return 0 ;
@@ -916,7 +916,7 @@ static u64 response_get_u64(const structreturn 0 ; } -if (n > resp->num) { +if (n >= resp->num) {pr_debug ("Response has %d tokens. Can't access %d\n" , resp->num, n);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 77/324 ARC: Enable machine_desc->init_per_cpu for !CONFIG_SMP
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Brodkin <[email protected]>
[ Upstream commit 2f24ef7413a4d91657ef04e77c27ce0b313e6c95 ]
machine_desc->init_per_cpu() hook is supposed to be per cpu initialization and would seem to apply equally to UP and/or SMP. Infact the comment in header file seems to suggest it works for UP too, which was not the case and this patch.
This enables !CONFIG_SMP build for platforms such as hsdk.
--- arch/arc/include/asm/mach_desc.h | 2 -- arch/arc/kernel/irq.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
arch/arc/include/asm/mach_desc.h +0 -2
@@ -34,9 +34,7 @@ struct machine_desc {const char *name;const char **dt_compat;void (*init_early)(void ); -#ifdef CONFIG_SMP void (*init_per_cpu)(unsigned int ); -#endif void (*init_machine)(void );void (*init_late)(void );
arch/arc/kernel/irq.c +1 -1
@@ -31,10 +31,10 @@ void __init init_IRQ(void)/* a SMP H/w block could do IPI IRQ request here */ if (plat_smp_ops.init_per_cpu) plat_smp_ops.init_per_cpu (smp_processor_id ()); +#endif if (machine_desc->init_per_cpu) machine_desc->init_per_cpu (smp_processor_id ()); -#endif }/*
Greg Kroah-Hartman
maintainerPATCH 78/324 selftests: net: add config fragments
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anders Roxell <[email protected]>
[ Upstream commit 73f9c33beb9e85850a11a1597b35a13650352509 ]
Add fragments to pass bridge and vlan tests.
--- tools/testing/selftests/net/config | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/config +2 -0
@@ -12,3 +12,5 @@ CONFIG_NET_IPVTI=y CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_IPV6_VTI=y CONFIG_DUMMY=y +CONFIG_BRIDGE=y +CONFIG_VLAN_8021Q=y
Greg Kroah-Hartman
maintainerPATCH 79/324 nbd: Add the nbd NBD_DISCONNECT_ON_CLOSE config flag.
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Doron Roberts-Kedes <[email protected]>
[ Upstream commit 08ba91ee6e2c1c08d3f0648f978cbb5dbf3491d8 ]
If NBD_DISCONNECT_ON_CLOSE is set on a device, then the driver will issue a disconnect from nbd_release if the device has no remaining bdev->bd_openers.
Fix ret val so reconfigure with only setting the flag succeeds.
--- drivers/block/nbd.c | 40 +++++++++++++++++++++++++++++++++------- include/uapi/linux/nbd.h | 3 +++ 2 files changed, 36 insertions(+), 7 deletions(-)
drivers/block/nbd.c +33 -7
@@ -76,6 +76,7 @@ struct link_dead_args {#define NBD_HAS_CONFIG_REF 4#define NBD_BOUND 5#define NBD_DESTROY_ON_DISCONNECT 6 +#define NBD_DISCONNECT_ON_CLOSE 7struct nbd_config {u32 flags;
@@ -138,6 +139,7 @@ static void nbd_config_put(struct nbd_destatic void nbd_connect_reply (struct genl_info *info,int index);static int nbd_genl_status (struct sk_buff *skb,struct genl_info *info);static void nbd_dead_link_work (struct work_struct *work); +static void nbd_disconnect_and_put (struct nbd_device *nbd);static inline struct device *nbd_to_dev (struct nbd_device *nbd) {
@@ -1291,6 +1293,12 @@ out:static void nbd_release (struct gendisk *disk,fmode_t mode) {struct nbd_device *nbd = disk->private_data; +struct block_device *bdev =bdget_disk (disk,0 ); + +if (test_bit (NBD_DISCONNECT_ON_CLOSE , &nbd->config->runtime_flags) && + bdev->bd_openers ==0 ) +nbd_disconnect_and_put (nbd); +nbd_config_put (nbd);nbd_put (nbd); }
@@ -1690,6 +1698,10 @@ again: &config->runtime_flags); put_dev = true; } +if (flags &NBD_CFLAG_DISCONNECT_ON_CLOSE ) { +set_bit (NBD_DISCONNECT_ON_CLOSE , + &config->runtime_flags); + } }if (info->attrs[NBD_ATTR_SOCKETS ]) {
@@ -1734,6 +1746,16 @@ out:return ret; } +static void nbd_disconnect_and_put (struct nbd_device *nbd) +{ +mutex_lock (&nbd->config_lock); +nbd_disconnect (nbd); +mutex_unlock (&nbd->config_lock); +if (test_and_clear_bit (NBD_HAS_CONFIG_REF , + &nbd->config->runtime_flags)) +nbd_config_put (nbd); +} +static int nbd_genl_disconnect (struct sk_buff *skb,struct genl_info *info) {struct nbd_device *nbd;
@@ -1766,12 +1788,7 @@ static int nbd_genl_disconnect(struct sknbd_put (nbd);return 0 ; } -mutex_lock (&nbd->config_lock); -nbd_disconnect (nbd); -mutex_unlock (&nbd->config_lock); -if (test_and_clear_bit (NBD_HAS_CONFIG_REF , - &nbd->config->runtime_flags)) -nbd_config_put (nbd); +nbd_disconnect_and_put (nbd);nbd_config_put (nbd);nbd_put (nbd);return 0 ;
@@ -1782,7 +1799,7 @@ static int nbd_genl_reconfigure(struct sstruct nbd_device *nbd =NULL ;struct nbd_config *config;int index; -int ret = -EINVAL ; +int ret =0 ;bool put_dev = false;if (!netlink_capable (skb,CAP_SYS_ADMIN ))
@@ -1822,6 +1839,7 @@ static int nbd_genl_reconfigure(struct s !nbd->task_recv) {dev_err (nbd_to_dev (nbd),"not configured, cannot reconfigure\n" ); + ret = -EINVAL ; goto out; }
@@ -1846,6 +1864,14 @@ static int nbd_genl_reconfigure(struct s &config->runtime_flags))refcount_inc (&nbd->refs); } + +if (flags &NBD_CFLAG_DISCONNECT_ON_CLOSE ) { +set_bit (NBD_DISCONNECT_ON_CLOSE , + &config->runtime_flags); + }else { +clear_bit (NBD_DISCONNECT_ON_CLOSE , + &config->runtime_flags); + } }if (info->attrs[NBD_ATTR_SOCKETS ]) {
include/uapi/linux/nbd.h +3 -0
@@ -53,6 +53,9 @@ enum {/* These are client behavior specific flags. */ #define NBD_CFLAG_DESTROY_ON_DISCONNECT (1 << 0)/* delete the nbd device on disconnect. */ +#define NBD_CFLAG_DISCONNECT_ON_CLOSE (1 << 1)/* disconnect the nbd device on +* close by last opener. +*/ /* userspace doesn't need the nbd_device structure */
Greg Kroah-Hartman
maintainerPATCH 80/324 net: davinci_emac: match the mdio device against its compatible if possible
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
[ Upstream commit ea0820bb771175c7d4192fc6f5b5c56b3c6d5239 ]
Device tree based systems without of_dev_auxdata will have the mdio device named differently than "davinci_mdio(.0)". In this case use the device's parent's compatible string for matching
--- drivers/net/ethernet/ti/davinci_emac.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/ti/davinci_emac.c +4 -0
@@ -1387,6 +1387,10 @@ static int emac_devioctl(struct net_devistatic int match_first_device (struct device *dev,void *data) { +if (dev->parent && dev->parent->of_node) +return of_device_is_compatible (dev->parent->of_node, +"ti,davinci_mdio" ); +return !strncmp (dev_name (dev),"davinci_mdio" ,12 ); }
Greg Kroah-Hartman
maintainerPATCH 81/324 sctp: fix erroneous inc of snmp SctpFragUsrMsgs
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marcelo Ricardo Leitner <[email protected]>
[ Upstream commit fedb1bd3d274b33c432cb83c80c6b3cf54d509c8 ]
Currently it is incrementing SctpFragUsrMsgs when the user message size is of the exactly same size as the maximum fragment size, which is wrong.
The fix is to increment it only when user message is bigger than the maximum fragment size.
--- net/sctp/chunk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/sctp/chunk.c +3 -1
@@ -247,7 +247,9 @@ struct sctp_datamsg *sctp_datamsg_from_u/* Account for a different sized first fragment */ if (msg_len >= first_len) { msg->can_delay =0 ; -SCTP_INC_STATS (sock_net (asoc->base.sk),SCTP_MIB_FRAGUSRMSGS ); +if (msg_len > first_len) +SCTP_INC_STATS (sock_net (asoc->base.sk), +SCTP_MIB_FRAGUSRMSGS ); }else {/* Which may be the only one... */ first_len = msg_len;
Greg Kroah-Hartman
maintainerPATCH 82/324 KVM: arm/arm64: Drop resource size check for GICV window
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ard Biesheuvel <[email protected]>
[ Upstream commit ba56bc3a0786992755e6804fbcbdc60ef6cfc24c ]
When booting a 64 KB pages kernel on a ACPI GICv3 system that implements support for v2 emulation, the following warning is produced
GICV size 0x2000 not a multiple of page size 0x10000
and support for v2 emulation is disabled, preventing GICv2 VMs from being able to run on such hosts.
The reason is that vgic_v3_probe() performs a sanity check on the size of the window (it should be a multiple of the page size), while the ACPI MADT parsing code hardcodes the size of the window to 8 KB. This makes sense, considering that ACPI does not bother to describe the size in the first place, under the assumption that platforms implementing ACPI will follow the architecture and not put anything else in the same 64 KB window.
So let's just drop the sanity check altogether, and assume that the window is at least 64 KB in size.
--- virt/kvm/arm/vgic/vgic-v3.c | 5 ----- 1 file changed, 5 deletions(-)
virt/kvm/arm/vgic/vgic-v3.c +0 -5
@@ -552,11 +552,6 @@ int vgic_v3_probe(const struct gic_kvm_ipr_warn ("GICV physical address 0x%llx not page aligned\n" , (unsigned long long )info->vcpu.start); kvm_vgic_global_state.vcpu_base =0 ; - }else if (!PAGE_ALIGNED (resource_size (&info->vcpu))) { -pr_warn ("GICV size 0x%llx not a multiple of page size 0x%lx\n" , - (unsigned long long )resource_size (&info->vcpu), -PAGE_SIZE ); - kvm_vgic_global_state.vcpu_base =0 ; }else { kvm_vgic_global_state.vcpu_base = info->vcpu.start; kvm_vgic_global_state.can_emulate_gicv2 = true;
Greg Kroah-Hartman
maintainerPATCH 83/324 drm/bridge/sii8620: fix display of packed pixel modes in MHL2
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Purski <[email protected]>
[ Upstream commit e8b92efa629dac0e70ea4145c5e70616de5f89c8 ]
Currently packed pixel modes in MHL2 can't be displayed. The device automatically recognizes output format, so setting format other than RGB causes failure. Fix it by writing proper values to registers.
Tested on MHL1 and MHL2 using various vendors' dongles both in DVI and HDMI mode.
--- drivers/gpu/drm/bridge/sil-sii8620.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/gpu/drm/bridge/sil-sii8620.c +1 -16
@@ -1060,20 +1060,11 @@ static void sii8620_stop_video(struct sistatic void sii8620_set_format (struct sii8620 *ctx) { -u8 out_fmt; -if (sii8620_is_mhl3 (ctx)) {sii8620_setbits (ctx,REG_M3_P0CTRL ,BIT_M3_P0CTRL_MHL3_P0_PIXEL_MODE_PACKED , ctx->use_packed_pixel ? ~0 :0 ); }else { -if (ctx->use_packed_pixel) -sii8620_write_seq_static (ctx, -REG_VID_MODE ,BIT_VID_MODE_M1080P , -REG_MHL_TOP_CTL ,BIT_MHL_TOP_CTL_MHL_PP_SEL |1 , -REG_MHLTX_CTL6 ,0x60 - ); -else sii8620_write_seq_static(ctx, REG_VID_MODE, 0, REG_MHL_TOP_CTL, 1,
@@ -1081,15 +1072,9 @@ static void sii8620_set_format(struct si ); } -if (ctx->use_packed_pixel) - out_fmt =VAL_TPI_FORMAT (YCBCR422 ,FULL ) | -BIT_TPI_OUTPUT_CSCMODE709 ; -else - out_fmt =VAL_TPI_FORMAT (RGB ,FULL ); -sii8620_write_seq (ctx,REG_TPI_INPUT ,VAL_TPI_FORMAT (RGB ,FULL ), - REG_TPI_OUTPUT, out_fmt, + REG_TPI_OUTPUT, VAL_TPI_FORMAT(RGB, FULL), ); }
Greg Kroah-Hartman
maintainerPATCH 84/324 nvme-pci: move nvme_kill_queues to nvme_remove_dead_ctrl
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jianchao Wang <[email protected]>
[ Upstream commit 9f9cafc14016f23f982d3ce18f9057923bd3037a ]
There is race between nvme_remove and nvme_reset_work that can lead to io hang.
nvme_remove nvme_reset_work
-> nvme_remove_dead_ctrl
-> nvme_dev_disable
-> quiesce request_queue
-> queue remove_work
-> cancel_work_sync reset_work
-> nvme_remove_namespaces
-> splice ctrl->namespaces
nvme_remove_dead_ctrl_work
-> nvme_kill_queues
-> nvme_ns_remove do nothing
-> blk_cleanup_queue
-> blk_freeze_queueFinally, the request_queue is quiesced state when wait freeze, we will get io hang here. To fix it, move the nvme_kill_queues from nvme_remove_dead_ctrl_work to nvme_remove_dead_ctrl.
--- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvme/host/pci.c +1 -1
@@ -2291,6 +2291,7 @@ static void nvme_remove_dead_ctrl(structnvme_get_ctrl (&dev->ctrl);nvme_dev_disable (dev, false); +nvme_kill_queues (&dev->ctrl);if (!queue_work (nvme_wq, &dev->remove_work))nvme_put_ctrl (&dev->ctrl); }
@@ -2407,7 +2408,6 @@ static void nvme_remove_dead_ctrl_work(s struct nvme_dev *dev = container_of(work, struct nvme_dev, remove_work);struct pci_dev *pdev =to_pci_dev (dev->dev); -nvme_kill_queues (&dev->ctrl);if (pci_get_drvdata (pdev))device_release_driver (&pdev->dev);nvme_put_ctrl (&dev->ctrl);
Greg Kroah-Hartman
maintainerPATCH 85/324 clk: sunxi-ng: replace lib-y with obj-y
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
[ Upstream commit 12f8c553a503d98b519cca650b188bf51ebdbdbf ]
We had commit 06e226c7fb23 ("clk: sunxi-ng: Move all clock types to a library") and commit 799c43415442 ("kbuild: thin archives make default for all archs") in the same development cycle, from different trees.
With migration to the thin archive, the entire drivers/clk/sunxi-ng/lib.a is linked to the vmlinux. This does not break build, but we do not get any size saving.
However, we do not need to go back to the individual Kconfig options. The default configuration pulls in all (or most) of the CCU parts anyway. Also, once we enable CONFIG_LD_DEAD_CODE_DATA_ELIMINATION, we can simply list all files with obj-y, and the linker will drop all unused functions by itself.
After the long discussion [1], people there agreed to fix this, but nobody sent a patch after all. I am doing it now.
I lifted up CONFIG_SUNXI_CCU to drivers/clk/Makefile because everything in drivers/clk/sunxi-ng/ depends on SUNXI_CCU.
[1] https://patchwork.kernel.org/patch/9796521/
--- drivers/clk/Makefile | 2 +- drivers/clk/sunxi-ng/Makefile | 39 +++++++++++++++------------------------ 2 files changed, 16 insertions(+), 25 deletions(-)
drivers/clk/Makefile +1 -1
@@ -94,7 +94,7 @@ obj-$(CONFIG_ARCH_SPRD) += sprd/ obj-$(CONFIG_ARCH_STI) += st/ obj-$(CONFIG_ARCH_STRATIX10) += socfpga/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ -obj-$(CONFIG_ARCH_SUNXI) += sunxi-ng/ +obj-$(CONFIG_SUNXI_CCU) += sunxi-ng/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-y += ti/ obj-$(CONFIG_CLK_UNIPHIER) += uniphier/
drivers/clk/sunxi-ng/Makefile +15 -24
@@ -1,24 +1,24 @@ # SPDX-License-Identifier: GPL-2.0 # Common objects -lib-$(CONFIG_SUNXI_CCU) += ccu_common.o -lib-$(CONFIG_SUNXI_CCU) += ccu_mmc_timing.o -lib-$(CONFIG_SUNXI_CCU) += ccu_reset.o +obj-y += ccu_common.o +obj-y += ccu_mmc_timing.o +obj-y += ccu_reset.o # Base clock types -lib-$(CONFIG_SUNXI_CCU) += ccu_div.o -lib-$(CONFIG_SUNXI_CCU) += ccu_frac.o -lib-$(CONFIG_SUNXI_CCU) += ccu_gate.o -lib-$(CONFIG_SUNXI_CCU) += ccu_mux.o -lib-$(CONFIG_SUNXI_CCU) += ccu_mult.o -lib-$(CONFIG_SUNXI_CCU) += ccu_phase.o -lib-$(CONFIG_SUNXI_CCU) += ccu_sdm.o +obj-y += ccu_div.o +obj-y += ccu_frac.o +obj-y += ccu_gate.o +obj-y += ccu_mux.o +obj-y += ccu_mult.o +obj-y += ccu_phase.o +obj-y += ccu_sdm.o # Multi-factor clocks -lib-$(CONFIG_SUNXI_CCU) += ccu_nk.o -lib-$(CONFIG_SUNXI_CCU) += ccu_nkm.o -lib-$(CONFIG_SUNXI_CCU) += ccu_nkmp.o -lib-$(CONFIG_SUNXI_CCU) += ccu_nm.o -lib-$(CONFIG_SUNXI_CCU) += ccu_mp.o +obj-y += ccu_nk.o +obj-y += ccu_nkm.o +obj-y += ccu_nkmp.o +obj-y += ccu_nm.o +obj-y += ccu_mp.o # SoC support obj-$(CONFIG_SUN50I_A64_CCU) += ccu-sun50i-a64.o
@@ -37,12 +37,3 @@ obj-$(CONFIG_SUN8I_R40_CCU) += ccu-sun8i obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-de.o obj-$(CONFIG_SUN9I_A80_CCU) += ccu-sun9i-a80-usb.o - -# The lib-y file goals is supposed to work only in arch/*/lib or lib/. In our -# case, we want to use that goal, but even though lib.a will be properly -# generated, it will not be linked in, eventually resulting in a linker error -# for missing symbols. -# -# We can work around that by explicitly adding lib.a to the obj-y goal. This is -# an undocumented behaviour, but works well for now. -obj-$(CONFIG_SUNXI_CCU) += lib.a
Greg Kroah-Hartman
maintainerPATCH 86/324 locking/lockdep: Do not record IRQ state within lockdep code
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (VMware)" <[email protected]>
[ Upstream commit fcc784be837714a9173b372ff9fb9b514590dad9 ]
While debugging where things were going wrong with mapping enabling/disabling interrupts with the lockdep state and actual real enabling and disabling interrupts, I had to silent the IRQ disabling/enabling in debug_check_no_locks_freed() because it was always showing up as it was called before the splat was.
Use raw_local_irq_save/restore() for not only debug_check_no_locks_freed() but for all internal lockdep functions, as they hide useful information about where interrupts were used incorrectly last.
--- kernel/locking/lockdep.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/locking/lockdep.c +6 -6
@@ -1261,11 +1261,11 @@ unsigned long lockdep_count_forward_deps this.parent =NULL ; this.class = class; -local_irq_save (flags); +raw_local_irq_save (flags);arch_spin_lock (&lockdep_lock); ret =__lockdep_count_forward_deps (&this);arch_spin_unlock (&lockdep_lock); -local_irq_restore (flags); +raw_local_irq_restore (flags);return ret; }
@@ -1288,11 +1288,11 @@ unsigned long lockdep_count_backward_dep this.parent =NULL ; this.class = class; -local_irq_save (flags); +raw_local_irq_save (flags);arch_spin_lock (&lockdep_lock); ret =__lockdep_count_backward_deps (&this);arch_spin_unlock (&lockdep_lock); -local_irq_restore (flags); +raw_local_irq_restore (flags);return ret; }
@@ -4407,7 +4407,7 @@ void debug_check_no_locks_freed(const voif (unlikely (!debug_locks))return ; -local_irq_save (flags); +raw_local_irq_save (flags);for (i =0 ; i < curr->lockdep_depth; i++) { hlock = curr->held_locks + i;
@@ -4418,7 +4418,7 @@ void debug_check_no_locks_freed(const voprint_freed_lock_bug (curr, mem_from, mem_from + mem_len, hlock);break ; } -local_irq_restore (flags); +raw_local_irq_restore (flags); }EXPORT_SYMBOL_GPL (debug_check_no_locks_freed);
Greg Kroah-Hartman
maintainerPATCH 87/324 selftests: bpf: notification about privilege required to run test_kmod.sh testing script
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeffrin Jose T <[email protected]>
[ Upstream commit 81e167c2a216e7b54e6add9d2badcda267fe33b1 ]
The test_kmod.sh script require root privilege for the successful execution of the test.
This patch is to notify the user about the privilege the script demands for the successful execution of the test.
--- tools/testing/selftests/bpf/test_kmod.sh | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/testing/selftests/bpf/test_kmod.sh +9 -0
@@ -1,6 +1,15 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + +msg="skip all tests:" +if [ "$(id -u)" != "0" ]; then + echo $msg please run this as root >&2 + exit $ksft_skip +fi + SRC_TREE=../../../../ test_run()
Greg Kroah-Hartman
maintainerPATCH 89/324 irqchip/gic-v2m: Fix SPI release on error path
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit cbaf45a6be497c272e80500e4fd9bccdf20d5050 ]
On failing to allocate the required SPIs, the actual number of interrupts should be freed and not its log2 value.
--- drivers/irqchip/irq-gic-v2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v2m.c +1 -1
@@ -199,7 +199,7 @@ static int gicv2m_irq_domain_alloc(struc fail:irq_domain_free_irqs_parent (domain, virq, nr_irqs); -gicv2m_unalloc_msi (v2m, hwirq,get_count_order (nr_irqs)); +gicv2m_unalloc_msi (v2m, hwirq, nr_irqs);return err; }
Greg Kroah-Hartman
maintainerPATCH 90/324 irqchip/gic-v3-its: Fix reprogramming of redistributors on CPU hotplug
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit 82f499c8811149069ec958b72a86643a7a289b25 ]
Enabling LPIs was made a lot stricter recently, by checking that they are disabled before enabling them. By doing so, the CPU hotplug case was missed altogether, which leaves LPIs enabled on hotplug off (expecting the CPU to eventually come back), and won't write a different value anyway on hotplug on.
So skip that check if that particular case is detected
--- drivers/irqchip/irq-gic-v3-its.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/irqchip/irq-gic-v3-its.c +10 -0
@@ -3405,6 +3405,16 @@ static int redist_disable_lpis(void)u64 timeout =USEC_PER_SEC ;u64 val; +/* +* If coming via a CPU hotplug event, we don't need to disable +* LPIs before trying to re-enable them. They are already +* configured and all is well in the world. Detect this case +* by checking the allocation of the pending table for the +* current CPU. +*/ +if (gic_data_rdist ()->pend_page) +return 0 ; +if (!gic_rdists_supports_plpis ()) {pr_info ("CPU%d: LPIs not supported\n" ,smp_processor_id ());return -ENXIO ;
Greg Kroah-Hartman
maintainerPATCH 91/324 x86/microcode/intel: Fix memleak in save_microcode_patch()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhenzhong Duan <[email protected]>
[ Upstream commit 0218c766263e70795c5eaa17d75ed54bca350950 ]
Free useless ucode_patch entry when it's replaced.
[ bp: Drop the memfree_patch() two-liner. ]
--- arch/x86/kernel/cpu/microcode/intel.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/microcode/intel.c +4 -1
@@ -190,8 +190,11 @@ static void save_microcode_patch(void *d p =memdup_patch (data, size);if (!p)pr_err ("Error allocating buffer %p\n" , data); -else +else {list_replace (&iter->plist, &p->plist); +kfree (iter->data); +kfree (iter); + } } }
Greg Kroah-Hartman
maintainerPATCH 92/324 ipv6: mcast: fix unsolicited report interval after receiving querys
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 6c6da92808442908287fae8ebb0ca041a52469f4 ]
After recieving MLD querys, we update idev->mc_maxdelay with max_delay from query header. This make the later unsolicited reports have the same interval with mc_maxdelay, which means we may send unsolicited reports with long interval time instead of default configured interval time.
Also as we will not call ipv6_mc_reset() after device up. This issue will be there even after leave the group and join other groups.
--- net/ipv6/mcast.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/ipv6/mcast.c +6 -3
@@ -2081,7 +2081,8 @@ void ipv6_mc_dad_complete(struct inet6_dmld_send_initial_cr (idev); idev->mc_dad_count--;if (idev->mc_dad_count) -mld_dad_start_timer (idev, idev->mc_maxdelay); +mld_dad_start_timer (idev, +unsolicited_report_interval (idev)); } }
@@ -2093,7 +2094,8 @@ static void mld_dad_timer_expire(structif (idev->mc_dad_count) { idev->mc_dad_count--;if (idev->mc_dad_count) -mld_dad_start_timer (idev, idev->mc_maxdelay); +mld_dad_start_timer (idev, +unsolicited_report_interval (idev)); }in6_dev_put (idev); }
@@ -2451,7 +2453,8 @@ static void mld_ifc_timer_expire(structif (idev->mc_ifc_count) { idev->mc_ifc_count--;if (idev->mc_ifc_count) -mld_ifc_start_timer (idev, idev->mc_maxdelay); +mld_ifc_start_timer (idev, +unsolicited_report_interval (idev)); }in6_dev_put (idev); }
Greg Kroah-Hartman
maintainerPATCH 93/324 Smack: Mark inode instant in smack_task_to_inode
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Casey Schaufler <[email protected]>
[ Upstream commit 7b4e88434c4e7982fb053c49657e1c8bbb8692d9 ]
Smack: Mark inode instant in smack_task_to_inode
/proc clean-up in commit 1bbc55131e59bd099fdc568d3aa0b42634dbd188 resulted in smack_task_to_inode() being called before smack_d_instantiate. This resulted in the smk_inode value being ignored, even while present for files in /proc/self. Marking the inode as instant here fixes that.
--- security/smack/smack_lsm.c | 1 + 1 file changed, 1 insertion(+)
security/smack/smack_lsm.c +1 -0
@@ -2296,6 +2296,7 @@ static void smack_task_to_inode(struct tstruct smack_known *skp =smk_of_task_struct (p); isp->smk_inode = skp; + isp->smk_flags |=SMK_INODE_INSTANT ; }/*
Greg Kroah-Hartman
maintainerPATCH 94/324 arm64: dts: msm8916: fix Coresight ETF graph connections
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring <[email protected]>
[ Upstream commit 6b4154a655a258c67bcfabbd4c3a06637e74ebcd ]
The ETF input should be connected to the funnel output, and the ETF output should be connected to the replicator input. The labels are wrong and these got swapped:
Warning (graph_endpoint): /soc/funnel@821000/ports/port@8/endpoint: graph connection to node '/soc/etf@825000/ports/port@1/endpoint' is not bidirectional Warning (graph_endpoint): /soc/replicator@824000/ports/port@2/endpoint: graph connection to node '/soc/etf@825000/ports/port@0/endpoint' is not bidirectional
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +2 -2
@@ -1191,14 +1191,14 @@ port@0 { reg = <0>; - etf_out: endpoint { + etf_in: endpoint { slave-mode; remote-endpoint = <&funnel0_out>; }; }; port@1 { reg = <0>; - etf_in: endpoint { + etf_out: endpoint { remote-endpoint = <&replicator_in>; }; };
Greg Kroah-Hartman
maintainerPATCH 95/324 batman-adv: Fix bat_ogm_iv best gw refcnt after netlink dump
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit b5685d2687d6612adf5eac519eb7008f74dfd1ec ]
A reference for the best gateway is taken when the list of gateways in the mesh is sent via netlink. This is necessary to check whether the currently dumped entry is the currently selected gateway or not. This information is then transferred as flag BATADV_ATTR_FLAG_BEST.
After the comparison of the current entry is done, batadv_iv_gw_dump_entry() has to decrease the reference counter again. Otherwise the reference will be held and thus prevents a proper shutdown of the batman-adv interfaces (and some of the interfaces enslaved in it).
--- net/batman-adv/bat_iv_ogm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/batman-adv/bat_iv_ogm.c +3 -1
@@ -2732,7 +2732,7 @@ static int batadv_iv_gw_dump_entry(struc {struct batadv_neigh_ifinfo *router_ifinfo =NULL ;struct batadv_neigh_node *router; -struct batadv_gw_node *curr_gw; +struct batadv_gw_node *curr_gw =NULL ;int ret =0 ;void *hdr;
@@ -2780,6 +2780,8 @@ static int batadv_iv_gw_dump_entry(struc ret =0 ; out: +if (curr_gw) +batadv_gw_node_put (curr_gw);if (router_ifinfo)batadv_neigh_ifinfo_put (router_ifinfo);if (router)
Greg Kroah-Hartman
maintainerPATCH 96/324 batman-adv: Fix bat_v best gw refcnt after netlink dump
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit 9713cb0cf19f1cec6c007e3b37be0697042b6720 ]
A reference for the best gateway is taken when the list of gateways in the mesh is sent via netlink. This is necessary to check whether the currently dumped entry is the currently selected gateway or not. This information is then transferred as flag BATADV_ATTR_FLAG_BEST.
After the comparison of the current entry is done, batadv_v_gw_dump_entry() has to decrease the reference counter again. Otherwise the reference will be held and thus prevents a proper shutdown of the batman-adv interfaces (and some of the interfaces enslaved in it).
--- net/batman-adv/bat_v.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/batman-adv/bat_v.c +3 -1
@@ -927,7 +927,7 @@ static int batadv_v_gw_dump_entry(struct {struct batadv_neigh_ifinfo *router_ifinfo =NULL ;struct batadv_neigh_node *router; -struct batadv_gw_node *curr_gw; +struct batadv_gw_node *curr_gw =NULL ;int ret =0 ;void *hdr;
@@ -995,6 +995,8 @@ static int batadv_v_gw_dump_entry(struct ret =0 ; out: +if (curr_gw) +batadv_gw_node_put (curr_gw);if (router_ifinfo)batadv_neigh_ifinfo_put (router_ifinfo);if (router)
Greg Kroah-Hartman
maintainerPATCH 97/324 batman-adv: Fix debugfs path for renamed hardif
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit 36dc621ceca1be3ec885aeade5fdafbbcc452a6d ]
batman-adv is creating special debugfs directories in the init net_namespace for each valid hard-interface (net_device). But it is possible to rename a net_device to a completely different name then the original one.
It can therefore happen that a user registers a new net_device which gets the name "wlan0" assigned by default. batman-adv is also adding a new directory under $debugfs/batman-adv/ with the name "wlan0".
The user then decides to rename this device to "wl_pri" and registers a different device. The kernel may now decide to use the name "wlan0" again for this new device. batman-adv will detect it as a valid net_device and tries to create a directory with the name "wlan0" under $debugfs/batman-adv/. But there already exists one with this name under this path and thus this fails. batman-adv will detect a problem and rollback the registering of this device.
batman-adv must therefore take care of renaming the debugfs directories for hard-interfaces whenever it detects such a net_device rename.
--- net/batman-adv/debugfs.c | 20 ++++++++++++++++++++ net/batman-adv/debugfs.h | 6 ++++++ net/batman-adv/hard-interface.c | 3 +++ 3 files changed, 29 insertions(+)
net/batman-adv/debugfs.c +20 -0
@@ -19,6 +19,7 @@#include "debugfs.h" #include "main.h" +#include <linux/dcache.h> #include <linux/debugfs.h> #include <linux/err.h> #include <linux/errno.h>
@@ -344,6 +345,25 @@ out: }/** +* batadv_debugfs_rename_hardif() - Fix debugfs path for renamed hardif +* @hard_iface: hard interface which was renamed +*/ +void batadv_debugfs_rename_hardif (struct batadv_hard_iface *hard_iface) +{ +const char *name = hard_iface->net_dev->name; +struct dentry *dir; +struct dentry *d; + + dir = hard_iface->debug_dir; +if (!dir) +return ; + + d =debugfs_rename (dir->d_parent, dir, dir->d_parent, name); +if (!d) +pr_err ("Can't rename debugfs dir to %s\n" , name); +} + +/** * batadv_debugfs_del_hardif() - delete the base directory for a hard interface * in debugfs. * @hard_iface: hard interface which is deleted.
net/batman-adv/debugfs.h +6 -0
@@ -32,6 +32,7 @@ void batadv_debugfs_destroy(void);int batadv_debugfs_add_meshif (struct net_device *dev);void batadv_debugfs_del_meshif (struct net_device *dev);int batadv_debugfs_add_hardif (struct batadv_hard_iface *hard_iface); +void batadv_debugfs_rename_hardif (struct batadv_hard_iface *hard_iface);void batadv_debugfs_del_hardif (struct batadv_hard_iface *hard_iface);#else
@@ -60,6 +61,11 @@ int batadv_debugfs_add_hardif(struct bat }static inline +void batadv_debugfs_rename_hardif (struct batadv_hard_iface *hard_iface) +{ +} + +static inline void batadv_debugfs_del_hardif (struct batadv_hard_iface *hard_iface) { }
net/batman-adv/hard-interface.c +3 -0
@@ -1051,6 +1051,9 @@ static int batadv_hard_if_event(struct nif (batadv_is_wifi_hardif (hard_iface)) hard_iface->num_bcasts =BATADV_NUM_BCASTS_WIRELESS ;break ; +case NETDEV_CHANGENAME : +batadv_debugfs_rename_hardif (hard_iface); +break ;default :break ; }
Greg Kroah-Hartman
maintainerPATCH 98/324 batman-adv: Fix debugfs path for renamed softif
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Eckelmann <[email protected]>
[ Upstream commit 6da7be7d24b2921f8215473ba7552796dff05fe1 ]
batman-adv is creating special debugfs directories in the init net_namespace for each created soft-interface (batadv net_device). But it is possible to rename a net_device to a completely different name then the original one.
It can therefore happen that a user registers a new batadv net_device with the name "bat0". batman-adv is then also adding a new directory under $debugfs/batman-adv/ with the name "wlan0".
The user then decides to rename this device to "bat1" and registers a different batadv device with the name "bat0". batman-adv will then try to create a directory with the name "bat0" under $debugfs/batman-adv/ again. But there already exists one with this name under this path and thus this fails. batman-adv will detect a problem and rollback the registering of this device.
batman-adv must therefore take care of renaming the debugfs directories for soft-interfaces whenever it detects such a net_device rename.
--- net/batman-adv/debugfs.c | 20 ++++++++++++++++++++ net/batman-adv/debugfs.h | 5 +++++ net/batman-adv/hard-interface.c | 34 ++++++++++++++++++++++++++++------ 3 files changed, 53 insertions(+), 6 deletions(-)
net/batman-adv/debugfs.c +20 -0
@@ -434,6 +434,26 @@ out: }/** +* batadv_debugfs_rename_meshif() - Fix debugfs path for renamed softif +* @dev: net_device which was renamed +*/ +void batadv_debugfs_rename_meshif (struct net_device *dev) +{ +struct batadv_priv *bat_priv =netdev_priv (dev); +const char *name = dev->name; +struct dentry *dir; +struct dentry *d; + + dir = bat_priv->debug_dir; +if (!dir) +return ; + + d =debugfs_rename (dir->d_parent, dir, dir->d_parent, name); +if (!d) +pr_err ("Can't rename debugfs dir to %s\n" , name); +} + +/** * batadv_debugfs_del_meshif() - Remove interface dependent debugfs entries * @dev: netdev struct of the soft interface */
net/batman-adv/debugfs.h +5 -0
@@ -30,6 +30,7 @@ struct net_device;void batadv_debugfs_init (void );void batadv_debugfs_destroy (void );int batadv_debugfs_add_meshif (struct net_device *dev); +void batadv_debugfs_rename_meshif (struct net_device *dev);void batadv_debugfs_del_meshif (struct net_device *dev);int batadv_debugfs_add_hardif (struct batadv_hard_iface *hard_iface);void batadv_debugfs_rename_hardif (struct batadv_hard_iface *hard_iface);
@@ -50,6 +51,10 @@ static inline int batadv_debugfs_add_mesreturn 0 ; } +static inline void batadv_debugfs_rename_meshif (struct net_device *dev) +{ +} +static inline void batadv_debugfs_del_meshif (struct net_device *dev) { }
net/batman-adv/hard-interface.c +28 -6
@@ -989,6 +989,32 @@ void batadv_hardif_remove_interfaces(voirtnl_unlock (); } +/** +* batadv_hard_if_event_softif() - Handle events for soft interfaces +* @event: NETDEV_* event to handle +* @net_dev: net_device which generated an event +* +* Return: NOTIFY_* result +*/ +static int batadv_hard_if_event_softif (unsigned long event, +struct net_device *net_dev) +{ +struct batadv_priv *bat_priv; + +switch (event) { +case NETDEV_REGISTER : +batadv_sysfs_add_meshif (net_dev); + bat_priv =netdev_priv (net_dev); +batadv_softif_create_vlan (bat_priv,BATADV_NO_FLAGS ); +break ; +case NETDEV_CHANGENAME : +batadv_debugfs_rename_meshif (net_dev); +break ; + } + +return NOTIFY_DONE ; +} +static int batadv_hard_if_event (struct notifier_block *this,unsigned long event,void *ptr) {
@@ -997,12 +1023,8 @@ static int batadv_hard_if_event(struct nstruct batadv_hard_iface *primary_if =NULL ;struct batadv_priv *bat_priv; -if (batadv_softif_is_valid (net_dev) && event ==NETDEV_REGISTER ) { -batadv_sysfs_add_meshif (net_dev); - bat_priv =netdev_priv (net_dev); -batadv_softif_create_vlan (bat_priv,BATADV_NO_FLAGS ); -return NOTIFY_DONE ; - } +if (batadv_softif_is_valid (net_dev)) +return batadv_hard_if_event_softif (event, net_dev); hard_iface =batadv_hardif_get_by_netdev (net_dev); if (!hard_iface && (event == NETDEV_REGISTER ||
Greg Kroah-Hartman
maintainerPATCH 101/324 cxgb4: when disabling dcb set txq dcb priority to 0
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ganesh Goudar <[email protected]>
[ Upstream commit 5ce36338a30f9814fc4824f9fe6c20cd83d872c7 ]
When we are disabling DCB, store "0" in txq->dcb_prio since that's used for future TX Work Request "OVLAN_IDX" values. Setting non zero priority upon disabling DCB would halt the traffic.
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
@@ -263,7 +263,7 @@ static void dcb_tx_queue_prio_enable(str"Can't %s DCB Priority on port %d, TX Queue %d: err=%d\n" , enable ? "set" : "unset", pi->port_id, i, -err); else - txq->dcb_prio = value; + txq->dcb_prio = enable ? value : 0; } }
Greg Kroah-Hartman
maintainerPATCH 102/324 iio: pressure: bmp280: fix relative humidity unit
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Duszynski <[email protected]>
[ Upstream commit 13399ff25f179811ce9c1df1523eb39f9e4a4772 ]
According to IIO ABI relative humidity reading should be returned in milli percent.
This patch addresses that by applying proper scaling and returning integer instead of fractional format type specifier.
Note that the fixes tag is before the driver was heavily refactored to introduce spi support, so the patch won't apply that far back.
--- drivers/iio/pressure/bmp280-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iio/pressure/bmp280-core.c +2 -3
@@ -415,10 +415,9 @@ static int bmp280_read_humid(struct bmp2 } comp_humidity =bmp280_compensate_humidity (data, adc_humidity); - *val = comp_humidity; - *val2 =1024 ; + *val = comp_humidity *1000 /1024 ; -return IIO_VAL_FRACTIONAL ; +return IIO_VAL_INT ; } static int bmp280_read_raw(struct iio_dev *indio_dev,
Greg Kroah-Hartman
maintainerPATCH 103/324 brcmfmac: stop watchdog before detach and free everything
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Trimarchi <[email protected]>
[ Upstream commit 373c83a801f15b1e3d02d855fad89112bd4ccbe0 ]
Using built-in in kernel image without a firmware in filesystem or in the kernel image can lead to a kernel NULL pointer deference. Watchdog need to be stopped in brcmf_sdio_remove
The system is going down NOW!
[ 1348.110759] Unable to handle kernel NULL pointer dereference at virtual address 000002f8 Sent SIGTERM to all processes [ 1348.121412] Mem abort info: [ 1348.126962] ESR = 0x96000004 [ 1348.130023] Exception class = DABT (current EL), IL = 32 bits [ 1348.135948] SET = 0, FnV = 0 [ 1348.138997] EA = 0, S1PTW = 0 [ 1348.142154] Data abort info: [ 1348.145045] ISV = 0, ISS = 0x00000004 [ 1348.148884] CM = 0, WnR = 0 [ 1348.151861] user pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 1348.158475] [00000000000002f8] pgd=0000000000000000 [ 1348.163364] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 1348.168927] Modules linked in: ipv6 [ 1348.172421] CPU: 3 PID: 1421 Comm: brcmf_wdog/mmc0 Not tainted 4.17.0-rc5-next-20180517 #18 [ 1348.180757] Hardware name: Amarula A64-Relic (DT) [ 1348.185455] pstate: 60000005 (nZCv daif -PAN -UAO) [ 1348.190251] pc : brcmf_sdiod_freezer_count+0x0/0x20 [ 1348.195124] lr : brcmf_sdio_watchdog_thread+0x64/0x290 [ 1348.200253] sp : ffff00000b85be30 [ 1348.203561] x29: ffff00000b85be30 x28: 0000000000000000 [ 1348.208868] x27: ffff00000b6cb918 x26: ffff80003b990638 [ 1348.214176] x25: ffff0000087b1a20 x24: ffff80003b94f800 [ 1348.219483] x23: ffff000008e620c8 x22: ffff000008f0b660 [ 1348.224790] x21: ffff000008c6a858 x20: 00000000fffffe00 [ 1348.230097] x19: ffff80003b94f800 x18: 0000000000000001 [ 1348.235404] x17: 0000ffffab2e8a74 x16: ffff0000080d7de8 [ 1348.240711] x15: 0000000000000000 x14: 0000000000000400 [ 1348.246018] x13: 0000000000000400 x12: 0000000000000001 [ 1348.251324] x11: 00000000000002c4 x10: 0000000000000a10 [ 1348.256631] x9 : ffff00000b85bc40 x8 : ffff80003be11870 [ 1348.261937] x7 : ffff80003dfc7308 x6 : 000000078ff08b55 [ 1348.267243] x5 : 00000139e1058400 x4 : 0000000000000000 [ 1348.272550] x3 : dead000000000100 x2 : 958f2788d6618100 [ 1348.277856] x1 : 00000000fffffe00 x0 : 0000000000000000
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +7 -0
@@ -4294,6 +4294,13 @@ void brcmf_sdio_remove(struct brcmf_sdiobrcmf_dbg (TRACE ,"Enter\n" );if (bus) { +/* Stop watchdog task */ +if (bus->watchdog_tsk) { +send_sig (SIGTERM , bus->watchdog_tsk,1 ); +kthread_stop (bus->watchdog_tsk); + bus->watchdog_tsk =NULL ; + } +/* De-register interrupt handler */ brcmf_sdiod_intr_unregister (bus->sdiodev);
Greg Kroah-Hartman
maintainerPATCH 104/324 ipmi: kcs_bmc: fix IRQ exception if the channel is not open
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haiyue Wang <[email protected]>
[ Upstream commit dc0f0a026d33819bb82d5c26ab2fca838e2004be ]
When kcs_bmc_handle_event calls kcs_force_abort function to handle the not open (no user running) KCS channel transaction, the returned status value -ENODEV causes the low level IRQ handler indicating that the irq was not for him by returning IRQ_NONE. After some time, this IRQ will be treated to be spurious one, and the exception dump happens.
irq 30: nobody cared (try booting with the "irqpoll" option)
CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.10.15-npcm750 #1 Hardware name: NPCMX50 Chip family [<c010b264>] (unwind_backtrace) from [<c0106930>] (show_stack+0x20/0x24) [<c0106930>] (show_stack) from [<c03dad38>] (dump_stack+0x8c/0xa0) [<c03dad38>] (dump_stack) from [<c0168810>] (__report_bad_irq+0x3c/0xdc) [<c0168810>] (__report_bad_irq) from [<c0168c34>] (note_interrupt+0x29c/0x2ec) [<c0168c34>] (note_interrupt) from [<c0165c80>] (handle_irq_event_percpu+0x5c/0x68) [<c0165c80>] (handle_irq_event_percpu) from [<c0165cd4>] (handle_irq_event+0x48/0x6c) [<c0165cd4>] (handle_irq_event) from [<c0169664>] (handle_fasteoi_irq+0xc8/0x198) [<c0169664>] (handle_fasteoi_irq) from [<c016529c>] (__handle_domain_irq+0x90/0xe8) [<c016529c>] (__handle_domain_irq) from [<c01014bc>] (gic_handle_irq+0x58/0x9c) [<c01014bc>] (gic_handle_irq) from [<c010752c>] (__irq_svc+0x6c/0x90) Exception stack(0xc0a01de8 to 0xc0a01e30) 1de0: 00002080 c0a6fbc0 00000000 00000000 00000000 c096d294 1e00: 00000000 00000001 dc406400 f03ff100 00000082 c0a01e94 c0a6fbc0 c0a01e38 1e20: 00200102 c01015bc 60000113 ffffffff [<c010752c>] (__irq_svc) from [<c01015bc>] (__do_softirq+0xbc/0x358) [<c01015bc>] (__do_softirq) from [<c011c798>] (irq_exit+0xb8/0xec) [<c011c798>] (irq_exit) from [<c01652a0>] (__handle_domain_irq+0x94/0xe8) [<c01652a0>] (__handle_domain_irq) from [<c01014bc>] (gic_handle_irq+0x58/0x9c) [<c01014bc>] (gic_handle_irq) from [<c010752c>] (__irq_svc+0x6c/0x90) Exception stack(0xc0a01ef8 to 0xc0a01f40) 1ee0: 00000000 000003ae 1f00: dcc0f338 c0111060 c0a00000 c0a0cc44 c0a0cbe4 c0a1c22b c07bc218 00000001 1f20: dcffca40 c0a01f54 c0a01f58 c0a01f48 c0103524 c0103528 60000013 ffffffff [<c010752c>] (__irq_svc) from [<c0103528>] (arch_cpu_idle+0x48/0x4c) [<c0103528>] (arch_cpu_idle) from [<c0681390>] (default_idle_call+0x30/0x3c) [<c0681390>] (default_idle_call) from [<c0156f24>] (do_idle+0xc8/0x134) [<c0156f24>] (do_idle) from [<c015722c>] (cpu_startup_entry+0x28/0x2c) [<c015722c>] (cpu_startup_entry) from [<c067ad74>] (rest_init+0x84/0x88) [<c067ad74>] (rest_init) from [<c0900d44>] (start_kernel+0x388/0x394) [<c0900d44>] (start_kernel) from [<0000807c>] (0x807c) handlers: [<c041c5dc>] npcm7xx_kcs_irq Disabling IRQ #30
It needs to change the returned status from -ENODEV to 0. The -ENODEV was originally used to tell the low level IRQ handler that no user was running, but not consider the IRQ handling desgin.
And multiple KCS channels share one IRQ handler, it needs to check the IBF flag before doing force abort. If the IBF is set, after handling, return 0 to low level IRQ handler to indicate that the IRQ is handled.
--- drivers/char/ipmi/kcs_bmc.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)
drivers/char/ipmi/kcs_bmc.c +10 -21
@@ -210,34 +210,23 @@ static void kcs_bmc_handle_cmd(struct kcint kcs_bmc_handle_event (struct kcs_bmc *kcs_bmc) {unsigned long flags; -int ret =0 ; +int ret = -ENODATA ;u8 status;spin_lock_irqsave (&kcs_bmc->lock, flags); -if (!kcs_bmc->running) { -kcs_force_abort (kcs_bmc); - ret = -ENODEV ; - goto out_unlock; - } - - status =read_status (kcs_bmc) & (KCS_STATUS_IBF |KCS_STATUS_CMD_DAT ); - -switch (status) { -case KCS_STATUS_IBF |KCS_STATUS_CMD_DAT : -kcs_bmc_handle_cmd (kcs_bmc); -break ; - -case KCS_STATUS_IBF : -kcs_bmc_handle_data (kcs_bmc); -break ; + status =read_status (kcs_bmc); +if (status &KCS_STATUS_IBF ) { +if (!kcs_bmc->running) +kcs_force_abort (kcs_bmc); +else if (status &KCS_STATUS_CMD_DAT ) +kcs_bmc_handle_cmd (kcs_bmc); +else +kcs_bmc_handle_data (kcs_bmc); -default : - ret = -ENODATA ; -break ; + ret =0 ; } -out_unlock:spin_unlock_irqrestore (&kcs_bmc->lock, flags);return ret;
Greg Kroah-Hartman
maintainerPATCH 105/324 ARM: dts: am437x: make edt-ft5x06 a wakeup source
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Mack <[email protected]>
[ Upstream commit 49a6ec5b807ea4ad7ebe1f58080ebb8497cb2d2c ]
The touchscreen driver no longer configures the device as wakeup source by default. A "wakeup-source" property is needed.
--- arch/arm/boot/dts/am437x-sk-evm.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/am437x-sk-evm.dts +2 -0
@@ -537,6 +537,8 @@ touchscreen-size-x = <480>; touchscreen-size-y = <272>; + + wakeup-source; }; tlv320aic3106: tlv320aic3106@1b {
Greg Kroah-Hartman
maintainerPATCH 106/324 ALSA: seq: Fix UBSAN warning at SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT ioctl
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit c9a4c63888dbb79ce4d068ca1dd8b05bc3f156b1 ]
The kernel may spew a WARNING with UBSAN undefined behavior at handling ALSA sequencer ioctl SNDRV_SEQ_IOCTL_QUERY_NEXT_CLIENT:
UBSAN: Undefined behaviour in sound/core/seq/seq_clientmgr.c:2007:14 signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x122/0x1c8 lib/dump_stack.c:113 ubsan_epilogue+0x12/0x86 lib/ubsan.c:159 handle_overflow+0x1c2/0x21f lib/ubsan.c:190 __ubsan_handle_add_overflow+0x2a/0x31 lib/ubsan.c:198 snd_seq_ioctl_query_next_client+0x1ac/0x1d0 sound/core/seq/seq_clientmgr.c:2007 snd_seq_ioctl+0x264/0x3d0 sound/core/seq/seq_clientmgr.c:2144 ....
It happens only when INT_MAX is passed there, as we're incrementing it unconditionally. So the fix is trivial, check the value with INT_MAX. Although the bug itself is fairly harmless, it's better to fix it so that fuzzers won't hit this again later.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=200211
--- sound/core/seq/seq_clientmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/core/seq/seq_clientmgr.c +2 -1
@@ -2004,7 +2004,8 @@ static int snd_seq_ioctl_query_next_cliestruct snd_seq_client *cptr =NULL ;/* search for next client */ - info->client++; +if (info->client <INT_MAX ) + info->client++;if (info->client <0 ) info->client =0 ;for (; info->client <SNDRV_SEQ_MAX_CLIENTS ; info->client++) {
Greg Kroah-Hartman
maintainerPATCH 107/324 nfp: bpf: dont stop offload if replace failed
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 68d676a089625daed9d61df56ac63b5cd7189efe ]
Stopping offload completely if replace of program failed dates back to days of transparent offload. Back then we wanted to silently fall back to the in-driver processing. Today we mark programs for offload when they are loaded into the kernel, so the transparent offload is no longer a reality.
Flags check in the driver will only allow replace of a driver program with another driver program or an offload program with another offload program.
When driver program is replaced stopping offload is a no-op, because driver program isn't offloaded. When replacing offloaded program if the offload fails the entire operation will fail all the way back to user space and we should continue using the old program. IOW when replacing a driver program stopping offload is unnecessary and when replacing offloaded program - it's a bug, old program should continue to run.
In practice this bug would mean that if offload operation was to fail (either due to FW communication error, kernel OOM or new program being offloaded but for a different netdev) driver would continue reporting that previous XDP program is offloaded but in fact no program will be loaded in hardware. The failure is fairly unlikely (found by inspection, when working on the code) but it's unpleasant.
Backport note: even though the bug was introduced in commit cafa92ac2553 ("nfp: bpf: add support for XDP_FLAGS_HW_MODE"), this fix depends on commit 441a33031fe5 ("net: xdp: don't allow device-bound programs in driver mode"), so this fix is sufficient only in v4.15 or newer. Kernels v4.13.x and v4.14.x do need to stop offload if it was transparent/opportunistic, i.e. if XDP_FLAGS_HW_MODE was not set on running program.
--- drivers/net/ethernet/netronome/nfp/bpf/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/netronome/nfp/bpf/main.c +3 -3
@@ -73,10 +73,10 @@ nfp_bpf_xdp_offload(struct nfp_app *app, ret =nfp_net_bpf_offload (nn, prog, running, extack);/* Stop offload if replace not possible */ -if (ret && prog) -nfp_bpf_xdp_offload (app, nn,NULL , extack); +if (ret) +return ret; - nn->dp.bpf_offload_xdp = prog && !ret; + nn->dp.bpf_offload_xdp = !!prog;return ret; }
Greg Kroah-Hartman
maintainerPATCH 108/324 usb: xhci: remove the code build warning
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongjiu Geng <[email protected]>
[ Upstream commit 36eb93509c45d0bdbd8d09a01ab9d857972f5963 ]
Initialize the 'err' variate to remove the build warning, the warning is shown as below:
drivers/usb/host/xhci-tegra.c: In function 'tegra_xusb_mbox_thread':drivers/usb/host/xhci-tegra.c:552:6: warning: 'err' may be used uninitialized in this function [-Wuninitialized] drivers/usb/host/xhci-tegra.c:482:6: note: 'err' was declared here
--- drivers/usb/host/xhci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/xhci-tegra.c +1 -1
@@ -479,7 +479,7 @@ static void tegra_xusb_mbox_handle(strucunsigned long mask;unsigned int port;bool idle, enable; -int err; +int err =0 ;memset (&rsp,0 ,sizeof (rsp));
Greg Kroah-Hartman
maintainerPATCH 109/324 usb: xhci: increase CRS timeout value
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ajay Gupta <[email protected]>
[ Upstream commit 305886ca87be480ae159908c2affd135c04215cf ]
Some controllers take almost 55ms to complete controller restore state (CRS).
There is no timeout limit mentioned in xhci specification so fixing the issue by increasing the timeout limit to 100ms
--- drivers/usb/host/xhci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.c +6 -1
@@ -1014,8 +1014,13 @@ int xhci_resume(struct xhci_hcd *xhci, b command =readl (&xhci->op_regs->command); command |=CMD_CRS ;writel (command, &xhci->op_regs->command); +/* +* Some controllers take up to 55+ ms to complete the controller +* restore so setting the timeout to 100ms. Xhci specification +* doesn't mention any timeout value. +*/ if (xhci_handshake (&xhci->op_regs->status, -STS_RESTORE ,0 ,10 *1000 )) { +STS_RESTORE ,0 ,100 *1000 )) {xhci_warn (xhci,"WARN: xHC restore state timeout\n" );spin_unlock_irq (&xhci->lock);return -ETIMEDOUT ;
Greg Kroah-Hartman
maintainerPATCH 110/324 NFC: pn533: Fix wrong GFP flag usage
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit ecc443c03fb14abfb8a6af5e3b2d43b5257e60f2 ]
pn533_recv_response() is an urb completion handler, so it must use GFP_ATOMIC. pn533_usb_send_frame() OTOH runs from a regular sleeping context, so the pn533_submit_urb_for_response() there (and only there) can use the regular GFP_KERNEL flags.
--- drivers/nfc/pn533/usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nfc/pn533/usb.c +2 -2
@@ -74,7 +74,7 @@ static void pn533_recv_response(struct ustruct sk_buff *skb =NULL ;if (!urb->status) { - skb =alloc_skb (urb->actual_length,GFP_KERNEL ); + skb =alloc_skb (urb->actual_length,GFP_ATOMIC );if (!skb) {nfc_err (&phy->udev->dev,"failed to alloc memory\n" ); }else {
@@ -186,7 +186,7 @@ static int pn533_usb_send_frame(struct pif (dev->protocol_type ==PN533_PROTO_REQ_RESP ) {/* request for response for sent packet directly */ - rc =pn533_submit_urb_for_response (phy,GFP_ATOMIC ); + rc =pn533_submit_urb_for_response (phy,GFP_KERNEL );if (rc) goto error; }else if (dev->protocol_type ==PN533_PROTO_REQ_ACK_RESP ) {
Greg Kroah-Hartman
maintainerPATCH 111/324 typec: tcpm: Fix a msecs vs jiffies bug
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 9578bcd0bb487b8ecef4b7eee799aafb678aa441 ]
The tcpm_set_state() function take msecs not jiffies.
--- drivers/usb/typec/tcpm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/typec/tcpm.c +2 -1
@@ -2543,7 +2543,8 @@ static void run_state_machine(struct tcp tcpm_port_is_sink(port) && time_is_after_jiffies(port->delayed_runtime)) {tcpm_set_state (port,SNK_DISCOVERY , - port->delayed_runtime - jiffies); +jiffies_to_msecs (port->delayed_runtime - + jiffies));break ; }tcpm_set_state (port,unattached_state (port),0 );
Greg Kroah-Hartman
maintainerPATCH 112/324 kconfig: fix line numbers for if-entries in menu tree
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dirk Gouders <[email protected]>
[ Upstream commit b2d00d7c61c84edd150310af3f556f8a3c6e2e67 ]
The line numers for if-entries in the menu tree are off by one or more lines which is confusing when debugging for correctness of unrelated changes.
According to the git log, commit a02f0570ae201c49 (kconfig: improve error handling in the parser) was the last one that changed that part of the parser and replaced
"if_entry: T_IF expr T_EOL"
by
"if_entry: T_IF expr nl"
but the commit message does not state why this has been done.
When reverting that part of the commit, only the line numers are corrected (checked with cdebug = DEBUG_PARSE in zconf.y), otherwise the menu tree remains unchanged (checked with zconfdump() enabled in conf.c).
An example for the corrected line numbers:
drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig drivers/soc/tegra/Kconfig:4:if drivers/soc/tegra/Kconfig:6:if
changes to:
drivers/soc/Kconfig:15:source drivers/soc/tegra/Kconfig drivers/soc/tegra/Kconfig:1:if drivers/soc/tegra/Kconfig:4:if
--- scripts/kconfig/zconf.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/kconfig/zconf.y +2 -2
@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSI static struct menu *current_menu, *current_entry; %} -%expect 32 +%expect 31 %union {
@@ -345,7 +345,7 @@ choice_block: /* if entry */ -if_entry: T_IF expr nl +if_entry: T_IF expr T_EOL { printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno()); menu_add_entry(NULL);
Greg Kroah-Hartman
maintainerPATCH 113/324 perf record: Support s390 random socket_id assignment
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Richter <[email protected]>
[ Upstream commit 01766229533f9bdb1144a41b4345c8c7286da7b4 ]
On s390 the socket identifier assigned to a CPU identifier is random and (depending on the configuration of the LPAR) may be higher than the CPU identifier. This is currently not supported.
Fix this by allowing arbitrary socket identifiers being assigned to CPU id.
Output before:
[root@p23lp27 perf]# ./perf report --header -I -v
...
socket_id number is too big.You may need to upgrade the perf tool. Error:
The perf.data file has no samples!
# ========
# captured on : Tue May 29 09:29:57 2018 # header version : 1 ... # Core ID and Socket ID information is not available ... [root@p23lp27 perf]#
Output after:
[root@p23lp27 perf]# ./perf report --header -I -v
...
Error:
The perf.data file has no samples!
# ========
# captured on : Tue May 29 09:29:57 2018 # header version : 1 ... # CPU 0: Core ID 0, Socket ID 6 # CPU 1: Core ID 1, Socket ID 3 # CPU 2: Core ID -1, Socket ID -1 ... [root@p23lp27 perf]#
--- tools/perf/util/header.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
tools/perf/util/header.c +9 -1
@@ -2113,6 +2113,7 @@ static int process_cpu_topology(struct fint cpu_nr = ff->ph->env.nr_cpus_avail;u64 size =0 ;struct perf_header *ph = ff->ph; +bool do_core_id_test = true; ph->env.cpu =calloc (cpu_nr,sizeof (*ph->env.cpu));if (!ph->env.cpu)
@@ -2167,6 +2168,13 @@ static int process_cpu_topology(struct freturn 0 ; } +/* On s390 the socket_id number is not related to the numbers of cpus. +* The socket_id number might be higher than the numbers of cpus. +* This depends on the configuration. +*/ +if (ph->env.arch && !strncmp (ph->env.arch,"s390" ,4 )) + do_core_id_test = false; +for (i =0 ; i < (u32 )cpu_nr; i++) {if (do_read_u32 (ff, &nr)) goto free_cpu;
@@ -2176,7 +2184,7 @@ static int process_cpu_topology(struct fif (do_read_u32 (ff, &nr)) goto free_cpu; -if (nr != (u32)-1 && nr > (u32 )cpu_nr) { +if (do_core_id_test && nr != (u32)-1 && nr > (u32 )cpu_nr) {pr_debug ("socket_id number is too big." "You may need to upgrade the perf tool.\n" ); goto free_cpu;
Greg Kroah-Hartman
maintainerPATCH 114/324 perf test session topology: Fix test on s390
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Richter <[email protected]>
[ Upstream commit b930e62ecd362843002bdf84c2940439822af321 ]
On s390 this test case fails because the socket identifiction numbers assigned to the CPU are higher than the CPU identification numbers.
F/ix this by adding the platform architecture into the perf data header flag information. This helps identifiing the test platform and handles s390 specifics in process_cpu_topology().
Before:
[root@p23lp27 perf]# perf test -vvvvv -F 39
39: Session topology :
--- start ---
templ file: /tmp/perf-test-iUv755
socket_id number is too big.You may need to upgrade the perf tool. ---- end ----
Session topology: Skip
[root@p23lp27 perf]#
After:
[root@p23lp27 perf]# perf test -vvvvv -F 39
39: Session topology :
--- start ---
templ file: /tmp/perf-test-8X8VTs
CPU 0, core 0, socket 6
CPU 1, core 1, socket 3
---- end ----
Session topology: Ok
[root@p23lp27 perf]#
--- tools/perf/tests/topology.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/tests/topology.c +1 -0
@@ -45,6 +45,7 @@ static int session_write_header(char *paperf_header__set_feat (&session->header,HEADER_CPU_TOPOLOGY );perf_header__set_feat (&session->header,HEADER_NRCPUS ); +perf_header__set_feat (&session->header,HEADER_ARCH ); session->header.data_size +=DATA_SIZE ;
Greg Kroah-Hartman
maintainerPATCH 115/324 perf report powerpc: Fix crash if callchain is empty
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandipan Das <[email protected]>
[ Upstream commit 143c99f6ac6812d23254e80844d6e34be897d3e1 ]
For some cases, the callchain provided by the kernel may be empty. So, the callchain ip filtering code will cause a crash if we do not check whether the struct ip_callchain pointer is NULL before accessing any members.
This can be observed on a powerpc64le system running Fedora 27 as shown below.
# perf record -b -e cycles:u ls
Before:
# perf report --branch-history
perf: Segmentation fault
-------- backtrace --------
perf[0x1027615c] linux-vdso64.so.1(__kernel_sigtramp_rt64+0x0)[0x7fff856304d8] perf(arch_skip_callchain_idx+0x44)[0x10257c58] perf[0x1017f2e4] perf(thread__resolve_callchain+0x124)[0x1017ff5c] perf(sample__resolve_callchain+0xf0)[0x10172788]
...
After:
# perf report --branch-history
Samples: 25 of event 'cycles:u', Event count (approx.): 2306870
Overhead Source:Line Symbol Shared Object + 11.60% _init+35736 [.] _init ls + 9.84% strcoll_l.c:137 [.] __strcoll_l libc-2.26.so + 9.16% memcpy.S:175 [.] __memcpy_power7 libc-2.26.so + 9.01% gconv_charset.h:54 [.] _nl_find_locale libc-2.26.so + 8.87% dl-addr.c:52 [.] _dl_addr libc-2.26.so + 8.83% _init+236 [.] _init ls
...
--- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/powerpc/util/skip-callchain-idx.c +1 -1
@@ -243,7 +243,7 @@ int arch_skip_callchain_idx(struct threau64 ip;u64 skip_slot =-1 ; -if (chain->nr <3 ) +if (!chain || chain->nr <3 )return skip_slot; ip = chain->ips[2 ];
Greg Kroah-Hartman
maintainerPATCH 116/324 perf tests: Add event parsing error handling to parse events test
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit 933ccf2002aaef1037cb676622a694f5390c3d59 ]
Add missing error handling for parse_events calls in test_event function that led to following segfault on s390:
running test 52 'intel_pt//u'
perf: Segmentation fault
...
/lib64/libc.so.6(vasprintf+0xe6) [0x3fffca3f106] /lib64/libc.so.6(asprintf+0x46) [0x3fffca1aa96] ./perf(parse_events_add_pmu+0xb8) [0x80132088] ./perf(parse_events_parse+0xc62) [0x8019529a] ./perf(parse_events+0x98) [0x801341c0] ./perf(test__parse_events+0x48) [0x800cd140] ./perf(cmd_test+0x26a) [0x800bd44a]
test child interrupted
Adding the struct parse_events_error argument to parse_events call. Also adding parse_events_print_error to get more details on the parsing failures, like:
# perf test 6 -v
running test 52 'intel_pt//u'failed to parse event 'intel_pt//u', err 1, str 'Cannot find PMU `intel_pt'. Missing kernel support?'
event syntax error: 'intel_pt//u'
\___ Cannot find PMU `intel_pt'. Missing kernel support?Committer note:
Use named initializers in the struct parse_events_error variable to avoid breaking the build on centos5, 6 and others with a similar gcc:
cc1: warnings being treated as errors tests/parse-events.c: In function 'test_event':
tests/parse-events.c:1696: error: missing initializer tests/parse-events.c:1696: error: (near initialization for 'err.str')
--- tools/perf/tests/parse-events.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/perf/tests/parse-events.c +5 -3
@@ -1672,6 +1672,7 @@ static struct terms_test test__terms[] =static int test_event (struct evlist_test *e) { +struct parse_events_error err = { .idx =0 , };struct perf_evlist *evlist;int ret;
@@ -1679,10 +1680,11 @@ static int test_event(struct evlist_testif (evlist ==NULL )return -ENOMEM ; - ret =parse_events (evlist, e->name,NULL ); + ret =parse_events (evlist, e->name, &err);if (ret) { -pr_debug ("failed to parse event '%s', err %d\n" , - e->name, ret); +pr_debug ("failed to parse event '%s', err %d, str '%s'\n" , + e->name, ret, err.str); +parse_events_print_error (&err, e->name); }else { ret = e->check (evlist); }
Greg Kroah-Hartman
maintainerPATCH 118/324 perf bench: Fix numa report output code
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
[ Upstream commit 983107072be1a39cbde67d45cb0059138190e015 ]
Currently we can hit following assert when running numa bench:
$ perf bench numa mem -p 3 -t 1 -P 512 -s 100 -zZ0cm --thp 1 perf: bench/numa.c:1577: __bench_numa: Assertion `!(!(((wait_stat) & 0x7f) == 0))' failed.
The assertion is correct, because we hit the SIGFPE in following line:
Thread 2.2 "thread 0/0" received signal SIGFPE, Arithmetic exception. [Switching to Thread 0x7fffd28c6700 (LWP 11750)]
0x000.. in worker_thread (__tdata=0x7.. ) at bench/numa.c:1257 1257 td->speed_gbs = bytes_done / (td->runtime_ns / NSEC_PER_SEC) / 1e9;
We don't check if the runtime is actually bigger than 1 second, and thus this might end up with zero division within FPU.
Adding the check to prevent this.
--- tools/perf/bench/numa.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/bench/numa.c +3 -2
@@ -1098,7 +1098,7 @@ static void *worker_thread(void *__tdatau8 *global_data;u8 *process_data;u8 *thread_data; -u64 bytes_done; +u64 bytes_done, secs;long work_done;u32 l;struct rusage rusage;
@@ -1254,7 +1254,8 @@ static void *worker_thread(void *__tdatatimersub (&stop, &start0, &diff); td->runtime_ns = diff.tv_sec *NSEC_PER_SEC ; td->runtime_ns += diff.tv_usec *NSEC_PER_USEC ; - td->speed_gbs = bytes_done / (td->runtime_ns /NSEC_PER_SEC ) /1e9 ; + secs = td->runtime_ns /NSEC_PER_SEC ; + td->speed_gbs = secs ? bytes_done / secs /1e9 :0 ;getrusage (RUSAGE_THREAD , &rusage); td->system_time_ns = rusage.ru_stime.tv_sec *NSEC_PER_SEC ;
Greg Kroah-Hartman
maintainerPATCH 119/324 perf script: Fix crash because of missing evsel->priv
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ravi Bangoria <[email protected]>
[ Upstream commit a3af66f51bd0bca72881ead4bf2bd19cb366582b ]
'perf script' in piped mode is crashing because evsel->priv is not set properly. Fix it.
Before:
# perf record -o - -- ls | perf script
<SNIP 'ls' output>
Segmentation fault (core dumped)
#After:
# perf record -o - -- ls | perf script <SNIP 'ls' output> ls 2282 1031.731974: 250000 cpu-clock:uhH: 7effe4b3d29e ls 2282 1031.732222: 250000 cpu-clock:uhH: 7effe4b3a650 #
--- tools/perf/builtin-script.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
tools/perf/builtin-script.c +14 -0
@@ -1832,6 +1832,7 @@ static int process_attr(struct perf_toolstruct perf_evlist *evlist;struct perf_evsel *evsel, *pos;int err; +static struct perf_evsel_script *es; err =perf_event__process_attr (tool, event, pevlist);if (err)
@@ -1840,6 +1841,19 @@ static int process_attr(struct perf_tool evlist = *pevlist; evsel =perf_evlist__last (*pevlist); +if (!evsel->priv) { +if (scr->per_event_dump) { + evsel->priv =perf_evsel_script__new (evsel, + scr->session->data); + }else { + es =zalloc (sizeof (*es)); +if (!es) +return -ENOMEM ; + es->fp = stdout; + evsel->priv = es; + } + } +if (evsel->attr.type >=PERF_TYPE_MAX && evsel->attr.type !=PERF_TYPE_SYNTH )return 0 ;
Greg Kroah-Hartman
maintainerPATCH 120/324 perf tools: Fix crash caused by accessing feat_ops[HEADER_LAST_FEATURE]
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ravi Bangoria <[email protected]>
[ Upstream commit 92ead7ee30c80f8852d28735cbcb9d79bc85f715 ]
perf_event__process_feature() accesses feat_ops[HEADER_LAST_FEATURE] which is not defined and thus perf is crashing. HEADER_LAST_FEATURE is used as an end marker for the perf report but it's unused for perf script/annotate. Ignore HEADER_LAST_FEATURE for perf script/annotate, just like it is done in 'perf report'.
Before:
# perf record -o - ls | perf script <SNIP 'ls' output> Segmentation fault (core dumped) #
After:
# perf record -o - ls | perf script <SNIP 'ls' output> Segmentation fault (core dumped) ls 7031 4392.099856: 250000 cpu-clock:uhH: 7f5e0ce7cd60 ls 7031 4392.100355: 250000 cpu-clock:uhH: 7f5e0c706ef7 #
--- tools/perf/builtin-annotate.c | 11 ++++++++++- tools/perf/builtin-report.c | 3 ++- tools/perf/builtin-script.c | 11 ++++++++++- tools/perf/util/header.c | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-)
tools/perf/builtin-annotate.c +10 -1
@@ -283,6 +283,15 @@ out_put:return ret; } +static int process_feature_event (struct perf_tool *tool, +union perf_event *event, +struct perf_session *session) +{ +if (event->feat.feat_id <HEADER_LAST_FEATURE ) +return perf_event__process_feature (tool, event, session); +return 0 ; +} +static int hist_entry__tty_annotate (struct hist_entry *he,struct perf_evsel *evsel,struct perf_annotate *ann)
@@ -471,7 +480,7 @@ int cmd_annotate(int argc, const char ** .attr = perf_event__process_attr, .build_id = perf_event__process_build_id, .tracing_data = perf_event__process_tracing_data, - .feature = perf_event__process_feature, + .feature = process_feature_event, .ordered_events = true, .ordering_requires_timestamps = true, },
tools/perf/builtin-report.c +2 -1
@@ -226,7 +226,8 @@ static int process_feature_event(struct }/* -* All features are received, we can force the +* (feat_id = HEADER_LAST_FEATURE) is the end marker which +* means all features are received, now we can force the * group if needed. */ setup_forced_leader (rep, session->evlist);
tools/perf/builtin-script.c +10 -1
@@ -3042,6 +3042,15 @@ int process_cpu_map_event(struct perf_toreturn set_maps (script); } +static int process_feature_event (struct perf_tool *tool, +union perf_event *event, +struct perf_session *session) +{ +if (event->feat.feat_id <HEADER_LAST_FEATURE ) +return perf_event__process_feature (tool, event, session); +return 0 ; +} +#ifdef HAVE_AUXTRACE_SUPPORT static int perf_script__process_auxtrace_info(struct perf_tool *tool, union perf_event *event,
@@ -3086,7 +3095,7 @@ int cmd_script(int argc, const char **ar .attr = process_attr, .event_update = perf_event__process_event_update, .tracing_data = perf_event__process_tracing_data, - .feature = perf_event__process_feature, + .feature = process_feature_event, .build_id = perf_event__process_build_id, .id_index = perf_event__process_id_index, .auxtrace_info = perf_script__process_auxtrace_info,
tools/perf/util/header.c +1 -1
@@ -3450,7 +3450,7 @@ int perf_event__process_feature(struct ppr_warning ("invalid record type %d in pipe-mode\n" , type);return 0 ; } -if (feat ==HEADER_RESERVED || feat >HEADER_LAST_FEATURE ) { +if (feat ==HEADER_RESERVED || feat >=HEADER_LAST_FEATURE ) {pr_warning ("invalid record type %d in pipe-mode\n" , type);return -1 ; }
Greg Kroah-Hartman
maintainerPATCH 121/324 clk: davinci: cfgchip: testing the wrong variable
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 0613de37373bbbc747d434f643620472bd13303b ]
There is a copy and paste bug here. We should be testing "usb1" instead of "usb0".
--- drivers/clk/davinci/da8xx-cfgchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/davinci/da8xx-cfgchip.c +1 -1
@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(str usb1 =da8xx_cfgchip_register_usb1_clk48 (dev, regmap);if (IS_ERR (usb1)) { -if (PTR_ERR (usb0) == -EPROBE_DEFER ) +if (PTR_ERR (usb1) == -EPROBE_DEFER )return -EPROBE_DEFER ; dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
Greg Kroah-Hartman
maintainerPATCH 122/324 usb: chipidea: host: fix disconnection detect issue
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Chen <[email protected]>
[ Upstream commit 90f26cc6bb90b35040f4da0347f480ea9df6e2fc ]
The commit 4e88d4c08301 ("usb: add a flag to skip PHY initialization to struct usb_hcd") delete the assignment for hcd->usb_phy, it causes usb_phy_notify_connect{disconnect) are not called, the USB PHY driver is not notified of hot plug event, then the disconnection will not be detected by hardware.
to struct usb_hcd")
--- drivers/usb/chipidea/host.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/usb/chipidea/host.c +4 -1
@@ -124,8 +124,11 @@ static int host_start(struct ci_hdrc *ci hcd->power_budget = ci->platdata->power_budget; hcd->tpl_support = ci->platdata->tpl_support; -if (ci->phy || ci->usb_phy) +if (ci->phy || ci->usb_phy) { hcd->skip_phy_initialization =1 ; +if (ci->usb_phy) + hcd->usb_phy = ci->usb_phy; + } ehci =hcd_to_ehci (hcd); ehci->caps = ci->hw_bank.cap;
Greg Kroah-Hartman
maintainerPATCH 123/324 ARM: davinci: board-da850-evm: fix WP pin polarity for MMC/SD
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Adam Ford <[email protected]>
[ Upstream commit 1b6fe9798af8cb7d80fad5dd30ee1bcd1e0f51eb ]
When booting from MMC/SD in rw mode on DA850 EVM, the system crashes because the write protect pin should be active high and not active low. This patch fixes the polarity of the WP pin.
--- arch/arm/mach-davinci/board-da850-evm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-davinci/board-da850-evm.c +1 -1
@@ -773,7 +773,7 @@ static struct gpiod_lookup_table mmc_gpi GPIO_LOOKUP("davinci_gpio.0", DA850_MMCSD_CD_PIN, "cd", GPIO_ACTIVE_LOW),GPIO_LOOKUP ("davinci_gpio.0" ,DA850_MMCSD_WP_PIN ,"wp" , - GPIO_ACTIVE_LOW), + GPIO_ACTIVE_HIGH), }, };
Greg Kroah-Hartman
maintainerPATCH 124/324 netfilter: nf_log: fix uninit read in nf_log_proc_dostring
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
[ Upstream commit dffd22aed2aa1e804bccf19b30a421e89ee2ae61 ]
When proc_dostring() is called with a non-zero offset in strict mode, it doesn't just write to the ->data buffer, it also reads. Make sure it doesn't read uninitialized data.
--- net/netfilter/nf_log.c | 4 ++++ 1 file changed, 4 insertions(+)
net/netfilter/nf_log.c +4 -0
@@ -439,6 +439,10 @@ static int nf_log_proc_dostring(struct cif (write) {struct ctl_table tmp = *table; +/* proc_dostring() can append to existing strings, so we need to +* initialize it as an empty string. +*/ + buf[0 ] ='\0' ; tmp.data = buf; r =proc_dostring (&tmp, write, buffer, lenp, ppos);if (r)
Greg Kroah-Hartman
maintainerPATCH 125/324 ceph: fix dentry leak in splice_dentry()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Yan, Zheng" <[email protected]>
[ Upstream commit 8b8f53af1ed9df88a4c0fbfdf3db58f62060edf3 ]
In any case, d_splice_alias() does not drop reference of original dentry.
--- fs/ceph/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/ceph/inode.c +1 -0
@@ -1123,6 +1123,7 @@ static struct dentry *splice_dentry(struif (IS_ERR (realdn)) {pr_err ("splice_dentry error %ld %p inode %p ino %llx.%llx\n" ,PTR_ERR (realdn), dn, in,ceph_vinop (in)); +dput (dn); dn = realdn;/* note realdn contains the error */ goto out; }else if (realdn) {
Greg Kroah-Hartman
maintainerPATCH 126/324 net/mlx5: E-Switch, Disallow vlan/spoofcheck setup if not being esw manager
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eli Cohen <[email protected]>
[ Upstream commit a8d70a054a718b63058b3d3ac58b6181815e4289 ]
In smartnic env, if the host (PF) driver is not an e-switch manager, we are not allowed to apply eswitch ports setups such as vlan (VST), spoof-checks, min/max rate or state.
Make sure we are eswitch manager when coming to issue these callbacks and err otherwise.
Also fix the definition of ESW_ALLOWED to rely on eswitch_manager capability and on the vport_group_manger.
Operations on the VF nic vport context, such as setting a mac or reading the vport counters are allowed to the PF in this scheme.
The modify nic vport guid code was modified to omit checking the nic_vport_node_guid_modify eswitch capability.
The reason for doing so is that modifying node guid requires vport group manager capability, and there's no need to check further capabilities.
1. set_vf_vlan - disallowed
2. set_vf_spoofchk - disallowed
3. set_vf_mac - allowed 4. get_vf_config - allowed 5. set_vf_trust - disallowed 6. set_vf_rate - disallowed 7. get_vf_stat - allowed
8. set_vf_link_state - disallowed
--- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 12 +++++------- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +5 -7
@@ -1594,17 +1594,15 @@ static void esw_disable_vport(struct mlx }/* Public E-Switch API */ -#define ESW_ALLOWED (esw) ((esw) && MLX5_VPORT_MANAGER((esw)->dev)) +#define ESW_ALLOWED (esw) ((esw) && MLX5_ESWITCH_MANAGER((esw)->dev)) +int mlx5_eswitch_enable_sriov (struct mlx5_eswitch *esw,int nvfs,int mode) {int err;int i, enabled_events; -if (!ESW_ALLOWED (esw)) -return 0 ; - -if (!MLX5_ESWITCH_MANAGER (esw->dev) || +if (!ESW_ALLOWED (esw) || !MLX5_CAP_ESW_FLOWTABLE_FDB (esw->dev, ft_support)) {esw_warn (esw->dev,"E-Switch FDB is not supported, aborting ...\n" );return -EOPNOTSUPP ;
@@ -1806,7 +1804,7 @@ int mlx5_eswitch_set_vport_mac(struct mlu64 node_guid;int err =0 ; -if (!ESW_ALLOWED (esw)) +if (!MLX5_CAP_GEN (esw->dev, vport_group_manager))return -EPERM ;if (!LEGAL_VPORT (esw, vport) ||is_multicast_ether_addr (mac))return -EINVAL ;
@@ -1883,7 +1881,7 @@ int mlx5_eswitch_get_vport_config(struct {struct mlx5_vport *evport; -if (!ESW_ALLOWED (esw)) +if (!MLX5_CAP_GEN (esw->dev, vport_group_manager))return -EPERM ;if (!LEGAL_VPORT (esw, vport))return -EINVAL ;
drivers/net/ethernet/mellanox/mlx5/core/vport.c +0 -2
@@ -549,8 +549,6 @@ int mlx5_modify_nic_vport_node_guid(strureturn -EINVAL ;if (!MLX5_CAP_GEN (mdev, vport_group_manager))return -EACCES ; -if (!MLX5_CAP_ESW (mdev, nic_vport_node_guid_modify)) -return -EOPNOTSUPP ; in =kvzalloc (inlen,GFP_KERNEL );if (!in)
Greg Kroah-Hartman
maintainerPATCH 127/324 rds: clean up loopback rds_connections on netns deletion
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sowmini Varadhan <[email protected]>
[ Upstream commit c809195f5523dd4d09403bbb1c9732d548aa0d1e ]
The RDS core module creates rds_connections based on callbacks from rds_loop_transport when sending/receiving packets to local addresses.
These connections will need to be cleaned up when they are created from a netns that is not init_net, and that netns is deleted.
Add the changes aligned with the changes from
commit ebeeb1ad9b8a ("rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management") for rds_loop_transport
--- net/rds/connection.c | 11 +++++++++- net/rds/loop.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ net/rds/loop.h | 2 + 3 files changed, 68 insertions(+), 1 deletion(-)
net/rds/connection.c +10 -1
@@ -659,11 +659,19 @@ static void rds_conn_info(struct socketint rds_conn_init (void ) { +int ret; + + ret =rds_loop_net_init ();/* register pernet callback */ +if (ret) +return ret; + rds_conn_slab =kmem_cache_create ("rds_connection" ,sizeof (struct rds_connection ),0 ,0 ,NULL ); -if (!rds_conn_slab) +if (!rds_conn_slab) { +rds_loop_net_exit ();return -ENOMEM ; + }rds_info_register_func (RDS_INFO_CONNECTIONS , rds_conn_info); rds_info_register_func(RDS_INFO_SEND_MESSAGES,
@@ -676,6 +684,7 @@ int rds_conn_init(void)void rds_conn_exit (void ) { +rds_loop_net_exit ();/* unregister pernet callback */ rds_loop_exit ();WARN_ON (!hlist_empty (rds_conn_hash));
net/rds/loop.c +56 -0
84 lines not on this page · raw message
net/rds/loop.h +2 -0
@@ -5,6 +5,8 @@/* loop.c */ extern struct rds_transport rds_loop_transport; +int rds_loop_net_init (void ); +void rds_loop_net_exit (void );void rds_loop_exit (void );#endif
Greg Kroah-Hartman
maintainerPATCH 128/324 nfp: cast sizeof() to int when comparing with error code
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chengguang Xu <[email protected]>
[ Upstream commit 2d2595719a97c876f35b1e60e5768e58753b268c ]
sizeof() will return unsigned value so in the error check negative error code will be always larger than sizeof().
--- drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c +1 -1
@@ -232,7 +232,7 @@ struct nfp_nffw_info *nfp_nffw_info_open err =nfp_cpp_read (cpp,nfp_resource_cpp_id (state->res),nfp_resource_address (state->res), fwinf,sizeof (*fwinf)); -if (err <sizeof (*fwinf)) +if (err < (int )sizeof (*fwinf)) goto err_release;if (!nffw_res_flg_init_get (fwinf))
Greg Kroah-Hartman
maintainerPATCH 129/324 selftests/x86/sigreturn/64: Fix spurious failures on AMD CPUs
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
[ Upstream commit ec348020566009d3da9b99f07c05814d13969c78 ]
When I wrote the sigreturn test, I didn't realize that AMD's busted IRET behavior was different from Intel's busted IRET behavior:
On AMD CPUs, the CPU leaks the high 32 bits of the kernel stack pointer to certain userspace contexts. Gee, thanks. There's very little the kernel can do about it. Modify the test so it passes.
--- tools/testing/selftests/x86/sigreturn.c | 46 ++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 17 deletions(-)
tools/testing/selftests/x86/sigreturn.c +29 -17
@@ -612,19 +612,38 @@ static int test_valid_sigreturn(int cs_bgreg_t req = requested_regs[i], res = resulting_regs[i];if (i ==REG_TRAPNO || i ==REG_IP )continue ;/* don't care */ -if (i ==REG_SP ) { -printf ("\tSP: %llx -> %llx\n" , (unsigned long long )req, - (unsigned long long )res); +if (i ==REG_SP ) {/* -* In many circumstances, the high 32 bits of rsp -* are zeroed. For example, we could be a real -* 32-bit program, or we could hit any of a number -* of poorly-documented IRET or segmented ESP -* oddities. If this happens, it's okay. +* If we were using a 16-bit stack segment, then +* the kernel is a bit stuck: IRET only restores +* the low 16 bits of ESP/RSP if SS is 16-bit. +* The kernel uses a hack to restore bits 31:16, +* but that hack doesn't help with bits 63:32. +* On Intel CPUs, bits 63:32 end up zeroed, and, on +* AMD CPUs, they leak the high bits of the kernel +* espfix64 stack pointer. There's very little that +* the kernel can do about it. +* +* Similarly, if we are returning to a 32-bit context, +* the CPU will often lose the high 32 bits of RSP. */ -if (res == (req &0xFFFFFFFF )) -continue ;/* OK; not expected to work */ + +if (res == req) +continue ; + +if (cs_bits !=64 && ((res ^ req) &0xFFFFFFFF ) ==0 ) { +printf ("[NOTE]\tSP: %llx -> %llx\n" , + (unsigned long long )req, + (unsigned long long )res); +continue ; + } + +printf ("[FAIL]\tSP mismatch: requested 0x%llx; got 0x%llx\n" , + (unsigned long long )requested_regs[i], + (unsigned long long )resulting_regs[i]); + nerrs++; +continue ; }bool ignore_reg = false;
@@ -663,13 +682,6 @@ static int test_valid_sigreturn(int cs_b }if (requested_regs[i] != resulting_regs[i] && !ignore_reg) { -/* -* SP is particularly interesting here. The -* usual cause of failures is that we hit the -* nasty IRET case of returning to a 16-bit SS, -* in which case bits 16:31 of the *kernel* -* stack pointer persist in ESP. -*/ printf ("[FAIL]\tReg %d mismatch: requested 0x%llx; got 0x%llx\n" , i, (unsigned long long )requested_regs[i], (unsigned long long )resulting_regs[i]);
Greg Kroah-Hartman
maintainerPATCH 130/324 selftests/x86/sigreturn: Do minor cleanups
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
[ Upstream commit e8a445dea219c32727016af14f847d2e8f7ebec8 ]
We have short names for the requested and resulting register values. Use them instead of spelling out the whole register entry for each case.
--- tools/testing/selftests/x86/sigreturn.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
tools/testing/selftests/x86/sigreturn.c +7 -6
@@ -610,6 +610,7 @@ static int test_valid_sigreturn(int cs_b*/ for (int i =0 ; i <NGREG ; i++) {greg_t req = requested_regs[i], res = resulting_regs[i]; +if (i ==REG_TRAPNO || i ==REG_IP )continue ;/* don't care */
@@ -673,18 +674,18 @@ static int test_valid_sigreturn(int cs_b#endif /* Sanity check on the kernel */ -if (i ==REG_CX && requested_regs[i] != resulting_regs[i]) { +if (i ==REG_CX && req != res) {printf ("[FAIL]\tCX (saved SP) mismatch: requested 0x%llx; got 0x%llx\n" , - (unsigned long long )requested_regs[i], - (unsigned long long )resulting_regs[i]); + (unsigned long long )req, + (unsigned long long )res); nerrs++;continue ; } -if (requested_regs[i] != resulting_regs[i] && !ignore_reg) { +if (req != res && !ignore_reg) {printf ("[FAIL]\tReg %d mismatch: requested 0x%llx; got 0x%llx\n" , - i, (unsigned long long )requested_regs[i], - (unsigned long long )resulting_regs[i]); + i, (unsigned long long )req, + (unsigned long long )res); nerrs++; } }
Greg Kroah-Hartman
maintainerPATCH 131/324 ARM: dts: da850: Fix interrups property for gpio
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keerthy <[email protected]>
[ Upstream commit 3eb1b955cd7ed1e621ace856710006c2a8a7f231 ]
The intc #interrupt-cells is equal to 1. Currently gpio node has 2 cells per IRQ which is wrong. Remove the additional cell for each of the interrupts.
--- arch/arm/boot/dts/da850.dtsi | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
arch/arm/boot/dts/da850.dtsi +1 -5
@@ -539,11 +539,7 @@ gpio-controller; #gpio-cells = <2>; reg = <0x226000 0x1000>; - interrupts = <42 IRQ_TYPE_EDGE_BOTH - 43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH - 45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH - 47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH - 49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>; + interrupts = <42 43 44 45 46 47 48 49 50>; ti,ngpio = <144>; ti,davinci-gpio-unbanked = <0>; status = "disabled";
Greg Kroah-Hartman
maintainerPATCH 132/324 arm64: dts: uniphier: fix widget name of headphone for LD11/LD20 boards
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Katsuhiro Suzuki <[email protected]>
[ Upstream commit 86676c4685f774d818f7a6c401c925bbf2a92903 ]
This patch fixes wrong name of headphone widget for receiving events of insert/remove headphone plug from simple-card or audio-graph-card.
If we use wrong widget name then we get warning messages such as "asoc-audio-graph-card sound: ASoC: DAPM unknown pin Headphones" when the plug is inserted or removed from headphone jack.
--- arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts | 2 +- arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +1 -1
@@ -54,7 +54,7 @@ sound { compatible = "audio-graph-card"; label = "UniPhier LD11"; - widgets = "Headphone", "Headphone Jack"; + widgets = "Headphone", "Headphones"; dais = <&i2s_port2 &i2s_port3 &i2s_port4
arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +1 -1
@@ -54,7 +54,7 @@ sound { compatible = "audio-graph-card"; label = "UniPhier LD20"; - widgets = "Headphone", "Headphone Jack"; + widgets = "Headphone", "Headphones"; dais = <&i2s_port2 &i2s_port3 &i2s_port4
Greg Kroah-Hartman
maintainerPATCH 133/324 arm64: Avoid flush_icache_range() in alternatives patching code
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
[ Upstream commit 429388682dc266e7a693f9c27e3aabd341d55343 ]
The implementation of flush_icache_range() includes instruction sequences which are themselves patched at runtime, so it is not safe to call from the patching framework.
This patch reworks the alternatives cache-flushing code so that it rolls its own internal D-cache maintenance using DC CIVAC before invalidating the entire I-cache after all alternatives have been applied at boot. Modules don't cause any issues, since flush_icache_range() is safe to call by the time they are loaded.
--- arch/arm64/include/asm/alternative.h | 7 ++++ arch/arm64/kernel/alternative.c | 51 ++++++++++++++++++++++++++++++----- arch/arm64/kernel/module.c | 5 +-- 3 files changed, 52 insertions(+), 11 deletions(-)
arch/arm64/include/asm/alternative.h +6 -1
@@ -28,7 +28,12 @@ typedef void (*alternative_cb_t)(struct __le32 *origptr, __le32 *updptr, int nr_inst);void __init apply_alternatives_all (void ); -void apply_alternatives (void *start,size_t length); + +#ifdef CONFIG_MODULES +void apply_alternatives_module (void *start,size_t length); +#else +static inline void apply_alternatives_module (void *start,size_t length) { } +#endif #define ALTINSTR_ENTRY (feature,cb) \ " .word 661b - .\n"/* label */ \
arch/arm64/kernel/alternative.c +44 -7
85 lines not on this page · raw message
arch/arm64/kernel/module.c +2 -3
@@ -448,9 +448,8 @@ int module_finalize(const Elf_Ehdr *hdr,const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) { -if (strcmp (".altinstructions" , secstrs + s->sh_name) ==0 ) { -apply_alternatives ((void *)s->sh_addr, s->sh_size); - } +if (strcmp (".altinstructions" , secstrs + s->sh_name) ==0 ) +apply_alternatives_module ((void *)s->sh_addr, s->sh_size);#ifdef CONFIG_ARM64_MODULE_PLTS if (IS_ENABLED (CONFIG_DYNAMIC_FTRACE ) && !strcmp (".text.ftrace_trampoline" , secstrs + s->sh_name))
Greg Kroah-Hartman
maintainerPATCH 134/324 ARM64: dts: meson-axg: fix ethernet stability issue
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerome Brunet <[email protected]>
[ Upstream commit 6d28d577510f1a51f7ffbe830fdbf42077e0058b ]
Like the odroid-c2 and wetek, the s400 uses the RTL8211F and seems to suffer from the kind of stability issue.
Doing an iperf3 download test, we can see a significant number of LPI interrupts on the tx path. After a short while (5 to 15 seconds), the network connection dies. If using rootfs over NFS, the connection may also break during the boot sequence.
We still don't have a real explanation for this problem so let's disable EEE once again.
--- arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +14 -1
@@ -19,9 +19,22 @@ ðmac { status = "okay"; - phy-mode = "rgmii"; pinctrl-0 = <ð_rgmii_y_pins>; pinctrl-names = "default"; + phy-handle = <ð_phy0>; + phy-mode = "rgmii"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + eth_phy0: ethernet-phy@0 { + /* Realtek RTL8211F (0x001cc916) */ + reg = <0>; + eee-broken-1000t; + }; + }; }; &uart_A {
Greg Kroah-Hartman
maintainerPATCH 135/324 ARM64: dts: meson-gxl: fix Mali GPU compatible string
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Blumenstingl <[email protected]>
[ Upstream commit 1c38f4afd5d40234b67635b3c608a4093be04b96 ]
meson-gxl-mali.dtsi is only used on GXL SoCs. Thus it should use the GXL specific compatible string instead of the GXBB one.
For now this is purely cosmetic since the (out-of-tree) lima driver for this GPU currently uses the "arm,mali-450" match instead of the SoC specific one. However, update the .dts to match the documentation since this driver behavior might change in the future.
--- arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi +1 -1
@@ -6,7 +6,7 @@ &apb { mali: gpu@c0000 { - compatible = "amlogic,meson-gxbb-mali", "arm,mali-450"; + compatible = "amlogic,meson-gxl-mali", "arm,mali-450"; reg = <0x0 0xc0000 0x0 0x40000>; interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
Greg Kroah-Hartman
maintainerPATCH 136/324 dmaengine: pl330: report BURST residue granularity
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit e3f329c600033f011a978a8bc4ddb1e2e94c4f4d ]
The reported residue is already calculated in BURST unit granularity, so advertise this capability properly to other devices in the system.
--- drivers/dma/pl330.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/pl330.c +1 -1
@@ -2924,7 +2924,7 @@ pl330_probe(struct amba_device *adev, co pd->src_addr_widths =PL330_DMA_BUSWIDTHS ; pd->dst_addr_widths =PL330_DMA_BUSWIDTHS ; pd->directions =BIT (DMA_DEV_TO_MEM ) |BIT (DMA_MEM_TO_DEV ); - pd->residue_granularity =DMA_RESIDUE_GRANULARITY_SEGMENT ; + pd->residue_granularity =DMA_RESIDUE_GRANULARITY_BURST ; pd->max_burst = ((pl330->quirks &PL330_QUIRK_BROKEN_NO_FLUSHP ) ?1 :PL330_MAX_BURST );
Greg Kroah-Hartman
maintainerPATCH 137/324 dmaengine: k3dma: Off by one in k3_of_dma_simple_xlate()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit c4c2b7644cc9a41f17a8cc8904efe3f66ae4c7ed ]
The d->chans[] array has d->dma_requests elements so the > should be
Quoted 1 line
= here.
--- drivers/dma/k3dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/k3dma.c +1 -1
@@ -794,7 +794,7 @@ static struct dma_chan *k3_of_dma_simplestruct k3_dma_dev *d = ofdma->of_dma_data;unsigned int request = dma_spec->args[0 ]; -if (request > d->dma_requests) +if (request >= d->dma_requests)return NULL ;return dma_get_slave_channel (&(d->chans[request].vc.chan));
Greg Kroah-Hartman
maintainerPATCH 139/324 drm/amd/powerplay: correct vega12 thermal support as true
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Evan Quan <[email protected]>
[ Upstream commit 363a3d3fb7d478d7dd49b8c6294436b8ba5984cc ]
Thermal support is enabled on vega12.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +1 -0
@@ -82,6 +82,7 @@ static void vega12_set_default_registry_ data->registry_data.disallowed_features =0x0 ; data->registry_data.od_state_in_dc_support =0 ; + data->registry_data.thermal_support =1 ; data->registry_data.skip_baco_hardware =0 ; data->registry_data.log_avfs_param =0 ;
Greg Kroah-Hartman
maintainerPATCH 140/324 md/raid10: fix that replacement cannot complete recovery after reassemble
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: BingJing Chang <[email protected]>
[ Upstream commit bda3153998f3eb2cafa4a6311971143628eacdbc ]
During assemble, the spare marked for replacement is not checked. conf->fullsync cannot be updated to be 1. As a result, recovery will treat it as a clean array. All recovering sectors are skipped. Original device is replaced with the not-recovered spare.
mdadm -C /dev/md0 -l10 -n4 -pn2 /dev/loop[0123]
mdadm /dev/md0 -a /dev/loop4
mdadm /dev/md0 --replace /dev/loop0
mdadm -S /dev/md0 # stop array during recovery
mdadm -A /dev/md0 /dev/loop[01234]
After reassemble, you can see recovery go on, but it completes immediately. In fact, recovery is not actually processed.
To solve this problem, we just add the missing logics for replacment spares. (In raid1.c or raid5.c, they have already been checked.)
--- drivers/md/raid10.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/md/raid10.c +7 -0
@@ -3892,6 +3892,13 @@ static int raid10_run(struct mddev *mdde disk->rdev->saved_raid_disk < 0) conf->fullsync =1 ; } + +if (disk->replacement && + !test_bit (In_sync, &disk->replacement->flags) && + disk->replacement->saved_raid_disk <0 ) { + conf->fullsync =1 ; + } + disk->recovery_disabled = mddev->recovery_disabled -1 ; }
Greg Kroah-Hartman
maintainerPATCH 141/324 dev-dax: check_vma: ratelimit dev_info-s
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Moyer <[email protected]>
[ Upstream commit 5a14e91d559aee5bdb0e002e1153fd9c4338a29e ]
This is easily triggered from userspace, so let's ratelimit the messages.
--- drivers/dax/device.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/dax/device.c +8 -4
@@ -189,14 +189,16 @@ static int check_vma(struct dev_dax *dev/* prevent private mappings from being established */ if ((vma->vm_flags &VM_MAYSHARE ) !=VM_MAYSHARE ) { -dev_info (dev,"%s: %s: fail, attempted private mapping\n" , +dev_info_ratelimited (dev, +"%s: %s: fail, attempted private mapping\n" , current->comm, func);return -EINVAL ; } mask = dax_region->align -1 ;if (vma->vm_start & mask || vma->vm_end & mask) { -dev_info (dev,"%s: %s: fail, unaligned vma (%#lx - %#lx, %#lx)\n" , +dev_info_ratelimited (dev, +"%s: %s: fail, unaligned vma (%#lx - %#lx, %#lx)\n" , current->comm, func, vma->vm_start, vma->vm_end, mask);return -EINVAL ;
@@ -204,13 +206,15 @@ static int check_vma(struct dev_dax *devif ((dax_region->pfn_flags & (PFN_DEV |PFN_MAP )) ==PFN_DEV && (vma->vm_flags &VM_DONTCOPY ) ==0 ) { -dev_info (dev,"%s: %s: fail, dax range requires MADV_DONTFORK\n" , +dev_info_ratelimited (dev, +"%s: %s: fail, dax range requires MADV_DONTFORK\n" , current->comm, func);return -EINVAL ; }if (!vma_is_dax (vma)) { -dev_info (dev,"%s: %s: fail, vma is not DAX capable\n" , +dev_info_ratelimited (dev, +"%s: %s: fail, vma is not DAX capable\n" , current->comm, func);return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 142/324 mac80211: disable BHs/preemption in ieee80211_tx_control_port()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Kenzior <[email protected]>
[ Upstream commit e7441c9274a6a5453e06f4c2b8b5f72eca0a3f17 ]
On pre-emption enabled kernels the following print was being seen due to missing local_bh_disable/local_bh_enable calls. mac80211 assumes that pre-emption is disabled in the data path.
BUG: using smp_processor_id() in preemptible [00000000] code: iwd/517
caller is __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
[...]
Call Trace:
dump_stack+0x5c/0x80
check_preemption_disabled.cold.0+0x46/0x51
__ieee80211_subif_start_xmit+0x144/0x210 [mac80211]--- net/mac80211/tx.c | 2 ++ 1 file changed, 2 insertions(+)
net/mac80211/tx.c +2 -0
@@ -4800,7 +4800,9 @@ int ieee80211_tx_control_port(struct wipskb_reset_network_header (skb);skb_reset_mac_header (skb); +local_bh_disable ();__ieee80211_subif_start_xmit (skb, skb->dev, flags); +local_bh_enable ();return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 143/324 nl80211: relax ht operation checks for mesh
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Copeland <[email protected]>
[ Upstream commit 188f60ab8e787fcbb5ac9d64ede23a0070231f09 ]
Commit 9757235f451c, "nl80211: correct checks for NL80211_MESHCONF_HT_OPMODE value") relaxed the range for the HT operation field in meshconf, while also adding checks requiring the non-greenfield and non-ht-sta bits to be set in certain circumstances. The latter bit is actually reserved for mesh BSSes according to Table 9-168 in 802.11-2016, so in fact it should not be set.
wpa_supplicant sets these bits because the mesh and AP code share the same implementation, but authsae does not. As a result, some meshconf updates from authsae which set only the NONHT_MIXED protection bits were being rejected.
In order to avoid breaking userspace by changing the rules again, simply accept the values with or without the bits set, and mask off the reserved bit to match the spec.
While in here, update the 802.11-2012 reference to 802.11-2016.
--- net/wireless/nl80211.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
net/wireless/nl80211.c +3 -16
@@ -6061,7 +6061,7 @@ do { \ nl80211_check_s32);/* * Check HT operation mode based on -* IEEE 802.11 2012 8.4.2.59 HT Operation element. +* IEEE 802.11-2016 9.4.2.57 HT Operation element. */ if (tb[NL80211_MESHCONF_HT_OPMODE ]) { ht_opmode =nla_get_u16 (tb[NL80211_MESHCONF_HT_OPMODE ]);
@@ -6071,22 +6071,9 @@ do { \ IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT))return -EINVAL ; -if ((ht_opmode &IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT ) && - (ht_opmode &IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT )) -return -EINVAL ; +/* NON_HT_STA bit is reserved, but some programs set it */ + ht_opmode &= ~IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT ; -switch (ht_opmode &IEEE80211_HT_OP_MODE_PROTECTION ) { -case IEEE80211_HT_OP_MODE_PROTECTION_NONE : -case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ : -if (ht_opmode &IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT ) -return -EINVAL ; -break ; -case IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER : -case IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED : -if (!(ht_opmode &IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT )) -return -EINVAL ; -break ; - } cfg->ht_opmode = ht_opmode; mask |= (1 << (NL80211_MESHCONF_HT_OPMODE -1 )); }
Greg Kroah-Hartman
maintainerPATCH 144/324 nl80211: check nla_parse_nested() return values
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 95bca62fb723a121954fc7ae5473bb2c1f0d5986 ]
At the very least we should check the return value if nla_parse_nested() is called with a non-NULL policy.
--- net/wireless/nl80211.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
net/wireless/nl80211.c +11 -5
@@ -10703,9 +10703,12 @@ static int nl80211_set_wowlan(struct sk_ rem) {u8 *mask_pat; -nla_parse_nested (pat_tb,MAX_NL80211_PKTPAT , pat, - nl80211_packet_pattern_policy, - info->extack); + err =nla_parse_nested (pat_tb,MAX_NL80211_PKTPAT , pat, + nl80211_packet_pattern_policy, + info->extack); +if (err) + goto error; + err = -EINVAL ;if (!pat_tb[NL80211_PKTPAT_MASK ] || !pat_tb[NL80211_PKTPAT_PATTERN ])
@@ -10954,8 +10957,11 @@ static int nl80211_parse_coalesce_rule(s rem) {u8 *mask_pat; -nla_parse_nested (pat_tb,MAX_NL80211_PKTPAT , pat, - nl80211_packet_pattern_policy,NULL ); + err =nla_parse_nested (pat_tb,MAX_NL80211_PKTPAT , pat, + nl80211_packet_pattern_policy,NULL ); +if (err) +return err; +if (!pat_tb[NL80211_PKTPAT_MASK ] || !pat_tb[NL80211_PKTPAT_PATTERN ])return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 145/324 drm/exynos: gsc: Fix support for NV16/61, YUV420/YVU420 and YUV422 modes
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit dd209ef809080ced903e7747ee3ef640c923a1d2 ]
Fix following issues related to planar YUV pixel format configuration:
- NV16/61 modes were incorrectly programmed as NV12/21,
- YVU420 was programmed as YUV420 on source,
- YVU420 and YUV422 were programmed as YUV420 on output.
--- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 29 ++++++++++++++++++++--------- drivers/gpu/drm/exynos/regs-gsc.h | 1 + 2 files changed, 21 insertions(+), 9 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_gsc.c +20 -9
@@ -532,21 +532,25 @@ static int gsc_src_set_fmt(struct device GSC_IN_CHROMA_ORDER_CRCB);break ;case DRM_FORMAT_NV21 : + cfg |= (GSC_IN_CHROMA_ORDER_CRCB |GSC_IN_YUV420_2P ); +break ;case DRM_FORMAT_NV61 : - cfg |= (GSC_IN_CHROMA_ORDER_CRCB | -GSC_IN_YUV420_2P ); + cfg |= (GSC_IN_CHROMA_ORDER_CRCB |GSC_IN_YUV422_2P );break ;case DRM_FORMAT_YUV422 : cfg |=GSC_IN_YUV422_3P ;break ;case DRM_FORMAT_YUV420 : + cfg |= (GSC_IN_CHROMA_ORDER_CBCR |GSC_IN_YUV420_3P ); +break ;case DRM_FORMAT_YVU420 : - cfg |=GSC_IN_YUV420_3P ; + cfg |= (GSC_IN_CHROMA_ORDER_CRCB |GSC_IN_YUV420_3P );break ;case DRM_FORMAT_NV12 : + cfg |= (GSC_IN_CHROMA_ORDER_CBCR |GSC_IN_YUV420_2P ); +break ;case DRM_FORMAT_NV16 : - cfg |= (GSC_IN_CHROMA_ORDER_CBCR | -GSC_IN_YUV420_2P ); + cfg |= (GSC_IN_CHROMA_ORDER_CBCR |GSC_IN_YUV422_2P );break ;default :dev_err (ippdrv->dev,"invalid target yuv order 0x%x.\n" , fmt);
@@ -806,18 +810,25 @@ static int gsc_dst_set_fmt(struct device GSC_OUT_CHROMA_ORDER_CRCB);break ;case DRM_FORMAT_NV21 : -case DRM_FORMAT_NV61 : cfg |= (GSC_OUT_CHROMA_ORDER_CRCB |GSC_OUT_YUV420_2P );break ; +case DRM_FORMAT_NV61 : + cfg |= (GSC_OUT_CHROMA_ORDER_CRCB |GSC_OUT_YUV422_2P ); +break ;case DRM_FORMAT_YUV422 : + cfg |=GSC_OUT_YUV422_3P ; +break ;case DRM_FORMAT_YUV420 : + cfg |= (GSC_OUT_CHROMA_ORDER_CBCR |GSC_OUT_YUV420_3P ); +break ;case DRM_FORMAT_YVU420 : - cfg |=GSC_OUT_YUV420_3P ; + cfg |= (GSC_OUT_CHROMA_ORDER_CRCB |GSC_OUT_YUV420_3P );break ;case DRM_FORMAT_NV12 : + cfg |= (GSC_OUT_CHROMA_ORDER_CBCR |GSC_OUT_YUV420_2P ); +break ;case DRM_FORMAT_NV16 : - cfg |= (GSC_OUT_CHROMA_ORDER_CBCR | -GSC_OUT_YUV420_2P ); + cfg |= (GSC_OUT_CHROMA_ORDER_CBCR |GSC_OUT_YUV422_2P );break ;default :dev_err (ippdrv->dev,"invalid target yuv order 0x%x.\n" , fmt);
drivers/gpu/drm/exynos/regs-gsc.h +1 -0
@@ -138,6 +138,7 @@#define GSC_OUT_YUV420_3P (3 << 4)#define GSC_OUT_YUV422_1P (4 << 4)#define GSC_OUT_YUV422_2P (5 << 4) +#define GSC_OUT_YUV422_3P (6 << 4)#define GSC_OUT_YUV444 (7 << 4)#define GSC_OUT_TILE_TYPE_MASK (1 << 2)#define GSC_OUT_TILE_C_16x8 (0 << 2)
Greg Kroah-Hartman
maintainerPATCH 146/324 drm/exynos: decon5433: Fix per-plane global alpha for XRGB modes
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit ab337fc274a1957ff0771f19e826c736253f7c39 ]
Set per-plane global alpha to maximum value to get proper blending of XRGB and ARGB planes. This fixes the strange order of overlapping planes.
--- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/exynos/exynos5433_drm_decon.c +2 -2
@@ -351,8 +351,8 @@ static void decon_update_plane(struct exwritel (val, ctx->addr +DECON_VIDOSDxB (win)); } - val =VIDOSD_Wx_ALPHA_R_F (0x0 ) |VIDOSD_Wx_ALPHA_G_F (0x0 ) | -VIDOSD_Wx_ALPHA_B_F (0x0 ); + val =VIDOSD_Wx_ALPHA_R_F (0xff ) |VIDOSD_Wx_ALPHA_G_F (0xff ) | +VIDOSD_Wx_ALPHA_B_F (0xff );writel (val, ctx->addr +DECON_VIDOSDxC (win)); val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |
Greg Kroah-Hartman
maintainerPATCH 147/324 drm/exynos: decon5433: Fix WINCONx reset value
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
[ Upstream commit 7b7aa62c05eac9789c208b946f515983a9255d8d ]
The only bits that should be preserved in decon_win_set_fmt() is WINCONx_ENWIN_F. All other bits depends on the selected pixel formats and are set by the mentioned function.
--- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/exynos/exynos5433_drm_decon.c +1 -1
@@ -260,7 +260,7 @@ static void decon_win_set_pixfmt(structunsigned long val; val =readl (ctx->addr +DECON_WINCONx (win)); - val &= ~WINCONx_BPPMODE_MASK; + val &= WINCONx_ENWIN_F;switch (fb->format->format) {case DRM_FORMAT_XRGB1555 :
Greg Kroah-Hartman
maintainerPATCH 148/324 blk-mq: dont queue more if we get a busy return
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit 1f57f8d442f8017587eeebd8617913bfc3661d3d ]
Some devices have different queue limits depending on the type of IO. A classic case is SATA NCQ, where some commands can queue, but others cannot. If we have NCQ commands inflight and encounter a non-queueable command, the driver returns busy. Currently we attempt to dispatch more from the scheduler, if we were able to queue some commands. But for the case where we ended up stopping due to BUSY, we should not attempt to retrieve more from the scheduler. If we do, we can get into a situation where we attempt to queue a non-queueable command, get BUSY, then successfully retrieve more commands from that scheduler and queue those. This can repeat forever, starving the non-queuable command indefinitely.
Fix this by NOT attempting to pull more commands from the scheduler, if we get a BUSY return. This should also be more optimal in terms of letting requests stay in the scheduler for as long as possible, if we get a BUSY due to the regular out-of-tags condition.
--- block/blk-mq.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
block/blk-mq.c +12 -0
@@ -1174,6 +1174,9 @@ static bool blk_mq_mark_tag_wait(struct#define BLK_MQ_RESOURCE_DELAY 3/* ms units */ +/* +* Returns true if we did some work AND can potentially do more. +*/ bool blk_mq_dispatch_rq_list (struct request_queue *q,struct list_head *list,bool got_budget) {
@@ -1304,8 +1307,17 @@ bool blk_mq_dispatch_rq_list(struct requblk_mq_run_hw_queue (hctx, true); else if (needs_restart && (ret == BLK_STS_RESOURCE)) blk_mq_delay_run_hw_queue(hctx, BLK_MQ_RESOURCE_DELAY); + +return false; } +/* +* If the host/device is unable to accept more work, inform the +* caller of that. +*/ +if (ret ==BLK_STS_RESOURCE || ret ==BLK_STS_DEV_RESOURCE ) +return false; +return (queued + errors) !=0 ; }
Greg Kroah-Hartman
maintainerPATCH 149/324 drbd: Fix drbd_request_prepare() discard handling
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bart Van Assche <[email protected]>
[ Upstream commit fad2d4ef636654e926d374ef038f4cd4286661f6 ]
Fix the test that verifies whether bio_op(bio) represents a discard or write zeroes operation. Compile-tested only.
--- drivers/block/drbd/drbd_req.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/drbd/drbd_req.c +2 -2
@@ -1244,8 +1244,8 @@ drbd_request_prepare(struct drbd_device_drbd_start_io_acct (device, req);/* process discards always from our submitter thread */ -if ((bio_op (bio) &REQ_OP_WRITE_ZEROES ) || - (bio_op (bio) &REQ_OP_DISCARD )) +if (bio_op (bio) ==REQ_OP_WRITE_ZEROES || +bio_op (bio) ==REQ_OP_DISCARD ) goto queue_for_submitter_thread; if (rw == WRITE && req->private_bio && req->i.size
Greg Kroah-Hartman
maintainerPATCH 150/324 bpf, s390: fix potential memleak when later bpf_jit_prog fails
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Borkmann <[email protected]>
[ Upstream commit f605ce5eb26ac934fb8106d75d46a2c875a2bf23 ]
If we would ever fail in the bpf_jit_prog() pass that writes the actual insns to the image after we got header via bpf_jit_binary_alloc() then we also need to make sure to free it through bpf_jit_binary_free() again when bailing out. Given we had prior bpf_jit_prog() passes to initially probe for clobbered registers, program size and to fill in addrs arrray for jump targets, this is more of a theoretical one, but at least make sure this doesn't break with future changes.
--- arch/s390/net/bpf_jit_comp.c | 1 + 1 file changed, 1 insertion(+)
arch/s390/net/bpf_jit_comp.c +1 -0
@@ -1391,6 +1391,7 @@ struct bpf_prog *bpf_int_jit_compile(str goto free_addrs; }if (bpf_jit_prog (&jit, fp)) { +bpf_jit_binary_free (header); fp = orig_fp; goto free_addrs; }
Greg Kroah-Hartman
maintainerPATCH 151/324 PCI: xilinx: Add missing of_node_put()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Mc Guire <[email protected]>
[ Upstream commit 8c3f9bd851a4d3acf0a0f222d4e9e41c0cd1ea8e ]
The call to of_get_next_child() returns a node pointer with refcount incremented thus it must be explicitly decremented here after the last usage.
--- drivers/pci/host/pcie-xilinx.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/host/pcie-xilinx.c +1 -0
@@ -507,6 +507,7 @@ static int xilinx_pcie_init_irq_domain(s port->leg_domain =irq_domain_add_linear (pcie_intc_node,PCI_NUM_INTX , &intx_domain_ops, port); +of_node_put (pcie_intc_node);if (!port->leg_domain) {dev_err (dev,"Failed to get a INTx IRQ domain\n" );return -ENODEV ;
Greg Kroah-Hartman
maintainerPATCH 152/324 PCI: xilinx-nwl: Add missing of_node_put()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Mc Guire <[email protected]>
[ Upstream commit 342639d996f18bc0a4db2f42a84230c0a966dc94 ]
The call to of_get_next_child() returns a node pointer with refcount incremented thus it must be explicitly decremented here after the last usage.
--- drivers/pci/host/pcie-xilinx-nwl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pcie-xilinx-nwl.c +1 -1
@@ -557,7 +557,7 @@ static int nwl_pcie_init_irq_domain(struPCI_NUM_INTX , &legacy_domain_ops, pcie); - +of_node_put (legacy_intc_node);if (!pcie->legacy_irq_domain) {dev_err (dev,"failed to create IRQ domain\n" );return -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 153/324 PCI: faraday: Add missing of_node_put()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Mc Guire <[email protected]>
[ Upstream commit 3dc6ddfedc2818eaaa36842fbb049191e0c5e50f ]
The call to of_get_next_child() returns a node pointer with refcount incremented thus it must be explicitly decremented here in the error path and after the last usage.
--- drivers/pci/host/pci-ftpci100.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/host/pci-ftpci100.c +2 -0
@@ -353,11 +353,13 @@ static int faraday_pci_setup_cascaded_ir irq =of_irq_get (intc,0 );if (irq <=0 ) {dev_err (p->dev,"failed to get parent IRQ\n" ); +of_node_put (intc);return irq ?: -EINVAL ; } p->irqdomain =irq_domain_add_linear (intc,PCI_NUM_INTX , &faraday_pci_irqdomain_ops, p); +of_node_put (intc);if (!p->irqdomain) {dev_err (p->dev,"failed to create Gemini PCI IRQ domain\n" );return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 154/324 bnx2x: Fix receiving tx-timeout in error or recovery state.
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sudarsana Reddy Kalluru <[email protected]>
[ Upstream commit 484c016d9392786ce5c74017c206c706f29f823d ]
Driver performs the internal reload when it receives tx-timeout event from the OS. Internal reload might fail in some scenarios e.g., fatal HW issues. In such cases OS still see the link, which would result in undesirable functionalities such as re-generation of tx-timeouts.
The patch addresses this issue by indicating the link-down to OS when tx-timeout is detected, and keeping the link in down state till the internal reload is successful.
Please consider applying it to 'net' branch.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 ++++++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 6 ++++++ 3 files changed, 13 insertions(+)
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +1 -0
@@ -1533,6 +1533,7 @@ struct bnx2x {struct link_vars link_vars;u32 link_cnt;struct bnx2x_link_report_data last_reported_link; +bool force_link_down;struct mdio_if_info mdio;
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +6 -0
@@ -1261,6 +1261,11 @@ void __bnx2x_link_report(struct bnx2x *b {struct bnx2x_link_report_data cur_data; +if (bp->force_link_down) { + bp->link_vars.link_up =0 ; +return ; + } +/* reread mf_cfg */ if (IS_PF (bp) && !CHIP_IS_E1 (bp))bnx2x_read_mf_cfg (bp);
@@ -2817,6 +2822,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int bp->pending_max =0 ; } + bp->force_link_down = false;if (bp->port.pmf) { rc =bnx2x_initial_phy_init (bp, load_mode);if (rc)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +6 -0
@@ -10279,6 +10279,12 @@ static void bnx2x_sp_rtnl_task(struct wo bp->sp_rtnl_state =0 ;smp_mb (); +/* Immediately indicate link as down */ + bp->link_vars.link_up =0 ; + bp->force_link_down = true; +netif_carrier_off (bp->dev); +BNX2X_ERR ("Indicating link is down due to Tx-timeout\n" ); +bnx2x_nic_unload (bp,UNLOAD_NORMAL , true);/* When ret value shows failure of allocation failure, * the nic is rebooted again. If open still fails, a error
Greg Kroah-Hartman
maintainerPATCH 155/324 fsl/fman: fix parser reporting bad checksum on short frames
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Madalin Bucur <[email protected]>
[ Upstream commit b95f6fbc8e15803a596ca5e5e21008fba29694c6 ]
The FMan hardware parser needs to be configured to remove the short frame padding from the checksum calculation, otherwise short UDP and TCP frames are likely to be marked as having a bad checksum.
--- drivers/net/ethernet/freescale/fman/fman_port.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/freescale/fman/fman_port.c +8 -0
@@ -324,6 +324,10 @@ struct fman_port_qmi_regs {#define HWP_HXS_PHE_REPORT 0x00000800#define HWP_HXS_PCAC_PSTAT 0x00000100#define HWP_HXS_PCAC_PSTOP 0x00000001 +#define HWP_HXS_TCP_OFFSET 0xA +#define HWP_HXS_UDP_OFFSET 0xB +#define HWP_HXS_SH_PAD_REM 0x80000000 +struct fman_port_hwp_regs {struct {u32 ssa;/* Soft Sequence Attachment */
@@ -728,6 +732,10 @@ static void init_hwp(struct fman_port *piowrite32be (0xffffffff , ®s->pmda[i].lcv); } +/* Short packet padding removal from checksum calculation */ +iowrite32be (HWP_HXS_SH_PAD_REM , ®s->pmda[HWP_HXS_TCP_OFFSET ].ssa); +iowrite32be (HWP_HXS_SH_PAD_REM , ®s->pmda[HWP_HXS_UDP_OFFSET ].ssa); +start_port_hwp (port); }
Greg Kroah-Hartman
maintainerPATCH 156/324 dpaa_eth: DPAA SGT needs to be 256B
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Madalin Bucur <[email protected]>
[ Upstream commit 595e802e53f24642a145cf7f3e4ac9afab4c21ec ]
The DPAA HW requires that at least 256 bytes from the start of the first scatter-gather table entry are allocated and accessible. The hardware reads the maximum size the table can have in one access, thus requiring that the allocation and mapping to be done for the maximum size of 256B even if there is a smaller number of entries in the table.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +8 -7
@@ -125,6 +125,9 @@ MODULE_PARM_DESC(tx_timeout, "The Tx tim/* Default alignment for start of data in an Rx FD */ #define DPAA_FD_DATA_ALIGNMENT 16 +/* The DPAA requires 256 bytes reserved and mapped for the SGT */ +#define DPAA_SGT_SIZE 256 +/* Values for the L3R field of the FM Parse Results */ /* L3 Type field: First IP Present IPv4 */
@@ -1617,8 +1620,8 @@ static struct sk_buff *dpaa_cleanup_tx_fif (unlikely (qm_fd_get_format (fd) == qm_fd_sg)) { nr_frags =skb_shinfo (skb)->nr_frags; -dma_unmap_single (dev, addr,qm_fd_get_offset (fd) + -sizeof (struct qm_sg_entry ) * (1 + nr_frags), +dma_unmap_single (dev, addr, +qm_fd_get_offset (fd) +DPAA_SGT_SIZE , dma_dir);/* The sgt buffer has been allocated with netdev_alloc_frag(),
@@ -1903,8 +1906,7 @@ static int skb_to_sg_fd(struct dpaa_privvoid *sgt_buf;/* get a page frag to store the SGTable */ - sz =SKB_DATA_ALIGN (priv->tx_headroom + -sizeof (struct qm_sg_entry ) * (1 + nr_frags)); + sz =SKB_DATA_ALIGN (priv->tx_headroom +DPAA_SGT_SIZE ); sgt_buf =netdev_alloc_frag (sz);if (unlikely (!sgt_buf)) { netdev_err(net_dev, "netdev_alloc_frag() failed for size %d\n",
@@ -1972,9 +1974,8 @@ static int skb_to_sg_fd(struct dpaa_priv skbh = (struct sk_buff **)buffer_start; *skbh = skb; - addr =dma_map_single (dev, buffer_start, priv->tx_headroom + -sizeof (struct qm_sg_entry ) * (1 + nr_frags), - dma_dir); + addr =dma_map_single (dev, buffer_start, + priv->tx_headroom +DPAA_SGT_SIZE , dma_dir);if (unlikely (dma_mapping_error (dev, addr))) {dev_err (dev,"DMA mapping failed" ); err = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 157/324 s390/qeth: consistently re-enable device features
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julian Wiedmann <[email protected]>
[ Upstream commit d025da9eb1e48d3e5f2a2ff13ac5ac536ba4be43 ]
commit e830baa9c3f0 ("qeth: restore device features after recovery") and commit ce3443564145 ("s390/qeth: rely on kernel for feature recovery") made sure that the HW functions for device features get re-programmed after recovery.
But we missed that the same handling is also required when a card is first set offline (destroying all HW context), and then online again. Fix this by moving the re-enable action out of the recovery-only path.
--- drivers/s390/net/qeth_core.h | 2 +- drivers/s390/net/qeth_core_main.c | 23 +++++++++++------------ drivers/s390/net/qeth_l2_main.c | 5 ++--- drivers/s390/net/qeth_l3_main.c | 3 ++- 4 files changed, 16 insertions(+), 17 deletions(-)
drivers/s390/net/qeth_core.h +1 -1
@@ -1003,7 +1003,7 @@ struct qeth_cmd_buffer *qeth_get_setassp __u16, __u16, enum qeth_prot_versions);int qeth_set_features (struct net_device *,netdev_features_t ); -void qeth_recover_features (struct net_device *dev); +void qeth_enable_hw_features (struct net_device *dev);netdev_features_t qeth_fix_features (struct net_device *,netdev_features_t ); netdev_features_t qeth_features_check(struct sk_buff *skb, struct net_device *dev,
drivers/s390/net/qeth_core_main.c +11 -12
@@ -6432,28 +6432,27 @@ static int qeth_set_ipa_tso(struct qeth_#define QETH_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | NETIF_F_TSO)/** -* qeth_recover_features() - Restore device features after recovery -* @dev: the recovering net_device -* -* Caller must hold rtnl lock. +* qeth_enable_hw_features() - (Re-)Enable HW functions for device features +* @dev: a net_device */ -void qeth_recover_features (struct net_device *dev) +void qeth_enable_hw_features (struct net_device *dev) { -netdev_features_t features = dev->features;struct qeth_card *card = dev->ml_priv; +netdev_features_t features; +rtnl_lock (); + features = dev->features;/* force-off any feature that needs an IPA sequence. * netdev_update_features() will restart them. */ dev->features &= ~QETH_HW_FEATURES ;netdev_update_features (dev); - -if (features == dev->features) -return ; -dev_warn (&card->gdev->dev, -"Device recovery failed to restore all offload features\n" ); +if (features != dev->features) +dev_warn (&card->gdev->dev, +"Device recovery failed to restore all offload features\n" ); +rtnl_unlock (); } -EXPORT_SYMBOL_GPL (qeth_recover_features); +EXPORT_SYMBOL_GPL (qeth_enable_hw_features);int qeth_set_features (struct net_device *dev,netdev_features_t features) {
drivers/s390/net/qeth_l2_main.c +2 -3
@@ -1130,6 +1130,8 @@ static int __qeth_l2_set_online(struct cnetif_carrier_off (card->dev);qeth_set_allowed_threads (card,0xffffffff ,0 ); + +qeth_enable_hw_features (card->dev);if (recover_flag ==CARD_STATE_RECOVER ) {if (recovery_mode && card->info.type !=QETH_CARD_TYPE_OSN ) {
@@ -1141,9 +1143,6 @@ static int __qeth_l2_set_online(struct c }/* this also sets saved unicast addresses */ qeth_l2_set_rx_mode (card->dev); -rtnl_lock (); -qeth_recover_features (card->dev); -rtnl_unlock (); }/* let user_space know that device is online */ kobject_uevent (&gdev->dev.kobj,KOBJ_CHANGE );
drivers/s390/net/qeth_l3_main.c +2 -1
@@ -2792,6 +2792,8 @@ static int __qeth_l3_set_online(struct cnetif_carrier_on (card->dev); else netif_carrier_off(card->dev); + +qeth_enable_hw_features (card->dev);if (recover_flag ==CARD_STATE_RECOVER ) {rtnl_lock ();if (recovery_mode)
@@ -2799,7 +2801,6 @@ static int __qeth_l3_set_online(struct celse dev_open (card->dev);qeth_l3_set_rx_mode (card->dev); -qeth_recover_features (card->dev);rtnl_unlock (); }qeth_trace_features (card);
Greg Kroah-Hartman
maintainerPATCH 158/324 acpi/nfit: fix cmd_rc for acpi_nfit_ctl to always return a value
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jiang <[email protected]>
[ Upstream commit c1985cefd844e26bd19673a6df8d8f0b1918c2db ]
cmd_rc is passed in by reference to the acpi_nfit_ctl() function and the caller expects a value returned. However, when the package is pass through via the ND_CMD_CALL command, cmd_rc is not touched. Make sure cmd_rc is always set.
--- drivers/acpi/nfit/core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/acpi/nfit/core.c +2 -0
@@ -408,6 +408,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_descconst guid_t *guid;int rc, i; + *cmd_rc = -EINVAL ; func = cmd;if (cmd ==ND_CMD_CALL ) { call_pkg = buf;
@@ -518,6 +519,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_desc* If we return an error (like elsewhere) then caller wouldn't * be able to rely upon data returned to make calculation. */ + *cmd_rc =0 ;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 159/324 tools/testing/nvdimm: advertise a write cache for nfit_test
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vishal Verma <[email protected]>
[ Upstream commit 1273c253c32b9a073a4d8921ed079177ccc7c8af ]
Commit 546eb0317cfa "libnvdimm, pmem: Do not flush power-fail protected CPU caches" fixed the write_cache detection to correctly show the lack of a write cache based on the platform capabilities described in the ACPI NFIT. The nfit_test unit tests expected a write cache to be present, so change the nfit test namespaces to only advertise a persistence domain limited to the memory controller. This allows the kernel to show a write_cache attribute, and the test behaviour remains unchanged.
--- tools/testing/nvdimm/test/nfit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/testing/nvdimm/test/nfit.c +1 -2
@@ -1989,8 +1989,7 @@ static void nfit_test0_setup(struct nfit pcap->header.type =ACPI_NFIT_TYPE_CAPABILITIES ; pcap->header.length =sizeof (*pcap); pcap->highest_capability =1 ; - pcap->capabilities =ACPI_NFIT_CAPABILITY_CACHE_FLUSH | -ACPI_NFIT_CAPABILITY_MEM_FLUSH ; + pcap->capabilities =ACPI_NFIT_CAPABILITY_MEM_FLUSH ; offset += pcap->header.length;if (t->setup_hotplug) {
Greg Kroah-Hartman
maintainerPATCH 160/324 openrisc: entry: Fix delay slot exception detection
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stafford Horne <[email protected]>
[ Upstream commit ae15a41a641449f536578b0d9ec0e4ade130deb5 ]
Originally in patch e6d20c55a4 ("openrisc: entry: Fix delay slot detection") I fixed delay slot detection, but only for QEMU. We missed that hardware delay slot detection using delay slot exception flag (DSX) was still broken. This was because QEMU set the DSX flag in both pre-exception supervision register (ESR) and supervision register (SR) register, but on real hardware the DSX flag is only set on the SR register during exceptions.
Fix this by carrying the DSX flag into the SR register during exception. We also update the DSX flag read locations to read the value from the SR register not the pt_regs SR register which represents ESR. The ESR should never have the DSX flag set.
In the process I updated/removed a few comments to match the current state. Including removing a comment saying that the DSX detection logic was inefficient and needed to be rewritten.
I have tested this on QEMU with a patch ensuring it matches the hardware specification.
--- arch/openrisc/kernel/entry.S | 8 +------- arch/openrisc/kernel/head.S | 9 ++++++--- arch/openrisc/kernel/traps.c | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-)
arch/openrisc/kernel/entry.S +1 -7
@@ -277,12 +277,6 @@ EXCEPTION_ENTRY(_data_page_fault_handler l.addi r3,r1,0 // pt_regs /* r4 set be EXCEPTION_HANDLE */ // effective address of fault - /* - * __PHX__: TODO - * - * all this can be written much simpler. look at - * DTLB miss handler in the CONFIG_GUARD_PROTECTED_CORE part - */ #ifdef CONFIG_OPENRISC_NO_SPR_SR_DSX l.lwz r6,PT_PC(r3) // address of an offending insn l.lwz r6,0(r6) // instruction that caused pf
@@ -314,7 +308,7 @@ EXCEPTION_ENTRY(_data_page_fault_handler #else - l.lwz r6,PT_SR(r3) // SR + l.mfspr r6,r0,SPR_SR // SR l.andi r6,r6,SPR_SR_DSX // check for delay slot exception l.sfne r6,r0 // exception happened in delay slot l.bnf 7f
arch/openrisc/kernel/head.S +6 -3
@@ -210,8 +210,7 @@ * r4 - EEAR exception EA * r10 - current pointing to current_thread_info struct * r12 - syscall 0, since we didn't come from syscall - * r13 - temp it actually contains new SR, not needed anymore - * r31 - handler address of the handler we'll jump to + * r30 - handler address of the handler we'll jump to * * handler has to save remaining registers to the exception * ksp frame *before* tainting them!
@@ -244,6 +243,7 @@ /* r1 is KSP, r30 is __pa(KSP) */ ;\ tophys (r30,r1) ;\ l.sw PT_GPR12(r30),r12 ;\ + /* r4 use for tmp before EA */ ;\ l.mfspr r12,r0,SPR_EPCR_BASE ;\ l.sw PT_PC(r30),r12 ;\ l.mfspr r12,r0,SPR_ESR_BASE ;\
@@ -263,7 +263,10 @@ /* r12 == 1 if we come from syscall */ ;\ CLEAR_GPR(r12) ;\ /* ----- turn on MMU ----- */ ;\ - l.ori r30,r0,(EXCEPTION_SR) ;\ + /* Carry DSX into exception SR */ ;\ + l.mfspr r30,r0,SPR_SR ;\ + l.andi r30,r30,SPR_SR_DSX ;\ + l.ori r30,r30,(EXCEPTION_SR) ;\ l.mtspr r0,r30,SPR_ESR_BASE ;\ /* r30: EA address of handler */ ;\ LOAD_SYMBOL_2_GPR(r30,handler) ;\
arch/openrisc/kernel/traps.c +1 -1
@@ -317,7 +317,7 @@ static inline int in_delay_slot(struct p return 0; }#else -return regs->sr &SPR_SR_DSX ; +return mfspr (SPR_SR ) &SPR_SR_DSX ;#endif }
Greg Kroah-Hartman
maintainerPATCH 161/324 crypto: arm/speck - fix building in Thumb2 mode
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Biggers <[email protected]>
[ Upstream commit a068b94d74ddb7776ca707b6d39d1ac0d2d057e6 ]
Building the kernel with CONFIG_THUMB2_KERNEL=y and CONFIG_CRYPTO_SPECK_NEON set fails with the following errors:
arch/arm/crypto/speck-neon-core.S: Assembler messages:
arch/arm/crypto/speck-neon-core.S:419: Error: r13 not allowed here -- `bic sp,#0xf'
arch/arm/crypto/speck-neon-core.S:423: Error: r13 not allowed here -- `bic sp,#0xf'
arch/arm/crypto/speck-neon-core.S:427: Error: r13 not allowed here -- `bic sp,#0xf'
arch/arm/crypto/speck-neon-core.S:431: Error: r13 not allowed here -- `bic sp,#0xf'The problem is that the 'bic' instruction can't operate on the 'sp' register in Thumb2 mode. Fix it by using a temporary register. This isn't in the main loop, so the performance difference is negligible. This also matches what aes-neonbs-core.S does.
--- arch/arm/crypto/speck-neon-core.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/crypto/speck-neon-core.S +4 -2
@@ -272,9 +272,11 @@ * Allocate stack space to store 128 bytes worth of tweaks. For * performance, this space is aligned to a 16-byte boundary so that we * can use the load/store instructions that declare 16-byte alignment. + * For Thumb2 compatibility, don't do the 'bic' directly on 'sp'. */ - sub sp, #128 - bic sp, #0xf + sub r12, sp, #128 + bic r12, #0xf + mov sp, r12 .if \n == 64 // Load first tweak
Greg Kroah-Hartman
maintainerPATCH 163/324 objtool: Support GCC 8 -fnoreorder-functions
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
[ Upstream commit 08b393d01c88aff27347ed2b1b354eb4db2f1532 ]
Since the following commit:
cd77849a69cf ("objtool: Fix GCC 8 cold subfunction detection for aliased functions")
... if the kernel is built with EXTRA_CFLAGS='-fno-reorder-functions', objtool can get stuck in an infinite loop.
That flag causes the new GCC 8 cold subfunctions to be placed in .text instead of .text.unlikely. But it also has an unfortunate quirk: in the symbol table, the subfunction (e.g., nmi_panic.cold.7) is nested inside the parent (nmi_panic).
That function overlap confuses objtool, and causes it to get into an infinite loop in next_insn_same_func(). Here's Allan's description of the loop:
"Objtool iterates through the instructions in nmi_panic using next_insn_same_func. Once it reaches the end of nmi_panic at 0x534 it jumps to 0x528 as that's the start of nmi_panic.cold.7. However, since the instructions starting at 0x528 are still associated with nmi_panic objtool will get stuck in a loop, continually jumping back to 0x528 after reaching 0x534."
Fix it by shortening the length of the parent function so that the functions no longer overlap.
--- tools/objtool/elf.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-)
tools/objtool/elf.c +26 -11
@@ -302,19 +302,34 @@ static int read_symbols(struct elf *elf)continue ; sym->pfunc = sym->cfunc = sym; coldstr =strstr (sym->name,".cold." ); -if (coldstr) { - coldstr[0 ] ='\0' ; - pfunc =find_symbol_by_name (elf, sym->name); - coldstr[0 ] ='.' ; +if (!coldstr) +continue ; + + coldstr[0 ] ='\0' ; + pfunc =find_symbol_by_name (elf, sym->name); + coldstr[0 ] ='.' ; + +if (!pfunc) { +WARN ("%s(): can't find parent function" , + sym->name); + goto err; + } -if (!pfunc) { -WARN ("%s(): can't find parent function" , - sym->name); - goto err; - } + sym->pfunc = pfunc; + pfunc->cfunc = sym; - sym->pfunc = pfunc; - pfunc->cfunc = sym; +/* +* Unfortunately, -fnoreorder-functions puts the child +* inside the parent. Remove the overlap so we can +* have sane assumptions. +* +* Note that pfunc->len now no longer matches +* pfunc->sym.st_size. +*/ +if (sym->sec == pfunc->sec && + sym->offset >= pfunc->offset && + sym->offset + sym->len == pfunc->offset + pfunc->len) { + pfunc->len -= sym->len; } } }
Greg Kroah-Hartman
maintainerPATCH 164/324 ipvlan: call dev_change_flags when ipvlan mode is reset
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hangbin Liu <[email protected]>
[ Upstream commit 5dc2d3996a8b221c20dd0900bdad45031a572530 ]
After we change the ipvlan mode from l3 to l2, or vice versa, we only reset IFF_NOARP flag, but don't flush the ARP table cache, which will cause eth->h_dest to be equal to eth->h_source in ipvlan_xmit_mode_l2(). Then the message will not come out of host.
Here is the reproducer on local host:
ip link set eth1 up
ip addr add 192.168.1.1/24 dev eth1
ip link add link eth1 ipvlan1 type ipvlan mode l3
ip netns add net1
ip link set ipvlan1 netns net1
ip netns exec net1 ip link set ipvlan1 up
ip netns exec net1 ip addr add 192.168.2.1/24 dev ipvlan1
ip route add 192.168.2.0/24 via 192.168.1.2
ping 192.168.2.2 -c 2
ip netns exec net1 ip link set ipvlan1 type ipvlan mode l2 ping 192.168.2.2 -c 2
Add the same configuration on remote host. After we set the mode to l2, we could find that the src/dst MAC addresses are the same on eth1:
21:26:06.648565 00:b7:13:ad:d3:05 > 00:b7:13:ad:d3:05, ethertype IPv4 (0x0800), length 98: (tos 0x0, ttl 64, id 58356, offset 0, flags [DF], proto ICMP (1), length 84)
192.168.2.1 > 192.168.2.2: ICMP echo request, id 22686, seq 1, length 64
Fix this by calling dev_change_flags(), which will call netdevice notifier with flag change info.
v2:
a) As pointed out by Wang Cong, check return value for dev_change_flags() when change dev flags.
b) As suggested by Stefano and Sabrina, move flags setting before l3mdev_ops. So we don't need to redo ipvlan_{, un}register_nf_hook() again in err path.
--- drivers/net/ipvlan/ipvlan_main.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)
drivers/net/ipvlan/ipvlan_main.c +28 -8
@@ -75,10 +75,23 @@ static int ipvlan_set_port_mode(struct i {struct ipvl_dev *ipvlan;struct net_device *mdev = port->dev; -int err =0 ; +unsigned int flags; +int err;ASSERT_RTNL ();if (port->mode != nval) { +list_for_each_entry (ipvlan, &port->ipvlans, pnode) { + flags = ipvlan->dev->flags; +if (nval ==IPVLAN_MODE_L3 || nval ==IPVLAN_MODE_L3S ) { + err =dev_change_flags (ipvlan->dev, + flags |IFF_NOARP ); + }else { + err =dev_change_flags (ipvlan->dev, + flags & ~IFF_NOARP ); + } +if (unlikely (err)) + goto fail; + }if (nval ==IPVLAN_MODE_L3S ) {/* New mode is L3S */ err =ipvlan_register_nf_hook (read_pnet (&port->pnet));
@@ -86,21 +99,28 @@ static int ipvlan_set_port_mode(struct i mdev->l3mdev_ops = &ipvl_l3mdev_ops; mdev->priv_flags |=IFF_L3MDEV_MASTER ; }else -return err; + goto fail; }else if (port->mode ==IPVLAN_MODE_L3S ) {/* Old mode was L3S */ mdev->priv_flags &= ~IFF_L3MDEV_MASTER ;ipvlan_unregister_nf_hook (read_pnet (&port->pnet)); mdev->l3mdev_ops =NULL ; } -list_for_each_entry (ipvlan, &port->ipvlans, pnode) { -if (nval ==IPVLAN_MODE_L3 || nval ==IPVLAN_MODE_L3S ) - ipvlan->dev->flags |=IFF_NOARP ; -else - ipvlan->dev->flags &= ~IFF_NOARP ; - } port->mode = nval; } +return 0 ; + +fail: +/* Undo the flags changes that have been done so far. */ +list_for_each_entry_continue_reverse (ipvlan, &port->ipvlans, pnode) { + flags = ipvlan->dev->flags; +if (port->mode ==IPVLAN_MODE_L3 || + port->mode ==IPVLAN_MODE_L3S ) +dev_change_flags (ipvlan->dev, flags |IFF_NOARP ); +else +dev_change_flags (ipvlan->dev, flags & ~IFF_NOARP ); + } +return err; }
Greg Kroah-Hartman
maintainerPATCH 165/324 usb: xhci: dbc: Dont decrement runtime PM counter if DBC is not started
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai-Heng Feng <[email protected]>
[ Upstream commit 74cb319bd97dd62881f97ea5a3228f7c2546bf56 ]
pm_runtime_put_sync() gets called everytime in xhci_dbc_stop().
If dbc is not started, this makes the runtime PM counter incorrectly becomes 0, and calls autosuspend function. Then we'll keep seeing this:
[54664.762220] xhci_hcd 0000:00:14.0: Root hub is not suspended
So only calls pm_runtime_put_sync() when dbc was started.
--- drivers/usb/host/xhci-dbgcap.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-dbgcap.c +8 -4
@@ -507,16 +507,18 @@ static int xhci_do_dbc_start(struct xhcireturn 0 ; } -static void xhci_do_dbc_stop (struct xhci_hcd *xhci) +static int xhci_do_dbc_stop (struct xhci_hcd *xhci) {struct xhci_dbc *dbc = xhci->dbc;if (dbc->state ==DS_DISABLED ) -return ; +return -1 ;writel (0 , &dbc->regs->control);xhci_dbc_mem_cleanup (xhci); dbc->state =DS_DISABLED ; + +return 0 ; }static int xhci_dbc_start (struct xhci_hcd *xhci)
@@ -543,6 +545,7 @@ static int xhci_dbc_start(struct xhci_hcstatic void xhci_dbc_stop (struct xhci_hcd *xhci) { +int ret;unsigned long flags;struct xhci_dbc *dbc = xhci->dbc;struct dbc_port *port = &dbc->port;
@@ -555,10 +558,11 @@ static void xhci_dbc_stop(struct xhci_hcxhci_dbc_tty_unregister_device (xhci);spin_lock_irqsave (&dbc->lock, flags); -xhci_do_dbc_stop (xhci); + ret =xhci_do_dbc_stop (xhci);spin_unlock_irqrestore (&dbc->lock, flags); -pm_runtime_put_sync (xhci_to_hcd (xhci)->self.controller); +if (!ret) +pm_runtime_put_sync (xhci_to_hcd (xhci)->self.controller); } static void
Greg Kroah-Hartman
maintainerPATCH 166/324 drm/amdgpu: fix swapped emit_ib_size in vce3
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit 0859df22ab7cfb3ad2df2caed76cadce6ac33a80 ]
The phys and vm versions had the values swapped.
--- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +2 -2
@@ -899,7 +899,7 @@ static const struct amdgpu_ring_funcs vc .emit_frame_size =4 +/* vce_v3_0_emit_pipeline_sync */ 6, /* amdgpu_vce_ring_emit_fence x1 no user fence */ - .emit_ib_size = 5, /* vce_v3_0_ring_emit_ib */ + .emit_ib_size = 4, /* amdgpu_vce_ring_emit_ib */ .emit_ib = amdgpu_vce_ring_emit_ib, .emit_fence = amdgpu_vce_ring_emit_fence, .test_ring = amdgpu_vce_ring_test_ring,
@@ -923,7 +923,7 @@ static const struct amdgpu_ring_funcs vc6 +/* vce_v3_0_emit_vm_flush */ 4 +/* vce_v3_0_emit_pipeline_sync */ 6 + 6, /* amdgpu_vce_ring_emit_fence x2 vm fence */ - .emit_ib_size = 4, /* amdgpu_vce_ring_emit_ib */ + .emit_ib_size = 5, /* vce_v3_0_ring_emit_ib */ .emit_ib = vce_v3_0_ring_emit_ib, .emit_vm_flush = vce_v3_0_emit_vm_flush, .emit_pipeline_sync = vce_v3_0_emit_pipeline_sync,
Greg Kroah-Hartman
maintainerPATCH 167/324 nds32: Fix the dts pointer is not passed correctly issue.
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greentime Hu <[email protected]>
[ Upstream commit 6897e6ecb3167598cb45e1a1424dd4d5e3778837 ]
We found that the original implementation will only use the built-in dtb pointer instead of the pointer pass from bootloader. This bug is fixed by this patch.
--- arch/nds32/kernel/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/nds32/kernel/setup.c +2 -1
@@ -278,7 +278,8 @@ static void __init setup_memory(void)void __init setup_arch (char **cmdline_p) { -early_init_devtree ( __dtb_start); +early_init_devtree (__atags_pointer ? \ +phys_to_virt (__atags_pointer) : __dtb_start);setup_cpuinfo ();
Greg Kroah-Hartman
maintainerPATCH 168/324 sched/nohz: Skip remote tick on idle task entirely
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Frederic Weisbecker <[email protected]>
[ Upstream commit d9c0ffcabd6aae7ff1e34e8078354c13bb9f1183 ]
Some people have reported that the warning in sched_tick_remote() occasionally triggers, especially in favour of some RCU-Torture pressure:
WARNING: CPU: 11 PID: 906 at kernel/sched/core.c:3138 sched_tick_remote+0xb6/0xc0 Modules linked in: CPU: 11 PID: 906 Comm: kworker/u32:3 Not tainted 4.18.0-rc2+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 Workqueue: events_unbound sched_tick_remote RIP: 0010:sched_tick_remote+0xb6/0xc0 Code: e8 0f 06 b8 00 c6 03 00 fb eb 9d 8b 43 04 85 c0 75 8d 48 8b 83 e0 0a 00 00 48 85 c0 75 81 eb 88 48 89 df e8 bc fe ff ff eb aa <0f> 0b eb +c5 66 0f 1f 44 00 00 bf 17 00 00 00 e8 b6 2e fe ff 0f b6 Call Trace: process_one_work+0x1df/0x3b0 worker_thread+0x44/0x3d0 kthread+0xf3/0x130 ? set_worker_desc+0xb0/0xb0 ? kthread_create_worker_on_cpu+0x70/0x70 ret_from_fork+0x35/0x40
This happens when the remote tick applies on an idle task. Usually the idle_cpu() check avoids that, but it is performed before we lock the runqueue and it is therefore racy. It was intended to be that way in order to prevent from useless runqueue locks since idle task tick callback is a no-op.
Now if the racy check slips out of our hands and we end up remotely ticking an idle task, the empty task_tick_idle() is harmless. Still it won't pass the WARN_ON_ONCE() test that ensures rq_clock_task() is not too far from curr->se.exec_start because update_curr_idle() doesn't update the exec_start value like other scheduler policies. Hence the reported false positive.
So let's have another check, while the rq is locked, to make sure we don't remote tick on an idle task. The lockless idle_cpu() still applies to avoid unecessary rq lock contention.
--- kernel/sched/core.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-)
kernel/sched/core.c +23 -17
@@ -3127,7 +3127,9 @@ static void sched_tick_remote(struct wor struct tick_work *twork = container_of(dwork, struct tick_work, work);int cpu = twork->cpu;struct rq *rq =cpu_rq (cpu); +struct task_struct *curr;struct rq_flags rf; +u64 delta;/* * Handle the tick only if it appears the remote CPU is running in full
@@ -3136,24 +3138,28 @@ static void sched_tick_remote(struct wor* statistics and checks timeslices in a time-independent way, regardless * of when exactly it is running. */ -if (!idle_cpu (cpu) &&tick_nohz_tick_stopped_cpu (cpu)) { -struct task_struct *curr; -u64 delta; - -rq_lock_irq (rq, &rf); -update_rq_clock (rq); - curr = rq->curr; - delta =rq_clock_task (rq) - curr->se.exec_start; - -/* -* Make sure the next tick runs within a reasonable -* amount of time. -*/ -WARN_ON_ONCE (delta > (u64 )NSEC_PER_SEC *3 ); - curr->sched_class->task_tick (rq, curr,0 ); -rq_unlock_irq (rq, &rf); - } +if (idle_cpu (cpu) || !tick_nohz_tick_stopped_cpu (cpu)) + goto out_requeue; +rq_lock_irq (rq, &rf); + curr = rq->curr; +if (is_idle_task (curr)) + goto out_unlock; + +update_rq_clock (rq); + delta =rq_clock_task (rq) - curr->se.exec_start; + +/* +* Make sure the next tick runs within a reasonable +* amount of time. +*/ +WARN_ON_ONCE (delta > (u64 )NSEC_PER_SEC *3 ); + curr->sched_class->task_tick (rq, curr,0 ); + +out_unlock: +rq_unlock_irq (rq, &rf); + +out_requeue:/* * Run the remote tick once per second (1Hz). This arbitrary * frequency is large enough to avoid overload but short enough
Greg Kroah-Hartman
maintainerPATCH 169/324 sched/fair: Fix bandwidth timer clock drift condition
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xunlei Pang <[email protected]>
[ Upstream commit 512ac999d2755d2b7109e996a76b6fb8b888631d ]
I noticed that cgroup task groups constantly get throttled even if they have low CPU usage, this causes some jitters on the response time to some of our business containers when enabling CPU quotas.
It's very simple to reproduce:
mkdir /sys/fs/cgroup/cpu/test
cd /sys/fs/cgroup/cpu/test
echo 100000 > cpu.cfs_quota_us
echo $$ > tasks
then repeat:
cat cpu.stat | grep nr_throttled # nr_throttled will increase steadily
After some analysis, we found that cfs_rq::runtime_remaining will be cleared by expire_cfs_rq_runtime() due to two equal but stale "cfs_{b|q}->runtime_expires" after period timer is re-armed.
The current condition to judge clock drift in expire_cfs_rq_runtime() is wrong, the two runtime_expires are actually the same when clock drift happens, so this condtion can never hit. The orginal design was correctly done by this commit:
a9cf55b28610 ("sched: Expire invalid runtime")
... but was changed to be the current implementation due to its locking bug.
This patch introduces another way, it adds a new field in both structures cfs_rq and cfs_bandwidth to record the expiration update sequence, and uses them to figure out if clock drift happens (true if they are equal).
--- kernel/sched/fair.c | 14 ++++++++------ kernel/sched/sched.h | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-)
kernel/sched/fair.c +8 -6
@@ -4549,6 +4549,7 @@ void __refill_cfs_bandwidth_runtime(stru now =sched_clock_cpu (smp_processor_id ()); cfs_b->runtime = cfs_b->quota; cfs_b->runtime_expires = now +ktime_to_ns (cfs_b->period); + cfs_b->expires_seq++; }static inline struct cfs_bandwidth *tg_cfs_bandwidth (struct task_group *tg)
@@ -4571,6 +4572,7 @@ static int assign_cfs_rq_runtime(structstruct task_group *tg = cfs_rq->tg;struct cfs_bandwidth *cfs_b =tg_cfs_bandwidth (tg);u64 amount =0 , min_amount, expires; +int expires_seq;/* note: this is a positive sum as runtime_remaining <= 0 */ min_amount =sched_cfs_bandwidth_slice () - cfs_rq->runtime_remaining;
@@ -4587,6 +4589,7 @@ static int assign_cfs_rq_runtime(struct cfs_b->idle =0 ; } } + expires_seq = cfs_b->expires_seq; expires = cfs_b->runtime_expires;raw_spin_unlock (&cfs_b->lock);
@@ -4596,8 +4599,10 @@ static int assign_cfs_rq_runtime(struct* spread between our sched_clock and the one on which runtime was * issued. */ -if ((s64)(expires - cfs_rq->runtime_expires) >0 ) +if (cfs_rq->expires_seq != expires_seq) { + cfs_rq->expires_seq = expires_seq; cfs_rq->runtime_expires = expires; + }return cfs_rq->runtime_remaining >0 ; }
@@ -4623,12 +4628,9 @@ static void expire_cfs_rq_runtime(struct* has not truly expired. * * Fortunately we can check determine whether this the case by checking -* whether the global deadline has advanced. It is valid to compare -* cfs_b->runtime_expires without any locks since we only care about -* exact equality, so a partial write will still work. +* whether the global deadline(cfs_b->expires_seq) has advanced. */ - -if (cfs_rq->runtime_expires != cfs_b->runtime_expires) { +if (cfs_rq->expires_seq == cfs_b->expires_seq) {/* extend local deadline, drift is bounded above by 2 ticks */ cfs_rq->runtime_expires +=TICK_NSEC ; }else {
kernel/sched/sched.h +4 -2
@@ -334,9 +334,10 @@ struct cfs_bandwidth {u64 runtime;s64 hierarchical_quota;u64 runtime_expires; +int expires_seq; -int idle; -int period_active; +short idle; +short period_active;struct hrtimer period_timer;struct hrtimer slack_timer;struct list_head throttled_cfs_rq;
@@ -551,6 +552,7 @@ struct cfs_rq {#ifdef CONFIG_CFS_BANDWIDTH int runtime_enabled; +int expires_seq;u64 runtime_expires;s64 runtime_remaining;
Greg Kroah-Hartman
maintainerPATCH 170/324 sched/util_est: Fix util_est_dequeue() for throttled cfs_rq
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Guittot <[email protected]>
[ Upstream commit 3482d98bbc730758b63a5d1cf41d05ea17481412 ]
When a cfs_rq is throttled, parent cfs_rq->nr_running is decreased and everything happens at cfs_rq level. Currently util_est stays unchanged in such case and it keeps accounting the utilization of throttled tasks. This can somewhat make sense as we don't dequeue tasks but only throttled cfs_rq.
If a task of another group is enqueued/dequeued and root cfs_rq becomes idle during the dequeue, util_est will be cleared whereas it was accounting util_est of throttled tasks before. So the behavior of util_est is not always the same regarding throttled tasks and depends of side activity. Furthermore, util_est will not be updated when the cfs_rq is unthrottled as everything happens at cfs_rq level. Main results is that util_est will stay null whereas we now have running tasks. We have to wait for the next dequeue/enqueue of the previously throttled tasks to get an up to date util_est.
Remove the assumption that cfs_rq's estimated utilization of a CPU is 0 if there is no running task so the util_est of a task remains until the latter is dequeued even if its cfs_rq has been throttled.
--- kernel/sched/fair.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
kernel/sched/fair.c +4 -12
@@ -3941,18 +3941,10 @@ util_est_dequeue(struct cfs_rq *cfs_rq,if (!sched_feat (UTIL_EST ))return ; -/* -* Update root cfs_rq's estimated utilization -* -* If *p is the last task then the root cfs_rq's estimated utilization -* of a CPU is 0 by definition. -*/ - ue.enqueued =0 ; -if (cfs_rq->nr_running) { - ue.enqueued = cfs_rq->avg.util_est.enqueued; - ue.enqueued -= min_t(unsigned int, ue.enqueued, - (_task_util_est (p) |UTIL_AVG_UNCHANGED )); - } +/* Update root cfs_rq's estimated utilization */ + ue.enqueued = cfs_rq->avg.util_est.enqueued; + ue.enqueued -= min_t(unsigned int, ue.enqueued, + (_task_util_est (p) |UTIL_AVG_UNCHANGED ));WRITE_ONCE (cfs_rq->avg.util_est.enqueued, ue.enqueued);/*
Greg Kroah-Hartman
maintainerPATCH 171/324 kthread, sched/core: Fix kthread_parkme() (again...)
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit 1cef1150ef40ec52f507436a14230cbc2623299c ]
Gaurav reports that commit:
85f1abe0019f ("kthread, sched/wait: Fix kthread_parkme() completion issue")
isn't working for him. Because of the following race:
Quoted 25 lines
controller Thread CPUHP Thread
takedown_cpukthread_parkkthread_parkme
SetKTHREAD_SHOULD_PARK
smpboot_thread_fnset Task interruptible
wake_up_process
if (!(p->state & state))goto out; Kthread_parkme SET TASK_PARKED schedule raw_spin_lock(&rq->lock)
ttwu_remote
waiting for__task_rq_lock
context_switch
finish_lock_switch
Quoted 5 lines
Case
TASK_PARKEDkthread_park_completeSET Running
Furthermore, Oleg noticed that the whole scheduler TASK_PARKED handling is buggered because the TASK_DEAD thing is done with preemption disabled, the current code can still complete early on preemption :/
So basically revert that earlier fix and go with a variant of the alternative mentioned in the commit. Promote TASK_PARKED to special state to avoid the store-store issue on task->state leading to the WARN in kthread_unpark() -> __kthread_bind().
But in addition, add wait_task_inactive() to kthread_park() to ensure the task really is PARKED when we return from kthread_park(). This avoids the whole kthread still gets migrated nonsense -- although it would be really good to get this done differently.
--- include/linux/kthread.h | 1 - include/linux/sched.h | 2 +- kernel/kthread.c | 30 ++++++++++++++++++++++++------ kernel/sched/core.c | 31 +++++++++++-------------------- 4 files changed, 36 insertions(+), 28 deletions(-)
include/linux/kthread.h +0 -1
@@ -62,7 +62,6 @@ void *kthread_probe_data(struct task_strint kthread_park (struct task_struct *k);void kthread_unpark (struct task_struct *k);void kthread_parkme (void ); -void kthread_park_complete (struct task_struct *k);int kthreadd (void *unused);extern struct task_struct *kthreadd_task;
include/linux/sched.h +1 -1
@@ -117,7 +117,7 @@ struct task_group;* the comment with set_special_state(). */ #define is_special_task_state (state) \ - ((state) & (__TASK_STOPPED | __TASK_TRACED | TASK_DEAD)) + ((state) & (__TASK_STOPPED | __TASK_TRACED | TASK_PARKED | TASK_DEAD))#define __set_current_state (state_value) \ do { \
kernel/kthread.c +24 -6
@@ -177,9 +177,20 @@ void *kthread_probe_data(struct task_strstatic void __kthread_parkme (struct kthread *self) {for (;;) { -set_current_state (TASK_PARKED ); +/* +* TASK_PARKED is a special state; we must serialize against +* possible pending wakeups to avoid store-store collisions on +* task->state. +* +* Such a collision might possibly result in the task state +* changin from TASK_PARKED and us failing the +* wait_task_inactive() in kthread_park(). +*/ +set_special_state (TASK_PARKED );if (!test_bit (KTHREAD_SHOULD_PARK , &self->flags))break ; + +complete_all (&self->parked);schedule (); }__set_current_state (TASK_RUNNING );
@@ -191,11 +202,6 @@ void kthread_parkme(void) }EXPORT_SYMBOL_GPL (kthread_parkme); -void kthread_park_complete (struct task_struct *k) -{ -complete_all (&to_kthread (k)->parked); -} -static int kthread (void *_create) {/* Copy data: it's on kthread's stack */
@@ -467,6 +473,9 @@ void kthread_unpark(struct task_struct *reinit_completion (&kthread->parked);clear_bit (KTHREAD_SHOULD_PARK , &kthread->flags); +/* +* __kthread_parkme() will either see !SHOULD_PARK or get the wakeup. +*/ wake_up_state (k,TASK_PARKED ); }EXPORT_SYMBOL_GPL (kthread_unpark);
@@ -493,7 +502,16 @@ int kthread_park(struct task_struct *k)set_bit (KTHREAD_SHOULD_PARK , &kthread->flags);if (k != current) {wake_up_process (k); +/* +* Wait for __kthread_parkme() to complete(), this means we +* _will_ have TASK_PARKED and are about to call schedule(). +*/ wait_for_completion (&kthread->parked); +/* +* Now wait for that schedule() to complete and the task to +* get scheduled out. +*/ +WARN_ON_ONCE (!wait_task_inactive (k,TASK_PARKED )); }return 0 ;
kernel/sched/core.c +11 -20
@@ -7,7 +7,6 @@*/ #include "sched.h" -#include <linux/kthread.h> #include <linux/nospec.h> #include <asm/switch_to.h>
@@ -2738,28 +2737,20 @@ static struct rq *finish_task_switch(strmembarrier_mm_sync_core_before_usermode (mm);mmdrop (mm); } -if (unlikely (prev_state & (TASK_DEAD |TASK_PARKED ))) { -switch (prev_state) { -case TASK_DEAD : -if (prev->sched_class->task_dead) - prev->sched_class->task_dead (prev); - -/* -* Remove function-return probe instances associated with this -* task and put them back on the free list. -*/ -kprobe_flush_task (prev); +if (unlikely (prev_state ==TASK_DEAD )) { +if (prev->sched_class->task_dead) + prev->sched_class->task_dead (prev); -/* Task is done with its stack. */ -put_task_stack (prev); +/* +* Remove function-return probe instances associated with this +* task and put them back on the free list. +*/ +kprobe_flush_task (prev); -put_task_struct (prev); -break ; +/* Task is done with its stack. */ +put_task_stack (prev); -case TASK_PARKED : -kthread_park_complete (prev); -break ; - } +put_task_struct (prev); }tick_nohz_task_switch ();
Greg Kroah-Hartman
maintainerPATCH 172/324 x86/mm/32: Initialize the CR4 shadow before __flush_tlb_all()
In reply to Greg Kroah-Hartman4.17-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhenzhong Duan <[email protected]>
[ Upstream commit 4fb5f58e8d191f7c81637ad81284e4848afb4244 ]
On 32-bit kernels, __flush_tlb_all() may have read the CR4 shadow before the initialization of CR4 shadow in cpu_init().
Fix it by adding an explicit cr4_init_shadow() call into start_secondary() which is the first function called on non-boot SMP CPUs - ahead of the __flush_tlb_all() call.
( This is somewhat of a layering violation, but start_secondary() does
CR4 bootstrap in the PCID case anyway. )
--- arch/x86/kernel/smpboot.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/kernel/smpboot.c +5 -0
@@ -222,6 +222,11 @@ static void notrace start_secondary(void#ifdef CONFIG_X86_32 /* switch away from the initial page table */ load_cr3 (swapper_pg_dir); +/* +* Initialize the CR4 shadow before doing anything that could +* try to read it. +*/ +cr4_init_shadow ();__flush_tlb_all ();#endif load_current_idt ();