powerpc: Remove probe_user_read_inst()

Its name comes from former probe_user_read() function.
That function is now called copy_from_user_nofault().

probe_user_read_inst() uses copy_from_user_nofault() to read only
a few bytes. It is suboptimal.

It does the same as get_user_inst() but in addition disables
page faults.

But on the other hand, it is not used for the time being. So remove it
for now. If one day it is really needed, we can give it a new name
more in line with today's naming, and implement it using get_user_inst()

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5f6f82572242a59bfee1e19a71194d8f7ef5fca4.1618405715.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/include/asm/inst.h b/arch/powerpc/include/asm/inst.h
index 9646c63f74209f143dd578c116fe1fabd99cb043..b7709470e8e9b19a5932277883ffbf028d621c43 100644 (file)
--- a/arch/powerpc/include/asm/inst.h
+++ b/arch/powerpc/include/asm/inst.h
@@ -176,9 +176,6 @@ static inline char *__ppc_inst_as_str(char str[PPC_INST_STR_LEN], struct ppc_ins
        __str;                          \
 })
 
-int probe_user_read_inst(struct ppc_inst *inst,
-                        struct ppc_inst __user *nip);
-
 int probe_kernel_read_inst(struct ppc_inst *inst,
                           struct ppc_inst *src);
 

diff --git a/arch/powerpc/lib/inst.c b/arch/powerpc/lib/inst.c
index 9cc17eb62462a64efcb4f9f26f91765a832467f0..c57b3548de37bcfeda806347d34131fd2e928db6 100644 (file)
--- a/arch/powerpc/lib/inst.c
+++ b/arch/powerpc/lib/inst.c
@@ -9,24 +9,6 @@
 #include <asm/ppc-opcode.h>
 
 #ifdef CONFIG_PPC64
-int probe_user_read_inst(struct ppc_inst *inst,
-                        struct ppc_inst __user *nip)
-{
-       unsigned int val, suffix;
-       int err;
-
-       err = copy_from_user_nofault(&val, nip, sizeof(val));
-       if (err)
-               return err;
-       if (get_op(val) == OP_PREFIX) {
-               err = copy_from_user_nofault(&suffix, (void __user *)nip + 4, 4);
-               *inst = ppc_inst_prefix(val, suffix);
-       } else {
-               *inst = ppc_inst(val);
-       }
-       return err;
-}
-
 int probe_kernel_read_inst(struct ppc_inst *inst,
                           struct ppc_inst *src)
 {
@@ -45,19 +27,6 @@ int probe_kernel_read_inst(struct ppc_inst *inst,
        return err;
 }
 #else /* !CONFIG_PPC64 */
-int probe_user_read_inst(struct ppc_inst *inst,
-                        struct ppc_inst __user *nip)
-{
-       unsigned int val;
-       int err;
-
-       err = copy_from_user_nofault(&val, nip, sizeof(val));
-       if (!err)
-               *inst = ppc_inst(val);
-
-       return err;
-}
-
 int probe_kernel_read_inst(struct ppc_inst *inst,
                           struct ppc_inst *src)
 {