2019-05-15 12:00:52

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 000/115] 4.14.120-stable review

This is the start of the stable review cycle for the 4.14.120 release.
There are 115 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.

Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
Anything received after that time might be too late.

The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.120-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.14.y
and the diffstat can be found below.

thanks,

greg k-h

-------------
Pseudo-Shortlog of commits:

Greg Kroah-Hartman <[email protected]>
Linux 4.14.120-rc1

Laurentiu Tudor <[email protected]>
powerpc/booke64: set RI in default MSR

Russell Currey <[email protected]>
powerpc/powernv/idle: Restore IAMR after idle

Dan Carpenter <[email protected]>
drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl

Dan Carpenter <[email protected]>
drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl

Parthasarathy Bhuvaragan <[email protected]>
tipc: fix hanging clients using poll with EPOLLOUT flag

Stephen Suryaputra <[email protected]>
vrf: sit mtu should not be updated when vrf netdev is the link

Hangbin Liu <[email protected]>
vlan: disable SIOCSHWTSTAMP in container

YueHaibing <[email protected]>
packet: Fix error path in packet_init

Christophe Leroy <[email protected]>
net: ucc_geth - fix Oops when changing number of buffers in the ring

Thomas Bogendoerfer <[email protected]>
net: seeq: fix crash caused by not set dev.parent

Corentin Labbe <[email protected]>
net: ethernet: stmmac: dwmac-sun8i: enable support of unicast filtering

YueHaibing <[email protected]>
net: dsa: Fix error cleanup path in dsa_init_module

David Ahern <[email protected]>
ipv4: Fix raw socket lookup for local traffic

Hangbin Liu <[email protected]>
fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied

Laurentiu Tudor <[email protected]>
dpaa_eth: fix SG frame cleanup

Tobin C. Harding <[email protected]>
bridge: Fix error path for kobject_init_and_add()

Jarod Wilson <[email protected]>
bonding: fix arp_validate toggling in active-backup mode

Breno Leitao <[email protected]>
powerpc/64s: Include cpu header

Nigel Croxon <[email protected]>
Don't jump to compute_result state from check_result state

Gustavo A. R. Silva <[email protected]>
rtlwifi: rtl8723ae: Fix missing break in switch statement

Petr Štetiar <[email protected]>
mwl8k: Fix rate_idx underflow

Wei Yongjun <[email protected]>
cw1200: fix missing unlock on error in cw1200_hw_scan()

Masami Hiramatsu <[email protected]>
x86/kprobes: Avoid kretprobe recursion bug

Dan Carpenter <[email protected]>
nfc: nci: Potential off by one in ->pipes[] array

Dan Carpenter <[email protected]>
NFC: nci: Add some bounds checking in nci_hci_cmd_received()

Ido Schimmel <[email protected]>
mlxsw: core: Do not use WQ_MEM_RECLAIM for mlxsw workqueue

Ido Schimmel <[email protected]>
mlxsw: core: Do not use WQ_MEM_RECLAIM for mlxsw ordered workqueue

Ido Schimmel <[email protected]>
mlxsw: core: Do not use WQ_MEM_RECLAIM for EMAD workqueue

Ido Schimmel <[email protected]>
mlxsw: spectrum_switchdev: Add MDB entries in prepare phase

Andy Duan <[email protected]>
net: fec: manage ahb clock in runtime pm

Jan Kara <[email protected]>
mm/memory.c: fix modifying of page protection by insert_pfn()

Jun Xiao <[email protected]>
net: hns: Fix WARNING when hns modules installed

Sebastian Andrzej Siewior <[email protected]>
x86/fpu: Don't export __kernel_fpu_{begin,end}()

Ronnie Sahlberg <[email protected]>
cifs: fix memory leak in SMB2_read

Damian Kos <[email protected]>
drm/rockchip: fix for mailbox read validation.

Florian Westphal <[email protected]>
netfilter: nf_tables: warn when expr implements only one of activate/deactivate

KT Liao <[email protected]>
Input: elan_i2c - add hardware ID for multiple Lenovo laptops

Erik Schmauss <[email protected]>
ACPICA: Namespace: remove address node from global list after method termination

Matteo Croce <[email protected]>
gtp: change NET_UDP_TUNNEL dependency to select

Cong Wang <[email protected]>
net_sched: fix two more memory leaks in cls_tcindex

Max Filippov <[email protected]>
xtensa: xtfpga.dtsi: fix dtc warnings about SPI

Alexey Brodkin <[email protected]>
devres: Align data[] to ARCH_KMALLOC_MINALIGN

Nicolas Pitre <[email protected]>
vt: always call notifier with the console lock held

Heinrich Schuchardt <[email protected]>
arm64: dts: marvell: armada-ap806: reserve PSCI area

Adit Ranadive <[email protected]>
RDMA/vmw_pvrdma: Return the correct opcode when creating WR

Enric Balletbo i Serra <[email protected]>
drm/rockchip: psr: do not dereference encoder before it is null checked.

Jerome Brunet <[email protected]>
leds: pwm: silently error out on EPROBE_DEFER

Nicholas Piggin <[email protected]>
powerpc: remove old GCC version checks

Dmitry Eremin-Solenikov <[email protected]>
crypto: testmgr - add AES-CFB tests

Marc Zyngier <[email protected]>
arm64: KVM: Make VHE Stage-2 TLB invalidation operations non-interruptible

Martin Schwidefsky <[email protected]>
mm: introduce mm_[p4d|pud|pmd]_folded

Alistair Strachan <[email protected]>
x86/vdso: Pass --eh-frame-hdr to the linker

Omar Sandoval <[email protected]>
Btrfs: fix missing delayed iputs on unmount

Thierry Reding <[email protected]>
net: stmmac: Move debugfs init/exit to ->probe()/->remove()

Lubomir Rintel <[email protected]>
staging: olpc_dcon: add a missing dependency

Arnd Bergmann <[email protected]>
scsi: raid_attrs: fix unused variable warning

Chris Wilson <[email protected]>
drm/i915: Downgrade Gen9 Plane WM latency error

Steven Rostedt (VMware) <[email protected]>
tracing/fgraph: Fix set_graph_function from showing interrupts

Paolo Abeni <[email protected]>
net: don't keep lonely packets forever in the gro hash

Hugues Fruchet <[email protected]>
media: ov5640: fix auto controls values when switching to manual mode

Hugues Fruchet <[email protected]>
media: ov5640: fix wrong binning value in exposure calculation

