From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v1 4/9] powerpc/vdso: Remove unnecessary ifdefs in vdso_pagelist initialization
Date: Thu, 27 Aug 2020 06:47:42 +0000 [thread overview]
Message-ID: <04a968f6-88c0-0603-43aa-202196a68df2@csgroup.eu> (raw)
In-Reply-To: <87ft89h2st.fsf@mpe.ellerman.id.au>
On 08/26/2020 02:58 PM, Michael Ellerman wrote:
> Christophe Leroy <christophe.leroy@csgroup.eu> writes:
>> diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
>> index daef14a284a3..bbb69832fd46 100644
>> --- a/arch/powerpc/kernel/vdso.c
>> +++ b/arch/powerpc/kernel/vdso.c
>> @@ -718,16 +710,14 @@ static int __init vdso_init(void)
> ...
>>
>> -
>> -#ifdef CONFIG_VDSO32
>> vdso32_kbase = &vdso32_start;
>>
>> /*
>> @@ -735,8 +725,6 @@ static int __init vdso_init(void)
>> */
>> vdso32_pages = (&vdso32_end - &vdso32_start) >> PAGE_SHIFT;
>> DBG("vdso32_kbase: %p, 0x%x pages\n", vdso32_kbase, vdso32_pages);
>> -#endif
>
> This didn't build for ppc64le:
>
> /opt/cross/gcc-8.20_binutils-2.32/powerpc64-unknown-linux-gnu/bin/powerpc64-unknown-linux-gnu-ld: arch/powerpc/kernel/vdso.o:(.toc+0x0): undefined reference to `vdso32_end'
> /opt/cross/gcc-8.20_binutils-2.32/powerpc64-unknown-linux-gnu/bin/powerpc64-unknown-linux-gnu-ld: arch/powerpc/kernel/vdso.o:(.toc+0x8): undefined reference to `vdso32_start'
> make[1]: *** [/scratch/michael/build/maint/Makefile:1166: vmlinux] Error 1
> make: *** [Makefile:185: __sub-make] Error 2
>
> So I just put that ifdef back.
>
The problem is because is_32bit() can still return true even when
CONFIG_VDSO32 is not set.
The change below fixes the problem:
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index bbb69832fd46..38abff60cbe2 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -132,11 +132,7 @@ int arch_setup_additional_pages(struct linux_binprm
*bprm, int uses_interp)
if (!vdso_ready)
return 0;
- if (is_32bit_task()) {
- vdso_pagelist = vdso32_pagelist;
- vdso_pages = vdso32_pages;
- vdso_base = VDSO32_MBASE;
- } else {
+ if (!is_32bit_task()) {
vdso_pagelist = vdso64_pagelist;
vdso_pages = vdso64_pages;
/*
@@ -145,6 +141,12 @@ int arch_setup_additional_pages(struct linux_binprm
*bprm, int uses_interp)
* and most likely share a SLB entry.
*/
vdso_base = 0;
+ } else if (IS_ENABLED(CONFIG_VDSO32)) {
+ vdso_pagelist = vdso32_pagelist;
+ vdso_pages = vdso32_pages;
+ vdso_base = VDSO32_MBASE;
+ } else {
+ vdso_pages = 0;
}
current->mm->context.vdso_base = 0;
With this change all vdso32 static objects (functions and vars) go away
as expected.
We get a simple conflict with the following patch.
Do you prefer an updated series or a follow up patch, or you take the
above change yourself ?
Christophe
next prev parent reply other threads:[~2020-08-27 6:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 13:53 [PATCH v1 1/9] powerpc/vdso: Remove BUG_ON() in vdso_init() Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 2/9] powerpc/vdso: Remove get_page() in vdso_pagelist initialization Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 3/9] powerpc/vdso: Remove NULL termination element in vdso_pagelist Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 4/9] powerpc/vdso: Remove unnecessary ifdefs in vdso_pagelist initialization Christophe Leroy
2020-08-26 14:58 ` Michael Ellerman
2020-08-26 15:21 ` Christophe Leroy
2020-08-27 6:47 ` Christophe Leroy [this message]
2020-08-27 13:19 ` Michael Ellerman
2020-08-28 5:40 ` Christophe Leroy
2020-08-28 5:46 ` Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 5/9] powerpc/vdso: move to _install_special_mapping() and remove arch_vma_name() Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 6/9] powerpc/vdso: Provide vdso_remap() Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 7/9] powerpc/vdso: Move vdso datapage up front Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 8/9] powerpc/vdso: Remove __kernel_datapage_offset and simplify __get_datapage() Christophe Leroy
2020-08-25 13:54 ` [PATCH v1 9/9] powerpc/vdso: Remove unused \tmp param in __get_datapage() 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=04a968f6-88c0-0603-43aa-202196a68df2@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--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).