From nobody Tue Feb 08 15:13:37 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 471F719C2974; Tue, 8 Feb 2022 15:13:38 +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 4JtRNf1WsLz4dTs; Tue, 8 Feb 2022 15:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333218; 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=5JtPapigGs/NjIA044hq2lPdAdykM2cvyODJdX5ePwQ=; b=Nf8SVCiKRS0kb9noOQl2O3xey9Mmot5Lj0FxgelF3I7RkgjyWeYbsYV+dMUzgrYhBtXBgv TJrT7XYFMBlUJ9xjBH23h+gLKkjj+kpUOUW1NJSWpidFGwDSTPxxz5y+CR2uFwPUSDsu8Y 6ekVnMN4YIZxRabGHsOvxBIsNX27BBaTmDJPreEdr1zDNdHj+uKsnCga7mAhjuHW23mEHr FirGof4bf1HT2JsRCahDyz/uo6oBBSx4VYJElbvf8t8Gmu3uHKuds7vD++BRiK1WuJK4Ob 6sQeygwOB8WYMs9NRxe//v3uI3Yj+/kdvVdSOIc+67+WC4RoWibEPZLkyrpRag== 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 0A7091BB2D; Tue, 8 Feb 2022 15:13:38 +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 218FDbXV020209; Tue, 8 Feb 2022 15:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218FDb3Q020208; Tue, 8 Feb 2022 15:13:37 GMT (envelope-from git) Date: Tue, 8 Feb 2022 15:13:37 GMT Message-Id: <202202081513.218FDb3Q020208@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: ca73c0e25d7f - stable/13 - Update the TCP LRO code to handle both encrypted and un-encrypted traffic. 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: ca73c0e25d7f306b15657267d6d372a2e6b38948 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644333218; 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=5JtPapigGs/NjIA044hq2lPdAdykM2cvyODJdX5ePwQ=; b=cN3aRmbYwpWqaPPjg3mG0wUjW/L3Uwi13JButgADQNvF6wi8MzEmpib9Vn//bjobjeEc3x oDS/KMd+qRJjiaKUDnmz+p4hKq5fN56jfjrQS5ItACcdkllBca1QN+I5z8HC8o953OeMhd 5pvf7IbQLFRo+lx4fBAC+0e2WSpkSJImDuHFoaMJFLqoI1YbfuZd4kVPVhAC4x8AUQnceH HT7s2FazNjaVhtQoP+MTze3FvIgDwyO3/99/ZsQy3mQWUBmYeED06Ce3hgWW2Kf886EVPC ao1bE9+n/4Yte63+0BM6Qjsg0p7gkNQHmXIoBPD+8OTzg5gv78xBmdn2yfXYEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644333218; a=rsa-sha256; cv=none; b=RNcL6X6KFUCwM4T5mB0EBOCFDp0aa1xLK95YUdRclhTvrrrR8GhwsB2Bv8miC3pUT+qxME LyrPj3XEB4qEh4Sse7285GlpDyd7UthsT88OcUNTceYinziJUg2d+MZUkxEU18gS/g3hgN zcmyRgwm02kR2/UYTr+G6qbygRh1cMtjDbA9uYuctStF/iC5QWuN+0TLgAXoS7HPPZiOth 1f7Y2YWv8HIYEuFFEC0RGiWWfLZPed42vNmFfk3YfGN3pG/jK8+EQwvs2t/keGKYw6j5KF qJk+USGXe7W+8odopHUVYWketrdG5fstQddGXhlTR8/wxnrd+r8E6yQS1cpXSg== 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=ca73c0e25d7f306b15657267d6d372a2e6b38948 commit ca73c0e25d7f306b15657267d6d372a2e6b38948 Author: Hans Petter Selasky AuthorDate: 2022-02-08 15:08:50 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-08 15:08:50 +0000 Update the TCP LRO code to handle both encrypted and un-encrypted traffic. Encrypted and un-encrypted traffic needs to be coalesced separately. Split the 16-bit lro_type field in the address information into two 8-bit fields, and then use the last 8-bit field for flags, which among other indicate if the received mbuf is encrypted or un-encrypted. Differential Revision: https://reviews.freebsd.org/D31377 Reviewed by: gallatin Sponsored by: NVIDIA Networking (cherry picked from commit bb5cd80e8b42b31a2229077a7e93ffd3585eeb78) --- sys/netinet/tcp_lro.c | 5 ++++- sys/netinet/tcp_lro.h | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index bcfb8a809e1b..76083498b70e 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -370,6 +370,9 @@ tcp_lro_parser(struct mbuf *m, struct lro_parser *po, struct lro_parser *pi, boo po->data.vlan_id = htons(m->m_pkthdr.ether_vtag) & htons(EVL_VLID_MASK); } + /* Store decrypted flag, if any. */ + if (__predict_false(m->m_flags & M_DECRYPTED)) + po->data.lro_flags |= LRO_FLAG_DECRYPTED; } switch (po->data.lro_type) { @@ -1558,7 +1561,7 @@ do_bpf_strip_and_compress(struct inpcb *inp, struct lro_ctrl *lc, uint32_t *ts_ptr; int32_t n_mbuf; bool other_opts, can_compress; - uint16_t lro_type; + uint8_t lro_type; uint16_t iptos; int tcp_hdr_offset; int idx; diff --git a/sys/netinet/tcp_lro.h b/sys/netinet/tcp_lro.h index 75ab78c7fc6f..3eefd4f0537c 100644 --- a/sys/netinet/tcp_lro.h +++ b/sys/netinet/tcp_lro.h @@ -67,12 +67,14 @@ struct inpcb; union lro_address { u_long raw[1]; struct { - uint16_t lro_type; /* internal */ + uint8_t lro_type; /* internal */ #define LRO_TYPE_NONE 0 #define LRO_TYPE_IPV4_TCP 1 #define LRO_TYPE_IPV6_TCP 2 #define LRO_TYPE_IPV4_UDP 3 #define LRO_TYPE_IPV6_UDP 4 + uint8_t lro_flags; +#define LRO_FLAG_DECRYPTED 1 uint16_t vlan_id; /* VLAN identifier */ uint16_t s_port; /* source TCP/UDP port */ uint16_t d_port; /* destination TCP/UDP port */