| Submitter | Roberts, Lee A. |
|---|---|
| Date | Feb. 26, 2013, 2:36 p.m. |
| Message ID | <1361889376-22171-3-git-send-email-lee.roberts@hp.com> |
| Download | mbox | patch |
| Permalink | /patch/223228/ |
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
Comments
On 02/26/2013 09:36 AM, Lee A. Roberts wrote: > From: "Lee A. Roberts" <lee.roberts@hp.com> > > 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 <lee.roberts@hp.com> Acked-by: Vlad Yasevich <vyasevich@gmail.com> -vlad > --- > 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) > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
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)