From: Bart Van Assche <bart.vanassche@wdc.com>
To: Doug Ledford <dledford@redhat.com>
Cc: linux-rdma@vger.kernel.org,
Bart Van Assche <bart.vanassche@wdc.com>,
stable@vger.kernel.org
Subject: [PATCH v2 5/8] IB/srp: Avoid that a cable pull can trigger a kernel crash
Date: Wed, 11 Oct 2017 10:27:26 -0700 [thread overview]
Message-ID: <20171011172729.16984-6-bart.vanassche@wdc.com> (raw)
In-Reply-To: <20171011172729.16984-1-bart.vanassche@wdc.com>
This patch fixes the following kernel crash:
general protection fault: 0000 [#1] PREEMPT SMP
Workqueue: ib_mad2 timeout_sends [ib_core]
Call Trace:
ib_sa_path_rec_callback+0x1c4/0x1d0 [ib_core]
send_handler+0xb2/0xd0 [ib_core]
timeout_sends+0x14d/0x220 [ib_core]
process_one_work+0x200/0x630
worker_thread+0x4e/0x3b0
kthread+0x113/0x150
Fixes: commit aef9ec39c47f ("IB: Add SCSI RDMA Protocol (SRP) initiator")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Cc: <stable@vger.kernel.org>
---
drivers/infiniband/ulp/srp/ib_srp.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 778a08250f16..8ceb4bb011f1 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -665,12 +665,19 @@ static void srp_path_rec_completion(int status,
static int srp_lookup_path(struct srp_rdma_ch *ch)
{
struct srp_target_port *target = ch->target;
- int ret;
+ int ret = -ENODEV;
ch->path.numb_path = 1;
init_completion(&ch->done);
+ /*
+ * Avoid that the SCSI host can be removed by srp_remove_target()
+ * before srp_path_rec_completion() is called.
+ */
+ if (!scsi_host_get(target->scsi_host))
+ goto out;
+
ch->path_query_id = ib_sa_path_rec_get(&srp_sa_client,
target->srp_host->srp_dev->dev,
target->srp_host->port,
@@ -684,18 +691,24 @@ static int srp_lookup_path(struct srp_rdma_ch *ch)
GFP_KERNEL,
srp_path_rec_completion,
ch, &ch->path_query);
- if (ch->path_query_id < 0)
- return ch->path_query_id;
+ ret = ch->path_query_id;
+ if (ret < 0)
+ goto put;
ret = wait_for_completion_interruptible(&ch->done);
if (ret < 0)
- return ret;
+ goto put;
- if (ch->status < 0)
+ ret = ch->status;
+ if (ret < 0)
shost_printk(KERN_WARNING, target->scsi_host,
PFX "Path record query failed\n");
- return ch->status;
+put:
+ scsi_host_put(target->scsi_host);
+
+out:
+ return ret;
}
static int srp_send_req(struct srp_rdma_ch *ch, bool multich)
--
2.14.2
prev parent reply other threads:[~2017-10-11 17:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 17:27 [PATCH v2 0/8] SRP patches for kernel v4.15 Bart Van Assche
[not found] ` <20171011172729.16984-1-bart.vanassche-Sjgp3cTcYWE@public.gmane.org>
2017-10-11 17:27 ` [PATCH v2 1/8] IB/srpt: Do not accept invalid initiator port names Bart Van Assche
2017-10-11 17:27 ` [PATCH v2 2/8] IB/srpt: Limit the send and receive queue sizes to what the HCA supports Bart Van Assche
2017-10-11 17:27 ` [PATCH v2 3/8] IB/srpt: Cache global L_Key Bart Van Assche
2017-10-11 17:27 ` [PATCH v2 4/8] IB/srpt: Change default behavior from using SRQ to using RC Bart Van Assche
[not found] ` <20171011172729.16984-5-bart.vanassche-Sjgp3cTcYWE@public.gmane.org>
2017-11-02 18:30 ` Marciniszyn, Mike
[not found] ` <32E1700B9017364D9B60AED9960492BC6266931A-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-11-02 21:41 ` Bart Van Assche
[not found] ` <1509658914.2484.21.camel-Sjgp3cTcYWE@public.gmane.org>
2017-11-03 13:05 ` Marciniszyn, Mike
2017-11-03 15:46 ` Marciniszyn, Mike
2017-11-03 16:01 ` Marciniszyn, Mike
[not found] ` <32E1700B9017364D9B60AED9960492BC6266E41A-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-11-03 16:10 ` Bart Van Assche
[not found] ` <1509725458.2473.23.camel-Sjgp3cTcYWE@public.gmane.org>
2017-11-03 16:13 ` Marciniszyn, Mike
2017-11-03 19:53 ` Marciniszyn, Mike
[not found] ` <32E1700B9017364D9B60AED9960492BC626708EE-RjuIdWtd+YbTXloPLtfHfbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-11-13 19:56 ` Doug Ledford
2017-10-11 17:27 ` [PATCH v2 6/8] IB/srp: Remove second argument of srp_destroy_qp() Bart Van Assche
2017-10-11 17:27 ` [PATCH v2 7/8] IB/srp: Cache global rkey Bart Van Assche
2017-10-11 17:27 ` [PATCH v2 8/8] IB/srp: Make CM timeout dependent on subnet timeout Bart Van Assche
2017-10-18 14:50 ` [PATCH v2 0/8] SRP patches for kernel v4.15 Doug Ledford
2017-10-11 17:27 ` Bart Van Assche [this message]
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=20171011172729.16984-6-bart.vanassche@wdc.com \
--to=bart.vanassche@wdc.com \
--cc=dledford@redhat.com \
--cc=linux-rdma@vger.kernel.org \
--cc=stable@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox