From nobody Wed Apr 15 20:35:44 2026 X-Original-To: dev-commits-src-main@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 4fwtFY3QGJz6ZRrd for ; Wed, 15 Apr 2026 20:35:45 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwtFY0k1lz3csB for ; Wed, 15 Apr 2026 20:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776285345; 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=1AfuxfiDX0Htn4e72TNDauyHD6gd8LJQBf/yc5F8g3Y=; b=DyukP6v2PcaEY9W4vDeRMauRI36U1vdccOCS/DZVrvh6i7Tp67b4Jk3CkDMMP2ASjAf1CF dkJAI4W/1HWFCrujumKCYfa6laXzO8Wt91jiHy3zT9zlrDvI6/F2i2vQ8p6Q46rpQUx+JE oJClYDCPvzpLVEQeJkOfWHGjVHR/e5lRmH+ANK/U+D6D3NDdSTkACJqMhJhoTvQtmKrxm9 r8FOFT7gpeA85EYSZVGdvHcaA7VRn7GV3W5n9B8R5aU9jTEG/udXBeFOoDgiranO0fr4wC 2/xiqSB2lTifrWsEZh2Kar3EP9egpl0wkqB5M0q6faPbg+6l9nhjbbE8beMhiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776285345; a=rsa-sha256; cv=none; b=c/jvdpgQGC6P6lr2kvnU/zXsi7waQ4M0Xt1oKqzd2nsXNXoV8lAyft5Ogi3rCFvSxq+Uu3 0bKM5wX5gGNa8LoSA455UlHAcN9MnDj3jyvnRTwhrDRmGlcDpkrdjCy/ygz4OZ4fVgVPaP zfVEzpDZtrdlvzwMXxV+KQUdXKPZzsNI3FdvVVAsE5MaQfMlabIatkKxihpixob+Q4N7xD STLsbYJdGmKzdlWlJViPG7g0XiJCJRrYnAn/NV2Z5E5ISAX9f4HM5NfH+5cYfWxkNd8tP2 uvqLRhLECNbceELFzX1a1QNh38uBXYy056/CmaD2+40Xjbwg0HJZceNEE6inWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776285345; 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=1AfuxfiDX0Htn4e72TNDauyHD6gd8LJQBf/yc5F8g3Y=; b=fSW6LORLb3t954r+4ahcTE8OANMR8oi92EBGibMsO5VAtTtmBQlMgcca4wDZuSmPmY713j TdBoFzYb3R7+J9ZugRDoSgCXYtQNrwMV3zYlI2afkdYjKMiRiMbO9BAjAmzM+WVkZUu9Tj U8P53e8bV50UuR7FaeF2BRRq/d/U/9ifX8avjyi2sJlZocCMZv4K3Oxw9VhBO30nof+bYu PIM4oOQ5lZkBBKW7DLUxI9YwrmE43dJOrsyoEafcQ2nTb841ZJoyRg+oBE/EDOsD6Gu2La jCQR5hmTTyhHtytbmEIWU/ry3pyHbIBi/5q/1dnXyjlx69F5rNfHi7sDx25vFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwtFX6nymzcsM for ; Wed, 15 Apr 2026 20:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20dad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Apr 2026 20:35:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 2d13620c6e1b - main - tcp lro: fix vnet handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2d13620c6e1be7f8136095f648a6b824158d0941 Auto-Submitted: auto-generated Date: Wed, 15 Apr 2026 20:35:44 +0000 Message-Id: <69dff6a0.20dad.6680d624@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2d13620c6e1be7f8136095f648a6b824158d0941 commit 2d13620c6e1be7f8136095f648a6b824158d0941 Author: Michael Tuexen AuthorDate: 2026-04-15 20:31:48 +0000 Commit: Michael Tuexen CommitDate: 2026-04-15 20:31:48 +0000 tcp lro: fix vnet handling Reported by: Shawn Webb Reviewed by: glebius, rrs Fixes: f707cc00ed12 ("lro: move pkt rejection checks to leafs to avoid queueing") Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D56420 --- sys/netinet/tcp_lro.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index 5819fb5ceae0..961a1fa2cb31 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -1422,15 +1422,20 @@ tcp_lro_rx(struct lro_ctrl *lc, struct mbuf *m, uint32_t csum) { int error; + CURVNET_SET(lc->ifp->if_vnet); #ifdef INET /* Quickly decide if packet cannot be LRO'ed */ - if (__predict_false(V_ipforwarding != 0)) + if (__predict_false(V_ipforwarding != 0)) { + CURVNET_RESTORE(); return (TCP_LRO_CANNOT); + } #endif #ifdef INET6 /* Quickly decide if packet cannot be LRO'ed */ - if (__predict_false(V_ip6_forwarding != 0)) + if (__predict_false(V_ip6_forwarding != 0)) { + CURVNET_RESTORE(); return (TCP_LRO_CANNOT); + } #endif if (((m->m_pkthdr.csum_flags & (CSUM_DATA_VALID | CSUM_PSEUDO_HDR)) != @@ -1442,12 +1447,12 @@ tcp_lro_rx(struct lro_ctrl *lc, struct mbuf *m, uint32_t csum) * a packet. */ counter_u64_add(tcp_bad_csums, 1); + CURVNET_RESTORE(); return (TCP_LRO_CANNOT); } /* get current time */ binuptime(&lc->lro_last_queue_time); - CURVNET_SET(lc->ifp->if_vnet); error = tcp_lro_rx_common(lc, m, csum, true); if (__predict_false(error != 0)) { /* @@ -1474,10 +1479,12 @@ tcp_lro_queue_mbuf(struct lro_ctrl *lc, struct mbuf *mb) return; } + CURVNET_SET(lc->ifp->if_vnet); #ifdef INET /* Quickly decide if packet cannot be LRO'ed */ if (__predict_false(V_ipforwarding != 0)) { /* input packet to network layer */ + CURVNET_RESTORE(); (*lc->ifp->if_input) (lc->ifp, mb); return; } @@ -1486,10 +1493,12 @@ tcp_lro_queue_mbuf(struct lro_ctrl *lc, struct mbuf *mb) /* Quickly decide if packet cannot be LRO'ed */ if (__predict_false(V_ip6_forwarding != 0)) { /* input packet to network layer */ + CURVNET_RESTORE(); (*lc->ifp->if_input) (lc->ifp, mb); return; } #endif + CURVNET_RESTORE(); /* check if packet is not LRO capable */ if (__predict_false((lc->ifp->if_capenable & IFCAP_LRO) == 0)) { /* input packet to network layer */