Skip to contentSkip to conversation

Linux 4.17.7

DISCUSSION Greg KH 2 participants 4 messages Jul 17, 2018 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

NOTE, this kernel release is broken for i386 systems. If you are running such a machine, do NOT update to this release, you will not be able to boot properly.

I did this release anyway with this known problem as there is a fix in here for x86-64 systems that was nasty to track down and was affecting people. Given that the huge majority of systems are NOT i386, I felt this was a safe release to do at this point in time.

Once the proper fix for i386 systems has been accepted into Linus's tree (it has been posted already), I will pick it up and do a new 4.17.y release so that users of those systems can update.

All users of non-i386 systems running the 4.17 kernel series must upgrade.

The updated 4.17.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.17.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

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

 Documentation/kbuild/kbuild.txt               |    9 
 Makefile                                      |    2 
 arch/arm/boot/dts/armada-38x.dtsi             |    2 
 arch/arm64/include/asm/simd.h                 |   19 
 arch/mips/kernel/process.c                    |   43 -
 arch/mips/kernel/traps.c                      |    1 
 arch/mips/mm/ioremap.c                        |   37 -
 arch/x86/crypto/Makefile                      |    4 
 arch/x86/crypto/salsa20-i586-asm_32.S         |  938 --------------------------
 arch/x86/crypto/salsa20-x86_64-asm_64.S       |  805 ----------------------
 arch/x86/crypto/salsa20_glue.c                |   91 --
 arch/x86/include/asm/vmx.h                    |    3 
 arch/x86/kernel/uprobes.c                     |    2 
 arch/x86/kvm/vmx.c                            |   67 +
 arch/x86/kvm/x86.h                            |    9 
 arch/x86/purgatory/Makefile                   |    2 
 arch/x86/xen/enlighten_pv.c                   |   25 
 arch/x86/xen/irq.c                            |    4 
 block/bsg.c                                   |    2 
 crypto/Kconfig                                |   28 
 crypto/sha3_generic.c                         |    2 
 drivers/acpi/acpica/hwsleep.c                 |   15 
 drivers/acpi/nfit/core.c                      |   44 -
 drivers/acpi/nfit/nfit.h                      |    1 
 drivers/ata/ahci.c                            |   60 +
 drivers/ata/libata-core.c                     |    3 
 drivers/ata/libata-scsi.c                     |   18 
 drivers/block/loop.c                          |   79 +-
 drivers/block/loop.h                          |    1 
 drivers/gpu/drm/etnaviv/etnaviv_drv.c         |   24 
 drivers/gpu/drm/etnaviv/etnaviv_gpu.h         |    3 
 drivers/gpu/drm/etnaviv/etnaviv_sched.c       |   24 
 drivers/i2c/busses/i2c-tegra.c                |   17 
 drivers/i2c/i2c-core-base.c                   |   11 
 drivers/infiniband/Kconfig                    |   11 
 drivers/infiniband/core/Makefile              |    4 
 drivers/infiniband/hw/cxgb4/mem.c             |    2 
 drivers/infiniband/hw/hfi1/rc.c               |    2 
 drivers/infiniband/hw/hfi1/uc.c               |    4 
 drivers/infiniband/hw/hfi1/ud.c               |    4 
 drivers/infiniband/hw/hfi1/verbs_txreq.c      |    4 
 drivers/infiniband/hw/hfi1/verbs_txreq.h      |    4 
 drivers/misc/ibmasm/ibmasmfs.c                |   27 
 drivers/misc/mei/interrupt.c                  |    5 
 drivers/misc/vmw_balloon.c                    |    4 
 drivers/mmc/host/dw_mmc.c                     |    7 
 drivers/mmc/host/renesas_sdhi_internal_dmac.c |    3 
 drivers/mmc/host/sdhci-esdhc-imx.c            |   21 
 drivers/mtd/spi-nor/cadence-quadspi.c         |    6 
 drivers/staging/rtl8723bs/core/rtw_ap.c       |    2 
 drivers/staging/rtlwifi/rtl8822be/hw.c        |    2 
 drivers/staging/rtlwifi/wifi.h                |    1 
 drivers/thunderbolt/domain.c                  |    4 
 drivers/usb/core/quirks.c                     |    4 
 drivers/usb/host/xhci-mem.c                   |    2 
 drivers/usb/misc/yurex.c                      |   23 
 drivers/usb/serial/ch341.c                    |    2 
 drivers/usb/serial/cp210x.c                   |    1 
 drivers/usb/serial/keyspan_pda.c              |    4 
 drivers/usb/serial/mos7840.c                  |    3 
 fs/binfmt_elf.c                               |    5 
 fs/f2fs/f2fs.h                                |   13 
 fs/f2fs/inode.c                               |   33 
 fs/f2fs/node.c                                |   21 
 fs/f2fs/segment.c                             |   25 
 fs/inode.c                                    |    6 
 fs/proc/task_mmu.c                            |    3 
 fs/xfs/libxfs/xfs_ialloc_btree.c              |    2 
 include/linux/libata.h                        |    1 
 kernel/bpf/verifier.c                         |   48 -
 kernel/power/user.c                           |    5 
 kernel/trace/trace.c                          |    8 
 kernel/trace/trace_kprobe.c                   |    6 
 kernel/trace/trace_output.c                   |    5 
 mm/gup.c                                      |    2 
 mm/mmap.c                                     |   29 
 mm/page_alloc.c                               |    4 
 mm/rmap.c                                     |    8 
 net/bridge/netfilter/ebtables.c               |    2 
 net/ipv4/netfilter/ip_tables.c                |    1 
 net/ipv6/netfilter/ip6_tables.c               |    1 
 net/netfilter/nfnetlink_queue.c               |    3 
 sound/pci/hda/patch_hdmi.c                    |   19 
 sound/pci/hda/patch_realtek.c                 |    6 
 tools/build/Build.include                     |    4 
 tools/testing/selftests/bpf/test_verifier.c   |   58 +
 86 files changed, 701 insertions(+), 2168 deletions(-)

Alexander Usyskin (1):
mei: discard messages from not connected client during power down.

Baruch Siach (1):
ARM: dts: armada-38x: use the new thermal binding

Chris Wilson (1):
ALSA: hda - Handle pm failure during hotplug

Christian Borntraeger (1):
mm: do not drop unused pages when userfaultd is running

Damien Le Moal (2):
ata: Fix ZBC_OUT command block check
ata: Fix ZBC_OUT all bit handling

Dan Carpenter (2):
USB: serial: ch341: fix type promotion bug in ch341_control_in()
xhci: xhci-mem: off by one in xhci_stream_id_to_ring()

Dan Williams (1):
acpi, nfit: Fix scrub idle detection

Daniel Borkmann (1):
bpf: reject passing modified ctx to helper functions

Darrick J. Wong (1):
xfs: fix inobt magic number check

