From: Christophe Leroy <christophe.leroy@c-s.fr> To: Michal Suchanek <msuchanek@suse.de>, linuxppc-dev@lists.ozlabs.org Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, Nicholas Piggin <npiggin@gmail.com>, Hari Bathini <hbathini@linux.ibm.com>, Joel Stanley <joel@jms.id.au>, Andrew Donnellan <andrew.donnellan@au1.ibm.com>, Firoz Khan <firoz.khan@linaro.org>, Breno Leitao <leitao@debian.org>, Russell Currey <ruscur@russell.cc>, Nicolai Stange <nstange@suse.de>, Michael Neuling <mikey@neuling.org>, "Eric W. Biederman" <ebiederm@xmission.com>, Thomas Gleixner <tglx@linutronix.de>, Arnd Bergmann <arnd@arndb.de>, Geert Uytterhoeven <geert@linux-m68k.org>, Heiko Carstens <heiko.carstens@de.ibm.com>, Christian Brauner <christian@brauner.io>, David Howells <dhowells@redhat.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Allison Randal <allison@lohutok.net>, David Hildenbrand <david@redhat.com>, linux-kernel@vger.kernel.org Subject: Re: [PATCH v6 4/6] powerpc/64: make buildable without CONFIG_COMPAT Date: Fri, 30 Aug 2019 22:21:09 +0200 [thread overview] Message-ID: <a04b5750-a160-01a1-c208-7950f4c495bd@c-s.fr> (raw) In-Reply-To: <6192bddc4631d2691b98316908432ffabc5d4b40.1567188299.git.msuchanek@suse.de> Le 30/08/2019 à 20:57, 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 > --- > 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 | 5 ++-- > arch/powerpc/perf/callchain.c | 37 +++++++++++++++----------- > 7 files changed, 33 insertions(+), 31 deletions(-) > [...] > diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c > index b7cdcce20280..788ad2c63f18 100644 > --- a/arch/powerpc/perf/callchain.c > +++ b/arch/powerpc/perf/callchain.c > @@ -15,7 +15,7 @@ > #include <asm/sigcontext.h> > #include <asm/ucontext.h> > #include <asm/vdso.h> > -#ifdef CONFIG_PPC64 > +#ifdef CONFIG_COMPAT > #include "../kernel/ppc32.h" > #endif > #include <asm/pte-walk.h> > @@ -268,16 +268,6 @@ static void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, > } > } > > -static inline int current_is_64bit(void) > -{ > - /* > - * 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); > -} > - > #else /* CONFIG_PPC64 */ > static int read_user_stack_slow(void __user *ptr, void *buf, int nb) > { > @@ -314,11 +304,6 @@ static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry > { > } > > -static inline int current_is_64bit(void) > -{ > - return 0; > -} > - > static inline int valid_user_sp(unsigned long sp, int is_64) > { > if (!sp || (sp & 7) || sp > TASK_SIZE - 32) > @@ -334,6 +319,7 @@ static inline int valid_user_sp(unsigned long sp, int is_64) > > #endif /* CONFIG_PPC64 */ > > +#if defined(CONFIG_PPC32) || defined(CONFIG_COMPAT) > /* > * Layout for non-RT signal frames > */ > @@ -475,6 +461,25 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, > sp = next_sp; > } > } > +#else /* 32bit */ > +static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, > + struct pt_regs *regs) > +{ > + (void)&read_user_stack_32; /* unused if !COMPAT */ You don't need that anymore do you ? Christophe > +} > +#endif /* 32bit */ > + > +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); > +} > > void > perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) >
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@c-s.fr> To: Michal Suchanek <msuchanek@suse.de>, linuxppc-dev@lists.ozlabs.org Cc: David Hildenbrand <david@redhat.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, David Howells <dhowells@redhat.com>, Paul Mackerras <paulus@samba.org>, Breno Leitao <leitao@debian.org>, Michael Neuling <mikey@neuling.org>, Nicolai Stange <nstange@suse.de>, Geert Uytterhoeven <geert@linux-m68k.org>, Allison Randal <allison@lohutok.net>, Firoz Khan <firoz.khan@linaro.org>, Joel Stanley <joel@jms.id.au>, Arnd Bergmann <arnd@arndb.de>, Nicholas Piggin <npiggin@gmail.com>, Thomas Gleixner <tglx@linutronix.de>, Christian Brauner <christian@brauner.io>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-kernel@vger.kernel.org, "Eric W. Biederman" <ebiederm@xmission.com>, Andrew Donnellan <andrew.donnellan@au1.ibm.com>, Hari Bathini <hbathini@linux.ibm.com> Subject: Re: [PATCH v6 4/6] powerpc/64: make buildable without CONFIG_COMPAT Date: Fri, 30 Aug 2019 22:21:09 +0200 [thread overview] Message-ID: <a04b5750-a160-01a1-c208-7950f4c495bd@c-s.fr> (raw) In-Reply-To: <6192bddc4631d2691b98316908432ffabc5d4b40.1567188299.git.msuchanek@suse.de> Le 30/08/2019 à 20:57, 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 > --- > 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 | 5 ++-- > arch/powerpc/perf/callchain.c | 37 +++++++++++++++----------- > 7 files changed, 33 insertions(+), 31 deletions(-) > [...] > diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c > index b7cdcce20280..788ad2c63f18 100644 > --- a/arch/powerpc/perf/callchain.c > +++ b/arch/powerpc/perf/callchain.c > @@ -15,7 +15,7 @@ > #include <asm/sigcontext.h> > #include <asm/ucontext.h> > #include <asm/vdso.h> > -#ifdef CONFIG_PPC64 > +#ifdef CONFIG_COMPAT > #include "../kernel/ppc32.h" > #endif > #include <asm/pte-walk.h> > @@ -268,16 +268,6 @@ static void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, > } > } > > -static inline int current_is_64bit(void) > -{ > - /* > - * 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); > -} > - > #else /* CONFIG_PPC64 */ > static int read_user_stack_slow(void __user *ptr, void *buf, int nb) > { > @@ -314,11 +304,6 @@ static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry > { > } > > -static inline int current_is_64bit(void) > -{ > - return 0; > -} > - > static inline int valid_user_sp(unsigned long sp, int is_64) > { > if (!sp || (sp & 7) || sp > TASK_SIZE - 32) > @@ -334,6 +319,7 @@ static inline int valid_user_sp(unsigned long sp, int is_64) > > #endif /* CONFIG_PPC64 */ > > +#if defined(CONFIG_PPC32) || defined(CONFIG_COMPAT) > /* > * Layout for non-RT signal frames > */ > @@ -475,6 +461,25 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, > sp = next_sp; > } > } > +#else /* 32bit */ > +static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry, > + struct pt_regs *regs) > +{ > + (void)&read_user_stack_32; /* unused if !COMPAT */ You don't need that anymore do you ? Christophe > +} > +#endif /* 32bit */ > + > +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); > +} > > void > perf_callchain_user(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) >
next prev parent reply other threads:[~2019-08-30 20:21 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-30 18:57 [PATCH v6 0/6] Disable compat cruft on ppc64le v6 Michal Suchanek 2019-08-30 18:57 ` Michal Suchanek 2019-08-30 18:57 ` [PATCH v6 1/6] powerpc: make llseek 32bit-only Michal Suchanek 2019-08-30 18:57 ` Michal Suchanek 2019-08-30 19:46 ` [PATCH] Revert "asm-generic: Remove unneeded __ARCH_WANT_SYS_LLSEEK macro" Michal Suchanek 2019-08-30 19:46 ` Michal Suchanek 2019-08-30 19:46 ` Michal Suchanek 2019-08-30 19:46 ` Michal Suchanek 2019-08-30 19:46 ` Michal Suchanek 2019-08-30 19:54 ` Arnd Bergmann 2019-08-30 19:54 ` Arnd Bergmann 2019-08-30 19:54 ` Arnd Bergmann 2019-08-30 20:13 ` Michal Suchánek 2019-08-30 20:13 ` Michal Suchánek 2019-08-30 20:13 ` Michal Suchánek 2019-08-30 20:37 ` Arnd Bergmann 2019-08-30 20:37 ` Arnd Bergmann 2019-08-30 20:37 ` Arnd Bergmann [not found] ` <20190830202959.3539-1-msuchanek@suse.de> 2019-08-30 20:32 ` Arnd Bergmann 2019-08-30 20:32 ` Re: Arnd Bergmann 2019-08-31 8:38 ` [PATCH] Revert "asm-generic: Remove unneeded __ARCH_WANT_SYS_LLSEEK macro" Christoph Hellwig 2019-08-31 8:38 ` Christoph Hellwig 2019-08-31 8:38 ` Christoph Hellwig 2019-08-31 13:44 ` Arnd Bergmann 2019-08-31 13:44 ` Arnd Bergmann 2019-08-31 13:44 ` Arnd Bergmann 2019-08-30 18:57 ` [PATCH v6 2/6] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek 2019-08-30 18:57 ` Michal Suchanek 2019-08-30 20:22 ` Christophe Leroy 2019-08-30 20:22 ` Christophe Leroy 2019-08-30 18:57 ` [PATCH v6 3/6] powerpc/perf: consolidate read_user_stack_32 Michal Suchanek 2019-08-30 18:57 ` Michal Suchanek 2019-08-30 20:21 ` Christophe Leroy 2019-08-30 20:21 ` Christophe Leroy 2019-08-30 18:57 ` [PATCH v6 4/6] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek 2019-08-30 18:57 ` Michal Suchanek 2019-08-30 20:21 ` Christophe Leroy [this message] 2019-08-30 20:21 ` Christophe Leroy 2019-08-30 20:35 ` Michal Suchánek 2019-08-30 20:35 ` Michal Suchánek 2019-08-30 18:57 ` [PATCH v6 5/6] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek 2019-08-30 18:57 ` Michal Suchanek 2019-08-30 20:23 ` Christophe Leroy 2019-08-30 20:23 ` Christophe Leroy 2019-08-30 18:57 ` [PATCH v6 6/6] powerpc/perf: split callchain.c by bitness Michal Suchanek 2019-08-30 18:57 ` Michal Suchanek 2019-08-30 19:06 ` Michal Suchánek 2019-08-30 19:06 ` Michal Suchánek 2019-09-02 2:51 ` Michael Ellerman 2019-09-02 2:51 ` Michael Ellerman 2019-08-30 20:28 ` Christophe Leroy 2019-08-30 20:28 ` 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=a04b5750-a160-01a1-c208-7950f4c495bd@c-s.fr \ --to=christophe.leroy@c-s.fr \ --cc=allison@lohutok.net \ --cc=andrew.donnellan@au1.ibm.com \ --cc=arnd@arndb.de \ --cc=benh@kernel.crashing.org \ --cc=christian@brauner.io \ --cc=david@redhat.com \ --cc=dhowells@redhat.com \ --cc=ebiederm@xmission.com \ --cc=firoz.khan@linaro.org \ --cc=geert@linux-m68k.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-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mikey@neuling.org \ --cc=mpe@ellerman.id.au \ --cc=msuchanek@suse.de \ --cc=npiggin@gmail.com \ --cc=nstange@suse.de \ --cc=paulus@samba.org \ --cc=ruscur@russell.cc \ --cc=tglx@linutronix.de \ /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: linkBe 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.