IB/srp: Fix a connection setup race
authorBart Van Assche <bart.vanassche@sandisk.com>
Mon, 18 May 2015 11:23:36 +0000 (13:23 +0200)
committerDoug Ledford <dledford@redhat.com>
Mon, 18 May 2015 17:35:55 +0000 (13:35 -0400)
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 <bart.vanassche@sandisk.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Cc: Sebastian Parschauer <sebastian.riemer@profitbricks.com>
Cc: <stable@vger.kernel.org> #v3.19
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/ulp/srp/ib_srp.c

index 5ce6cfd86476eb80599b0544cd8c9fc8fcddcd56..f2daabd1e91d2b373ea3792f67ba0fba4b6ab833 100644 (file)
@@ -993,8 +993,6 @@ static int srp_connect_ch(struct srp_rdma_ch *ch, bool multich)
 
        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 srp_rport *rport)
                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) {