Dmitry Vyukov (1):
crypto: don't optimize keccakf()

Eric Biggers (1):
crypto: x86/salsa20 - remove x86 salsa20 implementations

Eric Dumazet (1):
netfilter: nf_queue: augment nfqa_cfg_policy

Fabio Estevam (2):
drm/etnaviv: Check for platform_device_register_simple() failure drm/etnaviv: Fix driver unregistering

Florian Westphal (1):
netfilter: x_tables: initialise match/target check parameter struct

Greg Kroah-Hartman (1):

      Linux 4.17.7

Hans de Goede (1):
ahci: Disable LPM on Lenovo 50 series laptops with a too old BIOS

Hui Wang (1):
ALSA: hda/realtek - two more lenovo models need fixup of MIC_LOCATION

Jaegeuk Kim (4):
f2fs: give message and set need_fsck given broken node id
f2fs: avoid bug_on on corrupted inode
f2fs: sanity check on sit entry
f2fs: sanity check for total valid node blocks

Jann Horn (2):
ibmasm: don't write out of bounds in read handler
USB: yurex: fix out-of-bounds uaccess in read handler

Jiri Olsa (1):
tracing/kprobe: Release kprobe print_fmt properly

Joel Fernandes (Google) (1):
tracing: Reorder display of TGID to be after PID

Johan Hovold (2):
USB: serial: keyspan_pda: fix modem-status error handling
USB: serial: mos7840: fix status-register error handling

Jon Hunter (1):
i2c: tegra: Fix NACK error handling

Juergen Gross (2):
xen: remove global bit from __default_kernel_pte_mask for pv guests
xen: setup pv irq ops vector earlier

Leon Romanovsky (1):
RDMA/ucm: Mark UCM interface as BROKEN

Linus Torvalds (1):
Fix up non-directory creation in SGID directories

Lucas Stach (1):
drm/etnaviv: bring back progress check in job timeout handler

Marc Orr (1):
kvm: vmx: Nested VM-entry prereqs for event inj.

Michael J. Ruhl (1):
IB/hfi1: Fix incorrect mixing of ERR_PTR and NULL return values

Michal Hocko (1):
mm: do not bug_on on incorrect length in __mm_populate()

Mika Westerberg (2):
ahci: Add Intel Ice Lake LP PCI ID
thunderbolt: Notify userspace when boot_acl is changed

Murray McAllister (1):
staging: rtl8723bs: Prevent an underflow in rtw_check_beacon_data().

Nadav Amit (1):
vmw_balloon: fix inflation with batching

Nico Sneck (1):
usb: quirks: add delay quirks for Corsair Strafe

Oleg Nesterov (1):
uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()

Olli Salonen (1):

      USB: serial: cp210x: add another USB ID for Qivicon ZigBee stick

Oscar Salvador (1):
fs, elf: make sure to page align bss in load_elf_library

Paul Burton (3):
MIPS: Call dump_stack() from show_regs()
MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()
MIPS: Fix ioremap() RAM check

Paul Menzel (1):
tools build: fix # escaping in .cmd files for future Make

Pavel Tatashin (1):
mm: zero unavailable pages before memmap init

Philipp Rudo (1):
x86/purgatory: add missing FORCE to Makefile target

Ping-Ke Shih (1):
staging: r8822be: Fix RTL8822be can't find any wireless AP

Rafael J. Wysocki (1):
ACPICA: Clear status of all events when entering S5

Randy Dunlap (1):
kbuild: delete INSTALL_FW_PATH from kbuild documentation

Stefan Agner (1):
mmc: sdhci-esdhc-imx: allow 1.8V modes without 100/200MHz pinctrl states

Steve Wise (1):
iw_cxgb4: correctly enforce the max reg_mr depth

Tetsuo Handa (2):
PM / hibernate: Fix oops at snapshot_write()
loop: remember whether sysfs_create_group() was done

Theodore Ts'o (1):
loop: add recursion validation to LOOP_CHANGE_FD

Tony Battersby (1):
bsg: fix bogus EINVAL on non-data commands

Vignesh R (1):
mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts

Vlastimil Babka (1):
fs/proc/task_mmu.c: fix Locked field in /proc/pid/smaps*

Wolfram Sang (1):
i2c: recovery: if possible send STOP with recovery pulses

Yandong Zhao (1):
arm64: neon: Fix function may_use_simd() return error status

Yoshihiro Shimoda (1):
mmc: renesas_sdhi_internal_dmac: Cannot clear the RX_IN_USE in abort

x00270170 (1):
mmc: dw_mmc: fix card threshold control configuration

author maintainer
#1 lore raw
Documentation/kbuild/kbuild.txt +0 -9
index 6c9c69ec3986..0fa16b461256 100644
@@ -148,15 +148,6 @@ stripped after they are installed.  If INSTALL_MOD_STRIP is '1', then
 the default option --strip-debug will be used.  Otherwise,
 INSTALL_MOD_STRIP value will be used as the options to the strip command.
 
-INSTALL_FW_PATH
---------------------------------------------------
-INSTALL_FW_PATH specifies where to install the firmware blobs.
-The default value is:
-
-    $(INSTALL_MOD_PATH)/lib/firmware
-
-The value can be overridden in which case the default value is ignored.
-
 INSTALL_HDR_PATH
 --------------------------------------------------
 INSTALL_HDR_PATH specifies where to install user space headers when
Makefile +1 -1
index 1a885c8f82ef..5c9f331f29c0 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 17
-SUBLEVEL = 6
+SUBLEVEL = 7
 EXTRAVERSION =
 NAME = Merciless Moray
 
arch/arm/boot/dts/armada-38x.dtsi +1 -1
index 4cc09e43eea2..e8309ecc32b9 100644
@@ -547,7 +547,7 @@
 
 			thermal: thermal@e8078 {
 				compatible = "marvell,armada380-thermal";
-				reg = <0xe4078 0x4>, <0xe4074 0x4>;
+				reg = <0xe4078 0x4>, <0xe4070 0x8>;
 				status = "okay";
 			};
 
arch/arm64/include/asm/simd.h +7 -12
index fa8b3fe932e6..6495cc51246f 100644
@@ -29,20 +29,15 @@ DECLARE_PER_CPU(bool, kernel_neon_busy);
 static __must_check inline bool may_use_simd(void)
 {
 	/*
-	 * The raw_cpu_read() is racy if called with preemption enabled.
-	 * This is not a bug: kernel_neon_busy is only set when
-	 * preemption is disabled, so we cannot migrate to another CPU
-	 * while it is set, nor can we migrate to a CPU where it is set.
-	 * So, if we find it clear on some CPU then we're guaranteed to
-	 * find it clear on any CPU we could migrate to.
-	 *
-	 * If we are in between kernel_neon_begin()...kernel_neon_end(),
-	 * the flag will be set, but preemption is also disabled, so we
-	 * can't migrate to another CPU and spuriously see it become
-	 * false.
+	 * kernel_neon_busy is only set while preemption is disabled,
+	 * and is clear whenever preemption is enabled. Since
+	 * this_cpu_read() is atomic w.r.t. preemption, kernel_neon_busy
+	 * cannot change under our feet -- if it's set we cannot be
+	 * migrated, and if it's clear we cannot be migrated to a CPU
+	 * where it is set.
 	 */
 	return !in_irq() && !irqs_disabled() && !in_nmi() &&
-		!raw_cpu_read(kernel_neon_busy);
+		!this_cpu_read(kernel_neon_busy);
 }
 
 #else /* ! CONFIG_KERNEL_MODE_NEON */
