From nobody Tue Oct 10 15:04:44 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 4S4fMJ6NLYz4wsl1; Tue, 10 Oct 2023 15:04:44 +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 4S4fMJ5s14z4Tg8; Tue, 10 Oct 2023 15:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696950284; 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=sN4i2IKzUsj/PBKI90dNcTRy7EXSpVy5hb7sUIZ4BBk=; b=wjkoLK/pLi6Mb0DgjgTg0/LWCi0dgS4Ip0bCgzKYOMuL7O2TFIL9aW8yUEtGlhoPtYzBBl CyRWFjkYzUvq6CF2kH0A84O0bYNxOdXpHMrg4FET4eXQPAH2hGkO6nSqux2vFyAWq67bQG +HFJPb0Z77qQwmXuFY+Mls9Uy+CCs4qLeuEjRaVFcp7etAACHNabawqjhdV3+Hqle5l8F8 TARE1oDZvDFOFnLf53CcIkfGnA+UKMjsboPwgju74OYE/I12zvzWblnDtFb8i9yRBHO2bd wf3TllEJJjIRWsTBox3KIhDkRyWYK414+vKAIylk8asDmg9jSv3jKlJ2YC7Dnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696950284; a=rsa-sha256; cv=none; b=LgxTPivb1PWKiT4WJNS+rj2sJ3/wdvsPqThGOrZES0+W/wAOqabBAN6hJvOcyDVx/ajPaz 2Bq49rE4zis8aswBDKrnHeKVXIIYqFSAPDlG4gie/tbZgIPUsX6el9mQ4FLUwHrNkZdNbo lyQQBcaJOJ8AepVlSBWVWg/V5e9IsBZ9SbFIjr9Xmwpk9WEbmpySQBULETJkdDmXy4sLfr 7teslzTwu43jmkFUV05eykijNgnnDixq1mvjbkCNmkMmlSgLOu2zMiygdcvc8DtOnSsqIy gh+QmnF0UkcOCWf/Lh7iZtn+6VRAphDLdDGQuoBNZdx3tP6AZQETZRQQ4md8ZA== 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=1696950284; 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=sN4i2IKzUsj/PBKI90dNcTRy7EXSpVy5hb7sUIZ4BBk=; b=I8YkvoDKN50/2MSSUgNQ9b4qh5zZjBMMTOnlP2SUKDV/3p56O39eJ8gZR7ID0bRRWVXsky maon8a/9FvQyWF+j1X/YmCvfw8pP3iMGJq3hj8ZfolifvFm2+mYYbrEcBdEiwGKRWsIviB L8ODKVynbnJ22CKDEsuFy0vYk+eB794vmql9SSAr5NLpnZbwiI3mA1O79gO1qnV4YiaA1r fPL5T7Xik1gqdwHtZMzALx6479ypMmRm0xTfWrHl3kzkOmsAAf7ch1B+jJqKEl+9GOdIFF 8V4XqzyKZxGG8bDRAYerQSn4SVIcfLIzeR6NbnCC7wntlvUxx8mSYMmxY8g12w== 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 4S4fMJ4wszzjT4; Tue, 10 Oct 2023 15:04:44 +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 39AF4ibl055789; Tue, 10 Oct 2023 15:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39AF4i9U055786; Tue, 10 Oct 2023 15:04:44 GMT (envelope-from git) Date: Tue, 10 Oct 2023 15:04:44 GMT Message-Id: <202310101504.39AF4i9U055786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e49c7cd677df - main - 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/main X-Git-Reftype: branch X-Git-Commit: e49c7cd677df0b8691c828b55919ef37d8aad219 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e49c7cd677df0b8691c828b55919ef37d8aad219 commit e49c7cd677df0b8691c828b55919ef37d8aad219 Author: Ed Maste AuthorDate: 2023-10-09 20:13:50 +0000 Commit: Ed Maste CommitDate: 2023-10-10 15:03:27 +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 --- 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