Commit 39352430 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Move copy_inst_from_kernel_nofault() 



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_inst_from_kernel_nofault(). And mm/maccess.h didn't exist at that
time. Today, mm/maccess.h is related to copy_from_kernel_nofault().

Move copy_inst_from_kernel_nofault() into mm/maccess.c

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/9655d8957313906b77b8db5700a0e33ce06f45e5.1618405715.git.christophe.leroy@csgroup.eu
parent 41d6cf68

arch/powerpc/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 inst.o test_code-patching.o

obj-y += alloc.o code-patching.o feature-fixups.o pmem.o test_code-patching.o



ifndef CONFIG_KASAN

obj-y	+=	string.o memcmp_$(BITS).o

arch/powerpc/lib/inst.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 *  Copyright 2020, IBM Corporation.

 */



#include <linux/uaccess.h>

#include <asm/disassemble.h>

#include <asm/inst.h>

#include <asm/ppc-opcode.h>



int copy_inst_from_kernel_nofault(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;

}

arch/powerpc/mm/maccess.c

+21 −0
Original line number Diff line number Diff line
@@ -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_inst_from_kernel_nofault(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;

}