From nobody Wed Apr 9 00:53:47 2025 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 4ZXPZz5g5yz5sFMJ; Wed, 09 Apr 2025 00:53:47 +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 4ZXPZz1DFWz3LkM; Wed, 09 Apr 2025 00:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744160027; 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=OOqrmLR3oJZmxkk4l6asenuh83qlazYpazQ2NFwRqUk=; b=L+/GMFNtYZv97rFiSFVQBzAsdzjqJqAaRmYqJaZO7uB+yo/JHPY8LOumuGD5s0mwFmjfZX ricQ0dZ2KDSUKqVmXGAInjrPa/lKzbq8ZDr3619fpYIWX9356RkMYj2h/YRF8b91JldsnT nWVi0O0xBn9ub37ORDgx5gSXFM+O0wwGKsPdVch7DrD9tMm0rroLr+/qWnpQ6p02IUJzFN MchQu1J/j7LJnY6jVtbNF9p6uFZctHyquQehQ2N3K8+d695zK2MFSXDdVvvBg2JaJ63gln 1IM3KjlhEOW6NjBk0pU3yf0JFEQP16juUMlV++545wfoZxYLprSScrND4QxRJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744160027; a=rsa-sha256; cv=none; b=Fc2fSaKemBcQdmTkEFqRd1m4rsTOuRj1WOLr1Zy2T1mkSmNLZfNmzR+Mazi5o/hJuIncyf Uka4upM2+/83qVcSnUNSURZSRKk/w/OBsNqaD3jP2q3TGBXe1ITMN9XYI34xwtpt9ZQk27 n1i8118hJzGOGJHIuJPRJUwV9pqX1xyPLo0CM/Ic1gyoRZgZ/Pe+7x3WsIu5BH36Uaoueu ReD1KI+Aa0EaDb+tcLf1Xk3qz7cc2uGE7QwObH4WGK59LaSlciVEDVoWV5jAgBmSq15nB6 ohttjitXee4HyRkZLENu/sQzfU+fHXkhnBSEaKo+FYDCan3rHIkz8SEJF1eEsw== 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=1744160027; 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=OOqrmLR3oJZmxkk4l6asenuh83qlazYpazQ2NFwRqUk=; b=ZXMyv91dDo3w57M3KEiv5fRXfj/prXVCrWvJ9Iy1CcYicF0B6f/zpRa2SWwdxOKqZyCIb4 TXhYii6raigEjitFB7e6CkyJnINLhT5eIhUrGSoSSORF+76PjqEqFqG1v0NprpQglgHDNk cD4qbPC08PM6FOQlYyV5rMeSarhv183EiBLUBchUVRypZmZRkFryoEYddwCpocqWYa/WTd FakefYQ6KP26nJ++LWSVa5Ot4B6RpYvVLqOtC+SfB/WgWtjglDaRmWDnrBq6/sRAnn/xvy OqVug6YV5Cvx03dLor+R2vBfmNgu3mqwOYafuzatxh/YF2sIf/Qm3lUw+85oew== 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 4ZXPZz0qhszw8c; Wed, 09 Apr 2025 00:53:47 +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 5390rlWB088422; Wed, 9 Apr 2025 00:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5390rlFk088417; Wed, 9 Apr 2025 00:53:47 GMT (envelope-from git) Date: Wed, 9 Apr 2025 00:53:47 GMT Message-Id: <202504090053.5390rlFk088417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e6a470ffcbd7 - stable/14 - efirt: add a tunable to disable printing faults during EFIRT calls 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e6a470ffcbd708cf404472bb871c2cb76eaa7b39 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6a470ffcbd708cf404472bb871c2cb76eaa7b39 commit e6a470ffcbd708cf404472bb871c2cb76eaa7b39 Author: Konstantin Belousov AuthorDate: 2025-03-31 18:38:36 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-09 00:53:17 +0000 efirt: add a tunable to disable printing faults during EFIRT calls PR: 285797 (cherry picked from commit fd748c7d5b7aefbeda604403f203637b12ae89df) --- 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 7f1175da41df..692491ecfc5a 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -165,6 +165,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. * @@ -453,8 +456,14 @@ trap(struct trapframe *frame) */ if ((td->td_pflags2 & TDP2_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 fdcb7e708daf..9f792332a931 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 1fb9b3bb01d1..4e630a5dde37 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)