From nobody Wed Feb 23 21:27:19 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 6058B19EA285; Wed, 23 Feb 2022 21:27:19 +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 4K3pyv2CzTz4Tw7; Wed, 23 Feb 2022 21:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645651639; 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=AYnmlW0qXBThWd1cYs80HL0hGWjy1kf7X7FbjkU7sr8=; b=XKCyie3xwcKb8F6a0cPFCxLK60PRZMlz9foE1Uw4TWljCLK+rYqYmbXWYnoA7qTNeiviyv 8qCrvjPDEsWgw8EyRmIwTdDCWkNSDriv5kufJoPaxzIxe5kaOh8/FJLzE6Z26Zc+wdA08A XkrQsB7MCmQ7fJV4ZCAlAus3i0SE4zgsFPJYnRmdmysG/lbWXTSlMEZle4Vvg6XneCnM+f XxkfJ8q8a72ceZ8Vx0gsVlAIEkGWBdaa9276bfrFHHlQ5eZYesy8hkGZL2opooH8nYLN6s QvjDfgldOqkiCD1N5CNmyAm01H77pZ5WkIu559R+e8StRG7LoirAwKVtIz8V0Q== 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 2BAE61F46C; Wed, 23 Feb 2022 21:27:19 +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 21NLRJ7k085059; Wed, 23 Feb 2022 21:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NLRJ4K085058; Wed, 23 Feb 2022 21:27:19 GMT (envelope-from git) Date: Wed, 23 Feb 2022 21:27:19 GMT Message-Id: <202202232127.21NLRJ4K085058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Randall Stewart Subject: git: a43b0aca125e - main - tcp: Push bit failure to set in fastpath 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: rrs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a43b0aca125e384dfd0bd9467baa033f01f00b40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645651639; 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=AYnmlW0qXBThWd1cYs80HL0hGWjy1kf7X7FbjkU7sr8=; b=feHswuMRI4dQpjSqrfkGXF7YUKcpIfW9yeJaE1W1QiLBZVqtUNxmZWK7zoCXIcQT1raVp0 284mYMmovMfOIdQeRcdWjLA/4d6Nu8LZrv4UD0u5IkYDsYwpeRCl9PjoyPEd0a8UEQzy0r lrJspgUKHhVxaNpv/KKpoLUSuVEtk9kOyuo6cKPteQjm+qNt4jbXvGm964Od95Xs6+yqWv Fo8ZvTpgcykfeTnp2xbVKtfSLp13+k5OBXOO+5hosf12yMQgfjjM/20Fjx+sBfPKFucvSn 8qoepFwH8TbsiapeAgg5HLWneF9pLozWpkJwQDCZvEHVPzHj7UaRYNUaq/WmNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645651639; a=rsa-sha256; cv=none; b=QhQzwEEpnEYKv/rzUKR/z6tMYpZ1nGa/z+GcjVWBEUGeGSaiFP6wDbKRhsJGeRstvnmoDh 5Z4iqWK+3ItD/unM6A88T6F8yaCrjIpdWy1O8TVZbvQAKq+plC4Uz1QFUt449la24j9miK nOYJqskj5VZmBGzmD5sHOfcTencgiDij2/lRj+uec3tTePj9stikWB+YZwPeNYutvqXxOB g1dLDag84DerzdERZhJfpXg3aYAuAlueCjeUs2axfzsjBaH6w6Kn6h49NdX8OlGT6vINS5 S4PD4Q8SoohFjuFX3mdFPunQQHlvVHUhBy8m+ykcZokSRFnOfHXa99rzDrw1Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rrs: URL: https://cgit.FreeBSD.org/src/commit/?id=a43b0aca125e384dfd0bd9467baa033f01f00b40 commit a43b0aca125e384dfd0bd9467baa033f01f00b40 Author: Randall Stewart AuthorDate: 2022-02-23 21:25:56 +0000 Commit: Randall Stewart CommitDate: 2022-02-23 21:25:56 +0000 tcp: Push bit failure to set in fastpath Recently changes were made to the tcp stack to use a macro/function to set tcp flags. In the process the PUSH bit setting in the fastpath of rack was broken. This fixes that as well as cleans up a warning that is occurring when you don't have INVARIANT on (inp used in KASSERT). We can use the tcp test suite to find this bug the test plan shows the script that fails due to the missing push bit Reviewed by: rscheff, tuexen Sponsored by: Netflix Inc. Differential Revision: https://reviews.freebsd.org/D34332 --- sys/netinet/tcp_stacks/rack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 63a36c716531..7bab75a637fa 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -6258,11 +6258,11 @@ static int rack_timeout_persist(struct tcpcb *tp, struct tcp_rack *rack, uint32_t cts) { struct tcptemp *t_template; - struct inpcb *inp; +#ifdef INVARIANTS + struct inpcb *inp = tp->t_inpcb; +#endif int32_t retval = 1; - inp = tp->t_inpcb; - if (tp->t_timers->tt_flags & TT_STOPPED) { return (1); } @@ -16217,7 +16217,7 @@ again: } if (rack->r_ctl.fsb.rfo_apply_push && (len == rack->r_ctl.fsb.left_to_send)) { - tcp_set_flags(th, flags | TH_PUSH); + flags |= TH_PUSH; add_flag |= RACK_HAD_PUSH; } if ((m->m_next == NULL) || (len <= 0)){