diff --git a/kernel.spec b/kernel.spec index 8aa6e84..cf4e0ad 100644 --- a/kernel.spec +++ b/kernel.spec @@ -847,6 +847,8 @@ Patch13962: af_netlink-add-needed-scm_destroy-after-scm_send.patch Patch13963: x86-amd-fix-apic-timer-erratum-400-affecting-k8-rev.a-e-processors.patch Patch13964: x86-amd-fix-another-erratum-400-bug.patch +Patch13969: scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1593,6 +1595,8 @@ ApplyPatch af_netlink-add-needed-scm_destroy-after-scm_send.patch ApplyPatch x86-amd-fix-apic-timer-erratum-400-affecting-k8-rev.a-e-processors.patch ApplyPatch x86-amd-fix-another-erratum-400-bug.patch +ApplyPatch scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch + # END OF PATCH APPLICATIONS %endif @@ -2179,6 +2183,10 @@ fi # and build. %changelog +* Fri May 13 2011 Kyle McMartin +- [fabbione@] Fix a deadlock when using hp_sw with an HP san. + (7a1e9d82 upstream) + * Thu May 12 2011 Chuck Ebbert 2.6.35.13-92 - Fix stalls on AMD machines with C1E caused by 2.6.35.13 (#704059) diff --git a/scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch b/scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch new file mode 100644 index 0000000..faded33 --- /dev/null +++ b/scsi_dh_hp_sw-fix-deadlock-in-start_stop_endio.patch @@ -0,0 +1,32 @@ +From 7a1e9d829f8bd821466c5ea834ad6f378740d2be Mon Sep 17 00:00:00 2001 +From: Mike Snitzer +Date: Tue, 25 Jan 2011 11:52:17 -0500 +Subject: [SCSI] scsi_dh_hp_sw: fix deadlock in start_stop_endio + +The use of blk_execute_rq_nowait() implies __blk_put_request() is needed +in start_stop_endio() rather than blk_put_request() -- +blk_finish_request() is called with queue lock already held. + +Signed-off-by: Mike Snitzer +Signed-off-by: James Bottomley +--- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c +index e391664..d0363c8 100644 +--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c ++++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c +@@ -225,7 +225,8 @@ static void start_stop_endio(struct request *req, int error) + } + } + done: +- blk_put_request(req); ++ req->end_io_data = NULL; ++ __blk_put_request(req->q, req); + if (h->callback_fn) { + h->callback_fn(h->callback_data, err); + h->callback_fn = h->callback_data = NULL; +-- +1.7.5.1 +