Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-03-22 07:23:26 +0100
committerKernel Build Daemon <kbuild@suse.de>2019-03-22 07:23:26 +0100
commita0dd1b8529f55052ed310889247540e6a1bf47aa (patch)
tree95083a81755228ed72ef3df649465ec4c032e70f
parenta66b40ed549f3c6446181ce7950ae3d0da8aa312 (diff)
parentdea44cac677747e5f67d5d625e599236c75808b5 (diff)
Merge branch 'SLE12-SP3' into openSUSE-42.3openSUSE-42.3
-rw-r--r--blacklist.conf2
-rw-r--r--patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch39
-rw-r--r--series.conf5
3 files changed, 28 insertions, 18 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 1126fc0d52..d70b11e705 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -609,3 +609,5 @@ fe5ec65668cdaa4348631d8ce1766eed43b33c10 # Duplicate of e8a8fedd57fdcebf0e4f24ef
0192e6535ebe9af68614198ced4fd6d37b778ebf # Breaks build
826c1362e79abcd36f99092acd083b5a2d576676 # only needed with 09abb5e3e5e50
a9519defc771d574888ffe01e84747889152ec35 # Just a typo fix in a comment
+c9e716eb9b3455a83ed7c5f5a81256a3da779a95 # Just to allow mounting ext2 with ancient kernels
+231fe82b5609c5d679f81073739c6132aaf166ea # Capitalization fix in kconfig
diff --git a/patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch b/patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch
index 3c121ada4e..bb30b61e9e 100644
--- a/patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch
+++ b/patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch
@@ -1,16 +1,19 @@
-From e28d9260f93c89f1d93328304b2f1cdc64adb4ba Mon Sep 17 00:00:00 2001
+From 7f5203c13ba8a7b7f9f6ecfe5a4d5567188d7835 Mon Sep 17 00:00:00 2001
From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
-Date: Fri, 15 Feb 2019 11:51:27 -0600
-Subject: [PATCH v2] ibmvscsi: Fix empty event pool access during host removal
+Date: Wed, 20 Mar 2019 13:41:51 -0500
+Subject: [PATCH] scsi: ibmvscsi: Fix empty event pool access during host
+ removal
References: bsc#1119019
-Patch-mainline: no, testing
+Patch-mainline: queued
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
+Git-commit: 7f5203c13ba8a7b7f9f6ecfe5a4d5567188d7835
-The event pool used for queueing commands is destroyed fairly early in
-the ibmvscsi_remove() code path. Since, this happens prior to the call
-so scsi_remove_host() it is possible for further calls to queuecommand
-to be processed which manifest as a panic due to a NULL pointer
-dereference as seen here:
+The event pool used for queueing commands is destroyed fairly early in the
+ibmvscsi_remove() code path. Since, this happens prior to the call so
+scsi_remove_host() it is possible for further calls to queuecommand to be
+processed which manifest as a panic due to a NULL pointer dereference as
+seen here:
PANIC: "Unable to handle kernel paging request for data at address
0x00000000"
@@ -35,15 +38,19 @@ The kernel buffer log is overfilled with this log:
[11261.952732] ibmvscsi: found no event struct in pool!
-This patch reorders the operations during host teardown. Start by
-calling the SRP transport and Scsi_Host remove functions to flush any
-outstanding work and set the host offline. LLDD teardown follows
-including destruction of the event pool, freeing the Command Response
-Queue (CRQ), and unmapping any persistent buffers. The event pool
-destruction is protected by the scsi_host lock, and the pool is purged
-prior of any requests for which we never received a response.
+This patch reorders the operations during host teardown. Start by calling
+the SRP transport and Scsi_Host remove functions to flush any outstanding
+work and set the host offline. LLDD teardown follows including destruction
+of the event pool, freeing the Command Response Queue (CRQ), and unmapping
+any persistent buffers. The event pool destruction is protected by the
+scsi_host lock, and the pool is purged prior of any requests for which we
+never received a response. Finally, move the removal of the scsi host from
+our global list to the end so that the host is easily locatable for
+debugging purposes during teardown.
+Cc: <stable@vger.kernel.org> # v2.6.12+
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
drivers/scsi/ibmvscsi/ibmvscsi.c | 15 ++++++++++++---
diff --git a/series.conf b/series.conf
index ea56aa39ff..6cc13bc628 100644
--- a/series.conf
+++ b/series.conf
@@ -24527,6 +24527,9 @@
# davem/net-next
patches.drivers/ibmvnic-Report-actual-backing-device-speed-and-duple.patch
+ # jejb/scsi for-next
+ patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch
+
# out-of-tree patches
patches.suse/0001-drm-vmwgfx-Don-t-double-free-the-mode-stored-in-par-.patch
patches.arch/pseries-energy-Use-OF-accessor-function-to-read-ibm-.patch
@@ -24647,8 +24650,6 @@
patches.arch/powerpc-add-kernel-parameter-iommu_alloc_quiet.patch
- patches.drivers/ibmvscsi-Fix-empty-event-pool-access-during-host-rem.patch
-
########################################################
# powerpc/little endian
########################################################