From: Dennis Dalessandro <dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Mike Marciniszyn
<mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 06/15] IB/hfi1: Fix potential panic with sdma drained mechanism
Date: Thu, 12 May 2016 10:23:03 -0700 [thread overview]
Message-ID: <20160512172302.9741.48926.stgit@scvm10.sc.intel.com> (raw)
In-Reply-To: <20160512172050.9741.84190.stgit-9QXIwq+3FY+1XWohqUldA0EOCMrvLtNR@public.gmane.org>
From: Mike Marciniszyn <mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
The guard is backwards, potentially causing the SDMA client
to panic if a wait structure was not specified.
psm and verbs are not exposed to the issue, but fix the
code just to be correct.
Fixes: a545f5308b6c ("staging/rdma/hfi: fix CQ completion order issue")
Reviewed-by: Dennis Dalessandro <dennis.dalessandro-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
drivers/staging/rdma/hfi1/sdma.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/rdma/hfi1/sdma.c b/drivers/staging/rdma/hfi1/sdma.c
index abb8ebc..e938017 100644
--- a/drivers/staging/rdma/hfi1/sdma.c
+++ b/drivers/staging/rdma/hfi1/sdma.c
@@ -376,7 +376,7 @@ static inline void complete_tx(struct sdma_engine *sde,
sdma_txclean(sde->dd, tx);
if (complete)
(*complete)(tx, res);
- if (iowait_sdma_dec(wait) && wait)
+ if (wait && iowait_sdma_dec(wait))
iowait_drain_wakeup(wait);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-05-12 17:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 17:22 [PATCH 00/15] IB/hfi1, rdmavt, core: Misc fixes and improvements for 4.7 Dennis Dalessandro
[not found] ` <20160512172050.9741.84190.stgit-9QXIwq+3FY+1XWohqUldA0EOCMrvLtNR@public.gmane.org>
2016-05-12 17:22 ` [PATCH 01/15] IB/hfi1: Ignore non-temperature warnings on a downed link Dennis Dalessandro
2016-05-12 17:22 ` [PATCH 02/15] IB/hfi1: Wait for QSFP modules to initialize Dennis Dalessandro
2016-05-12 17:22 ` [PATCH 03/15] IB/hfi1: Correct external device configuration shift Dennis Dalessandro
2016-05-12 17:22 ` [PATCH 04/15] IB/hfi1: Remove no-op QSFP reset code Dennis Dalessandro
2016-05-12 17:22 ` [PATCH 05/15] IB/hfi1: Fix pio wait counter double increment Dennis Dalessandro
2016-05-12 17:23 ` Dennis Dalessandro [this message]
2016-05-12 17:23 ` [PATCH 07/15] IB/hfi1: Improve performance of interval RB trees Dennis Dalessandro
2016-05-12 17:23 ` [PATCH 08/15] IB/hfi1: Remove unnecessary header Dennis Dalessandro
2016-05-12 17:23 ` [PATCH 09/15] IB/hfi1: Fix hfi_rcvhdr tracepoint Dennis Dalessandro
2016-05-12 17:23 ` [PATCH 10/15] IB/rdmavt: Increase CQ callback thread priority Dennis Dalessandro
2016-05-12 17:23 ` [PATCH 11/15] IB/hfi1: Correct log message strings Dennis Dalessandro
2016-05-12 17:23 ` [PATCH 12/15] IB/hfi1: Immediately apply congestion setting MAD Dennis Dalessandro
2016-05-12 17:23 ` [PATCH 13/15] IB/hfi1: Keep SC_USER as the last send context type Dennis Dalessandro
2016-05-12 17:23 ` [PATCH 14/15] ib_pack.h: Add opcode definition for send with invalidate Dennis Dalessandro
2016-05-12 17:24 ` [PATCH 15/15] IB/hfi1: Change hfi1_init loop to preserve error returns Dennis Dalessandro
2016-05-12 18:53 ` [PATCH 00/15] IB/hfi1, rdmavt, core: Misc fixes and improvements for 4.7 Doug Ledford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160512172302.9741.48926.stgit@scvm10.sc.intel.com \
--to=dennis.dalessandro-ral2jqcrhueavxtiumwx3w@public.gmane.org \
--cc=dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mike.marciniszyn-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.