From: Greg Kroah-Hartman Date: Mon, 12 Jun 2017 12:50:31 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v3.18.57~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83651b7db8f1615c119b1c83af5364bda5acd552;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: alsa-timer-fix-missing-queue-indices-reset-at-sndrv_timer_ioctl_select.patch alsa-timer-fix-race-between-read-and-ioctl.patch asoc-fix-use-after-free-at-card-unregistration.patch cpu-hotplug-drop-the-device-lock-on-error.patch drivers-char-mem-fix-wraparound-check-to-allow-mappings-up-to-the-end.patch drm-nouveau-tmr-fully-separate-alarm-execution-pending-lists.patch drm-vmwgfx-handle-vmalloc-failure-in-vmw_local_fifo_reserve.patch drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_surface_define_ioctl.patch drm-vmwgfx-make-sure-backup_handle-is-always-valid.patch kvm-arm-arm64-handle-possible-null-stage2-pud-when-ageing-pages.patch perf-core-drop-kernel-samples-even-though-u-is-specified.patch powerpc-hotplug-mem-fix-missing-endian-conversion-of-aa_index.patch powerpc-kernel-fix-fp-and-vector-register-restoration.patch powerpc-kernel-initialize-load_tm-on-task-creation.patch powerpc-numa-fix-percpu-allocations-to-be-numa-aware.patch powerpc-sysdev-simple_gpio-fix-oops-in-gpio-save_regs-function.patch scsi-qla2xxx-don-t-disable-a-not-previously-enabled-pci-device.patch scsi-qla2xxx-fix-mailbox-pointer-error-in-fwdump-capture.patch scsi-qla2xxx-modify-t262-fw-dump-template-to-specify-same-start-end-to-debug-customer-issues.patch scsi-qla2xxx-set-bit-15-for-diag_echo_test-mbc.patch serial-sh-sci-fix-panic-when-serial-console-and-dma-are-enabled.patch --- diff --git a/queue-4.9/alsa-timer-fix-missing-queue-indices-reset-at-sndrv_timer_ioctl_select.patch b/queue-4.9/alsa-timer-fix-missing-queue-indices-reset-at-sndrv_timer_ioctl_select.patch new file mode 100644 index 00000000000..a073e0b898e --- /dev/null +++ b/queue-4.9/alsa-timer-fix-missing-queue-indices-reset-at-sndrv_timer_ioctl_select.patch @@ -0,0 +1,55 @@ +From ba3021b2c79b2fa9114f92790a99deb27a65b728 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 2 Jun 2017 17:26:56 +0200 +Subject: ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT + +From: Takashi Iwai + +commit ba3021b2c79b2fa9114f92790a99deb27a65b728 upstream. + +snd_timer_user_tselect() reallocates the queue buffer dynamically, but +it forgot to reset its indices. Since the read may happen +concurrently with ioctl and snd_timer_user_tselect() allocates the +buffer via kmalloc(), this may lead to the leak of uninitialized +kernel-space data, as spotted via KMSAN: + + BUG: KMSAN: use of unitialized memory in snd_timer_user_read+0x6c4/0xa10 + CPU: 0 PID: 1037 Comm: probe Not tainted 4.11.0-rc5+ #2739 + Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 + Call Trace: + __dump_stack lib/dump_stack.c:16 + dump_stack+0x143/0x1b0 lib/dump_stack.c:52 + kmsan_report+0x12a/0x180 mm/kmsan/kmsan.c:1007 + kmsan_check_memory+0xc2/0x140 mm/kmsan/kmsan.c:1086 + copy_to_user ./arch/x86/include/asm/uaccess.h:725 + snd_timer_user_read+0x6c4/0xa10 sound/core/timer.c:2004 + do_loop_readv_writev fs/read_write.c:716 + __do_readv_writev+0x94c/0x1380 fs/read_write.c:864 + do_readv_writev fs/read_write.c:894 + vfs_readv fs/read_write.c:908 + do_readv+0x52a/0x5d0 fs/read_write.c:934 + SYSC_readv+0xb6/0xd0 fs/read_write.c:1021 + SyS_readv+0x87/0xb0 fs/read_write.c:1018 + +This patch adds the missing reset of queue indices. Together with the +previous fix for the ioctl/read race, we cover the whole problem. + +Reported-by: Alexander Potapenko +Tested-by: Alexander Potapenko +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/timer.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/core/timer.c ++++ b/sound/core/timer.c +@@ -1622,6 +1622,7 @@ static int snd_timer_user_tselect(struct + if (err < 0) + goto __err; + ++ tu->qhead = tu->qtail = tu->qused = 0; + kfree(tu->queue); + tu->queue = NULL; + kfree(tu->tqueue); diff --git a/queue-4.9/alsa-timer-fix-race-between-read-and-ioctl.patch b/queue-4.9/alsa-timer-fix-race-between-read-and-ioctl.patch new file mode 100644 index 00000000000..11d62bbba3e --- /dev/null +++ b/queue-4.9/alsa-timer-fix-race-between-read-and-ioctl.patch @@ -0,0 +1,73 @@ +From d11662f4f798b50d8c8743f433842c3e40fe3378 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 2 Jun 2017 15:03:38 +0200 +Subject: ALSA: timer: Fix race between read and ioctl + +From: Takashi Iwai + +commit d11662f4f798b50d8c8743f433842c3e40fe3378 upstream. + +The read from ALSA timer device, the function snd_timer_user_tread(), +may access to an uninitialized struct snd_timer_user fields when the +read is concurrently performed while the ioctl like +snd_timer_user_tselect() is invoked. We have already fixed the races +among ioctls via a mutex, but we seem to have forgotten the race +between read vs ioctl. + +This patch simply applies (more exactly extends the already applied +range of) tu->ioctl_lock in snd_timer_user_tread() for closing the +race window. + +Reported-by: Alexander Potapenko +Tested-by: Alexander Potapenko +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/timer.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/sound/core/timer.c ++++ b/sound/core/timer.c +@@ -1963,6 +1963,7 @@ static ssize_t snd_timer_user_read(struc + + tu = file->private_data; + unit = tu->tread ? sizeof(struct snd_timer_tread) : sizeof(struct snd_timer_read); ++ mutex_lock(&tu->ioctl_lock); + spin_lock_irq(&tu->qlock); + while ((long)count - result >= unit) { + while (!tu->qused) { +@@ -1978,7 +1979,9 @@ static ssize_t snd_timer_user_read(struc + add_wait_queue(&tu->qchange_sleep, &wait); + + spin_unlock_irq(&tu->qlock); ++ mutex_unlock(&tu->ioctl_lock); + schedule(); ++ mutex_lock(&tu->ioctl_lock); + spin_lock_irq(&tu->qlock); + + remove_wait_queue(&tu->qchange_sleep, &wait); +@@ -1998,7 +2001,6 @@ static ssize_t snd_timer_user_read(struc + tu->qused--; + spin_unlock_irq(&tu->qlock); + +- mutex_lock(&tu->ioctl_lock); + if (tu->tread) { + if (copy_to_user(buffer, &tu->tqueue[qhead], + sizeof(struct snd_timer_tread))) +@@ -2008,7 +2010,6 @@ static ssize_t snd_timer_user_read(struc + sizeof(struct snd_timer_read))) + err = -EFAULT; + } +- mutex_unlock(&tu->ioctl_lock); + + spin_lock_irq(&tu->qlock); + if (err < 0) +@@ -2018,6 +2019,7 @@ static ssize_t snd_timer_user_read(struc + } + _error: + spin_unlock_irq(&tu->qlock); ++ mutex_unlock(&tu->ioctl_lock); + return result > 0 ? result : err; + } + diff --git a/queue-4.9/asoc-fix-use-after-free-at-card-unregistration.patch b/queue-4.9/asoc-fix-use-after-free-at-card-unregistration.patch new file mode 100644 index 00000000000..8c48f616444 --- /dev/null +++ b/queue-4.9/asoc-fix-use-after-free-at-card-unregistration.patch @@ -0,0 +1,51 @@ +From 4efda5f2130da033aeedc5b3205569893b910de2 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 24 May 2017 10:19:45 +0200 +Subject: ASoC: Fix use-after-free at card unregistration + +From: Takashi Iwai + +commit 4efda5f2130da033aeedc5b3205569893b910de2 upstream. + +soc_cleanup_card_resources() call snd_card_free() at the last of its +procedure. This turned out to lead to a use-after-free. +PCM runtimes have been already removed via soc_remove_pcm_runtimes(), +while it's dereferenced later in soc_pcm_free() called via +snd_card_free(). + +The fix is simple: just move the snd_card_free() call to the beginning +of the whole procedure. This also gives another benefit: it +guarantees that all operations have been shut down before actually +releasing the resources, which was racy until now. + +Reported-and-tested-by: Robert Jarzmik +Signed-off-by: Takashi Iwai +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman + +--- + sound/soc/soc-core.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/sound/soc/soc-core.c ++++ b/sound/soc/soc-core.c +@@ -2076,6 +2076,9 @@ static int soc_cleanup_card_resources(st + list_for_each_entry(rtd, &card->rtd_list, list) + flush_delayed_work(&rtd->delayed_work); + ++ /* free the ALSA card at first; this syncs with pending operations */ ++ snd_card_free(card->snd_card); ++ + /* remove and free each DAI */ + soc_remove_dai_links(card); + soc_remove_pcm_runtimes(card); +@@ -2090,9 +2093,7 @@ static int soc_cleanup_card_resources(st + if (card->remove) + card->remove(card); + +- snd_card_free(card->snd_card); + return 0; +- + } + + /* removes a socdev */ diff --git a/queue-4.9/cpu-hotplug-drop-the-device-lock-on-error.patch b/queue-4.9/cpu-hotplug-drop-the-device-lock-on-error.patch new file mode 100644 index 00000000000..3c48f81c227 --- /dev/null +++ b/queue-4.9/cpu-hotplug-drop-the-device-lock-on-error.patch @@ -0,0 +1,51 @@ +From 40da1b11f01e43aad1aa6cea64681b6125e8a2a7 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior +Date: Fri, 2 Jun 2017 16:27:14 +0200 +Subject: cpu/hotplug: Drop the device lock on error + +From: Sebastian Andrzej Siewior + +commit 40da1b11f01e43aad1aa6cea64681b6125e8a2a7 upstream. + +If a custom CPU target is specified and that one is not available _or_ +can't be interrupted then the code returns to userland without dropping a +lock as notices by lockdep: + +|echo 133 > /sys/devices/system/cpu/cpu7/hotplug/target +| ================================================ +| [ BUG: lock held when returning to user space! ] +| ------------------------------------------------ +| bash/503 is leaving the kernel with locks still held! +| 1 lock held by bash/503: +| #0: (device_hotplug_lock){+.+...}, at: [] lock_device_hotplug_sysfs+0x10/0x40 + +So release the lock then. + +Fixes: 757c989b9994 ("cpu/hotplug: Make target state writeable") +Signed-off-by: Sebastian Andrzej Siewior +Signed-off-by: Thomas Gleixner +Link: http://lkml.kernel.org/r/20170602142714.3ogo25f2wbq6fjpj@linutronix.de +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/cpu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/kernel/cpu.c ++++ b/kernel/cpu.c +@@ -1765,13 +1765,13 @@ static ssize_t write_cpuhp_target(struct + ret = !sp->name || sp->cant_stop ? -EINVAL : 0; + mutex_unlock(&cpuhp_state_mutex); + if (ret) +- return ret; ++ goto out; + + if (st->state < target) + ret = do_cpu_up(dev->id, target); + else + ret = do_cpu_down(dev->id, target); +- ++out: + unlock_device_hotplug(); + return ret ? ret : count; + } diff --git a/queue-4.9/drivers-char-mem-fix-wraparound-check-to-allow-mappings-up-to-the-end.patch b/queue-4.9/drivers-char-mem-fix-wraparound-check-to-allow-mappings-up-to-the-end.patch new file mode 100644 index 00000000000..4b1a49344bb --- /dev/null +++ b/queue-4.9/drivers-char-mem-fix-wraparound-check-to-allow-mappings-up-to-the-end.patch @@ -0,0 +1,36 @@ +From 32829da54d9368103a2f03269a5120aa9ee4d5da Mon Sep 17 00:00:00 2001 +From: Julius Werner +Date: Fri, 2 Jun 2017 15:36:39 -0700 +Subject: drivers: char: mem: Fix wraparound check to allow mappings up to the end + +From: Julius Werner + +commit 32829da54d9368103a2f03269a5120aa9ee4d5da upstream. + +A recent fix to /dev/mem prevents mappings from wrapping around the end +of physical address space. However, the check was written in a way that +also prevents a mapping reaching just up to the end of physical address +space, which may be a valid use case (especially on 32-bit systems). +This patch fixes it by checking the last mapped address (instead of the +first address behind that) for overflow. + +Fixes: b299cde245 ("drivers: char: mem: Check for address space wraparound with mmap()") +Reported-by: Nico Huber +Signed-off-by: Julius Werner +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/char/mem.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/char/mem.c ++++ b/drivers/char/mem.c +@@ -343,7 +343,7 @@ static int mmap_mem(struct file *file, s + phys_addr_t offset = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT; + + /* It's illegal to wrap around the end of the physical address space. */ +- if (offset + (phys_addr_t)size < offset) ++ if (offset + (phys_addr_t)size - 1 < offset) + return -EINVAL; + + if (!valid_mmap_phys_addr_range(vma->vm_pgoff, size)) diff --git a/queue-4.9/drm-nouveau-tmr-fully-separate-alarm-execution-pending-lists.patch b/queue-4.9/drm-nouveau-tmr-fully-separate-alarm-execution-pending-lists.patch new file mode 100644 index 00000000000..59ad28e773d --- /dev/null +++ b/queue-4.9/drm-nouveau-tmr-fully-separate-alarm-execution-pending-lists.patch @@ -0,0 +1,57 @@ +From b4e382ca7586a63b6c1e5221ce0863ff867c2df6 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs +Date: Mon, 5 Jun 2017 17:23:32 +1000 +Subject: drm/nouveau/tmr: fully separate alarm execution/pending lists + +From: Ben Skeggs + +commit b4e382ca7586a63b6c1e5221ce0863ff867c2df6 upstream. + +Reusing the list_head for both is a bad idea. Callback execution is done +with the lock dropped so that alarms can be rescheduled from the callback, +which means that with some unfortunate timing, lists can get corrupted. + +The execution list should not require its own locking, the single function +that uses it can only be called from a single context. + +Signed-off-by: Ben Skeggs +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 7 ++++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h ++++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h +@@ -4,6 +4,7 @@ + + struct nvkm_alarm { + struct list_head head; ++ struct list_head exec; + u64 timestamp; + void (*func)(struct nvkm_alarm *); + }; +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c +@@ -50,7 +50,8 @@ nvkm_timer_alarm_trigger(struct nvkm_tim + /* Move to completed list. We'll drop the lock before + * executing the callback so it can reschedule itself. + */ +- list_move_tail(&alarm->head, &exec); ++ list_del_init(&alarm->head); ++ list_add(&alarm->exec, &exec); + } + + /* Shut down interrupt if no more pending alarms. */ +@@ -59,8 +60,8 @@ nvkm_timer_alarm_trigger(struct nvkm_tim + spin_unlock_irqrestore(&tmr->lock, flags); + + /* Execute completed callbacks. */ +- list_for_each_entry_safe(alarm, atemp, &exec, head) { +- list_del_init(&alarm->head); ++ list_for_each_entry_safe(alarm, atemp, &exec, exec) { ++ list_del(&alarm->exec); + alarm->func(alarm); + } + } diff --git a/queue-4.9/drm-vmwgfx-handle-vmalloc-failure-in-vmw_local_fifo_reserve.patch b/queue-4.9/drm-vmwgfx-handle-vmalloc-failure-in-vmw_local_fifo_reserve.patch new file mode 100644 index 00000000000..7f85a501474 --- /dev/null +++ b/queue-4.9/drm-vmwgfx-handle-vmalloc-failure-in-vmw_local_fifo_reserve.patch @@ -0,0 +1,31 @@ +From f0c62e9878024300319ba2438adc7b06c6b9c448 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Thu, 27 Apr 2017 12:12:08 +0300 +Subject: drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve() + +From: Dan Carpenter + +commit f0c62e9878024300319ba2438adc7b06c6b9c448 upstream. + +If vmalloc() fails then we need to a bit of cleanup before returning. + +Fixes: fb1d9738ca05 ("drm/vmwgfx: Add DRM driver for VMware Virtual GPU") +Signed-off-by: Dan Carpenter +Reviewed-by: Sinclair Yeh +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +@@ -368,6 +368,8 @@ static void *vmw_local_fifo_reserve(stru + return fifo_state->static_buffer; + else { + fifo_state->dynamic_buffer = vmalloc(bytes); ++ if (!fifo_state->dynamic_buffer) ++ goto out_err; + return fifo_state->dynamic_buffer; + } + } diff --git a/queue-4.9/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_surface_define_ioctl.patch b/queue-4.9/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_surface_define_ioctl.patch new file mode 100644 index 00000000000..2fa321c4350 --- /dev/null +++ b/queue-4.9/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_surface_define_ioctl.patch @@ -0,0 +1,36 @@ +From ee9c4e681ec4f58e42a83cb0c22a0289ade1aacf Mon Sep 17 00:00:00 2001 +From: Vladis Dronov +Date: Fri, 2 Jun 2017 07:42:09 +0200 +Subject: drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl() + +From: Vladis Dronov + +commit ee9c4e681ec4f58e42a83cb0c22a0289ade1aacf upstream. + +The 'req->mip_levels' parameter in vmw_gb_surface_define_ioctl() is +a user-controlled 'uint32_t' value which is used as a loop count limit. +This can lead to a kernel lockup and DoS. Add check for 'req->mip_levels'. + +References: +https://bugzilla.redhat.com/show_bug.cgi?id=1437431 + +Signed-off-by: Vladis Dronov +Reviewed-by: Sinclair Yeh +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +@@ -1280,6 +1280,9 @@ int vmw_gb_surface_define_ioctl(struct d + if (req->multisample_count != 0) + return -EINVAL; + ++ if (req->mip_levels > DRM_VMW_MAX_MIP_LEVELS) ++ return -EINVAL; ++ + if (unlikely(vmw_user_surface_size == 0)) + vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) + + 128; diff --git a/queue-4.9/drm-vmwgfx-make-sure-backup_handle-is-always-valid.patch b/queue-4.9/drm-vmwgfx-make-sure-backup_handle-is-always-valid.patch new file mode 100644 index 00000000000..79998f4b721 --- /dev/null +++ b/queue-4.9/drm-vmwgfx-make-sure-backup_handle-is-always-valid.patch @@ -0,0 +1,59 @@ +From 07678eca2cf9c9a18584e546c2b2a0d0c9a3150c Mon Sep 17 00:00:00 2001 +From: Sinclair Yeh +Date: Fri, 2 Jun 2017 07:50:57 +0200 +Subject: drm/vmwgfx: Make sure backup_handle is always valid + +From: Sinclair Yeh + +commit 07678eca2cf9c9a18584e546c2b2a0d0c9a3150c upstream. + +When vmw_gb_surface_define_ioctl() is called with an existing buffer, +we end up returning an uninitialized variable in the backup_handle. + +The fix is to first initialize backup_handle to 0 just to be sure, and +second, when a user-provided buffer is found, we will use the +req->buffer_handle as the backup_handle. + +Reported-by: Murray McAllister +Signed-off-by: Sinclair Yeh +Reviewed-by: Deepak Rawat +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c ++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +@@ -1275,7 +1275,7 @@ int vmw_gb_surface_define_ioctl(struct d + struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile; + int ret; + uint32_t size; +- uint32_t backup_handle; ++ uint32_t backup_handle = 0; + + if (req->multisample_count != 0) + return -EINVAL; +@@ -1318,12 +1318,16 @@ int vmw_gb_surface_define_ioctl(struct d + ret = vmw_user_dmabuf_lookup(tfile, req->buffer_handle, + &res->backup, + &user_srf->backup_base); +- if (ret == 0 && res->backup->base.num_pages * PAGE_SIZE < +- res->backup_size) { +- DRM_ERROR("Surface backup buffer is too small.\n"); +- vmw_dmabuf_unreference(&res->backup); +- ret = -EINVAL; +- goto out_unlock; ++ if (ret == 0) { ++ if (res->backup->base.num_pages * PAGE_SIZE < ++ res->backup_size) { ++ DRM_ERROR("Surface backup buffer is too small.\n"); ++ vmw_dmabuf_unreference(&res->backup); ++ ret = -EINVAL; ++ goto out_unlock; ++ } else { ++ backup_handle = req->buffer_handle; ++ } + } + } else if (req->drm_surface_flags & drm_vmw_surface_flag_create_buffer) + ret = vmw_user_dmabuf_alloc(dev_priv, tfile, diff --git a/queue-4.9/kvm-arm-arm64-handle-possible-null-stage2-pud-when-ageing-pages.patch b/queue-4.9/kvm-arm-arm64-handle-possible-null-stage2-pud-when-ageing-pages.patch new file mode 100644 index 00000000000..d1522fbaba6 --- /dev/null +++ b/queue-4.9/kvm-arm-arm64-handle-possible-null-stage2-pud-when-ageing-pages.patch @@ -0,0 +1,85 @@ +From d6dbdd3c8558cad3b6d74cc357b408622d122331 Mon Sep 17 00:00:00 2001 +From: Marc Zyngier +Date: Mon, 5 Jun 2017 19:17:18 +0100 +Subject: KVM: arm/arm64: Handle possible NULL stage2 pud when ageing pages + +From: Marc Zyngier + +commit d6dbdd3c8558cad3b6d74cc357b408622d122331 upstream. + +Under memory pressure, we start ageing pages, which amounts to parsing +the page tables. Since we don't want to allocate any extra level, +we pass NULL for our private allocation cache. Which means that +stage2_get_pud() is allowed to fail. This results in the following +splat: + +[ 1520.409577] Unable to handle kernel NULL pointer dereference at virtual address 00000008 +[ 1520.417741] pgd = ffff810f52fef000 +[ 1520.421201] [00000008] *pgd=0000010f636c5003, *pud=0000010f56f48003, *pmd=0000000000000000 +[ 1520.429546] Internal error: Oops: 96000006 [#1] PREEMPT SMP +[ 1520.435156] Modules linked in: +[ 1520.438246] CPU: 15 PID: 53550 Comm: qemu-system-aar Tainted: G W 4.12.0-rc4-00027-g1885c397eaec #7205 +[ 1520.448705] Hardware name: FOXCONN R2-1221R-A4/C2U4N_MB, BIOS G31FB12A 10/26/2016 +[ 1520.463726] task: ffff800ac5fb4e00 task.stack: ffff800ce04e0000 +[ 1520.469666] PC is at stage2_get_pmd+0x34/0x110 +[ 1520.474119] LR is at kvm_age_hva_handler+0x44/0xf0 +[ 1520.478917] pc : [] lr : [] pstate: 40000145 +[ 1520.486325] sp : ffff800ce04e33d0 +[ 1520.489644] x29: ffff800ce04e33d0 x28: 0000000ffff40064 +[ 1520.494967] x27: 0000ffff27e00000 x26: 0000000000000000 +[ 1520.500289] x25: ffff81051ba65008 x24: 0000ffff40065000 +[ 1520.505618] x23: 0000ffff40064000 x22: 0000000000000000 +[ 1520.510947] x21: ffff810f52b20000 x20: 0000000000000000 +[ 1520.516274] x19: 0000000058264000 x18: 0000000000000000 +[ 1520.521603] x17: 0000ffffa6fe7438 x16: ffff000008278b70 +[ 1520.526940] x15: 000028ccd8000000 x14: 0000000000000008 +[ 1520.532264] x13: ffff7e0018298000 x12: 0000000000000002 +[ 1520.537582] x11: ffff000009241b93 x10: 0000000000000940 +[ 1520.542908] x9 : ffff0000092ef800 x8 : 0000000000000200 +[ 1520.548229] x7 : ffff800ce04e36a8 x6 : 0000000000000000 +[ 1520.553552] x5 : 0000000000000001 x4 : 0000000000000000 +[ 1520.558873] x3 : 0000000000000000 x2 : 0000000000000008 +[ 1520.571696] x1 : ffff000008fd5000 x0 : ffff0000080b149c +[ 1520.577039] Process qemu-system-aar (pid: 53550, stack limit = 0xffff800ce04e0000) +[...] +[ 1521.510735] [] stage2_get_pmd+0x34/0x110 +[ 1521.516221] [] kvm_age_hva_handler+0x44/0xf0 +[ 1521.522054] [] handle_hva_to_gpa+0xb8/0xe8 +[ 1521.527716] [] kvm_age_hva+0x44/0xf0 +[ 1521.532854] [] kvm_mmu_notifier_clear_flush_young+0x70/0xc0 +[ 1521.539992] [] __mmu_notifier_clear_flush_young+0x88/0xd0 +[ 1521.546958] [] page_referenced_one+0xf0/0x188 +[ 1521.552881] [] rmap_walk_anon+0xec/0x250 +[ 1521.558370] [] rmap_walk+0x78/0xa0 +[ 1521.563337] [] page_referenced+0x164/0x180 +[ 1521.569002] [] shrink_active_list+0x178/0x3b8 +[ 1521.574922] [] shrink_node_memcg+0x328/0x600 +[ 1521.580758] [] shrink_node+0xc4/0x328 +[ 1521.585986] [] do_try_to_free_pages+0xc0/0x340 +[ 1521.592000] [] try_to_free_pages+0xcc/0x240 +[...] + +The trivial fix is to handle this NULL pud value early, rather than +dereferencing it blindly. + +Signed-off-by: Marc Zyngier +Reviewed-by: Christoffer Dall +Signed-off-by: Christoffer Dall +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/kvm/mmu.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/arm/kvm/mmu.c ++++ b/arch/arm/kvm/mmu.c +@@ -872,6 +872,9 @@ static pmd_t *stage2_get_pmd(struct kvm + pmd_t *pmd; + + pud = stage2_get_pud(kvm, cache, addr); ++ if (!pud) ++ return NULL; ++ + if (stage2_pud_none(*pud)) { + if (!cache) + return NULL; diff --git a/queue-4.9/perf-core-drop-kernel-samples-even-though-u-is-specified.patch b/queue-4.9/perf-core-drop-kernel-samples-even-though-u-is-specified.patch new file mode 100644 index 00000000000..c39db0719fd --- /dev/null +++ b/queue-4.9/perf-core-drop-kernel-samples-even-though-u-is-specified.patch @@ -0,0 +1,127 @@ +From cc1582c231ea041fbc68861dfaf957eaf902b829 Mon Sep 17 00:00:00 2001 +From: Jin Yao +Date: Thu, 25 May 2017 18:09:07 +0800 +Subject: perf/core: Drop kernel samples even though :u is specified + +From: Jin Yao + +commit cc1582c231ea041fbc68861dfaf957eaf902b829 upstream. + +When doing sampling, for example: + + perf record -e cycles:u ... + +On workloads that do a lot of kernel entry/exits we see kernel +samples, even though :u is specified. This is due to skid existing. + +This might be a security issue because it can leak kernel addresses even +though kernel sampling support is disabled. + +The patch drops the kernel samples if exclude_kernel is specified. + +For example, test on Haswell desktop: + + perf record -e cycles:u + perf report --stdio + +Before patch applied: + + 99.77% mgen mgen [.] buf_read + 0.20% mgen mgen [.] rand_buf_init + 0.01% mgen [kernel.vmlinux] [k] apic_timer_interrupt + 0.00% mgen mgen [.] last_free_elem + 0.00% mgen libc-2.23.so [.] __random_r + 0.00% mgen libc-2.23.so [.] _int_malloc + 0.00% mgen mgen [.] rand_array_init + 0.00% mgen [kernel.vmlinux] [k] page_fault + 0.00% mgen libc-2.23.so [.] __random + 0.00% mgen libc-2.23.so [.] __strcasestr + 0.00% mgen ld-2.23.so [.] strcmp + 0.00% mgen ld-2.23.so [.] _dl_start + 0.00% mgen libc-2.23.so [.] sched_setaffinity@@GLIBC_2.3.4 + 0.00% mgen ld-2.23.so [.] _start + +We can see kernel symbols apic_timer_interrupt and page_fault. + +After patch applied: + + 99.79% mgen mgen [.] buf_read + 0.19% mgen mgen [.] rand_buf_init + 0.00% mgen libc-2.23.so [.] __random_r + 0.00% mgen mgen [.] rand_array_init + 0.00% mgen mgen [.] last_free_elem + 0.00% mgen libc-2.23.so [.] vfprintf + 0.00% mgen libc-2.23.so [.] rand + 0.00% mgen libc-2.23.so [.] __random + 0.00% mgen libc-2.23.so [.] _int_malloc + 0.00% mgen libc-2.23.so [.] _IO_doallocbuf + 0.00% mgen ld-2.23.so [.] do_lookup_x + 0.00% mgen ld-2.23.so [.] open_verify.constprop.7 + 0.00% mgen ld-2.23.so [.] _dl_important_hwcaps + 0.00% mgen libc-2.23.so [.] sched_setaffinity@@GLIBC_2.3.4 + 0.00% mgen ld-2.23.so [.] _start + +There are only userspace symbols. + +Signed-off-by: Jin Yao +Signed-off-by: Peter Zijlstra (Intel) +Cc: Alexander Shishkin +Cc: Arnaldo Carvalho de Melo +Cc: Jiri Olsa +Cc: Linus Torvalds +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: Stephane Eranian +Cc: Thomas Gleixner +Cc: Vince Weaver +Cc: acme@kernel.org +Cc: jolsa@kernel.org +Cc: kan.liang@intel.com +Cc: mark.rutland@arm.com +Cc: will.deacon@arm.com +Cc: yao.jin@intel.com +Link: http://lkml.kernel.org/r/1495706947-3744-1-git-send-email-yao.jin@linux.intel.com +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/events/core.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +--- a/kernel/events/core.c ++++ b/kernel/events/core.c +@@ -7062,6 +7062,21 @@ static void perf_log_itrace_start(struct + perf_output_end(&handle); + } + ++static bool sample_is_allowed(struct perf_event *event, struct pt_regs *regs) ++{ ++ /* ++ * Due to interrupt latency (AKA "skid"), we may enter the ++ * kernel before taking an overflow, even if the PMU is only ++ * counting user events. ++ * To avoid leaking information to userspace, we must always ++ * reject kernel samples when exclude_kernel is set. ++ */ ++ if (event->attr.exclude_kernel && !user_mode(regs)) ++ return false; ++ ++ return true; ++} ++ + /* + * Generic event overflow handling, sampling. + */ +@@ -7109,6 +7124,12 @@ static int __perf_event_overflow(struct + } + + /* ++ * For security, drop the skid kernel samples if necessary. ++ */ ++ if (!sample_is_allowed(event, regs)) ++ return ret; ++ ++ /* + * XXX event_limit might not quite work as expected on inherited + * events + */ diff --git a/queue-4.9/powerpc-hotplug-mem-fix-missing-endian-conversion-of-aa_index.patch b/queue-4.9/powerpc-hotplug-mem-fix-missing-endian-conversion-of-aa_index.patch new file mode 100644 index 00000000000..f3bbb321ffc --- /dev/null +++ b/queue-4.9/powerpc-hotplug-mem-fix-missing-endian-conversion-of-aa_index.patch @@ -0,0 +1,42 @@ +From dc421b200f91930c9c6a9586810ff8c232cf10fc Mon Sep 17 00:00:00 2001 +From: Michael Bringmann +Date: Mon, 22 May 2017 15:44:37 -0500 +Subject: powerpc/hotplug-mem: Fix missing endian conversion of aa_index + +From: Michael Bringmann + +commit dc421b200f91930c9c6a9586810ff8c232cf10fc upstream. + +When adding or removing memory, the aa_index (affinity value) for the +memblock must also be converted to match the endianness of the rest +of the 'ibm,dynamic-memory' property. Otherwise, subsequent retrieval +of the attribute will likely lead to non-existent nodes, followed by +using the default node in the code inappropriately. + +Fixes: 5f97b2a0d176 ("powerpc/pseries: Implement memory hotplug add in the kernel") +Signed-off-by: Michael Bringmann +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/powerpc/platforms/pseries/hotplug-memory.c ++++ b/arch/powerpc/platforms/pseries/hotplug-memory.c +@@ -124,6 +124,7 @@ static struct property *dlpar_clone_drco + for (i = 0; i < num_lmbs; i++) { + lmbs[i].base_addr = be64_to_cpu(lmbs[i].base_addr); + lmbs[i].drc_index = be32_to_cpu(lmbs[i].drc_index); ++ lmbs[i].aa_index = be32_to_cpu(lmbs[i].aa_index); + lmbs[i].flags = be32_to_cpu(lmbs[i].flags); + } + +@@ -147,6 +148,7 @@ static void dlpar_update_drconf_property + for (i = 0; i < num_lmbs; i++) { + lmbs[i].base_addr = cpu_to_be64(lmbs[i].base_addr); + lmbs[i].drc_index = cpu_to_be32(lmbs[i].drc_index); ++ lmbs[i].aa_index = cpu_to_be32(lmbs[i].aa_index); + lmbs[i].flags = cpu_to_be32(lmbs[i].flags); + } + diff --git a/queue-4.9/powerpc-kernel-fix-fp-and-vector-register-restoration.patch b/queue-4.9/powerpc-kernel-fix-fp-and-vector-register-restoration.patch new file mode 100644 index 00000000000..7c4aa06f9f0 --- /dev/null +++ b/queue-4.9/powerpc-kernel-fix-fp-and-vector-register-restoration.patch @@ -0,0 +1,51 @@ +From 1195892c091a15cc862f4e202482a36adc924e12 Mon Sep 17 00:00:00 2001 +From: Breno Leitao +Date: Fri, 2 Jun 2017 18:43:30 -0300 +Subject: powerpc/kernel: Fix FP and vector register restoration + +From: Breno Leitao + +commit 1195892c091a15cc862f4e202482a36adc924e12 upstream. + +Currently tsk->thread->load_vec and load_fp are not initialized during +task creation, which can lead to garbage values in these variables (non-zero +values). + +These variables will be checked later in restore_math() to validate if the +FP and vector registers are being utilized. Since these values might be +non-zero, the restore_math() will continue to save the FP and vectors even if +they were never utilized by the userspace application. load_fp and load_vec +counters will then overflow (they wrap at 255) and the FP and Altivec will be +finally disabled, but before that condition is reached (counter overflow) +several context switches will have restored FP and vector registers without +need, causing a performance degradation. + +Fixes: 70fe3d980f5f ("powerpc: Restore FPU/VEC/VSX if previously used") +Signed-off-by: Breno Leitao +Signed-off-by: Gustavo Romero +Acked-by: Anton Blanchard +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/kernel/process.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/powerpc/kernel/process.c ++++ b/arch/powerpc/kernel/process.c +@@ -1659,6 +1659,7 @@ void start_thread(struct pt_regs *regs, + #ifdef CONFIG_VSX + current->thread.used_vsr = 0; + #endif ++ current->thread.load_fp = 0; + memset(¤t->thread.fp_state, 0, sizeof(current->thread.fp_state)); + current->thread.fp_save_area = NULL; + #ifdef CONFIG_ALTIVEC +@@ -1667,6 +1668,7 @@ void start_thread(struct pt_regs *regs, + current->thread.vr_save_area = NULL; + current->thread.vrsave = 0; + current->thread.used_vr = 0; ++ current->thread.load_vec = 0; + #endif /* CONFIG_ALTIVEC */ + #ifdef CONFIG_SPE + memset(current->thread.evr, 0, sizeof(current->thread.evr)); diff --git a/queue-4.9/powerpc-kernel-initialize-load_tm-on-task-creation.patch b/queue-4.9/powerpc-kernel-initialize-load_tm-on-task-creation.patch new file mode 100644 index 00000000000..9ff7ae0c5c5 --- /dev/null +++ b/queue-4.9/powerpc-kernel-initialize-load_tm-on-task-creation.patch @@ -0,0 +1,36 @@ +From 7f22ced4377628074e2ac25f41a88f98eb3b03f1 Mon Sep 17 00:00:00 2001 +From: Breno Leitao +Date: Mon, 5 Jun 2017 11:40:59 -0300 +Subject: powerpc/kernel: Initialize load_tm on task creation + +From: Breno Leitao + +commit 7f22ced4377628074e2ac25f41a88f98eb3b03f1 upstream. + +Currently tsk->thread.load_tm is not initialized in the task creation +and can contain garbage on a new task. + +This is an undesired behaviour, since it affects the timing to enable +and disable the transactional memory laziness (disabling and enabling +the MSR TM bit, which affects TM reclaim and recheckpoint in the +scheduling process). + +Fixes: 5d176f751ee3 ("powerpc: tm: Enable transactional memory (TM) lazily for userspace") +Signed-off-by: Breno Leitao +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/kernel/process.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/powerpc/kernel/process.c ++++ b/arch/powerpc/kernel/process.c +@@ -1680,6 +1680,7 @@ void start_thread(struct pt_regs *regs, + current->thread.tm_tfhar = 0; + current->thread.tm_texasr = 0; + current->thread.tm_tfiar = 0; ++ current->thread.load_tm = 0; + #endif /* CONFIG_PPC_TRANSACTIONAL_MEM */ + } + EXPORT_SYMBOL(start_thread); diff --git a/queue-4.9/powerpc-numa-fix-percpu-allocations-to-be-numa-aware.patch b/queue-4.9/powerpc-numa-fix-percpu-allocations-to-be-numa-aware.patch new file mode 100644 index 00000000000..841905f9a8c --- /dev/null +++ b/queue-4.9/powerpc-numa-fix-percpu-allocations-to-be-numa-aware.patch @@ -0,0 +1,105 @@ +From ba4a648f12f4cd0a8003dd229b6ca8a53348ee4b Mon Sep 17 00:00:00 2001 +From: Michael Ellerman +Date: Tue, 6 Jun 2017 20:23:57 +1000 +Subject: powerpc/numa: Fix percpu allocations to be NUMA aware + +From: Michael Ellerman + +commit ba4a648f12f4cd0a8003dd229b6ca8a53348ee4b upstream. + +In commit 8c272261194d ("powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID"), we +switched to the generic implementation of cpu_to_node(), which uses a percpu +variable to hold the NUMA node for each CPU. + +Unfortunately we neglected to notice that we use cpu_to_node() in the allocation +of our percpu areas, leading to a chicken and egg problem. In practice what +happens is when we are setting up the percpu areas, cpu_to_node() reports that +all CPUs are on node 0, so we allocate all percpu areas on node 0. + +This is visible in the dmesg output, as all pcpu allocs being in group 0: + + pcpu-alloc: [0] 00 01 02 03 [0] 04 05 06 07 + pcpu-alloc: [0] 08 09 10 11 [0] 12 13 14 15 + pcpu-alloc: [0] 16 17 18 19 [0] 20 21 22 23 + pcpu-alloc: [0] 24 25 26 27 [0] 28 29 30 31 + pcpu-alloc: [0] 32 33 34 35 [0] 36 37 38 39 + pcpu-alloc: [0] 40 41 42 43 [0] 44 45 46 47 + +To fix it we need an early_cpu_to_node() which can run prior to percpu being +setup. We already have the numa_cpu_lookup_table we can use, so just plumb it +in. With the patch dmesg output shows two groups, 0 and 1: + + pcpu-alloc: [0] 00 01 02 03 [0] 04 05 06 07 + pcpu-alloc: [0] 08 09 10 11 [0] 12 13 14 15 + pcpu-alloc: [0] 16 17 18 19 [0] 20 21 22 23 + pcpu-alloc: [1] 24 25 26 27 [1] 28 29 30 31 + pcpu-alloc: [1] 32 33 34 35 [1] 36 37 38 39 + pcpu-alloc: [1] 40 41 42 43 [1] 44 45 46 47 + +We can also check the data_offset in the paca of various CPUs, with the fix we +see: + + CPU 0: data_offset = 0x0ffe8b0000 + CPU 24: data_offset = 0x1ffe5b0000 + +And we can see from dmesg that CPU 24 has an allocation on node 1: + + node 0: [mem 0x0000000000000000-0x0000000fffffffff] + node 1: [mem 0x0000001000000000-0x0000001fffffffff] + +Fixes: 8c272261194d ("powerpc/numa: Enable USE_PERCPU_NUMA_NODE_ID") +Signed-off-by: Michael Ellerman +Reviewed-by: Nicholas Piggin +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/include/asm/topology.h | 14 ++++++++++++++ + arch/powerpc/kernel/setup_64.c | 4 ++-- + 2 files changed, 16 insertions(+), 2 deletions(-) + +--- a/arch/powerpc/include/asm/topology.h ++++ b/arch/powerpc/include/asm/topology.h +@@ -44,8 +44,22 @@ extern void __init dump_numa_cpu_topolog + extern int sysfs_add_device_to_node(struct device *dev, int nid); + extern void sysfs_remove_device_from_node(struct device *dev, int nid); + ++static inline int early_cpu_to_node(int cpu) ++{ ++ int nid; ++ ++ nid = numa_cpu_lookup_table[cpu]; ++ ++ /* ++ * Fall back to node 0 if nid is unset (it should be, except bugs). ++ * This allows callers to safely do NODE_DATA(early_cpu_to_node(cpu)). ++ */ ++ return (nid < 0) ? 0 : nid; ++} + #else + ++static inline int early_cpu_to_node(int cpu) { return 0; } ++ + static inline void dump_numa_cpu_topology(void) {} + + static inline int sysfs_add_device_to_node(struct device *dev, int nid) +--- a/arch/powerpc/kernel/setup_64.c ++++ b/arch/powerpc/kernel/setup_64.c +@@ -595,7 +595,7 @@ void __init emergency_stack_init(void) + + static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) + { +- return __alloc_bootmem_node(NODE_DATA(cpu_to_node(cpu)), size, align, ++ return __alloc_bootmem_node(NODE_DATA(early_cpu_to_node(cpu)), size, align, + __pa(MAX_DMA_ADDRESS)); + } + +@@ -606,7 +606,7 @@ static void __init pcpu_fc_free(void *pt + + static int pcpu_cpu_distance(unsigned int from, unsigned int to) + { +- if (cpu_to_node(from) == cpu_to_node(to)) ++ if (early_cpu_to_node(from) == early_cpu_to_node(to)) + return LOCAL_DISTANCE; + else + return REMOTE_DISTANCE; diff --git a/queue-4.9/powerpc-sysdev-simple_gpio-fix-oops-in-gpio-save_regs-function.patch b/queue-4.9/powerpc-sysdev-simple_gpio-fix-oops-in-gpio-save_regs-function.patch new file mode 100644 index 00000000000..5a7fb1540f1 --- /dev/null +++ b/queue-4.9/powerpc-sysdev-simple_gpio-fix-oops-in-gpio-save_regs-function.patch @@ -0,0 +1,36 @@ +From 6f553912eedafae13ff20b322a65e471fe7f5236 Mon Sep 17 00:00:00 2001 +From: Christophe Leroy +Date: Wed, 24 May 2017 10:01:55 +0200 +Subject: powerpc/sysdev/simple_gpio: Fix oops in gpio save_regs function + +From: Christophe Leroy + +commit 6f553912eedafae13ff20b322a65e471fe7f5236 upstream. + +of_mm_gpiochip_add_data() generates an oops for NULL pointer dereference. + +of_mm_gpiochip_add_data() calls mm_gc->save_regs() before +setting the data, therefore ->save_regs() cannot use gpiochip_get_data() + +Fixes: 937daafca774 ("powerpc: simple-gpio: use gpiochip data pointer") +Signed-off-by: Christophe Leroy +Reviewed-by: Linus Walleij +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/sysdev/simple_gpio.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/powerpc/sysdev/simple_gpio.c ++++ b/arch/powerpc/sysdev/simple_gpio.c +@@ -75,7 +75,8 @@ static int u8_gpio_dir_out(struct gpio_c + + static void u8_gpio_save_regs(struct of_mm_gpio_chip *mm_gc) + { +- struct u8_gpio_chip *u8_gc = gpiochip_get_data(&mm_gc->gc); ++ struct u8_gpio_chip *u8_gc = ++ container_of(mm_gc, struct u8_gpio_chip, mm_gc); + + u8_gc->data = in_8(mm_gc->regs); + } diff --git a/queue-4.9/scsi-qla2xxx-don-t-disable-a-not-previously-enabled-pci-device.patch b/queue-4.9/scsi-qla2xxx-don-t-disable-a-not-previously-enabled-pci-device.patch new file mode 100644 index 00000000000..d10bb5653d5 --- /dev/null +++ b/queue-4.9/scsi-qla2xxx-don-t-disable-a-not-previously-enabled-pci-device.patch @@ -0,0 +1,65 @@ +From ddff7ed45edce4a4c92949d3c61cd25d229c4a14 Mon Sep 17 00:00:00 2001 +From: Johannes Thumshirn +Date: Tue, 23 May 2017 16:50:47 +0200 +Subject: scsi: qla2xxx: don't disable a not previously enabled PCI device + +From: Johannes Thumshirn + +commit ddff7ed45edce4a4c92949d3c61cd25d229c4a14 upstream. + +When pci_enable_device() or pci_enable_device_mem() fail in +qla2x00_probe_one() we bail out but do a call to +pci_disable_device(). This causes the dev_WARN_ON() in +pci_disable_device() to trigger, as the device wasn't enabled +previously. + +So instead of taking the 'probe_out' error path we can directly return +*iff* one of the pci_enable_device() calls fails. + +Additionally rename the 'probe_out' goto label's name to the more +descriptive 'disable_device'. + +Signed-off-by: Johannes Thumshirn +Fixes: e315cd28b9ef ("[SCSI] qla2xxx: Code changes for qla data structure refactoring") +Reviewed-by: Bart Van Assche +Reviewed-by: Giridhar Malavali +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/qla2xxx/qla_os.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/scsi/qla2xxx/qla_os.c ++++ b/drivers/scsi/qla2xxx/qla_os.c +@@ -2420,10 +2420,10 @@ qla2x00_probe_one(struct pci_dev *pdev, + + if (mem_only) { + if (pci_enable_device_mem(pdev)) +- goto probe_out; ++ return ret; + } else { + if (pci_enable_device(pdev)) +- goto probe_out; ++ return ret; + } + + /* This may fail but that's ok */ +@@ -2433,7 +2433,7 @@ qla2x00_probe_one(struct pci_dev *pdev, + if (!ha) { + ql_log_pci(ql_log_fatal, pdev, 0x0009, + "Unable to allocate memory for ha.\n"); +- goto probe_out; ++ goto disable_device; + } + ql_dbg_pci(ql_dbg_init, pdev, 0x000a, + "Memory allocated for ha=%p.\n", ha); +@@ -3039,7 +3039,7 @@ iospace_config_failed: + kfree(ha); + ha = NULL; + +-probe_out: ++disable_device: + pci_disable_device(pdev); + return ret; + } diff --git a/queue-4.9/scsi-qla2xxx-fix-mailbox-pointer-error-in-fwdump-capture.patch b/queue-4.9/scsi-qla2xxx-fix-mailbox-pointer-error-in-fwdump-capture.patch new file mode 100644 index 00000000000..42559808641 --- /dev/null +++ b/queue-4.9/scsi-qla2xxx-fix-mailbox-pointer-error-in-fwdump-capture.patch @@ -0,0 +1,38 @@ +From 74939a0bc772d642b1c12827966c4c3a3c90ea2c Mon Sep 17 00:00:00 2001 +From: Joe Carnuccio +Date: Wed, 24 May 2017 18:06:23 -0700 +Subject: scsi: qla2xxx: Fix mailbox pointer error in fwdump capture + +From: Joe Carnuccio + +commit 74939a0bc772d642b1c12827966c4c3a3c90ea2c upstream. + +Signed-off-by: Joe Carnuccio +Signed-off-by: Himanshu Madhani +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/qla2xxx/qla_dbg.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/scsi/qla2xxx/qla_dbg.c ++++ b/drivers/scsi/qla2xxx/qla_dbg.c +@@ -1131,7 +1131,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, in + + /* Mailbox registers. */ + mbx_reg = ®->mailbox0; +- for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, dmp_reg++) ++ for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, mbx_reg++) + fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg)); + + /* Transfer sequence registers. */ +@@ -2090,7 +2090,7 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, in + + /* Mailbox registers. */ + mbx_reg = ®->mailbox0; +- for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, dmp_reg++) ++ for (cnt = 0; cnt < sizeof(fw->mailbox_reg) / 2; cnt++, mbx_reg++) + fw->mailbox_reg[cnt] = htons(RD_REG_WORD(mbx_reg)); + + /* Transfer sequence registers. */ diff --git a/queue-4.9/scsi-qla2xxx-modify-t262-fw-dump-template-to-specify-same-start-end-to-debug-customer-issues.patch b/queue-4.9/scsi-qla2xxx-modify-t262-fw-dump-template-to-specify-same-start-end-to-debug-customer-issues.patch new file mode 100644 index 00000000000..7af921eb0f4 --- /dev/null +++ b/queue-4.9/scsi-qla2xxx-modify-t262-fw-dump-template-to-specify-same-start-end-to-debug-customer-issues.patch @@ -0,0 +1,31 @@ +From ce6c668b146cc4f4442111e2bcee4c3af94e1ddf Mon Sep 17 00:00:00 2001 +From: Joe Carnuccio +Date: Wed, 24 May 2017 18:06:21 -0700 +Subject: scsi: qla2xxx: Modify T262 FW dump template to specify same start/end to debug customer issues + +From: Joe Carnuccio + +commit ce6c668b146cc4f4442111e2bcee4c3af94e1ddf upstream. + +Firmware dump allows for debugging customer issues. This patch fixes +start/end pointer calculation to capture T262 template entry for dump +tool. + +Signed-off-by: Joe Carnuccio +Signed-off-by: Himanshu Madhani +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c +index 8a58ef3adab4..c197972a3e2d 100644 +--- a/drivers/scsi/qla2xxx/qla_tmpl.c ++++ b/drivers/scsi/qla2xxx/qla_tmpl.c +@@ -371,7 +371,7 @@ qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha, + goto done; + } + +- if (end <= start || start == 0 || end == 0) { ++ if (end < start || start == 0 || end == 0) { + ql_dbg(ql_dbg_misc, vha, 0xd023, + "%s: unusable range (start=%x end=%x)\n", __func__, + ent->t262.end_addr, ent->t262.start_addr); diff --git a/queue-4.9/scsi-qla2xxx-set-bit-15-for-diag_echo_test-mbc.patch b/queue-4.9/scsi-qla2xxx-set-bit-15-for-diag_echo_test-mbc.patch new file mode 100644 index 00000000000..784f8cfdefd --- /dev/null +++ b/queue-4.9/scsi-qla2xxx-set-bit-15-for-diag_echo_test-mbc.patch @@ -0,0 +1,61 @@ +From 1d63496516c61e2e1351f10e6becbfc9ee511395 Mon Sep 17 00:00:00 2001 +From: Joe Carnuccio +Date: Wed, 24 May 2017 18:06:22 -0700 +Subject: scsi: qla2xxx: Set bit 15 for DIAG_ECHO_TEST MBC + +From: Joe Carnuccio + +commit 1d63496516c61e2e1351f10e6becbfc9ee511395 upstream. + +Set bit (BIT_15) to send right ECHO payload information for Diagnostic +Echo Test command. + +Signed-off-by: Joe Carnuccio +Signed-off-by: Himanshu Madhani +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/qla2xxx/qla_bsg.c | 9 +++++---- + drivers/scsi/qla2xxx/qla_mbx.c | 4 ++-- + 2 files changed, 7 insertions(+), 6 deletions(-) + +--- a/drivers/scsi/qla2xxx/qla_bsg.c ++++ b/drivers/scsi/qla2xxx/qla_bsg.c +@@ -721,6 +721,8 @@ qla2x00_process_loopback(struct fc_bsg_j + return -EIO; + } + ++ memset(&elreq, 0, sizeof(elreq)); ++ + elreq.req_sg_cnt = dma_map_sg(&ha->pdev->dev, + bsg_job->request_payload.sg_list, bsg_job->request_payload.sg_cnt, + DMA_TO_DEVICE); +@@ -786,10 +788,9 @@ qla2x00_process_loopback(struct fc_bsg_j + + if (atomic_read(&vha->loop_state) == LOOP_READY && + (ha->current_topology == ISP_CFG_F || +- ((IS_QLA81XX(ha) || IS_QLA8031(ha) || IS_QLA8044(ha)) && +- le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE +- && req_data_len == MAX_ELS_FRAME_PAYLOAD)) && +- elreq.options == EXTERNAL_LOOPBACK) { ++ (le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE && ++ req_data_len == MAX_ELS_FRAME_PAYLOAD)) && ++ elreq.options == EXTERNAL_LOOPBACK) { + type = "FC_BSG_HST_VENDOR_ECHO_DIAG"; + ql_dbg(ql_dbg_user, vha, 0x701e, + "BSG request type: %s.\n", type); +--- a/drivers/scsi/qla2xxx/qla_mbx.c ++++ b/drivers/scsi/qla2xxx/qla_mbx.c +@@ -4783,9 +4783,9 @@ qla2x00_echo_test(scsi_qla_host_t *vha, + + memset(mcp->mb, 0 , sizeof(mcp->mb)); + mcp->mb[0] = MBC_DIAGNOSTIC_ECHO; +- mcp->mb[1] = mreq->options | BIT_6; /* BIT_6 specifies 64bit address */ ++ /* BIT_6 specifies 64bit address */ ++ mcp->mb[1] = mreq->options | BIT_15 | BIT_6; + if (IS_CNA_CAPABLE(ha)) { +- mcp->mb[1] |= BIT_15; + mcp->mb[2] = vha->fcoe_fcf_idx; + } + mcp->mb[16] = LSW(mreq->rcv_dma); diff --git a/queue-4.9/serial-sh-sci-fix-panic-when-serial-console-and-dma-are-enabled.patch b/queue-4.9/serial-sh-sci-fix-panic-when-serial-console-and-dma-are-enabled.patch new file mode 100644 index 00000000000..98212f852db --- /dev/null +++ b/queue-4.9/serial-sh-sci-fix-panic-when-serial-console-and-dma-are-enabled.patch @@ -0,0 +1,61 @@ +From 3c9101766b502a0163d1d437fada5801cf616be2 Mon Sep 17 00:00:00 2001 +From: Takatoshi Akiyama +Date: Mon, 27 Feb 2017 15:56:31 +0900 +Subject: serial: sh-sci: Fix panic when serial console and DMA are enabled + +From: Takatoshi Akiyama + +commit 3c9101766b502a0163d1d437fada5801cf616be2 upstream. + +This patch fixes an issue that kernel panic happens when DMA is enabled +and we press enter key while the kernel booting on the serial console. + +* An interrupt may occur after sci_request_irq(). +* DMA transfer area is initialized by setup_timer() in sci_request_dma() + and used in interrupt. + +If an interrupt occurred between sci_request_irq() and setup_timer() in +sci_request_dma(), DMA transfer area has not been initialized yet. +So, this patch changes the order of sci_request_irq() and +sci_request_dma(). + +Fixes: 73a19e4c0301 ("serial: sh-sci: Add DMA support.") +Signed-off-by: Takatoshi Akiyama +[Shimoda changes the commit log] +Signed-off-by: Yoshihiro Shimoda +Cc: Jiri Slaby +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/serial/sh-sci.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/tty/serial/sh-sci.c ++++ b/drivers/tty/serial/sh-sci.c +@@ -1976,11 +1976,13 @@ static int sci_startup(struct uart_port + + dev_dbg(port->dev, "%s(%d)\n", __func__, port->line); + ++ sci_request_dma(port); ++ + ret = sci_request_irq(s); +- if (unlikely(ret < 0)) ++ if (unlikely(ret < 0)) { ++ sci_free_dma(port); + return ret; +- +- sci_request_dma(port); ++ } + + return 0; + } +@@ -2012,8 +2014,8 @@ static void sci_shutdown(struct uart_por + } + #endif + +- sci_free_dma(port); + sci_free_irq(s); ++ sci_free_dma(port); + } + + static int sci_sck_calc(struct sci_port *s, unsigned int bps, diff --git a/queue-4.9/series b/queue-4.9/series index e4cac76125e..c9ae2928453 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -84,3 +84,24 @@ cxl-fix-error-path-on-bad-ioctl.patch cxl-avoid-double-free_irq-for-psl-slice-interrupts.patch btrfs-use-correct-types-for-page-indices-in-btrfs_page_exists_in_range.patch btrfs-fix-memory-leak-in-update_space_info-failure-path.patch +kvm-arm-arm64-handle-possible-null-stage2-pud-when-ageing-pages.patch +scsi-qla2xxx-don-t-disable-a-not-previously-enabled-pci-device.patch +scsi-qla2xxx-modify-t262-fw-dump-template-to-specify-same-start-end-to-debug-customer-issues.patch +scsi-qla2xxx-set-bit-15-for-diag_echo_test-mbc.patch +scsi-qla2xxx-fix-mailbox-pointer-error-in-fwdump-capture.patch +powerpc-sysdev-simple_gpio-fix-oops-in-gpio-save_regs-function.patch +powerpc-numa-fix-percpu-allocations-to-be-numa-aware.patch +powerpc-hotplug-mem-fix-missing-endian-conversion-of-aa_index.patch +powerpc-kernel-fix-fp-and-vector-register-restoration.patch +powerpc-kernel-initialize-load_tm-on-task-creation.patch +perf-core-drop-kernel-samples-even-though-u-is-specified.patch +drm-vmwgfx-handle-vmalloc-failure-in-vmw_local_fifo_reserve.patch +drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_surface_define_ioctl.patch +drm-vmwgfx-make-sure-backup_handle-is-always-valid.patch +drm-nouveau-tmr-fully-separate-alarm-execution-pending-lists.patch +alsa-timer-fix-race-between-read-and-ioctl.patch +alsa-timer-fix-missing-queue-indices-reset-at-sndrv_timer_ioctl_select.patch +asoc-fix-use-after-free-at-card-unregistration.patch +cpu-hotplug-drop-the-device-lock-on-error.patch +drivers-char-mem-fix-wraparound-check-to-allow-mappings-up-to-the-end.patch +serial-sh-sci-fix-panic-when-serial-console-and-dma-are-enabled.patch