Ville Syrjälä <[email protected]>
drm/i915: Disable LP3 watermarks on all SNB machines

Vignesh R <[email protected]>
i2c: omap: Enable for ARCH_K3

Miklos Szeredi <[email protected]>
fuse: fix possibly missed wake-up after abort

Hans Verkuil <[email protected]>
media: adv7842: when the EDID is cleared, unconfigure CEC as well

Hans Verkuil <[email protected]>
media: adv7604: when the EDID is cleared, unconfigure CEC as well

Hans Verkuil <[email protected]>
media: cec: integrate cec_validate_phys_addr() in cec-api.c

Hans Verkuil <[email protected]>
media: cec: make cec_get_edid_spa_location() an inline function

Punit Agrawal <[email protected]>
KVM: arm/arm64: Ensure only THP is candidate for adjustment

Goldwyn Rodrigues <[email protected]>
ima: open a new file instance if no read permissions

Jason Gunthorpe <[email protected]>
IB/rxe: Revise the ib_wr_opcode enum

Erik Schmauss <[email protected]>
ACPICA: AML interpreter: add region addresses in global list during initialization

Tang Junhui <[email protected]>
bcache: correct dirty data statistics

Huacai Chen <[email protected]>
MIPS: VDSO: Reduce VDSO_RANDOMIZE_SIZE to 64MB for 64bit

David Miller <[email protected]>
sparc64: Make corrupted user stacks more debuggable.

David S. Miller <[email protected]>
sparc64: Export __node_distance.

Pan Bian <[email protected]>
Input: synaptics-rmi4 - fix possible double free

Daniel Gomez <[email protected]>
spi: ST ST95HF NFC: declare missing of table

Daniel Gomez <[email protected]>
spi: Micrel eth switch: declare missing of table

Lucas Stach <[email protected]>
drm/imx: don't skip DP channel disable for background plane

Lucas Stach <[email protected]>
gpu: ipu-v3: dp: fix CSC handling

Po-Hsu Lin <[email protected]>
selftests/net: correct the return value for run_netsocktests

Paul Kocialkowski <[email protected]>
drm/sun4i: Set device driver data at bind time for use in unbind

Arnd Bergmann <[email protected]>
s390: ctcm: fix ctcm_new_device error return code

Petr Štetiar <[email protected]>
MIPS: perf: ath79: Fix perfcount IRQ assignment

Florian Westphal <[email protected]>
netfilter: ctnetlink: don't use conntrack/expect object addresses as id

Julian Anastasov <[email protected]>
ipvs: do not schedule icmp errors from tunnels

Florian Westphal <[email protected]>
selftests: netfilter: check icmp pkttoobig errors are set as related

Dan Williams <[email protected]>
init: initialize jump labels before command line option parsing

Johannes Weiner <[email protected]>
mm: fix inactive list balancing between NUMA nodes and cgroups

Rikard Falkeborn <[email protected]>
tools lib traceevent: Fix missing equality check for strcmp

Vitaly Kuznetsov <[email protected]>
KVM: x86: avoid misreporting level-triggered irqs as edge-triggered in tracing

Paolo Bonzini <[email protected]>
KVM: fix spectrev1 gadgets

Jian-Hong Pan <[email protected]>
x86/reboot, efi: Use EFI reboot for Acer TravelMate X514-51T

Harald Freudenberger <[email protected]>
s390/pkey: add one more argument space for debug feature entry

Tetsuo Handa <[email protected]>
mISDN: Check address length before reading address family

Neil Armstrong <[email protected]>
clocksource/drivers/oxnas: Fix OX820 compatible

Martin Schwidefsky <[email protected]>
s390/3270: fix lockdep false positive on view->lock

Sunil Dutt <[email protected]>
nl80211: Add NL80211_FLAG_CLEAR_SKB flag for other NL commands

Felix Fietkau <[email protected]>
mac80211: fix memory accounting with A-MSDU aggregation

Andrei Otcheretianski <[email protected]>
mac80211: Increase MAX_MSG_LEN

Felix Fietkau <[email protected]>
mac80211: fix unaligned access in mesh table hash function

Peter Oberparleiter <[email protected]>
s390/dasd: Fix capacity calculation for large volumes

Aditya Pakki <[email protected]>
libnvdimm/btt: Fix a kmemdup failure check

Dmitry Torokhov <[email protected]>
HID: input: add mapping for "Toggle Display" key

Dmitry Torokhov <[email protected]>
HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys

Dmitry Torokhov <[email protected]>
HID: input: add mapping for Expose/Overview key

Kangjie Lu <[email protected]>
libnvdimm/namespace: Fix a potential NULL pointer dereference

Sven Van Asbroeck <[email protected]>
iio: adc: xilinx: fix potential use-after-free on remove

Johan Hovold <[email protected]>
USB: serial: fix unthrottle races

Andrea Parri <[email protected]>
kernfs: fix barrier usage in __kernfs_new_node()

Stefan Wahren <[email protected]>
hwmon: (pwm-fan) Disable PWM if fetching cooling data fails

Jiaxun Yang <[email protected]>
platform/x86: thinkpad_acpi: Disable Bluetooth for some machines

Gustavo A. R. Silva <[email protected]>
platform/x86: sony-laptop: Fix unintentional fall-through

Francesco Ruggeri <[email protected]>
netfilter: compat: initialize all fields in xt_init


-------------

Diffstat:

