From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43387 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbbGQClr (ORCPT ); Thu, 16 Jul 2015 22:41:47 -0400 Subject: Patch "IB/srp: Fix a connection setup race" has been added to the 4.1-stable tree To: bart.vanassche@sandisk.com, dledford@redhat.com, gregkh@linuxfoundation.org, sagig@mellanox.com, sebastian.riemer@profitbricks.com Cc: , From: Date: Thu, 16 Jul 2015 19:41:46 -0700 Message-ID: <14371009067146@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled IB/srp: Fix a connection setup race to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ib-srp-fix-a-connection-setup-race.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 8de9fe3a1d4ac8c3e4953fa4b7d81f863f5196ad Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 18 May 2015 13:23:36 +0200 Subject: IB/srp: Fix a connection setup race From: Bart Van Assche commit 8de9fe3a1d4ac8c3e4953fa4b7d81f863f5196ad upstream. Avoid that receiving a DREQ while RDMA channels are being established causes target->qp_in_error to be reset. Signed-off-by: Bart Van Assche Cc: Sagi Grimberg Cc: Sebastian Parschauer Signed-off-by: Doug Ledford Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/ulp/srp/ib_srp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -993,8 +993,6 @@ static int srp_connect_ch(struct srp_rdm WARN_ON_ONCE(!multich && target->connected); - target->qp_in_error = false; - ret = srp_lookup_path(ch); if (ret) return ret; @@ -1243,6 +1241,9 @@ static int srp_rport_reconnect(struct sr for (j = 0; j < target->queue_size; ++j) list_add(&ch->tx_ring[j]->list, &ch->free_tx); } + + target->qp_in_error = false; + for (i = 0; i < target->ch_count; i++) { ch = &target->ch[i]; if (ret || !ch->target) { Patches currently in stable-queue which might be from bart.vanassche@sandisk.com are queue-4.1/ib-srp-fix-a-connection-setup-race.patch queue-4.1/scsi_transport_srp-introduce-srp_wait_for_queuecommand.patch queue-4.1/ib-srp-fix-connection-state-tracking.patch queue-4.1/ib-srp-fix-reconnection-failure-handling.patch queue-4.1/scsi_transport_srp-fix-a-race-condition.patch queue-4.1/ib-srp-remove-an-extraneous-scsi_host_put-from-an-error-path.patch