From: Jordan Niethe <jniethe5@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: alistair@popple.id.au, npiggin@gmail.com, bala24@linux.ibm.com,
Jordan Niethe <jniethe5@gmail.com>,
dja@axtens.net
Subject: [PATCH v6 13/28] powerpc: Add a probe_user_read_inst() function
Date: Tue, 28 Apr 2020 11:57:59 +1000 [thread overview]
Message-ID: <20200428015814.15380-14-jniethe5@gmail.com> (raw)
In-Reply-To: <20200428015814.15380-1-jniethe5@gmail.com>
Introduce a probe_user_read_inst() function to use in cases where
probe_user_read() is used for getting an instruction. This will be more
useful for prefixed instructions.
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
---
v6: - New to series
---
arch/powerpc/include/asm/inst.h | 3 +++
arch/powerpc/lib/Makefile | 2 +-
arch/powerpc/lib/inst.c | 18 ++++++++++++++++++
arch/powerpc/mm/fault.c | 2 +-
4 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 arch/powerpc/lib/inst.c
diff --git a/arch/powerpc/include/asm/inst.h b/arch/powerpc/include/asm/inst.h
index 552e953bf04f..3e9a58420151 100644
--- a/arch/powerpc/include/asm/inst.h
+++ b/arch/powerpc/include/asm/inst.h
@@ -37,4 +37,7 @@ static inline bool ppc_inst_equal(struct ppc_inst x, struct ppc_inst y)
return ppc_inst_val(x) == ppc_inst_val(y);
}
+int probe_user_read_inst(struct ppc_inst *inst,
+ struct ppc_inst *nip);
+
#endif /* _ASM_INST_H */
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index b8de3be10eb4..546591848219 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -16,7 +16,7 @@ CFLAGS_code-patching.o += -DDISABLE_BRANCH_PROFILING
CFLAGS_feature-fixups.o += -DDISABLE_BRANCH_PROFILING
endif
-obj-y += alloc.o code-patching.o feature-fixups.o pmem.o
+obj-y += alloc.o code-patching.o feature-fixups.o pmem.o inst.o
ifndef CONFIG_KASAN
obj-y += string.o memcmp_$(BITS).o
diff --git a/arch/powerpc/lib/inst.c b/arch/powerpc/lib/inst.c
new file mode 100644
index 000000000000..eaf786afad2b
--- /dev/null
+++ b/arch/powerpc/lib/inst.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2020, IBM Corporation.
+ */
+
+#include <linux/uaccess.h>
+#include <asm/inst.h>
+
+int probe_user_read_inst(struct ppc_inst *inst,
+ struct ppc_inst *nip)
+{
+ unsigned int val;
+ int err;
+
+ err = probe_user_read(&val, nip, sizeof(val));
+ *inst = ppc_inst(val);
+ return err;
+}
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 7a68a3b32615..4983197d4a8e 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -281,7 +281,7 @@ static bool bad_stack_expansion(struct pt_regs *regs, unsigned long address,
access_ok(nip, sizeof(*nip))) {
struct ppc_inst inst;
- if (!probe_user_read(&inst, nip, sizeof(inst)))
+ if (!probe_user_read_inst(&inst, (struct ppc_inst __user *)nip))
return !store_updates_sp(inst);
*must_retry = true;
}
--
2.17.1
next prev parent reply other threads:[~2020-04-28 2:28 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 1:57 [PATCH v6 00/28] Initial Prefixed Instruction support Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 01/28] powerpc/xmon: Remove store_inst() for patch_instruction() Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 02/28] powerpc/xmon: Move breakpoint instructions to own array Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 03/28] powerpc/xmon: Move breakpoints to text section Jordan Niethe
2020-04-28 5:19 ` Christophe Leroy
2020-04-28 5:30 ` Jordan Niethe
2020-04-28 5:36 ` Christophe Leroy
2020-04-29 2:45 ` Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 04/28] powerpc/xmon: Use bitwise calculations in_breakpoint_table() Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 05/28] powerpc: Change calling convention for create_branch() et. al Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 06/28] powerpc: Use a macro for creating instructions from u32s Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 07/28] powerpc: Use an accessor for instructions Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 08/28] powerpc: Use a function for getting the instruction op code Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 09/28] powerpc: Use a function for byte swapping instructions Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 10/28] powerpc: Introduce functions for instruction equality Jordan Niethe
2020-04-29 1:59 ` Alistair Popple
2020-04-29 2:52 ` Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 11/28] powerpc: Use a datatype for instructions Jordan Niethe
2020-04-29 2:02 ` Alistair Popple
2020-04-29 2:57 ` Jordan Niethe
2020-04-28 1:57 ` [PATCH v6 12/28] powerpc: Use a function for reading instructions Jordan Niethe
2020-04-28 1:57 ` Jordan Niethe [this message]
2020-04-28 1:58 ` [PATCH v6 14/28] powerpc: Add a probe_kernel_read_inst() function Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 15/28] powerpc/kprobes: Use patch_instruction() Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 16/28] powerpc: Define and use __get_user_instr{, inatomic}() Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 17/28] powerpc: Introduce a function for reporting instruction length Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 18/28] powerpc/xmon: Use a function for reading instructions Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 19/28] powerpc/xmon: Move insertion of breakpoint for xol'ing Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 20/28] powerpc: Make test_translate_branch() independent of instruction length Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 21/28] powerpc: Enable Prefixed Instructions Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 22/28] powerpc: Define new SRR1 bits for a future ISA version Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 23/28] powerpc: Add prefixed instructions to instruction data type Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 24/28] powerpc: Test prefixed code patching Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 25/28] powerpc: Test prefixed instructions in feature fixups Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 26/28] powerpc: Support prefixed instructions in alignment handler Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 27/28] powerpc sstep: Add support for prefixed load/stores Jordan Niethe
2020-04-28 1:58 ` [PATCH v6 28/28] powerpc sstep: Add support for prefixed fixed-point arithmetic Jordan Niethe
2020-04-28 10:06 ` [PATCH v6 00/28] Initial Prefixed Instruction support Balamuruhan S
2020-04-29 2:51 ` Jordan Niethe
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=20200428015814.15380-14-jniethe5@gmail.com \
--to=jniethe5@gmail.com \
--cc=alistair@popple.id.au \
--cc=bala24@linux.ibm.com \
--cc=dja@axtens.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=npiggin@gmail.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).