4.14-stable patches

added patches:
	scsi-qla2xxx-don-t-break-the-bsg-lib-abstractions.patch

diff --git a/queue-4.14/scsi-qla2xxx-don-t-break-the-bsg-lib-abstractions.patch b/queue-4.14/scsi-qla2xxx-don-t-break-the-bsg-lib-abstractions.patch
new file mode 100644 (file)
index 0000000..61f909d
--- /dev/null
+++ b/queue-4.14/scsi-qla2xxx-don-t-break-the-bsg-lib-abstractions.patch
@@ -0,0 +1,115 @@
+From 05231a3bb7981b01f6933c0a847fcaac25622bfd Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Tue, 3 Oct 2017 12:48:40 +0200
+Subject: scsi: qla2xxx: don't break the bsg-lib abstractions
+
+From: Christoph Hellwig <hch@lst.de>
+
+commit 05231a3bb7981b01f6933c0a847fcaac25622bfd upstream.
+
+Always use bsg_job->reply instead of scsi_req(bsg_job->req)->sense), as
+they always point to the same memory.
+
+Never set scsi_req(bsg_job->req)->result and we'll set that value
+through bsg_job_done.
+
+[mkp: applied by hand, fixed whitespace]
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
+Reviewed-by: Himanshu Madhani <himanshu.madhani@cavium.com>
+Tested-by: Himanshu Madhani <himanshu.madhani@cavium.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/qla2xxx/qla_bsg.c |   10 ++++------
+ drivers/scsi/qla2xxx/qla_isr.c |   12 +++---------
+ drivers/scsi/qla2xxx/qla_mr.c  |    3 +--
+ 3 files changed, 8 insertions(+), 17 deletions(-)
+
+--- a/drivers/scsi/qla2xxx/qla_bsg.c
++++ b/drivers/scsi/qla2xxx/qla_bsg.c
+@@ -924,9 +924,9 @@ qla2x00_process_loopback(struct bsg_job
+ 
+       bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
+           sizeof(response) + sizeof(uint8_t);
+-      fw_sts_ptr = ((uint8_t *)scsi_req(bsg_job->req)->sense) +
+-          sizeof(struct fc_bsg_reply);
+-      memcpy(fw_sts_ptr, response, sizeof(response));
++      fw_sts_ptr = bsg_job->reply + sizeof(struct fc_bsg_reply);
++      memcpy(bsg_job->reply + sizeof(struct fc_bsg_reply), response,
++                      sizeof(response));
+       fw_sts_ptr += sizeof(response);
+       *fw_sts_ptr = command_sent;
+ 
+@@ -2558,13 +2558,11 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_
+                                               ql_log(ql_log_warn, vha, 0x7089,
+                                                   "mbx abort_command "
+                                                   "failed.\n");
+-                                              scsi_req(bsg_job->req)->result =
+                                               bsg_reply->result = -EIO;
+                                       } else {
+                                               ql_dbg(ql_dbg_user, vha, 0x708a,
+                                                   "mbx abort_command "
+                                                   "success.\n");
+-                                              scsi_req(bsg_job->req)->result =
+                                               bsg_reply->result = 0;
+                                       }
+                                       spin_lock_irqsave(&ha->hardware_lock, flags);
+@@ -2575,7 +2573,7 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_
+       }
+       spin_unlock_irqrestore(&ha->hardware_lock, flags);
+       ql_log(ql_log_info, vha, 0x708b, "SRB not found to abort.\n");
+-      scsi_req(bsg_job->req)->result = bsg_reply->result = -ENXIO;
++      bsg_reply->result = -ENXIO;
+       return 0;
+ 
+ done:
+--- a/drivers/scsi/qla2xxx/qla_isr.c
++++ b/drivers/scsi/qla2xxx/qla_isr.c
+@@ -1540,7 +1540,6 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vh
+       struct fc_bsg_reply *bsg_reply;
+       uint16_t comp_status;
+       uint32_t fw_status[3];
+-      uint8_t* fw_sts_ptr;
+       int res;
+ 
+       sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
+@@ -1601,11 +1600,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vh
+                           type, sp->handle, comp_status, fw_status[1], fw_status[2],
+                           le16_to_cpu(((struct els_sts_entry_24xx *)
+                               pkt)->total_byte_count));
+-                      fw_sts_ptr = ((uint8_t*)scsi_req(bsg_job->req)->sense) +
+-                              sizeof(struct fc_bsg_reply);
+-                      memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
+-              }
+-              else {
++              } else {
+                       ql_dbg(ql_dbg_user, vha, 0x5040,
+                           "ELS-CT pass-through-%s error hdl=%x comp_status-status=0x%x "
+                           "error subcode 1=0x%x error subcode 2=0x%x.\n",
+@@ -1616,10 +1611,9 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vh
+                                   pkt)->error_subcode_2));
+                       res = DID_ERROR << 16;
+                       bsg_reply->reply_payload_rcv_len = 0;
+-                      fw_sts_ptr = ((uint8_t*)scsi_req(bsg_job->req)->sense) +
+-                                      sizeof(struct fc_bsg_reply);
+-                      memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
+               }
++              memcpy(bsg_job->reply + sizeof(struct fc_bsg_reply),
++                     fw_status, sizeof(fw_status));
+               ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,
+                               (uint8_t *)pkt, sizeof(*pkt));
+       }
+--- a/drivers/scsi/qla2xxx/qla_mr.c
++++ b/drivers/scsi/qla2xxx/qla_mr.c
+@@ -2222,8 +2222,7 @@ qlafx00_ioctl_iosb_entry(scsi_qla_host_t
+               memcpy(fstatus.reserved_3,
+                   pkt->reserved_2, 20 * sizeof(uint8_t));
+ 
+-              fw_sts_ptr = ((uint8_t *)scsi_req(bsg_job->req)->sense) +
+-                  sizeof(struct fc_bsg_reply);
++              fw_sts_ptr = bsg_job->reply + sizeof(struct fc_bsg_reply);
+ 
+               memcpy(fw_sts_ptr, (uint8_t *)&fstatus,
+                   sizeof(struct qla_mt_iocb_rsp_fx00));

diff --git a/queue-4.14/series b/queue-4.14/series
index 66041f8a2f7ea8f6ba30375e92d7a56a745e9810..038d08f266887d7953d332968e551087c6d599f2 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -40,3 +40,4 @@ x86-i8259-mark-legacy-pic-interrupts-with-irq_level.patch
 wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch
 xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch
 drm-radeon-dp-make-radeon_dp_get_dp_link_config-static.patch
+scsi-qla2xxx-don-t-break-the-bsg-lib-abstractions.patch