From patchwork Sun Aug 23 11:30:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 509836 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1BDA51402A6 for ; Sun, 23 Aug 2015 21:30:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=sQ7xwDAp; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752517AbbHWLar (ORCPT ); Sun, 23 Aug 2015 07:30:47 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34704 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752446AbbHWLaq (ORCPT ); Sun, 23 Aug 2015 07:30:46 -0400 Received: by padfa11 with SMTP id fa11so3834613pad.1 for ; Sun, 23 Aug 2015 04:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=JzMiLqbB6uMgB4lcQL3xoOD9hQxwZyurSegyIYAgSBU=; b=sQ7xwDApiTszw1IwBdoMKL+hsi3C2qXPXBg0SF6ZJa6dm4VjJyDg5OUa6cP0uxWTlK UIanGIttXfuIF4VWroIk93XvmxcmW2GB8su6FzcNq++NDbntPy5kEI7ZnayLDtWETong 1+rY9IFoW7fs+woOl+E29ekzgJzKYLpACw5ko6JcIm0T21vW63e4NfYNUn0wvA2nEae3 fP41PTPimc1pt28/e8pVvKYaklZtICb3VE7eEM7qE0b7tUXkAQxlSHMsnQ+TcPHHdz5s MI7L4fZh8eB3CVyAKJBsPcG/iD7yG8SIHcEejyPmZv21jmcRS82OvX/bdczmGMtMqyIM EVYg== X-Received: by 10.69.27.106 with SMTP id jf10mr4730315pbd.165.1440329445836; Sun, 23 Aug 2015 04:30:45 -0700 (PDT) Received: from localhost (138.128.208.20.16clouds.com. [138.128.208.20]) by smtp.gmail.com with ESMTPSA id z16sm13738698pbt.3.2015.08.23.04.30.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Aug 2015 04:30:45 -0700 (PDT) From: Xin Long To: network dev Cc: mleitner@redhat.com, tgraf@infradead.org, davem@davemloft.net Subject: [PATCH net v2] sctp: start t5 timer only when peer.rwnd is 0 and local.state is SHUTDOWN_PENDING Date: Sun, 23 Aug 2015 19:30:40 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org when A sends a data to B, then A close() and enter into SHUTDOWN_PENDING state, if B neither claim his rwnd is 0 nor send SACK for this data, A will keep retransmitting this data util t5 timeout, Max.Retrans times can't work anymore, which is bad. if B's rwnd is not 0, it should send abord after Max.Retrans times, only when B's rwnd == 0 and A's retransmitting beyonds Max.Retrans times, A will start t5 timer, which is also commit f8d960524 means, but it lacks the condition peer.rwnd == 0. Fixes: f8d960524 ("sctp: Enforce retransmission limit during shutdown") Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner --- net/sctp/sm_statefuns.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 3ee27b7..deb9eab 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -5412,7 +5412,8 @@ sctp_disposition_t sctp_sf_do_6_3_3_rtx(struct net *net, SCTP_INC_STATS(net, SCTP_MIB_T3_RTX_EXPIREDS); if (asoc->overall_error_count >= asoc->max_retrans) { - if (asoc->state == SCTP_STATE_SHUTDOWN_PENDING) { + if (!q->asoc->peer.rwnd && + asoc->state == SCTP_STATE_SHUTDOWN_PENDING) { /* * We are here likely because the receiver had its rwnd * closed for a while and we have not been able to