Merge 4.4.173 into kernel.lnx.4.4.r34-rel

Changes in 4.4.173: (55 commits)
        net: Fix usage of pskb_trim_rcsum
        openvswitch: Avoid OOB read when parsing flow nlattrs
        net: ipv4: Fix memory leak in network namespace dismantle
        net_sched: refetch skb protocol for each filter
        net: bridge: Fix ethernet header pointer before check skb forwardable
        USB: serial: simple: add Motorola Tetra TPG2200 device id
        USB: serial: pl2303: add new PID to support PL2303TB
        ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
        ARC: perf: map generic branches to correct hardware condition
        s390/early: improve machine detection
        s390/smp: fix CPU hotplug deadlock with CPU rescan
        char/mwave: fix potential Spectre v1 vulnerability
        staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1
        tty: Handle problem if line discipline does not have receive_buf
        tty/n_hdlc: fix __might_sleep warning
        CIFS: Fix possible hang during async MTU reads and writes
        Input: xpad - add support for SteelSeries Stratus Duo
        KVM: x86: Fix single-step debugging
        x86/kaslr: Fix incorrect i8254 outb() parameters
        can: dev: __can_get_echo_skb(): fix bogous check for non-existing skb by removing it
        can: bcm: check timer values before ktime conversion
        vt: invoke notifier on screen size change
        perf unwind: Unwind with libdw doesn't take symfs into account
        perf unwind: Take pgoff into account when reporting elf to libdwfl
        irqchip/gic-v3-its: Align PCI Multi-MSI allocation on their size
        arm64: mm: remove page_mapping check in __sync_icache_dcache
        f2fs: read page index before freeing
        Revert "loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()"
        Revert "loop: Get rid of loop_index_mutex"
        Revert "loop: Fold __loop_release into loop_release"
        s390/smp: Fix calling smp_call_ipl_cpu() from ipl CPU
        fs: add the fsnotify call to vfs_iter_write
        ipv6: Consider sk_bound_dev_if when binding a socket to an address
        l2tp: copy 4 more bytes to linear part if necessary
        net/mlx4_core: Add masking for a few queries on HCA caps
        netrom: switch to sock timer API
        net/rose: fix NULL ax25_cb kernel panic
        ucc_geth: Reset BQL queue when stopping device
        l2tp: remove l2specific_len dependency in l2tp_core
        l2tp: fix reading optional fields of L2TPv3
        CIFS: Do not count -ENODATA as failure for query directory
        fs/dcache: Fix incorrect nr_dentry_unused accounting in shrink_dcache_sb()
        ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
        arm64: hyp-stub: Forbid kprobing of the hyp-stub
        gfs2: Revert "Fix loop in gfs2_rbm_find"
        platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
        platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
        mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
        kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
        mm, oom: fix use-after-free in oom_kill_process
        cifs: Always resolve hostname before reconnecting
        drivers: core: Remove glue dirs from sysfs earlier
        mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
        fs: don't scan the inode cache before SB_BORN is set
        Linux 4.4.173

Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Conflicts:
	arch/arm64/mm/flush.c
	mm/migrate.c

Author: nathanchance

Makefile

@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 4
-SUBLEVEL = 172
+SUBLEVEL = 173
 EXTRAVERSION =
 NAME = Blurry Fish Butt
 

arch/arc/include/asm/perf_event.h

@@ -103,7 +103,8 @@ static const char * const arc_pmu_ev_hw_map[] = {
 
 	/* counts condition */
 	[PERF_COUNT_HW_INSTRUCTIONS] = "iall",
-	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmp", /* Excludes ZOL jumps */
+	/* All jump instructions that are taken */
+	[PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmptak",
 	[PERF_COUNT_ARC_BPOK]         = "bpok",	  /* NP-NT, PT-T, PNT-NT */
 #ifdef CONFIG_ISA_ARCV2
 	[PERF_COUNT_HW_BRANCH_MISSES] = "bpmp",

arch/arm/mach-cns3xxx/pcie.c

@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus,
 	} else /* remote PCI bus */
 		base = cnspci->cfg1_regs + ((busno & 0xf) << 20);
 
-	return base + (where & 0xffc) + (devfn << 12);
+	return base + where + (devfn << 12);
 }
 
 static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,

arch/arm64/kernel/hyp-stub.S

