From nobody Fri Oct 13 15:44:21 2023 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 4S6W5d562gz4x8d1; Fri, 13 Oct 2023 15:44:21 +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 4S6W5d4ddtz3XmL; Fri, 13 Oct 2023 15:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697211861; 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=5LZL9ubwmt4OvdfJ7hrKaCm0mHHvSmJJ04s9ezy7ulM=; b=mpnlbMTtKs9zijCjVzzDyft3EZdtG/hnceCps41KYbIXXIaoMoRkxBdDx2bY+bU9uU6uT1 nW94WU4msQqIKhTQpCOPF999OO9aBaA7v02d6fGOUfXR59KBA+zvidskDGeVPJxKQPuXMQ 0QS7qczxDgGUvoZNoD+NshAE42fxCwf84G1neziEND1dJz4SZVLdKYlYgiycGksi/vPbrA 0x4q7hysXUc6T9soK9Kw1rtkDiXoR9sKzCYijK2H8RnxvqIIcLosxstj2KOdCctOVRtyv1 nTxwEZPgvCltgeFjbAl+8bKDWKJG7C9R64cK61vMaohbd5rE9vhgAXoJocNYTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697211861; a=rsa-sha256; cv=none; b=U1jS3TowZM9vJHjrCjOo+kxJkcUQQ+Fwnnz9VtLx/FQ2NxAqXl3KCKtZgkwgdSpxIUyfjV O55vZJu2n8Y6GTiQ51GjEcSeMN2AmDm5IXzDD4qg8hGWJBBK6K1VFPWWP01KO+5LNsCFXp aAOfPvdEnxZqyROAS4WHgOS9IGGouCM1dfo76AnJ/0kz1/rUQF35/tRiMrQUBj3Uf5Fbw2 NLXstAxeGrM7B/M3GsFDS9iiqyDR8LbpAMZcYmQm97+RGmXjShU8aln5Kgc1VT9+/MoSF4 5BNHuj1GHi1YnhZYDNO2kKDtQquUo/RulZ/LZhQiXgY0Lt0j+sNFw7mFxpLfgA== 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=1697211861; 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=5LZL9ubwmt4OvdfJ7hrKaCm0mHHvSmJJ04s9ezy7ulM=; b=BDgnZ4+ot0eU5vRptGmioAf7Jku9Pq7z5L1Jh/I6kqrL35E0KSwtMDBA/YnYAp7c5cCQ7D 2ezyDFuwoIgyoOzA30BqIzmQeHKcLY4cgfi4iBbZc4n1o2orb03QdeBFDqBL1SI2MmHFpX clpHrPf+sewf3vh2kabz6vI28qvhIRaDciIm0SD9J7FCOokNtHOMZn4SETGUpuQgwQxqk7 MLwwGnZUxZesdltPcIUbkhS/8vVDcrB/03bZpCEqpKZGK49IuAvX4z5XTsEgUUBVmKoLaV 7StPPGprKEKsz/Zsrhb2DiBqTcXB94YgejhdFDRa5JcaIoJwWj3F4zhvZp1e6w== 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 4S6W5d3jWXztZ1; Fri, 13 Oct 2023 15:44:21 +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 39DFiLw3014961; Fri, 13 Oct 2023 15:44:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DFiLfY014958; Fri, 13 Oct 2023 15:44:21 GMT (envelope-from git) Date: Fri, 13 Oct 2023 15:44:21 GMT Message-Id: <202310131544.39DFiLfY014958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5feb890554b6 - stable/14 - dtrace: remove x86 non-EARLY_AP_STARTUP support 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5feb890554b6fb2c37a4e9aca6e5e5a0a9743be2 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5feb890554b6fb2c37a4e9aca6e5e5a0a9743be2 commit 5feb890554b6fb2c37a4e9aca6e5e5a0a9743be2 Author: Ed Maste AuthorDate: 2023-10-09 20:13:50 +0000 Commit: Ed Maste CommitDate: 2023-10-13 14:13:14 +0000 dtrace: remove x86 non-EARLY_AP_STARTUP support After 792655abd64c EARLY_AP_STARTUP is mandatory for x86. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42139 (cherry picked from commit e49c7cd677df0b8691c828b55919ef37d8aad219) --- sys/cddl/dev/dtrace/amd64/dtrace_subr.c | 28 ---------------------------- sys/cddl/dev/dtrace/i386/dtrace_subr.c | 28 ---------------------------- 2 files changed, 56 deletions(-) diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c index ee57432bd2fb..09b820241e50 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c @@ -283,7 +283,6 @@ dtrace_gethrtime_init_cpu(void *arg) hst_cpu_tsc = rdtsc(); } -#ifdef EARLY_AP_STARTUP static void dtrace_gethrtime_init(void *arg) { @@ -291,16 +290,6 @@ dtrace_gethrtime_init(void *arg) uint64_t tsc_f; cpuset_t map; int i; -#else -/* - * Get the frequency and scale factor as early as possible so that they can be - * used for boot-time tracing. - */ -static void -dtrace_gethrtime_init_early(void *arg) -{ - uint64_t tsc_f; -#endif /* * Get TSC frequency known at this moment. @@ -329,18 +318,6 @@ dtrace_gethrtime_init_early(void *arg) * (terahertz) values; */ nsec_scale = ((uint64_t)NANOSEC << SCALE_SHIFT) / tsc_f; -#ifndef EARLY_AP_STARTUP -} -SYSINIT(dtrace_gethrtime_init_early, SI_SUB_CPU, SI_ORDER_ANY, - dtrace_gethrtime_init_early, NULL); - -static void -dtrace_gethrtime_init(void *arg) -{ - struct pcpu *pc; - cpuset_t map; - int i; -#endif if (vm_guest != VM_GUEST_NO) return; @@ -364,13 +341,8 @@ dtrace_gethrtime_init(void *arg) } sched_unpin(); } -#ifdef EARLY_AP_STARTUP SYSINIT(dtrace_gethrtime_init, SI_SUB_DTRACE, SI_ORDER_ANY, dtrace_gethrtime_init, NULL); -#else -SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init, - NULL); -#endif /* * DTrace needs a high resolution time function which can diff --git a/sys/cddl/dev/dtrace/i386/dtrace_subr.c b/sys/cddl/dev/dtrace/i386/dtrace_subr.c index 9c9143eb9dff..026581f5a899 100644 --- a/sys/cddl/dev/dtrace/i386/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/i386/dtrace_subr.c @@ -283,7 +283,6 @@ dtrace_gethrtime_init_cpu(void *arg) hst_cpu_tsc = rdtsc(); } -#ifdef EARLY_AP_STARTUP static void dtrace_gethrtime_init(void *arg) { @@ -291,16 +290,6 @@ dtrace_gethrtime_init(void *arg) uint64_t tsc_f; cpuset_t map; int i; -#else -/* - * Get the frequency and scale factor as early as possible so that they can be - * used for boot-time tracing. - */ -static void -dtrace_gethrtime_init_early(void *arg) -{ - uint64_t tsc_f; -#endif /* * Get TSC frequency known at this moment. @@ -329,18 +318,6 @@ dtrace_gethrtime_init_early(void *arg) * (terahertz) values; */ nsec_scale = ((uint64_t)NANOSEC << SCALE_SHIFT) / tsc_f; -#ifndef EARLY_AP_STARTUP -} -SYSINIT(dtrace_gethrtime_init_early, SI_SUB_CPU, SI_ORDER_ANY, - dtrace_gethrtime_init_early, NULL); - -static void -dtrace_gethrtime_init(void *arg) -{ - cpuset_t map; - struct pcpu *pc; - int i; -#endif if (vm_guest != VM_GUEST_NO) return; @@ -364,13 +341,8 @@ dtrace_gethrtime_init(void *arg) } sched_unpin(); } -#ifdef EARLY_AP_STARTUP SYSINIT(dtrace_gethrtime_init, SI_SUB_DTRACE, SI_ORDER_ANY, dtrace_gethrtime_init, NULL); -#else -SYSINIT(dtrace_gethrtime_init, SI_SUB_SMP, SI_ORDER_ANY, dtrace_gethrtime_init, - NULL); -#endif /* * DTrace needs a high resolution time function which can