From nobody Thu Jan 13 16:18:41 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C325D1942B81; Thu, 13 Jan 2022 16:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JZV3j3ZrSz3wJg; Thu, 13 Jan 2022 16:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642090721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUj8o8Pye67GoTvNkIgTcUS60ZRGrDy7U5lj5zuaBsk=; b=jHfiF69EN6cwaEywTwxCsKNNIQFmoa5hdnJFvP9EgLRYfXwJI5fa3AxbgEzet/q17r8mJE UVb5rvhHuubMy6qgeKvz6EkGyREDVCfJswiWIrSYgBSNvFCLDIQtulkkpVlB1ZE5wVUZHB U0KodkrQnEtr/EMpKqUdHvwP07eCDMWXNy6KSEt3nH6n3a3gmkhdbxBkWUkStOyd2/QNbe yZcjqiAw1p6vlgnzv4dtRdGB0onKcb48F+bFx1Qh1fVSGTTKUYcycU2oxNCxX/4Jj+9kV4 jV6XrlQ9KyBndauwcZVzngT51UYLQ/loUQ/xtH0+llzUOFIWnPHMN0Zlg5yXKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BBB92390C; Thu, 13 Jan 2022 16:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20DGIfXa016897; Thu, 13 Jan 2022 16:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20DGIfAw016896; Thu, 13 Jan 2022 16:18:41 GMT (envelope-from git) Date: Thu, 13 Jan 2022 16:18:41 GMT Message-Id: <202201131618.20DGIfAw016896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Stone Subject: git: 3284f4925f69 - main - LRO: Don't merge ACK and non-ACK packets together List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rstone X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3284f4925f697ad7cc2aa4761ff5cf6ce98fd623 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642090721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aUj8o8Pye67GoTvNkIgTcUS60ZRGrDy7U5lj5zuaBsk=; b=jWHFmqmnFfOfK632QqTYtFpWrtBUYmC1Eaa0rnKFmYripuuv+ltj7wrZJOfOa30neuHYRB WvsFiTH6ixhnJmFbBa3IM3PVj0oHpbZdixdmp92FwJFegp3GnZzThBnG+1pxYR+3qNW4JQ X6rmKCxDmrfJn/TkE6BSKD8mH78LDBGendZydSTbUboxehXIzMgX9N7dJJa2JP21BQVUNi fhYPPtgR/TCgeN2CC272szJ/2h50BGH6yPhLmwlSZ2xrkW8sbKCD7rDTn8XKYpIx+hZ/rQ C+9P54Z7ZUH1nek2UOKVPgOdWIQBY0as1Bg5uZ4I9ppypjcuS+9965h4XvXqRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642090721; a=rsa-sha256; cv=none; b=Qx35NRqaVe/JamU5LF5+cWBYctMHmvsYEZ8L4SFJN5RIP2t0OtI6joJUIsqWAJP+4jGSrZ fmbfu3OTUeGqzH1w1f/YJ3PwgG35xltXp4ohWLQ/q/AkRCWzEVmVYOHuH91iAY9Gd0e9kA 2esb1dJe2N3XLJNZkDMiQdv2sM18kKkFsYIvtSCCLdP9/aMWE43YAILxY0K6Ttg6LK6jtB sxzbMHbA5FA3Yd4VoRoNqdAKu5dizyWLP9e144DJLnYLTj5KW98dsCvExo1P+2gw+EcNk5 ZWkiko179l0ylyEN7DEcHqJg6At0BD/kFnaQDMJSDkkJZ0WthyMoHZZFlXOcsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rstone: URL: https://cgit.FreeBSD.org/src/commit/?id=3284f4925f697ad7cc2aa4761ff5cf6ce98fd623 commit 3284f4925f697ad7cc2aa4761ff5cf6ce98fd623 Author: Ryan Stone AuthorDate: 2022-01-01 16:54:19 +0000 Commit: Ryan Stone CommitDate: 2022-01-13 16:17:58 +0000 LRO: Don't merge ACK and non-ACK packets together LRO was willing to merge ACK and non-ACK packets together. This can cause incorrect th_ack values to be reported up the stack. While non-ACKs are quite unlikely to appear in practice, LRO's behaviour is against the spec. Make LRO unwilling to merge packets with different TH_ACK flag values in order to fix the issue. Found by: Sysunit test Differential Revision: https://reviews.freebsd.org/D33775 Reviewed by: rrs --- sys/netinet/tcp_lro.c | 5 ++++- sys/netinet/tcp_lro.h | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index f006cae57302..b973c788d23e 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -921,6 +921,7 @@ tcp_set_entry_to_mbuf(struct lro_ctrl *lc, struct lro_entry *le, le->next_seq = ntohl(th->th_seq) + tcp_data_len; le->ack_seq = th->th_ack; le->window = th->th_win; + le->flags = th->th_flags; le->needs_merge = 0; /* Setup new data pointers. */ @@ -1092,10 +1093,12 @@ again: } /* Try to append the new segment. */ if (__predict_false(ntohl(th->th_seq) != le->next_seq || + ((th->th_flags & TH_ACK) != + (le->flags & TH_ACK)) || (tcp_data_len == 0 && le->ack_seq == th->th_ack && le->window == th->th_win))) { - /* Out of order packet or duplicate ACK. */ + /* Out of order packet, non-ACK + ACK or dup ACK. */ tcp_push_and_replace(lc, le, m); goto again; } diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h index 97819596231e..b8abc2fa1ab3 100644 --- a/sys/netinet/tcp_lro.h +++ b/sys/netinet/tcp_lro.h @@ -146,8 +146,9 @@ struct lro_entry { uint16_t compressed; uint16_t uncompressed; uint16_t window; - uint16_t timestamp : 1; - uint16_t needs_merge : 1; + uint8_t flags; + uint8_t timestamp : 1; + uint8_t needs_merge : 1; struct bintime alloc_time; /* time when entry was allocated */ };