@@ -28,6 +28,8 @@
 #include <asm/virt.h>
 
 	.text
+	.pushsection	.hyp.text, "ax"
+
 	.align 11
 
 ENTRY(__hyp_stub_vectors)

arch/arm64/mm/flush.c

@@ -75,10 +75,6 @@ void __sync_icache_dcache(pte_t pte, unsigned long addr)
 {
 	struct page *page = pte_page(pte);
 
-	/* no flushing needed for anonymous pages */
-	if (!page_mapping(page))
-		return;
-
 	if (!test_and_set_bit(PG_dcache_clean, &page->flags))
 		sync_icache_aliases(page_address(page),
 				    PAGE_SIZE << compound_order(page));

arch/s390/kernel/early.c

@@ -224,10 +224,10 @@ static noinline __init void detect_machine_type(void)
 	if (stsi(vmms, 3, 2, 2) || !vmms->count)
 		return;
 
-	/* Running under KVM? If not we assume z/VM */
+	/* Detect known hypervisors */
 	if (!memcmp(vmms->vm[0].cpi, "\xd2\xe5\xd4", 3))
 		S390_lowcore.machine_flags |= MACHINE_FLAG_KVM;
-	else
+	else if (!memcmp(vmms->vm[0].cpi, "\xa9\x61\xe5\xd4", 4))
 		S390_lowcore.machine_flags |= MACHINE_FLAG_VM;
 }
 

arch/s390/kernel/setup.c

@@ -833,6 +833,8 @@ void __init setup_arch(char **cmdline_p)
 		pr_info("Linux is running under KVM in 64-bit mode\n");
 	else if (MACHINE_IS_LPAR)
 		pr_info("Linux is running natively in 64-bit mode\n");
+	else
+		pr_info("Linux is running as a guest in 64-bit mode\n");
 
 	/* Have one command line that is parsed and saved in /proc/cmdline */
 	/* boot_command_line has been already set up in early.c */

arch/s390/kernel/smp.c

@@ -360,9 +360,13 @@ void smp_call_online_cpu(void (*func)(void *), void *data)
  */
 void smp_call_ipl_cpu(void (*func)(void *), void *data)
 {
+	struct _lowcore *lc = pcpu_devices->lowcore;
+
+	if (pcpu_devices[0].address == stap())
+		lc = &S390_lowcore;
+
 	pcpu_delegate(&pcpu_devices[0], func, data,
-		      pcpu_devices->lowcore->panic_stack -
-		      PANIC_FRAME_OFFSET + PAGE_SIZE);
+		      lc->panic_stack - PANIC_FRAME_OFFSET + PAGE_SIZE);
 }
 
 int smp_find_processor_id(u16 address)
@@ -1152,7 +1156,11 @@ static ssize_t __ref rescan_store(struct device *dev,
 {
 	int rc;
 
+	rc = lock_device_hotplug_sysfs();
+	if (rc)
+		return rc;
 	rc = smp_rescan_cpus();
+	unlock_device_hotplug();
 	return rc ? rc : count;
 }
 static DEVICE_ATTR(rescan, 0200, NULL, rescan_store);

arch/x86/boot/compressed/aslr.c

@@ -25,8 +25,8 @@ static inline u16 i8254(void)
 	u16 status, timer;
 
 	do {
-		outb(I8254_PORT_CONTROL,
-		     I8254_CMD_READBACK | I8254_SELECT_COUNTER0);
+		outb(I8254_CMD_READBACK | I8254_SELECT_COUNTER0,
+		     I8254_PORT_CONTROL);
 		status = inb(I8254_PORT_COUNTER0);
 		timer  = inb(I8254_PORT_COUNTER0);
 		timer |= inb(I8254_PORT_COUNTER0) << 8;

arch/x86/kvm/x86.c

@@ -5524,8 +5524,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
 		toggle_interruptibility(vcpu, ctxt->interruptibility);
 		vcpu->arch.emulate_regs_need_sync_to_vcpu = false;
 		kvm_rip_write(vcpu, ctxt->eip);
-		if (r == EMULATE_DONE &&
-		    (ctxt->tf || (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)))
+		if (r == EMULATE_DONE && ctxt->tf)
 			kvm_vcpu_do_singlestep(vcpu, &r);
 		if (!ctxt->have_exception ||
 		    exception_type(ctxt->exception.vector) == EXCPT_TRAP)