From nobody Tue Dec 19 18:22:51 2023 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 4SvlRc38hnz54gfS; Tue, 19 Dec 2023 18:22:52 +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 4SvlRc2DRyz4Rdr; Tue, 19 Dec 2023 18:22:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703010172; 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=YxTIogOpxNUGCVZ1bkh/GZpH77BNleEw3NbbrOIZ3FQ=; b=psRpQ1vRSXdpXhhH/EtHMBl74qfF+t1pPvwsV2SILOQq1K7t1T+QOOSbX3OmI//vnoqDyB 9+frHv9TauLS8M8r9y1uYxLB2+6lMg4rFK1lAcomjvK1mEqiFfzp0AlY3OramnuVUCrPLO P0tiTDCgBy/DiW4jOM+bW0KSIi7aNuCM58Yr1ykE2lYbkHharwTMAjFRwHM9YHviP56rgV aPxdMr/yJma631oGB686qTjTOtvjnXgUQ8uCOlzRT7GUnf7sdKTYXwiNN1z77iMJS8J6tM NhogW1LhzshwmaUExsraE/DZOiVhhdoJTPzLoMN+4vnfiVmu552yahZ6bF6VHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703010172; a=rsa-sha256; cv=none; b=Pl/vgpvGkFl5WHZbAiu/E9rGY1FPnJwL2ukA8JstVVM99mKQ6K8ACuq766oJuO6UIjdVP7 VZi9kSoULFv6K4Zzqoc/YBL72wt/VzXKaQI+t0A3+OvQVo84yPwMOC9uq78mvhH4kk9Yxe wpYXOgMUMY2Er4zYQEXrpLP62EYcQyU2TIw+k8QdXMr6Qyxonq7wo2+jjKvaO8G+gV95+c oMFWZFvDj3PamxM+OTo5eS2Yimk0GCulJuDH+juZ3781LPz9idl8H/Uk4NOP4i0W9CzOkk ki62RyX+teqsgwjU9g3e+bsk1hdskzyX5lKfTXVLe1JF8Oua2A8bfueUnhv13g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703010172; 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=YxTIogOpxNUGCVZ1bkh/GZpH77BNleEw3NbbrOIZ3FQ=; b=tySBJu7EcPf77UYRSn2sPXjm6Y5zpfpbakoQ9pUVPzaWWb9OHqCvYt013RX3OhxGrjThIs VqN6MYdST66vlZk9GoSML3hJrnyY8dvWfw5jqPIX9XBH9BCJNV20usQmKdWP0SzjbXiEli pI6GQDC+X/IJNjwDBtLmNJwduXwhV+8ncVVnwMjjOxU4Z1Blv2fQ9OjcEMzjMtsPuRkhzA baowcDZJkL8xj+yH2ujfF4SRnG+fgXB4pWRXqOpdJP3K2msY3FbA6Zjd0BJKchvTR0SFFW sL83IQEASME0X6cC9V8LS1dNA00qgVDT2JbMeOOCPbVO580Ziqe3UqfuhU6bRw== 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 4SvlRb6w5Tz20x; Tue, 19 Dec 2023 18:22:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BJIMpGh016102; Tue, 19 Dec 2023 18:22:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BJIMpGa016099; Tue, 19 Dec 2023 18:22:51 GMT (envelope-from git) Date: Tue, 19 Dec 2023 18:22:51 GMT Message-Id: <202312191822.3BJIMpGa016099@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: 175d4d69887f - main - tcp_hpts: use tcp_pace.cts_last_ran for last ran table 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 175d4d69887fb103f0b0385cbbafec0432284ff3 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=175d4d69887fb103f0b0385cbbafec0432284ff3 commit 175d4d69887fb103f0b0385cbbafec0432284ff3 Author: Gleb Smirnoff AuthorDate: 2023-12-19 18:21:56 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-19 18:21:56 +0000 tcp_hpts: use tcp_pace.cts_last_ran for last ran table Remove the global cts_last_ran and use already existing unused field of struct tcp_hptsi, which seems originally planned to hold this table. This makes it consistent with other malloc-ed tables, like main array of HPTS entities and CPU groups. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D43091 --- sys/netinet/tcp_hpts.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index f1b729c249c6..50a30a2cff03 100644 --- a/sys/netinet/tcp_hpts.c +++ b/sys/netinet/tcp_hpts.c @@ -236,7 +236,6 @@ static int tcp_bind_threads = 1; static int tcp_bind_threads = 2; #endif static int tcp_use_irq_cpu = 0; -static uint32_t *cts_last_ran; static int hpts_does_tp_logging = 0; static int32_t tcp_hptsi(struct tcp_hpts_entry *hpts, int from_callout); @@ -1098,7 +1097,7 @@ tcp_hptsi(struct tcp_hpts_entry *hpts, int from_callout) hpts->p_lasttick = hpts->p_curtick; hpts->p_curtick = tcp_gethptstick(&tv); - cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv); + tcp_pace.cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv); orig_exit_slot = hpts->p_cur_slot = tick_to_wheel(hpts->p_curtick); if ((hpts->p_on_queue_cnt == 0) || (hpts->p_lasttick == hpts->p_curtick)) { @@ -1441,7 +1440,7 @@ no_one: goto again; } no_run: - cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv); + tcp_pace.cts_last_ran[hpts->p_num] = tcp_tv_to_usectick(&tv); /* * Set flag to tell that we are done for * any slot input that happens during @@ -1523,8 +1522,8 @@ tcp_choose_hpts_to_run(void) } oldest_idx = -1; for (i = start; i < end; i++) { - if (TSTMP_GT(cts, cts_last_ran[i])) - calc = cts - cts_last_ran[i]; + if (TSTMP_GT(cts, tcp_pace.cts_last_ran[i])) + calc = cts - tcp_pace.cts_last_ran[i]; else calc = 0; if (calc > time_since_ran) { @@ -1830,7 +1829,7 @@ tcp_init_hptsi(void *st) sz = (tcp_pace.rp_num_hptss * sizeof(struct tcp_hpts_entry *)); tcp_pace.rp_ent = malloc(sz, M_TCPHPTS, M_WAITOK | M_ZERO); sz = (sizeof(uint32_t) * tcp_pace.rp_num_hptss); - cts_last_ran = malloc(sz, M_TCPHPTS, M_WAITOK); + tcp_pace.cts_last_ran = malloc(sz, M_TCPHPTS, M_WAITOK); tcp_pace.grp_cnt = 0; if (cpu_top == NULL) { tcp_pace.grp_cnt = 1; @@ -1916,7 +1915,7 @@ tcp_init_hptsi(void *st) SYSCTL_ADD_UINT(&hpts->hpts_ctx, SYSCTL_CHILDREN(hpts->hpts_root), OID_AUTO, "lastran", CTLFLAG_RD, - &cts_last_ran[i], 0, + &tcp_pace.cts_last_ran[i], 0, "The last usec tick that this hpts ran"); SYSCTL_ADD_LONG(&hpts->hpts_ctx, SYSCTL_CHILDREN(hpts->hpts_root), @@ -1937,7 +1936,7 @@ tcp_init_hptsi(void *st) hpts->p_hpts_sleep_time = hpts_sleep_max; hpts->p_num = i; hpts->p_curtick = tcp_gethptstick(&tv); - cts_last_ran[i] = tcp_tv_to_usectick(&tv); + tcp_pace.cts_last_ran[i] = tcp_tv_to_usectick(&tv); hpts->p_prev_slot = hpts->p_cur_slot = tick_to_wheel(hpts->p_curtick); hpts->p_cpu = 0xffff; hpts->p_nxt_slot = hpts_slot(hpts->p_cur_slot, 1);