arch/mips/kernel/process.c +29 -14

63 lines not on this page · raw message

arch/mips/kernel/traps.c +1 -0
index 967e9e4e795e..a91777630045 100644
@@ -351,6 +351,7 @@ static void __show_regs(const struct pt_regs *regs)
 void show_regs(struct pt_regs *regs)
 {
 	__show_regs((struct pt_regs *)regs);
+	dump_stack();
 }
 
 void show_registers(struct pt_regs *regs)
arch/mips/mm/ioremap.c +25 -12
index 1986e09fb457..1601d90b087b 100644
@@ -9,6 +9,7 @@
 #include <linux/export.h>
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
+#include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
@@ -98,6 +99,20 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,
 	return error;
 }
 
+static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
+			       void *arg)
+{
+	unsigned long i;
+
+	for (i = 0; i < nr_pages; i++) {
+		if (pfn_valid(start_pfn + i) &&
+		    !PageReserved(pfn_to_page(start_pfn + i)))
+			return 1;
+	}
+
+	return 0;
+}
+
 /*
  * Generic mapping function (not visible outside):
  */
@@ -116,8 +131,8 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,
 
 void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags)
 {
+	unsigned long offset, pfn, last_pfn;
 	struct vm_struct * area;
-	unsigned long offset;
 	phys_addr_t last_addr;
 	void * addr;
 
@@ -137,18 +152,16 @@ void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long
 		return (void __iomem *) CKSEG1ADDR(phys_addr);
 
 	/*
-	 * Don't allow anybody to remap normal RAM that we're using..
+	 * Don't allow anybody to remap RAM that may be allocated by the page
+	 * allocator, since that could lead to races & data clobbering.
 	 */
-	if (phys_addr < virt_to_phys(high_memory)) {
-		char *t_addr, *t_end;
-		struct page *page;
-
-		t_addr = __va(phys_addr);
-		t_end = t_addr + (size - 1);
-
-		for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)
-			if(!PageReserved(page))
-				return NULL;
+	pfn = PFN_DOWN(phys_addr);
+	last_pfn = PFN_DOWN(last_addr);
+	if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
+				  __ioremap_check_ram) == 1) {
+		WARN_ONCE(1, "ioremap on RAM at %pa - %pa\n",
+			  &phys_addr, &last_addr);
+		return NULL;
 	}
 
 	/*
arch/x86/crypto/Makefile +0 -4
index 5f07333bb224..9c903a420cda 100644
@@ -15,7 +15,6 @@ obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o
 
 obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
 obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
-obj-$(CONFIG_CRYPTO_SALSA20_586) += salsa20-i586.o
 obj-$(CONFIG_CRYPTO_SERPENT_SSE2_586) += serpent-sse2-i586.o
 
 obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
@@ -24,7 +23,6 @@ obj-$(CONFIG_CRYPTO_CAMELLIA_X86_64) += camellia-x86_64.o
 obj-$(CONFIG_CRYPTO_BLOWFISH_X86_64) += blowfish-x86_64.o
 obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
 obj-$(CONFIG_CRYPTO_TWOFISH_X86_64_3WAY) += twofish-x86_64-3way.o
-obj-$(CONFIG_CRYPTO_SALSA20_X86_64) += salsa20-x86_64.o
 obj-$(CONFIG_CRYPTO_CHACHA20_X86_64) += chacha20-x86_64.o
 obj-$(CONFIG_CRYPTO_SERPENT_SSE2_X86_64) += serpent-sse2-x86_64.o
 obj-$(CONFIG_CRYPTO_AES_NI_INTEL) += aesni-intel.o
@@ -59,7 +57,6 @@ endif
 
 aes-i586-y := aes-i586-asm_32.o aes_glue.o
 twofish-i586-y := twofish-i586-asm_32.o twofish_glue.o
-salsa20-i586-y := salsa20-i586-asm_32.o salsa20_glue.o
 serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o
 
 aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o
@@ -68,7 +65,6 @@ camellia-x86_64-y := camellia-x86_64-asm_64.o camellia_glue.o
 blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o
 twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_glue.o
 twofish-x86_64-3way-y := twofish-x86_64-asm_64-3way.o twofish_glue_3way.o
-salsa20-x86_64-y := salsa20-x86_64-asm_64.o salsa20_glue.o
 chacha20-x86_64-y := chacha20-ssse3-x86_64.o chacha20_glue.o
 serpent-sse2-x86_64-y := serpent-sse2-x86_64-asm_64.o serpent_sse2_glue.o
 
arch/x86/crypto/salsa20-i586-asm_32.S deleted +0 -938

938 lines not on this page · raw message

arch/x86/crypto/salsa20-x86_64-asm_64.S deleted +0 -805

805 lines not on this page · raw message

arch/x86/crypto/salsa20_glue.c deleted +0 -91

91 lines not on this page · raw message

arch/x86/include/asm/vmx.h +3 -0
index 5db8b0b10766..7cc81c586d71 100644
@@ -114,6 +114,7 @@
 #define VMX_MISC_PREEMPTION_TIMER_RATE_MASK	0x0000001f
 #define VMX_MISC_SAVE_EFER_LMA			0x00000020
 #define VMX_MISC_ACTIVITY_HLT			0x00000040
+#define VMX_MISC_ZERO_LEN_INS			0x40000000
 
 /* VMFUNC functions */
 #define VMX_VMFUNC_EPTP_SWITCHING               0x00000001
