From nobody Tue Feb 08 15:13: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 55C4519C2AC0; Tue, 8 Feb 2022 15:13:42 +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 4JtRNj6fqRz4dRb; Tue, 8 Feb 2022 15:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333222; 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=dLRGH5KNk53SVyoyr79TdW5nt6vhTHFO5ma1kUL4swE=; b=rR1wG1CBpLkWMf5WJ9m//V0jatjHhN3giHxl6Vj51suwIaPOVlW6C3qktJRKV3G66uq1A3 h12tOuvfFfR6vz/m+pIgvwKiTnpcDhE+hYV/cPfKNcurgwgS2SkErXnqFSwtH527nk8ePi Jv3gZPhfXfe9F9rjwc/fORzCsHnTrlG0Ewv3DtwW3jjpfiFdpGf/LTVOIILQoCSrHsAdB3 fpbhwmCu+LZExNm1y7UQT1580F9Xsc2effUQFT46nEIuT0Lj8F/SevbExkSY4A3W8Ixp/J KZT+jj4rQSmsn24+L47WHFmjOH4xyhvTUyPdTvJ2EnE0+O8Wqd8mLsjVPZI3Fg== 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 682EF1BC10; Tue, 8 Feb 2022 15:13: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 218FDfEs020281; Tue, 8 Feb 2022 15:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218FDfn5020280; Tue, 8 Feb 2022 15:13:41 GMT (envelope-from git) Date: Tue, 8 Feb 2022 15:13:41 GMT Message-Id: <202202081513.218FDfn5020280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 4287b7caa921 - stable/13 - 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4287b7caa921131845837dd394581d0246f38eb1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333222; 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=dLRGH5KNk53SVyoyr79TdW5nt6vhTHFO5ma1kUL4swE=; b=kIL0rZhZ2LE570SEiGHEg+HIEoAtB19ffIdjMeMmMtjKqAhpTUxbH8/ywKp9+kaA26qnDW 92NwZyBLCc00bqYcDIl4UhHdN2pUlrfXxRNx3crBmUVkseRWZN1Sp+7mqgni2JBHApEldH I98PL4i+ZqqXzdiQvb39CmfxYhYEgxOyRgS/RoSar4pPfVvusAVz4PBj8kNPuF5AOgpTWu P2PuHsABdiMQ1e4tvMGFfSHDoLlp7/oqEB7sJvUo+T4Umm/aBoUkCmEDc4+UUvuKr5rjkh 840vuYhXWnsSE7OAYYA6EikSdmcEM+He5EafpRp/N0WV+YxyFcnKqRHU3DZ3ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644333222; a=rsa-sha256; cv=none; b=ZmEAcQT5IK7yNLSelHxUqigFRM2Df/yTC9m43COwTkIYYxMvtEL7BnGiOUm7kiR4KOUckt PEBRmXL6Mk400N3rcUJZnDHVEh/RNTEuWZ2uoOgfIRHohuQ+Ck7i+HQKsMvW6jSbIcO+Q8 npD3K49/Vnue/14GY+ReDg1Pj/D9yJjV5QnYiV6WjvK7xEEdREE7hOHF40dg3sNy4YsZZj BxHE7/567cM4oyYIf7zj3y2cTt1Ruj7E5z6WbPFq47C0Ek0WeCG8NxSETt09jjvztCVvDb lDXX7f8kjuvqQXemsK9Gpv61eEAL7nNNLxrhEjFQNZGMzndC2JxVEqewCD+I9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=4287b7caa921131845837dd394581d0246f38eb1 commit 4287b7caa921131845837dd394581d0246f38eb1 Author: Ryan Stone AuthorDate: 2022-02-08 15:08:50 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-08 15:08:50 +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 (cherry picked from commit 3284f4925f697ad7cc2aa4761ff5cf6ce98fd623) --- 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 feec8c36ab69..cfc84707abd2 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -895,6 +895,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. */ @@ -1066,10 +1067,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 */ };