| From 0b41d6ca616ddeb3b6c0a80e8770b6f53cd42806 Mon Sep 17 00:00:00 2001 |
| From: Nicholas Bellinger <nab@linux-iscsi.org> |
| Date: Wed, 18 Sep 2013 12:48:27 -0700 |
| Subject: ib_srpt: Destroy cm_id before destroying QP. |
| |
| From: Nicholas Bellinger <nab@linux-iscsi.org> |
| |
| commit 0b41d6ca616ddeb3b6c0a80e8770b6f53cd42806 upstream. |
| |
| This patch fixes a bug where ib_destroy_cm_id() was incorrectly being called |
| after srpt_destroy_ch_ib() had destroyed the active QP. |
| |
| This would result in the following failed SRP_LOGIN_REQ messages: |
| |
| Received SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff1762bd, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c903009f8f41) |
| Received SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff1758f9, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 2 (guid=0xfe80000000000000:0x2c903009f8f42) |
| Received SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff175941, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 2 (guid=0xfe80000000000000:0x2c90300a3cfb2) |
| Received SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff176299, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c90300a3cfb1) |
| mlx4_core 0000:84:00.0: command 0x19 failed: fw status = 0x9 |
| rejected SRP_LOGIN_REQ because creating a new RDMA channel failed. |
| Received SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff176299, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c90300a3cfb1) |
| mlx4_core 0000:84:00.0: command 0x19 failed: fw status = 0x9 |
| rejected SRP_LOGIN_REQ because creating a new RDMA channel failed. |
| Received SRP_LOGIN_REQ with i_port_id 0x0:0x2590ffff176299, t_port_id 0x2c903009f8f40:0x2c903009f8f40 and it_iu_len 260 on port 1 (guid=0xfe80000000000000:0x2c90300a3cfb1) |
| |
| Reported-by: Navin Ahuja <navin.ahuja@saratoga-speed.com> |
| Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/infiniband/ulp/srpt/ib_srpt.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/infiniband/ulp/srpt/ib_srpt.c |
| +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c |
| @@ -2358,6 +2358,8 @@ static void srpt_release_channel_work(st |
| transport_deregister_session(se_sess); |
| ch->sess = NULL; |
| |
| + ib_destroy_cm_id(ch->cm_id); |
| + |
| srpt_destroy_ch_ib(ch); |
| |
| srpt_free_ioctx_ring((struct srpt_ioctx **)ch->ioctx_ring, |
| @@ -2368,8 +2370,6 @@ static void srpt_release_channel_work(st |
| list_del(&ch->list); |
| spin_unlock_irq(&sdev->spinlock); |
| |
| - ib_destroy_cm_id(ch->cm_id); |
| - |
| if (ch->release_done) |
| complete(ch->release_done); |
| |
