From nobody Tue Nov 15 14:17:51 2022 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 4NBSv40ZZZz4dMS4; Tue, 15 Nov 2022 14:17: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 4NBSv371lPz3M38; Tue, 15 Nov 2022 14:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668521872; 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=T9iis53ScOnIdjgntPD1vwp1U8rg8yz/C88l/pLHudc=; b=aq8VVzffoiVFkqr382DO7YReJeehRV7DSSGSdFrNUpJZuO9YCu284+JyzJnBgyYYpbxzBf xmq9jnXFAqC5L59SF3ZK2HOdGP04z/xm48TB6zR7huxjXR2JW9ipjr1BDktjMTI447qKyZ o4CLMafl+SApinlQJG5PPlF5aFRprBfCPJb2QMHnbnd1WrRzRnCDKOvNw6iIMMLkGmeVCD Q26UMuJfm85eVQ6v1yAkHHp1bBX1jTUS3S4bhrnsnRRvY+Tk2fFlJFEBUCrXt+Bc4urVe4 PNAnKDgI8kTpKYjUoMwof6Ki6187zhNF/Il4ZT1kUIodVb03IBwPOrkwrlHK6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668521872; 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=T9iis53ScOnIdjgntPD1vwp1U8rg8yz/C88l/pLHudc=; b=AltRf0Lg56JKBOPih2lZ2aAiWni9OGoSQBdCsng+MbDtJrKvl6RdVnbZSop6aXwGU6bf1w 4eqsGYhqD7bkDrQ9r1HV8siO7wSbCuEhFRk8fToSM6xCoeTzkNaTtAqTaBL9ZLM/aNC0pJ KzdEw/XO5eeY7+lwnG/qgT8cXB7LarXBokJ8YGMO/TznPtA/WYt5mEnvL2jG/npVezc4Vn HQxt/3FQdpiHpkoPaFHfGmbgOLTI17roRW5JD12qw00LANTC6eeX7QgOp0yZUcuImHeFMY 4FSmwY56v9ZAiIKvCRKkzL09BBwCbfDjGdg6HqDw7iPeD2ryFNfHCgJ0ZAW29g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668521872; a=rsa-sha256; cv=none; b=gFQ/NZ3kq2QauDoZfP/rEPcA3OeYo9hcPamwzvr4XqiQ2d774kM2fegX+tWkGnMeRfYKL3 JCMkW3LK+bCDA6ujqVs4d9T8qyGWD9RCWrMiOi9chNURBbfjsivV5+gN9szPBbjb2MSZpk Dds4bcOPeHNcvcVPQQ4ynzi/9iuE2TzJ7ED7K0TMb3BLi4dx4uUJ/uzJp1LVjTqM9JG1C7 LdI1oB4kgYNrlGiRVEu6j7qVhoTAaygcOf3SFJK3IWX5eGlqmlLBUh7KP0TdmQGQ0Vi4sC 76MOw25G5kiF9o89BXtRsWNFWVa/7ncEDiD7oniNuy8yS6AIhoEqLbTb1fzX0Q== 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 4NBSv35vq0zQ6l; Tue, 15 Nov 2022 14:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AFEHpMs029747; Tue, 15 Nov 2022 14:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFEHpQu029746; Tue, 15 Nov 2022 14:17:51 GMT (envelope-from git) Date: Tue, 15 Nov 2022 14:17:51 GMT Message-Id: <202211151417.2AFEHpQu029746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: c3f1a13902c1 - main - Retire broken GPROF support from the kernel 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3f1a13902c15f350d59335e99c8945e515a915c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c3f1a13902c15f350d59335e99c8945e515a915c commit c3f1a13902c15f350d59335e99c8945e515a915c Author: Mateusz Guzik AuthorDate: 2022-11-15 10:56:13 +0000 Commit: Mateusz Guzik CommitDate: 2022-11-15 14:17:10 +0000 Retire broken GPROF support from the kernel The option is not even recognized and with that patched it does not compile. Even if it did work, it would be prohibitively expensive to use. Interested parties can use pmcstat or dtrace instead. --- sys/amd64/amd64/mp_machdep.c | 3 --- sys/arm/include/asm.h | 15 +++------------ sys/i386/i386/mp_machdep.c | 3 --- sys/kern/kern_clock.c | 22 ---------------------- sys/kern/link_elf.c | 11 ----------- sys/x86/x86/mp_x86.c | 3 --- 6 files changed, 3 insertions(+), 54 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 2ed3a57866a2..f41e8dafcc86 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifdef GPROF -#include -#endif #include #include #include diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h index b346f50ca210..72bf244c449a 100644 --- a/sys/arm/include/asm.h +++ b/sys/arm/include/asm.h @@ -69,15 +69,6 @@ #define _ASM_TYPE_FUNCTION #function #define _ASM_TYPE_OBJECT #object -/* XXX Is this still the right prologue for profiling? */ -#ifdef GPROF -#define _PROF_PROLOGUE \ - mov ip, lr; \ - bl __mcount -#else -#define _PROF_PROLOGUE -#endif - /* * EENTRY()/EEND() mark "extra" entry/exit points from a function. * LEENTRY()/LEEND() are the same for local symbols. @@ -106,14 +97,14 @@ #define _ENTRY(x) .text; _ALIGN_TEXT; _EENTRY(x); _FNSTART #define _END(x) _LEND(x) -#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE +#define ENTRY(y) _ENTRY(_C_LABEL(y)); #define EENTRY(y) _EENTRY(_C_LABEL(y)); #define ENTRY_NP(y) _ENTRY(_C_LABEL(y)) #define EENTRY_NP(y) _EENTRY(_C_LABEL(y)) #define END(y) _END(_C_LABEL(y)) #define EEND(y) _EEND(_C_LABEL(y)) -#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE -#define ASLENTRY(y) _LENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE +#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); +#define ASLENTRY(y) _LENTRY(_ASM_LABEL(y)); #define ASEENTRY(y) _EENTRY(_ASM_LABEL(y)); #define ASLEENTRY(y) _LEENTRY(_ASM_LABEL(y)); #define ASENTRY_NP(y) _ENTRY(_ASM_LABEL(y)) diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 98d716027060..9a8e82c5fc52 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -51,9 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include /* cngetc() */ #include -#ifdef GPROF -#include -#endif #include #include #include diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index f155d2da7e04..b8122b7d6468 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -74,10 +74,6 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef GPROF -#include -#endif - #ifdef HWPMC_HOOKS #include PMC_SOFT_DEFINE( , , clock, hard); @@ -775,10 +771,6 @@ void profclock(int cnt, int usermode, uintfptr_t pc) { struct thread *td; -#ifdef GPROF - struct gmonparam *g; - uintfptr_t i; -#endif td = curthread; if (usermode) { @@ -791,20 +783,6 @@ profclock(int cnt, int usermode, uintfptr_t pc) if (td->td_proc->p_flag & P_PROFIL) addupc_intr(td, pc, cnt); } -#ifdef GPROF - else { - /* - * Kernel statistics are just like addupc_intr, only easier. - */ - g = &_gmonparam; - if (g->state == GMON_PROF_ON && pc >= g->lowpc) { - i = PC_TO_I(g, pc); - if (i < g->textsize) { - KCOUNT(g, i) += cnt; - } - } - } -#endif #ifdef HWPMC_HOOKS if (td->td_intr_frame != NULL) PMC_SOFT_CALL_TF( , , clock, prof, td->td_intr_frame); diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 2c86c99452f8..5f0649d7540c 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef GPROF -#include -#endif #include #include #include @@ -1180,14 +1177,6 @@ link_elf_load_file(linker_class_t cls, const char* filename, segs[i]->p_memsz - segs[i]->p_filesz); } -#ifdef GPROF - /* Update profiling information with the new text segment. */ - mtx_lock(&Giant); - kmupetext((uintfptr_t)(mapbase + segs[0]->p_vaddr - base_vaddr + - segs[0]->p_memsz)); - mtx_unlock(&Giant); -#endif - ef->dynamic = (Elf_Dyn *) (mapbase + phdyn->p_vaddr - base_vaddr); lf->address = ef->address; diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index 61b08dd1ee97..da5c7f52f955 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -47,9 +47,6 @@ __FBSDID("$FreeBSD$"); #include /* cngetc() */ #include #include -#ifdef GPROF -#include -#endif #include #include #include