From nobody Thu Oct 16 09:58:32 2025 X-Original-To: dev-commits-src-branches@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 4cnNgr32qJz6C98W; Thu, 16 Oct 2025 09:58:32 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnNgr2S70z3cC5; Thu, 16 Oct 2025 09:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760608712; 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=NHNT8DaUoPkRG2Jbu7wZpAbfYI0+gskkhnjyNrVPa0s=; b=YwCCXgv8jRojN4dA3sh+tL5tjJw4juHejpImeoWOspApxqy+kjqvYZSZ+AKnnPpEna0HTJ d683avnGQ2l1/sCkA8lXgdif2EvF4NUtinlrdvqmneYgZeH0MMfHvczYN1OGx3dbttr5XY iu9D23g79v798VbWQnZvB7Y95y4usUnao0R1t5x9bsi7heRiM35e3VoBJJgxIGDk9NCiN5 Y36UKvt069cCw6kxSAB1N2y5VCwkrP5raXaMhJyhRxrN4uAihQ4qhffIPqEtZd5f2xHyuV yjBjhetdJhvV2bi8Xgq/cYL44oRA3cC2ZoVJmrU1gBJDjg1xEExw4zfk5dz45A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760608712; 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=NHNT8DaUoPkRG2Jbu7wZpAbfYI0+gskkhnjyNrVPa0s=; b=VnJrpP5Wsz9hr89zbSRMt+iCL31wQXPtA+M5z/7ydjd4Z5+c63ruq1LkhZT/5q5Pgseqcc 2pGUYlEF1sTinxtoeOVhDJic2X/BlEgXOi0LL9Z76LLHJk4U2B+I7lTDu+Tfe7dKgMMt7m 6rN/XMU+eEDYNbQaNVZwRhjilutJ5qCORaty0oZME0d6c4z5YlB4Q5uS3b99RCMtlMrdHL H5UBMDe/TCSvXowCpp1bL9krf24xv/6dRDC3Qpe2Jwrqq3Lz6cRMn9rmKoLhMIHIHPMNy4 MqEyoSE2v+d6lvDexBRaK/UxbYYOdClC2viTBJkgRwiOGfDbtIe5A+YL1qU0eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760608712; a=rsa-sha256; cv=none; b=m0ISUH76TnXcOwe1LSGWy8EB051TsysPQjW/5Ivsf7M4k4Ixk2itwtGAcP1PpkEus+rELb Kw4YZ/2agM1PfPLz1y8JiuHSyDtxbjSwpKW/srHTHptjYMP+D8DRLFXjq8/VslSP/e56vF TaeaH/CBM+kPzYmWpg+gY4kKxHduKlFxFR8PLuA3lAO04f+VE39B5ZcnT5yNjttP6mQHFp khq1nGmfR+T8042PC/+iy+Vt2oV8J8eFsCIfd4lht4jUMsO5tpTdCV8Nbf87A1cYgCvdLf /29dcspchhcG5xlrWJ3pjODya/x9fFR2tXKSOi1hekfJIY27wcRZjkYrlv0OyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cnNgr23Cmz1HpB; Thu, 16 Oct 2025 09:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59G9wWVr066135; Thu, 16 Oct 2025 09:58:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59G9wWQC066132; Thu, 16 Oct 2025 09:58:32 GMT (envelope-from git) Date: Thu, 16 Oct 2025 09:58:32 GMT Message-Id: <202510160958.59G9wWQC066132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 258cde4b2e48 - stable/14 - tcp lro: use the flowid only when it has hash properties List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 258cde4b2e4832bfaa49c800754aec8800a388c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=258cde4b2e4832bfaa49c800754aec8800a388c7 commit 258cde4b2e4832bfaa49c800754aec8800a388c7 Author: Michael Tuexen AuthorDate: 2025-10-09 12:37:11 +0000 Commit: Michael Tuexen CommitDate: 2025-10-16 09:57:10 +0000 tcp lro: use the flowid only when it has hash properties When a packet is provided to LRO using tcp_lro_queue_mbuf(), a sequence number is computed based on the m_pkthdr.flowid provided by he driver. The implicit assumption is that the m_pkthdr.flowid has hash properties. The recent use of tcp_lro_queue_mbuf() in iflib exposed a bug in at least one driver (igc) , which * reports always that is uses M_HASHTYPE_OPAQUE. * sets in some cases m_pkthdr.flowid not consistently for packets belonging to the same TCP connection. This results in severe performance problems for the base TCP stack, since it handles the packets in the wrong sequence, although they were received in the correct sequence. To protect against such misbehaving drivers, just take the m_pkthdr.flowid only into account, if it has hash properties. The performance problems were observed by gallatin@ and analyzed together with rrs@. Reviewed by: gallatin Tested by: gallatin Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D52989 (cherry picked from commit 73f56fa542ecf6ea6819c9e17fc60962eeb726d8) --- sys/netinet/tcp_lro.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index 2a5839440d69..045412f6856a 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -1475,10 +1475,11 @@ tcp_lro_queue_mbuf(struct lro_ctrl *lc, struct mbuf *mb) } /* create sequence number */ - lc->lro_mbuf_data[lc->lro_mbuf_count].seq = - (((uint64_t)M_HASHTYPE_GET(mb)) << 56) | - (((uint64_t)mb->m_pkthdr.flowid) << 24) | - ((uint64_t)lc->lro_mbuf_count); + lc->lro_mbuf_data[lc->lro_mbuf_count].seq = lc->lro_mbuf_count; + if (M_HASHTYPE_ISHASH(mb)) + lc->lro_mbuf_data[lc->lro_mbuf_count].seq |= + (((uint64_t)M_HASHTYPE_GET(mb)) << 56) | + (((uint64_t)mb->m_pkthdr.flowid) << 24); /* enter mbuf */ lc->lro_mbuf_data[lc->lro_mbuf_count].mb = mb;