From: Christophe LEROY <christophe.leroy@c-s.fr>
To: Balbir Singh <bsingharora@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Scott Wood <oss@buserror.net>, Meelis Roos <mroos@linux.ee>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)"
<linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH v2] powerpc: fix boot on BOOK3S_32 with CONFIG_STRICT_KERNEL_RWX
Date: Wed, 22 Nov 2017 08:16:28 +0100 [thread overview]
Message-ID: <141a04c4-a236-430d-f346-ad31252e146a@c-s.fr> (raw)
In-Reply-To: <CAKTCnznviUQfizSdfMDGxO_8CFuwhPCNSkK2VagNSRvZdpLqyg@mail.gmail.com>
Le 22/11/2017 à 00:07, Balbir Singh a écrit :
> On Wed, Nov 22, 2017 at 1:28 AM, Christophe Leroy
> <christophe.leroy@c-s.fr> wrote:
>> On powerpc32, patch_instruction() is called by apply_feature_fixups()
>> which is called from early_init()
>>
>> There is the following note in front of early_init():
>> * Note that the kernel may be running at an address which is different
>> * from the address that it was linked at, so we must use RELOC/PTRRELOC
>> * to access static data (including strings). -- paulus
>>
>> Therefore, slab_is_available() cannot be called yet, and
>> text_poke_area must be addressed with PTRRELOC()
>>
>> Fixes: 37bc3e5fd764f ("powerpc/lib/code-patching: Use alternate map
>> for patch_instruction()")
>> Reported-by: Meelis Roos <mroos@linux.ee>
>> Cc: Balbir Singh <bsingharora@gmail.com>
>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>> ---
>> v2: Added missing asm/setup.h
>>
>> arch/powerpc/lib/code-patching.c | 6 ++----
>> 1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
>> index c9de03e0c1f1..d469224c4ada 100644
>> --- a/arch/powerpc/lib/code-patching.c
>> +++ b/arch/powerpc/lib/code-patching.c
>> @@ -21,6 +21,7 @@
>> #include <asm/tlbflush.h>
>> #include <asm/page.h>
>> #include <asm/code-patching.h>
>> +#include <asm/setup.h>
>>
>> static int __patch_instruction(unsigned int *addr, unsigned int instr)
>> {
>> @@ -146,11 +147,8 @@ int patch_instruction(unsigned int *addr, unsigned int instr)
>> * During early early boot patch_instruction is called
>> * when text_poke_area is not ready, but we still need
>> * to allow patching. We just do the plain old patching
>> - * We use slab_is_available and per cpu read * via this_cpu_read
>> - * of text_poke_area. Per-CPU areas might not be up early
>> - * this can create problems with just using this_cpu_read()
>> */
>> - if (!slab_is_available() || !this_cpu_read(text_poke_area))
>> + if (!this_cpu_read(*PTRRELOC(&text_poke_area)))
>> return __patch_instruction(addr, instr);
>
> On ppc64, we call apply_feature_fixups() in early_setup() after we've
> relocated ourselves. Sorry for missing the ppc32 case. I would like to
> avoid PTRRELOC when unnecessary.
What do you suggest then ?
Some #ifdef PPC32 around that ?
Christophe
>
> Balbir Singh.
>
next prev parent reply other threads:[~2017-11-22 7:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 14:28 [PATCH v2] powerpc: fix boot on BOOK3S_32 with CONFIG_STRICT_KERNEL_RWX Christophe Leroy
2017-11-21 17:28 ` Meelis Roos
2017-11-21 22:22 ` Benjamin Herrenschmidt
2017-11-21 23:07 ` Balbir Singh
2017-11-22 7:16 ` Christophe LEROY [this message]
2017-11-22 11:48 ` Michael Ellerman
2017-11-23 7:49 ` Christophe LEROY
2017-11-23 12:04 ` Michael Ellerman
2017-11-25 23:57 ` Balbir Singh
2017-11-22 11:55 ` Michael Ellerman
2017-11-24 9:46 ` [v2] " Michael Ellerman
-- strict thread matches above, loose matches on Subject: below --
2017-11-21 14:26 [PATCH v2] " 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=141a04c4-a236-430d-f346-ad31252e146a@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=mroos@linux.ee \
--cc=oss@buserror.net \
--cc=paulus@samba.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).