Skip to content

Commit

Permalink
powerpc: Move copy_from_kernel_nofault_inst()
Browse files Browse the repository at this point in the history
When probe_kernel_read_inst() was created, there was no good place to
put it, so a file called lib/inst.c was dedicated for it.

Since then, probe_kernel_read_inst() has been renamed
copy_from_kernel_nofault_inst(). And mm/maccess.h didn't exist at that
time. Today, mm/maccess.h is related to copy_from_kernel_nofault().

Move copy_from_kernel_nofault_inst() into mm/maccess.c

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
  • Loading branch information
chleroy authored and intel-lab-lkp committed Apr 12, 2021
1 parent 71fde2e commit 2e6a9a2
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 26 deletions.
26 changes: 0 additions & 26 deletions arch/powerpc/lib/inst.c

This file was deleted.

21 changes: 21 additions & 0 deletions arch/powerpc/mm/maccess.c
Expand Up @@ -3,7 +3,28 @@
#include <linux/uaccess.h>
#include <linux/kernel.h>

#include <asm/disassemble.h>
#include <asm/inst.h>
#include <asm/ppc-opcode.h>

bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)
{
return is_kernel_addr((unsigned long)unsafe_src);
}

int copy_from_kernel_nofault_inst(struct ppc_inst *inst, struct ppc_inst *src)
{
unsigned int val, suffix;
int err;

err = copy_from_kernel_nofault(&val, src, sizeof(val));
if (err)
return err;
if (IS_ENABLED(CONFIG_PPC64) && get_op(val) == OP_PREFIX) {
err = copy_from_kernel_nofault(&suffix, (void *)src + 4, 4);
*inst = ppc_inst_prefix(val, suffix);
} else {
*inst = ppc_inst(val);
}
return err;
}

0 comments on commit 2e6a9a2

Please sign in to comment.