| Message ID | 12f2aba36279bcf52a1e9836a68c0e592c8d35bc.1511615658.git.lucien.xin@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | a couple of fixes for chunks abandoned in prsctp | expand |
On Sat, Nov 25, 2017 at 09:18:36PM +0800, Xin Long wrote: > Now for the abandoned chunks in unsent outq, it would just free the chunks. > Because no tsn is assigned to them yet, there's no need to send fwd tsn to > peer, unlike for the abandoned chunks in sent outq. > > The problem is when parts of the msg have been sent and the other frags > are still in unsent outq, if they are abandoned/dropped, the peer would > never get this msg reassembled. > > So these frags in unsent outq can't be dropped if this msg already has > outstanding frags. > > This patch does the check in sctp_chunk_abandoned and > sctp_prsctp_prune_unsent. > > Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > --- > net/sctp/chunk.c | 4 ++++ > net/sctp/outqueue.c | 3 ++- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c > index 9213805..7f8baa4 100644 > --- a/net/sctp/chunk.c > +++ b/net/sctp/chunk.c > @@ -308,6 +308,10 @@ int sctp_chunk_abandoned(struct sctp_chunk *chunk) > if (chunk->msg->abandoned) > return 1; > > + if (!chunk->has_tsn && > + !(chunk->chunk_hdr->flags & SCTP_DATA_FIRST_FRAG)) > + return 0; > + > if (SCTP_PR_TTL_ENABLED(chunk->sinfo.sinfo_flags) && > time_after(jiffies, chunk->msg->expires_at)) { > struct sctp_stream_out *streamout = > diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c > index 4ab164b..7d67fee 100644 > --- a/net/sctp/outqueue.c > +++ b/net/sctp/outqueue.c > @@ -407,7 +407,8 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, > > list_for_each_entry_safe(chk, temp, &q->out_chunk_list, list) { > if (!chk->msg->abandoned && > - (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || > + (!(chk->chunk_hdr->flags & SCTP_DATA_FIRST_FRAG) || > + !SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || > chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive)) > continue; > > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sctp" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c index 9213805..7f8baa4 100644 --- a/net/sctp/chunk.c +++ b/net/sctp/chunk.c @@ -308,6 +308,10 @@ int sctp_chunk_abandoned(struct sctp_chunk *chunk) if (chunk->msg->abandoned) return 1; + if (!chunk->has_tsn && + !(chunk->chunk_hdr->flags & SCTP_DATA_FIRST_FRAG)) + return 0; + if (SCTP_PR_TTL_ENABLED(chunk->sinfo.sinfo_flags) && time_after(jiffies, chunk->msg->expires_at)) { struct sctp_stream_out *streamout = diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 4ab164b..7d67fee 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c @@ -407,7 +407,8 @@ static int sctp_prsctp_prune_unsent(struct sctp_association *asoc, list_for_each_entry_safe(chk, temp, &q->out_chunk_list, list) { if (!chk->msg->abandoned && - (!SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || + (!(chk->chunk_hdr->flags & SCTP_DATA_FIRST_FRAG) || + !SCTP_PR_PRIO_ENABLED(chk->sinfo.sinfo_flags) || chk->sinfo.sinfo_timetolive <= sinfo->sinfo_timetolive)) continue;
Now for the abandoned chunks in unsent outq, it would just free the chunks. Because no tsn is assigned to them yet, there's no need to send fwd tsn to peer, unlike for the abandoned chunks in sent outq. The problem is when parts of the msg have been sent and the other frags are still in unsent outq, if they are abandoned/dropped, the peer would never get this msg reassembled. So these frags in unsent outq can't be dropped if this msg already has outstanding frags. This patch does the check in sctp_chunk_abandoned and sctp_prsctp_prune_unsent. Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/chunk.c | 4 ++++ net/sctp/outqueue.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)