git: b87cf2bc841b - main - tcp: keep SACK scoreboard sorted when doing rescue retransmission

[Richard Scheffenegger]

The branch main has been updated by rscheff:

URL: https://cgit.FreeBSD.org/src/commit/?id=b87cf2bc841b2a336b7f0c6cd89573610412a84f

commit b87cf2bc841b2a336b7f0c6cd89573610412a84f
Author:     Richard Scheffenegger <rscheff at FreeBSD.org>
AuthorDate: 2021-04-18 20:14:14 +0000
Commit:     Richard Scheffenegger <rscheff at FreeBSD.org>
CommitDate: 2021-04-18 21:11:10 +0000

    tcp: keep SACK scoreboard sorted when doing rescue retransmission
    
    Reviewed By: tuexen, kbowling, #transport
    MFC after: 3 days
    Sponsored by: NetApp, Inc.
    Differential Revision: https://reviews.freebsd.org/D29825
---
 sys/netinet/tcp_sack.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index a28bb40a8332..fffba2e75045 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -497,7 +497,7 @@ static struct sackhole *
 tcp_sackhole_insert(struct tcpcb *tp, tcp_seq start, tcp_seq end,
     struct sackhole *after)
 {
-	struct sackhole *hole;
+	struct sackhole *hole, *tail;
 
 	/* Allocate a new SACK hole. */
 	hole = tcp_sackhole_alloc(tp, start, end);
@@ -508,7 +508,15 @@ tcp_sackhole_insert(struct tcpcb *tp, tcp_seq start, tcp_seq end,
 	if (after != NULL)
 		TAILQ_INSERT_AFTER(&tp->snd_holes, after, hole, scblink);
 	else
-		TAILQ_INSERT_TAIL(&tp->snd_holes, hole, scblink);
+		/*
+		 * With Rescue Retransmission, new holes may need to
+		 * be inserted just before the tail.
+		 */
+		if (((tail = TAILQ_LAST_FAST(&tp->snd_holes, sackhole,
+		    scblink)) != NULL) && SEQ_LEQ(end, tail->start))
+			TAILQ_INSERT_BEFORE(tail, hole, scblink);
+		else
+			TAILQ_INSERT_TAIL(&tp->snd_holes, hole, scblink);
 
 	/* Update SACK hint. */
 	if (tp->sackhint.nexthole == NULL)