From nobody Wed Apr 16 01:39:09 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 4ZckG62gwvz5sl68; Wed, 16 Apr 2025 01:39:10 +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 4ZckG56TBGz46Wq; Wed, 16 Apr 2025 01:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744767549; 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=tFVxTnNXqFlHu+412wWRxL3HmJ0TDpnmNgauiOMkrzg=; b=cjzlTYG7D2e3AmGWotGAchA7Qn8/wHiKEkPLgxFbY3tfOuuijsnwfv5EN3mKR3ETPSVcqD osmxVo6o1HLBLAjuCyIpE95rCPB5Y6sQAy5CC1xdWrHvNxh4+55yYDkUF3azWWf4VmunEC zZMZ4F06WNL3nNKaV2J0qCHtQUtT+cTF10Naht8+XQL+3GuXo8g/FRMZw00fE9TCj8qCV+ kEvxcNwc342nBdzT14cXQ/fEvwZDlsRfguHyoEqqENzTYxrtVeh81ln8cCuQwdDHBfdS5j vE0iy1CgtKlzxU/aN89wgOueJNti+8wcAdf7TkH1hXrRuchcL5XR1GXFerve/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744767549; a=rsa-sha256; cv=none; b=GxgqOvNNvzpED577bHn1/SssX4Ayd3kxAkpSniwV3nOF3fkTqWU5cBouFYfb72bFwKniwS HGTFjtJy1m9DoOyJP8Pb8jXs2iWSHH4aeDRU0SR7Z8RBxYL9j+cx28zjQBy9YjQPHSbpy+ 88bKHObAqaumfkXbXdtOmZlGrcseBN4WJ94BGWgdk5D0D7Jp3Gm9JoO1VtI4nuXYQc0zFG 4BlwpbsFS9FKRfODfUR0D4Lif0CZCRCtHBVHvDlqUlznaR2AxSDg6heoTugNdNMw8TTzkL F3deM0ZuULy8FXmMYJ/4xEO1ZRjSc3IY/Cc87a9iuuq6iLGWTqmJ8Pu3JEk+AA== 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=1744767549; 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=tFVxTnNXqFlHu+412wWRxL3HmJ0TDpnmNgauiOMkrzg=; b=xJ1TPMwf7PyfPklGRUxCJ7dwgzm30FKcEzaKc+BSbHgWHPUhNiRxM9xn2AU6LvIGkNWHbm oy29A10/dMjp2xxdoWHp66hV7tGv3oWRm5MPnztNdtgZ5LkV2FAUc+SMKMGFZxgqcB3xeb qQLnEc/XV0YRG2NKit0KugxvZ6V+e+yCuNZLQ45er7UvDjW5AQbDBt3RfgpiKBc7IcmTFn ilGPu3WUMCYINIw9bsir73Jdc0d/Q4sZVx48/Nm3+wlTp3WgQIQCSR4geazlwm7pVN6SXF aoJICAUSFV1XCguh+eo8asSVqP4NcZsX3op4tqzQL5F0reveQKBZOjQAZFkrqQ== 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 4ZckG563ttzy3Z; Wed, 16 Apr 2025 01:39:09 +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 53G1d9Mv020007; Wed, 16 Apr 2025 01:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53G1d9Gu020003; Wed, 16 Apr 2025 01:39:09 GMT (envelope-from git) Date: Wed, 16 Apr 2025 01:39:09 GMT Message-Id: <202504160139.53G1d9Gu020003@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: b9a015bd0a19 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: b9a015bd0a19dcc87a6d229e4918fdbb15a65f8b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9a015bd0a19dcc87a6d229e4918fdbb15a65f8b commit b9a015bd0a19dcc87a6d229e4918fdbb15a65f8b Author: Konstantin Belousov AuthorDate: 2025-04-09 23:54:23 +0000 Commit: Konstantin Belousov 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");