From nobody Wed Apr 02 20:22:13 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 4ZSbrP2zQtz5rYgZ; Wed, 02 Apr 2025 20:22:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSbrP1mHmz3XKs; Wed, 02 Apr 2025 20:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743625333; 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=drQHqDoMXmg4e2ENtrd3IrgKGXMdHfoDtTWZOEIKWtM=; b=VfLS/GsGNjAkikGYPCYfZxfyfNdqMddsXUeLFYJlYon6fefoZr8Pg5JwWyNhSVtW0TEHkj ugV+CIRDIUkVLMKFuiQfjrQkIxoPgvCUuSJN0yeUA3HSSBm0Bof8dOrIgt/3RKcWhnWtQN 94uqgW6P6V5p8dxVJzA29HfevFFzB0aD73WYbUO6wc1f0qNoGPppGGBvNyonVQEQbUK9yM 73fRwH6K/XxjrpZ6Ge5Ab5fhk3AyReofRRnbQeNLZnOOQIDbiAAgplR8g4Jygh+mre3Tyd 8ipQUzo4fuL5T+zRUEPLghnl4/l0MjGZ0UPz/7apR8hRLv+F1soq6YzLVyojEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743625333; a=rsa-sha256; cv=none; b=PL5WS/NKT82xRtTlOf1uxFxWTA+CY8CUVrketnbxnJ6YWa58tx/F3mxPXyxW3kJ8H+k8df oWCmD1as6E0bdJvP7ufL2kHdR0oulpQslFo+jLKTwIrFmYC/A+O/7EDv2c7OMl/pme57OT UOgJ7KZMbiiox2P2uX1r+vd8lPRVpYDaALyWyCto20APTvsagA4/BaSjbWchyrVVmW4p71 C3MfSeIZ7bi+q3VCOTucQOaQ1GotPQt5KtQrfKznJTAPOAL1MO2sH0CEbGz4X3DnKXAE39 S0Sr/00o4hYIqEWS7y2HViqzdbeUM1zazGdA+PWjq08tT79uPwhirPEPhDID4w== 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=1743625333; 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=drQHqDoMXmg4e2ENtrd3IrgKGXMdHfoDtTWZOEIKWtM=; b=nwrttG+H2LpQf0/99iPuPXirfFxv5BzbswzFvhSDmFf+VubRHeG8yamVYCTiX9GUQphKno V4VbGHykFanQCyIatlC/mfMYEvNNDdvOeu7E3yBbCXc1Xa6UoFE7fg5fRzeKKqINrBrfRM a8LpMYvHDeMImKOppPO2TdI3paSCHHCtyOkt6aKjDkHCUqvXtYwMhNx0CznN+g1+Qbd6ni avBtHAP0uA47yxQSRGQ2E9Gp/AxXZWHwGFpK+IsaoAomd/A02fQN+5PV8Dxh6cY4xjVHoI eiZ1uSgN6LM7yBPvVfFvzNXX5qCw4ZpxUtPk04e9+Hjmubda+CzA4OIWf1sndg== 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 4ZSbrP1BC5zWs6; Wed, 02 Apr 2025 20:22:13 +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 532KMDrR042026; Wed, 2 Apr 2025 20:22:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532KMDWu042023; Wed, 2 Apr 2025 20:22:13 GMT (envelope-from git) Date: Wed, 2 Apr 2025 20:22:13 GMT Message-Id: <202504022022.532KMDWu042023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fd748c7d5b7a - main - efirt: add a tunable to disable printing faults during EFIRT calls 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd748c7d5b7aefbeda604403f203637b12ae89df Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fd748c7d5b7aefbeda604403f203637b12ae89df commit fd748c7d5b7aefbeda604403f203637b12ae89df Author: Konstantin Belousov AuthorDate: 2025-03-31 18:38:36 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-02 20:21:56 +0000 efirt: add a tunable to disable printing faults during EFIRT calls PR: 285797 Reported and tested by: Bakul Shah Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49592 --- sys/amd64/amd64/trap.c | 13 +++++++++++-- sys/arm64/arm64/trap.c | 3 +++ sys/dev/efidev/efirt.c | 11 ++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 8e9b115ef224..1041422b9f92 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -163,6 +163,9 @@ SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RWTUN, &uprintf_signal, 0, "Print debugging information on trap signal to ctty"); +u_long cnt_efirt_faults; +int print_efirt_faults = 1; + /* * Control L1D flush on return from NMI. * @@ -431,8 +434,14 @@ trap(struct trapframe *frame) */ if ((td->td_pflags & TDP_EFIRT) != 0 && curpcb->pcb_onfault != NULL && type != T_PAGEFLT) { - trap_diag(frame, 0); - printf("EFI RT fault %s\n", traptype_to_msg(type)); + u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); + + if ((print_efirt_faults == 1 && cnt == 1) || + print_efirt_faults == 2) { + trap_diag(frame, 0); + printf("EFI RT fault %s\n", + traptype_to_msg(type)); + } frame->tf_rip = (long)curpcb->pcb_onfault; return; } diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index d612905b77c8..fdcc38cd9a31 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -85,6 +85,9 @@ static void print_registers(struct trapframe *frame); int (*dtrace_invop_jump_addr)(struct trapframe *); +u_long cnt_efirt_faults; +int print_efirt_faults; + typedef void (abort_handler)(struct thread *, struct trapframe *, uint64_t, uint64_t, int); diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index 5dff2258725d..9523ffc7f386 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -123,11 +123,20 @@ efi_status_to_errno(efi_status status) } static struct mtx efi_lock; -static SYSCTL_NODE(_hw, OID_AUTO, efi, CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, +SYSCTL_NODE(_hw, OID_AUTO, efi, CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, "EFI"); static bool efi_poweroff = true; SYSCTL_BOOL(_hw_efi, OID_AUTO, poweroff, CTLFLAG_RWTUN, &efi_poweroff, 0, "If true, use EFI runtime services to power off in preference to ACPI"); +extern int print_efirt_faults; +SYSCTL_INT(_hw_efi, OID_AUTO, print_faults, CTLFLAG_RWTUN, + &print_efirt_faults, 0, + "Print fault information upon trap from EFIRT calls: " + "0 - never, 1 - once, 2 - always"); +extern u_long cnt_efirt_faults; +SYSCTL_ULONG(_hw_efi, OID_AUTO, total_faults, CTLFLAG_RD, + &cnt_efirt_faults, 0, + "Total number of faults that occurred during EFIRT calls"); static bool efi_is_in_map(struct efi_md *map, int ndesc, int descsz, vm_offset_t addr)