5.15-stable patches

added patches:
	arm-defconfig-drop-config_drm_rcar_lvds.patch
	rdma-irdma-do-not-generate-sw-completions-for-nops.patch
	rdma-irdma-fix-drain-sq-hang-with-no-completion.patch

diff --git a/queue-5.15/arm-defconfig-drop-config_drm_rcar_lvds.patch b/queue-5.15/arm-defconfig-drop-config_drm_rcar_lvds.patch
new file mode 100644 (file)
index 0000000..fcc9047
--- /dev/null
+++ b/queue-5.15/arm-defconfig-drop-config_drm_rcar_lvds.patch
@@ -0,0 +1,28 @@
+From 1441a15dd49616bd9dd4c25a018b0508cdada576 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 11 Aug 2022 16:27:13 +0200
+Subject: ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 1441a15dd49616bd9dd4c25a018b0508cdada576 upstream.
+
+This is now a hidden symbol, so just drop the defconfig line.
+
+Fixes: 42d95d1b3a9c ("drm/rcar: stop using 'imply' for dependencies")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/configs/multi_v7_defconfig |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/arm/configs/multi_v7_defconfig
++++ b/arch/arm/configs/multi_v7_defconfig
+@@ -696,7 +696,6 @@ CONFIG_DRM_IMX_LDB=m
+ CONFIG_DRM_IMX_HDMI=m
+ CONFIG_DRM_ATMEL_HLCDC=m
+ CONFIG_DRM_RCAR_DU=m
+-CONFIG_DRM_RCAR_LVDS=y
+ CONFIG_DRM_SUN4I=m
+ CONFIG_DRM_MSM=m
+ CONFIG_DRM_FSL_DCU=m

