From: "Michal Suchánek" <msuchanek@suse.de>
To: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
David Hildenbrand <david@redhat.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Paul Mackerras <paulus@samba.org>,
Breno Leitao <leitao@debian.org>,
Michael Neuling <mikey@neuling.org>,
Diana Craciun <diana.craciun@nxp.com>,
Firoz Khan <firoz.khan@linaro.org>, Joel Stanley <joel@jms.id.au>,
Arnd Bergmann <arnd@arndb.de>,
Nicholas Piggin <npiggin@gmail.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Thomas Gleixner <tglx@linutronix.de>,
Allison Randal <allison@lohutok.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org,
Hari Bathini <hbathini@linux.ibm.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
linux-fsdevel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v8 5/7] powerpc/64: make buildable without CONFIG_COMPAT
Date: Thu, 12 Sep 2019 22:19:46 +0200 [thread overview]
Message-ID: <20190912221946.41a161e4@kitsune.suse.cz> (raw)
In-Reply-To: <758324b9-203b-ec4b-affc-a30aefc9ea23@c-s.fr>
On Thu, 12 Sep 2019 21:36:11 +0200
Christophe Leroy <christophe.leroy@c-s.fr> wrote:
> Le 12/09/2019 à 20:26, Michal Suchánek a écrit :
> > On Thu, 12 Sep 2019 20:02:16 +0200
> > Christophe Leroy <christophe.leroy@c-s.fr> wrote:
> >
> >> Le 12/09/2019 à 19:26, Michal Suchanek a écrit :
> >>> There are numerous references to 32bit functions in generic and 64bit
> >>> code so ifdef them out.
> >>>
> >>> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> >>> ---
> >>> v2:
> >>> - fix 32bit ifdef condition in signal.c
> >>> - simplify the compat ifdef condition in vdso.c - 64bit is redundant
> >>> - simplify the compat ifdef condition in callchain.c - 64bit is redundant
> >>> v3:
> >>> - use IS_ENABLED and maybe_unused where possible
> >>> - do not ifdef declarations
> >>> - clean up Makefile
> >>> v4:
> >>> - further makefile cleanup
> >>> - simplify is_32bit_task conditions
> >>> - avoid ifdef in condition by using return
> >>> v5:
> >>> - avoid unreachable code on 32bit
> >>> - make is_current_64bit constant on !COMPAT
> >>> - add stub perf_callchain_user_32 to avoid some ifdefs
> >>> v6:
> >>> - consolidate current_is_64bit
> >>> v7:
> >>> - remove leftover perf_callchain_user_32 stub from previous series version
> >>> v8:
> >>> - fix build again - too trigger-happy with stub removal
> >>> - remove a vdso.c hunk that causes warning according to kbuild test robot
> >>> ---
> >>> arch/powerpc/include/asm/thread_info.h | 4 +--
> >>> arch/powerpc/kernel/Makefile | 7 ++---
> >>> arch/powerpc/kernel/entry_64.S | 2 ++
> >>> arch/powerpc/kernel/signal.c | 3 +-
> >>> arch/powerpc/kernel/syscall_64.c | 6 ++--
> >>> arch/powerpc/kernel/vdso.c | 3 +-
> >>> arch/powerpc/perf/callchain.c | 39 ++++++++++++++------------
> >>> 7 files changed, 33 insertions(+), 31 deletions(-)
> >>>
> >>> diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
> >>> index 8e1d0195ac36..c128d8a48ea3 100644
> >>> --- a/arch/powerpc/include/asm/thread_info.h
> >>> +++ b/arch/powerpc/include/asm/thread_info.h
> >>> @@ -144,10 +144,10 @@ static inline bool test_thread_local_flags(unsigned int flags)
> >>> return (ti->local_flags & flags) != 0;
> >>> }
> >>>
> >>> -#ifdef CONFIG_PPC64
> >>> +#ifdef CONFIG_COMPAT
> >>> #define is_32bit_task() (test_thread_flag(TIF_32BIT))
> >>> #else
> >>> -#define is_32bit_task() (1)
> >>> +#define is_32bit_task() (IS_ENABLED(CONFIG_PPC32))
> >>> #endif
> >>>
> >>> #if defined(CONFIG_PPC64)
> >>
> >> [...]
> >>
> >>> +static inline int current_is_64bit(void)
> >>> +{
> >>> + if (!IS_ENABLED(CONFIG_COMPAT))
> >>> + return IS_ENABLED(CONFIG_PPC64);
> >>> + /*
> >>> + * We can't use test_thread_flag() here because we may be on an
> >>> + * interrupt stack, and the thread flags don't get copied over
> >>> + * from the thread_info on the main stack to the interrupt stack.
> >>> + */
> >>> + return !test_ti_thread_flag(task_thread_info(current), TIF_32BIT);
> >>> +}
> >>
> >>
> >> Since at least commit ed1cd6deb013 ("powerpc: Activate
> >> CONFIG_THREAD_INFO_IN_TASK")
> >> [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ed1cd6d]
> >> the above comment is wrong and current_is_64bit() is equivalent to
> >> !is_32bit_task()
> >>
> >> See https://github.com/linuxppc/issues/issues/275
> >>
> >> Christophe
> >
> > I aim at changing the code as little as possible here. A separate patch
> > on top removing this function would be ok?
>
> Yes I agree. By making prior to this patch a separate patch which drops
> current_is_64bit() would be good. And it would reduce the size of this
> patch by approximately one third.
Indeed, removing it before makes this patch much cleaner.
Thanks
Michal
next prev parent reply other threads:[~2019-09-12 20:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 17:26 [PATCH v8 0/7] Disable compat cruft on ppc64le v8 Michal Suchanek
2019-09-12 17:26 ` [PATCH v8 1/7] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro Michal Suchanek
2019-09-12 17:26 ` [PATCH v8 2/7] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek
2019-09-12 17:26 ` [PATCH v8 3/7] powerpc/perf: consolidate read_user_stack_32 Michal Suchanek
2019-09-12 17:26 ` [PATCH v8 4/7] powerpc/perf: consolidate valid_user_sp Michal Suchanek
2019-09-12 17:26 ` [PATCH v8 5/7] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek
2019-09-12 18:02 ` Christophe Leroy
2019-09-12 18:26 ` Michal Suchánek
2019-09-12 19:36 ` Christophe Leroy
2019-09-12 20:19 ` Michal Suchánek [this message]
2019-09-12 19:46 ` [PATCH] powerpc/perf: remove current_is_64bit() Michal Suchanek
2019-11-14 9:07 ` Michael Ellerman
2019-09-12 17:26 ` [PATCH v8 6/7] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek
2019-09-12 17:26 ` [PATCH v8 7/7] powerpc/perf: split callchain.c by bitness Michal Suchanek
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=20190912221946.41a161e4@kitsune.suse.cz \
--to=msuchanek@suse.de \
--cc=akpm@linux-foundation.org \
--cc=allison@lohutok.net \
--cc=andrew.donnellan@au1.ibm.com \
--cc=arnd@arndb.de \
--cc=christophe.leroy@c-s.fr \
--cc=david@redhat.com \
--cc=diana.craciun@nxp.com \
--cc=ebiederm@xmission.com \
--cc=firoz.khan@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hbathini@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=joel@jms.id.au \
--cc=leitao@debian.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mikey@neuling.org \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/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).