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>,
Oleg Nesterov <oleg@redhat.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <christian@brauner.io>,
Nicholas Piggin <npiggin@gmail.com>,
Allison Randal <allison@lohutok.net>,
"Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Breno Leitao <leitao@debian.org>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Claudio Carvalho <cclaudio@linux.ibm.com>,
Russell Currey <ruscur@russell.cc>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Firoz Khan <firoz.khan@linaro.org>,
Dmitry Vyukov <dvyukov@google.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Hari Bathini <hbathini@linux.ibm.com>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
Nicolai Stange <nstange@suse.de>,
Valentin Schneider <valentin.schneider@arm.com>,
Diana Craciun <diana.craciun@nxp.com>,
Daniel Axtens <dja@axtens.net>,
Michael Neuling <mikey@neuling.org>,
Gustavo Romero <gromero@linux.ibm.com>,
Mathieu Malaterre <malat@debian.org>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
David Howells <dhowells@redhat.com>,
Brajeswar Ghosh <brajeswar.linux@gmail.com>,
Jagadeesh Pagadala <jagdsh.linux@gmail.com>,
David Hildenbrand <david@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 31/35] powerpc/perf: consolidate valid_user_sp
Date: Tue, 26 Nov 2019 21:13:45 +0100 [thread overview]
Message-ID: <a02f398db353cd08b2d01e70ca3a9c2003f35a1a.1574798487.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1574798487.git.msuchanek@suse.de>
Merge the 32bit and 64bit version.
Halve the check constants on 32bit.
Use STACK_TOP since it is defined.
Passing is_64 is now redundant since is_32bit_task() is used to
determine which callchain variant should be used. Use STACK_TOP and
is_32bit_task() directly.
This removes a page from the valid 32bit area on 64bit:
#define TASK_SIZE_USER32 (0x0000000100000000UL - (1 * PAGE_SIZE))
#define STACK_TOP_USER32 TASK_SIZE_USER32
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
v8: new patch
v11: simplify by using is_32bit_task()
---
arch/powerpc/perf/callchain.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c
index c6c4c609cc14..a22a19975a19 100644
--- a/arch/powerpc/perf/callchain.c
+++ b/arch/powerpc/perf/callchain.c
@@ -102,6 +102,15 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re
}
}
+static inline int valid_user_sp(unsigned long sp)
+{
+ bool is_64 = !is_32bit_task();
+
+ if (!sp || (sp & (is_64 ? 7 : 3)) || sp > STACK_TOP - (is_64 ? 32 : 16))
+ return 0;
+ return 1;
+}
+
#ifdef CONFIG_PPC64
/*
* On 64-bit we don't want to invoke hash_page on user addresses from
@@ -165,13 +174,6 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret)
return read_user_stack_slow(ptr, ret, 8);
}
-static inline int valid_user_sp(unsigned long sp, int is_64)
-{
- if (!sp || (sp & 7) || sp > (is_64 ? TASK_SIZE : 0x100000000UL) - 32)
- return 0;
- return 1;
-}
-
/*
* 64-bit user processes use the same stack frame for RT and non-RT signals.
*/
@@ -230,7 +232,7 @@ static void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry,
while (entry->nr < entry->max_stack) {
fp = (unsigned long __user *) sp;
- if (!valid_user_sp(sp, 1) || read_user_stack_64(fp, &next_sp))
+ if (!valid_user_sp(sp) || read_user_stack_64(fp, &next_sp))
return;
if (level > 0 && read_user_stack_64(&fp[2], &next_ip))
return;
@@ -279,13 +281,6 @@ static inline void perf_callchain_user_64(struct perf_callchain_entry_ctx *entry
{
}
-static inline int valid_user_sp(unsigned long sp, int is_64)
-{
- if (!sp || (sp & 7) || sp > TASK_SIZE - 32)
- return 0;
- return 1;
-}
-
#define __SIGNAL_FRAMESIZE32 __SIGNAL_FRAMESIZE
#define sigcontext32 sigcontext
#define mcontext32 mcontext
@@ -428,7 +423,7 @@ static void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry,
while (entry->nr < entry->max_stack) {
fp = (unsigned int __user *) (unsigned long) sp;
- if (!valid_user_sp(sp, 0) || read_user_stack_32(fp, &next_sp))
+ if (!valid_user_sp(sp) || read_user_stack_32(fp, &next_sp))
return;
if (level > 0 && read_user_stack_32(&fp[1], &next_ip))
return;
--
2.23.0
next prev parent reply other threads:[~2019-11-26 20:14 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 20:13 [PATCH v2 00/35] exception cleanup, syscall in C and !COMPAT Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 01/35] powerpc/64s/exception: Introduce INT_DEFINE parameter block for code generation Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 02/35] powerpc/64s/exception: Add GEN_COMMON macro that uses INT_DEFINE parameters Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 03/35] powerpc/64s/exception: Add GEN_KVM " Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 04/35] powerpc/64s/exception: Expand EXC_COMMON and EXC_COMMON_ASYNC macros Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 05/35] powerpc/64s/exception: Move all interrupt handlers to new style code gen macros Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 06/35] powerpc/64s/exception: Remove old INT_ENTRY macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 07/35] powerpc/64s/exception: Remove old INT_COMMON macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 08/35] powerpc/64s/exception: Remove old INT_KVM_HANDLER Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 09/35] powerpc/64s/exception: Add ISIDE option Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 10/35] powerpc/64s/exception: move real->virt switch into the common handler Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 11/35] powerpc/64s/exception: move soft-mask test to common code Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 12/35] powerpc/64s/exception: move KVM " Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 13/35] powerpc/64s/exception: remove confusing IEARLY option Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 14/35] powerpc/64s/exception: remove the SPR saving patch code macros Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 15/35] powerpc/64s/exception: trim unused arguments from KVMTEST macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 16/35] powerpc/64s/exception: hdecrementer avoid touching the stack Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 17/35] powerpc/64s/exception: re-inline some handlers Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 18/35] powerpc/64s/exception: Clean up SRR specifiers Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 19/35] powerpc/64s/exception: add more comments for interrupt handlers Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 20/35] powerpc/64s/exception: only test KVM in SRR interrupts when PR KVM is supported Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 21/35] powerpc/64s/exception: soft nmi interrupt should not use ret_from_except Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 22/35] powerpc/64: system call remove non-volatile GPR save optimisation Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 23/35] powerpc/64: system call implement the bulk of the logic in C Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 24/35] powerpc/64s: interrupt return " Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 25/35] powerpc/64s/exception: remove lite interrupt return Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 26/35] powerpc/64: system call: Fix sparse warning about missing declaration Michal Suchanek
2019-11-26 21:44 ` Luc Van Oostenryck
2019-11-27 7:30 ` Christophe Leroy
2019-11-26 20:13 ` [PATCH v2 27/35] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 28/35] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 29/35] powerpc/perf: remove current_is_64bit() Michal Suchanek
2019-11-27 5:41 ` Christophe Leroy
2019-11-27 9:49 ` Michal Suchánek
2019-11-26 20:13 ` [PATCH v2 30/35] powerpc/perf: consolidate read_user_stack_32 Michal Suchanek
2019-11-26 20:13 ` Michal Suchanek [this message]
2019-11-26 20:13 ` [PATCH v2 32/35] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 33/35] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 34/35] powerpc/perf: split callchain.c by bitness Michal Suchanek
2019-11-26 20:13 ` [PATCH v2 35/35] MAINTAINERS: perf: Add pattern that matches ppc perf to the perf entry 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=a02f398db353cd08b2d01e70ca3a9c2003f35a1a.1574798487.git.msuchanek@suse.de \
--to=msuchanek@suse.de \
--cc=akpm@linux-foundation.org \
--cc=allison@lohutok.net \
--cc=andrew.donnellan@au1.ibm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=brajeswar.linux@gmail.com \
--cc=cclaudio@linux.ibm.com \
--cc=christian@brauner.io \
--cc=christophe.leroy@c-s.fr \
--cc=david@redhat.com \
--cc=dhowells@redhat.com \
--cc=diana.craciun@nxp.com \
--cc=dja@axtens.net \
--cc=dvyukov@google.com \
--cc=ebiederm@xmission.com \
--cc=firoz.khan@linaro.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=gromero@linux.ibm.com \
--cc=hbathini@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=jagdsh.linux@gmail.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mahesh@linux.vnet.ibm.com \
--cc=malat@debian.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=nstange@suse.de \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--cc=ruscur@russell.cc \
--cc=tglx@linutronix.de \
--cc=valentin.schneider@arm.com \
--cc=viro@zeniv.linux.org.uk \
--cc=yamada.masahiro@socionext.com \
/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).