]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.3-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2019 15:10:50 +0000 (16:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2019 15:10:50 +0000 (16:10 +0100)
added patches:
media-venus-remove-invalid-compat_ioctl32-handler.patch
revert-nvme-add-quirk-for-kingston-nvme-ssd-running-fw-e8fk11.t.patch
scsi-qla2xxx-fix-driver-unload-hang.patch
scsi-qla2xxx-fix-memory-leak-when-sending-i-o-fails.patch
scsi-zfcp-trace-channel-log-even-for-fcp-command-responses.patch

queue-5.3/media-venus-remove-invalid-compat_ioctl32-handler.patch [new file with mode: 0644]
queue-5.3/revert-nvme-add-quirk-for-kingston-nvme-ssd-running-fw-e8fk11.t.patch [new file with mode: 0644]
queue-5.3/scsi-qla2xxx-fix-driver-unload-hang.patch [new file with mode: 0644]
queue-5.3/scsi-qla2xxx-fix-memory-leak-when-sending-i-o-fails.patch [new file with mode: 0644]
queue-5.3/scsi-zfcp-trace-channel-log-even-for-fcp-command-responses.patch [new file with mode: 0644]
queue-5.3/series

diff --git a/queue-5.3/media-venus-remove-invalid-compat_ioctl32-handler.patch b/queue-5.3/media-venus-remove-invalid-compat_ioctl32-handler.patch
new file mode 100644 (file)
index 0000000..8b5e554
--- /dev/null
@@ -0,0 +1,54 @@
+From 4adc0423de92cf850d1ef5c0e7cb28fd7a38219e Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 6 Nov 2019 10:06:54 +0100
+Subject: media: venus: remove invalid compat_ioctl32 handler
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 4adc0423de92cf850d1ef5c0e7cb28fd7a38219e upstream.
+
+v4l2_compat_ioctl32() is the function that calls into
+v4l2_file_operations->compat_ioctl32(), so setting that back to the same
+function leads to a trivial endless loop, followed by a kernel
+stack overrun.
+
+Remove the incorrect assignment.
+
+Cc: stable@vger.kernel.org
+Fixes: 7472c1c69138 ("[media] media: venus: vdec: add video decoder files")
+Fixes: aaaa93eda64b ("[media] media: venus: venc: add video encoder files")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/platform/qcom/venus/vdec.c |    3 ---
+ drivers/media/platform/qcom/venus/venc.c |    3 ---
+ 2 files changed, 6 deletions(-)
+
+--- a/drivers/media/platform/qcom/venus/vdec.c
++++ b/drivers/media/platform/qcom/venus/vdec.c
+@@ -1104,9 +1104,6 @@ static const struct v4l2_file_operations
+       .unlocked_ioctl = video_ioctl2,
+       .poll = v4l2_m2m_fop_poll,
+       .mmap = v4l2_m2m_fop_mmap,
+-#ifdef CONFIG_COMPAT
+-      .compat_ioctl32 = v4l2_compat_ioctl32,
+-#endif
+ };
+ static int vdec_probe(struct platform_device *pdev)
+--- a/drivers/media/platform/qcom/venus/venc.c
++++ b/drivers/media/platform/qcom/venus/venc.c
+@@ -1230,9 +1230,6 @@ static const struct v4l2_file_operations
+       .unlocked_ioctl = video_ioctl2,
+       .poll = v4l2_m2m_fop_poll,
+       .mmap = v4l2_m2m_fop_mmap,
+-#ifdef CONFIG_COMPAT
+-      .compat_ioctl32 = v4l2_compat_ioctl32,
+-#endif
+ };
+ static int venc_probe(struct platform_device *pdev)
diff --git a/queue-5.3/revert-nvme-add-quirk-for-kingston-nvme-ssd-running-fw-e8fk11.t.patch b/queue-5.3/revert-nvme-add-quirk-for-kingston-nvme-ssd-running-fw-e8fk11.t.patch
new file mode 100644 (file)
index 0000000..1f32312
--- /dev/null
@@ -0,0 +1,46 @@
+From 655e7aee1f0398602627a485f7dca6c29cc96cae Mon Sep 17 00:00:00 2001
+From: Jian-Hong Pan <jian-hong@endlessm.com>
+Date: Thu, 31 Oct 2019 17:34:09 +0800
+Subject: Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
+
+From: Jian-Hong Pan <jian-hong@endlessm.com>
+
+commit 655e7aee1f0398602627a485f7dca6c29cc96cae upstream.
+
+Since e045fa29e893 ("PCI/MSI: Fix incorrect MSI-X masking on resume") is
+merged, we can revert the previous quirk now.
+
+This reverts commit 19ea025e1d28c629b369c3532a85b3df478cc5c6.
+
+Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=204887
+Fixes: 19ea025e1d28 ("nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T")
+Link: https://lore.kernel.org/r/20191031093408.9322-1-jian-hong@endlessm.com
+Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Acked-by: Christoph Hellwig <hch@lst.de>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/nvme/host/core.c |   10 ----------
+ 1 file changed, 10 deletions(-)
+
+--- a/drivers/nvme/host/core.c
++++ b/drivers/nvme/host/core.c
+@@ -2270,16 +2270,6 @@ static const struct nvme_core_quirk_entr
+               .vid = 0x14a4,
+               .fr = "22301111",
+               .quirks = NVME_QUIRK_SIMPLE_SUSPEND,
+-      },
+-      {
+-              /*
+-               * This Kingston E8FK11.T firmware version has no interrupt
+-               * after resume with actions related to suspend to idle
+-               * https://bugzilla.kernel.org/show_bug.cgi?id=204887
+-               */
+-              .vid = 0x2646,
+-              .fr = "E8FK11.T",
+-              .quirks = NVME_QUIRK_SIMPLE_SUSPEND,
+       }
+ };
diff --git a/queue-5.3/scsi-qla2xxx-fix-driver-unload-hang.patch b/queue-5.3/scsi-qla2xxx-fix-driver-unload-hang.patch
new file mode 100644 (file)
index 0000000..2ea4a5e
--- /dev/null
@@ -0,0 +1,35 @@
+From dd322b7f3efc8cda085bb60eadc4aee6324eadd8 Mon Sep 17 00:00:00 2001
+From: Quinn Tran <qutran@marvell.com>
+Date: Tue, 5 Nov 2019 07:06:53 -0800
+Subject: scsi: qla2xxx: Fix driver unload hang
+
+From: Quinn Tran <qutran@marvell.com>
+
+commit dd322b7f3efc8cda085bb60eadc4aee6324eadd8 upstream.
+
+This patch fixes driver unload hang by removing msleep()
+
+Fixes: d74595278f4ab ("scsi: qla2xxx: Add multiple queue pair functionality.")
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20191105150657.8092-5-hmadhani@marvell.com
+Reviewed-by: Ewan D. Milne <emilne@redhat.com>
+Signed-off-by: Quinn Tran <qutran@marvell.com>
+Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/qla2xxx/qla_init.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/scsi/qla2xxx/qla_init.c
++++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -9092,8 +9092,6 @@ int qla2xxx_delete_qpair(struct scsi_qla
+       struct qla_hw_data *ha = qpair->hw;
+       qpair->delete_in_progress = 1;
+-      while (atomic_read(&qpair->ref_count))
+-              msleep(500);
+       ret = qla25xx_delete_req_que(vha, qpair->req);
+       if (ret != QLA_SUCCESS)
diff --git a/queue-5.3/scsi-qla2xxx-fix-memory-leak-when-sending-i-o-fails.patch b/queue-5.3/scsi-qla2xxx-fix-memory-leak-when-sending-i-o-fails.patch
new file mode 100644 (file)
index 0000000..42ae1d9
--- /dev/null
@@ -0,0 +1,45 @@
+From 2f856d4e8c23f5ad5221f8da4a2f22d090627f19 Mon Sep 17 00:00:00 2001
+From: Arun Easi <aeasi@marvell.com>
+Date: Tue, 5 Nov 2019 07:06:55 -0800
+Subject: scsi: qla2xxx: Fix memory leak when sending I/O fails
+
+From: Arun Easi <aeasi@marvell.com>
+
+commit 2f856d4e8c23f5ad5221f8da4a2f22d090627f19 upstream.
+
+On heavy loads, a memory leak of the srb_t structure is observed.  This
+would make the qla2xxx_srbs cache gobble up memory.
+
+Fixes: 219d27d7147e0 ("scsi: qla2xxx: Fix race conditions in the code for aborting SCSI commands")
+Cc: stable@vger.kernel.org # 5.2
+Link: https://lore.kernel.org/r/20191105150657.8092-7-hmadhani@marvell.com
+Reviewed-by: Ewan D. Milne <emilne@redhat.com>
+Signed-off-by: Arun Easi <aeasi@marvell.com>
+Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/qla2xxx/qla_os.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -947,6 +947,8 @@ qla2xxx_queuecommand(struct Scsi_Host *h
+ qc24_host_busy_free_sp:
+       sp->free(sp);
++      CMD_SP(cmd) = NULL;
++      qla2x00_rel_sp(sp);
+ qc24_host_busy:
+       return SCSI_MLQUEUE_HOST_BUSY;
+@@ -1036,6 +1038,8 @@ qla2xxx_mqueuecommand(struct Scsi_Host *
+ qc24_host_busy_free_sp:
+       sp->free(sp);
++      CMD_SP(cmd) = NULL;
++      qla2xxx_rel_qpair_sp(sp->qpair, sp);
+ qc24_host_busy:
+       return SCSI_MLQUEUE_HOST_BUSY;
diff --git a/queue-5.3/scsi-zfcp-trace-channel-log-even-for-fcp-command-responses.patch b/queue-5.3/scsi-zfcp-trace-channel-log-even-for-fcp-command-responses.patch
new file mode 100644 (file)
index 0000000..7eec323
--- /dev/null
@@ -0,0 +1,46 @@
+From 100843f176109af94600e500da0428e21030ca7f Mon Sep 17 00:00:00 2001
+From: Steffen Maier <maier@linux.ibm.com>
+Date: Fri, 25 Oct 2019 18:12:53 +0200
+Subject: scsi: zfcp: trace channel log even for FCP command responses
+
+From: Steffen Maier <maier@linux.ibm.com>
+
+commit 100843f176109af94600e500da0428e21030ca7f upstream.
+
+While v2.6.26 commit b75db73159cc ("[SCSI] zfcp: Add qtcb dump to hba debug
+trace") is right that we don't want to flood the (payload) trace ring
+buffer, we don't trace successful FCP command responses by default.  So we
+can include the channel log for problem determination with failed responses
+of any FSF request type.
+
+Fixes: b75db73159cc ("[SCSI] zfcp: Add qtcb dump to hba debug trace")
+Fixes: a54ca0f62f95 ("[SCSI] zfcp: Redesign of the debug tracing for HBA records.")
+Cc: <stable@vger.kernel.org> #2.6.38+
+Link: https://lore.kernel.org/r/e37597b5c4ae123aaa85fd86c23a9f71e994e4a9.1572018132.git.bblock@linux.ibm.com
+Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
+Signed-off-by: Steffen Maier <maier@linux.ibm.com>
+Signed-off-by: Benjamin Block <bblock@linux.ibm.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/s390/scsi/zfcp_dbf.c |    8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+--- a/drivers/s390/scsi/zfcp_dbf.c
++++ b/drivers/s390/scsi/zfcp_dbf.c
+@@ -95,11 +95,9 @@ void zfcp_dbf_hba_fsf_res(char *tag, int
+       memcpy(rec->u.res.fsf_status_qual, &q_head->fsf_status_qual,
+              FSF_STATUS_QUALIFIER_SIZE);
+-      if (q_head->fsf_command != FSF_QTCB_FCP_CMND) {
+-              rec->pl_len = q_head->log_length;
+-              zfcp_dbf_pl_write(dbf, (char *)q_pref + q_head->log_start,
+-                                rec->pl_len, "fsf_res", req->req_id);
+-      }
++      rec->pl_len = q_head->log_length;
++      zfcp_dbf_pl_write(dbf, (char *)q_pref + q_head->log_start,
++                        rec->pl_len, "fsf_res", req->req_id);
+       debug_event(dbf->hba, level, rec, sizeof(*rec));
+       spin_unlock_irqrestore(&dbf->hba_lock, flags);
index 9b04749e51fa6a2f840384e8ef6b24a83970066e..8da897388ed429e835c764398b31914cd8048226 100644 (file)
@@ -1,2 +1,7 @@
 usb-gadget-configfs-fix-missing-spin_lock_init.patch
 usb-gadget-pch_udc-fix-use-after-free.patch
+revert-nvme-add-quirk-for-kingston-nvme-ssd-running-fw-e8fk11.t.patch
+scsi-zfcp-trace-channel-log-even-for-fcp-command-responses.patch
+scsi-qla2xxx-fix-driver-unload-hang.patch
+scsi-qla2xxx-fix-memory-leak-when-sending-i-o-fails.patch
+media-venus-remove-invalid-compat_ioctl32-handler.patch