From nobody Wed Feb 5 19:44:00 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 4Yp9f914GZz5mH06; Wed, 05 Feb 2025 19:44:01 +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 4Yp9f85Q80z3sZn; Wed, 05 Feb 2025 19:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784640; 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=C7kQb3ea9+vEaUL5Z87bgeQY9Ra9hZYkUeG+sOJwzQQ=; b=p3GQEBno2bOSBwrOI5LG+BMB0eqMtDm50/DpocqS97inC+zBefkdb48Otx4VvAnVgVW+dP KxqtsfpSwyEoWkCq2a4x21qC0uG2XlMaq1AbXzLaS7NQQX3iAP+FgThXj9tzu5+hn2UuQT 8Q7v3Pd2mPdZf4Qxpm0yvaz+1MElgVgEGKYGMgxozh9EDi6h52pMbAS+ggt1bR0b8TxNnW QWDPLVzVNTFBhz3tSMo1AVQ8e9ms4B2ilFfNb9EfQv2dhesdqCvW3PGloVGlBPgrL9tuhh uJmKMyt2zZt/Jg9zM7xsk436Z1+FZGQPimiysA8lsJ14vE6XAfhndIxtKMp1kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738784640; 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=C7kQb3ea9+vEaUL5Z87bgeQY9Ra9hZYkUeG+sOJwzQQ=; b=Sa/b/sdeb4yZ3QwVdLeinTUw5tPCojliMcgQ4laKeMZKfp8QKY56+BUnMKazzpQ40d278L 2C7OGjrgT8Z1Ed34OgZSla95/5f8hYPDVIKPorLkxe1+s85LTxs1wmEtzPBDVvIsySnAVR ipb1AzahFpsrZwUarCEI/digcDWhYMqE5XcuWZ0ZJJUYRNuLPok/S1FgkVC+wz+foQU9BU BiimFPfdWi77uOq2cFzkRmcJgozsYkuqbmcTVVV+4loIykYkBGB2/8YcCjVEdj0AkoVNoe 9Jyp0M6E7qPRMDfj0lkbiR6ZVzvc0RTaIqByjJn6Hu0oSkZgNJjgEWZjsVIW+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738784640; a=rsa-sha256; cv=none; b=UtLUEc4JLfudgF1AsSy8a57jETYEBw0HyBSXICQcbzaNSqFRznqBEK3Ez75BUcYeZHftrR kMkLavc/37W5hy3bgaXxt8JNAP9QksTqQ+OSfOfmu/cMK9KzLHWLwgC9V0DRl6ACyZoYZT ce3BTTnbCUHqpIVdiF2Ae2smkSAcbDeGhuOwTLzMT3Eklrr762Hj5BLvTS7S6UlIyFUiZ8 8A7mtm4POMDkevC67ItbX9Vgkt8MRMZq3lxtwl/g3FAP2MYJbLwWwcOxYsLhNu43hRAfgp v538xLJ4wVUuate/WAjNqztycsAJyFFSj2wFKYQpjbzQKtgmMKXe7nIP/1xm+w== 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 4Yp9f84wlFz15Mc; Wed, 05 Feb 2025 19:44:00 +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 515Ji0kb068274; Wed, 5 Feb 2025 19:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Ji0wI068271; Wed, 5 Feb 2025 19:44:00 GMT (envelope-from git) Date: Wed, 5 Feb 2025 19:44:00 GMT Message-Id: <202502051944.515Ji0wI068271@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: dd0d5ece19be - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: dd0d5ece19be1cfde6ca744ea03c2a49c35f2fa4 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0d5ece19be1cfde6ca744ea03c2a49c35f2fa4 commit dd0d5ece19be1cfde6ca744ea03c2a49c35f2fa4 Author: Michael Tuexen AuthorDate: 2024-12-31 16:22:03 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 08:44:19 +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 | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index 9fd1817192c9..b78988b75c72 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -361,26 +361,15 @@ ctf_process_inbound_raw(struct tcpcb *tp, struct mbuf *m, int has_pkt) int32_t retval, nxt_pkt, tlen, off; int etype = 0; uint16_t drop_hdrlen; - uint8_t iptos, no_vn=0; + uint8_t iptos; inp = tptoinpcb(tp); INP_WLOCK_ASSERT(inp); 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; @@ -466,18 +455,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); }