| Message ID | 20171006214243.11296-5-bart.vanassche@wdc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, Oct 06, 2017 at 02:42:40PM -0700, Bart Van Assche wrote: > 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 > > Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> > Cc: <stable@vger.kernel.org> You need Fixes tag for the stable tree. Thanks
T24gU3VuLCAyMDE3LTEwLTA4IGF0IDE2OjIyICswMzAwLCBMZW9uIFJvbWFub3Zza3kgd3JvdGU6 DQo+IE9uIEZyaSwgT2N0IDA2LCAyMDE3IGF0IDAyOjQyOjQwUE0gLTA3MDAsIEJhcnQgVmFuIEFz c2NoZSB3cm90ZToNCj4gPiBUaGlzIHBhdGNoIGZpeGVzIHRoZSBmb2xsb3dpbmcga2VybmVsIGNy YXNoOg0KPiA+IA0KPiA+IGdlbmVyYWwgcHJvdGVjdGlvbiBmYXVsdDogMDAwMCBbIzFdIFBSRUVN UFQgU01QDQo+ID4gV29ya3F1ZXVlOiBpYl9tYWQyIHRpbWVvdXRfc2VuZHMgW2liX2NvcmVdDQo+ ID4gQ2FsbCBUcmFjZToNCj4gPiAgaWJfc2FfcGF0aF9yZWNfY2FsbGJhY2srMHgxYzQvMHgxZDAg W2liX2NvcmVdDQo+ID4gIHNlbmRfaGFuZGxlcisweGIyLzB4ZDAgW2liX2NvcmVdDQo+ID4gIHRp bWVvdXRfc2VuZHMrMHgxNGQvMHgyMjAgW2liX2NvcmVdDQo+ID4gIHByb2Nlc3Nfb25lX3dvcmsr MHgyMDAvMHg2MzANCj4gPiAgd29ya2VyX3RocmVhZCsweDRlLzB4M2IwDQo+ID4gIGt0aHJlYWQr MHgxMTMvMHgxNTANCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5OiBCYXJ0IFZhbiBBc3NjaGUgPGJh cnQudmFuYXNzY2hlQHdkYy5jb20+DQo+ID4gQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPg0K PiANCj4gWW91IG5lZWQgRml4ZXMgdGFnIGZvciB0aGUgc3RhYmxlIHRyZWUuDQoNCkhlbGxvIExl b24sDQoNCk9LLCBJIHdpbGwgYWRkIHRoYXQgdGFnIHdoZW4gSSByZXBvc3QgdGhpcyBwYXRjaCBz ZXJpZXMuDQoNCkJhcnQu -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Looks good,
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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 Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: <stable@vger.kernel.org> --- drivers/infiniband/ulp/srp/ib_srp.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)