diff --git a/queue-5.15/rdma-irdma-do-not-generate-sw-completions-for-nops.patch b/queue-5.15/rdma-irdma-do-not-generate-sw-completions-for-nops.patch
new file mode 100644 (file)
index 0000000..17bccb6
--- /dev/null
+++ b/queue-5.15/rdma-irdma-do-not-generate-sw-completions-for-nops.patch
@@ -0,0 +1,37 @@
+From 30ed9ee9a10a90ae719dcfcacead1d0506fa45ed Mon Sep 17 00:00:00 2001
+From: Mustafa Ismail <mustafa.ismail@intel.com>
+Date: Wed, 15 Mar 2023 09:52:28 -0500
+Subject: RDMA/irdma: Do not generate SW completions for NOPs
+
+From: Mustafa Ismail <mustafa.ismail@intel.com>
+
+commit 30ed9ee9a10a90ae719dcfcacead1d0506fa45ed upstream.
+
+Currently, artificial SW completions are generated for NOP wqes which can
+generate unexpected completions with wr_id = 0. Skip the generation of
+artificial completions for NOPs.
+
+Fixes: 81091d7696ae ("RDMA/irdma: Add SW mechanism to generate completions on error")
+Signed-off-by: Mustafa Ismail <mustafa.ismail@intel.com>
+Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
+Link: https://lore.kernel.org/r/20230315145231.931-2-shiraz.saleem@intel.com
+Signed-off-by: Leon Romanovsky <leon@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/infiniband/hw/irdma/utils.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/infiniband/hw/irdma/utils.c
++++ b/drivers/infiniband/hw/irdma/utils.c
+@@ -2650,7 +2650,10 @@ void irdma_generate_flush_completions(st
+                       /* remove the SQ WR by moving SQ tail*/
+                       IRDMA_RING_SET_TAIL(*sq_ring,
+                               sq_ring->tail + qp->sq_wrtrk_array[sq_ring->tail].quanta);
+-
++                      if (cmpl->cpi.op_type == IRDMAQP_OP_NOP) {
++                              kfree(cmpl);
++                              continue;
++                      }
+                       ibdev_dbg(iwqp->iwscq->ibcq.device,
+                                 "DEV: %s: adding wr_id = 0x%llx SQ Completion to list qp_id=%d\n",
+                                 __func__, cmpl->cpi.wr_id, qp->qp_id);

diff --git a/queue-5.15/rdma-irdma-fix-drain-sq-hang-with-no-completion.patch b/queue-5.15/rdma-irdma-fix-drain-sq-hang-with-no-completion.patch
new file mode 100644 (file)
index 0000000..1ebf873
--- /dev/null
+++ b/queue-5.15/rdma-irdma-fix-drain-sq-hang-with-no-completion.patch
@@ -0,0 +1,61 @@
+From ead54ced6321099978d30d62dc49c282a6e70574 Mon Sep 17 00:00:00 2001
+From: Shiraz Saleem <shiraz.saleem@intel.com>
+Date: Wed, 24 Aug 2022 10:43:59 -0500
+Subject: RDMA/irdma: Fix drain SQ hang with no completion
+
+From: Shiraz Saleem <shiraz.saleem@intel.com>
+
+commit ead54ced6321099978d30d62dc49c282a6e70574 upstream.
+
+SW generated completions for outstanding WRs posted on SQ
+after QP is in error target the wrong CQ. This causes the
+ib_drain_sq to hang with no completion.
+
+Fix this to generate completions on the right CQ.
+
+[  863.969340] INFO: task kworker/u52:2:671 blocked for more than 122 seconds.
+[  863.979224]       Not tainted 5.14.0-130.el9.x86_64 #1
+[  863.986588] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
+[  863.996997] task:kworker/u52:2   state:D stack:    0 pid:  671 ppid:     2 flags:0x00004000
+[  864.007272] Workqueue: xprtiod xprt_autoclose [sunrpc]
+[  864.014056] Call Trace:
+[  864.017575]  __schedule+0x206/0x580
+[  864.022296]  schedule+0x43/0xa0
+[  864.026736]  schedule_timeout+0x115/0x150
+[  864.032185]  __wait_for_common+0x93/0x1d0
+[  864.037717]  ? usleep_range_state+0x90/0x90
+[  864.043368]  __ib_drain_sq+0xf6/0x170 [ib_core]
+[  864.049371]  ? __rdma_block_iter_next+0x80/0x80 [ib_core]
+[  864.056240]  ib_drain_sq+0x66/0x70 [ib_core]
+[  864.062003]  rpcrdma_xprt_disconnect+0x82/0x3b0 [rpcrdma]
+[  864.069365]  ? xprt_prepare_transmit+0x5d/0xc0 [sunrpc]
+[  864.076386]  xprt_rdma_close+0xe/0x30 [rpcrdma]
+[  864.082593]  xprt_autoclose+0x52/0x100 [sunrpc]
+[  864.088718]  process_one_work+0x1e8/0x3c0
+[  864.094170]  worker_thread+0x50/0x3b0
+[  864.099109]  ? rescuer_thread+0x370/0x370
+[  864.104473]  kthread+0x149/0x170
+[  864.109022]  ? set_kthread_struct+0x40/0x40
+[  864.114713]  ret_from_fork+0x22/0x30
+
+Fixes: 81091d7696ae ("RDMA/irdma: Add SW mechanism to generate completions on error")
+Link: https://lore.kernel.org/r/20220824154358.117-1-shiraz.saleem@intel.com
+Reported-by: Kamal Heib <kamalheib1@gmail.com>
+Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com>
+Signed-off-by: Leon Romanovsky <leon@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/infiniband/hw/irdma/utils.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/infiniband/hw/irdma/utils.c
++++ b/drivers/infiniband/hw/irdma/utils.c
+@@ -2660,7 +2660,7 @@ void irdma_generate_flush_completions(st
+               spin_unlock_irqrestore(&iwqp->lock, flags2);
+               spin_unlock_irqrestore(&iwqp->iwscq->lock, flags1);
+               if (compl_generated)
+-                      irdma_comp_handler(iwqp->iwrcq);
++                      irdma_comp_handler(iwqp->iwscq);
+       } else {
+               spin_unlock_irqrestore(&iwqp->iwscq->lock, flags1);
+               mod_delayed_work(iwqp->iwdev->cleanup_wq, &iwqp->dwork_flush,

diff --git a/queue-5.15/series b/queue-5.15/series
index 3163cb8845de80b6285877e45338809460bce3b3..7219532bd8b0461888e3f43b059206eb9c8a0b5f 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -156,3 +156,6 @@ selftests-mptcp-diag-skip-if-mptcp-is-not-supported.patch
 selftests-mptcp-simult-flows-skip-if-mptcp-is-not-supported.patch
 selftests-mptcp-join-skip-if-mptcp-is-not-supported.patch
 ext4-enable-the-lazy-init-thread-when-remounting-read-write.patch
+arm-defconfig-drop-config_drm_rcar_lvds.patch
+rdma-irdma-fix-drain-sq-hang-with-no-completion.patch
+rdma-irdma-do-not-generate-sw-completions-for-nops.patch