git: b9a015bd0a19 - stable/14 - amd64: print limited EFIRT fault messages on first fault, not second
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 16 Apr 2025 01:39:09 UTC
The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9a015bd0a19dcc87a6d229e4918fdbb15a65f8b commit b9a015bd0a19dcc87a6d229e4918fdbb15a65f8b Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-04-09 23:54:23 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2025-04-16 01:38:33 +0000 amd64: print limited EFIRT fault messages on first fault, not second (cherry picked from commit 9227ecea6f4d4fc8a0ac9830a63eac6d79b5ce57) --- 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 1877aedee17a..2c3b8f0b4dd8 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -458,7 +458,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", @@ -897,7 +897,7 @@ after_vmfault: if ((td->td_pflags2 & TDP2_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");