Makefile | 4 +-
arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 17 ++
arch/arm64/kvm/hyp/tlb.c | 35 ++-
arch/mips/ath79/setup.c | 6 -
arch/mips/include/asm/processor.h | 2 +-
arch/powerpc/Makefile | 31 +--
arch/powerpc/include/asm/reg_booke.h | 2 +-
arch/powerpc/kernel/idle_book3s.S | 20 ++
arch/powerpc/kernel/security.c | 1 +
arch/sparc/include/asm/switch_to_64.h | 3 +-
arch/sparc/kernel/process_64.c | 25 +-
arch/sparc/kernel/rtrap_64.S | 1 +
arch/sparc/kernel/signal32.c | 12 +-
arch/sparc/kernel/signal_64.c | 6 +-
arch/sparc/mm/init_64.c | 1 +
arch/x86/entry/vdso/Makefile | 3 +-
arch/x86/include/asm/efi.h | 6 +-
arch/x86/include/asm/fpu/api.h | 15 +-
arch/x86/kernel/fpu/core.c | 6 +-
arch/x86/kernel/kprobes/core.c | 22 +-
arch/x86/kernel/reboot.c | 21 ++
arch/x86/kvm/lapic.c | 4 +-
arch/x86/kvm/trace.h | 4 +-
arch/xtensa/boot/dts/xtfpga.dtsi | 2 +-
crypto/tcrypt.c | 5 +
crypto/testmgr.c | 7 +
crypto/testmgr.h | 76 ++++++
drivers/acpi/acpica/dsopcode.c | 4 +
drivers/acpi/acpica/nsobject.c | 4 +
drivers/base/devres.c | 10 +-
drivers/clocksource/timer-oxnas-rps.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 45 +++-
drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +
drivers/gpu/ipu-v3/ipu-dp.c | 12 +-
drivers/hid/hid-input.c | 14 +
drivers/hwmon/pwm-fan.c | 2 +-
drivers/i2c/busses/Kconfig | 2 +-
drivers/iio/adc/xilinx-xadc-core.c | 2 +-
drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 35 ++-
drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 +
drivers/input/mouse/elan_i2c_core.c | 25 ++
drivers/input/rmi4/rmi_driver.c | 6 +-
drivers/irqchip/irq-ath79-misc.c | 11 +
drivers/isdn/mISDN/socket.c | 4 +-
drivers/leds/leds-pwm.c | 5 +-
drivers/md/bcache/super.c | 3 +-
drivers/md/raid5.c | 19 +-
drivers/media/cec/cec-api.c | 19 +-
drivers/media/cec/cec-edid.c | 60 -----
drivers/media/i2c/adv7604.c | 4 +-
drivers/media/i2c/adv7842.c | 4 +-
drivers/media/i2c/ov5640.c | 12 +-
drivers/net/Kconfig | 4 +-
drivers/net/bonding/bond_options.c | 7 -
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
drivers/net/ethernet/freescale/fec_main.c | 30 ++-
drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 8 +-
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 15 +-
drivers/net/ethernet/mellanox/mlxsw/core.c | 6 +-
.../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +-
drivers/net/ethernet/seeq/sgiseeq.c | 1 +
drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 2 +
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +-
drivers/net/phy/spi_ks8995.c | 9 +
drivers/net/wireless/marvell/mwl8k.c | 13 +-
.../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 +
drivers/net/wireless/st/cw1200/scan.c | 5 +-
drivers/nfc/st95hf/core.c | 7 +
drivers/nvdimm/btt_devs.c | 18 +-
drivers/nvdimm/namespace_devs.c | 5 +-
drivers/platform/x86/sony-laptop.c | 8 +-
drivers/platform/x86/thinkpad_acpi.c | 72 +++++-
drivers/s390/block/dasd_eckd.c | 6 +-
drivers/s390/char/con3270.c | 2 +-
drivers/s390/char/fs3270.c | 3 +-
drivers/s390/char/raw3270.c | 3 +-
drivers/s390/char/raw3270.h | 4 +-
drivers/s390/char/tty3270.c | 3 +-
drivers/s390/crypto/pkey_api.c | 3 +-
drivers/s390/net/ctcm_main.c | 1 +
drivers/scsi/raid_class.c | 4 +-
drivers/staging/olpc_dcon/Kconfig | 1 +
drivers/tty/vt/vt.c | 2 +-
drivers/usb/serial/generic.c | 39 ++-
drivers/virt/fsl_hypervisor.c | 29 ++-
fs/btrfs/disk-io.c | 51 ++--
fs/cifs/smb2pdu.c | 1 +
fs/fuse/dev.c | 12 +-
fs/kernfs/dir.c | 5 +-
include/asm-generic/pgtable.h | 16 ++
include/linux/efi.h | 7 +-
include/linux/kvm_host.h | 10 +-
include/media/cec.h | 70 +++++
include/net/netfilter/nf_conntrack.h | 2 +
include/net/nfc/nci_core.h | 2 +-
include/rdma/ib_verbs.h | 34 ++-
include/uapi/rdma/ib_user_verbs.h | 20 +-
include/uapi/rdma/vmw_pvrdma-abi.h | 1 +
init/main.c | 4 +-
kernel/trace/trace.h | 57 ++++-
kernel/trace/trace_functions_graph.c | 4 +
kernel/trace/trace_irqsoff.c | 2 +
kernel/trace/trace_sched_wakeup.c | 2 +
mm/memory.c | 11 +-
mm/vmscan.c | 29 +--
net/8021q/vlan_dev.c | 4 +-
net/bridge/br_if.c | 13 +-
net/core/dev.c | 7 +-
net/core/fib_rules.c | 6 +-
net/dsa/dsa.c | 11 +-
net/ipv4/raw.c | 4 +-
net/ipv6/sit.c | 2 +-
net/mac80211/mesh_pathtbl.c | 2 +-
net/mac80211/trace_msg.h | 7 +-
net/mac80211/tx.c | 3 +
net/netfilter/ipvs/ip_vs_core.c | 2 +-
net/netfilter/nf_conntrack_core.c | 35 +++
net/netfilter/nf_conntrack_netlink.c | 34 ++-
net/netfilter/nf_tables_api.c | 19 ++
net/netfilter/x_tables.c | 2 +-
net/nfc/nci/hci.c | 8 +
net/packet/af_packet.c | 25 +-
net/sched/cls_tcindex.c | 16 +-
net/tipc/socket.c | 4 +-
net/wireless/nl80211.c | 18 +-
security/integrity/ima/ima_crypto.c | 54 ++--
tools/lib/traceevent/event-parse.c | 2 +-
tools/testing/selftests/net/run_netsocktests | 2 +-
tools/testing/selftests/netfilter/Makefile | 2 +-
.../selftests/netfilter/conntrack_icmp_related.sh | 283 +++++++++++++++++++++
virt/kvm/arm/mmu.c | 8 +-
virt/kvm/irqchip.c | 5 +-
virt/kvm/kvm_main.c | 6 +-
136 files changed, 1457 insertions(+), 462 deletions(-)



2019-05-15 12:00:53

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 003/115] platform/x86: thinkpad_acpi: Disable Bluetooth for some machines

From: Jiaxun Yang <[email protected]>

commit f7db839fccf087664e5587966220821289b6a9cb upstream.

Some AMD based ThinkPads have a firmware bug that calling
"GBDC" will cause Bluetooth on Intel wireless cards blocked.

Probe these models by DMI match and disable Bluetooth subdriver
if specified Intel wireless card exist.