@@ -349,11 +350,13 @@ enum vmcs_field {
 #define VECTORING_INFO_VALID_MASK       	INTR_INFO_VALID_MASK
 
 #define INTR_TYPE_EXT_INTR              (0 << 8) /* external interrupt */
+#define INTR_TYPE_RESERVED              (1 << 8) /* reserved */
 #define INTR_TYPE_NMI_INTR		(2 << 8) /* NMI */
 #define INTR_TYPE_HARD_EXCEPTION	(3 << 8) /* processor exception */
 #define INTR_TYPE_SOFT_INTR             (4 << 8) /* software interrupt */
 #define INTR_TYPE_PRIV_SW_EXCEPTION	(5 << 8) /* ICE breakpoint - undocumented */
 #define INTR_TYPE_SOFT_EXCEPTION	(6 << 8) /* software exception */
+#define INTR_TYPE_OTHER_EVENT           (7 << 8) /* other event */
 
 /* GUEST_INTERRUPTIBILITY_INFO flags. */
 #define GUEST_INTR_STATE_STI		0x00000001
arch/x86/kernel/uprobes.c +1 -1
index c84bb5396958..442fae7b8b61 100644
@@ -293,7 +293,7 @@ static int uprobe_init_insn(struct arch_uprobe *auprobe, struct insn *insn, bool
 	insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);
 	/* has the side-effect of processing the entire instruction */
 	insn_get_length(insn);
-	if (WARN_ON_ONCE(!insn_complete(insn)))
+	if (!insn_complete(insn))
 		return -ENOEXEC;
 
 	if (is_prefix_bad(insn))
arch/x86/kvm/vmx.c +67 -0

79 lines not on this page · raw message

arch/x86/kvm/x86.h +9 -0
index 331993c49dae..257f27620bc2 100644
@@ -110,6 +110,15 @@ static inline bool is_la57_mode(struct kvm_vcpu *vcpu)
 #endif
 }
 
+static inline bool x86_exception_has_error_code(unsigned int vector)
+{
+	static u32 exception_has_error_code = BIT(DF_VECTOR) | BIT(TS_VECTOR) |
+			BIT(NP_VECTOR) | BIT(SS_VECTOR) | BIT(GP_VECTOR) |
+			BIT(PF_VECTOR) | BIT(AC_VECTOR);
+
+	return (1U << vector) & exception_has_error_code;
+}
+
 static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)
 {
 	return vcpu->arch.walk_mmu == &vcpu->arch.nested_mmu;
arch/x86/purgatory/Makefile +1 -1
index 2e9ee023e6bc..81a8e33115ad 100644
@@ -6,7 +6,7 @@ purgatory-y := purgatory.o stack.o setup-x86_$(BITS).o sha256.o entry64.o string
 targets += $(purgatory-y)
 PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
 
-$(obj)/sha256.o: $(srctree)/lib/sha256.c
+$(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
 	$(call if_changed_rule,cc_o_c)
 
 LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib
arch/x86/xen/enlighten_pv.c +12 -13
index 357969a3697c..ce8f6a8d4ac9 100644
@@ -1206,12 +1206,20 @@ asmlinkage __visible void __init xen_start_kernel(void)
 
 	xen_setup_features();
 
-	xen_setup_machphys_mapping();
-
 	/* Install Xen paravirt ops */
 	pv_info = xen_info;
 	pv_init_ops.patch = paravirt_patch_default;
 	pv_cpu_ops = xen_cpu_ops;
+	xen_init_irq_ops();
+
+	/*
+	 * Setup xen_vcpu early because it is needed for
+	 * local_irq_disable(), irqs_disabled(), e.g. in printk().
+	 *
+	 * Don't do the full vcpu_info placement stuff until we have
+	 * the cpu_possible_mask and a non-dummy shared_info.
+	 */
+	xen_vcpu_info_reset(0);
 
 	x86_platform.get_nmi_reason = xen_get_nmi_reason;
 
@@ -1224,10 +1232,12 @@ asmlinkage __visible void __init xen_start_kernel(void)
 	 * Set up some pagetable state before starting to set any ptes.
 	 */
 
+	xen_setup_machphys_mapping();
 	xen_init_mmu_ops();
 
 	/* Prevent unwanted bits from being set in PTEs. */
 	__supported_pte_mask &= ~_PAGE_GLOBAL;
+	__default_kernel_pte_mask &= ~_PAGE_GLOBAL;
 
 	/*
 	 * Prevent page tables from being allocated in highmem, even
@@ -1248,20 +1258,9 @@ asmlinkage __visible void __init xen_start_kernel(void)
 	get_cpu_cap(&boot_cpu_data);
 	x86_configure_nx();
 
-	xen_init_irq_ops();
-
 	/* Let's presume PV guests always boot on vCPU with id 0. */
 	per_cpu(xen_vcpu_id, 0) = 0;
 
-	/*
-	 * Setup xen_vcpu early because idt_setup_early_handler needs it for
-	 * local_irq_disable(), irqs_disabled().
-	 *
-	 * Don't do the full vcpu_info placement stuff until we have
-	 * the cpu_possible_mask and a non-dummy shared_info.
-	 */
-	xen_vcpu_info_reset(0);
-
 	idt_setup_early_handler();
 
 	xen_init_capabilities();
arch/x86/xen/irq.c +1 -3
index 74179852e46c..7515a19fd324 100644
@@ -128,8 +128,6 @@ static const struct pv_irq_ops xen_irq_ops __initconst = {
 
 void __init xen_init_irq_ops(void)
 {
-	/* For PVH we use default pv_irq_ops settings. */
-	if (!xen_feature(XENFEAT_hvm_callback_vector))
-		pv_irq_ops = xen_irq_ops;
+	pv_irq_ops = xen_irq_ops;
 	x86_init.irqs.intr_init = xen_init_IRQ;
 }
block/bsg.c +0 -2
index defa06c11858..7a54b645d469 100644
@@ -268,8 +268,6 @@ bsg_map_hdr(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode)
 	} else if (hdr->din_xfer_len) {
 		ret = blk_rq_map_user(q, rq, NULL, uptr64(hdr->din_xferp),
 				hdr->din_xfer_len, GFP_KERNEL);
-	} else {
-		ret = blk_rq_map_user(q, rq, NULL, NULL, 0, GFP_KERNEL);
 	}
 
 	if (ret)
crypto/Kconfig +0 -28
index 76e8c88c97b4..2f4d4f711950 100644
@@ -1335,34 +1335,6 @@ config CRYPTO_SALSA20
 	  The Salsa20 stream cipher algorithm is designed by Daniel J.
 	  Bernstein <[email protected]>. See <http://cr.yp.to/snuffle.html>
 
-config CRYPTO_SALSA20_586
-	tristate "Salsa20 stream cipher algorithm (i586)"
-	depends on (X86 || UML_X86) && !64BIT
-	select CRYPTO_BLKCIPHER
-	select CRYPTO_SALSA20
-	help
-	  Salsa20 stream cipher algorithm.
-
-	  Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
-	  Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
-
-	  The Salsa20 stream cipher algorithm is designed by Daniel J.
-	  Bernstein <[email protected]>. See <http://cr.yp.to/snuffle.html>
-
-config CRYPTO_SALSA20_X86_64
-	tristate "Salsa20 stream cipher algorithm (x86_64)"
-	depends on (X86 || UML_X86) && 64BIT
-	select CRYPTO_BLKCIPHER
-	select CRYPTO_SALSA20
-	help
-	  Salsa20 stream cipher algorithm.
-
-	  Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
-	  Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
-
-	  The Salsa20 stream cipher algorithm is designed by Daniel J.
-	  Bernstein <[email protected]>. See <http://cr.yp.to/snuffle.html>
-
 config CRYPTO_CHACHA20
 	tristate "ChaCha20 cipher algorithm"
 	select CRYPTO_BLKCIPHER
crypto/sha3_generic.c +1 -1
index 264ec12c0b9c..7f6735d9003f 100644
@@ -152,7 +152,7 @@ static SHA3_INLINE void keccakf_round(u64 st[25])
 	st[24] ^= bc[ 4];
 }
 
-static void __optimize("O3") keccakf(u64 st[25])
+static void keccakf(u64 st[25])
 {
 	int round;
 
drivers/acpi/acpica/hwsleep.c +11 -4
index fc0c2e2328cd..fe9d46d81750 100644
@@ -51,16 +51,23 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state)
 		return_ACPI_STATUS(status);
 	}
 
