From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A497C2D0C7 for ; Wed, 11 Dec 2019 15:19:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 169992465C for ; Wed, 11 Dec 2019 15:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077546; bh=nMiRvwjy9pgZJOq79CVsdSrU7++n8S1+JfDq94pQgRw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AA985chVgcEpjembXjMmRX9soJSgyWgaWxYEd6PjQ78vcgucARjh2qgHqaqBzQyJ6 S6vxLk2lIYgTukAu8GPaekS56AZ27dWqfLnANMOtuRX54Q37gErKabHajvQisaknv5 uuzMvecnLzHjxPSyVt7HEsxkJen3XThWwUclO2g8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731835AbfLKPTF (ORCPT ); Wed, 11 Dec 2019 10:19:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:47530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731908AbfLKPTD (ORCPT ); Wed, 11 Dec 2019 10:19:03 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D24D208C3; Wed, 11 Dec 2019 15:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077543; bh=nMiRvwjy9pgZJOq79CVsdSrU7++n8S1+JfDq94pQgRw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k4e3Qli++3vyoLRf+avBmPS/FYAvg9s3e2vfkF0L92Lf7xK20d9raZg8EJQR++1kx rpclBu8+xX0lpM3oOA4BXmVkUmBGXh9tIY7yNxkQj0GFjn+H38pYpdJ8wm5zWtkyLl rkUVUXO5lIvS9QXVvOytzFyR7CEbfjXcFet5C1Gg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve Wise , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.19 079/243] iw_cxgb4: only reconnect with MPAv1 if the peer aborts Date: Wed, 11 Dec 2019 16:04:01 +0100 Message-Id: <20191211150344.441786407@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Steve Wise [ Upstream commit 9828ca654b52848e7eb7dcc9b0994ff130dd4546 ] Only retry connection setup with MPAv1 if the peer actually aborted the connection upon receiving the MPAv2 start message. This avoids retrying with MPAv1 in the case where the connection was aborted due to retransmit timeouts. Fixes: d2fe99e86bb2 ("RDMA/cxgb4: Add support for MPAv2 Enhanced RDMA Negotiation") Signed-off-by: Steve Wise Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/hw/cxgb4/cm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index a5ff1f0f2073e..4dcc92d116097 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -2798,7 +2798,8 @@ static int peer_abort(struct c4iw_dev *dev, struct sk_buff *skb) break; case MPA_REQ_SENT: (void)stop_ep_timer(ep); - if (mpa_rev == 1 || (mpa_rev == 2 && ep->tried_with_mpa_v1)) + if (status != CPL_ERR_CONN_RESET || mpa_rev == 1 || + (mpa_rev == 2 && ep->tried_with_mpa_v1)) connect_reply_upcall(ep, -ECONNRESET); else { /* -- 2.20.1