4.9-stable patches

added patches:
	sched-deadline-zero-out-positive-runtime-after-throttling-constrained-tasks.patch
	scsi-hpsa-fix-volume-offline-state.patch

diff --git a/queue-4.9/sched-deadline-zero-out-positive-runtime-after-throttling-constrained-tasks.patch b/queue-4.9/sched-deadline-zero-out-positive-runtime-after-throttling-constrained-tasks.patch
new file mode 100644 (file)
index 0000000..9736356
--- /dev/null
+++ b/queue-4.9/sched-deadline-zero-out-positive-runtime-after-throttling-constrained-tasks.patch
@@ -0,0 +1,47 @@
+From ae83b56a56f8d9643dedbee86b457fa1c5d42f59 Mon Sep 17 00:00:00 2001
+From: Xunlei Pang <xlpang@redhat.com>
+Date: Wed, 10 May 2017 21:03:37 +0800
+Subject: sched/deadline: Zero out positive runtime after throttling constrained tasks
+
+From: Xunlei Pang <xlpang@redhat.com>
+
+commit ae83b56a56f8d9643dedbee86b457fa1c5d42f59 upstream.
+
+When a contrained task is throttled by dl_check_constrained_dl(),
+it may carry the remaining positive runtime, as a result when
+dl_task_timer() fires and calls replenish_dl_entity(), it will
+not be replenished correctly due to the positive dl_se->runtime.
+
+This patch assigns its runtime to 0 if positive after throttling.
+
+Signed-off-by: Xunlei Pang <xlpang@redhat.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Acked-by: Daniel Bristot de Oliveira <bristot@redhat.com>
+Cc: Juri Lelli <juri.lelli@arm.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Luca Abeni <luca.abeni@santannapisa.it>
+Cc: Mike Galbraith <efault@gmx.de>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Fixes: df8eac8cafce ("sched/deadline: Throttle a constrained deadline task activated after the deadline)
+Link: http://lkml.kernel.org/r/1494421417-27550-1-git-send-email-xlpang@redhat.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/sched/deadline.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/kernel/sched/deadline.c
++++ b/kernel/sched/deadline.c
+@@ -723,6 +723,8 @@ static inline void dl_check_constrained_
+               if (unlikely(dl_se->dl_boosted || !start_dl_timer(p)))
+                       return;
+               dl_se->dl_throttled = 1;
++              if (dl_se->runtime > 0)
++                      dl_se->runtime = 0;
+       }
+ }
+ 

diff --git a/queue-4.9/scsi-hpsa-fix-volume-offline-state.patch b/queue-4.9/scsi-hpsa-fix-volume-offline-state.patch
new file mode 100644 (file)
index 0000000..c3edc5a
--- /dev/null
+++ b/queue-4.9/scsi-hpsa-fix-volume-offline-state.patch
@@ -0,0 +1,33 @@
+From eb94588dabec82e012281608949a860f64752914 Mon Sep 17 00:00:00 2001
+From: Tomas Henzl <thenzl@redhat.com>
+Date: Mon, 20 Mar 2017 16:42:48 +0100
+Subject: scsi: hpsa: fix volume offline state
+
+From: Tomas Henzl <thenzl@redhat.com>
+
+commit eb94588dabec82e012281608949a860f64752914 upstream.
+
+In a previous patch a hpsa_scsi_dev_t.volume_offline update line has
+been removed, so let us put it back..
+
+Fixes: 85b29008d8 (hpsa: update check for logical volume status)
+Signed-off-by: Tomas Henzl <thenzl@redhat.com>
+Acked-by: Don Brace <don.brace@microsemi.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Cc: Ben Hutchings <ben.hutchings@codethink.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/hpsa.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/scsi/hpsa.c
++++ b/drivers/scsi/hpsa.c
+@@ -3857,6 +3857,7 @@ static int hpsa_update_device_info(struc
+               if (h->fw_support & MISC_FW_RAID_OFFLOAD_BASIC)
+                       hpsa_get_ioaccel_status(h, scsi3addr, this_device);
+               volume_offline = hpsa_volume_offline(h, scsi3addr);
++              this_device->volume_offline = volume_offline;
+               if (volume_offline == HPSA_LV_FAILED) {
+                       rc = HPSA_LV_FAILED;
+                       dev_err(&h->pdev->dev,

diff --git a/queue-4.9/series b/queue-4.9/series
index b8d42d9e0f5c1ff807fce6c7d088356e4714fe19..6f65b0dbeeca70ffe10b67cb03df838c6f10066f 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -9,3 +9,5 @@ timers-unconditionally-check-deferrable-base.patch
 af_key-fix-buffer-overread-in-verify_address_len.patch
 af_key-fix-buffer-overread-in-parse_exthdrs.patch
 iser-target-fix-possible-use-after-free-in-connection-establishment-error.patch
+scsi-hpsa-fix-volume-offline-state.patch
+sched-deadline-zero-out-positive-runtime-after-throttling-constrained-tasks.patch