Cc: stable <[email protected]> # 4.14+
Signed-off-by: Jiaxun Yang <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
drivers/platform/x86/thinkpad_acpi.c | 72 ++++++++++++++++++++++++++++++++++-
1 file changed, 70 insertions(+), 2 deletions(-)

--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -77,7 +77,7 @@
#include <linux/jiffies.h>
#include <linux/workqueue.h>
#include <linux/acpi.h>
-#include <linux/pci_ids.h>
+#include <linux/pci.h>
#include <linux/thinkpad_acpi.h>
#include <sound/core.h>
#include <sound/control.h>
@@ -4366,6 +4366,74 @@ static void bluetooth_exit(void)
bluetooth_shutdown();
}

+static const struct dmi_system_id bt_fwbug_list[] __initconst = {
+ {
+ .ident = "ThinkPad E485",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_BOARD_NAME, "20KU"),
+ },
+ },
+ {
+ .ident = "ThinkPad E585",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_BOARD_NAME, "20KV"),
+ },
+ },
+ {
+ .ident = "ThinkPad A285 - 20MW",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_BOARD_NAME, "20MW"),
+ },
+ },
+ {
+ .ident = "ThinkPad A285 - 20MX",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_BOARD_NAME, "20MX"),
+ },
+ },
+ {
+ .ident = "ThinkPad A485 - 20MU",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_BOARD_NAME, "20MU"),
+ },
+ },
+ {
+ .ident = "ThinkPad A485 - 20MV",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_BOARD_NAME, "20MV"),
+ },
+ },
+ {}
+};
+
+static const struct pci_device_id fwbug_cards_ids[] __initconst = {
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x24F3) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x24FD) },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2526) },
+ {}
+};
+
+
+static int __init have_bt_fwbug(void)
+{
+ /*
+ * Some AMD based ThinkPads have a firmware bug that calling
+ * "GBDC" will cause bluetooth on Intel wireless cards blocked
+ */
+ if (dmi_check_system(bt_fwbug_list) && pci_dev_present(fwbug_cards_ids)) {
+ vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_RFKILL,
+ FW_BUG "disable bluetooth subdriver for Intel cards\n");
+ return 1;
+ } else
+ return 0;
+}
+
static int __init bluetooth_init(struct ibm_init_struct *iibm)
{
int res;
@@ -4378,7 +4446,7 @@ static int __init bluetooth_init(struct

/* bluetooth not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,
G4x, R30, R31, R40e, R50e, T20-22, X20-21 */
- tp_features.bluetooth = hkey_handle &&
+ tp_features.bluetooth = !have_bt_fwbug() && hkey_handle &&
acpi_evalf(hkey_handle, &status, "GBDC", "qd");

vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_RFKILL,


2019-05-15 12:01:08

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 032/115] s390: ctcm: fix ctcm_new_device error return code

[ Upstream commit 27b141fc234a3670d21bd742c35d7205d03cbb3a ]

clang points out that the return code from this function is
undefined for one of the error paths:

../drivers/s390/net/ctcm_main.c:1595:7: warning: variable 'result' is used uninitialized whenever 'if' condition is true
[-Wsometimes-uninitialized]
if (priv->channel[direction] == NULL) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/s390/net/ctcm_main.c:1638:9: note: uninitialized use occurs here
return result;
^~~~~~
../drivers/s390/net/ctcm_main.c:1595:3: note: remove the 'if' if its condition is always false
if (priv->channel[direction] == NULL) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/s390/net/ctcm_main.c:1539:12: note: initialize the variable 'result' to silence this warning
int result;
^

Make it return -ENODEV here, as in the related failure cases.
gcc has a known bug in underreporting some of these warnings
when it has already eliminated the assignment of the return code
based on some earlier optimization step.

Reviewed-by: Nathan Chancellor <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
Signed-off-by: Julian Wiedmann <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
drivers/s390/net/ctcm_main.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index 26363e0816fe4..fbe35c2ac8981 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1594,6 +1594,7 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
if (priv->channel[direction] == NULL) {
if (direction == CTCM_WRITE)
channel_free(priv->channel[CTCM_READ]);
+ result = -ENODEV;
goto out_dev;
}
priv->channel[direction]->netdev = dev;
--
2.20.1



2019-05-15 12:01:10

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 018/115] s390/3270: fix lockdep false positive on view->lock

[ Upstream commit 5712f3301a12c0c3de9cc423484496b0464f2faf ]

The spinlock in the raw3270_view structure is used by con3270, tty3270
and fs3270 in different ways. For con3270 the lock can be acquired in
irq context, for tty3270 and fs3270 the highest context is bh.

Lockdep sees the view->lock as a single class and if the 3270 driver
is used for the console the following message is generated:

WARNING: inconsistent lock state
5.1.0-rc3-05157-g5c168033979d #12 Not tainted
--------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
swapper/0/1 [HC0[0]:SC1[1]:HE1:SE0] takes:
(____ptrval____) (&(&view->lock)->rlock){?.-.}, at: tty3270_update+0x7c/0x330

Introduce a lockdep subclass for the view lock to distinguish bh from
irq locks.

Signed-off-by: Martin Schwidefsky <[email protected]>

Signed-off-by: Sasha Levin <[email protected]>
---
drivers/s390/char/con3270.c | 2 +-
drivers/s390/char/fs3270.c | 3 ++-
drivers/s390/char/raw3270.c | 3 ++-
drivers/s390/char/raw3270.h | 4 +++-
drivers/s390/char/tty3270.c | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index be3e3c1206c24..1868ff803f439 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -629,7 +629,7 @@ con3270_init(void)
(void (*)(unsigned long)) con3270_read_tasklet,
(unsigned long) condev->read);

- raw3270_add_view(&condev->view, &con3270_fn, 1);
+ raw3270_add_view(&condev->view, &con3270_fn, 1, RAW3270_VIEW_LOCK_IRQ);

