From: stefan@agner.ch (Stefan Agner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: copypage: do not use naked functions
Date: Tue, 16 Oct 2018 00:51:26 +0200 [thread overview]
Message-ID: <4e598f27e3dc7ae9fd96a6cf097d1154@agner.ch> (raw)
In-Reply-To: <20181015224152.GA30658@n2100.armlinux.org.uk>
On 16.10.2018 00:41, Russell King - ARM Linux wrote:
> On Mon, Oct 15, 2018 at 06:35:33PM -0400, Nicolas Pitre wrote:
>> On Tue, 16 Oct 2018, Stefan Agner wrote:
>>
>> > GCC documentation says naked functions should only use basic ASM
>> > syntax. The extended ASM or mixture of basic ASM and "C" code is
>> > not guaranteed. Currently it seems to work though.
>> >
>> > Furthermore with Clang using parameters in extended asm in a
>> > naked function is not supported:
>> > arch/arm/mm/copypage-v4wb.c:47:9: error: parameter references not
>> > allowed in naked functions
>> > : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64));
>> > ^
>> >
>> > Use a regular function to be more portable. Also use volatile asm
>> > to avoid unsolicited optimizations.
>> >
>> > Tested with qemu versatileab machine and versatile_defconfig and
>> > qemu mainstone machine using pxa_defconfig compiled with GCC 7.2.1
>> > and Clang 7.0.
>> >
>> > Link: https://github.com/ClangBuiltLinux/linux/issues/90
>> > Reported-by: Joel Stanley <joel@jms.id.au>
>> > Signed-off-by: Stefan Agner <stefan@agner.ch>
>> > ---
>> > arch/arm/mm/copypage-fa.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-feroceon.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-v4mc.c | 14 +++++++++-----
>> > arch/arm/mm/copypage-v4wb.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-v4wt.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-xsc3.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-xscale.c | 13 ++++++++-----
>> > 7 files changed, 72 insertions(+), 40 deletions(-)
>> >
>> > diff --git a/arch/arm/mm/copypage-fa.c b/arch/arm/mm/copypage-fa.c
>> > index ec6501308c60..33ccd396bf99 100644
>> > --- a/arch/arm/mm/copypage-fa.c
>> > +++ b/arch/arm/mm/copypage-fa.c
>> > @@ -17,11 +17,16 @@
>> > /*
>> > * Faraday optimised copy_user_page
>> > */
>> > -static void __naked
>> > -fa_copy_user_page(void *kto, const void *kfrom)
>> > +static void fa_copy_user_page(void *kto, const void *kfrom)
>> > {
>> > - asm("\
>> > - stmfd sp!, {r4, lr} @ 2\n\
>> > + register void *r0 asm("r0") = kto;
>> > + register const void *r1 asm("r1") = kfrom;
>> > +
>> > + asm(
>> > + __asmeq("%0", "r0")
>> > + __asmeq("%1", "r1")
>> > + "\
>> > + stmfd sp!, {r4} @ 2\n\
>> > mov r2, %2 @ 1\n\
>> > 1: ldmia r1!, {r3, r4, ip, lr} @ 4\n\
>> > stmia r0, {r3, r4, ip, lr} @ 4\n\
>> > @@ -34,9 +39,9 @@ fa_copy_user_page(void *kto, const void *kfrom)
>> > subs r2, r2, #1 @ 1\n\
>> > bne 1b @ 1\n\
>> > mcr p15, 0, r2, c7, c10, 4 @ 1 drain WB\n\
>> > - ldmfd sp!, {r4, pc} @ 3"
>> > + ldmfd sp!, {r4} @ 3"
>> > :
>> > - : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 32));
>> > + : "r" (r0), "r" (r1), "I" (PAGE_SIZE / 32));
>>
>> This is still wrong as you list r0 and r1 in the input operand list
>> where they must remain constant but the code does modify them. You
>> should list them in the output operand list with the "&" attribute. Also
>> r2 should be listed in the clobbered list.
>
> Either we keep these as naked functions (and, if Clang wants to
> try to inline naked functions which makes no sense, also mark them
> as noinline) or we make them proper functions and also add (eg) r4
> to the clobber list and get rid of the stacking of that register
> along with LR/PC.
Clang does not inline naked functions, at least that is what a quick
look at the disassembled code shows when compiling with 9a40ac86152c
reverted.
>
> Having this half-way house which will generate worse code is not
> acceptable.
For Clang reverting 9a40ac86152c ("ARM: 6164/1: Add kto and kfrom to
input operands list.") is a solution...
I guess the question is why that commit was necessary back then... Do we
break something by reverting it?
--
Stefan
WARNING: multiple messages have this Message-ID (diff)
From: Stefan Agner <stefan@agner.ch>
To: Russell King - ARM Linux <linux@armlinux.org.uk>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>,
ulli.kroll@googlemail.com, joel@jms.id.au, arnd@arndb.de,
linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] ARM: copypage: do not use naked functions
Date: Tue, 16 Oct 2018 00:51:26 +0200 [thread overview]
Message-ID: <4e598f27e3dc7ae9fd96a6cf097d1154@agner.ch> (raw)
In-Reply-To: <20181015224152.GA30658@n2100.armlinux.org.uk>
On 16.10.2018 00:41, Russell King - ARM Linux wrote:
> On Mon, Oct 15, 2018 at 06:35:33PM -0400, Nicolas Pitre wrote:
>> On Tue, 16 Oct 2018, Stefan Agner wrote:
>>
>> > GCC documentation says naked functions should only use basic ASM
>> > syntax. The extended ASM or mixture of basic ASM and "C" code is
>> > not guaranteed. Currently it seems to work though.
>> >
>> > Furthermore with Clang using parameters in extended asm in a
>> > naked function is not supported:
>> > arch/arm/mm/copypage-v4wb.c:47:9: error: parameter references not
>> > allowed in naked functions
>> > : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64));
>> > ^
>> >
>> > Use a regular function to be more portable. Also use volatile asm
>> > to avoid unsolicited optimizations.
>> >
>> > Tested with qemu versatileab machine and versatile_defconfig and
>> > qemu mainstone machine using pxa_defconfig compiled with GCC 7.2.1
>> > and Clang 7.0.
>> >
>> > Link: https://github.com/ClangBuiltLinux/linux/issues/90
>> > Reported-by: Joel Stanley <joel@jms.id.au>
>> > Signed-off-by: Stefan Agner <stefan@agner.ch>
>> > ---
>> > arch/arm/mm/copypage-fa.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-feroceon.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-v4mc.c | 14 +++++++++-----
>> > arch/arm/mm/copypage-v4wb.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-v4wt.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-xsc3.c | 17 +++++++++++------
>> > arch/arm/mm/copypage-xscale.c | 13 ++++++++-----
>> > 7 files changed, 72 insertions(+), 40 deletions(-)
>> >
>> > diff --git a/arch/arm/mm/copypage-fa.c b/arch/arm/mm/copypage-fa.c
>> > index ec6501308c60..33ccd396bf99 100644
>> > --- a/arch/arm/mm/copypage-fa.c
>> > +++ b/arch/arm/mm/copypage-fa.c
>> > @@ -17,11 +17,16 @@
>> > /*
>> > * Faraday optimised copy_user_page
>> > */
>> > -static void __naked
>> > -fa_copy_user_page(void *kto, const void *kfrom)
>> > +static void fa_copy_user_page(void *kto, const void *kfrom)
>> > {
>> > - asm("\
>> > - stmfd sp!, {r4, lr} @ 2\n\
>> > + register void *r0 asm("r0") = kto;
>> > + register const void *r1 asm("r1") = kfrom;
>> > +
>> > + asm(
>> > + __asmeq("%0", "r0")
>> > + __asmeq("%1", "r1")
>> > + "\
>> > + stmfd sp!, {r4} @ 2\n\
>> > mov r2, %2 @ 1\n\
>> > 1: ldmia r1!, {r3, r4, ip, lr} @ 4\n\
>> > stmia r0, {r3, r4, ip, lr} @ 4\n\
>> > @@ -34,9 +39,9 @@ fa_copy_user_page(void *kto, const void *kfrom)
>> > subs r2, r2, #1 @ 1\n\
>> > bne 1b @ 1\n\
>> > mcr p15, 0, r2, c7, c10, 4 @ 1 drain WB\n\
>> > - ldmfd sp!, {r4, pc} @ 3"
>> > + ldmfd sp!, {r4} @ 3"
>> > :
>> > - : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 32));
>> > + : "r" (r0), "r" (r1), "I" (PAGE_SIZE / 32));
>>
>> This is still wrong as you list r0 and r1 in the input operand list
>> where they must remain constant but the code does modify them. You
>> should list them in the output operand list with the "&" attribute. Also
>> r2 should be listed in the clobbered list.
>
> Either we keep these as naked functions (and, if Clang wants to
> try to inline naked functions which makes no sense, also mark them
> as noinline) or we make them proper functions and also add (eg) r4
> to the clobber list and get rid of the stacking of that register
> along with LR/PC.
Clang does not inline naked functions, at least that is what a quick
look at the disassembled code shows when compiling with 9a40ac86152c
reverted.
>
> Having this half-way house which will generate worse code is not
> acceptable.
For Clang reverting 9a40ac86152c ("ARM: 6164/1: Add kto and kfrom to
input operands list.") is a solution...
I guess the question is why that commit was necessary back then... Do we
break something by reverting it?
--
Stefan
next prev parent reply other threads:[~2018-10-15 22:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 22:26 [PATCH 2/2] ARM: copypage: do not use naked functions Stefan Agner
2018-10-15 22:26 ` Stefan Agner
2018-10-15 22:35 ` Nicolas Pitre
2018-10-15 22:35 ` Nicolas Pitre
2018-10-15 22:41 ` Russell King - ARM Linux
2018-10-15 22:41 ` Russell King - ARM Linux
2018-10-15 22:51 ` Stefan Agner [this message]
2018-10-15 22:51 ` Stefan Agner
2018-10-15 23:27 ` Nicolas Pitre
2018-10-15 23:27 ` Nicolas Pitre
2018-10-16 8:33 ` Russell King - ARM Linux
2018-10-16 8:33 ` Russell King - ARM Linux
2018-10-16 12:09 ` Stefan Agner
2018-10-16 12:09 ` Stefan Agner
2018-10-15 22:54 ` Nicolas Pitre
2018-10-15 22:54 ` Nicolas Pitre
2018-10-15 23:02 ` Russell King - ARM Linux
2018-10-15 23:02 ` Russell King - ARM Linux
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=4e598f27e3dc7ae9fd96a6cf097d1154@agner.ch \
--to=stefan@agner.ch \
--cc=linux-arm-kernel@lists.infradead.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.