From patchwork Tue Feb 26 14:36:15 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: 223231 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 DE6D62C0077 for ; Wed, 27 Feb 2013 01:35:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759352Ab3BZOff (ORCPT ); Tue, 26 Feb 2013 09:35:35 -0500 Received: from g5t0007.atlanta.hp.com ([15.192.0.44]:16448 "EHLO g5t0007.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758842Ab3BZOf2 (ORCPT ); Tue, 26 Feb 2013 09:35:28 -0500 Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142]) by g5t0007.atlanta.hp.com (Postfix) with ESMTP id 2702D14499 for ; Tue, 26 Feb 2013 14:35:28 +0000 (UTC) Received: from ldl (ldl.usa.hp.com [16.125.112.222]) by g5t0030.atlanta.hp.com (Postfix) with ESMTP id 1237A14123; Tue, 26 Feb 2013 14:35:28 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id A96301A7E0E8; 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 lBYb8bcwa+0m; Tue, 26 Feb 2013 07:36:22 -0700 (MST) Received: by ldl (Postfix, from userid 10474) id 8A4DB1A7E0EA; Tue, 26 Feb 2013 07:36:22 -0700 (MST) From: "Lee A. Roberts" To: netdev@vger.kernel.org Cc: lee.roberts@hp.com Subject: [PATCH 3/4] sctp: fix association hangs due to errors when reneging events from the ordering queue Date: Tue, 26 Feb 2013 07:36:15 -0700 Message-Id: <1361889376-22171-4-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(), events being reneged from the ordering queue may correspond to multiple TSNs. Identify all affected packets; sum freed space and renege from the tsnmap. Signed-off-by: Lee A. Roberts Acked-by: Vlad Yasevich --- net/sctp/ulpqueue.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index 63afddc..f221fbb 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c @@ -962,8 +962,8 @@ static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq, struct sk_buff_head *list, __u16 needed) { __u16 freed = 0; - __u32 tsn; - struct sk_buff *skb; + __u32 tsn, last_tsn; + struct sk_buff *skb, *flist, *last; struct sctp_ulpevent *event; struct sctp_tsnmap *tsnmap; @@ -977,10 +977,28 @@ static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq, if (TSN_lte(tsn, sctp_tsnmap_get_ctsn(tsnmap))) break; - __skb_unlink(skb, list); + /* Events in ordering queue may have multiple fragments + * corresponding to additional TSNs. Sum the total + * freed space; find the last TSN. + */ freed += skb_headlen(skb); + flist = skb_shinfo(skb)->frag_list; + for (last = flist; flist; flist = flist->next) { + last = flist; + freed += skb_headlen(last); + } + if (last) + last_tsn = sctp_skb2event(last)->tsn; + else + last_tsn = tsn; + + /* Unlink the event, then renege all applicable TSNs. */ + __skb_unlink(skb, list); sctp_ulpevent_free(event); - sctp_tsnmap_renege(tsnmap, tsn); + while (TSN_lte(tsn, last_tsn)) { + sctp_tsnmap_renege(tsnmap, tsn); + tsn++; + } if (freed >= needed) return freed; }