fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/ib-hfi1-close-psm-sdma_progress-sleep-window.patch b/queue-4.19/ib-hfi1-close-psm-sdma_progress-sleep-window.patch
new file mode 100644 (file)
index 0000000..7e8c0d6
--- /dev/null
+++ b/queue-4.19/ib-hfi1-close-psm-sdma_progress-sleep-window.patch
@@ -0,0 +1,89 @@
+From 79dedd87705e3ec7d1ddb78fc011da6c24017884 Mon Sep 17 00:00:00 2001
+From: Mike Marciniszyn <mike.marciniszyn@intel.com>
+Date: Mon, 24 Jun 2019 16:19:43 -0400
+Subject: IB/hfi1: Close PSM sdma_progress sleep window
+
+commit da9de5f8527f4b9efc82f967d29a583318c034c7 upstream.
+
+The call to sdma_progress() is called outside the wait lock.
+
+In this case, there is a race condition where sdma_progress() can return
+false and the sdma_engine can idle.  If that happens, there will be no
+more sdma interrupts to cause the wakeup and the user_sdma xmit will hang.
+
+Fix by moving the lock to enclose the sdma_progress() call.
+
+Also, delete busycount. The need for this was removed by:
+commit bcad29137a97 ("IB/hfi1: Serve the most starved iowait entry first")
+
+Ported to linux-4.19.y.
+
+Cc: <stable@vger.kernel.org>
+Fixes: 7724105686e7 ("IB/hfi1: add driver files")
+Reviewed-by: Gary Leshner <Gary.S.Leshner@intel.com>
+Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
+Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
+Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/infiniband/hw/hfi1/user_sdma.c | 12 ++++--------
+ drivers/infiniband/hw/hfi1/user_sdma.h |  1 -
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/infiniband/hw/hfi1/user_sdma.c b/drivers/infiniband/hw/hfi1/user_sdma.c
+index 51831bfbf90f..cbff746d9e9d 100644
+--- a/drivers/infiniband/hw/hfi1/user_sdma.c
++++ b/drivers/infiniband/hw/hfi1/user_sdma.c
+@@ -132,25 +132,22 @@ static int defer_packet_queue(
+       struct hfi1_user_sdma_pkt_q *pq =
+               container_of(wait, struct hfi1_user_sdma_pkt_q, busy);
+       struct hfi1_ibdev *dev = &pq->dd->verbs_dev;
+-      struct user_sdma_txreq *tx =
+-              container_of(txreq, struct user_sdma_txreq, txreq);
+ 
+-      if (sdma_progress(sde, seq, txreq)) {
+-              if (tx->busycount++ < MAX_DEFER_RETRY_COUNT)
+-                      goto eagain;
+-      }
++      write_seqlock(&dev->iowait_lock);
++      if (sdma_progress(sde, seq, txreq))
++              goto eagain;
+       /*
+        * We are assuming that if the list is enqueued somewhere, it
+        * is to the dmawait list since that is the only place where
+        * it is supposed to be enqueued.
+        */
+       xchg(&pq->state, SDMA_PKT_Q_DEFERRED);
+-      write_seqlock(&dev->iowait_lock);
+       if (list_empty(&pq->busy.list))
+               iowait_queue(pkts_sent, &pq->busy, &sde->dmawait);
+       write_sequnlock(&dev->iowait_lock);
+       return -EBUSY;
+ eagain:
++      write_sequnlock(&dev->iowait_lock);
+       return -EAGAIN;
+ }
+ 
+@@ -803,7 +800,6 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)
+ 
+               tx->flags = 0;
+               tx->req = req;
+-              tx->busycount = 0;
+               INIT_LIST_HEAD(&tx->list);
+ 
+               /*
+diff --git a/drivers/infiniband/hw/hfi1/user_sdma.h b/drivers/infiniband/hw/hfi1/user_sdma.h
+index 91c343f91776..2c056702d975 100644
+--- a/drivers/infiniband/hw/hfi1/user_sdma.h
++++ b/drivers/infiniband/hw/hfi1/user_sdma.h
+@@ -245,7 +245,6 @@ struct user_sdma_txreq {
+       struct list_head list;
+       struct user_sdma_request *req;
+       u16 flags;
+-      unsigned int busycount;
+       u64 seqnum;
+ };
+ 
+-- 
+2.20.1
+

diff --git a/queue-4.19/revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch b/queue-4.19/revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch
new file mode 100644 (file)
index 0000000..53ccb3f
--- /dev/null
+++ b/queue-4.19/revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch
@@ -0,0 +1,45 @@
+From 8d6071c9d1eb405386ff2e21fc4bad9ac024d86d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 25 Jun 2019 07:36:40 -0400
+Subject: Revert "x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP"
+
+This reverts commit 1a3188d737ceb922166d8fe78a5fc4f89907e31b, which was
+upstream commit 4a6c91fbdef846ec7250b82f2eeeb87ac5f18cf9.
+
+On Tue, Jun 25, 2019 at 09:39:45AM +0200, Sebastian Andrzej Siewior wrote:
+>Please backport commit e74deb11931ff682b59d5b9d387f7115f689698e to
+>stable _or_ revert the backport of commit 4a6c91fbdef84 ("x86/uaccess,
+>ftrace: Fix ftrace_likely_update() vs. SMAP"). It uses
+>user_access_{save|restore}() which has been introduced in the following
+>commit.
+
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ kernel/trace/trace_branch.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
+index 3ea65cdff30d..4ad967453b6f 100644
+--- a/kernel/trace/trace_branch.c
++++ b/kernel/trace/trace_branch.c
+@@ -205,8 +205,6 @@ void trace_likely_condition(struct ftrace_likely_data *f, int val, int expect)
+ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
+                         int expect, int is_constant)
+ {
+-      unsigned long flags = user_access_save();
+-
+       /* A constant is always correct */
+       if (is_constant) {
+               f->constant++;
+@@ -225,8 +223,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
+               f->data.correct++;
+       else
+               f->data.incorrect++;
+-
+-      user_access_restore(flags);
+ }
+ EXPORT_SYMBOL(ftrace_likely_update);
+ 
+-- 
+2.20.1
+

diff --git a/queue-4.19/series b/queue-4.19/series
index c7037aad859b04f84febdc0bdfab4d1ad58cb089..c04f39b07c6052c545b7ab0195e9c5df78120981 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -2,3 +2,5 @@ perf-ui-helpline-use-strlcpy-as-a-shorter-form-of-strncpy-explicit-set-nul.patch
 perf-help-remove-needless-use-of-strncpy.patch
 perf-header-fix-unchecked-usage-of-strncpy.patch
 arm64-don-t-unconditionally-add-wno-psabi-to-kbuild_cflags.patch
+revert-x86-uaccess-ftrace-fix-ftrace_likely_update-v.patch
+ib-hfi1-close-psm-sdma_progress-sleep-window.patch