INIT_LIST_HEAD(&condev->freemem);
for (i = 0; i < CON3270_STRING_PAGES; i++) {
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index c4518168fd02c..4f73a38c7cbd2 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -463,7 +463,8 @@ fs3270_open(struct inode *inode, struct file *filp)

init_waitqueue_head(&fp->wait);
fp->fs_pid = get_pid(task_pid(current));
- rc = raw3270_add_view(&fp->view, &fs3270_fn, minor);
+ rc = raw3270_add_view(&fp->view, &fs3270_fn, minor,
+ RAW3270_VIEW_LOCK_BH);
if (rc) {
fs3270_free_view(&fp->view);
goto out;
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 5d4f053d7c38c..0f47fec35acc0 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -919,7 +919,7 @@ raw3270_deactivate_view(struct raw3270_view *view)
* Add view to device with minor "minor".
*/
int
-raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
+raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor, int subclass)
{
unsigned long flags;
struct raw3270 *rp;
@@ -941,6 +941,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
view->cols = rp->cols;
view->ascebc = rp->ascebc;
spin_lock_init(&view->lock);
+ lockdep_set_subclass(&view->lock, subclass);
list_add(&view->list, &rp->view_list);
rc = 0;
spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h
index 114ca7cbf8897..3afaa35f73513 100644
--- a/drivers/s390/char/raw3270.h
+++ b/drivers/s390/char/raw3270.h
@@ -150,6 +150,8 @@ struct raw3270_fn {
struct raw3270_view {
struct list_head list;
spinlock_t lock;
+#define RAW3270_VIEW_LOCK_IRQ 0
+#define RAW3270_VIEW_LOCK_BH 1
atomic_t ref_count;
struct raw3270 *dev;
struct raw3270_fn *fn;
@@ -158,7 +160,7 @@ struct raw3270_view {
unsigned char *ascebc; /* ascii -> ebcdic table */
};

-int raw3270_add_view(struct raw3270_view *, struct raw3270_fn *, int);
+int raw3270_add_view(struct raw3270_view *, struct raw3270_fn *, int, int);
int raw3270_activate_view(struct raw3270_view *);
void raw3270_del_view(struct raw3270_view *);
void raw3270_deactivate_view(struct raw3270_view *);
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index e5ebe2fbee235..401688bf8fd37 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -978,7 +978,8 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
return PTR_ERR(tp);

rc = raw3270_add_view(&tp->view, &tty3270_fn,
- tty->index + RAW3270_FIRSTMINOR);
+ tty->index + RAW3270_FIRSTMINOR,
+ RAW3270_VIEW_LOCK_BH);
if (rc) {
tty3270_free_view(tp);
return rc;
--
2.20.1



2019-05-15 12:01:23

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 015/115] mac80211: Increase MAX_MSG_LEN

[ Upstream commit 78be2d21cc1cd3069c6138dcfecec62583130171 ]

Looks that 100 chars isn't enough for messages, as we keep getting
warnings popping from different places due to message shortening.
Instead of trying to shorten the prints, just increase the buffer size.

Signed-off-by: Andrei Otcheretianski <[email protected]>
Signed-off-by: Luca Coelho <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
net/mac80211/trace_msg.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/trace_msg.h b/net/mac80211/trace_msg.h
index 366b9e6f043e2..40141df09f255 100644
--- a/net/mac80211/trace_msg.h
+++ b/net/mac80211/trace_msg.h
@@ -1,4 +1,9 @@
/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Portions of this file
+ * Copyright (C) 2019 Intel Corporation
+ */
+
#ifdef CONFIG_MAC80211_MESSAGE_TRACING

#if !defined(__MAC80211_MSG_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ)
@@ -11,7 +16,7 @@
#undef TRACE_SYSTEM
#define TRACE_SYSTEM mac80211_msg

-#define MAX_MSG_LEN 100
+#define MAX_MSG_LEN 120

DECLARE_EVENT_CLASS(mac80211_msg_event,
TP_PROTO(struct va_format *vaf),
--
2.20.1



2019-05-15 12:01:24

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 025/115] tools lib traceevent: Fix missing equality check for strcmp

[ Upstream commit f32c2877bcb068a718bb70094cd59ccc29d4d082 ]

There was a missing comparison with 0 when checking if type is "s64" or
"u64". Therefore, the body of the if-statement was entered if "type" was
"u64" or not "s64", which made the first strcmp() redundant since if
type is "u64", it's not "s64".

If type is "s64", the body of the if-statement is not entered but since
the remainder of the function consists of if-statements which will not
be entered if type is "s64", we will just return "val", which is
correct, albeit at the cost of a few more calls to strcmp(), i.e., it
will behave just as if the if-statement was entered.

If type is neither "s64" or "u64", the body of the if-statement will be
entered incorrectly and "val" returned. This means that any type that is
checked after "s64" and "u64" is handled the same way as "s64" and
"u64", i.e., the limiting of "val" to fit in for example "s8" is never
reached.

This was introduced in the kernel tree when the sources were copied from
trace-cmd in commit f7d82350e597 ("tools/events: Add files to create
libtraceevent.a"), and in the trace-cmd repo in 1cdbae6035cei
("Implement typecasting in parser") when the function was introduced,
i.e., it has always behaved the wrong way.

Detected by cppcheck.

Signed-off-by: Rikard Falkeborn <[email protected]>
Reviewed-by: Steven Rostedt (VMware) <[email protected]>
Cc: Tzvetomir Stoyanov <[email protected]>
Fixes: f7d82350e597 ("tools/events: Add files to create libtraceevent.a")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
tools/lib/traceevent/event-parse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 3955ba9e6fcb5..7989dd6289e7a 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -2206,7 +2206,7 @@ eval_type_str(unsigned long long val, const char *type, int pointer)
return val & 0xffffffff;

if (strcmp(type, "u64") == 0 ||
- strcmp(type, "s64"))
+ strcmp(type, "s64") == 0)
return val;

if (strcmp(type, "s8") == 0)
--
2.20.1



2019-05-15 12:01:41

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 023/115] KVM: fix spectrev1 gadgets

[ Upstream commit 1d487e9bf8ba66a7174c56a0029c54b1eca8f99c ]

These were found with smatch, and then generalized when applicable.

Signed-off-by: Paolo Bonzini <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
arch/x86/kvm/lapic.c | 4 +++-
include/linux/kvm_host.h | 10 ++++++----
virt/kvm/irqchip.c | 5 +++--
virt/kvm/kvm_main.c | 6 ++++--
4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index f7c34184342a5..053e4937af0cb 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -133,6 +133,7 @@ static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map,
if (offset <= max_apic_id) {
u8 cluster_size = min(max_apic_id - offset + 1, 16U);

+ offset = array_index_nospec(offset, map->max_apic_id + 1);
*cluster = &map->phys_map[offset];
*mask = dest_id & (0xffff >> (16 - cluster_size));
} else {
@@ -829,7 +830,8 @@ static inline bool kvm_apic_map_get_dest_lapic(struct kvm *kvm,
if (irq->dest_id > map->max_apic_id) {
*bitmap = 0;
} else {
- *dst = &map->phys_map[irq->dest_id];
+ u32 dest_id = array_index_nospec(irq->dest_id, map->max_apic_id + 1);
+ *dst = &map->phys_map[dest_id];
*bitmap = 1;
}
return true;
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 753c16633bac5..026615e242d8e 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -27,6 +27,7 @@
#include <linux/irqbypass.h>
#include <linux/swait.h>
#include <linux/refcount.h>
+#include <linux/nospec.h>
#include <asm/signal.h>

#include <linux/kvm.h>
@@ -483,10 +484,10 @@ static inline struct kvm_io_bus *kvm_get_bus(struct kvm *kvm, enum kvm_bus idx)

static inline struct kvm_vcpu *kvm_get_vcpu(struct kvm *kvm, int i)
{
- /* Pairs with smp_wmb() in kvm_vm_ioctl_create_vcpu, in case
- * the caller has read kvm->online_vcpus before (as is the case
- * for kvm_for_each_vcpu, for example).
- */
+ int num_vcpus = atomic_read(&kvm->online_vcpus);
+ i = array_index_nospec(i, num_vcpus);
+
+ /* Pairs with smp_wmb() in kvm_vm_ioctl_create_vcpu. */
smp_rmb();
return kvm->vcpus[i];
}
@@ -570,6 +571,7 @@ void kvm_put_kvm(struct kvm *kvm);

static inline struct kvm_memslots *__kvm_memslots(struct kvm *kvm, int as_id)
{
+ as_id = array_index_nospec(as_id, KVM_ADDRESS_SPACE_NUM);
return srcu_dereference_check(kvm->memslots[as_id], &kvm->srcu,
lockdep_is_held(&kvm->slots_lock) ||
!refcount_read(&kvm->users_count));
diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
index b1286c4e07122..0bd0683640bdf 100644
--- a/virt/kvm/irqchip.c
+++ b/virt/kvm/irqchip.c
@@ -144,18 +144,19 @@ static int setup_routing_entry(struct kvm *kvm,
{
struct kvm_kernel_irq_routing_entry *ei;
int r;
+ u32 gsi = array_index_nospec(ue->gsi, KVM_MAX_IRQ_ROUTES);

/*
* Do not allow GSI to be mapped to the same irqchip more than once.
* Allow only one to one mapping between GSI and non-irqchip routing.
*/
- hlist_for_each_entry(ei, &rt->map[ue->gsi], link)
+ hlist_for_each_entry(ei, &rt->map[gsi], link)
if (ei->type != KVM_IRQ_ROUTING_IRQCHIP ||
ue->type != KVM_IRQ_ROUTING_IRQCHIP ||
ue->u.irqchip.irqchip == ei->irqchip.irqchip)
return -EINVAL;

- e->gsi = ue->gsi;
+ e->gsi = gsi;
e->type = ue->type;
r = kvm_set_routing_entry(kvm, e, ue);
if (r)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a373c60ef1c06..b91716b1b428e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2886,12 +2886,14 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
struct kvm_device_ops *ops = NULL;
struct kvm_device *dev;
bool test = cd->flags & KVM_CREATE_DEVICE_TEST;
+ int type;
int ret;

if (cd->type >= ARRAY_SIZE(kvm_device_ops_table))
return -ENODEV;

- ops = kvm_device_ops_table[cd->type];
+ type = array_index_nospec(cd->type, ARRAY_SIZE(kvm_device_ops_table));
+ ops = kvm_device_ops_table[type];
if (ops == NULL)
return -ENODEV;

@@ -2906,7 +2908,7 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
dev->kvm = kvm;

mutex_lock(&kvm->lock);
- ret = ops->create(dev, cd->type);
+ ret = ops->create(dev, type);
if (ret < 0) {
mutex_unlock(&kvm->lock);
kfree(dev);
--
2.20.1



2019-05-15 12:02:31

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH 4.14 002/115] platform/x86: sony-laptop: Fix unintentional fall-through

From: Gustavo A. R. Silva <[email protected]>

commit 1cbd7a64959d33e7a2a1fa2bf36a62b350a9fcbd upstream.

It seems that the default case should return AE_CTRL_TERMINATE, instead
of falling through to case ACPI_RESOURCE_TYPE_END_TAG and returning AE_OK;
otherwise the line of code at the end of the function is unreachable and
makes no sense:

return AE_CTRL_TERMINATE;

This fix is based on the following thread of discussion:

https://lore.kernel.org/patchwork/patch/959782/

Fixes: 33a04454527e ("sony-laptop: Add SNY6001 device handling (sonypi reimplementation)")
Cc: [email protected]
Signed-off-by: Gustavo A. R. Silva <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
drivers/platform/x86/sony-laptop.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -4422,14 +4422,16 @@ sony_pic_read_possible_resource(struct a
}
return AE_OK;
}
+
+ case ACPI_RESOURCE_TYPE_END_TAG:
+ return AE_OK;
+
default:
dprintk("Resource %d isn't an IRQ nor an IO port\n",
resource->type);
+ return AE_CTRL_TERMINATE;

- case ACPI_RESOURCE_TYPE_END_TAG:
- return AE_OK;
}
- return AE_CTRL_TERMINATE;
}

static int sony_pic_possible_resources(struct acpi_device *device)


2019-05-15 16:28:31

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On Wed, May 15, 2019 at 12:54:40PM +0200, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.14.120 release.
> There are 115 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> Anything received after that time might be too late.
>

There is a build error with s390 builds.

arch/s390/kernel/nospec-branch.c: In function 'nospec_auto_detect':
arch/s390/kernel/nospec-branch.c:84:19: error:
invalid storage class for function 'spectre_v2_setup_early'

arch/s390/kernel/nospec-branch.c:96:27: error:
initializer element is not constant

and more. The file has merge damage in function nospec_auto_detect().
Culprit is commit 91788fcb21d0 ("s390/speculation: Support 'mitigations='
cmdline option"). That patch is in v4.14.119, so you'll have to patch
it up manually. Example patch (compile tested) below.

Guenter

---
From c4430ee29bf57cb1327d52b38acf3f616be9d7f5 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <[email protected]>
Date: Wed, 15 May 2019 09:22:31 -0700
Subject: [PATCH] s390/speculation: Fix build error caused by bad backport

The backport of commit 0336e04a6520 ("s390/speculation: Support
'mitigations=' cmdline option") introduces a build error. Fix it up.

Fixes: 91788fcb21d0 ("s390/speculation: Support 'mitigations=' cmdline option")
Signed-off-by: Guenter Roeck <[email protected]>
---
arch/s390/kernel/nospec-branch.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/s390/kernel/nospec-branch.c b/arch/s390/kernel/nospec-branch.c
index 83e597688562..6956902bba12 100644
--- a/arch/s390/kernel/nospec-branch.c
+++ b/arch/s390/kernel/nospec-branch.c
@@ -66,6 +66,7 @@ void __init nospec_auto_detect(void)
if (IS_ENABLED(CC_USING_EXPOLINE))
nospec_disable = 1;
__clear_facility(82, S390_lowcore.alt_stfle_fac_list);
+ }
if (IS_ENABLED(CC_USING_EXPOLINE)) {
/*
* The kernel has been compiled with expolines.
--
2.7.4

2019-05-15 16:43:43

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On Wed, May 15, 2019 at 09:26:38AM -0700, Guenter Roeck wrote:
> On Wed, May 15, 2019 at 12:54:40PM +0200, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 4.14.120 release.
> > There are 115 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> > Anything received after that time might be too late.
> >
>
> There is a build error with s390 builds.
>
> arch/s390/kernel/nospec-branch.c: In function 'nospec_auto_detect':
> arch/s390/kernel/nospec-branch.c:84:19: error:
> invalid storage class for function 'spectre_v2_setup_early'
>
> arch/s390/kernel/nospec-branch.c:96:27: error:
> initializer element is not constant
>
> and more. The file has merge damage in function nospec_auto_detect().
> Culprit is commit 91788fcb21d0 ("s390/speculation: Support 'mitigations='
> cmdline option"). That patch is in v4.14.119, so you'll have to patch
> it up manually. Example patch (compile tested) below.
>
> Guenter
>
> ---
> >From c4430ee29bf57cb1327d52b38acf3f616be9d7f5 Mon Sep 17 00:00:00 2001
> From: Guenter Roeck <[email protected]>
> Date: Wed, 15 May 2019 09:22:31 -0700
> Subject: [PATCH] s390/speculation: Fix build error caused by bad backport
>
> The backport of commit 0336e04a6520 ("s390/speculation: Support
> 'mitigations=' cmdline option") introduces a build error. Fix it up.
>
> Fixes: 91788fcb21d0 ("s390/speculation: Support 'mitigations=' cmdline option")
> Signed-off-by: Guenter Roeck <[email protected]>
> ---
> arch/s390/kernel/nospec-branch.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/s390/kernel/nospec-branch.c b/arch/s390/kernel/nospec-branch.c
> index 83e597688562..6956902bba12 100644
> --- a/arch/s390/kernel/nospec-branch.c
> +++ b/arch/s390/kernel/nospec-branch.c
> @@ -66,6 +66,7 @@ void __init nospec_auto_detect(void)
> if (IS_ENABLED(CC_USING_EXPOLINE))
> nospec_disable = 1;
> __clear_facility(82, S390_lowcore.alt_stfle_fac_list);
> + }
> if (IS_ENABLED(CC_USING_EXPOLINE)) {
> /*
> * The kernel has been compiled with expolines.
> --
> 2.7.4
>

Yes, that backport was broken, good catch. Now queued up, thanks.

greg k-h

2019-05-15 18:09:18

by kernelci.org bot

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

stable-rc/linux-4.14.y boot: 128 boots: 1 failed, 122 passed with 3 offline, 2 conflicts (v4.14.119-116-g7b9ae876e241)

Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.14.y/kernel/v4.14.119-116-g7b9ae876e241/
Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.14.y/kernel/v4.14.119-116-g7b9ae876e241/

Tree: stable-rc
Branch: linux-4.14.y
Git Describe: v4.14.119-116-g7b9ae876e241
Git Commit: 7b9ae876e2410f72fbc14db54f141d516adeabca
Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Tested: 65 unique boards, 23 SoC families, 14 builds out of 201

Boot Regressions Detected:

arm:

multi_v7_defconfig:
gcc-8:
omap4-panda:
lab-baylibre: new failure (last pass: v4.14.119-98-g8d3df192fd69)

Boot Failure Detected:

arm64:
defconfig:
gcc-8:
rk3399-firefly: 1 failed lab

Offline Platforms:

arm:

tegra_defconfig:
gcc-8
tegra20-iris-512: 1 offline lab

multi_v7_defconfig:
gcc-8
stih410-b2120: 1 offline lab
tegra20-iris-512: 1 offline lab

Conflicting Boot Failures Detected: (These likely are not failures as other labs are reporting PASS. Needs review.)

arm:
multi_v7_defconfig:
omap4-panda:
lab-baylibre: FAIL (gcc-8)
lab-baylibre-seattle: PASS (gcc-8)

davinci_all_defconfig:
da850-lcdk:
lab-baylibre: PASS (gcc-8)
lab-baylibre-seattle: FAIL (gcc-8)

---
For more info write to <[email protected]>

2019-05-15 18:18:39

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On Wed, May 15, 2019 at 12:54:40PM +0200, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.14.120 release.
> There are 115 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> Anything received after that time might be too late.
>

mips:malta_defconfig, parisc:defconfig with
CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n:

In file included from crypto/testmgr.c:54:0:
crypto/testmgr.h:16081:4: error:
'const struct cipher_testvec' has no member named 'ptext'
crypto/testmgr.h:16089:4: error:
'const struct cipher_testvec' has no member named 'ctext'

and several more. Commit c97feceb948b6 ("crypto: testmgr - add AES-CFB tests")
[upstream commit 7da66670775d201f633577f5b15a4bbeebaaa2b0] is the culprit -
aplying it to v4.14.y would require a backport.

Guenter

2019-05-15 18:25:55

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On Wed, May 15, 2019 at 11:17:05AM -0700, Guenter Roeck wrote:
> On Wed, May 15, 2019 at 12:54:40PM +0200, Greg Kroah-Hartman wrote:
> > This is the start of the stable review cycle for the 4.14.120 release.
> > There are 115 patches in this series, all will be posted as a response
> > to this one. If anyone has any issues with these being applied, please
> > let me know.
> >
> > Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> > Anything received after that time might be too late.
> >
>
> mips:malta_defconfig, parisc:defconfig with
> CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n:
>
> In file included from crypto/testmgr.c:54:0:
> crypto/testmgr.h:16081:4: error:
> 'const struct cipher_testvec' has no member named 'ptext'
> crypto/testmgr.h:16089:4: error:
> 'const struct cipher_testvec' has no member named 'ctext'
>
> and several more. Commit c97feceb948b6 ("crypto: testmgr - add AES-CFB tests")
> [upstream commit 7da66670775d201f633577f5b15a4bbeebaaa2b0] is the culprit -
> aplying it to v4.14.y would require a backport.

Already dropped. I'll push out a -rc2 as you aren't the only one that
hit this...

thanks,

greg k-h

2019-05-15 18:39:26

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On Wed, May 15, 2019 at 08:24:27PM +0200, Greg Kroah-Hartman wrote:
> On Wed, May 15, 2019 at 11:17:05AM -0700, Guenter Roeck wrote:
> > On Wed, May 15, 2019 at 12:54:40PM +0200, Greg Kroah-Hartman wrote:
> > > This is the start of the stable review cycle for the 4.14.120 release.
> > > There are 115 patches in this series, all will be posted as a response
> > > to this one. If anyone has any issues with these being applied, please
> > > let me know.
> > >
> > > Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> > > Anything received after that time might be too late.
> > >
> >
> > mips:malta_defconfig, parisc:defconfig with
> > CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n:
> >
> > In file included from crypto/testmgr.c:54:0:
> > crypto/testmgr.h:16081:4: error:
> > 'const struct cipher_testvec' has no member named 'ptext'
> > crypto/testmgr.h:16089:4: error:
> > 'const struct cipher_testvec' has no member named 'ctext'
> >
> > and several more. Commit c97feceb948b6 ("crypto: testmgr - add AES-CFB tests")
> > [upstream commit 7da66670775d201f633577f5b15a4bbeebaaa2b0] is the culprit -
> > aplying it to v4.14.y would require a backport.
>
> Already dropped. I'll push out a -rc2 as you aren't the only one that
> hit this...

-rc2 is pushed out now, thanks.

greg k-h

2019-05-16 02:00:43

by Naresh Kamboju

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On Thu, 16 May 2019 at 00:07, Greg Kroah-Hartman
<[email protected]> wrote:
>
> On Wed, May 15, 2019 at 08:24:27PM +0200, Greg Kroah-Hartman wrote:
> > On Wed, May 15, 2019 at 11:17:05AM -0700, Guenter Roeck wrote:
> > > On Wed, May 15, 2019 at 12:54:40PM +0200, Greg Kroah-Hartman wrote:
> > > > This is the start of the stable review cycle for the 4.14.120 release.
> > > > There are 115 patches in this series, all will be posted as a response
> > > > to this one. If anyone has any issues with these being applied, please
> > > > let me know.
> > > >
> > > > Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> > > > Anything received after that time might be too late.
> > > >
> > >
> > > mips:malta_defconfig, parisc:defconfig with
> > > CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n:
> > >
> > > In file included from crypto/testmgr.c:54:0:
> > > crypto/testmgr.h:16081:4: error:
> > > 'const struct cipher_testvec' has no member named 'ptext'
> > > crypto/testmgr.h:16089:4: error:
> > > 'const struct cipher_testvec' has no member named 'ctext'
> > >
> > > and several more. Commit c97feceb948b6 ("crypto: testmgr - add AES-CFB tests")
> > > [upstream commit 7da66670775d201f633577f5b15a4bbeebaaa2b0] is the culprit -
> > > aplying it to v4.14.y would require a backport.
> >
> > Already dropped. I'll push out a -rc2 as you aren't the only one that
> > hit this...
>
> -rc2 is pushed out now, thanks.

4.14.120-rc2 test results report,

Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.

Summary
------------------------------------------------------------------------

kernel: 4.14.120-rc2
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-4.14.y
git commit: 76f297797325042039484d833822c683d6335075
git describe: v4.14.119-115-g76f297797325
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.14-oe/build/v4.14.119-115-g76f297797325

No regressions (compared to build v4.14.119)

No fixes (compared to build v4.14.119)

Ran 23545 total tests in the following environments and test suites.

Environments
--------------
- dragonboard-410c - arm64
- hi6220-hikey - arm64
- i386
- juno-r2 - arm64
- qemu_arm
- qemu_arm64
- qemu_i386
- qemu_x86_64
- x15 - arm
- x86_64

Test Suites
-----------
* build
* install-android-platform-tools-r2600
* kselftest
* libhugetlbfs
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-cpuhotplug-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-timers-tests
* spectre-meltdown-checker-test
* v4l2-compliance
* perf
* ltp-open-posix-tests
* kvm-unit-tests
* ssuite
* kselftest-vsyscall-mode-native
* kselftest-vsyscall-mode-none

--
Linaro LKFT
https://lkft.linaro.org

2019-05-16 03:36:58

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On 5/15/19 3:54 AM, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.14.120 release.
> There are 115 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> Anything received after that time might be too late.
>

For v4.14.119-115-g76f2977:

Build results:
total: 172 pass: 172 fail: 0
Qemu test results:
total: 333 pass: 333 fail: 0

Guenter

2019-05-16 11:04:28

by Jon Hunter

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review


On 15/05/2019 11:54, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.14.120 release.
> There are 115 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> Anything received after that time might be too late.
>
> The whole patch series can be found in one patch at:
> https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.120-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.14.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h

All tests are passing for Tegra ...

Test results for stable-v4.14:
8 builds: 8 pass, 0 fail
16 boots: 16 pass, 0 fail
24 tests: 24 pass, 0 fail

Linux version: 4.14.120-rc1-g7b9ae87
Boards tested: tegra124-jetson-tk1, tegra20-ventana,
tegra210-p2371-2180, tegra30-cardhu-a04

Cheers
Jon

--
nvpublic

2019-05-16 14:07:07

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH 4.14 000/115] 4.14.120-stable review

On 5/15/19 4:54 AM, Greg Kroah-Hartman wrote:
> This is the start of the stable review cycle for the 4.14.120 release.
> There are 115 patches in this series, all will be posted as a response
> to this one. If anyone has any issues with these being applied, please
> let me know.
>
> Responses should be made by Fri 17 May 2019 09:04:39 AM UTC.
> Anything received after that time might be too late.
>
> The whole patch series can be found in one patch at:
> https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.120-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.14.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
>

Compiled and booted on my test system. No dmesg regressions.

thanks,
-- Shuah