From nobody Fri Mar 27 01:52:24 2026 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 4fhkD84zKTz6WYPD for ; Fri, 27 Mar 2026 01:52:24 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhkD817Gcz41P8 for ; Fri, 27 Mar 2026 01:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774576344; 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=fSMvvHabQ5Gx+uWdHmpUUOxS+CjGNKlQxD1QFffZ5+s=; b=IA2hFQiU4aU2zgVAdcbymUdRqnvrVRuDzWcC0WpZgU9KhDS+zgdQVsgkvqN3NGUetFAkoU eUXTEMsteLeByaqpxx0E+B2ZrUAfJKjjWAmN/UPBEQu55FXPNZDcpT2MmQjULFssXf4wUX C5q9yjKDgXX74kWh4QW+13IYYtgKtRNxNIUdwBfwGpMplWXxl3oXFwzc9QHvQIcTeYThUE oWVhAOdB2kLYblIuDQLzywmoI5e7SXos7SOnGAf/Euxhpqgcd1zygwdIlC/fDpEf6x6d+r 1OPXv1oC34cfiftw2JsWCewAoexmZkheKrqy6e1NF8QsXRx0VTrwU7EQeAdwPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774576344; a=rsa-sha256; cv=none; b=h6u16saOgsIGHw3Ud5OjEaFQkSVplI7YF65+JGgEpDGSGydhOarK/j9S5fRS/HHwGkdNzQ QAPt3B9wZ2ISJMjJ3lVSg8y9p6Q4iqJABLm/3P1xue2Qhhp6EX4iRJvsDxRtbqtgzGpuU4 0/Vl8CctHJZ3gvOF6bIMxDJGdoOtH0eGbbzvKwHTYcCf9H+iEtH2gl9PtbcdyQGlJXub57 iJd5jELlOhbErdBrvbDIAwY7mFIPV3FnEvXW6aNEUAs9N6+eVruJr9sGxCvpQ5qw8sgYYd 8tENpL2nFxxGFhJqKveS9OLVPBpV2DQg27IY+kxj/sNhRx6HniVPodhn8JdvvQ== 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=1774576344; 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=fSMvvHabQ5Gx+uWdHmpUUOxS+CjGNKlQxD1QFffZ5+s=; b=jUImQZybcLl6Wv2NpwfsbW924GGq95Zn36oqa9X/WzG+CcQLEe7+yhMJ7blG+7+Eadi9Yf lJcvXy3O5htCye7ce+f0frCA9Ud76xcZRoWkr8u9olTNgrTmYZD2XnVLi8jochB16QtEg8 BXuWiMRsb6f16ow05Z4MssD32OV88cX5Mr+Yib+seYFg3Jt+fuiTxU6vQNwavU48E0pxOU 7Svb3o5RFVq0kUzJuiq1AFoJ3f4uEdinJczr8DtNLS61U9zSH5Zv/DhYNhytsfy6DkMTd2 xBSGGjDZMRE8kbpcEIjqC4bm25dHZZIdHPQ1hM7FDDioLxb+AuLq8yrGxo4hOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhkD80cXbz399 for ; Fri, 27 Mar 2026 01:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f032 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Mar 2026 01:52:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 41ca79b247ea - stable/15 - amd64: move code to check for traps with interrupts disabled into helpers 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/15 X-Git-Reftype: branch X-Git-Commit: 41ca79b247ea8ea228ba8d0d3fd561cf8fbecc72 Auto-Submitted: auto-generated Date: Fri, 27 Mar 2026 01:52:24 +0000 Message-Id: <69c5e2d8.1f032.45421d59@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41ca79b247ea8ea228ba8d0d3fd561cf8fbecc72 commit 41ca79b247ea8ea228ba8d0d3fd561cf8fbecc72 Author: Konstantin Belousov AuthorDate: 2026-03-11 12:04:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-26 23:42:56 +0000 amd64: move code to check for traps with interrupts disabled into helpers (cherry picked from commit e18449fbe2731399862e82e61fffaadd6739642c) --- sys/amd64/amd64/trap.c | 96 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 3a9323936d2d..e4e4e98fbf7d 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -260,6 +260,62 @@ trap_clear_step(struct thread *td, struct trapframe *frame) PROC_UNLOCK(td->td_proc); } +/* + * Warn with a message on the user's tty if application code has + * disabled interrupts and then trapped. + */ +static void +trap_check_intr_user(struct thread *td, struct trapframe *frame) +{ + MPASS(TRAPF_USERMODE(frame)); + + if (__predict_true((frame->tf_rflags & PSL_I) != 0)) + return; + + uprintf("pid %ld (%s): trap %d (%s) with interrupts disabled\n", + (long)td->td_proc->p_pid, td->td_name, frame->tf_trapno, + trap_msg[frame->tf_trapno]); +} + +/* + * Some exceptions can occur on kernel attempt to reload a corrupted + * user context, which is done with interrupts enabled. Interrupts + * such as NMIs and debugging faults can be also taken in the kernel + * while interrupts are disabled. Other traps shouldn't occur with + * interrupts disabled unless the kernel has a bug. Re-enable + * interrupts in case this occurs, unless the interrupted thread holds + * a spin lock. + */ +static void +trap_check_intr_kernel(struct thread *td, struct trapframe *frame) +{ + MPASS(!TRAPF_USERMODE(frame)); + + if (__predict_true((frame->tf_rflags & PSL_I) != 0)) + return; + + switch (frame->tf_trapno) { + case T_NMI: + case T_BPTFLT: + case T_TRCTRAP: + case T_PROTFLT: + case T_SEGNPFLT: + case T_STKFLT: + break; + default: + printf("kernel trap %d with interrupts disabled\n", + frame->tf_trapno); + + /* + * We shouldn't enable interrupts while holding a + * spin lock. + */ + if (td->td_md.md_spinlock_count == 0) + enable_intr(); + break; + } +} + /* * Table of handlers for various segment load faults. */ @@ -337,46 +393,9 @@ trap(struct trapframe *frame) return; } - if ((frame->tf_rflags & PSL_I) == 0) { - /* - * Buggy application or kernel code has disabled - * interrupts and then trapped. Enabling interrupts - * now is wrong, but it is better than running with - * interrupts disabled until they are accidentally - * enabled later. - */ - if (TRAPF_USERMODE(frame)) { - uprintf( - "pid %ld (%s): trap %d (%s) " - "with interrupts disabled\n", - (long)curproc->p_pid, curthread->td_name, type, - trap_msg[type]); - } else { - switch (type) { - case T_NMI: - case T_BPTFLT: - case T_TRCTRAP: - case T_PROTFLT: - case T_SEGNPFLT: - case T_STKFLT: - break; - default: - printf( - "kernel trap %d with interrupts disabled\n", - type); - - /* - * We shouldn't enable interrupts while holding a - * spin lock. - */ - if (td->td_md.md_spinlock_count == 0) - enable_intr(); - } - } - } - if (TRAPF_USERMODE(frame)) { /* user trap */ + trap_check_intr_user(td, frame); td->td_pticks = 0; td->td_frame = frame; @@ -497,6 +516,7 @@ trap(struct trapframe *frame) } } else { /* kernel trap */ + trap_check_intr_kernel(td, frame); KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred"));