From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Andrew Donnellan <ajd@linux.ibm.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Cc: "linux-hardening@vger.kernel.org"
<linux-hardening@vger.kernel.org>,
"cmr@bluescreens.de" <cmr@bluescreens.de>
Subject: Re: [RFC PATCH 6/6] powerpc/64s: Enable CONFIG_VMAP_STACK
Date: Sat, 5 Nov 2022 17:07:29 +0000 [thread overview]
Message-ID: <1ae2abf5-e85d-cc6d-0cd4-1b89400ea780@csgroup.eu> (raw)
In-Reply-To: <20221104172737.391978-7-ajd@linux.ibm.com>
Le 04/11/2022 à 18:27, Andrew Donnellan a écrit :
> Enable CONFIG_VMAP_STACK for book3s64.
>
> To do this, we need to make some slight adjustments to set the stack SLB
> entry up for vmalloc rather than linear.
>
> For now, only enable if KVM_BOOK3S_64_HV is disabled (there's some real mode
> handlers we need to fix there).
There is one missing point : with VMAP_STACK, a stack overflow will
generate a page fault. You have to handle it at interrupt entry, before
going back to virtual mode, otherwise it will fault forever.
See how it is done in arch/powerpc/kernel/head_32.h, in macro
EXCEPTION_PROLOG_1
>
> Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com>
> ---
> arch/powerpc/kernel/process.c | 4 ++++
> arch/powerpc/mm/book3s64/slb.c | 11 +++++++++--
> arch/powerpc/platforms/Kconfig.cputype | 1 +
> 3 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
> index 07917726c629..cadf2db5a2a8 100644
> --- a/arch/powerpc/kernel/process.c
> +++ b/arch/powerpc/kernel/process.c
> @@ -1685,7 +1685,11 @@ static void setup_ksp_vsid(struct task_struct *p, unsigned long sp)
> {
> #ifdef CONFIG_PPC_64S_HASH_MMU
> unsigned long sp_vsid;
> +#ifdef CONFIG_VMAP_STACK
> + unsigned long llp = mmu_psize_defs[mmu_vmalloc_psize].sllp;
> +#else /* CONFIG_VMAP_STACK */
> unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
> +#endif /* CONFIG_VMAP_STACK */
I think you could use IS_ENABLED() instead of an ifdef:
unsigned long llp;
if (IS_ENABLED(CONFIG_VMAP_STACK))
llp = mmu_psize_defs[mmu_vmalloc_psize].sllp;
else
llp = mmu_psize_defs[mmu_linear_psize].sllp;
>
> if (radix_enabled())
> return;
> diff --git a/arch/powerpc/mm/book3s64/slb.c b/arch/powerpc/mm/book3s64/slb.c
> index 6956f637a38c..0e21f0eaa7bb 100644
> --- a/arch/powerpc/mm/book3s64/slb.c
> +++ b/arch/powerpc/mm/book3s64/slb.c
> @@ -541,7 +541,7 @@ void slb_set_size(u16 size)
> void slb_initialize(void)
> {
> unsigned long linear_llp, vmalloc_llp, io_llp;
> - unsigned long lflags;
> + unsigned long lflags, kstack_flags;
> static int slb_encoding_inited;
> #ifdef CONFIG_SPARSEMEM_VMEMMAP
> unsigned long vmemmap_llp;
> @@ -582,11 +582,18 @@ void slb_initialize(void)
> * get_paca()->kstack hasn't been initialized yet.
> * For secondary cpus, we need to bolt the kernel stack entry now.
> */
> +
> +#ifdef CONFIG_VMAP_STACK
> + kstack_flags = SLB_VSID_KERNEL | vmalloc_llp;
> +#else
> + kstack_flags = SLB_VSID_KERNEL | linear_llp;
> +#endif
Same, should be
if (IS_ENABLED(CONFIG_VMAP_STACK))
kstack_flags = SLB_VSID_KERNEL | vmalloc_llp;
else
kstack_flags = SLB_VSID_KERNEL | linear_llp;
> slb_shadow_clear(KSTACK_INDEX);
> if (raw_smp_processor_id() != boot_cpuid &&
> (get_paca()->kstack & slb_esid_mask(mmu_kernel_ssize)) > PAGE_OFFSET)
> create_shadowed_slbe(get_paca()->kstack,
> - mmu_kernel_ssize, lflags, KSTACK_INDEX);
> + mmu_kernel_ssize, kstack_flags,
> + KSTACK_INDEX);
>
> asm volatile("isync":::"memory");
> }
> diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
> index 0c4eed9aea80..998317257797 100644
> --- a/arch/powerpc/platforms/Kconfig.cputype
> +++ b/arch/powerpc/platforms/Kconfig.cputype
> @@ -104,6 +104,7 @@ config PPC_BOOK3S_64
> select IRQ_WORK
> select PPC_64S_HASH_MMU if !PPC_RADIX_MMU
> select KASAN_VMALLOC if KASAN
> + select HAVE_ARCH_VMAP_STACK if KVM_BOOK3S_64_HV = n
Is it different from
select HAVE_ARCH_VMAP_STACK if !KVM_BOOK3S_64_HV ?
>
> config PPC_BOOK3E_64
> bool "Embedded processors"
prev parent reply other threads:[~2022-11-05 17:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-04 17:27 [RFC PATCH 0/6] VMAP_STACK support for book3s64 Andrew Donnellan
2022-11-04 17:27 ` [RFC PATCH 1/6] powerpc/64s: Fix assembly to support larger values of THREAD_SIZE Andrew Donnellan
2022-11-04 17:51 ` Christophe Leroy
2023-04-26 7:03 ` Andrew Donnellan
2022-11-04 17:27 ` [RFC PATCH 2/6] powerpc/64s: Helpers to switch between linear and vmapped stack pointers Andrew Donnellan
2022-11-05 8:00 ` Christophe Leroy
2022-11-05 19:28 ` Christophe Leroy
2022-11-07 12:38 ` Nicholas Piggin
2022-11-04 17:27 ` [RFC PATCH 3/6] powerpc/powernv: Keep MSR in register across OPAL entry/return path Andrew Donnellan
2022-11-04 18:00 ` Christophe Leroy
2022-11-04 17:27 ` [RFC PATCH 4/6] powerpc/powernv: Convert pointers to physical addresses in OPAL call args Andrew Donnellan
2022-11-07 0:00 ` Russell Currey
2022-11-08 16:21 ` Christophe Leroy
2022-11-04 17:27 ` [RFC PATCH 5/6] powerpc/powernv/idle: Convert stack pointer to physical address Andrew Donnellan
2022-11-08 16:17 ` Christophe Leroy
2022-11-04 17:27 ` [RFC PATCH 6/6] powerpc/64s: Enable CONFIG_VMAP_STACK Andrew Donnellan
2022-11-05 17:07 ` Christophe Leroy [this message]
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=1ae2abf5-e85d-cc6d-0cd4-1b89400ea780@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=ajd@linux.ibm.com \
--cc=cmr@bluescreens.de \
--cc=linux-hardening@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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).