-	/*
-	 * 1) Disable all GPEs
-	 * 2) Enable all wakeup GPEs
-	 */
+	/* Disable all GPEs */
 	status = acpi_hw_disable_all_gpes();
 	if (ACPI_FAILURE(status)) {
 		return_ACPI_STATUS(status);
 	}
+	/*
+	 * If the target sleep state is S5, clear all GPEs and fixed events too
+	 */
+	if (sleep_state == ACPI_STATE_S5) {
+		status = acpi_hw_clear_acpi_status();
+		if (ACPI_FAILURE(status)) {
+			return_ACPI_STATUS(status);
+		}
+	}
 	acpi_gbl_system_awake_and_running = FALSE;
 
+	 /* Enable all wakeup GPEs */
 	status = acpi_hw_enable_all_wakeup_gpes();
 	if (ACPI_FAILURE(status)) {
 		return_ACPI_STATUS(status);
drivers/acpi/nfit/core.c +33 -11

74 lines not on this page · raw message

drivers/acpi/nfit/nfit.h +1 -0
index 7d15856a739f..a97ff42fe311 100644
@@ -203,6 +203,7 @@ struct acpi_nfit_desc {
 	unsigned int max_ars;
 	unsigned int scrub_count;
 	unsigned int scrub_mode;
+	unsigned int scrub_busy:1;
 	unsigned int cancel:1;
 	unsigned long dimm_cmd_force_en;
 	unsigned long bus_cmd_force_en;
drivers/ata/ahci.c +60 -0

78 lines not on this page · raw message

drivers/ata/libata-core.c +3 -0
index 9bfd2f7e4542..55cbaab4bc20 100644
@@ -2502,6 +2502,9 @@ int ata_dev_configure(struct ata_device *dev)
 	    (id[ATA_ID_SATA_CAPABILITY] & 0xe) == 0x2)
 		dev->horkage |= ATA_HORKAGE_NOLPM;
 
+	if (ap->flags & ATA_FLAG_NO_LPM)
+		dev->horkage |= ATA_HORKAGE_NOLPM;
+
 	if (dev->horkage & ATA_HORKAGE_NOLPM) {
 		ata_dev_warn(dev, "LPM support broken, forcing max_power\n");
 		dev->link->ap->target_lpm_policy = ATA_LPM_MAX_POWER;
drivers/ata/libata-scsi.c +12 -6
index 89a9d4a2efc8..c0ac1ea3e7a3 100644
@@ -3802,10 +3802,20 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
 		 */
 		goto invalid_param_len;
 	}
-	if (block > dev->n_sectors)
-		goto out_of_range;
 
 	all = cdb[14] & 0x1;
+	if (all) {
+		/*
+		 * Ignore the block address (zone ID) as defined by ZBC.
+		 */
+		block = 0;
+	} else if (block >= dev->n_sectors) {
+		/*
+		 * Block must be a valid zone ID (a zone start LBA).
+		 */
+		fp = 2;
+		goto invalid_fld;
+	}
 
 	if (ata_ncq_enabled(qc->dev) &&
 	    ata_fpdma_zac_mgmt_out_supported(qc->dev)) {
@@ -3834,10 +3844,6 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
  invalid_fld:
 	ata_scsi_set_invalid_field(qc->dev, scmd, fp, 0xff);
 	return 1;
- out_of_range:
-	/* "Logical Block Address out of range" */
-	ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x21, 0x00);
-	return 1;
 invalid_param_len:
 	/* "Parameter list length error" */
 	ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x1a, 0x0);
drivers/block/loop.c +44 -35

129 lines not on this page · raw message

drivers/block/loop.h +1 -0
index b78de9879f4f..4d42c7af7de7 100644
@@ -58,6 +58,7 @@ struct loop_device {
 	struct kthread_worker	worker;
 	struct task_struct	*worker_task;
 	bool			use_dio;
+	bool			sysfs_inited;
 
 	struct request_queue	*lo_queue;
 	struct blk_mq_tag_set	tag_set;
drivers/gpu/drm/etnaviv/etnaviv_drv.c +20 -4
index ab50090d066c..ff1a9ffbf17f 100644
@@ -693,8 +693,11 @@ static struct platform_driver etnaviv_platform_driver = {
 	},
 };
 
