From nobody Sat Apr 19 22:42:10 2025 X-Original-To: dev-commits-src-main@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 4Zg6832NxZz5tb84; Sat, 19 Apr 2025 22:42:11 +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 4Zg6830jj0z3tdy; Sat, 19 Apr 2025 22:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745102531; 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=9UI5m/gOgUNkoC1TMzIt/NqiHRsq0VPVoHK4CugYlow=; b=l1L7RQw1vyN0Taswo2JNysWPMKyqKzdnzo2eKfKBtTvWgXdUXcHfXSMC8k1j+9bfTqNuFB sPdPWAWB1GUEqohMW0DxVy7/w9vdfm67GIED54GlCpKWSx+7SkobWDeT1Bok7K+tiZWIZS H1rJwGG/Ex6xaDWjXJyojdtNhT+YiOMbYGiOXAOoQJofLy/OL7SSo/y4pVWrblZDGqs+/4 XhNi170sgY0CbCo4C1y3u+IPrhZvm4WvyzPiBjpSG0tLJjQWE5CxNa7owHpRP4zGgi1QoC W5x4ioWXkIE8nfxhR1tCyjOc1sAfEIHRd9dXYjDXN75jVcKfMdlEV9/p894q8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745102531; a=rsa-sha256; cv=none; b=cLxTwWHxIDj4dq1Jhs73zLP9aK1f/QiWpJCXzgGYEJWEdEbV+QPbrEEj3gRuygHl8mqmzh 1bfiQ4P4pVyRu5cyhICTb0/e5OEu84DIg0GngqVFTRdBqH2/7J1OwY8dwdo2FekcJdxCwe JDaTNFYUmJP43396AuTMmVT5tkQBrNd/cyy+qYNfqh05/aLwI4TdA5WiC5MWTlpfDG4gQV vqKazqhj0TJ69/KKsKQ5MK8UsA+Nd/UDplwmruFvYF4Iylc/J8wsv3S0T1JLTiVfxzbRFO 1fkDKJN1OxQ3IFSVpg4lLJIxEi/KEkxEq7JdMkbq38uViVp/D51KTT421WFYDA== 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=1745102531; 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=9UI5m/gOgUNkoC1TMzIt/NqiHRsq0VPVoHK4CugYlow=; b=grvou5Ik0KY+lr1ElW5eLzOxw1/dZmPykDn7B0a5ea97unPHf4Tnstnzl3R4yEZESPIFBz PPkgB8HnqihSKHnNpoVSZhH2GZBKwVoCdGKBshxBtdqquidpuUYRx2dguOnsGRcKdMCRvf SvHr2sRjK22SRPQMhlRLHsZapift+6CyJosLrJSBLfyQp5AoH/upUS88WP/ImTHmQdMvuo Wyk5DsVt3D7EP3frauOeaEbB5wa6yHFpSThFDY7u0thz8j+cv0aDRAoLj5Ob4RP13CK6xS SiS7nXE6R/hwxrznycEbUy08M3M64Nn7KCLnUBtLt0agBH4dsKanPRj1ne8BSQ== 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 4Zg6830HB4zf4B; Sat, 19 Apr 2025 22:42:11 +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 53JMgA2B000881; Sat, 19 Apr 2025 22:42:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53JMgAcF000878; Sat, 19 Apr 2025 22:42:10 GMT (envelope-from git) Date: Sat, 19 Apr 2025 22:42:10 GMT Message-Id: <202504192242.53JMgAcF000878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0ca5e3dd1ad0 - main - riscv: Fix handling of interrupts during kernel page faults List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ca5e3dd1ad006a5251a391676e90ec4dc94df20 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0ca5e3dd1ad006a5251a391676e90ec4dc94df20 commit 0ca5e3dd1ad006a5251a391676e90ec4dc94df20 Author: Mark Johnston AuthorDate: 2025-04-19 22:41:07 +0000 Commit: Mark Johnston CommitDate: 2025-04-19 22:41:07 +0000 riscv: Fix handling of interrupts during kernel page faults We were checking the wrong status bit when deciding whether to enable interrupts. Reviewed by: jrtc27 Fixes: c226f193515c ("riscv: Permit spurious faults in kernel mode") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49897 --- sys/riscv/riscv/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index a1a30eb58220..d6df1245a24e 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -239,7 +239,7 @@ page_fault_handler(struct trapframe *frame, int usermode) * Enable interrupts for the duration of the page fault. For * user faults this was done already in do_trap_user(). */ - if ((frame->tf_sstatus & SSTATUS_SIE) != 0) + if ((frame->tf_sstatus & SSTATUS_SPIE) != 0) intr_enable(); if (stval >= VM_MIN_KERNEL_ADDRESS) {