From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
To: Jinyang He <hejinyang@loongson.cn>
Cc: Huacai Chen <chenhuacai@kernel.org>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] MIPS: relocatable: Use __kaslr_offset in show_kernel_relocation
Date: Thu, 4 Feb 2021 16:36:23 +0100 [thread overview]
Message-ID: <20210204153623.GA14818@alpha.franken.de> (raw)
In-Reply-To: <1612348510-29569-2-git-send-email-hejinyang@loongson.cn>
On Wed, Feb 03, 2021 at 06:35:10PM +0800, Jinyang He wrote:
> The type of the VMLINUX_LOAD_ADDRESS macro is the (unsigned long long)
> in 32bits kernel but (unsigned long) in the 64-bit kernel. Although there
> is no error here, avoid using it to calculate kaslr_offset. And here we
> may need is that the address of __kaslr_offset rather than (void *)offset.
>
> Signed-off-by: Jinyang He <hejinyang@loongson.cn>
> ---
> arch/mips/kernel/relocate.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c
> index 95abb9c..52018a3 100644
> --- a/arch/mips/kernel/relocate.c
> +++ b/arch/mips/kernel/relocate.c
> @@ -430,13 +430,9 @@ void *__init relocate_kernel(void)
> */
> static void show_kernel_relocation(const char *level)
> {
> - unsigned long offset;
> -
> - offset = __pa_symbol(_text) - __pa_symbol(VMLINUX_LOAD_ADDRESS);
> -
> - if (IS_ENABLED(CONFIG_RELOCATABLE) && offset > 0) {
> + if (__kaslr_offset > 0) {
> printk(level);
> - pr_cont("Kernel relocated by 0x%pK\n", (void *)offset);
> + pr_cont("Kernel relocated by 0x%pK\n", &__kaslr_offset);
are you sure ? I would have expected (void *)__kaslr_offset here.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
next prev parent reply other threads:[~2021-02-04 15:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 10:35 [PATCH v2 1/2] MIPS: relocatable: Provide kaslr_offset() to get the kernel offset Jinyang He
2021-02-03 10:35 ` [PATCH v2 2/2] MIPS: relocatable: Use __kaslr_offset in show_kernel_relocation Jinyang He
2021-02-04 15:36 ` Thomas Bogendoerfer [this message]
2021-02-05 1:55 ` Jinyang He
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=20210204153623.GA14818@alpha.franken.de \
--to=tsbogend@alpha.franken.de \
--cc=chenhuacai@kernel.org \
--cc=hejinyang@loongson.cn \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.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 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.