+static struct platform_device *etnaviv_drm;
+
 static int __init etnaviv_init(void)
 {
+	struct platform_device *pdev;
 	int ret;
 	struct device_node *np;
 
@@ -706,7 +709,7 @@ static int __init etnaviv_init(void)
 
 	ret = platform_driver_register(&etnaviv_platform_driver);
 	if (ret != 0)
-		platform_driver_unregister(&etnaviv_gpu_driver);
+		goto unregister_gpu_driver;
 
 	/*
 	 * If the DT contains at least one available GPU device, instantiate
@@ -715,20 +718,33 @@ static int __init etnaviv_init(void)
 	for_each_compatible_node(np, NULL, "vivante,gc") {
 		if (!of_device_is_available(np))
 			continue;
-
-		platform_device_register_simple("etnaviv", -1, NULL, 0);
+		pdev = platform_device_register_simple("etnaviv", -1,
+						       NULL, 0);
+		if (IS_ERR(pdev)) {
+			ret = PTR_ERR(pdev);
+			of_node_put(np);
+			goto unregister_platform_driver;
+		}
+		etnaviv_drm = pdev;
 		of_node_put(np);
 		break;
 	}
 
+	return 0;
+
+unregister_platform_driver:
+	platform_driver_unregister(&etnaviv_platform_driver);
+unregister_gpu_driver:
+	platform_driver_unregister(&etnaviv_gpu_driver);
 	return ret;
 }
 module_init(etnaviv_init);
 
 static void __exit etnaviv_exit(void)
 {
-	platform_driver_unregister(&etnaviv_gpu_driver);
+	platform_device_unregister(etnaviv_drm);
 	platform_driver_unregister(&etnaviv_platform_driver);
+	platform_driver_unregister(&etnaviv_gpu_driver);
 }
 module_exit(etnaviv_exit);
 
drivers/gpu/drm/etnaviv/etnaviv_gpu.h +3 -0
index 3c3005501846..feb3c6fab382 100644
@@ -142,6 +142,9 @@ struct etnaviv_gpu {
 	struct work_struct sync_point_work;
 	int sync_point_event;
 
+	/* hang detection */
+	u32 hangcheck_dma_addr;
+
 	void __iomem *mmio;
 	int irq;
 
drivers/gpu/drm/etnaviv/etnaviv_sched.c +24 -0
index 6cf0775dbcd7..506b05a67dfe 100644
@@ -21,6 +21,7 @@
 #include "etnaviv_gem.h"
 #include "etnaviv_gpu.h"
 #include "etnaviv_sched.h"
+#include "state.xml.h"
 
 static int etnaviv_job_hang_limit = 0;
 module_param_named(job_hang_limit, etnaviv_job_hang_limit, int , 0444);
@@ -96,6 +97,29 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job)
 {
 	struct etnaviv_gem_submit *submit = to_etnaviv_submit(sched_job);
 	struct etnaviv_gpu *gpu = submit->gpu;
+	u32 dma_addr;
+	int change;
+
+	/*
+	 * If the GPU managed to complete this jobs fence, the timout is
+	 * spurious. Bail out.
+	 */
+	if (fence_completed(gpu, submit->out_fence->seqno))
+		return;
+
+	/*
+	 * If the GPU is still making forward progress on the front-end (which
+	 * should never loop) we shift out the timeout to give it a chance to
+	 * finish the job.
+	 */
+	dma_addr = gpu_read(gpu, VIVS_FE_DMA_ADDRESS);
+	change = dma_addr - gpu->hangcheck_dma_addr;
+	if (change < 0 || change > 16) {
+		gpu->hangcheck_dma_addr = dma_addr;
+		schedule_delayed_work(&sched_job->work_tdr,
+				      sched_job->sched->timeout);
+		return;
+	}
 
 	/* block scheduler */
 	kthread_park(gpu->sched.thread);
drivers/i2c/busses/i2c-tegra.c +8 -9
index 60292d243e24..ec2d11af6c78 100644
@@ -547,6 +547,14 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev)
 {
 	u32 cnfg;
 
+	/*
+	 * NACK interrupt is generated before the I2C controller generates
+	 * the STOP condition on the bus. So wait for 2 clock periods
+	 * before disabling the controller so that the STOP condition has
+	 * been delivered properly.
+	 */
+	udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
+
 	cnfg = i2c_readl(i2c_dev, I2C_CNFG);
 	if (cnfg & I2C_CNFG_PACKET_MODE_EN)
 		i2c_writel(i2c_dev, cnfg & ~I2C_CNFG_PACKET_MODE_EN, I2C_CNFG);
@@ -708,15 +716,6 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
 	if (likely(i2c_dev->msg_err == I2C_ERR_NONE))
 		return 0;
 
-	/*
-	 * NACK interrupt is generated before the I2C controller generates
-	 * the STOP condition on the bus. So wait for 2 clock periods
-	 * before resetting the controller so that the STOP condition has
-	 * been delivered properly.
-	 */
-	if (i2c_dev->msg_err == I2C_ERR_NO_ACK)
-		udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
-
 	tegra_i2c_init(i2c_dev);
 	if (i2c_dev->msg_err == I2C_ERR_NO_ACK) {
 		if (msg->flags & I2C_M_IGNORE_NAK)
drivers/i2c/i2c-core-base.c +10 -1
index 1ba40bb2b966..1b6e80123fba 100644
@@ -198,7 +198,16 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap)
 
 		val = !val;
 		bri->set_scl(adap, val);
-		ndelay(RECOVERY_NDELAY);
+
+		/*
+		 * If we can set SDA, we will always create STOP here to ensure
+		 * the additional pulses will do no harm. This is achieved by
+		 * letting SDA follow SCL half a cycle later.
+		 */
+		ndelay(RECOVERY_NDELAY / 2);
+		if (bri->set_sda)
+			bri->set_sda(adap, val);
+		ndelay(RECOVERY_NDELAY / 2);
 	}
 
 	/* check if recovery actually succeeded */
drivers/infiniband/Kconfig +11 -0
index 2a972ed6851b..b03af54367c0 100644
@@ -35,6 +35,17 @@ config INFINIBAND_USER_ACCESS
 	  libibverbs, libibcm and a hardware driver library from
 	  rdma-core <https://github.com/linux-rdma/rdma-core>.
 
+config INFINIBAND_USER_ACCESS_UCM
+	bool "Userspace CM (UCM, DEPRECATED)"
+	depends on BROKEN
+	depends on INFINIBAND_USER_ACCESS
+	help
+	  The UCM module has known security flaws, which no one is
+	  interested to fix. The user-space part of this code was
+	  dropped from the upstream a long time ago.
+
+	  This option is DEPRECATED and planned to be removed.
+
 config INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI
 	bool "Allow experimental legacy verbs in new ioctl uAPI  (EXPERIMENTAL)"
 	depends on INFINIBAND_USER_ACCESS
drivers/infiniband/core/Makefile +2 -2
index dda9e856e3fa..e1acbf5f87f1 100644
@@ -5,8 +5,8 @@ user_access-$(CONFIG_INFINIBAND_ADDR_TRANS)	:= rdma_ucm.o
 obj-$(CONFIG_INFINIBAND) +=		ib_core.o ib_cm.o iw_cm.o \
 					$(infiniband-y)
 obj-$(CONFIG_INFINIBAND_USER_MAD) +=	ib_umad.o
-obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=	ib_uverbs.o ib_ucm.o \
-					$(user_access-y)
+obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o $(user_access-y)
+obj-$(CONFIG_INFINIBAND_USER_ACCESS_UCM) += ib_ucm.o $(user_access-y)
 
 ib_core-y :=			packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \
 				device.o fmr_pool.o cache.o netlink.o \
