From: Andrey Konovalov <andreyknvl@gmail.com>
To: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
Cc: kees@kernel.org, julian.stecklina@cyberus-technology.de,
kevinloughlin@google.com, peterz@infradead.org,
tglx@linutronix.de, justinstitt@google.com,
catalin.marinas@arm.com, wangkefeng.wang@huawei.com,
bhe@redhat.com, ryabinin.a.a@gmail.com,
kirill.shutemov@linux.intel.com, will@kernel.org,
ardb@kernel.org, jason.andryuk@amd.com,
dave.hansen@linux.intel.com, pasha.tatashin@soleen.com,
ndesaulniers@google.com, guoweikang.kernel@gmail.com,
dwmw@amazon.co.uk, mark.rutland@arm.com, broonie@kernel.org,
apopple@nvidia.com, bp@alien8.de, rppt@kernel.org,
kaleshsingh@google.com, richard.weiyang@gmail.com,
luto@kernel.org, glider@google.com, pankaj.gupta@amd.com,
pawan.kumar.gupta@linux.intel.com, kuan-ying.lee@canonical.com,
tony.luck@intel.com, tj@kernel.org, jgross@suse.com,
dvyukov@google.com, baohua@kernel.org,
samuel.holland@sifive.com, dennis@kernel.org,
akpm@linux-foundation.org, thomas.weissschuh@linutronix.de,
surenb@google.com, kbingham@kernel.org, ankita@nvidia.com,
nathan@kernel.org, ziy@nvidia.com, xin@zytor.com,
rafael.j.wysocki@intel.com, andriy.shevchenko@linux.intel.com,
cl@linux.com, jhubbard@nvidia.com, hpa@zytor.com,
scott@os.amperecomputing.com, david@redhat.com,
jan.kiszka@siemens.com, vincenzo.frascino@arm.com,
corbet@lwn.net, maz@kernel.org, mingo@redhat.com, arnd@arndb.de,
ytcoode@gmail.com, xur@google.com, morbo@google.com,
thiago.bauermann@linaro.org, linux-doc@vger.kernel.org,
kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org,
llvm@lists.linux.dev, linux-mm@kvack.org,
linux-arm-kernel@lists.infradead.org, x86@kernel.org
Subject: Re: [PATCH v2 13/14] x86: runtime_const used for KASAN_SHADOW_END
Date: Thu, 20 Feb 2025 00:31:08 +0100 [thread overview]
Message-ID: <CA+fCnZdtJj7VcEJfsjkjr3UhmkcKS25SEPTs=dB9k3cEFvfX2g@mail.gmail.com> (raw)
In-Reply-To: <2a2f08bc8118b369610d34e4d190a879d44f76b8.1739866028.git.maciej.wieczor-retman@intel.com>
On Tue, Feb 18, 2025 at 9:20 AM Maciej Wieczor-Retman
<maciej.wieczor-retman@intel.com> wrote:
>
> On x86, generic KASAN is setup in a way that needs a single
> KASAN_SHADOW_OFFSET value for both 4 and 5 level paging. It's required
> to facilitate boot time switching and it's a compiler ABI so it can't be
> changed during runtime.
>
> Software tag-based mode doesn't tie shadow start and end to any linear
> addresses as part of the compiler ABI so it can be changed during
> runtime.
KASAN_SHADOW_OFFSET is passed to the compiler via
hwasan-mapping-offset, see scripts/Makefile.kasan (for the INLINE
mode). So while we can change its value, it has to be known at compile
time. So I don't think using a runtime constant would work.
Which means that KASAN_SHADOW_OFFSET has to have such a value that
works for both 4 and 5 level page tables. This possibly means we might
need something different than the first patch in this series.
But in case I'm wrong, I left comments for the current code below.
> This notion, for KASAN purposes, allows to optimize out macros
> such us pgtable_l5_enabled() which would otherwise be used in every
> single KASAN related function.
>
> Use runtime_const infrastructure with pgtable_l5_enabled() to initialize
> the end address of KASAN's shadow address space. It's a good choice
> since in software tag based mode KASAN_SHADOW_OFFSET and
> KASAN_SHADOW_END refer to the same value and the offset in
> kasan_mem_to_shadow() is a signed negative value.
>
> Setup KASAN_SHADOW_END values so that they're aligned to 4TB in 4-level
> paging mode and to 2PB in 5-level paging mode. Also update x86 memory
> map documentation.
>
> Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
> ---
> Changelog v2:
> - Change documentation kasan start address to non-dense values.
>
> Documentation/arch/x86/x86_64/mm.rst | 6 ++++--
> arch/x86/Kconfig | 3 +--
> arch/x86/include/asm/kasan.h | 14 +++++++++++++-
> arch/x86/kernel/vmlinux.lds.S | 1 +
> arch/x86/mm/kasan_init_64.c | 5 ++++-
> 5 files changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/arch/x86/x86_64/mm.rst b/Documentation/arch/x86/x86_64/mm.rst
> index f2db178b353f..5014ec322e19 100644
> --- a/Documentation/arch/x86/x86_64/mm.rst
> +++ b/Documentation/arch/x86/x86_64/mm.rst
> @@ -60,7 +60,8 @@ Complete virtual memory map with 4-level page tables
> ffffe90000000000 | -23 TB | ffffe9ffffffffff | 1 TB | ... unused hole
> ffffea0000000000 | -22 TB | ffffeaffffffffff | 1 TB | virtual memory map (vmemmap_base)
> ffffeb0000000000 | -21 TB | ffffebffffffffff | 1 TB | ... unused hole
> - ffffec0000000000 | -20 TB | fffffbffffffffff | 16 TB | KASAN shadow memory
> + ffffec0000000000 | -20 TB | fffffbffffffffff | 16 TB | KASAN shadow memory (generic mode)
> + fffff40000000000 | -8 TB | fffffc0000000000 | 8 TB | KASAN shadow memory (software tag-based mode)
> __________________|____________|__________________|_________|____________________________________________________________
> |
> | Identical layout to the 56-bit one from here on:
> @@ -130,7 +131,8 @@ 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 memory map (vmemmap_base)
> ffd6000000000000 | -10.5 PB | ffdeffffffffffff | 2.25 PB | ... unused hole
> - ffdf000000000000 | -8.25 PB | fffffbffffffffff | ~8 PB | KASAN shadow memory
> + ffdf000000000000 | -8.25 PB | fffffbffffffffff | ~8 PB | KASAN shadow memory (generic mode)
> + ffe0000000000000 | -6 PB | fff0000000000000 | 4 PB | KASAN shadow memory (software tag-based mode)
> __________________|____________|__________________|_________|____________________________________________________________
> |
> | Identical layout to the 47-bit one from here on:
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 6df7779ed6da..f4ef64bf824a 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -400,8 +400,7 @@ config AUDIT_ARCH
>
> config KASAN_SHADOW_OFFSET
> hex
> - depends on KASAN
> - default 0xdffffc0000000000
> + default 0xdffffc0000000000 if KASAN_GENERIC
Let's put a comment here explaining what happens if !KASAN_GENERIC.
Also, as I mentioned in the first patch, we need to figure out what to
do with scripts/gdb/linux/kasan.py.
>
> config HAVE_INTEL_TXT
> def_bool y
> diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h
> index a75f0748a4b6..4bfd3641af84 100644
> --- a/arch/x86/include/asm/kasan.h
> +++ b/arch/x86/include/asm/kasan.h
> @@ -5,7 +5,7 @@
> #include <linux/const.h>
> #include <linux/kasan-tags.h>
> #include <linux/types.h>
> -#define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL)
> +
> #define KASAN_SHADOW_SCALE_SHIFT 3
>
> /*
> @@ -14,6 +14,8 @@
> * for kernel really starts from compiler's shadow offset +
> * 'kernel address space start' >> KASAN_SHADOW_SCALE_SHIFT
> */
> +#ifdef CONFIG_KASAN_GENERIC
> +#define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL)
> #define KASAN_SHADOW_START (KASAN_SHADOW_OFFSET + \
> ((-1UL << __VIRTUAL_MASK_SHIFT) >> \
> KASAN_SHADOW_SCALE_SHIFT))
> @@ -24,12 +26,22 @@
> #define KASAN_SHADOW_END (KASAN_SHADOW_START + \
> (1ULL << (__VIRTUAL_MASK_SHIFT - \
> KASAN_SHADOW_SCALE_SHIFT)))
> +#endif
> +
>
> #ifndef __ASSEMBLY__
> +#include <asm/runtime-const.h>
> #include <linux/bitops.h>
> #include <linux/bitfield.h>
> #include <linux/bits.h>
>
> +#ifdef CONFIG_KASAN_SW_TAGS
> +extern unsigned long KASAN_SHADOW_END_RC;
> +#define KASAN_SHADOW_END runtime_const_ptr(KASAN_SHADOW_END_RC)
> +#define KASAN_SHADOW_OFFSET KASAN_SHADOW_END
> +#define KASAN_SHADOW_START (KASAN_SHADOW_END - ((UL(1)) << (__VIRTUAL_MASK_SHIFT - KASAN_SHADOW_SCALE_SHIFT)))
Any reason these are under __ASSEMBLY__? They seem to belong better
together with the CONFIG_KASAN_GENERIC definitions above.
> +#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)
> diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
> index 0deb4887d6e9..df6c85f8f48f 100644
> --- a/arch/x86/kernel/vmlinux.lds.S
> +++ b/arch/x86/kernel/vmlinux.lds.S
> @@ -353,6 +353,7 @@ SECTIONS
>
> RUNTIME_CONST_VARIABLES
> RUNTIME_CONST(ptr, USER_PTR_MAX)
> + RUNTIME_CONST(ptr, KASAN_SHADOW_END_RC)
>
> . = ALIGN(PAGE_SIZE);
>
> diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
> index 299a2144dac4..5ca5862a5cd6 100644
> --- a/arch/x86/mm/kasan_init_64.c
> +++ b/arch/x86/mm/kasan_init_64.c
> @@ -358,6 +358,9 @@ void __init kasan_init(void)
> int i;
>
> memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt));
> + unsigned long KASAN_SHADOW_END_RC = pgtable_l5_enabled() ? 0xfff0000000000000 : 0xfffffc0000000000;
I think defining these constants in arch/x86/include/asm/kasan.h is
cleaner than hardcoding them here.
> +
> + runtime_const_init(ptr, KASAN_SHADOW_END_RC);
>
> /*
> * We use the same shadow offset for 4- and 5-level paging to
> @@ -372,7 +375,7 @@ void __init kasan_init(void)
> * bunch of things like kernel code, modules, EFI mapping, etc.
> * We need to take extra steps to not overwrite them.
> */
> - if (pgtable_l5_enabled()) {
> + if (pgtable_l5_enabled() && !IS_ENABLED(CONFIG_KASAN_SW_TAGS)) {
> void *ptr;
>
> ptr = (void *)pgd_page_vaddr(*pgd_offset_k(KASAN_SHADOW_END));
> --
> 2.47.1
>
next prev parent reply other threads:[~2025-02-19 23:31 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 8:15 [PATCH v2 00/14] kasan: x86: arm64: KASAN tag-based mode for x86 Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 01/14] kasan: sw_tags: Use arithmetic shift for shadow computation Maciej Wieczor-Retman
2025-02-19 23:29 ` Andrey Konovalov
2025-02-21 13:11 ` Maciej Wieczor-Retman
2025-02-22 15:06 ` Andrey Konovalov
2025-02-25 17:20 ` Maciej Wieczor-Retman
2025-02-25 19:12 ` Maciej Wieczor-Retman
2025-02-25 20:12 ` Maciej Wieczor-Retman
2025-02-25 21:38 ` Andrey Konovalov
2025-02-26 16:42 ` Maciej Wieczor-Retman
2025-02-26 19:44 ` Andrey Konovalov
2025-02-27 12:27 ` Maciej Wieczor-Retman
2025-02-28 16:12 ` Maciej Wieczor-Retman
2025-03-01 0:21 ` Andrey Konovalov
2025-03-04 14:06 ` Maciej Wieczor-Retman
2025-03-07 1:10 ` Andrey Konovalov
2025-03-13 14:56 ` Maciej Wieczor-Retman
2025-03-18 15:31 ` Andrey Konovalov
2025-02-25 21:37 ` Andrey Konovalov
2025-02-27 12:33 ` Maciej Wieczor-Retman
2025-03-01 0:22 ` Andrey Konovalov
2025-03-04 12:29 ` Maciej Wieczor-Retman
2025-03-07 1:10 ` Andrey Konovalov
2025-03-14 15:57 ` Maciej Wieczor-Retman
2025-03-18 15:32 ` Andrey Konovalov
2025-02-18 8:15 ` [PATCH v2 02/14] kasan: sw_tags: Check kasan_flag_enabled at runtime Maciej Wieczor-Retman
2025-02-19 23:30 ` Andrey Konovalov
2025-02-21 14:35 ` Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 03/14] kasan: sw_tags: Support outline stack tag generation Maciej Wieczor-Retman
2025-02-19 23:30 ` Andrey Konovalov
2025-02-18 8:15 ` [PATCH v2 04/14] kasan: sw_tags: Support tag widths less than 8 bits Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 05/14] kasan: arm64: x86: Make special tags arch specific Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 06/14] x86: Add arch specific kasan functions Maciej Wieczor-Retman
2025-02-19 23:30 ` Andrey Konovalov
2025-02-21 8:40 ` Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 07/14] x86: Reset tag for virtual to physical address conversions Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 08/14] x86: Physical address comparisons in fill_p*d/pte Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 09/14] mm: Pcpu chunk address tag reset Maciej Wieczor-Retman
2025-03-20 17:39 ` Andrey Ryabinin
2025-03-20 17:47 ` Andrey Konovalov
2025-03-21 10:40 ` Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 10/14] x86: KASAN raw shadow memory PTE init Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 11/14] x86: LAM initialization Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 12/14] x86: Minimal SLAB alignment Maciej Wieczor-Retman
2025-02-19 23:30 ` Andrey Konovalov
2025-02-21 7:24 ` Maciej Wieczor-Retman
2025-02-18 8:15 ` [PATCH v2 13/14] x86: runtime_const used for KASAN_SHADOW_END Maciej Wieczor-Retman
2025-02-19 23:31 ` Andrey Konovalov [this message]
2025-02-21 15:10 ` Maciej Wieczor-Retman
2025-02-21 15:27 ` Maciej Wieczor-Retman
2025-02-22 15:08 ` Andrey Konovalov
2025-02-22 15:07 ` Andrey Konovalov
2025-02-25 17:15 ` Maciej Wieczor-Retman
2025-02-25 21:37 ` Andrey Konovalov
2025-02-26 11:52 ` Maciej Wieczor-Retman
2025-02-26 15:24 ` Andrey Konovalov
2025-02-26 17:03 ` Maciej Wieczor-Retman
2025-03-21 19:20 ` Maciej Wieczor-Retman
2025-03-21 20:16 ` Andrey Konovalov
2025-03-24 10:43 ` Maciej Wieczor-Retman
2025-03-24 10:50 ` Maciej Wieczor-Retman
2025-03-24 21:58 ` Andrey Konovalov
2025-02-18 8:15 ` [PATCH v2 14/14] x86: Make software tag-based kasan available Maciej Wieczor-Retman
2025-02-19 23:31 ` Andrey Konovalov
2025-02-20 16:32 ` Andrey Konovalov
2025-02-21 14:44 ` Maciej Wieczor-Retman
2025-02-22 15:06 ` Andrey Konovalov
2025-02-25 15:39 ` Maciej Wieczor-Retman
2025-02-20 2:49 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+fCnZdtJj7VcEJfsjkjr3UhmkcKS25SEPTs=dB9k3cEFvfX2g@mail.gmail.com' \
--to=andreyknvl@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ankita@nvidia.com \
--cc=apopple@nvidia.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=baohua@kernel.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=dennis@kernel.org \
--cc=dvyukov@google.com \
--cc=dwmw@amazon.co.uk \
--cc=glider@google.com \
--cc=guoweikang.kernel@gmail.com \
--cc=hpa@zytor.com \
--cc=jan.kiszka@siemens.com \
--cc=jason.andryuk@amd.com \
--cc=jgross@suse.com \
--cc=jhubbard@nvidia.com \
--cc=julian.stecklina@cyberus-technology.de \
--cc=justinstitt@google.com \
--cc=kaleshsingh@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=kbingham@kernel.org \
--cc=kees@kernel.org \
--cc=kevinloughlin@google.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kuan-ying.lee@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=llvm@lists.linux.dev \
--cc=luto@kernel.org \
--cc=maciej.wieczor-retman@intel.com \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=mingo@redhat.com \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=pankaj.gupta@amd.com \
--cc=pasha.tatashin@soleen.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=richard.weiyang@gmail.com \
--cc=rppt@kernel.org \
--cc=ryabinin.a.a@gmail.com \
--cc=samuel.holland@sifive.com \
--cc=scott@os.amperecomputing.com \
--cc=surenb@google.com \
--cc=tglx@linutronix.de \
--cc=thiago.bauermann@linaro.org \
--cc=thomas.weissschuh@linutronix.de \
--cc=tj@kernel.org \
--cc=tony.luck@intel.com \
--cc=vincenzo.frascino@arm.com \
--cc=wangkefeng.wang@huawei.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xin@zytor.com \
--cc=xur@google.com \
--cc=ytcoode@gmail.com \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox