From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out198-24.us.a.mail.aliyun.com (out198-24.us.a.mail.aliyun.com [47.90.198.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E3F728A72B for ; Mon, 19 Jan 2026 06:54:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=47.90.198.24 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768805672; cv=none; b=RdR+QO/MF04YrX5WZe4I1Gu/mGIo3Uat1PrsEW2LiGZl8lfKoKzEUzZSnA3iqrBPQZidnHCyAg80hmBe5NgUFR31QGzbQ0NfY1q7Ul8Zt9MsNCeOYS0PeWHkgmiB/AtXG8pedXy6pcojGrEN5oPRLb8aQ8V0LWz142bBYrOy9VQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768805672; c=relaxed/simple; bh=20x6D37Ih/2J2Q2gRnlK9cMJWWpwgsGJrpPD0KiU1dk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ZCuRAAotYlXuGz6s6+x+F+GP5R4om2CX98q75XiR/iqk1OVcyFwZz+PshS/SLklNatoIKhzdRiTdFjP8wWgi3uhtPCvT7CuoxQYfH0GeVjF3Ogkl2/7zvro5WmP+Ip7qfDFn0RHnQK5w2HbT2w9AdPMAUaV0zXscQRbq6e7xO20= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=antgroup.com; spf=pass smtp.mailfrom=antgroup.com; dkim=pass (1024-bit key) header.d=antgroup.com header.i=@antgroup.com header.b=AXpITnOE; arc=none smtp.client-ip=47.90.198.24 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=antgroup.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=antgroup.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=antgroup.com header.i=@antgroup.com header.b="AXpITnOE" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=antgroup.com; s=default; t=1768805653; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; bh=OCsM6wl3udtfU78sGVoqhjPSrXtCZfzM8jzhuOVAVKI=; b=AXpITnOE3Tg7nrkeEXnXvEXpjhZq1yL0WPz9D09zSXuJExDfUat+AIjfQf99JDrpvrGCviPe8/a4i8jIrfCRexjBowyOYR+kF2FcE7vatWFgaZwB0kf6A6b6iIcOqsZ6lwSqZ+iPK3u9rUXpzUHvkQIuMmgodwLHYsmvYtar4ZY= Received: from localhost(mailfrom:houwenlong.hwl@antgroup.com fp:SMTPD_---.g9z42mW_1768805336 cluster:ay29) by smtp.aliyun-inc.com; Mon, 19 Jan 2026 14:48:56 +0800 Date: Mon, 19 Jan 2026 14:48:56 +0800 From: Hou Wenlong To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Joel Granados , Kees Cook , Sohil Mehta , "Xin Li (Intel)" , Mostafa Saleh , Josh Poimboeuf , Alexander Shishkin Subject: Re: [PATCH v2] x86/bug: Handle __WARN_printf() trap in early_fixup_exception() Message-ID: <20260119064856.GA110836@k08j02272.eu95sqa> References: <97dd5c5b5e92d48ffbc95fb1357dfbbbf0d12a1e.1767960698.git.houwenlong.hwl@antgroup.com> <20260112074428.GA830755@noisy.programming.kicks-ass.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260112074428.GA830755@noisy.programming.kicks-ass.net> User-Agent: Mutt/1.5.21 (2010-09-15) On Mon, Jan 12, 2026 at 08:44:28AM +0100, Peter Zijlstra wrote: > On Sat, Jan 10, 2026 at 11:47:37AM +0800, Hou Wenlong wrote: > > The commit 5b472b6e5bd9 ("x86_64/bug: Implement __WARN_printf()") > > implemented __WARN_printf(), which changed the mechanism to use UD1 > > instead of UD2. However, it only handles the trap in the runtime IDT > > handler, while the early booting IDT handler lacks this handling. As a > > result, the usage of WARN() before the runtime IDT setup can lead to > > kernel crashes. > > Urgh, indeed. Clearly I don't see many early WARNs :/ > > > Since KMSAN is enabled after the runtime IDT setup, it > > is safe to use handle_bug() directly in early_fixup_exception() to > > address this issue. > > I'm not sure I understand this. Should it not be that KMSAN is enabled > *before* early IDT to make this a non-issue? > > > Fixes: 5b472b6e5bd9 ("x86_64/bug: Implement __WARN_printf()") > > Signed-off-by: Hou Wenlong > > --- > > arch/x86/include/asm/traps.h | 2 ++ > > arch/x86/kernel/traps.c | 2 +- > > arch/x86/mm/extable.c | 7 ++----- > > 3 files changed, 5 insertions(+), 6 deletions(-) > > > > diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h > > index 869b88061801..3f24cc472ce9 100644 > > --- a/arch/x86/include/asm/traps.h > > +++ b/arch/x86/include/asm/traps.h > > @@ -25,6 +25,8 @@ extern int ibt_selftest_noendbr(void); > > void handle_invalid_op(struct pt_regs *regs); > > #endif > > > > +noinstr bool handle_bug(struct pt_regs *regs); > > + > > static inline int get_si_code(unsigned long condition) > > { > > if (condition & DR_STEP) > > diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c > > index bcf1dedc1d00..aca1eca5daff 100644 > > --- a/arch/x86/kernel/traps.c > > +++ b/arch/x86/kernel/traps.c > > @@ -397,7 +397,7 @@ static inline void handle_invalid_op(struct pt_regs *regs) > > ILL_ILLOPN, error_get_trap_addr(regs)); > > } > > > > -static noinstr bool handle_bug(struct pt_regs *regs) > > +noinstr bool handle_bug(struct pt_regs *regs) > > { > > unsigned long addr = regs->ip; > > bool handled = false; > > diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c > > index 2fdc1f1f5adb..6b9ff1c6cafa 100644 > > --- a/arch/x86/mm/extable.c > > +++ b/arch/x86/mm/extable.c > > @@ -411,14 +411,11 @@ void __init early_fixup_exception(struct pt_regs *regs, int trapnr) > > return; > > > > if (trapnr == X86_TRAP_UD) { > > - if (report_bug(regs->ip, regs) == BUG_TRAP_TYPE_WARN) { > > - /* Skip the ud2. */ > > - regs->ip += LEN_UD2; > > + if (handle_bug(regs)) > > return; > > - } > > > > /* > > - * If this was a BUG and report_bug returns or if this > > + * If this was a BUG and handle_bug returns or if this > > * was just a normal #UD, we want to continue onward and > > * crash. > > */ > > > > base-commit: b7dccac786071bba98b0d834c517fd44a22c50f9 > > -- > > 2.31.1 > > Hi, Peter. I received a kernel test robot build failure message regarding this patch, but I noticed that you queued the v1 version instead of the v2 version in your queue tree[0]. I ran the test config file with the v2 version, and it should be fine. [0]: https://git.kernel.org/pub/scm/linux/kernel/git/peterz/queue.git/commit/?h=x86/urgent&id=695d896472d6543523de43110b0016b8b4469643 Thanks!