From nobody Mon Oct 27 03:07:45 2025 X-Original-To: dev-commits-src-branches@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 4cvz2p1xYsz6FF9V; Mon, 27 Oct 2025 03:07:46 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvz2n4vsSz44Mv; Mon, 27 Oct 2025 03:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761534465; 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=bcEnuGvBYSnquIOnEeQDf8i7S96NkRmO1o4/oNB73LM=; b=osCipIwYAo694dUkEZeWtovo9O8KDzmkISNyYZTiHVgw6SZg2fAjJ3N8/O3KurKeEmL8zo AzCoSszNJRs4XcwM4OInMpEhsKU6/SGxFWhSnmv9ea60WyxCG2Bhhu2HlNqW8nrdR15cQO nOTLEPWY9a1xBCQGvwe4zGQqIJhJXqJ/qIcePrjl/cNgUYXgj0M1cxiuaaNH8UySJqurfg AA6CtEV4dAaRveeqrdVznSdT+rFt0ukzMUAET2TaQTd3MMihQnCubIMZI0rzsf6BYyPlGv vwaw6qkO7ZFG59XgqBZpjFsxiKpwRP4699l39LR+8LiuO7XOl8rHCxlP5sHfDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761534465; 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=bcEnuGvBYSnquIOnEeQDf8i7S96NkRmO1o4/oNB73LM=; b=xK6nhlGuQSz97LCebyV/uwOuNZeGX6iC27HVjZuzNwAtBReUt5J51VVPCTLn79yLKgKi7t 1FemMOZUWfA9D1K5C6mRWICHgsl2KHJpNl/mpMS5cPkn17vFbSSo7LpPmVK8LBYg0jJajn nfNYKXaJHDLFlnf7uOjt/HE+26E2PCGN9zMSBj0l/osLVREUPMD/BWi6GPGobs3Ri7PUeW 1qfWgHUKTyMb2v4TRrRy4gdBpenxXsEZrKIfEVSUp3xdhxNn05NSGIwYyu8ilJ0MaNscyL QJhqhAocx1/Lu8Py5cXB7FXn7CLfcmyXzTHldB9EEfVrOMoh8DQT4K+Yp7dOvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761534465; a=rsa-sha256; cv=none; b=brBNLqxi/tKYD9wbMVcdYzd0Vtka91pv1JfDUZtMviXF6cWCaxs6fdOss2PIkfkh80Y73i aMYOzwQbb4a/JIFWbMw89LLyzf5TUoRMBadIYUfbbcREe7bMYEqLBF8T2No/VjaDeu7DL3 aTfR6j7t92uikCSkGRjOq9ok7BoB5bwE5+k90yYta2ZoLUU95mGafCeTayOnmbWpZ8rG1W 1U5wMfom+6H4yOMu4ydOcIEkujKumbheRYi6jEHg94r7HmrXELqYKObegmM1IWjZIjP2oT /SzYnirNosgufj9tRBp9y1mOmddygKuZpJOSasq9moXwUel7+iZiV2zxf59eHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cvz2n49Kgz11c0; Mon, 27 Oct 2025 03:07:45 +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 59R37jom061941; Mon, 27 Oct 2025 03:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59R37ja0061938; Mon, 27 Oct 2025 03:07:45 GMT (envelope-from git) Date: Mon, 27 Oct 2025 03:07:45 GMT Message-Id: <202510270307.59R37ja0061938@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: c412af68cb60 - stable/15 - amd64: print 'EFI RT fault' line before fault CPU state List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: c412af68cb60f54fdbc29eb09e35869ed07c93f7 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c412af68cb60f54fdbc29eb09e35869ed07c93f7 commit c412af68cb60f54fdbc29eb09e35869ed07c93f7 Author: Konstantin Belousov AuthorDate: 2025-10-24 09:39:13 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-27 03:07:18 +0000 amd64: print 'EFI RT fault' line before fault CPU state (cherry picked from commit cfb28c5ea0bce2ce95b14076bc63546049f0c16c) --- sys/amd64/amd64/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index f3469ed5e2bc..84305ca918df 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -435,9 +435,9 @@ trap(struct trapframe *frame) if ((print_efirt_faults == 1 && cnt == 0) || print_efirt_faults == 2) { - trap_diag(frame, 0); printf("EFI RT fault %s\n", traptype_to_msg(type)); + trap_diag(frame, 0); } frame->tf_rip = (long)curpcb->pcb_onfault; return; @@ -870,8 +870,8 @@ after_vmfault: if ((print_efirt_faults == 1 && cnt == 0) || print_efirt_faults == 2) { - trap_diag(frame, eva); printf("EFI RT page fault\n"); + trap_diag(frame, eva); } } frame->tf_rip = (long)curpcb->pcb_onfault;