drivers/infiniband/hw/cxgb4/mem.c +1 -1
index 1445918e3239..7b76e6f81aeb 100644
@@ -774,7 +774,7 @@ static int c4iw_set_page(struct ib_mr *ibmr, u64 addr)
 {
 	struct c4iw_mr *mhp = to_c4iw_mr(ibmr);
 
-	if (unlikely(mhp->mpl_len == mhp->max_mpl_len))
+	if (unlikely(mhp->mpl_len == mhp->attr.pbl_size))
 		return -ENOMEM;
 
 	mhp->mpl[mhp->mpl_len++] = addr;
drivers/infiniband/hw/hfi1/rc.c +1 -1
index da58046a02ea..295d3c40a994 100644
@@ -271,7 +271,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
 
 	lockdep_assert_held(&qp->s_lock);
 	ps->s_txreq = get_txreq(ps->dev, qp);
-	if (IS_ERR(ps->s_txreq))
+	if (!ps->s_txreq)
 		goto bail_no_tx;
 
 	if (priv->hdr_type == HFI1_PKT_TYPE_9B) {
drivers/infiniband/hw/hfi1/uc.c +2 -2
index 9d7a3110c14c..d140aaccdf14 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2015, 2016 Intel Corporation.
+ * Copyright(c) 2015 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -72,7 +72,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
 	int middle = 0;
 
 	ps->s_txreq = get_txreq(ps->dev, qp);
-	if (IS_ERR(ps->s_txreq))
+	if (!ps->s_txreq)
 		goto bail_no_tx;
 
 	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_SEND_OK)) {
drivers/infiniband/hw/hfi1/ud.c +2 -2
index 69c17a5ef038..3ae10530f754 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2015, 2016 Intel Corporation.
+ * Copyright(c) 2015 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -482,7 +482,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
 	u32 lid;
 
 	ps->s_txreq = get_txreq(ps->dev, qp);
-	if (IS_ERR(ps->s_txreq))
+	if (!ps->s_txreq)
 		goto bail_no_tx;
 
 	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_NEXT_SEND_OK)) {
drivers/infiniband/hw/hfi1/verbs_txreq.c +2 -2
index 873e48ea923f..c4ab2d5b4502 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2016 - 2017 Intel Corporation.
+ * Copyright(c) 2016 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -94,7 +94,7 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev,
 				struct rvt_qp *qp)
 	__must_hold(&qp->s_lock)
 {
-	struct verbs_txreq *tx = ERR_PTR(-EBUSY);
+	struct verbs_txreq *tx = NULL;
 
 	write_seqlock(&dev->txwait_lock);
 	if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) {
drivers/infiniband/hw/hfi1/verbs_txreq.h +2 -2
index 729244c3086c..1c19bbc764b2 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2016 Intel Corporation.
+ * Copyright(c) 2016 - 2018 Intel Corporation.
  *
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -83,7 +83,7 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,
 	if (unlikely(!tx)) {
 		/* call slow path to get the lock */
 		tx = __get_txreq(dev, qp);
-		if (IS_ERR(tx))
+		if (!tx)
 			return tx;
 	}
 	tx->qp = qp;
drivers/misc/ibmasm/ibmasmfs.c +3 -24
index e05c3245930a..fa840666bdd1 100644
@@ -507,35 +507,14 @@ static int remote_settings_file_close(struct inode *inode, struct file *file)
 static ssize_t remote_settings_file_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
 	void __iomem *address = (void __iomem *)file->private_data;
-	unsigned char *page;
-	int retval;
 	int len = 0;
 	unsigned int value;
-
-	if (*offset < 0)
-		return -EINVAL;
-	if (count == 0 || count > 1024)
-		return 0;
-	if (*offset != 0)
-		return 0;
-
-	page = (unsigned char *)__get_free_page(GFP_KERNEL);
-	if (!page)
-		return -ENOMEM;
+	char lbuf[20];
 
 	value = readl(address);
-	len = sprintf(page, "%d\n", value);
-
-	if (copy_to_user(buf, page, len)) {
-		retval = -EFAULT;
-		goto exit;
-	}
-	*offset += len;
-	retval = len;
+	len = snprintf(lbuf, sizeof(lbuf), "%d\n", value);
 
-exit:
-	free_page((unsigned long)page);
-	return retval;
+	return simple_read_from_buffer(buf, count, offset, lbuf, len);
 }
 
 static ssize_t remote_settings_file_write(struct file *file, const char __user *ubuff, size_t count, loff_t *offset)
drivers/misc/mei/interrupt.c +4 -1
index b0b8f18a85e3..6649f0d56d2f 100644
@@ -310,8 +310,11 @@ int mei_irq_read_handler(struct mei_device *dev,
 	if (&cl->link == &dev->file_list) {
 		/* A message for not connected fixed address clients
 		 * should be silently discarded
+		 * On power down client may be force cleaned,
+		 * silently discard such messages
 		 */
-		if (hdr_is_fixed(mei_hdr)) {
+		if (hdr_is_fixed(mei_hdr) ||
+		    dev->dev_state == MEI_DEV_POWER_DOWN) {
 			mei_irq_discard_msg(dev, mei_hdr);
 			ret = 0;
 			goto reset_slots;
drivers/misc/vmw_balloon.c +2 -2
index efd733472a35..56c6f79a5c5a 100644
@@ -467,7 +467,7 @@ static int vmballoon_send_batched_lock(struct vmballoon *b,
 		unsigned int num_pages, bool is_2m_pages, unsigned int *target)
 {
 	unsigned long status;
-	unsigned long pfn = page_to_pfn(b->page);
+	unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));
 
 	STATS_INC(b->stats.lock[is_2m_pages]);
 
@@ -515,7 +515,7 @@ static bool vmballoon_send_batched_unlock(struct vmballoon *b,
 		unsigned int num_pages, bool is_2m_pages, unsigned int *target)
 {
 	unsigned long status;
-	unsigned long pfn = page_to_pfn(b->page);
+	unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));
 
 	STATS_INC(b->stats.unlock[is_2m_pages]);
 
drivers/mmc/host/dw_mmc.c +4 -3
index 29a1afa81f66..3ee8f57fd612 100644
@@ -1065,8 +1065,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
 	 * It's used when HS400 mode is enabled.
 	 */
 	if (data->flags & MMC_DATA_WRITE &&
-		!(host->timing != MMC_TIMING_MMC_HS400))
-		return;
+		host->timing != MMC_TIMING_MMC_HS400)
+		goto disable;
 
 	if (data->flags & MMC_DATA_WRITE)
 		enable = SDMMC_CARD_WR_THR_EN;
@@ -1074,7 +1074,8 @@ static void dw_mci_ctrl_thld(struct dw_mci *host, struct mmc_data *data)
 		enable = SDMMC_CARD_RD_THR_EN;
 
 	if (host->timing != MMC_TIMING_MMC_HS200 &&
-	    host->timing != MMC_TIMING_UHS_SDR104)
+	    host->timing != MMC_TIMING_UHS_SDR104 &&
+	    host->timing != MMC_TIMING_MMC_HS400)
 		goto disable;
 
 	blksz_depth = blksz / (1 << host->data_shift);
drivers/mmc/host/renesas_sdhi_internal_dmac.c +1 -2
index eb027cdc8f24..8d19b5903fd1 100644
@@ -139,8 +139,7 @@ renesas_sdhi_internal_dmac_abort_dma(struct tmio_mmc_host *host) {
 	renesas_sdhi_internal_dmac_dm_write(host, DM_CM_RST,
 					    RST_RESERVED_BITS | val);
 
-	if (host->data && host->data->flags & MMC_DATA_READ)
-		clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);
+	clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);
 
 	renesas_sdhi_internal_dmac_enable_dma(host, true);
 }
