From patchwork Tue Feb 26 14:36:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roberts, Lee A." X-Patchwork-Id: 223228 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 22E6D2C0095 for ; Wed, 27 Feb 2013 01:35:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759210Ab3BZOf3 (ORCPT ); Tue, 26 Feb 2013 09:35:29 -0500 Received: from g5t0006.atlanta.hp.com ([15.192.0.43]:12745 "EHLO g5t0006.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753297Ab3BZOf2 (ORCPT ); Tue, 26 Feb 2013 09:35:28 -0500 Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142]) by g5t0006.atlanta.hp.com (Postfix) with ESMTP id 7DF70C6BE for ; Tue, 26 Feb 2013 14:35:27 +0000 (UTC) Received: from ldl (ldl.usa.hp.com [16.125.112.222]) by g5t0030.atlanta.hp.com (Postfix) with ESMTP id 66504140E6; Tue, 26 Feb 2013 14:35:27 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 025F01A7E0E8; Tue, 26 Feb 2013 07:36:22 -0700 (MST) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pn4Xxk5x0VKo; Tue, 26 Feb 2013 07:36:21 -0700 (MST) Received: by ldl (Postfix, from userid 10474) id D15071A7E0EA; Tue, 26 Feb 2013 07:36:21 -0700 (MST) From: "Lee A. Roberts" To: netdev@vger.kernel.org Cc: lee.roberts@hp.com Subject: [PATCH 2/4] sctp: fix association hangs due to reneging packets below the cumulative TSN ACK point Date: Tue, 26 Feb 2013 07:36:14 -0700 Message-Id: <1361889376-22171-3-git-send-email-lee.roberts@hp.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1361889376-22171-1-git-send-email-lee.roberts@hp.com> References: <1361889376-22171-1-git-send-email-lee.roberts@hp.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: "Lee A. Roberts" Resolve SCTP association hangs observed during SCTP stress testing. Observable symptoms include communications hangs with data being held in the association reassembly and/or lobby (ordering) queues. Close examination of reassembly queue shows missing packets. In sctp_ulpq_renege_list(), do not renege packets below the cumulative TSN ACK point. Signed-off-by: Lee A. Roberts Acked-by: Vlad Yasevich --- net/sctp/ulpqueue.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index ada1746..63afddc 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c @@ -969,11 +969,16 @@ static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq, tsnmap = &ulpq->asoc->peer.tsn_map; - while ((skb = __skb_dequeue_tail(list)) != NULL) { - freed += skb_headlen(skb); + while ((skb = skb_peek_tail(list)) != NULL) { event = sctp_skb2event(skb); tsn = event->tsn; + /* Don't renege below the Cumulative TSN ACK Point. */ + if (TSN_lte(tsn, sctp_tsnmap_get_ctsn(tsnmap))) + break; + + __skb_unlink(skb, list); + freed += skb_headlen(skb); sctp_ulpevent_free(event); sctp_tsnmap_renege(tsnmap, tsn); if (freed >= needed)