From nobody Sat Apr 4 18:31:13 2026 Received: from mail-24418.protonmail.ch (mail-24418.protonmail.ch [109.224.244.18]) (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 A955632E141; Tue, 10 Mar 2026 17:53:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165206; cv=none; b=khCJkykIOm46PsrJrfp3kqWcSlQhf7+3ZdC7JKAMZTglvDn15M+jWnD1NpF5UzS4U4OPlKm6j31+V8SCP2j7twmgSWjqNSlaWWtvphRIcaLT3se6vkGTjSlymLemVAC6ReMFRieFVTgTYVqH07eRfJPp6gxH87I/xDslYBYPXzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165206; c=relaxed/simple; bh=GFUkKQniLCe2Z16J5JP+uPrJhbbe0XywGGt841UJECg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tKDWsnWH3tPxYSIk+tJTOKaRRRSfRE2uTfyuXyoGVCTN4k9yXfN7C3UxDk09z2l7vD9in2WBWBrS99x7GFAw4mGypVemJJ8dL9XTH36xnCtJndfdT6TP84egWWKg7GCzD1PazMUmvlelEXGFT+MyqueaLgZoeyXvRAGB0AnChmg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=eOmfR8xz; arc=none smtp.client-ip=109.224.244.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="eOmfR8xz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165202; x=1773424402; bh=KgF6vwAr3ozZrYPkkQlFUkiAKLXyOaZj05V4Z6s5C7o=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=eOmfR8xz4/S5c40XAaotAQv62PLjY61bCelIqnCo9O7xww4ycGIiRtTz0rGh7c/UR Xd2K/blxe9wS3NY3+bRBJFf4QUYAN7giEWSlYARrNPSgYhZ8Xf0iDVsGmGpcO+qYOK H15kn1ZlSfAfmP+BxaSiuMpS1ieyYUOplYAQwr70anMTGqVFheXuaq5r4wPzdiwQuS CEw1cn0QEF/iogUwi934a05WtiP9leStqOC+6uL8A60Zux3f/nN1oSY6mijue0t/FQ fTMKSnNZJEW93hK7UcwNmpFNsKeK5e8xZ4cF6YySRqCN3rP8PMOgkoNHXGLIe/R/rr dq0Q+bD4UUDhA== Date: Tue, 10 Mar 2026 17:53:18 +0000 To: akpm@linux-foundation.org, Catalin Marinas , Will Deacon , Jonathan Corbet , Shuah Khan , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Jan Kiszka , Kieran Bingham , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Samuel Holland , Maciej Wieczor-Retman , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, workflows@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev Subject: [PATCH v11 01/15] kasan: sw_tags: Use arithmetic shift for shadow computation Message-ID: <8033d1ad717800657ce6b80a30e2191d78ec7bcb.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: c99ca11fe68d9c9cb4c46ddd74310becb8f2619c Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Samuel Holland Currently, kasan_mem_to_shadow() uses a logical right shift, which turns canonical kernel addresses into non-canonical addresses by clearing the high KASAN_SHADOW_SCALE_SHIFT bits. The value of KASAN_SHADOW_OFFSET is then chosen so that the addition results in a canonical address for the shadow memory. For KASAN_GENERIC, this shift/add combination is ABI with the compiler, because KASAN_SHADOW_OFFSET is used in compiler-generated inline tag checks[1], which must only attempt to dereference canonical addresses. However, for KASAN_SW_TAGS there is some freedom to change the algorithm without breaking the ABI. Because TBI is enabled for kernel addresses, the top bits of shadow memory addresses computed during tag checks are irrelevant, and so likewise are the top bits of KASAN_SHADOW_OFFSET. This is demonstrated by the fact that LLVM uses a logical right shift in the tag check fast path[2] but a sbfx (signed bitfield extract) instruction in the slow path[3] without causing any issues. Use an arithmetic shift in kasan_mem_to_shadow() as it provides a number of benefits: 1) The memory layout doesn't change but is easier to understand. KASAN_SHADOW_OFFSET becomes a canonical memory address, and the shifted pointer becomes a negative offset, so KASAN_SHADOW_OFFSET =3D=3D KASAN_SHADOW_END regardless of the shift amount or the size of the virtual address space. 2) KASAN_SHADOW_OFFSET becomes a simpler constant, requiring only one instruction to load instead of two. Since it must be loaded in each function with a tag check, this decreases kernel text size by 0.5%. 3) This shift and the sign extension from kasan_reset_tag() can be combined into a single sbfx instruction. When this same algorithm change is applied to the compiler, it removes an instruction from each inline tag check, further reducing kernel text size by an additional 4.6%. These benefits extend to other architectures as well. On RISC-V, where the baseline ISA does not shifted addition or have an equivalent to the sbfx instruction, loading KASAN_SHADOW_OFFSET is reduced from 3 to 2 instructions, and kasan_mem_to_shadow(kasan_reset_tag(addr)) similarly combines two consecutive right shifts. Link: https://github.com/llvm/llvm-project/blob/llvmorg-20-init/llvm/lib/Tr= ansforms/Instrumentation/AddressSanitizer.cpp#L1316 [1] Link: https://github.com/llvm/llvm-project/blob/llvmorg-20-init/llvm/lib/Tr= ansforms/Instrumentation/HWAddressSanitizer.cpp#L895 [2] Link: https://github.com/llvm/llvm-project/blob/llvmorg-20-init/llvm/lib/Ta= rget/AArch64/AArch64AsmPrinter.cpp#L669 [3] Signed-off-by: Samuel Holland Co-developed-by: Maciej Wieczor-Retman Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: (Maciej) - Remove the arch_kasan_non_canonical_hook() scheme in favor of Andrey Ryabinin's much nicer simple implementation. Changelog v10: (Maciej) - Update the Documentation/dev-tools/kasan.rst file with the changed kasan_mem_to_shadow(). Changelog v9: (Maciej) - Take out the arm64 related code from mm/kasan/report.c and put it in the arch specific directory in a new file so the kasan_mem_to_shadow() function can be included. - Reset addr tag bits in arm64's arch_kasan_non_canonical_hook() so the inline mode can also work with that function (Andrey Ryabinin). - Fix incorrect number of zeros in a comment in mm/kasan/report.c. - Remove Catalin's acked-by since changes were made. Changelog v7: (Maciej) - Change UL to ULL in report.c to fix some compilation warnings. Changelog v6: (Maciej) - Add Catalin's acked-by. - Move x86 gdb snippet here from the last patch. Changelog v5: (Maciej) - (u64) -> (unsigned long) in report.c Changelog v4: (Maciej) - Revert x86 to signed mem_to_shadow mapping. - Remove last two paragraphs since they were just poorer duplication of the comments in kasan_non_canonical_hook(). Changelog v3: (Maciej) - Fix scripts/gdb/linux/kasan.py so the new signed mem_to_shadow() is reflected there. - Fix Documentation/arch/arm64/kasan-offsets.sh to take new offsets into account. - Made changes to the kasan_non_canonical_hook() according to upstream discussion. Settled on overflow on both ranges and separate checks for x86 and arm. Changelog v2: (Maciej) - Correct address range that's checked in kasan_non_canonical_hook(). Adjust the comment inside. - Remove part of comment from arch/arm64/include/asm/memory.h. - Append patch message paragraph about the overflow in kasan_non_canonical_hook(). Documentation/arch/arm64/kasan-offsets.sh | 8 ++++++-- Documentation/dev-tools/kasan.rst | 18 ++++++++++++------ arch/arm64/Kconfig | 10 +++++----- arch/arm64/include/asm/memory.h | 14 +++++++++++++- arch/arm64/mm/kasan_init.c | 7 +++++-- include/linux/kasan.h | 10 ++++++++-- mm/kasan/report.c | 16 ++++++++++++---- scripts/gdb/linux/kasan.py | 5 ++++- scripts/gdb/linux/mm.py | 5 +++-- 9 files changed, 68 insertions(+), 25 deletions(-) diff --git a/Documentation/arch/arm64/kasan-offsets.sh b/Documentation/arch= /arm64/kasan-offsets.sh index 2dc5f9e18039..ce777c7c7804 100644 --- a/Documentation/arch/arm64/kasan-offsets.sh +++ b/Documentation/arch/arm64/kasan-offsets.sh @@ -5,8 +5,12 @@ =20 print_kasan_offset () { printf "%02d\t" $1 - printf "0x%08x00000000\n" $(( (0xffffffff & (-1 << ($1 - 1 - 32))) \ - - (1 << (64 - 32 - $2)) )) + if [[ $2 -ne 4 ]] then + printf "0x%08x00000000\n" $(( (0xffffffff & (-1 << ($1 - 1 - 32))) \ + - (1 << (64 - 32 - $2)) )) + else + printf "0x%08x00000000\n" $(( (0xffffffff & (-1 << ($1 - 1 - 32))) )) + fi } =20 echo KASAN_SHADOW_SCALE_SHIFT =3D 3 diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/ka= san.rst index 4968b2aa60c8..b11c1be8dff4 100644 --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@ -315,13 +315,19 @@ translate a memory address to its corresponding shado= w address. Here is the function which translates an address to its corresponding shad= ow address:: =20 - static inline void *kasan_mem_to_shadow(const void *addr) - { - return (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT) - + KASAN_SHADOW_OFFSET; - } + static inline void *kasan_mem_to_shadow(const void *addr) + { + void *scaled; =20 -where ``KASAN_SHADOW_SCALE_SHIFT =3D 3``. + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + scaled =3D (void *)((unsigned long)addr >> KASAN_S= HADOW_SCALE_SHIFT); + else + scaled =3D (void *)((long)addr >> KASAN_SHADOW_SCA= LE_SHIFT); + + return KASAN_SHADOW_OFFSET + scaled; + } + +where for Generic KASAN ``KASAN_SHADOW_SCALE_SHIFT =3D 3``. =20 Compile-time instrumentation is used to insert memory access checks. Compi= ler inserts function calls (``__asan_load*(addr)``, ``__asan_store*(addr)``) b= efore diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 38dba5f7e4d2..4de7e721f32e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -435,11 +435,11 @@ config KASAN_SHADOW_OFFSET default 0xdffffe0000000000 if ARM64_VA_BITS_42 && !KASAN_SW_TAGS default 0xdfffffc000000000 if ARM64_VA_BITS_39 && !KASAN_SW_TAGS default 0xdffffff800000000 if ARM64_VA_BITS_36 && !KASAN_SW_TAGS - default 0xefff800000000000 if (ARM64_VA_BITS_48 || (ARM64_VA_BITS_52 && != ARM64_16K_PAGES)) && KASAN_SW_TAGS - default 0xefffc00000000000 if (ARM64_VA_BITS_47 || ARM64_VA_BITS_52) && A= RM64_16K_PAGES && KASAN_SW_TAGS - default 0xeffffe0000000000 if ARM64_VA_BITS_42 && KASAN_SW_TAGS - default 0xefffffc000000000 if ARM64_VA_BITS_39 && KASAN_SW_TAGS - default 0xeffffff800000000 if ARM64_VA_BITS_36 && KASAN_SW_TAGS + default 0xffff800000000000 if (ARM64_VA_BITS_48 || (ARM64_VA_BITS_52 && != ARM64_16K_PAGES)) && KASAN_SW_TAGS + default 0xffffc00000000000 if (ARM64_VA_BITS_47 || ARM64_VA_BITS_52) && A= RM64_16K_PAGES && KASAN_SW_TAGS + default 0xfffffe0000000000 if ARM64_VA_BITS_42 && KASAN_SW_TAGS + default 0xffffffc000000000 if ARM64_VA_BITS_39 && KASAN_SW_TAGS + default 0xfffffff800000000 if ARM64_VA_BITS_36 && KASAN_SW_TAGS default 0xffffffffffffffff =20 config UNWIND_TABLES diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memor= y.h index a2b7a33966ff..875c0bd0d85a 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -89,7 +89,15 @@ * * KASAN_SHADOW_END is defined first as the shadow address that correspond= s to * the upper bound of possible virtual kernel memory addresses UL(1) << 64 - * according to the mapping formula. + * according to the mapping formula. For Generic KASAN, the address in the + * mapping formula is treated as unsigned (part of the compiler's ABI), so= the + * end of the shadow memory region is at a large positive offset from + * KASAN_SHADOW_OFFSET. For Software Tag-Based KASAN, the address in the + * formula is treated as signed. Since all kernel addresses are negative, = they + * map to shadow memory below KASAN_SHADOW_OFFSET, making KASAN_SHADOW_OFF= SET + * itself the end of the shadow memory region. (User pointers are positive= and + * would map to shadow memory above KASAN_SHADOW_OFFSET, but shadow memory= is + * not allocated for them.) * * KASAN_SHADOW_START is defined second based on KASAN_SHADOW_END. The sha= dow * memory start must map to the lowest possible kernel virtual memory addr= ess @@ -100,7 +108,11 @@ */ #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) #define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) +#ifdef CONFIG_KASAN_GENERIC #define KASAN_SHADOW_END ((UL(1) << (64 - KASAN_SHADOW_SCALE_SHIFT)) + KAS= AN_SHADOW_OFFSET) +#else +#define KASAN_SHADOW_END KASAN_SHADOW_OFFSET +#endif #define _KASAN_SHADOW_START(va) (KASAN_SHADOW_END - (UL(1) << ((va) - KASA= N_SHADOW_SCALE_SHIFT))) #define KASAN_SHADOW_START _KASAN_SHADOW_START(vabits_actual) #define PAGE_END KASAN_SHADOW_START diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index abeb81bf6ebd..937f6eb8115b 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -198,8 +198,11 @@ static bool __init root_level_aligned(u64 addr) /* The early shadow maps everything to a single page of zeroes */ asmlinkage void __init kasan_early_init(void) { - BUILD_BUG_ON(KASAN_SHADOW_OFFSET !=3D - KASAN_SHADOW_END - (1UL << (64 - KASAN_SHADOW_SCALE_SHIFT))); + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + BUILD_BUG_ON(KASAN_SHADOW_OFFSET !=3D + KASAN_SHADOW_END - (1UL << (64 - KASAN_SHADOW_SCALE_SHIFT))); + else + BUILD_BUG_ON(KASAN_SHADOW_OFFSET !=3D KASAN_SHADOW_END); BUILD_BUG_ON(!IS_ALIGNED(_KASAN_SHADOW_START(VA_BITS), SHADOW_ALIGN)); BUILD_BUG_ON(!IS_ALIGNED(_KASAN_SHADOW_START(VA_BITS_MIN), SHADOW_ALIGN)); BUILD_BUG_ON(!IS_ALIGNED(KASAN_SHADOW_END, SHADOW_ALIGN)); diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 338a1921a50a..81c83dcfcebe 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -62,8 +62,14 @@ int kasan_populate_early_shadow(const void *shadow_start, #ifndef kasan_mem_to_shadow static inline void *kasan_mem_to_shadow(const void *addr) { - return (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT) - + KASAN_SHADOW_OFFSET; + void *scaled; + + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + scaled =3D (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT); + else + scaled =3D (void *)((long)addr >> KASAN_SHADOW_SCALE_SHIFT); + + return KASAN_SHADOW_OFFSET + scaled; } #endif =20 diff --git a/mm/kasan/report.c b/mm/kasan/report.c index e804b1e1f886..1e4521b5ef14 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -640,12 +640,20 @@ void kasan_non_canonical_hook(unsigned long addr) { unsigned long orig_addr, user_orig_addr; const char *bug_type; + void *tagged_null =3D set_tag(NULL, KASAN_TAG_KERNEL); + void *tagged_addr =3D set_tag((void *)addr, KASAN_TAG_KERNEL); =20 /* - * All addresses that came as a result of the memory-to-shadow mapping - * (even for bogus pointers) must be >=3D KASAN_SHADOW_OFFSET. + * Filter out addresses that cannot be shadow memory accesses generated + * by the compiler. + * + * In SW_TAGS mode, when computing a shadow address, the compiler always + * sets the kernel tag (some top bits) on the pointer *before* computing + * the memory-to-shadow mapping. As a result, valid shadow addresses + * are derived from tagged kernel pointers. */ - if (addr < KASAN_SHADOW_OFFSET) + if (tagged_addr < kasan_mem_to_shadow(tagged_null) || + tagged_addr > kasan_mem_to_shadow((void *)(~0ULL))) return; =20 orig_addr =3D (unsigned long)kasan_shadow_to_mem((void *)addr); @@ -670,7 +678,7 @@ void kasan_non_canonical_hook(unsigned long addr) } else if (user_orig_addr < TASK_SIZE) { bug_type =3D "probably user-memory-access"; orig_addr =3D user_orig_addr; - } else if (addr_in_shadow((void *)addr)) + } else if (addr_in_shadow(tagged_addr)) bug_type =3D "probably wild-memory-access"; else bug_type =3D "maybe wild-memory-access"; diff --git a/scripts/gdb/linux/kasan.py b/scripts/gdb/linux/kasan.py index 56730b3fde0b..4b86202b155f 100644 --- a/scripts/gdb/linux/kasan.py +++ b/scripts/gdb/linux/kasan.py @@ -7,7 +7,8 @@ # =20 import gdb -from linux import constants, mm +from linux import constants, utils, mm +from ctypes import c_int64 as s64 =20 def help(): t =3D """Usage: lx-kasan_mem_to_shadow [Hex memory addr] @@ -39,6 +40,8 @@ class KasanMemToShadow(gdb.Command): else: help() def kasan_mem_to_shadow(self, addr): + if constants.CONFIG_KASAN_SW_TAGS and not utils.is_target_arch('x8= 6'): + addr =3D s64(addr) return (addr >> self.p_ops.KASAN_SHADOW_SCALE_SHIFT) + self.p_ops.= KASAN_SHADOW_OFFSET =20 KasanMemToShadow() diff --git a/scripts/gdb/linux/mm.py b/scripts/gdb/linux/mm.py index d78908f6664d..d4ab341d89c5 100644 --- a/scripts/gdb/linux/mm.py +++ b/scripts/gdb/linux/mm.py @@ -281,12 +281,13 @@ class aarch64_page_ops(): self.KERNEL_END =3D gdb.parse_and_eval("_end") =20 if constants.LX_CONFIG_KASAN_GENERIC or constants.LX_CONFIG_KASAN_= SW_TAGS: + self.KASAN_SHADOW_OFFSET =3D constants.LX_CONFIG_KASAN_SHADOW_= OFFSET if constants.LX_CONFIG_KASAN_GENERIC: self.KASAN_SHADOW_SCALE_SHIFT =3D 3 + self.KASAN_SHADOW_END =3D (1 << (64 - self.KASAN_SHADOW_SC= ALE_SHIFT)) + self.KASAN_SHADOW_OFFSET else: self.KASAN_SHADOW_SCALE_SHIFT =3D 4 - self.KASAN_SHADOW_OFFSET =3D constants.LX_CONFIG_KASAN_SHADOW_= OFFSET - self.KASAN_SHADOW_END =3D (1 << (64 - self.KASAN_SHADOW_SCALE_= SHIFT)) + self.KASAN_SHADOW_OFFSET + self.KASAN_SHADOW_END =3D self.KASAN_SHADOW_OFFSET self.PAGE_END =3D self.KASAN_SHADOW_END - (1 << (self.vabits_a= ctual - self.KASAN_SHADOW_SCALE_SHIFT)) else: self.PAGE_END =3D self._PAGE_END(self.VA_BITS_MIN) --=20 2.53.0 From nobody Sat Apr 4 18:31:13 2026 Received: from mail-24417.protonmail.ch (mail-24417.protonmail.ch [109.224.244.17]) (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 010463148C2 for ; Tue, 10 Mar 2026 17:53:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165219; cv=none; b=uSe9fUi35hlrFHd+5+8GeffuHIjjMMVXSd/MUNv0q7uqP1cAw9yDZVLKAgC17F3Nl3Em7/m/nUX7j+iKVIduLAwJBj4UKdHanQJcMdmyRXW5cAWr6ZOL7AJFBwAb8KjsnRh0z32RItH/5w4QLlQMgotCq83Bo2UGcH1D3+u0zV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165219; c=relaxed/simple; bh=uugRjf9sm1XsUi7rlIRzB1dRTh5Dhm52lSYWvg3tIaM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=k2YkOyc5eikuxIG7EDZ0gAvYQiUctdDuZCyOolrdCNB5KO9jV4PI4sV86XkyVtD9vl0N8EFtP+DFVMYCJ6F7QhOUjchlUmoTifdWyQrhmN31/Tdri6liG2SOZ7r4w+aA1s9I62tZQBvntijAcugHs795gBu5uA5C1tm+kKiPDwk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=ZOT7FhAC; arc=none smtp.client-ip=109.224.244.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="ZOT7FhAC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165215; x=1773424415; bh=hW8Xl7auJ7eZebzUdWboADWoFiE8jqbtwE71lz2jc9s=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ZOT7FhACkCBo8FHvyVNgtIcuTXogFaYpgBckqk6Bpd+GG6PkXObvvNrlWoXWySU+g t7nERdRqcmEwEAVzdl5YIZw1QnN255m3wynl7fDQu4mAbnVFLMkg3ezvgTB4GgufVe ZRguwVk3ArZj0a7mwHkh41bVkr8gYXVREzO0WWLvwQB9dTRx25TPjGVH9cbq6ItmC5 e+nV+hm778RpnUxMSQl0Li2Eheu6nr9dogx/kERF1eIKYr9ILP56xp3499fsqpChNq qlqrAwVfHKHIoOKSnISDRNDFYi8rJoQcv4k9Wm1QPwelpTPzng/UwZSwtlF+KDVFEr InxJohmrLvfGA== Date: Tue, 10 Mar 2026 17:53:30 +0000 To: akpm@linux-foundation.org, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , Will Deacon , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Samuel Holland , Maciej Wieczor-Retman , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org Subject: [PATCH v11 02/15] kasan: arm64: x86: Make special tags arch specific Message-ID: <35fe9ee0bfe99bfa72ac8c1dc5581c850d11c8ed.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 046023e6163b6d6ade86f621b8452c4b2e6e74f6 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Samuel Holland KASAN's tag-based mode defines multiple special tag values. They're reserved for: - Native kernel value. On arm64 it's 0xFF and it causes an early return in the tag checking function. - Invalid value. 0xFE marks an area as freed / unallocated. It's also the value that is used to initialize regions of shadow memory. - Min and max values. 0xFD is the highest value that can be randomly generated for a new tag. 0 is the minimal value with the exception of arm64's hardware mode where it is equal to 0xF0. Metadata macro is also defined: - Tag width equal to 8. Tag-based mode on x86 is going to use 4 bit wide tags so all the above values need to be changed accordingly. Make tag width and native kernel tag arch specific for x86 and arm64. Base the invalid tag value and the max value on the native kernel tag since they follow the same pattern on both mentioned architectures. Also generalize KASAN_SHADOW_INIT and 0xff used in various page_kasan_tag* helpers. Give KASAN_TAG_MIN the default value of zero, and move the special value for hw_tags arm64 to its arch specific kasan-tags.h. Signed-off-by: Samuel Holland Co-developed-by: Maciej Wieczor-Retman Signed-off-by: Maciej Wieczor-Retman Acked-by: Will Deacon (for the arm part) Reviewed-by: Andrey Konovalov Reviewed-by: Andrey Ryabinin --- Changelog v9: - Add Andrey Ryabinin's Reviewed-by tag. - Add Andrey Konovalov's Reviewed-by tag. Changelog v8: - Add Will's Acked-by tag. Changelog v7: - Reorder defines of arm64 tag width to prevent redefinition warnings. - Remove KASAN_TAG_MASK so it's only defined in mmzone.h (Andrey Konovalov) - Merge the 'support tag widths less than 8 bits' with this patch since they do similar things and overwrite each other. (Alexander) Changelog v6: - Add hardware tags KASAN_TAG_WIDTH value to the arm64 arch file. - Keep KASAN_TAG_MASK in the mmzone.h. - Remove ifndef from KASAN_SHADOW_INIT. Changelog v5: - Move KASAN_TAG_MIN to the arm64 kasan-tags.h for the hardware KASAN mode case. Changelog v4: - Move KASAN_TAG_MASK to kasan-tags.h. Changelog v2: - Remove risc-v from the patch. MAINTAINERS | 2 +- arch/arm64/include/asm/kasan-tags.h | 14 ++++++++++++++ arch/arm64/include/asm/kasan.h | 2 -- arch/arm64/include/asm/uaccess.h | 1 + arch/x86/include/asm/kasan-tags.h | 9 +++++++++ include/linux/kasan-tags.h | 19 ++++++++++++++----- include/linux/kasan.h | 3 +-- include/linux/mm.h | 6 +++--- include/linux/page-flags-layout.h | 9 +-------- 9 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 arch/arm64/include/asm/kasan-tags.h create mode 100644 arch/x86/include/asm/kasan-tags.h diff --git a/MAINTAINERS b/MAINTAINERS index 39987895bcfc..29586c316ca4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13739,7 +13739,7 @@ L: kasan-dev@googlegroups.com S: Maintained B: https://bugzilla.kernel.org/buglist.cgi?component=3DSanitizers&product= =3DMemory%20Management F: Documentation/dev-tools/kasan.rst -F: arch/*/include/asm/*kasan.h +F: arch/*/include/asm/*kasan*.h F: arch/*/mm/kasan_init* F: include/linux/kasan*.h F: lib/Kconfig.kasan diff --git a/arch/arm64/include/asm/kasan-tags.h b/arch/arm64/include/asm/k= asan-tags.h new file mode 100644 index 000000000000..259952677443 --- /dev/null +++ b/arch/arm64/include/asm/kasan-tags.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_KASAN_TAGS_H +#define __ASM_KASAN_TAGS_H + +#define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ + +#ifdef CONFIG_KASAN_HW_TAGS +#define KASAN_TAG_MIN 0xF0 /* minimum value for random tags */ +#define KASAN_TAG_WIDTH 4 +#else +#define KASAN_TAG_WIDTH 8 +#endif + +#endif /* ASM_KASAN_TAGS_H */ diff --git a/arch/arm64/include/asm/kasan.h b/arch/arm64/include/asm/kasan.h index b167e9d3da91..fd4a8557d736 100644 --- a/arch/arm64/include/asm/kasan.h +++ b/arch/arm64/include/asm/kasan.h @@ -6,8 +6,6 @@ =20 #include #include -#include -#include =20 #define arch_kasan_set_tag(addr, tag) __tag_set(addr, tag) #define arch_kasan_reset_tag(addr) __tag_reset(addr) diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uacc= ess.h index 9810106a3f66..5465bc97ccdd 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/x86/include/asm/kasan-tags.h b/arch/x86/include/asm/kasan= -tags.h new file mode 100644 index 000000000000..68ba385bc75c --- /dev/null +++ b/arch/x86/include/asm/kasan-tags.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_KASAN_TAGS_H +#define __ASM_KASAN_TAGS_H + +#define KASAN_TAG_KERNEL 0xF /* native kernel pointers tag */ + +#define KASAN_TAG_WIDTH 4 + +#endif /* ASM_KASAN_TAGS_H */ diff --git a/include/linux/kasan-tags.h b/include/linux/kasan-tags.h index 4f85f562512c..ad5c11950233 100644 --- a/include/linux/kasan-tags.h +++ b/include/linux/kasan-tags.h @@ -2,13 +2,22 @@ #ifndef _LINUX_KASAN_TAGS_H #define _LINUX_KASAN_TAGS_H =20 +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) +#include +#endif + +#ifndef KASAN_TAG_WIDTH +#define KASAN_TAG_WIDTH 0 +#endif + +#ifndef KASAN_TAG_KERNEL #define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ -#define KASAN_TAG_INVALID 0xFE /* inaccessible memory tag */ -#define KASAN_TAG_MAX 0xFD /* maximum value for random tags */ +#endif + +#define KASAN_TAG_INVALID (KASAN_TAG_KERNEL - 1) /* inaccessible memory ta= g */ +#define KASAN_TAG_MAX (KASAN_TAG_KERNEL - 2) /* maximum value for random = tags */ =20 -#ifdef CONFIG_KASAN_HW_TAGS -#define KASAN_TAG_MIN 0xF0 /* minimum value for random tags */ -#else +#ifndef KASAN_TAG_MIN #define KASAN_TAG_MIN 0x00 /* minimum value for random tags */ #endif =20 diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 81c83dcfcebe..c6febd1362e8 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -40,8 +40,7 @@ typedef unsigned int __bitwise kasan_vmalloc_flags_t; /* Software KASAN implementations use shadow memory. */ =20 #ifdef CONFIG_KASAN_SW_TAGS -/* This matches KASAN_TAG_INVALID. */ -#define KASAN_SHADOW_INIT 0xFE +#define KASAN_SHADOW_INIT KASAN_TAG_INVALID #else #define KASAN_SHADOW_INIT 0 #endif diff --git a/include/linux/mm.h b/include/linux/mm.h index 25d5c2395b40..b2245b1a25d8 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2210,7 +2210,7 @@ static inline u8 page_kasan_tag(const struct page *pa= ge) =20 if (kasan_enabled()) { tag =3D (page->flags.f >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK; - tag ^=3D 0xff; + tag ^=3D KASAN_TAG_KERNEL; } =20 return tag; @@ -2223,7 +2223,7 @@ static inline void page_kasan_tag_set(struct page *pa= ge, u8 tag) if (!kasan_enabled()) return; =20 - tag ^=3D 0xff; + tag ^=3D KASAN_TAG_KERNEL; old_flags =3D READ_ONCE(page->flags.f); do { flags =3D old_flags; @@ -2242,7 +2242,7 @@ static inline void page_kasan_tag_reset(struct page *= page) =20 static inline u8 page_kasan_tag(const struct page *page) { - return 0xff; + return KASAN_TAG_KERNEL; } =20 static inline void page_kasan_tag_set(struct page *page, u8 tag) { } diff --git a/include/linux/page-flags-layout.h b/include/linux/page-flags-l= ayout.h index 760006b1c480..b2cc4cb870e0 100644 --- a/include/linux/page-flags-layout.h +++ b/include/linux/page-flags-layout.h @@ -3,6 +3,7 @@ #define PAGE_FLAGS_LAYOUT_H =20 #include +#include #include =20 /* @@ -72,14 +73,6 @@ #define NODE_NOT_IN_PAGE_FLAGS 1 #endif =20 -#if defined(CONFIG_KASAN_SW_TAGS) -#define KASAN_TAG_WIDTH 8 -#elif defined(CONFIG_KASAN_HW_TAGS) -#define KASAN_TAG_WIDTH 4 -#else -#define KASAN_TAG_WIDTH 0 -#endif - #ifdef CONFIG_NUMA_BALANCING #define LAST__PID_SHIFT 8 #define LAST__PID_MASK ((1 << LAST__PID_SHIFT)-1) --=20 2.53.0 From nobody Sat Apr 4 18:31:13 2026 Received: from mail-24418.protonmail.ch (mail-24418.protonmail.ch [109.224.244.18]) (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 357403148C2 for ; Tue, 10 Mar 2026 17:53:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165231; cv=none; b=ELCZmPpDKb9YbuuoNuS5fNYpfHYOiDwTZydERObk+vkN9+c3RdKUJJlHlt6I1c5NcRBda5bkjhdGFSjqPoAsL9DyVu3SEdDj8sgUjDH+hq49sxUI4MqFHOpJ8tH7a/pqw45Jj7KS4H47AUAtmlzNtH0C4u4LVNPk0fZAn1E1dqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165231; c=relaxed/simple; bh=dx/n2ZSnVbr5KLV93z31YExmyUZ4EQEgGgGeMkJk0wo=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Qj+aOyKSR66ah0WdwkXcnZrquGwXEF1bN2rs775LQzOVAWkhHFf3iUbBgI0Dh62FuVssnNwMkxpxvZM5Cd9vCjFVYxN9dFeg4uok1Y9Xc7xHR9XWEe/bdV6Nn6qdZkNSbwyNGBX3AC973rp+TS0i0slB/S8puSQ+ugV9kNQ40Yg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=OCZ8/RHk; arc=none smtp.client-ip=109.224.244.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="OCZ8/RHk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165228; x=1773424428; bh=xt/M6F0af0Aewj/HTy9bWBamZzfKiE3bbOG01o2uFtM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=OCZ8/RHkyI35Q6A0yR+RlSOPGPYSk95DfrWBIY7p8V/viEvmzGZvUe8tjlMy+xUAb YZxSyBFVgunZn7wwh/cKKrJcpyOKdnJ8r3p0QarhThx67GQf5jtz6G5YUJ7oN8xy8Y gwCy+JoB0+WB81UMeFRkjNeFijQl7HDVHIH2yXFKehOcCWLk1PwOuT3kzta6lrLPbO ce3uP5sGBRxTzJYtMjqNV0eDGTI6tg3UD3pmNtXcNWqjcLwNp5Dv6h85HwMc0V7944 2NIOQgqQrciyfov6UbBS2oicOp2uhu8o5KV8TSes8yhIMlTRLul5B3gA/2Op2P9oi+ 1bCHAPg1pxXnw== Date: Tue, 10 Mar 2026 17:53:41 +0000 To: akpm@linux-foundation.org, Nathan Chancellor , Nicolas Schier , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Nick Desaulniers , Bill Wendling , Justin Stitt From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , kasan-dev@googlegroups.com, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH v11 03/15] kasan: Fix inline mode for x86 tag-based mode Message-ID: <257e64c7cf5ee94a5010bed60ae5f39d41af59cb.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 594cb8d8a1a8fb1968c30ad4a796e272e7b30e4e Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman The LLVM compiler uses hwasan-instrument-with-calls parameter to setup inline or outline mode in tag-based KASAN. If zeroed, it means the instrumentation implementation will be pasted into each relevant location along with KASAN related constants during compilation. If set to one all function instrumentation will be done with function calls instead. The default hwasan-instrument-with-calls value for the x86 architecture in the compiler is "1", which is not true for other architectures. Because of this, enabling inline mode in software tag-based KASAN doesn't work on x86 as the kernel script doesn't zero out the parameter and always sets up the outline mode. Explicitly zero out hwasan-instrument-with-calls when enabling inline mode in tag-based KASAN. Signed-off-by: Maciej Wieczor-Retman Reviewed-by: Andrey Konovalov Reviewed-by: Alexander Potapenko Reviewed-by: Andrey Ryabinin --- Changelog v9: - Add Andrey Ryabinin's Reviewed-by tag. Changelog v7: - Add Alexander's Reviewed-by tag. Changelog v6: - Add Andrey's Reviewed-by tag. Changelog v3: - Add this patch to the series. scripts/Makefile.kasan | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index 0ba2aac3b8dc..e485814df3e9 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -76,8 +76,11 @@ CFLAGS_KASAN :=3D -fsanitize=3Dkernel-hwaddress RUSTFLAGS_KASAN :=3D -Zsanitizer=3Dkernel-hwaddress \ -Zsanitizer-recover=3Dkernel-hwaddress =20 +# LLVM sets hwasan-instrument-with-calls to 1 on x86 by default. Set it to= 0 +# when inline mode is enabled. ifdef CONFIG_KASAN_INLINE kasan_params +=3D hwasan-mapping-offset=3D$(KASAN_SHADOW_OFFSET) + kasan_params +=3D hwasan-instrument-with-calls=3D0 else kasan_params +=3D hwasan-instrument-with-calls=3D1 endif --=20 2.53.0 From nobody Sat Apr 4 18:31:13 2026 Received: from mail-106121.protonmail.ch (mail-106121.protonmail.ch [79.135.106.121]) (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 D6CDB39DBCA for ; Tue, 10 Mar 2026 17:54:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.121 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165243; cv=none; b=JtPvvEdJehBM6DlLlNgeZn5PQfbDD9sM4zqyEX2dnrNTGPaDWzxTr2Gk14t6AIQtuxOYQZ3ztTnbL5TExcwopy4IOFYw4tVdNjlE24A175t2DNIoIW+KZhcRs4Ip+YnBQmbwxoptOjqvMvunelxcpwKNg2vv563gjZJhN9mpYKQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165243; c=relaxed/simple; bh=Ere6h+86XsUfa0vp2aO+ZmkoAOGqF8TahKzuihzNawE=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iWiK1JK40slvWAoJzNHUUw5SuOOU+I3AuWC0p9iPfjl12puvjAN1Mzt4mrfo9JyrvLBtEsdDBnboDxx9lf2ZMhYZ+9fhoPb7zcDJJq8PQNKBg6KQh6BCOIL6rZMPXOOHEqIvMV7kxys2LnCgDoYfHDwXJNe43V4KhqwQ0FsnhdM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=P+XiKjo2; arc=none smtp.client-ip=79.135.106.121 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="P+XiKjo2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165239; x=1773424439; bh=GAJ+J+1XntmG0XcWACMTfZBywC1fG1kbT1ZPvAKl7/I=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=P+XiKjo2WDhinx0LrZhoCyEO9Xz+s6vrjf4PAP6BYgEFfhhXNGL4WxkqcfRL5LKQd mRqR/n13Qr+TlRaDEPhsv8mhs8s/iECp5fYo4Xp38yrJa7pvqHKHYqP1bDdYRoRvWo hnFlILtUZ982lBU4y/339wXeTtL1Lwzj9znt1VKRLyrhc0dfpQ7av2ya+WO/tIW/qh xuXWGc7T+l0ECmd2r31w55ZhDRO8l+htirq7RNuBnsxn51eaMTCF6605eYD1apPZSZ N5AV4HhxU3wF/5eh72gUxCVPvZxkw135q/Dcu5vwt1P3+uVM4u4CMLu0RmrzAkk/Rl yclEgiNjw698w== Date: Tue, 10 Mar 2026 17:53:55 +0000 To: akpm@linux-foundation.org, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Axel Rasmussen , Yuanchu Xie , Wei Xu From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v11 04/15] x86/kasan: Add arch specific kasan functions Message-ID: <61a7cecb9f498a565d87508e434ea1d7df9623f1.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: e16ac0e855ec3772eef990d44995458f1f48bbd8 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman KASAN's software tag-based mode needs multiple macros/functions to handle tag and pointer interactions - to set, retrieve and reset tags from the top bits of a pointer. Mimic functions currently used by arm64 but change the tag's position to bits [60:57] in the pointer. Signed-off-by: Maciej Wieczor-Retman Reviewed-by: Andrey Ryabinin --- Changelog v9: - Rename KASAN_TAG_BYTE_MASK to KASAN_TAG_BITS_MASK. - Add Andrey Ryabinin's Reviewed-by tag. Changelog v7: - Add KASAN_TAG_BYTE_MASK to avoid circular includes and avoid removing KASAN_TAG_MASK from mmzone.h. - Remove Andrey's Acked-by tag. Changelog v6: - Remove empty line after ifdef CONFIG_KASAN_SW_TAGS - Add ifdef 64 bit to avoid problems in vdso32. - Add Andrey's Acked-by tag. Changelog v4: - Rewrite __tag_set() without pointless casts and make it more readable. Changelog v3: - Reorder functions so that __tag_*() etc are above the arch_kasan_*() ones. - Remove CONFIG_KASAN condition from __tag_set() arch/x86/include/asm/kasan.h | 42 ++++++++++++++++++++++++++++++++++-- include/linux/kasan-tags.h | 2 ++ include/linux/mmzone.h | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index d7e33c7f096b..c868ae734f68 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -3,6 +3,8 @@ #define _ASM_X86_KASAN_H =20 #include +#include +#include #define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) #define KASAN_SHADOW_SCALE_SHIFT 3 =20 @@ -24,8 +26,43 @@ KASAN_SHADOW_SCALE_SHIFT))) =20 #ifndef __ASSEMBLER__ +#include +#include +#include + +#ifdef CONFIG_KASAN_SW_TAGS +#define __tag_shifted(tag) FIELD_PREP(GENMASK_ULL(60, 57), tag) +#define __tag_reset(addr) (sign_extend64((u64)(addr), 56)) +#define __tag_get(addr) ((u8)FIELD_GET(GENMASK_ULL(60, 57), (u64)addr)) +#else +#define __tag_shifted(tag) 0UL +#define __tag_reset(addr) (addr) +#define __tag_get(addr) 0 +#endif /* CONFIG_KASAN_SW_TAGS */ + +#ifdef CONFIG_64BIT +static inline void *__tag_set(const void *__addr, u8 tag) +{ + u64 addr =3D (u64)__addr; + + addr &=3D ~__tag_shifted(KASAN_TAG_BITS_MASK); + addr |=3D __tag_shifted(tag & KASAN_TAG_BITS_MASK); + + return (void *)addr; +} +#else +static inline void *__tag_set(void *__addr, u8 tag) +{ + return __addr; +} +#endif + +#define arch_kasan_set_tag(addr, tag) __tag_set(addr, tag) +#define arch_kasan_reset_tag(addr) __tag_reset(addr) +#define arch_kasan_get_tag(addr) __tag_get(addr) =20 #ifdef CONFIG_KASAN + void __init kasan_early_init(void); void __init kasan_init(void); void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid= ); @@ -34,8 +71,9 @@ static inline void kasan_early_init(void) { } static inline void kasan_init(void) { } static inline void kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid) { } -#endif =20 -#endif +#endif /* CONFIG_KASAN */ + +#endif /* __ASSEMBLER__ */ =20 #endif diff --git a/include/linux/kasan-tags.h b/include/linux/kasan-tags.h index ad5c11950233..36cc4f70674a 100644 --- a/include/linux/kasan-tags.h +++ b/include/linux/kasan-tags.h @@ -10,6 +10,8 @@ #define KASAN_TAG_WIDTH 0 #endif =20 +#define KASAN_TAG_BITS_MASK ((1UL << KASAN_TAG_WIDTH) - 1) + #ifndef KASAN_TAG_KERNEL #define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ #endif diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 7bd0134c241c..2bd4f9eb1ea7 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1269,7 +1269,7 @@ static inline bool zone_is_empty(const struct zone *z= one) #define NODES_MASK ((1UL << NODES_WIDTH) - 1) #define SECTIONS_MASK ((1UL << SECTIONS_WIDTH) - 1) #define LAST_CPUPID_MASK ((1UL << LAST_CPUPID_SHIFT) - 1) -#define KASAN_TAG_MASK ((1UL << KASAN_TAG_WIDTH) - 1) +#define KASAN_TAG_MASK KASAN_TAG_BITS_MASK #define ZONEID_MASK ((1UL << ZONEID_SHIFT) - 1) =20 static inline enum zone_type memdesc_zonenum(memdesc_flags_t flags) --=20 2.53.0 From nobody Sat Apr 4 18:31:13 2026 Received: from mail-106120.protonmail.ch (mail-106120.protonmail.ch [79.135.106.120]) (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 84C9C31715E for ; Tue, 10 Mar 2026 17:54:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.120 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165256; cv=none; b=b762bXdY3TaMOROupWbZsTSCOeacYbu8haK8ceqoqDA0ynme/PHvVMuLAcmX1zmpfgx9gdOFfYx7Ml7SSbamNrW4aVAjbKC/aY7keqxrDIoN06aXQnES8a4iid3y8WUnxGLPhnG1heh6+gaIWmxzlLvkCGUpv8LVcA5qP/X7WvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165256; c=relaxed/simple; bh=7AFthwAm+gatT35eXeU/LM3MuDQxV8VZ/+uxZ3AfbIU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tlff5jno4J9jmk7C1OW+5VhrqJ02id1YDLkhTjvM+jBjbb32xI/JfydwYidUjn8whzLNFe7HOU/QlsPSxbjzj1j+w8d22YmP2P247CWDiD3ouvbYD4gHBRGfetmg/N+YogWoPiYuqKtiFfslHlWD+zCNbcoBCUt+07vZYNXgRYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=ekBW0fZ9; arc=none smtp.client-ip=79.135.106.120 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="ekBW0fZ9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165247; x=1773424447; bh=P/sihZxhx1D4j95rOaUZIBK6YpmtfpmdHtZkQ0gkPEM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ekBW0fZ9U0pFISQm13VX4gPINMRAG+aUrcMWRdpMtPRYjiU0o+vByxhUb1KF1Zi61 Wj473fxX6LRdP1689VmXcolWLtRbnuQMbnCSFTT0HnvSGZCJhAiYKD0D7nCcfKifzX HTY1ILTnG0Nyth8kynBh5MW/Pwhvgo11LIrvfIhbZzBxzSqTaCk5i/0cajygRZfq6t 6NvpEnFTccnFzqCGSRX8GyxjJI90FXOM/LW8dy6lv5IMqSYssjzRpELia5E7dIXmJM Ezo35ZY2MrgXFt7FrYeylzao0kUrtt89z6DpWmmigWEmVo3++MY62NHhmLVacFeYDz luP/kVPGs1tpQ== Date: Tue, 10 Mar 2026 17:54:02 +0000 To: akpm@linux-foundation.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , linux-kernel@vger.kernel.org Subject: [PATCH v11 05/15] x86/mm: Reset pointer tag in x - __START_KERNEL_map instances Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 5d63b0e957ace989d8e72826c150df393d957212 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman With KASAN software tag-based mode arbitrary kernel pointers can be tagged, and any place where pointer arithmetic is used to convert a virtual address into a physical one can raise errors if the virtual address is tagged. To lower the amount of lines added it's beneficial to move the similar pointer arithmetic to a helper first. Reset the tag in the __phys_addr_kernel_start() which plugs into all the relevant virtual to physical address helpers. Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: - Split off this patch from the tag reset patch. Move x - __START_KERNEL_map to a helper so less lines are added. arch/x86/include/asm/page_64.h | 11 +++++++++-- arch/x86/mm/physaddr.c | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index 1895c207f629..9260a0d693d6 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLER__ #include #include +#include =20 #include #include @@ -20,9 +21,15 @@ extern unsigned long vmalloc_base; extern unsigned long vmemmap_base; extern unsigned long direct_map_physmem_end; =20 +static __always_inline unsigned long __phys_addr_kernel_start(unsigned lon= g x) +{ + x =3D __tag_reset(x); + return x - __START_KERNEL_map; +} + static __always_inline unsigned long __phys_addr_nodebug(unsigned long x) { - unsigned long y =3D x - __START_KERNEL_map; + unsigned long y =3D __phys_addr_kernel_start(x); =20 /* use the carry flag to determine if x was < __START_KERNEL_map */ x =3D y + ((x > y) ? phys_base : (__START_KERNEL_map - PAGE_OFFSET)); @@ -38,7 +45,7 @@ extern unsigned long __phys_addr(unsigned long); =20 static inline unsigned long __phys_addr_symbol(unsigned long x) { - unsigned long y =3D x - __START_KERNEL_map; + unsigned long y =3D __phys_addr_kernel_start(x); =20 /* only check upper bounds since lower bounds will trigger carry */ VIRTUAL_BUG_ON(y >=3D KERNEL_IMAGE_SIZE); diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c index 8d31c6b9e184..682e23541228 100644 --- a/arch/x86/mm/physaddr.c +++ b/arch/x86/mm/physaddr.c @@ -14,7 +14,7 @@ #ifdef CONFIG_DEBUG_VIRTUAL unsigned long __phys_addr(unsigned long x) { - unsigned long y =3D x - __START_KERNEL_map; + unsigned long y =3D __phys_addr_kernel_start(x); =20 /* use the carry flag to determine if x was < __START_KERNEL_map */ if (unlikely(x > y)) { @@ -35,7 +35,7 @@ EXPORT_SYMBOL(__phys_addr); =20 bool __virt_addr_valid(unsigned long x) { - unsigned long y =3D x - __START_KERNEL_map; + unsigned long y =3D __phys_addr_kernel_start(x); =20 /* use the carry flag to determine if x was < __START_KERNEL_map */ if (unlikely(x > y)) { --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-10631.protonmail.ch (mail-10631.protonmail.ch [79.135.106.31]) (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 E0AC639DBF7 for ; Tue, 10 Mar 2026 17:54:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165257; cv=none; b=sjSbKzPNsfkP0NqmZLjOBMQ7ST6vsI9u3qdKSQTuDy6B+5Vch6Aj+hbf87MDSmGarZFMQmIbqweVq6wkfTxr4wDljCGkvbuIkFjXHh+FU9ZctMwNTY77W987L7Y2pdn8ZJ3ku1pmBqoD/7g+BhhB/yfuaYX6D1ccCod9qdfTOkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165257; c=relaxed/simple; bh=SvJ6a6fq/dRY4+jKRj20knTvDJMidqc6MDB53Daeuhc=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Aa+6MgnmqjZ6nfmzlMWifBhCVXATJbvGRJAWCG/4LRcsVGwBq9pdK546cEfkaVE73ldS89DRwbkkqm6bmaapFvrxhCdSJzMRq4NOqM1qvRMYMMzDMXD7A+WKMnJrE0wakq9N/9lK6gjk0e9NDW+Jb4Kx9WuTPHcshas8RJFhofo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=I3sUpFOI; arc=none smtp.client-ip=79.135.106.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="I3sUpFOI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165253; x=1773424453; bh=xYzT9pUJ33fciEEYHLErzOjZWjIu4mssUSjNvzdqw84=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=I3sUpFOIrb0QB5EzsPsVdPlNOpVbfpHLEIFJQeylmc0o9iLyg5d30OqYqf74C9PEt RxuA3WzuNAsFr9ULBmNwM/R6q310ubpG5zMPLnSj8NrahepZxdw9FFYzh8zrDewQik Q+C99HzEX98wp3AL5hhD5rDIhZk9HpP0T3YASmLQ4jR4m7lhEPy5rvBV99WZHTb6Ap LQb0JdgMolcKL7naA7a8LT3bnoSH6+T/ea4fC83VoDovOCHQmt3is2Q4jssmokQ/XV VYE1OSvIOG1j2JVFfqGlypQEZkNX39kCtNRTrCb6+LvwUXH13MrQ8zkE8ZfYM6zqvM r7E5fhO3jM/lA== Date: Tue, 10 Mar 2026 17:54:09 +0000 To: akpm@linux-foundation.org, Catalin Marinas , Will Deacon , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Subject: [PATCH v11 06/15] kasan: arm64: x86: Make page_to_virt() KASAN aware Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: a95af21cc490f13be9b2b1108f966a54feb03d3d Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman Special page_to_virt() implementation is needed if an architecture wants to enable KASAN software tag-based mode. Make page_to_virt() KASAN aware in arch-independent code so architectures implementing the software tag-based mode don't have to define their own implementations anymore. When KASAN is disabled or for architectures that don't implement the software tag-based mode page_to_virt() will be optimized to it's previous form. Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: - Redo the patch to work on the page_to_virt macro. Split off changes about virt to phys conversion to an earlier patch. - Remove Alexander's acked-by due to bigger changes. Changelog v7: - Add Alexander's Acked-by tag. Changelog v5: - Move __tag_reset() calls into __phys_addr_nodebug() and __virt_addr_valid() instead of calling it on the arguments of higher level functions. Changelog v4: - Simplify page_to_virt() by removing pointless casts. - Remove change in __is_canonical_address() because it's taken care of in a later patch due to a LAM compatible definition of canonical. arch/arm64/include/asm/memory.h | 5 ----- include/linux/kasan.h | 10 ++++++++++ include/linux/mm.h | 5 ++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memor= y.h index 875c0bd0d85a..39dd0071d3ec 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -411,11 +411,6 @@ static inline unsigned long virt_to_pfn(const void *ka= ddr) */ =20 #if defined(CONFIG_DEBUG_VIRTUAL) -#define page_to_virt(x) ({ \ - __typeof__(x) __page =3D x; \ - void *__addr =3D __va(page_to_phys(__page)); \ - (void *)__tag_set((const void *)__addr, page_kasan_tag(__page));\ -}) #define virt_to_page(x) pfn_to_page(virt_to_pfn(x)) #else #define page_to_virt(x) ({ \ diff --git a/include/linux/kasan.h b/include/linux/kasan.h index c6febd1362e8..58cf02af4fa5 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -527,6 +527,11 @@ static inline void *kasan_reset_tag(const void *addr) return (void *)arch_kasan_reset_tag(addr); } =20 +static inline void *kasan_set_tag(const void *addr, u8 tag) +{ + return (void *)arch_kasan_set_tag(addr, tag); +} + /** * kasan_report - print a report about a bad memory access detected by KAS= AN * @addr: address of the bad access @@ -544,6 +549,11 @@ static inline void *kasan_reset_tag(const void *addr) return (void *)addr; } =20 +static inline void *kasan_set_tag(const void *addr, u8 tag) +{ + return (void *)addr; +} + #endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS*/ =20 #ifdef CONFIG_KASAN_HW_TAGS diff --git a/include/linux/mm.h b/include/linux/mm.h index b2245b1a25d8..044425db766e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -117,7 +117,10 @@ extern int mmap_rnd_compat_bits __read_mostly; #endif =20 #ifndef page_to_virt -#define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x))) +#define page_to_virt(x) ({ \ + void *__addr =3D __va(PFN_PHYS(page_to_pfn((struct page *)x))); \ + kasan_set_tag(__addr, page_kasan_tag(x)); \ +}) #endif =20 #ifndef lm_alias --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-244122.protonmail.ch (mail-244122.protonmail.ch [109.224.244.122]) (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 88A553D16EC for ; Tue, 10 Mar 2026 17:54:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165262; cv=none; b=c96Arh/4vRzTtH14hb4cKPyWoKzyGojLUcq9A2weugYavKlcJTl9fzf6FnzWfohY2uP3ciukBaGo6Oae4aGUdZHjTyMvWVZX/Lr6/D9UJ6BxyBBB/lzB4EiVS+E9Vdirm1s4skzcR1qdB09zhioeeAvBaVufCS9k+Np7XaNBrbE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165262; c=relaxed/simple; bh=MMsvaOYS9WFGFsv0xef/+D1HF477/R2DbSptCzjsc5M=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=O0k0iROnYujTLtjZ9dqku9riIXL7NAPM8fvApFSKuWJU68DpADm/+/lVpFRwfIl4uanDwYt/6D9IKLJd0KfYOQViVYS5ehZCX9gxZb+XIv0FY+eSDu5RScWO69QuzoMkh567H8dJe+Nuyc0PG/jMr95jdrSC6g8xYASiQf6Rzzg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=TdeiI5Eg; arc=none smtp.client-ip=109.224.244.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="TdeiI5Eg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165258; x=1773424458; bh=zjM37d5NXgOfN+BbnN5wcd6ufgE9HwUJahACByQ/mOc=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=TdeiI5EgKkUmx6lLx62juUTEtbY42Vnt9sE017+UF2+eCFw2FmEWtRhxWnRq9PDZT ojOs2S3zIaUYSZQL+Bzku1FeFz8vDKAbCB+BXQTiGPd+wzgpsGrN0wLZT1qGfviDJp B/RLawSOqIcEmfu4lm3kXkT0+MiOzc5eK8JoJDVHIZ5aAXbizMRIbL11vsL1s4Yupi onz25zm55NCQm4OoD+Gu1c6iEUSNyrG5+DYyNJq2gIP7Hii4iSWVElakf0XS+r2WY9 vI6p55YyVL1P4rgd6/TS3X7TQs9HNwQVOsIgP+MVuW4i7mtNZdVzAjp5rI3S9DQlpY m2AfwK8Xf4lXQ== Date: Tue, 10 Mar 2026 17:54:14 +0000 To: akpm@linux-foundation.org, Mike Rapoport , Uladzislau Rezki From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , Alexander Potapenko , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 07/15] mm/execmem: Untag addresses in EXECMEM_ROX related pointer arithmetic Message-ID: <46124025a71405bd5d830496c79baee047a1f3f3.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 1f2018ca438a91b582bccc0718962a32e2496492 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman ARCH_HAS_EXECMEM_ROX was re-enabled in x86 at Linux 6.14 release. vm_reset_perms() calculates range's start and end addresses using min() and max() functions. To do that it compares pointers but, with KASAN software tags mode enabled, some are tagged - addr variable is, while start and end variables aren't. This can cause the wrong address to be chosen and result in various errors in different places. Reset tags in the address used as function argument in min(), max(). execmem_cache_add() adds tagged pointers to a maple tree structure, which then are incorrectly compared when walking the tree. That results in different pointers being returned later and page permission violation errors panicking the kernel. Reset tag of the address range inserted into the maple tree inside execmem_vmalloc() which then gets propagated to execmem_cache_add(). Signed-off-by: Maciej Wieczor-Retman Acked-by: Alexander Potapenko Acked-by: Mike Rapoport (Microsoft) --- Changelog v10: - Add Mike's acked-by tag. Changelog v7: - Add Alexander's acked-by tag. - Add comments on why these tag resets are needed (Alexander) Changelog v6: - Move back the tag reset from execmem_cache_add() to execmem_vmalloc() (Mike Rapoport) - Rewrite the changelogs to match the code changes from v6 and v5. Changelog v5: - Remove the within_range() change. - arch_kasan_reset_tag -> kasan_reset_tag. Changelog v4: - Add patch to the series. mm/execmem.c | 9 ++++++++- mm/vmalloc.c | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mm/execmem.c b/mm/execmem.c index 810a4ba9c924..dc7422222cf7 100644 --- a/mm/execmem.c +++ b/mm/execmem.c @@ -59,7 +59,14 @@ static void *execmem_vmalloc(struct execmem_range *range= , size_t size, return NULL; } =20 - return p; + /* + * Resetting the tag here is necessary to avoid the tagged address + * ending up in the maple tree structure. There it's linear address + * can be incorrectly compared with other addresses which can result in + * a wrong address being picked down the line and for example a page + * permission violation error panicking the kernel. + */ + return kasan_reset_tag(p); } =20 struct vm_struct *execmem_vmap(size_t size) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index c607307c657a..67406e42c4d0 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -3361,7 +3361,12 @@ static void vm_reset_perms(struct vm_struct *area) * the vm_unmap_aliases() flush includes the direct map. */ for (i =3D 0; i < area->nr_pages; i +=3D 1U << page_order) { - unsigned long addr =3D (unsigned long)page_address(area->pages[i]); + /* + * Addresses' tag needs resetting so it can be properly used in + * the min() and max() below. Otherwise the start or end values + * might be favoured. + */ + unsigned long addr =3D (unsigned long)kasan_reset_tag(page_address(area-= >pages[i])); =20 if (addr) { unsigned long page_size; --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-106119.protonmail.ch (mail-106119.protonmail.ch [79.135.106.119]) (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 627F02D592D for ; Tue, 10 Mar 2026 17:54:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.119 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165271; cv=none; b=u5FS7kzc/3Jms3GU/zINQvZAiWwhiCiq0RB84HazBhcE/kcfCximYwY/x34TPCl/7I+39c6L6VjXL+4XEIqHVuTXEfn4M1p1WM4F/6RZCCrw6/4mkiBj+20OZFwQzLb11dKk6Hwz248Mu/21If4p+wB2Iz0zgw8qXRwvEpa7xqk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165271; c=relaxed/simple; bh=IrdPXXebpwRuiG3UcmBGZipuHvApjSHn/WQXzPro91E=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=m/QOL4wB39MVFkHCmbcbI63QasUWii0KGaQA55l5rrR3sBFUhWgZBF3wtGBCCcDCgyQhVbloJErS2yZIEY3sAWcZmxj+ob3eqtx0ZAjTjEgCQmz2MfCzJwaOikYjNElBJZHf7BNKEOPGCFQqnSS3uAwA8gJ5bx39p/kMHU6AT68= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=DGa4o0jj; arc=none smtp.client-ip=79.135.106.119 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="DGa4o0jj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165262; x=1773424462; bh=fLHwEkOWFBQMUpvTpaURzpC8jNFoLdOQa4MBEpchEew=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=DGa4o0jjMJckM2EwACNCt9zB2oXsyIy1niDdC5UOawSo3XCZrajXtwz2vyqVDqwXg AodPT9MiMhE3/u4Cx7i+cnZPwye8MPjj+aDqdTKvfaiGEPUrz4EJBbSvJFEFiajFvc /OufyFDB+vhCDzUqdkFCineedHpcq8Jfg9XArIUlmEj2X5Ohi8VON0l3FL3W6/7WjN 7PgTjdH+ZQ92O1yDxig3q6Hpoit1L2PERXfhV5NF3adwN3eLY15M05BRYmm8ljLAP0 cXsmd0nR4yhpYDZaVUJdjaAb347RwC82j3DsbOGtZog/c3zx2ikfD3FUb9npeQopzW 6+9jwUfHWQn8g== Date: Tue, 10 Mar 2026 17:54:20 +0000 To: akpm@linux-foundation.org, Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , linux-kernel@vger.kernel.org Subject: [PATCH v11 08/15] x86/mm: Use physical address comparisons in fill_p*d/pte Message-ID: <4e6b9f78698b2e0da3c2cb0a310b206cc98e19bf.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 23a9ef37b30aa27f9a0f72f5d9c2b4b5c3329e6e Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman Calculating page offset returns a pointer without a tag. When comparing the calculated offset to a tagged page pointer an error is raised because they are not equal. Change pointer comparisons to physical address comparisons as to avoid issues with tagged pointers that pointer arithmetic would create. Open code pte_offset_kernel(), pmd_offset(), pud_offset() and p4d_offset(). Because one parameter is always zero and the rest of the function insides are enclosed inside __va(), removing that layer lowers the complexity of final assembly. Signed-off-by: Maciej Wieczor-Retman Acked-by: Dave Hansen --- Changelog v11: - Add Dave's Acked-by. Changelog v9: - Rename patch title so it fits the tip standards. Changelog v7: - Swap ternary operator outcomes in fill_p4d since the order was incorrect. Changelog v2: - Open code *_offset() to avoid it's internal __va(). arch/x86/mm/init_64.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index df2261fa4f98..dd9f15ab8b86 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -269,7 +269,10 @@ static p4d_t *fill_p4d(pgd_t *pgd, unsigned long vaddr) if (pgd_none(*pgd)) { p4d_t *p4d =3D (p4d_t *)spp_getpage(); pgd_populate(&init_mm, pgd, p4d); - if (p4d !=3D p4d_offset(pgd, 0)) + + if (__pa(p4d) !=3D (pgtable_l5_enabled() ? + (unsigned long)pgd_val(*pgd) & PTE_PFN_MASK : + __pa(pgd))) printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n", p4d, p4d_offset(pgd, 0)); } @@ -281,7 +284,7 @@ static pud_t *fill_pud(p4d_t *p4d, unsigned long vaddr) if (p4d_none(*p4d)) { pud_t *pud =3D (pud_t *)spp_getpage(); p4d_populate(&init_mm, p4d, pud); - if (pud !=3D pud_offset(p4d, 0)) + if (__pa(pud) !=3D (p4d_val(*p4d) & p4d_pfn_mask(*p4d))) printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n", pud, pud_offset(p4d, 0)); } @@ -293,7 +296,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr) if (pud_none(*pud)) { pmd_t *pmd =3D (pmd_t *) spp_getpage(); pud_populate(&init_mm, pud, pmd); - if (pmd !=3D pmd_offset(pud, 0)) + if (__pa(pmd) !=3D (pud_val(*pud) & pud_pfn_mask(*pud))) printk(KERN_ERR "PAGETABLE BUG #02! %p <-> %p\n", pmd, pmd_offset(pud, 0)); } @@ -305,7 +308,7 @@ static pte_t *fill_pte(pmd_t *pmd, unsigned long vaddr) if (pmd_none(*pmd)) { pte_t *pte =3D (pte_t *) spp_getpage(); pmd_populate_kernel(&init_mm, pmd, pte); - if (pte !=3D pte_offset_kernel(pmd, 0)) + if (__pa(pte) !=3D (pmd_val(*pmd) & pmd_pfn_mask(*pmd))) printk(KERN_ERR "PAGETABLE BUG #03!\n"); } return pte_offset_kernel(pmd, vaddr); --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-244123.protonmail.ch (mail-244123.protonmail.ch [109.224.244.123]) (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 839003D47D9 for ; Tue, 10 Mar 2026 17:54:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.123 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165280; cv=none; b=lnDj+tZqRyqejQc34GnQGeASD0x8m3waO0n3IXBMiQ5Hd6zrziHAa6jBI2yQoNjIcUYym2bCfnvec+MXEAluZglOiDuUCuUD8fW2I8fyN3a9XwjcZqUxFQm+1hYhORtdX5Zoi76Umt58uZIBHONccNRY4sWbhv+J6S/kMYnhK7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165280; c=relaxed/simple; bh=V+RVEeTIiyKE2lGOZ60G1elPpCREDpubZZJqoJxO+jY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GEYvFkHxzFLo862/N0gNerUyVC/q9SUtiVxDJ+NtlTgjEVVWOK8zp4LaGINZT0+LNvgIIKlH2SN9UAF9bW+ipiUkBJR1ceGoIxYuWrNcXaYw4CzTbQZUwOoDmQI+g4f+XN06MUWfc1pquRvoLTlUlFfehjNKaq+Lmtm85tqGrEk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=Nen7Z1t0; arc=none smtp.client-ip=109.224.244.123 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="Nen7Z1t0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165270; x=1773424470; bh=svfiyvtEE/lqQ8xsx5lT5DL7oiLrvzGxpb3VchVEZvw=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Nen7Z1t0M7fJ3iFzrDj2t5PUZSfD18+/ZHvqQecnizVXpYnj7r19JvVBfSkCojqnv ksfYwaP+ASraiJKUqcx9Uy3B1RHU/3ep2D6M0jeNkekqK086jnOiQEaUIpMc4tMHgN xWZZihkhXFr99y+Gis1eOtBq8+f1WM0XnW++9orfm/08pOQLV6jTr3fgfbwzdZ084r MhqasV3kzxV+h8t/fsLbIHHUDWnFny4kao9kDznxqBJDdLPZzxfzS8nMzc8DgYa3Av 6ZcGOHFuixL+Y0yBHRbX9H8j/n9wFxMB1ziPw0q0ePwSUO/YhjoADnJa/aLU6kFNuN GJLipxQYLTQBw== Date: Tue, 10 Mar 2026 17:54:25 +0000 To: akpm@linux-foundation.org, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH v11 09/15] x86/kasan: Initialize KASAN raw shadow memory Message-ID: <0720e3a668219f11cd11e46eefb0717469829ee8.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 55e15ba340631198bdb8c85e0cd8788689b7a3a0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman In KASAN's generic mode the default value in shadow memory is zero. During initialization of shadow memory pages they are allocated and zeroed. In KASAN's tag-based mode the default tag for the arm64 architecture is 0xFE which corresponds to any memory that should not be accessed. On x86 (where tags are 4-bit wide instead of 8-bit wide) that tag is 0xE so during the initializations all the bytes in shadow memory pages should be filled with it. Use memblock_alloc_try_nid_raw() instead of memblock_alloc_try_nid() to avoid zeroing out the memory so it can be set with the KASAN invalid tag. Signed-off-by: Maciej Wieczor-Retman Reviewed-by: Alexander Potapenko Reviewed-by: Andrey Ryabinin --- Changelog v9: - Rename patch title so it fits the tip standards. - Add Andrey Ryabinin's Reviewed-by tag. Changelog v7: - Fix flipped arguments in memset(). - Add Alexander's reviewed-by tag. Changelog v2: - Remove dense mode references, use memset() instead of kasan_poison(). arch/x86/mm/kasan_init_64.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 998b6010d6d3..7f5c11328ec1 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -34,6 +34,18 @@ static __init void *early_alloc(size_t size, int nid, bo= ol should_panic) return ptr; } =20 +static __init void *early_raw_alloc(size_t size, int nid, bool should_pani= c) +{ + void *ptr =3D memblock_alloc_try_nid_raw(size, size, + __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid); + + if (!ptr && should_panic) + panic("%pS: Failed to allocate page, nid=3D%d from=3D%lx\n", + (void *)_RET_IP_, nid, __pa(MAX_DMA_ADDRESS)); + + return ptr; +} + static void __init kasan_populate_pmd(pmd_t *pmd, unsigned long addr, unsigned long end, int nid) { @@ -63,8 +75,9 @@ static void __init kasan_populate_pmd(pmd_t *pmd, unsigne= d long addr, if (!pte_none(*pte)) continue; =20 - p =3D early_alloc(PAGE_SIZE, nid, true); - entry =3D pfn_pte(PFN_DOWN(__pa(p)), PAGE_KERNEL); + p =3D early_raw_alloc(PAGE_SIZE, nid, true); + memset(p, KASAN_SHADOW_INIT, PAGE_SIZE); + entry =3D pfn_pte(PFN_DOWN(__pa_nodebug(p)), PAGE_KERNEL); set_pte_at(&init_mm, addr, pte, entry); } while (pte++, addr +=3D PAGE_SIZE, addr !=3D end); } @@ -436,7 +449,7 @@ void __init kasan_init(void) * it may contain some garbage. Now we can clear and write protect it, * since after the TLB flush no one should write to it. */ - memset(kasan_early_shadow_page, 0, PAGE_SIZE); + memset(kasan_early_shadow_page, KASAN_SHADOW_INIT, PAGE_SIZE); for (i =3D 0; i < PTRS_PER_PTE; i++) { pte_t pte; pgprot_t prot; --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-10631.protonmail.ch (mail-10631.protonmail.ch [79.135.106.31]) (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 51E503C9434 for ; Tue, 10 Mar 2026 17:54:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165278; cv=none; b=BhXdLRAjy1Zx7CjJGLnn14UQvMtzNn5H1RTl6ftXACE9Mgl2sZMGV3uAVo/y2zAmhGFTKmxBEi0EhfXfBmt65VoOuSgymKLUDhWNFMvjDTu5kb+Kcd8HYS3YGgvLG9esOc6tD6NlcwSQOUFqMZ+gPY0pUCmGiOjE4MWdwtOAkro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165278; c=relaxed/simple; bh=HEk3URbZ/6THzIJGq7fLcDOYJTGoprphT19QGX3qyP0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=V94PU735yAezjcWVa4gM4k4k3+avIrK3luV5uMluGk+zlGZRrI/tU0WGx1cBimiAjG57kI8zC+sNe2X+AzVajNJjzP+ZozZJOzL9UDOtNxYGnpg0i/5FbuwfeMMRvfQYO3Hk33MhNUOiHh+oklxoLf1JKPAhNOwsdTkvAPkRfUg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=XMswb6H/; arc=none smtp.client-ip=79.135.106.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="XMswb6H/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165275; x=1773424475; bh=dJUPQVhZMRfdzveegBvIFV3TwRa6qj795ujvLrKLhXQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=XMswb6H/xTsm2H7K6hvQfCbWwL7EgpBZ+/8GskZ9viHDLdz7cq36jJpgj9mfxjzz6 0uugYLxoT1T8psI53aMt7JjfrXB7yKukq3cWdRoyE2rd4xKUHwsIkFyNk+MHS3SF5j sJSVRNxNWt0gip0FqBNJ7Qhg4QOAXm/p3buKYmahm2X95QU0ciVENWziXG+4mmkE7a yFG94KmjYVxwNw54INZXLQLJ/AdxVQIVZrgwwQH5eHCdfs6zNvkmw4h51eN8ClHOF+ WYrqUflMBcEX/wXPW3W9v3wl5fCQxfzU2+0b0Rvb965B6reC71aVG//hfu2Vb1xf0z W0sIDI6Eo8RnQ== Date: Tue, 10 Mar 2026 17:54:31 +0000 To: akpm@linux-foundation.org, Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , linux-kernel@vger.kernel.org Subject: [PATCH v11 10/15] x86/mm: Reset tags in a canonical address helper call Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: ef56dda76c5004d38bc6843ff4498539a79960e1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman With KASAN software tag-based mode arbitrary kernel pointers can be tagged. __is_canonical_address() helper can cause issues when met with tagged pointers that expect the loosened canonicality checks. The function itself shouldn't be made LAM-aware since for example in KVM, where it's used extensively - it's not practical to deal with differences between host and guest which might want a different LAM state. Also by the time __is_canonical_address() is invoked KVM has already done any necessary LAM unmasking. Reset the address' tag early in copy_from_kernel_nofault_allowed() so pointer arithmetic checks before a __is_canonical_address() call can work properly. Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: - Reset tag earlier in copy_from_kernel_nofault_allowed() so the is_vsyscall_vaddr() can properly check tagged pointers. - Redo the patch message. Changelog v9: - Redo the patch to not break KVM. - Remove Alexander's acked-by tag. Changelog v7: - Add Alexander's acked-by tag. - Add parentheses around vaddr_bits as suggested by checkpatch. - Apply the bitmasks to the __canonical_address() function which is used in kvm code. Changelog v6: - Use bitmasks to check both kernel and userspace addresses in the __is_canonical_address() (Dave Hansen and Samuel Holland). Changelog v4: - Add patch to the series. arch/x86/mm/maccess.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/mm/maccess.c b/arch/x86/mm/maccess.c index 42115ac079cf..7d8fa58b61b8 100644 --- a/arch/x86/mm/maccess.c +++ b/arch/x86/mm/maccess.c @@ -9,6 +9,7 @@ bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size) { unsigned long vaddr =3D (unsigned long)unsafe_src; + vaddr =3D __tag_reset(vaddr); =20 /* * Do not allow userspace addresses. This disallows --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-24416.protonmail.ch (mail-24416.protonmail.ch [109.224.244.16]) (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 BD8163D8133 for ; Tue, 10 Mar 2026 17:54:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165283; cv=none; b=Nerp66F7+V3FYt7ooAWeLJvfphAK7MxInPIcLWK6GYkvmaZhg9RsBBKs0Gj97mO7dsY5242YM4O+GblB0ldSkNICAG/lX1bKse1wzq5l5vS7DNHkC3GeBAejZEehREO8KJVr9W5vypYuw61mBjc3y5d+3Ao27HtIqSpj2FuzbRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165283; c=relaxed/simple; bh=3dk+frueDuHQjriFgAHAMkt4rUMWp604vJfW3rYS4JA=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jdTTEpw6MaYxwkd956D8QCwJmPVHghZ12yilsbrDbQ3eGuzOM3LwTV0sNAlwXa0nDX9crcufOb9WPjb8jK8UmNF6gcPr/2HePIdtXot/CvzMg6NM0NFqyja2PW4odC/RCggdmuwRP/sAUV1f3GlzzQDtjH/aHWAxk6dvFRz7MY0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=aUgMhbIx; arc=none smtp.client-ip=109.224.244.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="aUgMhbIx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165279; x=1773424479; bh=unipzal6Mh5Coy7VvqackQjj3jPPOlgMpAcUBvdM8Gg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=aUgMhbIxKT3ySXWftqfDg/1yncRcL1gkUJ8z8o5q4rWzucKb6TdpI0SQDhDSc6x/3 Xx6RNciGKljqssT8L4hZ58Wy6Q/SoRvVKqZd8y0YRjKwzuhA0LWB+PgehDlbG+WHMc gtlXQPow0iwPkCKDKVWzgFYimd+2HpDf0u8IMFiOSYdE7E6fquWKq23d/wjLzmoBGT LryWVJj7xUDHeNaJfgCoxJ8MvK/xdzLVhlMfmKOgXmSrEZuk4YOEB6adTM5wmNAsNX 5w3D7ZWmxn+Q99EJUz+ulUG2uIFnf74Zv8EHnKBWDhn2PpkMCWXmie/wHoyFJ8GtfF 0ELFcaBzuRCbg== Date: Tue, 10 Mar 2026 17:54:37 +0000 To: akpm@linux-foundation.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , Alexander Potapenko , linux-kernel@vger.kernel.org Subject: [PATCH v11 11/15] x86/mm: Initialize LAM_SUP Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 4bb4271a3fcf87066663522d0d22fd74051cfcfd Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman To make use of KASAN's tag based mode on x86, Linear Address Masking (LAM) needs to be enabled. To do a bit in CR4 has to be set. When launching secondary CPUs the LAM CR4 bit needs to be added to a mask in head_64.S. Bits that are not part of that mask are cleared when secondary CPUs are getting enabled by the primary one. Signed-off-by: Maciej Wieczor-Retman Acked-by: Alexander Potapenko --- Changelog v11: - Redo the patch message according to Dave's suggestions. Changelog v9: - Rename patch title so it fits the tip standards. Changelog v7: - Add Alexander's acked-by tag. Changelog v6: - boot_cpu_has() -> cpu_feature_enabled() arch/x86/kernel/head_64.S | 3 +++ arch/x86/mm/init.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index cbf7647a25d8..253667acd8a5 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -209,6 +209,9 @@ SYM_INNER_LABEL(common_startup_64, SYM_L_LOCAL) * there will be no global TLB entries after the execution." */ movl $(X86_CR4_PAE | X86_CR4_LA57), %edx +#ifdef CONFIG_ADDRESS_MASKING + orl $X86_CR4_LAM_SUP, %edx +#endif #ifdef CONFIG_X86_MCE /* * Preserve CR4.MCE if the kernel will enable #MC support. diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index fb67217fddcd..11804ccf2fbb 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -763,6 +763,9 @@ void __init init_mem_mapping(void) probe_page_size_mask(); setup_pcid(); =20 + if (cpu_feature_enabled(X86_FEATURE_LAM) && IS_ENABLED(CONFIG_KASAN_SW_TA= GS)) + cr4_set_bits_and_update_boot(X86_CR4_LAM_SUP); + #ifdef CONFIG_X86_64 end =3D max_pfn << PAGE_SHIFT; #else --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-106119.protonmail.ch (mail-106119.protonmail.ch [79.135.106.119]) (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 220753D811A for ; Tue, 10 Mar 2026 17:54:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.119 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165288; cv=none; b=JtBEvc3taXxQVqamtn0MMEIfzhIPKBWjBegfOi/iMXaOn8tIbNyRgQYBZxyjdNtWJ8uBZKti4aqsWwyH5gYtgPBMRjSaa5u6KX3bBwhipx8L+924wvE1rQHPX21Vx9eMwtbuj6pGePYZf9h5Hw/kt12de2DeH7U/uc4Cn6XkPs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165288; c=relaxed/simple; bh=rz7p9jc3KEAU2CN3A3kTwST1nAH3niP9Qkjh2cBt8hs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=evdIVd2fBXeNntBJbM8q8o7cKHRc0G67kesEFZRsX+K5Tm9c2B7D4K1UUG6eJCGVflrU+sbn9HmKzSb/V5wK2poh13til3S3Swh5gZyxJ3Zb2yaRytp1/3KGlqrlkgPFGweFJieAmQZ9DS8za5whvPW1uFjsLzFOdavWUE7UGI0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=MnLF3dvK; arc=none smtp.client-ip=79.135.106.119 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="MnLF3dvK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165284; x=1773424484; bh=/GycTFJ6YqEM59YZ69bixAdyxP3vleuMSrnAsUVSYsk=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=MnLF3dvKFDpLS4Y+B372m9yWeetXGShHdUkW5iH1nhCCh9aigEGttMZxSjjPlbr5/ jj6RzqL4pJkGN3VMlAW2jMxSIh4OiSXjru9bTv4B+U9iA+bgnzRe0EPHTFodLnYNuf K18dWqTsdYkBUHWwyD2/ItGMGf+ZbsjHcfYoGh2e/LQTVNZJSQxVo/ryj88aMpHbY1 dKe67KAe6FEu76qDVR14ZzD4qkTXA8XNZTqnkLNw3pefL6HYqAyf+uLPaxDyS9BEL3 uVCAQPbe+g/zTbgqdSNLVmx9iho4GSBUZhOdYbddi9sAXFcqd8zn4UiIaPIpebsR2K b1LKK3bOFaN+w== Date: Tue, 10 Mar 2026 17:54:42 +0000 To: akpm@linux-foundation.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , Andrey Konovalov , linux-kernel@vger.kernel.org Subject: [PATCH v11 12/15] x86: Increase minimal SLAB alignment for KASAN Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: ac37c0a0c2b65f7e6f8f6987460fd5347f84115e Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman 8 byte minimal SLAB alignment interferes with KASAN's granularity of 16 bytes. It causes a lot of out-of-bounds errors for unaligned 8 byte allocations. Compared to a kernel with KASAN disabled, the memory footprint increases because all kmalloc-8 allocations now are realized as kmalloc-16, which has twice the object size. But more meaningfully, when compared to a kernel with generic KASAN enabled, there is no difference. Because of redzones in generic KASAN, kmalloc-8' and kmalloc-16' object size is the same (48 bytes). So changing the minimal SLAB alignment of the tag-based mode doesn't have any negative impact when compared to the other software KASAN mode. Adjust x86 minimal SLAB alignment to match KASAN granularity size. Signed-off-by: Maciej Wieczor-Retman Reviewed-by: Andrey Konovalov --- Changelog v9: - Rename patch title so it fits the tip standards. Changelog v6: - Add Andrey's Reviewed-by tag. Changelog v4: - Extend the patch message with some more context and impact information. Changelog v3: - Fix typo in patch message 4 -> 16. - Change define location to arch/x86/include/asm/cache.c. arch/x86/include/asm/cache.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h index 69404eae9983..3232583b5487 100644 --- a/arch/x86/include/asm/cache.h +++ b/arch/x86/include/asm/cache.h @@ -21,4 +21,8 @@ #endif #endif =20 +#ifdef CONFIG_KASAN_SW_TAGS +#define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT) +#endif + #endif /* _ASM_X86_CACHE_H */ --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-24416.protonmail.ch (mail-24416.protonmail.ch [109.224.244.16]) (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 E1A5A31715E for ; Tue, 10 Mar 2026 17:54:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165295; cv=none; b=P02qvrURlLJOG6An1rtGmBbKr66fLXpXStpP3UHZ0lJ9YH3uGVcw4zzyto8Z54ysj4ciaFsq85s/QdOsbJPytbP6ZZWdnY0CmIjYgf0+NAwDGd2VQ8cg7Vcs6oolnWg34nR0WtC10OCiP+AWPZBuWpT4DsmrK+ILh9w7JfICYBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165295; c=relaxed/simple; bh=LwNfxBWgQmpaN0N55me2m8MQEa8QkZFClIxbBKNRrBM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nC7GyOp7/F15JYH8nYCZw3o4V5qtvI62+94+A+ehL9B0KZlqaXx7QuY5SpyLqAD24Cal9JxjHMwbVT26spMm25j46DmsX5hSrSv096JfRW1WYUombISqsU+9wSJE7TsqDthSeHinufOjLkw+7vAHmpfHU/JJZr91FrCIDQ2jHLQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=jTqlmu3N; arc=none smtp.client-ip=109.224.244.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="jTqlmu3N" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165292; x=1773424492; bh=iGV4u3tIjmDilzg0P4gIC9AUsBUkKpvQgpSv2yugQhc=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=jTqlmu3Nukv4esmVGuSNzyHvHixWTPfHFT0NW10pRKbbOxadomqfpwdMeep19OZ2S S2hMzIqH/6wuqn+QHoost97lGVQ5e98uF/9jP13kgZ5hY9rtjepPmmuWPhrZyPTQmj uR8O0Kte/mr1Kq0nox6JbMp7R7LKPu7wVHnMN/dkX3aabUxDbf9izwI3vy+9Pmqz9m rsnQJJ6Dli3qzRmTgxSLr0gXaHiPiF5z1mllOZ7n+VCiaL0xW8gQuV5A28HfJPUqwm ZCIuqWT79HHEN4JyOMIS4OKBxGDRf8f7IzjKREMZQoCvEJRA9Nz+sxCgExi2LoKmhy tqzHpj2DZUGwg== Date: Tue, 10 Mar 2026 17:54:47 +0000 To: akpm@linux-foundation.org, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH v11 13/15] x86/kasan: Use a logical bit shift for kasan_mem_to_shadow Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 170aee158032c5ef3edb0e673615c9453616a905 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman The tag-based KASAN adopts an arithemitc bit shift to convert a memory address to a shadow memory address. While it makes a lot of sense on arm64, it doesn't work well for all cases on x86 - either the non-canonical hook becomes quite complex for different paging levels, or the inline mode would need a lot more adjustments. Thus the best working scheme is the logical bit shift and non-canonical shadow offset that x86 uses for generic KASAN, of course adjusted for the increased granularity from 8 to 16 bytes. Add an arch specific implementation of kasan_mem_to_shadow() that uses the logical bit shift. Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: - Remove arch_kasan_non_canonical_hook() since an arch independent version was added to the first patch in the series. Changelog v9: - Rename patch title so it fits the tip standards. - Take out the x86 part from mm/kasan/report.c and put it in the arch specific function. Adjust the patch message. Changelog v7: - Redo the patch message and add a comment to __kasan_mem_to_shadow() to provide better explanation on why x86 doesn't work well with the arithemitc bit shift approach (Marco). Changelog v4: - Add this patch to the series. arch/x86/include/asm/kasan.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index c868ae734f68..060ef997bfae 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -31,6 +31,21 @@ #include =20 #ifdef CONFIG_KASAN_SW_TAGS +/* + * Using the non-arch specific implementation of __kasan_mem_to_shadow() w= ith a + * arithmetic bit shift can cause high code complexity in KASAN's non-cano= nical + * hook for x86 or might not work for some paging level and KASAN mode + * combinations. The inline mode compiler support could also suffer from h= igher + * complexity for no specific benefit. Therefore the generic mode's logical + * shift implementation is used. + */ +static inline void *__kasan_mem_to_shadow(const void *addr) +{ + return (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT) + + KASAN_SHADOW_OFFSET; +} +#define kasan_mem_to_shadow(addr) __kasan_mem_to_shadow(addr) + #define __tag_shifted(tag) FIELD_PREP(GENMASK_ULL(60, 57), tag) #define __tag_reset(addr) (sign_extend64((u64)(addr), 56)) #define __tag_get(addr) ((u8)FIELD_GET(GENMASK_ULL(60, 57), (u64)addr)) --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-43101.protonmail.ch (mail-43101.protonmail.ch [185.70.43.101]) (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 621832D592D for ; Tue, 10 Mar 2026 17:55:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.43.101 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165310; cv=none; b=HvCUsev3NHBrsHJ6mRrxFuVMjmgrxrxquNHnMaylhfIaEfGkOxwJGlQRJD+J6BVjPB++gvZF54TylpS+fYZmdbnKHZkn830TSC2BLBDhq50OglbjrV/7O3KfVmCYRB9lyr+f86tGHlnL427IDgbETYmPBOInpYU8bq8xe0dxfnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165310; c=relaxed/simple; bh=+Z7bcbUGBv5JWOT0Mwg8tkq7NEIQ6GkIgb1hAhQNOqE=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LnKkJDvAav7A6GDeBhnsu8hMi3prvWtH51F3h1TwK75ie/27x+ZoqfFSyrBruMPZupDXmcicB/SqxgcwZdu4BJ+rJ0FyNwIUtkX5Qp/iTaLImWOZoFXty8Rgg08rImzqHCs5L4h758WBlqZxjXR4gGeC0EL1Hj6nuZ0Hs5k8vT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=PfLXqf7O; arc=none smtp.client-ip=185.70.43.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="PfLXqf7O" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165300; x=1773424500; bh=7GSV+MXs8tO0nW6wFAzkEmVxf9yCdN2cllo+XbXrsYY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=PfLXqf7OtJyOgkajF4MwYMgw19rRzgf0heC8QbYj+/1NrK+WycXJ9qXzGt54ZP330 UV/mrzVRZOCDV/9uat+1WMlc+DQIDRJScgTi22OceFXPnrE6XuuXjPGjVAkeo03eDA wqmuMpAdqEZ9Z+Jxjr3+JJpY0pDmgm+VPMJUU8qG3rjBpL19Cvokus4HLvkCaC0LtV Wn3W5pGgrmvAxqFf0gCPqTpYjNn+L0/1pf6ZxSx/pT87lZrgBglzavQ1Zw+buHlP7I oo9kG+T5v2iYf0d/1BU13g+LMtV6dwE4Fylu6EZGqQxln99oy5Xor8IfopW4UZVd3x ebnr8juaSdqjA== Date: Tue, 10 Mar 2026 17:54:54 +0000 To: akpm@linux-foundation.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Andy Lutomirski , Peter Zijlstra From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Subject: [PATCH v11 14/15] x86/kasan: Make software tag-based kasan available Message-ID: <2b44780d5f1d5f0bba84904fbf021edc827b4157.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 96baa29da28d044d821ea26f15856769d4413009 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman Make CONFIG_KASAN_SW_TAGS available for x86 machines if they have ADDRESS_MASKING enabled (LAM) as that works similarly to Top-Byte Ignore (TBI) that allows the software tag-based mode on arm64 platform. The value for sw_tags KASAN_SHADOW_OFFSET was calculated by rearranging the formulas for KASAN_SHADOW_START and KASAN_SHADOW_END from arch/x86/include/asm/kasan.h - the only prerequisites being KASAN_SHADOW_SCALE_SHIFT of 4, and KASAN_SHADOW_END equal to the one from KASAN generic mode. Set scale macro based on KASAN mode: in software tag-based mode 16 bytes of memory map to one shadow byte and 8 in generic mode. Disable CONFIG_KASAN_INLINE and CONFIG_KASAN_STACK when CONFIG_KASAN_SW_TAGS is enabled on x86 until the appropriate compiler support is available. Lock software tag KASAN behind CC_IS_CLANG due to lack of proper support by gcc resulting in kernel booting issues. Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: - Split off the documentation changes. - Rewrite the Kconfig.kasan entry for sw_tags. Changelog v10: - Update Documentation/dev-tools/kasan.rst with x86 related informations. Changelog v9: - Lock HAVE_ARCH_KASAN_HAS_SW_TAGS behind CC_IS_CLANG due to lack of support from gcc. - Remove pr_info() from KASAN initialization since it's now done by the generic init helper. - Add paragraph to the mm.rst to explain the mutual exclusive nature of the KASAN address ranges. - Use cpu_feature_enabled() instead of boot_cpu_has() in kasan_init_64.c. Changelog v7: - Add a paragraph to the patch message explaining how the various addresses and the KASAN_SHADOW_OFFSET were calculated. Changelog v6: - Don't enable KASAN if LAM is not supported. - Move kasan_init_tags() to kasan_init_64.c to not clutter the setup.c file. - Move the #ifdef for the KASAN scale shift here. - Move the gdb code to patch "Use arithmetic shift for shadow computation". - Return "depends on KASAN" line to Kconfig. - Add the defer kasan config option so KASAN can be disabled on hardware that doesn't have LAM. Changelog v4: - Add x86 specific kasan_mem_to_shadow(). - Revert x86 to the older unsigned KASAN_SHADOW_OFFSET. Do the same to KASAN_SHADOW_START/END. - Modify scripts/gdb/linux/kasan.py to keep x86 using unsigned offset. - Disable inline and stack support when software tags are enabled on x86. Changelog v3: - Remove runtime_const from previous patch and merge the rest here. - Move scale shift definition back to header file. - Add new kasan offset for software tag based mode. - Fix patch message typo 32 -> 16, and 16 -> 8. - Update lib/Kconfig.kasan with x86 now having software tag-based support. Changelog v2: - Remove KASAN dense code. arch/x86/Kconfig | 4 ++++ arch/x86/boot/compressed/misc.h | 1 + arch/x86/include/asm/kasan.h | 5 +++++ arch/x86/mm/kasan_init_64.c | 5 +++++ lib/Kconfig.kasan | 4 +++- 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e2df1b147184..f82b629c5791 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -67,6 +67,7 @@ config X86 select ARCH_CLOCKSOURCE_INIT select ARCH_CONFIGURES_CPU_MITIGATIONS select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE + select ARCH_DISABLE_KASAN_INLINE if X86_64 && KASAN_SW_TAGS select ARCH_ENABLE_HUGEPAGE_MIGRATION if X86_64 && HUGETLB_PAGE && MIGRAT= ION select ARCH_ENABLE_MEMORY_HOTPLUG if X86_64 select ARCH_ENABLE_MEMORY_HOTREMOVE if MEMORY_HOTPLUG @@ -196,6 +197,8 @@ config X86 select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if X86_64 select HAVE_ARCH_KASAN_VMALLOC if X86_64 + select HAVE_ARCH_KASAN_SW_TAGS if ADDRESS_MASKING && CC_IS_CLANG + select ARCH_NEEDS_DEFER_KASAN if ADDRESS_MASKING select HAVE_ARCH_KFENCE select HAVE_ARCH_KMSAN if X86_64 select HAVE_ARCH_KGDB @@ -410,6 +413,7 @@ config AUDIT_ARCH config KASAN_SHADOW_OFFSET hex depends on KASAN + default 0xeffffc0000000000 if KASAN_SW_TAGS default 0xdffffc0000000000 =20 config HAVE_INTEL_TXT diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/mis= c.h index 4f86c5903e03..9bc1dcb0f8b0 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -14,6 +14,7 @@ #undef CONFIG_ARCH_HAS_LAZY_MMU_MODE #undef CONFIG_KASAN #undef CONFIG_KASAN_GENERIC +#undef CONFIG_KASAN_SW_TAGS =20 #define __NO_FORTIFY =20 diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index 060ef997bfae..f3d08a002aeb 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -6,7 +6,12 @@ #include #include #define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) + +#ifdef CONFIG_KASAN_SW_TAGS +#define KASAN_SHADOW_SCALE_SHIFT 4 +#else #define KASAN_SHADOW_SCALE_SHIFT 3 +#endif =20 /* * Compiler uses shadow offset assuming that addresses start diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 7f5c11328ec1..8cbb8ec32061 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -465,4 +465,9 @@ void __init kasan_init(void) =20 init_task.kasan_depth =3D 0; kasan_init_generic(); + + if (cpu_feature_enabled(X86_FEATURE_LAM)) + kasan_init_sw_tags(); + else + pr_info("KernelAddressSanitizer not initialized (sw-tags): hardware does= n't support LAM\n"); } diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index a4bb610a7a6f..4be4e8943bd1 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -112,7 +112,9 @@ config KASAN_SW_TAGS =20 Requires GCC 11+ or Clang. =20 - Supported only on arm64 CPUs and relies on Top Byte Ignore. + Supported on: + arm64: CPUs with Top Byte Ignore + x86: CPUs with Linear Address Masking. =20 Consumes about 1/16th of available memory at kernel start and add an overhead of ~20% for dynamic allocations. --=20 2.53.0 From nobody Sat Apr 4 18:31:14 2026 Received: from mail-4322.protonmail.ch (mail-4322.protonmail.ch [185.70.43.22]) (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 68ED62D592D; Tue, 10 Mar 2026 17:55:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.43.22 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165314; cv=none; b=AJNZ2cGzTlCT9DIhbNjRcBkNXUIqBZoAvOoY9gwjhRjmZTJObBKmK0ZS8Kn0ExZT/9/244f1J6RgoSgSLLb+0UssUJUqqR/DISlTZEbA2bYuJzgahJXquxkN19S7Tqevg9XI3uDhUTQ4uW1GRwae/Po6QzSZ6V0rkPn7FxehRBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165314; c=relaxed/simple; bh=j3RO6GN6DceqVgbfJifPD7Mr4hXFOiKjw/TNqZPOPe0=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZsaQfKHAtj7BS5TShHo29qElNTkipdGpiIUdCkkGPiTkuzNRj27Kx0+uqwvJkDswYe5Vv4NS672Z5pxgstoweMySqresSa6kjRjrd40UBo3YDnpGDOuED7KmozjfXkhKbJ22PfU1e0YSc7ug0xeHuJXt5Va2A7zeauuojPcYSIY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=Vx2bXKOm; arc=none smtp.client-ip=185.70.43.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="Vx2bXKOm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165305; x=1773424505; bh=sI6qR0mJYdxFmMNIqBBXQAz3LXcRYa0zIgeJz3FHVi8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Vx2bXKOmiijawesKHgTU59oddiSP9j0FE5pp25ea7SBlT13lyY5yhRngs83ZWoLTR KMHPfuhFFFokTHI4UEbseY5P4WSnkTPNQANVQ2LcnBPxrcXTMa9BdzjuB+hJzM50P2 gxIkjfPUVnSAqjK2ir7wB3Ipo1t6i9FTqbDIppHa8EwI+gPmv/GYVoS8Oe3kjY1ox+ EfJlFdwJgROo9e6WZdbswaO3GufrSPpHNiz6OwIqI4cxc2m7LSDWLbnIR4UkajpoEY 6vLqL8AF4ewAMxV0HxJk6d/LxuAmYjyXn9GJTuYUXmX+a/bdhjjFFMUJlsjxCjNS8R t3BPtCmqHjiWw== Date: Tue, 10 Mar 2026 17:55:00 +0000 To: akpm@linux-foundation.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Jonathan Corbet , Shuah Khan , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kasan-dev@googlegroups.com, workflows@vger.kernel.org Subject: [PATCH v11 15/15] docs: Update KASAN and x86 memory map documentations Message-ID: <9e1176112817b3cb7bb7daa982b6d4f5b2452749.1773164688.git.m.wieczorretman@pm.me> In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 1cf51b8a6337a63e242ed43be86c30aa3516a39e Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman Update the documentation concerning changes to x86's memory address space and new architecture addition to KASAN's software tag-based mode. Redo paragraphs in KASAN's documentation on hardware and software implementation details to allow better extensibility. Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: - Split off the documentation portion of v10's patch 13. - Apply Dave's suggestions to reformat the footer explaining alternate ranges for KASAN shadow memory, put arch hardware implementation in a separate paragraph and make a table to hold various implementation details. Documentation/arch/x86/x86_64/mm.rst | 21 +++++++++- Documentation/dev-tools/kasan.rst | 61 ++++++++++++++++++++-------- 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/Documentation/arch/x86/x86_64/mm.rst b/Documentation/arch/x86/= x86_64/mm.rst index a6cf05d51bd8..3c78ab1afd8d 100644 --- a/Documentation/arch/x86/x86_64/mm.rst +++ b/Documentation/arch/x86/x86_64/mm.rst @@ -60,7 +60,7 @@ Complete virtual memory map with 4-level page tables ffffe90000000000 | -23 TB | ffffe9ffffffffff | 1 TB | ... unused= hole ffffea0000000000 | -22 TB | ffffeaffffffffff | 1 TB | virtual me= mory map (vmemmap_base) ffffeb0000000000 | -21 TB | ffffebffffffffff | 1 TB | ... unused= hole - ffffec0000000000 | -20 TB | fffffbffffffffff | 16 TB | KASAN shad= ow memory + ffffec0000000000 | -20 TB | fffffbffffffffff | 16 TB | KASAN shad= ow memory[1] __________________|____________|__________________|_________|___________= _________________________________________________ | | Identical = layout to the 56-bit one from here on: @@ -130,7 +130,7 @@ Complete virtual memory map with 5-level page tables ffd2000000000000 | -11.5 PB | ffd3ffffffffffff | 0.5 PB | ... unused= hole ffd4000000000000 | -11 PB | ffd5ffffffffffff | 0.5 PB | virtual me= mory map (vmemmap_base) ffd6000000000000 | -10.5 PB | ffdeffffffffffff | 2.25 PB | ... unused= hole - ffdf000000000000 | -8.25 PB | fffffbffffffffff | ~8 PB | KASAN shad= ow memory + ffdf000000000000 | -8.25 PB | fffffbffffffffff | ~8 PB | KASAN shad= ow memory[1] __________________|____________|__________________|_________|___________= _________________________________________________ | | Identical = layout to the 47-bit one from here on: @@ -178,3 +178,20 @@ correct as KASAN disables KASLR. =20 For both 4- and 5-level layouts, the KSTACK_ERASE_POISON value in the last= 2MB hole: ffffffffffff4111 + +1. The range is different based on what KASAN mode is used and what paging= level + is used: + +:: + + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D + Start addr | Offset | End addr | Size | VM area de= scription + =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D + | | | | 4-level pa= ging: + ffffec0000000000 | -20 TB | fffffbffffffffff | 16 TB | KASAN shad= ow memory (generic mode) + fffff40000000000 | -8 TB | fffffbffffffffff | 8 TB | KASAN shad= ow memory (software tag-based mode) + __________________|____________|__________________|_________|___________= ____________________________________ + | | | | 5-level pa= ging: + ffdf000000000000 | -8.25 PB | fffffbffffffffff | ~8 PB | KASAN shad= ow memory (generic mode) + ffeffc0000000000 | -6 PB | fffffbffffffffff | 4 PB | KASAN shad= ow memory (software tag-based mode) + __________________|____________|__________________|_________|___________= ____________________________________ diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/ka= san.rst index b11c1be8dff4..d42d80e9fcf1 100644 --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@ -22,8 +22,8 @@ architectures, but it has significant performance and mem= ory overheads. =20 Software Tag-Based KASAN or SW_TAGS KASAN, enabled with CONFIG_KASAN_SW_TA= GS, can be used for both debugging and dogfood testing, similar to userspace H= WASan. -This mode is only supported for arm64, but its moderate memory overhead al= lows -using it for testing on memory-restricted devices with real workloads. +This mode is only supported for arm64 and x86, but its moderate memory ove= rhead +allows using it for testing on memory-restricted devices with real workloa= ds. =20 Hardware Tag-Based KASAN or HW_TAGS KASAN, enabled with CONFIG_KASAN_HW_TA= GS, is the mode intended to be used as an in-field memory bug detector or as a @@ -346,16 +346,21 @@ Software Tag-Based KASAN ~~~~~~~~~~~~~~~~~~~~~~~~ =20 Software Tag-Based KASAN uses a software memory tagging approach to checki= ng -access validity. It is currently only implemented for the arm64 architectu= re. - -Software Tag-Based KASAN uses the Top Byte Ignore (TBI) feature of arm64 C= PUs -to store a pointer tag in the top byte of kernel pointers. It uses shadow = memory -to store memory tags associated with each 16-byte memory cell (therefore, = it -dedicates 1/16th of the kernel memory for shadow memory). - -On each memory allocation, Software Tag-Based KASAN generates a random tag= , tags -the allocated memory with this tag, and embeds the same tag into the retur= ned -pointer. +access validity. It is currently only implemented for the arm64 and x86 +architectures. To function, special hardware CPU features* are needed for +repurposing space inside the kernel pointers to store pointer tags. + +Software Tag-Based mode uses shadow memory to store memory tags associated= with +each 16-byte memory cell (therefore, it dedicates 1/16th of the kernel mem= ory +for shadow memory). On each memory allocation, Software Tag-Based KASAN +generates a random tag, tags the allocated memory with this tag, and embed= s the +same tag into the returned pointer. + +Two special tag values can be distinguished. A match-all pointer tag (othe= rwise +called the 'kernel tag' because it's supposed to be equal to the value nor= mally +present in the same bits of the linear address when KASAN is disabled) - +accesses through such pointers are not checked. Another value is also rese= rved +to tag freed memory regions. =20 Software Tag-Based KASAN uses compile-time instrumentation to insert checks before each memory access. These checks make sure that the tag of the memo= ry @@ -367,12 +372,32 @@ Software Tag-Based KASAN also has two instrumentation= modes (outline, which emits callbacks to check memory accesses; and inline, which performs the s= hadow memory checks inline). With outline instrumentation mode, a bug report is printed from the function that performs the access check. With inline -instrumentation, a ``brk`` instruction is emitted by the compiler, and a -dedicated ``brk`` handler is used to print bug reports. - -Software Tag-Based KASAN uses 0xFF as a match-all pointer tag (accesses th= rough -pointers with the 0xFF pointer tag are not checked). The value 0xFE is cur= rently -reserved to tag freed memory regions. +instrumentation, the compiler emits a specific arch-dependent instruction = with a +dedicated handler to print bug reports. + +Architecture specific details: + +:: + + +-----------------------+--------+---------------------+ + | detail \ architecture | arm64 | x86 | + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+= =3D=3D=3D=3D=3D=3D=3D=3D+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D+ + | Hardware feature | TBI | LAM | + +-----------------------+--------+---------------------+ + | Kernel tag | 0xFF | 0x0F | + +-----------------------+--------+---------------------+ + | Freed memory tag | 0xFE | 0x0E | + +-----------------------+--------+---------------------+ + | Tag width | 8 bits | 4 bits | + +-----------------------+--------+---------------------+ + | Inline instruction | brk | no compiler support | + +-----------------------+--------+---------------------+ + +* Different architectures implement different hardware features to mask and + repurpose linear address bits. arm64 utilizes Top Byte Ignore (TBI) to m= ask + out and allow storing tags in the top byte of the pointer. x86 uses Line= ar + Address Masking (LAM) to store tags in the four bits of the kernel point= er's + top byte. =20 Hardware Tag-Based KASAN ~~~~~~~~~~~~~~~~~~~~~~~~ --=20 2.53.0