drivers/mmc/host/sdhci-esdhc-imx.c +9 -12
index cd2b5f643a15..6891be4ff9f1 100644
@@ -306,6 +306,15 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
 
 			if (imx_data->socdata->flags & ESDHC_FLAG_HS400)
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/mtd/spi-nor/cadence-quadspi.c +4 -2
index 5872f31eaa60..5cf9ef6cf259 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8723bs/core/rtw_ap.c +1 -1
index 0b530ea7fd81..4b39b7ddf506 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtlwifi/rtl8822be/hw.c +1 -1
index 74386003044f..c6db2bd20594 100644

Lines of this file are not shown. View the raw message.

drivers/staging/rtlwifi/wifi.h +1 -0
index a23bb1719e35..0ab1e2d50535 100644

Lines of this file are not shown. View the raw message.

drivers/thunderbolt/domain.c +4 -0
index 6281266b8ec0..a923ebdeb73c 100644

Lines of this file are not shown. View the raw message.

drivers/usb/core/quirks.c +4 -0
index c55def2f1320..097057d2eacf 100644

Lines of this file are not shown. View the raw message.

drivers/usb/host/xhci-mem.c +1 -1
index 99e7547f234f..0b424a4b58ec 100644

Lines of this file are not shown. View the raw message.

drivers/usb/misc/yurex.c +6 -17
index 8abb6cbbd98a..3be40eaa1ac9 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/ch341.c +1 -1
index bdd7a5ad3bf1..3bb1fff02bed 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/cp210x.c +1 -0
index ee0cc1d90b51..626a29d9aa58 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/keyspan_pda.c +3 -1
index 5169624d8b11..38d43c4b7ce5 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/mos7840.c +3 -0
index fdceb46d9fc6..b580b4c7fa48 100644

Lines of this file are not shown. View the raw message.

fs/binfmt_elf.c +2 -3
index 4ad6f669fe34..39d3a724a4b4 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/f2fs.h +1 -12
index 1df7f10476d6..20149b8771d9 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/inode.c +25 -8
index f8ef04c9f69d..3d91bea4ec90 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/node.c +19 -2
index f202398e20ea..de48222f48e3 100644

Lines of this file are not shown. View the raw message.

fs/f2fs/segment.c +25 -0
index be8d1b16b8d1..cffaf842f4e7 100644

Lines of this file are not shown. View the raw message.

fs/inode.c +6 -0
index 3b55391072f3..6c6fef8c7c27 100644

Lines of this file are not shown. View the raw message.

fs/proc/task_mmu.c +2 -1
index c486ad4b43f0..b0abfe02beab 100644

Lines of this file are not shown. View the raw message.

fs/xfs/libxfs/xfs_ialloc_btree.c +1 -1
index 367e9a0726e6..ead8c4842c29 100644

Lines of this file are not shown. View the raw message.

include/linux/libata.h +1 -0
index 1795fecdea17..6fed495af95c 100644

Lines of this file are not shown. View the raw message.

kernel/bpf/verifier.c +31 -17

48 lines not on this page · raw message

kernel/power/user.c +5 -0
index 75c959de4b29..abd225550271 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace.c +4 -4
index bcd93031d042..4e67d0020337 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace_kprobe.c +5 -1
index 02aed76e0978..eebc7c92f6d0 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace_output.c +3 -2
index 90db994ac900..1c8e30fda46a 100644

Lines of this file are not shown. View the raw message.

mm/gup.c +0 -2
index 3d8472d48a0b..e608e6650d60 100644

Lines of this file are not shown. View the raw message.

mm/mmap.c +12 -17
index fc41c0543d7f..540cfab8c2c4 100644

Lines of this file are not shown. View the raw message.

mm/page_alloc.c +2 -2
index d2d0eb9536a3..322cb12a142f 100644

Lines of this file are not shown. View the raw message.

mm/rmap.c +7 -1
index 8d5337fed37b..09a799c9aebd 100644

Lines of this file are not shown. View the raw message.

net/bridge/netfilter/ebtables.c +2 -0
index 6ba639f6c51d..499123afcab5 100644

Lines of this file are not shown. View the raw message.

net/ipv4/netfilter/ip_tables.c +1 -0
index e85f35b89c49..f6130704f052 100644

Lines of this file are not shown. View the raw message.

net/ipv6/netfilter/ip6_tables.c +1 -0
index 97f79dc943d7..685c2168f524 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nfnetlink_queue.c +3 -0
index 74a04638ef03..93b3e4b86870 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_hdmi.c +14 -5
index ed39a77f9253..76d82eebeef2 100644

Lines of this file are not shown. View the raw message.

sound/pci/hda/patch_realtek.c +5 -1
index cb9a977bf188..066efe783fe8 100644

Lines of this file are not shown. View the raw message.

tools/build/Build.include +2 -2
index a4bbb984941d..d9048f145f97 100644

Lines of this file are not shown. View the raw message.

tools/testing/selftests/bpf/test_verifier.c +57 -1

58 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#2 lore raw
In reply to Greg KH
Quoted 4 lines · Greg KH

NOTE, this kernel release is broken for i386 systems. If you are running such a machine, do NOT update to this release, you will not be able to boot properly.

Quoted 9 lines

I did this release anyway with this known problem as there is a fix in here for x86-64 systems that was nasty to track down and was affecting people. Given that the huge majority of systems are NOT i386, I felt this was a safe release to do at this point in time.

Once the proper fix for i386 systems has been accepted into Linus's tree (it has been posted already), I will pick it up and do a new 4.17.y release so that users of those systems can update.

Just a heads up, it was picked up by Linux yesterday but it wasn't tagged for stable: d1b47a7c9efc ("mm: don't do zero_resv_unavail if memmap is not allocated").

author maintainer
#3 lore raw
Quoted 10 lines · Nathan Chancellor
Quoted 9 lines · Greg KH

NOTE, this kernel release is broken for i386 systems. If you are running such a machine, do NOT update to this release, you will not be able to boot properly.

I did this release anyway with this known problem as there is a fix in here for x86-64 systems that was nasty to track down and was affecting people. Given that the huge majority of systems are NOT i386, I felt this was a safe release to do at this point in time.

Quoted 8 lines
Quoted 4 lines

Once the proper fix for i386 systems has been accepted into Linus's tree (it has been posted already), I will pick it up and do a new 4.17.y release so that users of those systems can update.

Just a heads up, it was picked up by Linux yesterday but it wasn't tagged for stable: d1b47a7c9efc ("mm: don't do zero_resv_unavail if memmap is not allocated").

Ah, I missed that! Now queued up, let's run this on my build system and then push it out for the world to test in a few hours.

thanks,

greg k-h