Skip to contentSkip to conversation

FAILED: patch "[PATCH] IB/hfi1: Fix hard lockup due to not using save/restore spin" failed to apply to 4.6-stable tree

PATCH [email protected] 3 participants 6 messages May 30, 2016 – Jun 1, 2016

Subsystems (3)
Stable branch InfiniBand HFI1 driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 7049de65c9e520886f06d6f9deceaaed5d93fb7c Mon Sep 17 00:00:00 2001

From: Mike Marciniszyn <[email protected]>
Date: Tue, 24 May 2016 12:50:23 -0700
Subject: [PATCH] IB/hfi1: Fix hard lockup due to not using save/restore spin
lock

Commit b9b06cb6feda
("IB/hfi1: Fix missing lock/unlock in verbs drain callback") added a spin lock.

Unfortunately, the new lock code can be called from a base level interrupt state, and an interrupt that can get stacked will attempt to get the same lock.

Fix by using the flag save/restore spin lock variation.

Cc [email protected] # 4.6+
Reviewed-by Sebastian Sanchez <[email protected]>
Signed-off-by Mike Marciniszyn <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>
Signed-off-by Doug Ledford <[email protected]>
drivers/infiniband/hw/hfi1/qp.c +3 -2
index 14f889e3655b..1a942ffba4cb 100644
@@ -512,6 +512,7 @@ static void iowait_wakeup(struct iowait *wait, int reason)
 static void iowait_sdma_drained(struct iowait *wait)
 {
 	struct rvt_qp *qp = iowait_to_qp(wait);
+	unsigned long flags;
 
 	/*
 	 * This happens when the send engine notes

@@ -519,12 +520,12 @@ static void iowait_sdma_drained(struct iowait *wait)
 	 * do the flush work until that QP's
 	 * sdma work has finished.
 	 */
-	spin_lock(&qp->s_lock);
+	spin_lock_irqsave(&qp->s_lock, flags);
 	if (qp->s_flags & RVT_S_WAIT_DMA) {
 		qp->s_flags &= ~RVT_S_WAIT_DMA;
 		hfi1_schedule_send(qp);
 	}
-	spin_unlock(&qp->s_lock);
+	spin_unlock_irqrestore(&qp->s_lock, flags);
 }
 
 /**
#1 lore raw
Quoted 5 lines · On Mon, May 30, 2016 at 01:08:17PM -0700, [email protected] wrote:

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Thanks Greg. Most likely the problem is the driver move from staging. We'll submit an updated patch with the right location for 4.6.

-Denny

author maintainer
#3 lore raw
Quoted 10 lines · Mike
Quoted 8 lines

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

http://marc.info/?l=linux-rdma&m=146479189725973&w=2 has the patch for the old staging location.

Is that what should be used here? If so, can someone forward it on to the stable@ address?

thanks,

greg k-h

author maintainer
#4 lore raw
Quoted 6 lines · On Wed, Jun 01, 2016 at 09:11:02AM -0700, [email protected] wrote:
Quoted 5 lines · Mike
Quoted 5 lines

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

thanks,

greg k-h

http://marc.info/?l=linux-rdma&m=146479189725973&w=2 has the patch for the old staging location.

Is that what should be used here? If so, can someone forward it on to the stable@ address?

Ah, nevermind, didn't realize that you had just done this and that this was the link to the message, sorry for the noise, I'll take this one :)

thanks,

greg k-h

#5 lore raw
In reply to [email protected]
Quoted 12 lines · Mike
Quoted 10 lines
Quoted 8 lines

The patch below does not apply to the 4.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

http://marc.info/?l=linux-rdma&m=146479189725973&w=2 has the patch

Quoted 8 lines

for the old staging location.

Is that what should be used here? If so, can someone forward it on to the stable@ address?

thanks,

greg k-h

I emailed it to [email protected]. I also CC'ed linux-rdma in the same email. The above link is from the marc linux-rdma archive.

Mike