From: Michal Suchanek <msuchanek@suse.de> To: linuxppc-dev@lists.ozlabs.org Cc: Michal Suchanek <msuchanek@suse.de>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, Christophe Leroy <christophe.leroy@c-s.fr>, 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: [PATCH v6 3/6] powerpc/perf: consolidate read_user_stack_32 Date: Fri, 30 Aug 2019 20:57:54 +0200 [thread overview] Message-ID: <630c0889c1fb841bcd2054d90205e61d175b965b.1567188299.git.msuchanek@suse.de> (raw) In-Reply-To: <cover.1567188299.git.msuchanek@suse.de> There are two almost identical copies for 32bit and 64bit. The function is used only in 32bit code which will be split out in next patch so consolidate to one function. Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- new patch in v6 --- arch/powerpc/perf/callchain.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index c84bbd4298a0..b7cdcce20280 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -165,22 +165,6 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret) return read_user_stack_slow(ptr, ret, 8); } -static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) -{ - if ((unsigned long)ptr > TASK_SIZE - sizeof(unsigned int) || - ((unsigned long)ptr & 3)) - return -EFAULT; - - pagefault_disable(); - if (!__get_user_inatomic(*ret, ptr)) { - pagefault_enable(); - return 0; - } - pagefault_enable(); - - return read_user_stack_slow(ptr, ret, 4); -} - static inline int valid_user_sp(unsigned long sp, int is_64) { if (!sp || (sp & 7) || sp > (is_64 ? TASK_SIZE : 0x100000000UL) - 32) @@ -295,6 +279,12 @@ static inline int current_is_64bit(void) } #else /* CONFIG_PPC64 */ +static int read_user_stack_slow(void __user *ptr, void *buf, int nb) +{ + return 0; +} +#endif /* CONFIG_PPC64 */ + /* * On 32-bit we just access the address and let hash_page create a * HPTE if necessary, so there is no need to fall back to reading @@ -313,9 +303,12 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) rc = __get_user_inatomic(*ret, ptr); pagefault_enable(); + if (IS_ENABLED(CONFIG_PPC64) && rc) + return read_user_stack_slow(ptr, ret, 4); return rc; } +#ifndef CONFIG_PPC64 static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) { -- 2.22.0
WARNING: multiple messages have this Message-ID (diff)
From: Michal Suchanek <msuchanek@suse.de> To: 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>, Allison Randal <allison@lohutok.net>, Geert Uytterhoeven <geert@linux-m68k.org>, Joel Stanley <joel@jms.id.au>, Firoz Khan <firoz.khan@linaro.org>, Michal Suchanek <msuchanek@suse.de>, 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: [PATCH v6 3/6] powerpc/perf: consolidate read_user_stack_32 Date: Fri, 30 Aug 2019 20:57:54 +0200 [thread overview] Message-ID: <630c0889c1fb841bcd2054d90205e61d175b965b.1567188299.git.msuchanek@suse.de> (raw) In-Reply-To: <cover.1567188299.git.msuchanek@suse.de> There are two almost identical copies for 32bit and 64bit. The function is used only in 32bit code which will be split out in next patch so consolidate to one function. Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- new patch in v6 --- arch/powerpc/perf/callchain.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index c84bbd4298a0..b7cdcce20280 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -165,22 +165,6 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret) return read_user_stack_slow(ptr, ret, 8); } -static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) -{ - if ((unsigned long)ptr > TASK_SIZE - sizeof(unsigned int) || - ((unsigned long)ptr & 3)) - return -EFAULT; - - pagefault_disable(); - if (!__get_user_inatomic(*ret, ptr)) { - pagefault_enable(); - return 0; - } - pagefault_enable(); - - return read_user_stack_slow(ptr, ret, 4); -} - static inline int valid_user_sp(unsigned long sp, int is_64) { if (!sp || (sp & 7) || sp > (is_64 ? TASK_SIZE : 0x100000000UL) - 32) @@ -295,6 +279,12 @@ static inline int current_is_64bit(void) } #else /* CONFIG_PPC64 */ +static int read_user_stack_slow(void __user *ptr, void *buf, int nb) +{ + return 0; +} +#endif /* CONFIG_PPC64 */ + /* * On 32-bit we just access the address and let hash_page create a * HPTE if necessary, so there is no need to fall back to reading @@ -313,9 +303,12 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret) rc = __get_user_inatomic(*ret, ptr); pagefault_enable(); + if (IS_ENABLED(CONFIG_PPC64) && rc) + return read_user_stack_slow(ptr, ret, 4); return rc; } +#ifndef CONFIG_PPC64 static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry, struct pt_regs *regs) { -- 2.22.0
next prev parent reply other threads:[~2019-08-30 18:58 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 ` Michal Suchanek [this message] 2019-08-30 18:57 ` [PATCH v6 3/6] powerpc/perf: consolidate read_user_stack_32 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 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=630c0889c1fb841bcd2054d90205e61d175b965b.1567188299.git.msuchanek@suse.de \ --to=msuchanek@suse.de \ --cc=allison@lohutok.net \ --cc=andrew.donnellan@au1.ibm.com \ --cc=arnd@arndb.de \ --cc=benh@kernel.crashing.org \ --cc=christian@brauner.io \ --cc=christophe.leroy@c-s.fr \ --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=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.