From: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
To: hpa@zytor.com, hch@infradead.org,
nick.desaulniers+lkml@gmail.com, kuan-ying.lee@canonical.com,
masahiroy@kernel.org, samuel.holland@sifive.com,
mingo@redhat.com, corbet@lwn.net, ryabinin.a.a@gmail.com,
guoweikang.kernel@gmail.com, jpoimboe@kernel.org,
ardb@kernel.org, vincenzo.frascino@arm.com, glider@google.com,
kirill.shutemov@linux.intel.com, apopple@nvidia.com,
samitolvanen@google.com, maciej.wieczor-retman@intel.com,
kaleshsingh@google.com, jgross@suse.com, andreyknvl@gmail.com,
scott@os.amperecomputing.com, tony.luck@intel.com,
dvyukov@google.com, pasha.tatashin@soleen.com, ziy@nvidia.com,
broonie@kernel.org, gatlin.newhouse@gmail.com,
jackmanb@google.com, wangkefeng.wang@huawei.com,
thiago.bauermann@linaro.org, tglx@linutronix.de, kees@kernel.org,
akpm@linux-foundation.org, jason.andryuk@amd.com,
snovitoll@gmail.com, xin@zytor.com, jan.kiszka@siemens.com,
bp@alien8.de, rppt@kernel.org, peterz@infradead.org,
pankaj.gupta@amd.com, thuth@redhat.com,
andriy.shevchenko@linux.intel.com, joel.granados@kernel.org,
kbingham@kernel.org, nicolas@fjasle.eu, mark.rutland@arm.com,
surenb@google.com, catalin.marinas@arm.com, morbo@google.com,
justinstitt@google.com, ubizjak@gmail.com, jhubbard@nvidia.com,
urezki@gmail.com, dave.hansen@linux.intel.com, bhe@redhat.com,
luto@kernel.org, baohua@kernel.org, nathan@kernel.org,
will@kernel.org, brgerst@gmail.com
Cc: llvm@lists.linux.dev, linux-mm@kvack.org,
linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
kasan-dev@googlegroups.com, x86@kernel.org
Subject: [PATCH v3 11/14] x86: Handle int3 for inline KASAN reports
Date: Fri, 4 Apr 2025 15:14:15 +0200 [thread overview]
Message-ID: <012c84049b853d6853a7d6c887ce0c2323bcd80a.1743772053.git.maciej.wieczor-retman@intel.com> (raw)
In-Reply-To: <cover.1743772053.git.maciej.wieczor-retman@intel.com>
When a tag mismatch happens in inline software tag-based KASAN on x86 an
int3 instruction is executed and needs proper handling.
Call kasan_report() from the int3 handler and pass down the proper
information from registers - RDI should contain the problematic address
and RAX other metadata.
Also early return from the int3 selftest if inline KASAN is enabled
since it will cause a kernel panic otherwise.
Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
---
Changelog v3:
- Add this patch to the series.
arch/x86/kernel/alternative.c | 3 ++
arch/x86/kernel/traps.c | 52 +++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index bf82c6f7d690..ba277a25b57f 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -1979,6 +1979,9 @@ static noinline void __init int3_selftest(void)
};
unsigned int val = 0;
+ if (IS_ENABLED(CONFIG_KASAN_INLINE))
+ return;
+
BUG_ON(register_die_notifier(&int3_exception_nb));
/*
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 9f88b8a78e50..32c81fc2d439 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -16,6 +16,7 @@
#include <linux/interrupt.h>
#include <linux/kallsyms.h>
#include <linux/kmsan.h>
+#include <linux/kasan.h>
#include <linux/spinlock.h>
#include <linux/kprobes.h>
#include <linux/uaccess.h>
@@ -849,6 +850,51 @@ DEFINE_IDTENTRY_ERRORCODE(exc_general_protection)
cond_local_irq_disable(regs);
}
+#ifdef CONFIG_KASAN_SW_TAGS
+
+#define KASAN_RAX_RECOVER 0x20
+#define KASAN_RAX_WRITE 0x10
+#define KASAN_RAX_SIZE_MASK 0x0f
+#define KASAN_RAX_SIZE(rax) (1 << ((rax) & KASAN_RAX_SIZE_MASK))
+
+static bool kasan_handler(struct pt_regs *regs)
+{
+ int metadata = regs->ax;
+ u64 addr = regs->di;
+ u64 pc = regs->ip;
+ bool recover = metadata & KASAN_RAX_RECOVER;
+ bool write = metadata & KASAN_RAX_WRITE;
+ size_t size = KASAN_RAX_SIZE(metadata);
+
+ if (!IS_ENABLED(CONFIG_KASAN_INLINE))
+ return false;
+
+ if (user_mode(regs))
+ return false;
+
+ kasan_report((void *)addr, size, write, pc);
+
+ /*
+ * The instrumentation allows to control whether we can proceed after
+ * a crash was detected. This is done by passing the -recover flag to
+ * the compiler. Disabling recovery allows to generate more compact
+ * code.
+ *
+ * Unfortunately disabling recovery doesn't work for the kernel right
+ * now. KASAN reporting is disabled in some contexts (for example when
+ * the allocator accesses slab object metadata; this is controlled by
+ * current->kasan_depth). All these accesses are detected by the tool,
+ * even though the reports for them are not printed.
+ *
+ * This is something that might be fixed at some point in the future.
+ */
+ if (!recover)
+ die("Oops - KASAN", regs, 0);
+ return true;
+}
+
+#endif
+
static bool do_int3(struct pt_regs *regs)
{
int res;
@@ -863,6 +909,12 @@ static bool do_int3(struct pt_regs *regs)
if (kprobe_int3_handler(regs))
return true;
#endif
+
+#ifdef CONFIG_KASAN_SW_TAGS
+ if (kasan_handler(regs))
+ return true;
+#endif
+
res = notify_die(DIE_INT3, "int3", regs, 0, X86_TRAP_BP, SIGTRAP);
return res == NOTIFY_STOP;
--
2.49.0
next prev parent reply other threads:[~2025-04-04 13:17 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-04 13:14 [PATCH v3 00/14] kasan: x86: arm64: KASAN tag-based mode for x86 Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 01/14] kasan: sw_tags: Use arithmetic shift for shadow computation Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 02/14] kasan: sw_tags: Support tag widths less than 8 bits Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 03/14] x86: Add arch specific kasan functions Maciej Wieczor-Retman
2025-04-04 16:06 ` Dave Hansen
2025-04-09 7:16 ` Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 04/14] kasan: arm64: x86: Make special tags arch specific Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 05/14] x86: Reset tag for virtual to physical address conversions Maciej Wieczor-Retman
2025-04-04 16:42 ` Dave Hansen
2025-04-09 7:36 ` Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 06/14] x86: Physical address comparisons in fill_p*d/pte Maciej Wieczor-Retman
2025-04-04 16:56 ` Dave Hansen
2025-04-09 7:49 ` Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 07/14] x86: KASAN raw shadow memory PTE init Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 08/14] x86: LAM initialization Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 09/14] x86: Minimal SLAB alignment Maciej Wieczor-Retman
2025-04-04 16:59 ` Dave Hansen
2025-04-09 12:49 ` Maciej Wieczor-Retman
2025-04-09 15:24 ` Dave Hansen
2025-04-04 13:14 ` [PATCH v3 10/14] x86: Update the KASAN non-canonical hook Maciej Wieczor-Retman
2025-04-04 17:37 ` Dave Hansen
2025-04-09 14:34 ` Maciej Wieczor-Retman
2025-04-09 18:29 ` Dave Hansen
2025-04-04 13:14 ` Maciej Wieczor-Retman [this message]
2025-04-04 17:55 ` [PATCH v3 11/14] x86: Handle int3 for inline KASAN reports Dave Hansen
2025-04-09 14:48 ` Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 12/14] kasan: Fix inline mode for x86 tag-based mode Maciej Wieczor-Retman
2025-04-04 13:14 ` [PATCH v3 13/14] mm: Unpoison pcpu chunks with base address tag Maciej Wieczor-Retman
2025-04-04 18:08 ` Dave Hansen
2025-04-09 16:32 ` Maciej Wieczor-Retman
2025-04-09 17:12 ` Dave Hansen
2025-04-04 13:14 ` [PATCH v3 14/14] x86: Make software tag-based kasan available Maciej Wieczor-Retman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=012c84049b853d6853a7d6c887ce0c2323bcd80a.1743772053.git.maciej.wieczor-retman@intel.com \
--to=maciej.wieczor-retman@intel.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=apopple@nvidia.com \
--cc=ardb@kernel.org \
--cc=baohua@kernel.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=dvyukov@google.com \
--cc=gatlin.newhouse@gmail.com \
--cc=glider@google.com \
--cc=guoweikang.kernel@gmail.com \
--cc=hch@infradead.org \
--cc=hpa@zytor.com \
--cc=jackmanb@google.com \
--cc=jan.kiszka@siemens.com \
--cc=jason.andryuk@amd.com \
--cc=jgross@suse.com \
--cc=jhubbard@nvidia.com \
--cc=joel.granados@kernel.org \
--cc=jpoimboe@kernel.org \
--cc=justinstitt@google.com \
--cc=kaleshsingh@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=kbingham@kernel.org \
--cc=kees@kernel.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=kuan-ying.lee@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=llvm@lists.linux.dev \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mingo@redhat.com \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=nick.desaulniers+lkml@gmail.com \
--cc=nicolas@fjasle.eu \
--cc=pankaj.gupta@amd.com \
--cc=pasha.tatashin@soleen.com \
--cc=peterz@infradead.org \
--cc=rppt@kernel.org \
--cc=ryabinin.a.a@gmail.com \
--cc=samitolvanen@google.com \
--cc=samuel.holland@sifive.com \
--cc=scott@os.amperecomputing.com \
--cc=snovitoll@gmail.com \
--cc=surenb@google.com \
--cc=tglx@linutronix.de \
--cc=thiago.bauermann@linaro.org \
--cc=thuth@redhat.com \
--cc=tony.luck@intel.com \
--cc=ubizjak@gmail.com \
--cc=urezki@gmail.com \
--cc=vincenzo.frascino@arm.com \
--cc=wangkefeng.wang@huawei.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xin@zytor.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox