From: Christophe Leroy <christophe.leroy@c-s.fr> To: Jason Yan <yanaijie@huawei.com>, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, diana.craciun@nxp.com, benh@kernel.crashing.org, paulus@samba.org, npiggin@gmail.com, keescook@chromium.org, kernel-hardening@lists.openwall.com Cc: linux-kernel@vger.kernel.org, wangkefeng.wang@huawei.com, yebin10@huawei.com, thunder.leizhen@huawei.com, jingxiangfeng@huawei.com, fanchengyang@huawei.com Subject: Re: [RFC PATCH 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure Date: Mon, 29 Jul 2019 13:16:21 +0200 [thread overview] Message-ID: <e3f287fc-c4d8-e0c2-90ba-ddfa3cb57e29@c-s.fr> (raw) In-Reply-To: <20190717080621.40424-7-yanaijie@huawei.com> Le 17/07/2019 à 10:06, Jason Yan a écrit : > This patch add support to boot kernel from places other than KERNELBASE. > Since CONFIG_RELOCATABLE has already supported, what we need to do is > map or copy kernel to a proper place and relocate. Freescale Book-E > parts expect lowmem to be mapped by fixed TLB entries(TLB1). The TLB1 > entries are not suitable to map the kernel directly in a randomized > region, so we chose to copy the kernel to a proper place and restart to > relocate. > > The offset of the kernel was not randomized yet(a fixed 64M is set). We > will randomize it in the next patch. > > Signed-off-by: Jason Yan <yanaijie@huawei.com> > Cc: Diana Craciun <diana.craciun@nxp.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Christophe Leroy <christophe.leroy@c-s.fr> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Cc: Paul Mackerras <paulus@samba.org> > Cc: Nicholas Piggin <npiggin@gmail.com> > Cc: Kees Cook <keescook@chromium.org> > --- > arch/powerpc/Kconfig | 11 +++ > arch/powerpc/kernel/Makefile | 1 + > arch/powerpc/kernel/early_32.c | 2 +- > arch/powerpc/kernel/fsl_booke_entry_mapping.S | 13 ++- > arch/powerpc/kernel/head_fsl_booke.S | 15 +++- > arch/powerpc/kernel/kaslr_booke.c | 83 +++++++++++++++++++ > arch/powerpc/mm/mmu_decl.h | 6 ++ > arch/powerpc/mm/nohash/fsl_booke.c | 7 +- > 8 files changed, 125 insertions(+), 13 deletions(-) > create mode 100644 arch/powerpc/kernel/kaslr_booke.c > [...] > diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h > index dae8e9177574..754ae1e69f92 100644 > --- a/arch/powerpc/mm/mmu_decl.h > +++ b/arch/powerpc/mm/mmu_decl.h > @@ -148,6 +148,12 @@ extern void reloc_kernel_entry(void *fdt, int addr); > extern void loadcam_entry(unsigned int index); > extern void loadcam_multi(int first_idx, int num, int tmp_idx); > > +#ifdef CONFIG_RANDOMIZE_BASE > +extern void kaslr_early_init(void *dt_ptr, phys_addr_t size); No superflous 'extern' keyword. Christophe > +#else > +static inline void kaslr_early_init(void *dt_ptr, phys_addr_t size) {} > +#endif > + > struct tlbcam { > u32 MAS0; > u32 MAS1;
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@c-s.fr> To: Jason Yan <yanaijie@huawei.com>, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, diana.craciun@nxp.com, benh@kernel.crashing.org, paulus@samba.org, npiggin@gmail.com, keescook@chromium.org, kernel-hardening@lists.openwall.com Cc: wangkefeng.wang@huawei.com, linux-kernel@vger.kernel.org, jingxiangfeng@huawei.com, thunder.leizhen@huawei.com, fanchengyang@huawei.com, yebin10@huawei.com Subject: Re: [RFC PATCH 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure Date: Mon, 29 Jul 2019 13:16:21 +0200 [thread overview] Message-ID: <e3f287fc-c4d8-e0c2-90ba-ddfa3cb57e29@c-s.fr> (raw) In-Reply-To: <20190717080621.40424-7-yanaijie@huawei.com> Le 17/07/2019 à 10:06, Jason Yan a écrit : > This patch add support to boot kernel from places other than KERNELBASE. > Since CONFIG_RELOCATABLE has already supported, what we need to do is > map or copy kernel to a proper place and relocate. Freescale Book-E > parts expect lowmem to be mapped by fixed TLB entries(TLB1). The TLB1 > entries are not suitable to map the kernel directly in a randomized > region, so we chose to copy the kernel to a proper place and restart to > relocate. > > The offset of the kernel was not randomized yet(a fixed 64M is set). We > will randomize it in the next patch. > > Signed-off-by: Jason Yan <yanaijie@huawei.com> > Cc: Diana Craciun <diana.craciun@nxp.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Christophe Leroy <christophe.leroy@c-s.fr> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Cc: Paul Mackerras <paulus@samba.org> > Cc: Nicholas Piggin <npiggin@gmail.com> > Cc: Kees Cook <keescook@chromium.org> > --- > arch/powerpc/Kconfig | 11 +++ > arch/powerpc/kernel/Makefile | 1 + > arch/powerpc/kernel/early_32.c | 2 +- > arch/powerpc/kernel/fsl_booke_entry_mapping.S | 13 ++- > arch/powerpc/kernel/head_fsl_booke.S | 15 +++- > arch/powerpc/kernel/kaslr_booke.c | 83 +++++++++++++++++++ > arch/powerpc/mm/mmu_decl.h | 6 ++ > arch/powerpc/mm/nohash/fsl_booke.c | 7 +- > 8 files changed, 125 insertions(+), 13 deletions(-) > create mode 100644 arch/powerpc/kernel/kaslr_booke.c > [...] > diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h > index dae8e9177574..754ae1e69f92 100644 > --- a/arch/powerpc/mm/mmu_decl.h > +++ b/arch/powerpc/mm/mmu_decl.h > @@ -148,6 +148,12 @@ extern void reloc_kernel_entry(void *fdt, int addr); > extern void loadcam_entry(unsigned int index); > extern void loadcam_multi(int first_idx, int num, int tmp_idx); > > +#ifdef CONFIG_RANDOMIZE_BASE > +extern void kaslr_early_init(void *dt_ptr, phys_addr_t size); No superflous 'extern' keyword. Christophe > +#else > +static inline void kaslr_early_init(void *dt_ptr, phys_addr_t size) {} > +#endif > + > struct tlbcam { > u32 MAS0; > u32 MAS1;
next prev parent reply other threads:[~2019-07-29 11:16 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-17 8:06 [RFC PATCH 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 01/10] powerpc: unify definition of M_IF_NEEDED Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 10:59 ` Christophe Leroy 2019-07-29 10:59 ` Christophe Leroy 2019-07-17 8:06 ` [RFC PATCH 02/10] powerpc: move memstart_addr and kernstart_addr to init-common.c Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 14:31 ` Christoph Hellwig 2019-07-29 14:31 ` Christoph Hellwig 2019-07-30 0:47 ` Jason Yan 2019-07-30 0:47 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 03/10] powerpc: introduce kimage_vaddr to store the kernel base Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 11:00 ` Christophe Leroy 2019-07-29 14:32 ` Christoph Hellwig 2019-07-29 14:32 ` Christoph Hellwig 2019-07-17 8:06 ` [RFC PATCH 04/10] powerpc/fsl_booke/32: introduce create_tlb_entry() helper Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:05 ` Christophe Leroy 2019-07-29 11:05 ` Christophe Leroy 2019-07-29 13:26 ` Jason Yan 2019-07-29 13:26 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 05/10] powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:08 ` Christophe Leroy 2019-07-29 11:08 ` Christophe Leroy 2019-07-29 13:35 ` Jason Yan 2019-07-29 13:35 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:16 ` Christophe Leroy [this message] 2019-07-29 11:16 ` Christophe Leroy 2019-07-17 8:06 ` [RFC PATCH 07/10] powerpc/fsl_booke/32: randomize the kernel image offset Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:33 ` Christophe Leroy 2019-07-29 11:33 ` Christophe Leroy 2019-07-29 13:53 ` Jason Yan 2019-07-29 13:53 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:19 ` Christophe Leroy 2019-07-29 11:19 ` Christophe Leroy 2019-07-29 13:43 ` Jason Yan 2019-07-29 13:43 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:38 ` Christophe Leroy 2019-07-29 11:38 ` Christophe Leroy 2019-07-29 14:04 ` Jason Yan 2019-07-29 14:04 ` Jason Yan 2019-07-17 8:06 ` [RFC PATCH 10/10] powerpc/fsl_booke/kaslr: dump out kernel offset information on panic Jason Yan 2019-07-17 8:06 ` Jason Yan 2019-07-29 11:43 ` Christophe Leroy 2019-07-29 11:43 ` Christophe Leroy 2019-07-29 14:08 ` Jason Yan 2019-07-29 14:08 ` Jason Yan 2019-07-25 7:16 ` [RFC PATCH 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan 2019-07-25 7:16 ` Jason Yan 2019-07-25 19:58 ` Kees Cook 2019-07-25 19:58 ` Kees Cook 2019-07-26 7:20 ` Jason Yan 2019-07-26 7:20 ` Jason Yan 2019-07-26 16:15 ` Kees Cook 2019-07-26 16:15 ` Kees Cook 2019-07-26 7:04 ` Diana Madalina Craciun 2019-07-26 7:04 ` Diana Madalina Craciun 2019-07-26 7:04 ` Diana Madalina Craciun 2019-07-26 7:26 ` Jason Yan 2019-07-26 7:26 ` Jason Yan 2019-07-26 7:26 ` Jason Yan 2019-07-29 14:30 ` Diana Madalina Craciun 2019-07-29 14:30 ` Diana Madalina Craciun 2019-07-29 14:30 ` Diana Madalina Craciun
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=e3f287fc-c4d8-e0c2-90ba-ddfa3cb57e29@c-s.fr \ --to=christophe.leroy@c-s.fr \ --cc=benh@kernel.crashing.org \ --cc=diana.craciun@nxp.com \ --cc=fanchengyang@huawei.com \ --cc=jingxiangfeng@huawei.com \ --cc=keescook@chromium.org \ --cc=kernel-hardening@lists.openwall.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=paulus@samba.org \ --cc=thunder.leizhen@huawei.com \ --cc=wangkefeng.wang@huawei.com \ --cc=yanaijie@huawei.com \ --cc=yebin10@huawei.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.