From nobody Wed Feb 05 19:49:28 2025 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 4Yp9mT0lHbz5mHKk; Wed, 05 Feb 2025 19:49:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp9mS6LcMz3tlQ; Wed, 05 Feb 2025 19:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784968; 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=lAZW+6yN9qLWL5ayCs/sGF/gC4Qhon6w86JPJdcWdm8=; b=ocQAiv6AFsjcOgxm9EoTs1Hylc0PgVUqgCe9VzdLDY6+PTEaE0GiUjlSCb7zoM+jK0G/Js vNOMxmwRqsHAiADdO7CJgEOSi9Q4SNemBy9kRXdPxtbFPV5l0PJuA+518yizJvP2Rdkr4Q G8+Vmjf757ztc8gMkXfRoTdzicETA/vm+Q0BzmZtrESvax8RFBqdJO2HoBH8xxrmFRXS6l sf3V1eIK0JoCQPbSW4o4eAhVAW/yo30NECE5ghb5AE+yJNh6rRSjpT1ch4Tjj/yFVc6g8T nnrgo7CcWluskeV+PZnbBQsc/7xVoF/BFjexGftP4Sl6RV/YGUtAbYyaywufkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784968; 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=lAZW+6yN9qLWL5ayCs/sGF/gC4Qhon6w86JPJdcWdm8=; b=DC+GDS3R1AZsqxOTW6XIyYn/1F6ei8c8R5FY2ZFAypd598k/5HyMABESzf2BHpg/S7T6xf TVc67v5DXQuF5iDGPc57QJPa86NO1FU6znoq+rw+wZp7yPIhkpuLVUd2YKSWcl4fSfVSxv r2o4uhVPOYxtHO4424c8nG4rjE5snHYhP72VyRd21rwDK2uxsUGVt1xYN08yZCOAFKQwPV ngDV/tI7B6LMHB1UWjnw9kBmWkhpdalHwVBclV1v160HXeDP/ATkJdqBojrDWsrI2CXzeD XRD3wG0216ARnwghtS4m5r+BCFoGG9MjgTHpvvd0sKwioLwXTRGjOFVlZvzWwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784968; a=rsa-sha256; cv=none; b=Lv1yTf13J8wd15vfR3/tV9CbHM2nQ2wh2W2jlS8aF1UozYmRI6bS6m1mre3rzGvblz+mnx e45hzMmY5EFCqvoS7EZc4hBfZfWevtlvym9GC7h4FL42L2pENFctMjPv9bePQPfRyCb9Rx BecNhJxbysnK5TldMdDGMpMks3bCX1I/Ir2v+pTH46Jl/YshYMgCEkyMCyxzx5N6w1SnUL lppyBuYZkJNpJJjamoxkgaLEdmnlp7twE2AGhpXqUAK0r+vSMvmqsvxWMqDt0nRkrh+gwR Y1kZ/BvMBCdHiMAAslTPuZdlBm8tmv5deuL7R4938EUgap2ZZ07XFFr14N3KxA== 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 4Yp9mS5wSxz15KX; Wed, 05 Feb 2025 19:49:28 +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 515JnSGu069976; Wed, 5 Feb 2025 19:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515JnSZX069973; Wed, 5 Feb 2025 19:49:28 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:49:28 GMT Message-Id: <202502051949.515JnSZX069973@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: 92d87203c00e - stable/13 - TCP RACK, BBR: cleanup of ctf_process_inbound_raw() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 92d87203c00e5b47f5505702b2a86fae3c1cf063 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=92d87203c00e5b47f5505702b2a86fae3c1cf063 commit 92d87203c00e5b47f5505702b2a86fae3c1cf063 Author: Michael Tuexen AuthorDate: 2024-12-31 16:22:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 19:34:37 +0000 TCP RACK, BBR: cleanup of ctf_process_inbound_raw() Instead of dealing with ifp == NULL, which should never happen, assume that this is not true. Use KASSERT to make this clear. No functional change intended. Reviewed by: glebius, rrs CID: 1523767 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48258 (cherry picked from commit 4940584bbf0b809130f6ac1a7a0c6b00d373af1e) --- sys/netinet/tcp_stacks/rack_bbr_common.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index 1426043f5326..4a1f167e90f4 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -400,23 +400,13 @@ ctf_process_inbound_raw(struct tcpcb *tp, struct socket *so, struct mbuf *m, int int32_t retval, nxt_pkt, tlen, off; int etype = 0; uint16_t drop_hdrlen; - uint8_t iptos, no_vn=0; + uint8_t iptos; NET_EPOCH_ASSERT(); - if (m) - ifp = m_rcvif(m); - else - ifp = NULL; - if (ifp == NULL) { - /* - * We probably should not work around - * but kassert, since lro alwasy sets rcvif. - */ - no_vn = 1; - goto skip_vnet; - } + KASSERT(m != NULL, ("ctf_process_inbound_raw: m == NULL")); + ifp = m_rcvif(m); + KASSERT(ifp != NULL, ("ctf_process_inbound_raw: ifp == NULL")); CURVNET_SET(ifp->if_vnet); -skip_vnet: tcp_get_usecs(&tv); while (m) { m_save = m->m_nextpkt; @@ -508,18 +498,14 @@ skip_vnet: m_freem(m); m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); INP_UNLOCK_ASSERT(inp); - return(retval); + return (retval); } skipped_pkt: m = m_save; } - if (no_vn == 0) { - CURVNET_RESTORE(); - } + CURVNET_RESTORE(); return (0); }