From nobody Wed Apr 9 23:55:50 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 4ZY0Fg1NJRz5sZlg; Wed, 09 Apr 2025 23:55:51 +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 4ZY0Ff72tDz3ntF; Wed, 09 Apr 2025 23:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744242951; 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=7/Uas8pqEp1h3r+7JI2jofNniSC2tbAOF5m9taWM3lM=; b=mK3KA7viTUOvYTNsGasHkJkZm8m8OAvNY0UHfvgVzDVZfjfs+qDKQx30Po9xjzwcIswWjG StW4GqXWpsXk4bOdILjXEYVDRzlddptfY5IkQ2atJIexONm6ShHBn1vaLmwYru0cHR1Mem vYOEAFMM1q9skhFS5S1v2kcJ1hTJb+OpWFh5TmLFVbLVXBbJY04qWef3r0Tu+wA+3TTX+O OHD+jnxgWfGMMmYcLcfPIV8QFzwZ5985jZ8xg2Bj2l2TWbllj5dMLrd+ibbMkkPfOd/2Ix yA+O7WBTswoUYs2gfVWSDKnatKcQgGMRma9gFo2TkqDB5M/nb1C6mj59WzFK4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744242951; a=rsa-sha256; cv=none; b=k1CUYHcoSunYnQTWVwNmkYRNpyhTOex2cG2entglzv+okCEnU3l2OP4dL3OvbUTIsBennJ T59sFEpPjF4Md4L7Naxc9+IYd7MKrq5sNA26898Sk0liHnspeATyjqapckeWAWd/YObDQM wHAG4OoRAf5RP9yRDjMtr7hScuyp6gpauBhkNGr7jWGUIUouxytaBxFxNp58+oEJs5c1X3 l6daRMVsgsJ7ogm/xFl39XqAqK2aaIQ23eew4A3nHRReYUKNJhYLUXpTkMQClTlfagItMQ k7Fevb6L6ksoAkFWIqcEu4f4rYDPGdnzr7Bg/u00AqndpA5+B7+cVlmGfX5GMQ== 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=1744242951; 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=7/Uas8pqEp1h3r+7JI2jofNniSC2tbAOF5m9taWM3lM=; b=iCfT5goOkSCJXVgpOfHTPo4Shu/P7Rr8JMItGPa9FTBnLKy2BI5WOHnh31e8iGjIVkImVf vkCGnh9criRo09wWT8EQA0GbWppJLmFEdDOVqSXdzI29dcFzWzHqoPv9lFwBzSWk9rUGlo nsbXfZAohiaHT8E5EAjfT8MxKBzt0lDmnEaFPy6o1upbHlBdv3JvvQV+TNJ5CUHanjEgHy sibp4efdDF8OnX84bwKhbB/X/bF9UbfCEO7/m6bN9UUpHurh8sxh0oZ5YFKdSHMkKTOcIs nGmxYOKbWIX9zBHm13hJend/bQDxuP8cPXluuzLbfef+dSD+CDjohd7WTR4uJg== 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 4ZY0Ff6fZMzfY9; Wed, 09 Apr 2025 23:55:50 +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 539NtoDF074622; Wed, 9 Apr 2025 23:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 539NtoCl074619; Wed, 9 Apr 2025 23:55:50 GMT (envelope-from git) Date: Wed, 9 Apr 2025 23:55:50 GMT Message-Id: <202504092355.539NtoCl074619@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: 9227ecea6f4d - main - amd64: print limited EFIRT fault messages on first fault, not second 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/main X-Git-Reftype: branch X-Git-Commit: 9227ecea6f4d4fc8a0ac9830a63eac6d79b5ce57 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9227ecea6f4d4fc8a0ac9830a63eac6d79b5ce57 commit 9227ecea6f4d4fc8a0ac9830a63eac6d79b5ce57 Author: Konstantin Belousov AuthorDate: 2025-04-09 23:54:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-09 23:54:23 +0000 amd64: print limited EFIRT fault messages on first fault, not second Noted by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 a400b8a2c022..09ac0a67dbef 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -436,7 +436,7 @@ trap(struct trapframe *frame) curpcb->pcb_onfault != NULL && type != T_PAGEFLT) { u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); - if ((print_efirt_faults == 1 && cnt == 1) || + if ((print_efirt_faults == 1 && cnt == 0) || print_efirt_faults == 2) { trap_diag(frame, 0); printf("EFI RT fault %s\n", @@ -871,7 +871,7 @@ after_vmfault: if ((td->td_pflags & TDP_EFIRT) != 0) { u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); - if ((print_efirt_faults == 1 && cnt == 1) || + if ((print_efirt_faults == 1 && cnt == 0) || print_efirt_faults == 2) { trap_diag(frame, eva); printf("EFI RT page fault\n");