From nobody Thu Oct 24 17:14:40 2024 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 4XZCFr3sl0z5Zg3R; Thu, 24 Oct 2024 17:14:40 +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 4XZCFr38pxz4c9x; Thu, 24 Oct 2024 17:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790080; 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=lThoNc3BvTWVfl6mle0V8XTWrjGHvEpcNfAauJGUhfI=; b=RFOErHHYSJoteM+0c7bwk1nyn1K25XsUM78iSkoeO9f2auJYRFAGyDY3nulwAtnND4Zyxq 5eneLmH/8E+2nzs8nCVb8Lda4IESTYZF6qk1YOzP8woeW8tVZ2QwRicMadsDAd6tOy4zxK e5oQkIVLvjjPbedi1XtotybLKsQEwh5TO7MHQ6Pe8aHY/8hfw6ODTDf9P3I/GhNWxtrEf4 W9RTIIo3jGiqRksCD3j18+faGJ45J8EVsXhWg0b86U5chD6Hemlu5tyZjTdP1iTn8Vysr8 VTDtDGRsbUPEE6EeFI8CVGyoKAGR1F4EaahzGnhhBNS0AVcY7+Q6OYPdiy8hrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729790080; 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=lThoNc3BvTWVfl6mle0V8XTWrjGHvEpcNfAauJGUhfI=; b=kzlDJ1kqgwxObkG++BSskv1Ch87XzqLGHiFiHHJ54VJDW6SAcItNc9Ah0Y+t+UY1tgLNui w3sLHl1iOKtPN9wnlRGK+lVZqXXxEftv303x72WPjw69jU46XcJB0o3yAWNEI4mcQi+pDy Wou/NX7L8KMurC1ofGULJG+kjU3kl8YwITYFRze9A1GxhJISYPIpUBaj41VtUKhX9B/1aH PEHG/h50vGiOTngN5WofcFDEwnaJdXXqEdivox3Vs4kwA8oa0hqaspGfBTr8Guq9f3ReO+ t4+ktwzoTVdTggOE894NKjU+tY1xlKmciKRmV8B7tKI7yQkse3taPIk3Gaiw8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729790080; a=rsa-sha256; cv=none; b=XX2O5ejKVZ1PvYZMFuEyytFjAivaYedWL/BZ+dcWS3E2y0iRtF4vYBCZqz6yIZ8ul3XcgA UEOYadV3QB1ebn/7E7GJrx1HQCrWzxJ1AdVVQSHJdelCCF/hDa9RGr/Zy6+dW3G1/a6a26 r6Wi8sp5Z65icN4hKtfLlVa+o8Mf6KLW2jFYSX9lB60DjSBEt0aTEVo3iYDFj4IiRJ3Yzb brIOMt3Br3RMu8bXXNs4jB89gf6haUjti3E1Tl4jbqJc0DY77FIBQ4h5iTq22JN95hL+tC Xnq7cpwN9PqoijGtZIzLUXfPkg8PIX+vVVdcVOnE0mNAtcJjj5ufaerw2o/3Zw== 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 4XZCFr1rfQzr1P; Thu, 24 Oct 2024 17:14:40 +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 49OHEeGZ000419; Thu, 24 Oct 2024 17:14:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OHEe4e000416; Thu, 24 Oct 2024 17:14:40 GMT (envelope-from git) Date: Thu, 24 Oct 2024 17:14:40 GMT Message-Id: <202410241714.49OHEe4e000416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d021d3b3c675 - main - tcp: get rid of TDP_INTCPCALLOUT 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d021d3b3c67573822b01d27cb05ca937fc966843 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d021d3b3c67573822b01d27cb05ca937fc966843 commit d021d3b3c67573822b01d27cb05ca937fc966843 Author: Gleb Smirnoff AuthorDate: 2024-10-24 16:58:49 +0000 Commit: Gleb Smirnoff CommitDate: 2024-10-24 17:14:03 +0000 tcp: get rid of TDP_INTCPCALLOUT With CALLOUT_TRYLOCK we don't need this special flag. Reviewed by: jtl Differential Revision: https://reviews.freebsd.org/D45748 --- sys/netinet/tcp_timer.c | 9 +-------- sys/sys/proc.h | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index ae4753b2523f..c5c65dda5b1a 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -874,12 +874,8 @@ tcp_timer_enter(void *xtp) struct inpcb *inp = tptoinpcb(tp); sbintime_t precision; tt_which which; - bool tp_valid; INP_WLOCK_ASSERT(inp); - MPASS((curthread->td_pflags & TDP_INTCPCALLOUT) == 0); - - curthread->td_pflags |= TDP_INTCPCALLOUT; which = tcp_timer_next(tp, NULL); MPASS(which < TT_N); @@ -887,8 +883,7 @@ tcp_timer_enter(void *xtp) tp->t_precisions[which] = 0; tcp_bblog_timer(tp, which, TT_PROCESSING, 0); - tp_valid = tcp_timersw[which](tp); - if (tp_valid) { + if (tcp_timersw[which](tp)) { tcp_bblog_timer(tp, which, TT_PROCESSED, 0); if ((which = tcp_timer_next(tp, &precision)) != TT_N) { MPASS(tp->t_state > TCPS_CLOSED); @@ -898,8 +893,6 @@ tcp_timer_enter(void *xtp) } INP_WUNLOCK(inp); } - - curthread->td_pflags &= ~TDP_INTCPCALLOUT; } /* diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 1e98cc84a60a..466fb3c0cd41 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -560,7 +560,7 @@ enum { #define TDP_RESETSPUR 0x04000000 /* Reset spurious page fault history. */ #define TDP_NERRNO 0x08000000 /* Last errno is already in td_errno */ #define TDP_UIOHELD 0x10000000 /* Current uio has pages held in td_ma */ -#define TDP_INTCPCALLOUT 0x20000000 /* used by netinet/tcp_timer.c */ +#define TDP_UNUSED0 0x20000000 /* UNUSED */ #define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */ #define TDP_SIGFASTPENDING 0x80000000 /* Pending signal due to sigfastblock */