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

powerpc/ptrace: split out SPE related functions. 



Move CONFIG_SPE functions out of ptrace.c, into
ptrace-spe.c

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/0f17a331760310b5562fae3791cdd3cf9c64237b.1582848567.git.christophe.leroy@c-s.fr
parent 1b20773b

arch/powerpc/kernel/ptrace/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ ifneq ($(CONFIG_VSX),y) 
obj-y				+= ptrace-novsx.o

endif

obj-$(CONFIG_ALTIVEC)		+= ptrace-altivec.o

obj-$(CONFIG_SPE)		+= ptrace-spe.o

arch/powerpc/kernel/ptrace/ptrace-decl.h

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,15 @@ int vr_set(struct task_struct *target, const struct user_regset *regset, 
	   unsigned int pos, unsigned int count,

	   const void *kbuf, const void __user *ubuf);



/* ptrace-spe */



int evr_active(struct task_struct *target, const struct user_regset *regset);

int evr_get(struct task_struct *target, const struct user_regset *regset,

	    unsigned int pos, unsigned int count, void *kbuf, void __user *ubuf);

int evr_set(struct task_struct *target, const struct user_regset *regset,

	    unsigned int pos, unsigned int count,

	    const void *kbuf, const void __user *ubuf);



/* ptrace */



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

arch/powerpc/kernel/ptrace/ptrace-spe.c

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



#include <linux/regset.h>



#include <asm/switch_to.h>



#include "ptrace-decl.h"



/*

 * For get_evrregs/set_evrregs functions 'data' has the following layout:

 *

 * struct {

 *   u32 evr[32];

 *   u64 acc;

 *   u32 spefscr;

 * }

 */



int evr_active(struct task_struct *target, const struct user_regset *regset)

{

	flush_spe_to_thread(target);

	return target->thread.used_spe ? regset->n : 0;

}



int evr_get(struct task_struct *target, const struct user_regset *regset,

	    unsigned int pos, unsigned int count, void *kbuf, void __user *ubuf)

{

	int ret;



	flush_spe_to_thread(target);



	ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,

				  &target->thread.evr,

				  0, sizeof(target->thread.evr));



	BUILD_BUG_ON(offsetof(struct thread_struct, acc) + sizeof(u64) !=

		     offsetof(struct thread_struct, spefscr));



	if (!ret)

		ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,

					  &target->thread.acc,

					  sizeof(target->thread.evr), -1);



	return ret;

}



int evr_set(struct task_struct *target, const struct user_regset *regset,

	    unsigned int pos, unsigned int count,

	    const void *kbuf, const void __user *ubuf)

{

	int ret;



	flush_spe_to_thread(target);



	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,

				 &target->thread.evr,

				 0, sizeof(target->thread.evr));



	BUILD_BUG_ON(offsetof(struct thread_struct, acc) + sizeof(u64) !=

		     offsetof(struct thread_struct, spefscr));



	if (!ret)

		ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,

					 &target->thread.acc,

					 sizeof(target->thread.evr), -1);



	return ret;

}

arch/powerpc/kernel/ptrace/ptrace.c

+0 −66
Original line number Diff line number Diff line
@@ -403,72 +403,6 @@ static int gpr_set(struct task_struct *target, const struct user_regset *regset, 
	return ret;

}



#ifdef CONFIG_SPE



/*

 * For get_evrregs/set_evrregs functions 'data' has the following layout:

 *

 * struct {

 *   u32 evr[32];

 *   u64 acc;

 *   u32 spefscr;

 * }

 */



static int evr_active(struct task_struct *target,

		      const struct user_regset *regset)

{

	flush_spe_to_thread(target);

	return target->thread.used_spe ? regset->n : 0;

}



static int evr_get(struct task_struct *target, const struct user_regset *regset,

		   unsigned int pos, unsigned int count,

		   void *kbuf, void __user *ubuf)

{

	int ret;



	flush_spe_to_thread(target);



	ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,

				  &target->thread.evr,

				  0, sizeof(target->thread.evr));



	BUILD_BUG_ON(offsetof(struct thread_struct, acc) + sizeof(u64) !=

		     offsetof(struct thread_struct, spefscr));



	if (!ret)

		ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,

					  &target->thread.acc,

					  sizeof(target->thread.evr), -1);



	return ret;

}



static int evr_set(struct task_struct *target, const struct user_regset *regset,

		   unsigned int pos, unsigned int count,

		   const void *kbuf, const void __user *ubuf)

{

	int ret;



	flush_spe_to_thread(target);



	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,

				 &target->thread.evr,

				 0, sizeof(target->thread.evr));



	BUILD_BUG_ON(offsetof(struct thread_struct, acc) + sizeof(u64) !=

		     offsetof(struct thread_struct, spefscr));



	if (!ret)

		ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,

					 &target->thread.acc,

					 sizeof(target->thread.evr), -1);



	return ret;

}

#endif /* CONFIG_SPE */



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

/**

 * tm_cgpr_active - get active number of registers in CGPR