From nobody Mon Oct 13 20:39:58 2025 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 4clq3L2wwyz6CKqb; Mon, 13 Oct 2025 20:39:58 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4clq3L2TYPz3V4l; Mon, 13 Oct 2025 20:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760387998; 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=/YUVAqqdWH7TXNLaaCHHexYGTqqsHAbECSWY+ubFYQ4=; b=R7iH/+bksmRGRIOntFbZZb7fdSs4ar9blMTJZ7cG0CMNZ63Iw1WrNHWx/KfMkCQGPJExH3 KfNdGs3fWH7Wx/hQhxlI41qqiSJf04pTILy9u2FAaESffm0TCBufmBWFoSb1ngRS6WqcZb IzDGmLMDaomd8Qc31pf9cHFpYJXcKjduvcoETa7c0BU0nwFkBbw7GXuNt69TxjUOqzNmw1 4QLwEXLKpkcVb6rZkDlP80mzwL7IlvvoIEjODuUgCpZOxG0IF/LLobhyRmGw65RDwRKZY+ jxLMlDJeofsvcT5reButqgGYdinDZqp5HVbT+8YDdNvakddES7nTvVlGln2+vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760387998; 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=/YUVAqqdWH7TXNLaaCHHexYGTqqsHAbECSWY+ubFYQ4=; b=eQNLn798pUqT9dzamvanGUQE3tV+mBN5zHfVMXUi4iKs4fBXhUXrpInD22W1pkXUd/leN+ sOVSOFtDsxTnuWa2cktlDr5xB7njMmI+Dh8oXRPIz9gcNLpUMpT8+jNDHt+mXwvXqOUQOn W0GKbrPtKHI2TVYb61r14enA2WV3gV8+RxZzNdSgHbs9MB70f1Mk/1fEw4I1twsoBE8IvG N+pmUdFBrLIFxot/KqzlGtfA5uUrVQnZuSrFSWEjqNBKZTfxMU5jkvSYDZaArUccBhlBhB kjX7IREAZUKDFLSWe1179Y1T2TMLgbh8A4zwfz2gSm/yRPyjJbvHxPPZOU0jaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760387998; a=rsa-sha256; cv=none; b=AZpkl86rr5MNODIbg6QZ+0fmM0BsXuQaAxvcN81E9wvnjOAGd2ljO/f2eXdH369hEAqdnF juStnq3MBpxCcM7fAUhPeoWdbRCYHR9feRlAVZfPc/wV8sjQ2AtuPNfz6z51i72iGsglxZ KTDxIPNgJ7yGlOXjZaKO3B3iEZdLJB8dYnpOA0OcVQG1/LBKb8xRJvwDZtrBWuNSB19mv3 GV4CC3Ph/2GfE/eDxHiiUEB5fG4d8pWn9jd6yGoLcBUuSeQU4OmUELIQEKzPFkB+O8KSmk W93aKB/d/tLeo95RAXXbAqIsGLUQZ7crbbr7/RgKWptVoeUn83tRVuNuX21zqA== 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 4clq3L1lZgz6hW; Mon, 13 Oct 2025 20:39:58 +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 59DKdwk8034739; Mon, 13 Oct 2025 20:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59DKdwxN034736; Mon, 13 Oct 2025 20:39:58 GMT (envelope-from git) Date: Mon, 13 Oct 2025 20:39:58 GMT Message-Id: <202510132039.59DKdwxN034736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bf48bc994a92 - main - tcp: remove unused argument in HPTS 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: bf48bc994a92850f7717b79da3a10a80725073bd Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bf48bc994a92850f7717b79da3a10a80725073bd commit bf48bc994a92850f7717b79da3a10a80725073bd Author: Nick Banks AuthorDate: 2025-10-13 20:38:51 +0000 Commit: Michael Tuexen CommitDate: 2025-10-13 20:38:51 +0000 tcp: remove unused argument in HPTS Reviewed by: tuexen Sponsored by: Netflix, Inc. --- sys/netinet/tcp_hpts.c | 9 ++------- sys/netinet/tcp_hpts.h | 7 ------- sys/netinet/tcp_hpts_test.c | 5 ----- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index a50ad3fa6b33..c54459bb5f01 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -798,7 +798,7 @@ max_slots_available(struct tcp_hpts_entry *hpts, uint32_t wheel_slot, uint32_t * #ifdef INVARIANTS static void check_if_slot_would_be_wrong(struct tcp_hpts_entry *hpts, struct tcpcb *tp, - uint32_t hptsslot, int line) + uint32_t hptsslot) { /* * Sanity checks for the pacer with invariants @@ -830,13 +830,8 @@ check_if_slot_would_be_wrong(struct tcp_hpts_entry *hpts, struct tcpcb *tp, #endif void -#ifdef INVARIANTS -__tcp_hpts_insert(struct tcp_hptsi *pace, struct tcpcb *tp, uint32_t usecs, - int32_t line, struct hpts_diag *diag) -#else __tcp_hpts_insert(struct tcp_hptsi *pace, struct tcpcb *tp, uint32_t usecs, struct hpts_diag *diag) -#endif { struct tcp_hpts_entry *hpts; struct timeval tv; @@ -934,7 +929,7 @@ __tcp_hpts_insert(struct tcp_hptsi *pace, struct tcpcb *tp, uint32_t usecs, diag->inp_hptsslot = tp->t_hpts_slot; } #ifdef INVARIANTS - check_if_slot_would_be_wrong(hpts, tp, tp->t_hpts_slot, line); + check_if_slot_would_be_wrong(hpts, tp, tp->t_hpts_slot); #endif if (__predict_true(tp->t_in_hpts != IHPTS_MOVING)) tcp_hpts_insert_internal(tp, hpts); diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 8b69e6af35ed..6b05f9701ac2 100644 --- a/sys/netinet/tcp_hpts.h +++ b/sys/netinet/tcp_hpts.h @@ -127,17 +127,10 @@ tcp_in_hpts(struct tcpcb *tp) * that INP_WLOCK() or from destroying your TCB where again * you should already have the INP_WLOCK(). */ -#ifdef INVARIANTS -void __tcp_hpts_insert(struct tcp_hptsi *pace, struct tcpcb *tp, uint32_t usecs, - int32_t line, struct hpts_diag *diag); -#define tcp_hpts_insert(tp, usecs, diag) \ - __tcp_hpts_insert(tcp_hptsi_pace, (tp), (usecs), __LINE__, (diag)) -#else void __tcp_hpts_insert(struct tcp_hptsi *pace, struct tcpcb *tp, uint32_t usecs, struct hpts_diag *diag); #define tcp_hpts_insert(tp, usecs, diag) \ __tcp_hpts_insert(tcp_hptsi_pace, (tp), (usecs), (diag)) -#endif void __tcp_set_hpts(struct tcp_hptsi *pace, struct tcpcb *tp); #define tcp_set_hpts(tp) __tcp_set_hpts(tcp_hptsi_pace, tp) diff --git a/sys/netinet/tcp_hpts_test.c b/sys/netinet/tcp_hpts_test.c index 9217c3205587..bab5827e0572 100644 --- a/sys/netinet/tcp_hpts_test.c +++ b/sys/netinet/tcp_hpts_test.c @@ -56,13 +56,8 @@ /* Custom definitions that take the tcp_hptsi */ #define tcp_hpts_init(pace, tp) __tcp_hpts_init((pace), (tp)) #define tcp_hpts_remove(pace, tp) __tcp_hpts_remove((pace), (tp)) -#ifdef INVARIANTS -#define tcp_hpts_insert(pace, tp, usecs, diag) \ - __tcp_hpts_insert((pace), (tp), (usecs), __LINE__, (diag)) -#else #define tcp_hpts_insert(pace, tp, usecs, diag) \ __tcp_hpts_insert((pace), (tp), (usecs), (diag)) -#endif #define tcp_set_hpts(pace, tp) __tcp_set_hpts((pace), (tp)) static MALLOC_DEFINE(M_TCPHPTS, "tcp_hpts_test", "TCP hpts test");