From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Daniel Axtens <dja@axtens.net>,
kasan-dev@googlegroups.com, linux-mm@kvack.org, x86@kernel.org,
aryabinin@virtuozzo.com, glider@google.com, luto@kernel.org,
linux-kernel@vger.kernel.org, mark.rutland@arm.com,
dvyukov@google.com
Cc: linuxppc-dev@lists.ozlabs.org, gor@linux.ibm.com
Subject: Re: [PATCH v4 3/3] x86/kasan: support KASAN_VMALLOC
Date: Fri, 16 Aug 2019 10:04:27 +0200 [thread overview]
Message-ID: <d8d2d0ae-8ebc-d572-7a62-f17f28cb1bac@c-s.fr> (raw)
In-Reply-To: <20190815001636.12235-4-dja@axtens.net>
Le 15/08/2019 à 02:16, Daniel Axtens a écrit :
> In the case where KASAN directly allocates memory to back vmalloc
> space, don't map the early shadow page over it.
If early shadow page is not mapped, any bad memory access will Oops on
the shadow access instead of Oopsing on the real bad access.
You should still map early shadow page, and replace it with real page
when needed.
Christophe
>
> We prepopulate pgds/p4ds for the range that would otherwise be empty.
> This is required to get it synced to hardware on boot, allowing the
> lower levels of the page tables to be filled dynamically.
>
> Acked-by: Dmitry Vyukov <dvyukov@google.com>
> Signed-off-by: Daniel Axtens <dja@axtens.net>
>
> ---
>
> v2: move from faulting in shadow pgds to prepopulating
> ---
> arch/x86/Kconfig | 1 +
> arch/x86/mm/kasan_init_64.c | 61 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 62 insertions(+)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 222855cc0158..40562cc3771f 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -134,6 +134,7 @@ config X86
> select HAVE_ARCH_JUMP_LABEL
> select HAVE_ARCH_JUMP_LABEL_RELATIVE
> select HAVE_ARCH_KASAN if X86_64
> + select HAVE_ARCH_KASAN_VMALLOC if X86_64
> select HAVE_ARCH_KGDB
> select HAVE_ARCH_MMAP_RND_BITS if MMU
> select HAVE_ARCH_MMAP_RND_COMPAT_BITS if MMU && COMPAT
> diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
> index 296da58f3013..2f57c4ddff61 100644
> --- a/arch/x86/mm/kasan_init_64.c
> +++ b/arch/x86/mm/kasan_init_64.c
> @@ -245,6 +245,52 @@ static void __init kasan_map_early_shadow(pgd_t *pgd)
> } while (pgd++, addr = next, addr != end);
> }
>
> +static void __init kasan_shallow_populate_p4ds(pgd_t *pgd,
> + unsigned long addr,
> + unsigned long end,
> + int nid)
> +{
> + p4d_t *p4d;
> + unsigned long next;
> + void *p;
> +
> + p4d = p4d_offset(pgd, addr);
> + do {
> + next = p4d_addr_end(addr, end);
> +
> + if (p4d_none(*p4d)) {
> + p = early_alloc(PAGE_SIZE, nid, true);
> + p4d_populate(&init_mm, p4d, p);
> + }
> + } while (p4d++, addr = next, addr != end);
> +}
> +
> +static void __init kasan_shallow_populate_pgds(void *start, void *end)
> +{
> + unsigned long addr, next;
> + pgd_t *pgd;
> + void *p;
> + int nid = early_pfn_to_nid((unsigned long)start);
> +
> + addr = (unsigned long)start;
> + pgd = pgd_offset_k(addr);
> + do {
> + next = pgd_addr_end(addr, (unsigned long)end);
> +
> + if (pgd_none(*pgd)) {
> + p = early_alloc(PAGE_SIZE, nid, true);
> + pgd_populate(&init_mm, pgd, p);
> + }
> +
> + /*
> + * we need to populate p4ds to be synced when running in
> + * four level mode - see sync_global_pgds_l4()
> + */
> + kasan_shallow_populate_p4ds(pgd, addr, next, nid);
> + } while (pgd++, addr = next, addr != (unsigned long)end);
> +}
> +
> +
> #ifdef CONFIG_KASAN_INLINE
> static int kasan_die_handler(struct notifier_block *self,
> unsigned long val,
> @@ -352,9 +398,24 @@ void __init kasan_init(void)
> shadow_cpu_entry_end = (void *)round_up(
> (unsigned long)shadow_cpu_entry_end, PAGE_SIZE);
>
> + /*
> + * If we're in full vmalloc mode, don't back vmalloc space with early
> + * shadow pages. Instead, prepopulate pgds/p4ds so they are synced to
> + * the global table and we can populate the lower levels on demand.
> + */
> +#ifdef CONFIG_KASAN_VMALLOC
> + kasan_shallow_populate_pgds(
> + kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM),
> + kasan_mem_to_shadow((void *)VMALLOC_END));
> +
> + kasan_populate_early_shadow(
> + kasan_mem_to_shadow((void *)VMALLOC_END + 1),
> + shadow_cpu_entry_begin);
> +#else
> kasan_populate_early_shadow(
> kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM),
> shadow_cpu_entry_begin);
> +#endif
>
> kasan_populate_shadow((unsigned long)shadow_cpu_entry_begin,
> (unsigned long)shadow_cpu_entry_end, 0);
>
next prev parent reply other threads:[~2019-08-16 8:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 0:16 [PATCH v4 0/3] kasan: support backing vmalloc space with real shadow memory Daniel Axtens
2019-08-15 0:16 ` [PATCH v4 1/3] " Daniel Axtens
2019-08-16 7:47 ` Christophe Leroy
2019-08-16 17:08 ` Mark Rutland
2019-08-16 17:41 ` Andy Lutomirski
2019-08-19 10:15 ` Mark Rutland
2019-08-19 3:58 ` Daniel Axtens
2019-08-19 22:20 ` Andy Lutomirski
2019-08-15 0:16 ` [PATCH v4 2/3] fork: support VMAP_STACK with KASAN_VMALLOC Daniel Axtens
2019-08-15 0:16 ` [PATCH v4 3/3] x86/kasan: support KASAN_VMALLOC Daniel Axtens
2019-08-16 8:04 ` Christophe Leroy [this message]
2019-08-15 11:28 ` [PATCH v4 0/3] kasan: support backing vmalloc space with real shadow memory Mark Rutland
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=d8d2d0ae-8ebc-d572-7a62-f17f28cb1bac@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=aryabinin@virtuozzo.com \
--cc=dja@axtens.net \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=gor@linux.ibm.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).