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,
zhaohongjiang@huawei.com
Subject: Re: [PATCH v2 05/10] powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper
Date: Tue, 30 Jul 2019 11:26:23 +0200 [thread overview]
Message-ID: <a1159f8e-ba34-5568-aef0-31f3a8b65449@c-s.fr> (raw)
In-Reply-To: <20190730074225.39544-6-yanaijie@huawei.com>
Le 30/07/2019 à 09:42, Jason Yan a écrit :
> Add a new helper reloc_kernel_entry() to jump back to the start of the
> new kernel. After we put the new kernel in a randomized place we can use
> this new helper to enter the kernel and begin to relocate again.
>
> 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>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
> arch/powerpc/kernel/head_fsl_booke.S | 13 +++++++++++++
> arch/powerpc/mm/mmu_decl.h | 1 +
> 2 files changed, 14 insertions(+)
>
> diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
> index 04d124fee17d..2083382dd662 100644
> --- a/arch/powerpc/kernel/head_fsl_booke.S
> +++ b/arch/powerpc/kernel/head_fsl_booke.S
> @@ -1143,6 +1143,19 @@ _GLOBAL(create_tlb_entry)
> sync
> blr
>
> +/*
> + * Return to the start of the relocated kernel and run again
> + * r3 - virtual address of fdt
> + * r4 - entry of the kernel
> + */
> +_GLOBAL(reloc_kernel_entry)
> + mfmsr r7
> + rlwinm r7, r7, 0, ~(MSR_IS | MSR_DS)
> +
> + mtspr SPRN_SRR0,r4
> + mtspr SPRN_SRR1,r7
> + rfi
> +
> /*
> * Create a tlb entry with the same effective and physical address as
> * the tlb entry used by the current running code. But set the TS to 1.
> diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
> index a09f89d3aa0f..804da298beb3 100644
> --- a/arch/powerpc/mm/mmu_decl.h
> +++ b/arch/powerpc/mm/mmu_decl.h
> @@ -143,6 +143,7 @@ extern void adjust_total_lowmem(void);
> extern int switch_to_as1(void);
> extern void restore_to_as0(int esel, int offset, void *dt_ptr, int bootcpu);
> void create_tlb_entry(phys_addr_t phys, unsigned long virt, int entry);
> +void reloc_kernel_entry(void *fdt, int addr);
> #endif
> extern void loadcam_entry(unsigned int index);
> extern void loadcam_multi(int first_idx, int num, int tmp_idx);
>
next prev parent reply other threads:[~2019-07-30 9:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 7:42 [PATCH v2 00/10] implement KASLR for powerpc/fsl_booke/32 Jason Yan
2019-07-30 7:42 ` [PATCH v2 01/10] powerpc: unify definition of M_IF_NEEDED Jason Yan
2019-07-30 7:42 ` [PATCH v2 02/10] powerpc: move memstart_addr and kernstart_addr to init-common.c Jason Yan
2019-07-30 9:25 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 03/10] powerpc: introduce kimage_vaddr to store the kernel base Jason Yan
2019-07-30 9:25 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 04/10] powerpc/fsl_booke/32: introduce create_tlb_entry() helper Jason Yan
2019-07-30 9:26 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 05/10] powerpc/fsl_booke/32: introduce reloc_kernel_entry() helper Jason Yan
2019-07-30 9:26 ` Christophe Leroy [this message]
2019-07-30 7:42 ` [PATCH v2 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure Jason Yan
2019-07-30 9:34 ` Christophe Leroy
2019-07-31 2:03 ` Jason Yan
2019-07-30 7:42 ` [PATCH v2 07/10] powerpc/fsl_booke/32: randomize the kernel image offset Jason Yan
2019-07-30 9:44 ` Christophe Leroy
2019-07-31 2:06 ` Jason Yan
2019-07-30 7:42 ` [PATCH v2 08/10] powerpc/fsl_booke/kaslr: clear the original kernel if randomized Jason Yan
2019-07-30 9:47 ` Christophe Leroy
2019-07-30 7:42 ` [PATCH v2 09/10] powerpc/fsl_booke/kaslr: support nokaslr cmdline parameter Jason Yan
2019-07-30 7:42 ` [PATCH v2 10/10] powerpc/fsl_booke/kaslr: dump out kernel offset information on panic Jason Yan
2019-07-30 9:48 ` Christophe Leroy
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=a1159f8e-ba34-5568-aef0-31f3a8b65449@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 \
--cc=zhaohongjiang@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: 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).