From nobody Tue Apr 29 00:47:54 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 4ZmhVz2M42z5v88d; Tue, 29 Apr 2025 00:47:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmhVz1JXtz3nqG; Tue, 29 Apr 2025 00:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745887675; 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=P7o434SegOKqwj2LZvdmuX9Hm3iq28cfDUax03WDEV8=; b=JGeCJ/e0on5Isu93rFukFatMVTQ6H0yi4vBbPVRbsxEsPvpUYV6samq3nUz4B8WGNjS0Wt WUnv1WVAdV7jY6ecPbtfTpFgfccaomgKfQPDFlfhSPIqQXJGc7THgA47gEjQtmrlw9SaUQ 47bCEc4mSDdGmppz+JOWOXlncXo7xVHHF3cKBoY59f8W6mzR4wBWveMcOW/nqz+oapeR0Y 8yuVWHDjkbA+B5DJ0mO8NsgsZU//l9gzrx2ibkbvAl/3K3iYio1Ox5p5qR2PszD+gUQA+2 VQGv9kZuTd5L2yE56mPM5rm+1br1mAhb3s61pokBI29Wjd+7HWzpF7InIDwPOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745887675; a=rsa-sha256; cv=none; b=erQhyJSCsQq1d2hMxgLNx9dQ7oJTCS+pBMIyF/URZKzX+I28NOZMseDpLeOazGLriKXSQO urYfNMtb0iHapqZzDI0yj7Mh986elT6s6ZUG1hctbvlehYkCZH1jIRa7A9HoIuQZt8tLIi uwLxlk5bgN6tdwexo+foIH/XUW8jqyDmAMiBWWHzeTtCsg3/1+/x5r0eR1WCGbXk0vsa0k qa/MNvXFXYjFO3ucDAvo1jrFMoEs0pxU1c2nLrnX1IUSGqQSZcqijoVL2NnpXDK9Chz4Bk NPhA+M7T7zkSn6F2el9ZeDEmrEF6EoCFpjI7sUwvoOJjzqWCHIb9ZDgo+u4gKw== 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=1745887675; 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=P7o434SegOKqwj2LZvdmuX9Hm3iq28cfDUax03WDEV8=; b=q4ohNmI/th+1xWOz2UsWG8fLWUNphMoys69PTvcbmlvDuawmfn7e7oZGpPom/cb+IKhKjb Umgt58jzg5PnFXl+OEHS0RZED+81re1/qBlC3bwBvWGenrWQXoGmzcMXKSdQ/orzoUjnvi +EQaldXBfQwdlMjhr3rpUQ5tP/vzbYe9kB/l6cW5KCeKSgqyqWwVnsMhhXqkEYi3JyJlKp 9wkSusK+kecr9grMyZE5l2bu0+cWZ+sW67vD3MwhBI1TjzOWK4gYMwKJfegYjM4Xi8RAAy FKzHgHbVNmFnTos7HXZcbqOwfxk6JIa3JCgCDUGuNcrqgH9KOnf5j5U/THzZfg== 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 4ZmhVz0bQczxNQ; Tue, 29 Apr 2025 00:47:55 +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 53T0lsIc014345; Tue, 29 Apr 2025 00:47:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53T0lssc014342; Tue, 29 Apr 2025 00:47:54 GMT (envelope-from git) Date: Tue, 29 Apr 2025 00:47:54 GMT Message-Id: <202504290047.53T0lssc014342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: dfbda7c53d67 - stable/14 - riscv: Fix handling of interrupts during kernel page faults 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dfbda7c53d673999aeb743f77c30c157c067dd8b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dfbda7c53d673999aeb743f77c30c157c067dd8b commit dfbda7c53d673999aeb743f77c30c157c067dd8b Author: Mark Johnston AuthorDate: 2025-04-19 22:41:07 +0000 Commit: Mark Johnston CommitDate: 2025-04-29 00:44:01 +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 (cherry picked from commit 0ca5e3dd1ad006a5251a391676e90ec4dc94df20) --- 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 0b6db7982847..2e502316447d 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -241,7 +241,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) {