linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	Nicholas Piggin <npiggin@gmail.com>,
	Christophe Leroy <christophe.leroy@c-s.fr>,
	Breno Leitao <leitao@debian.org>, Arnd Bergmann <arnd@arndb.de>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Firoz Khan <firoz.khan@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Joel Stanley <joel@jms.id.au>,
	Hari Bathini <hbathini@linux.ibm.com>,
	Michael Neuling <mikey@neuling.org>,
	Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
	Russell Currey <ruscur@russell.cc>,
	Diana Craciun <diana.craciun@nxp.com>,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	David Hildenbrand <david@redhat.com>,
	Allison Randal <allison@lohutok.net>,
	Andrew Morton <akpm@linux-foundation.org>,
	Madhavan Srinivasan <maddy@linux.vnet.ibm.com>,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH v7 3/6] powerpc/perf: consolidate read_user_stack_32
Date: Fri, 30 Aug 2019 23:03:40 +0200	[thread overview]
Message-ID: <ea3783a1640b707ef9ce4740562850ef1152829b.1567198491.git.msuchanek@suse.de> (raw)
In-Reply-To: <cover.1567198491.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>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
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


  parent reply	other threads:[~2019-08-30 21:04 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-30 21:03 [PATCH v7 0/6] Disable compat cruft on ppc64le v7 Michal Suchanek
2019-08-30 21:03 ` [PATCH v7 1/6] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro Michal Suchanek
2019-08-30 21:03 ` [PATCH v7 2/6] powerpc: move common register copy functions from signal_32.c to signal.c Michal Suchanek
2019-08-30 21:03 ` Michal Suchanek [this message]
2019-09-02  3:53   ` [PATCH v7 3/6] powerpc/perf: consolidate read_user_stack_32 Michael Ellerman
2019-09-02  4:01     ` Michael Ellerman
2019-09-02  8:26       ` Michal Suchánek
2019-09-02 23:45         ` Michael Ellerman
2019-08-30 21:03 ` [PATCH v7 4/6] powerpc/64: make buildable without CONFIG_COMPAT Michal Suchanek
2019-08-31  6:43   ` Christophe Leroy
2019-08-31 13:02   ` Michal Suchánek
2019-08-30 21:03 ` [PATCH v7 5/6] powerpc/64: Make COMPAT user-selectable disabled on littleendian by default Michal Suchanek
2019-09-02  2:03   ` Michael Ellerman
2019-09-02  9:42     ` Michal Suchánek
2019-09-03  0:00       ` Michael Ellerman
2019-09-14 10:22         ` Michal Suchánek
2019-09-18  5:36           ` Michael Ellerman
2019-09-02 13:00     ` Segher Boessenkool
2019-09-02 23:53       ` Michael Ellerman
2019-09-03  5:21         ` Christophe Leroy
2019-08-30 21:03 ` [PATCH v7 6/6] powerpc/perf: split callchain.c by bitness Michal Suchanek
2019-08-31 18:51   ` Michal Suchánek
2019-08-31  6:41 ` [PATCH v7 0/6] Disable compat cruft on ppc64le v7 Christophe Leroy
2019-08-31 18:03   ` Michal Suchánek

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=ea3783a1640b707ef9ce4740562850ef1152829b.1567198491.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=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=mpe@ellerman.id.au \
    --cc=npiggin@gmail.com \
    --cc=paulus@samba.org \
    --cc=ruscur@russell.cc \
    --cc=tglx@linutronix.de \
    --cc=viro@zeniv.linux.org.uk \
    --subject='Re: [PATCH v7 3/6] powerpc/perf: consolidate read_user_stack_32' \
    /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

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).