Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 904818e2 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

s390/kernel: introduce fpu-internal.h with fpu helper functions 



Introduce a new structure to manage FP and VX registers. Refactor the
save and restore of floating point and vector registers with a set
of helper functions in fpu-internal.h.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 96b2d7a8

arch/s390/include/asm/fpu-internal.h

0 → 100644
+191 −0
Original line number Diff line number Diff line 
/*

 * General floating pointer and vector register helpers

 *

 * Copyright IBM Corp. 2015

 * Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>

 */



#ifndef _ASM_S390_FPU_INTERNAL_H

#define _ASM_S390_FPU_INTERNAL_H



#include <linux/errno.h>

#include <linux/string.h>

#include <asm/linkage.h>

#include <asm/ctl_reg.h>

#include <asm/sigcontext.h>



struct fpu {

	__u32 fpc;			/* Floating-point control */

	__u32 pad;

	freg_t fprs[__NUM_FPRS];	/* Floating-point register save area */

	__vector128 *vxrs;		/* Vector register save area */

};



#define is_vx_fpu(fpu) (!!(fpu)->vxrs)

#define is_vx_task(tsk) (!!(tsk)->thread.fpu.vxrs)



static inline int test_fp_ctl(u32 fpc)

{

	u32 orig_fpc;

	int rc;



	asm volatile(

		"	efpc    %1\n"

		"	sfpc	%2\n"

		"0:	sfpc	%1\n"

		"	la	%0,0\n"

		"1:\n"

		EX_TABLE(0b,1b)

		: "=d" (rc), "=d" (orig_fpc)

		: "d" (fpc), "0" (-EINVAL));

	return rc;

}



static inline void save_fp_ctl(u32 *fpc)

{

	asm volatile(

		"       stfpc   %0\n"

		: "+Q" (*fpc));

}



static inline int restore_fp_ctl(u32 *fpc)

{

	int rc;



	asm volatile(

		"	lfpc    %1\n"

		"0:	la	%0,0\n"

		"1:\n"

		: "=d" (rc) : "Q" (*fpc), "0" (-EINVAL));

	return rc;

}



static inline void save_fp_regs(freg_t *fprs)

{

	asm volatile("std 0,%0" : "=Q" (fprs[0]));

	asm volatile("std 2,%0" : "=Q" (fprs[2]));

	asm volatile("std 4,%0" : "=Q" (fprs[4]));

	asm volatile("std 6,%0" : "=Q" (fprs[6]));

	asm volatile("std 1,%0" : "=Q" (fprs[1]));

	asm volatile("std 3,%0" : "=Q" (fprs[3]));

	asm volatile("std 5,%0" : "=Q" (fprs[5]));

	asm volatile("std 7,%0" : "=Q" (fprs[7]));

	asm volatile("std 8,%0" : "=Q" (fprs[8]));

	asm volatile("std 9,%0" : "=Q" (fprs[9]));

	asm volatile("std 10,%0" : "=Q" (fprs[10]));

	asm volatile("std 11,%0" : "=Q" (fprs[11]));

	asm volatile("std 12,%0" : "=Q" (fprs[12]));

	asm volatile("std 13,%0" : "=Q" (fprs[13]));

	asm volatile("std 14,%0" : "=Q" (fprs[14]));

	asm volatile("std 15,%0" : "=Q" (fprs[15]));

}



static inline void restore_fp_regs(freg_t *fprs)

{

	asm volatile("ld 0,%0" : : "Q" (fprs[0]));

	asm volatile("ld 2,%0" : : "Q" (fprs[2]));

	asm volatile("ld 4,%0" : : "Q" (fprs[4]));

	asm volatile("ld 6,%0" : : "Q" (fprs[6]));

	asm volatile("ld 1,%0" : : "Q" (fprs[1]));

	asm volatile("ld 3,%0" : : "Q" (fprs[3]));

	asm volatile("ld 5,%0" : : "Q" (fprs[5]));

	asm volatile("ld 7,%0" : : "Q" (fprs[7]));

	asm volatile("ld 8,%0" : : "Q" (fprs[8]));

	asm volatile("ld 9,%0" : : "Q" (fprs[9]));

	asm volatile("ld 10,%0" : : "Q" (fprs[10]));

	asm volatile("ld 11,%0" : : "Q" (fprs[11]));

	asm volatile("ld 12,%0" : : "Q" (fprs[12]));

	asm volatile("ld 13,%0" : : "Q" (fprs[13]));

	asm volatile("ld 14,%0" : : "Q" (fprs[14]));

	asm volatile("ld 15,%0" : : "Q" (fprs[15]));

}



static inline void save_vx_regs(__vector128 *vxrs)

{

	typedef struct { __vector128 _[__NUM_VXRS]; } addrtype;



	asm volatile(

		"	la	1,%0\n"

		"	.word	0xe70f,0x1000,0x003e\n"	/* vstm 0,15,0(1) */

		"	.word	0xe70f,0x1100,0x0c3e\n"	/* vstm 16,31,256(1) */

		: "=Q" (*(addrtype *) vxrs) : : "1");

}



static inline void save_vx_regs_safe(__vector128 *vxrs)

{

	unsigned long cr0, flags;



	flags = arch_local_irq_save();

	__ctl_store(cr0, 0, 0);

	__ctl_set_bit(0, 17);

	__ctl_set_bit(0, 18);

	save_vx_regs(vxrs);

	__ctl_load(cr0, 0, 0);

	arch_local_irq_restore(flags);

}



static inline void restore_vx_regs(__vector128 *vxrs)

{

	typedef struct { __vector128 _[__NUM_VXRS]; } addrtype;



	asm volatile(

		"	la	1,%0\n"

		"	.word	0xe70f,0x1000,0x0036\n"	/* vlm 0,15,0(1) */

		"	.word	0xe70f,0x1100,0x0c36\n"	/* vlm 16,31,256(1) */

		: : "Q" (*(addrtype *) vxrs) : "1");

}



static inline void convert_vx_to_fp(freg_t *fprs, __vector128 *vxrs)

{

	int i;



	for (i = 0; i < __NUM_FPRS; i++)

		fprs[i] = *(freg_t *)(vxrs + i);

}



static inline void convert_fp_to_vx(__vector128 *vxrs, freg_t *fprs)

{

	int i;



	for (i = 0; i < __NUM_FPRS; i++)

		*(freg_t *)(vxrs + i) = fprs[i];

}



static inline void fpregs_store(_s390_fp_regs *fpregs, struct fpu *fpu)

{

	fpregs->pad = 0;

	if (is_vx_fpu(fpu))

		convert_vx_to_fp((freg_t *)&fpregs->fprs, fpu->vxrs);

	else

		memcpy((freg_t *)&fpregs->fprs, fpu->fprs,

		       sizeof(fpregs->fprs));

}



static inline void fpregs_load(_s390_fp_regs *fpregs, struct fpu *fpu)

{

	if (is_vx_fpu(fpu))

		convert_fp_to_vx(fpu->vxrs, (freg_t *)&fpregs->fprs);

	else

		memcpy(fpu->fprs, (freg_t *)&fpregs->fprs,

		       sizeof(fpregs->fprs));

}



static inline void save_fpu_regs(struct fpu *fpu)

{

	save_fp_ctl(&fpu->fpc);

	if (is_vx_fpu(fpu))

		save_vx_regs(fpu->vxrs);

	else

		save_fp_regs(fpu->fprs);

}



static inline void restore_fpu_regs(struct fpu *fpu)

{

	restore_fp_ctl(&fpu->fpc);

	if (is_vx_fpu(fpu))

		restore_vx_regs(fpu->vxrs);

	else

		restore_fp_regs(fpu->fprs);

}



#endif /* _ASM_S390_FPU_INTERNAL_H */

arch/s390/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <asm/ptrace.h>

#include <asm/setup.h>

#include <asm/runtime_instr.h>

#include <asm/fpu-internal.h>



static inline void set_cpu_flag(int flag)

{
@@ -85,7 +86,7 @@ typedef struct { 
 * Thread structure

 */

struct thread_struct {

	s390_fp_regs fp_regs;

	struct fpu fpu;			/* FP and VX register save area */

	unsigned int  acrs[NUM_ACRS];

        unsigned long ksp;              /* kernel stack pointer             */

	mm_segment_t mm_segment;
@@ -101,7 +102,6 @@ struct thread_struct { 
	struct runtime_instr_cb *ri_cb;

	int ri_signum;

	unsigned char trap_tdb[256];	/* Transaction abort diagnose block */

	__vector128 *vxrs;		/* Vector register save area */

};



/* Flag to disable transactions. */

arch/s390/include/asm/switch_to.h

+3 −131
Original line number Diff line number Diff line
@@ -8,138 +8,12 @@ 
#define __ASM_SWITCH_TO_H



#include <linux/thread_info.h>

#include <asm/fpu-internal.h>

#include <asm/ptrace.h>



extern struct task_struct *__switch_to(void *, void *);

extern void update_cr_regs(struct task_struct *task);



static inline int test_fp_ctl(u32 fpc)

{

	u32 orig_fpc;

	int rc;



	asm volatile(

		"	efpc    %1\n"

		"	sfpc	%2\n"

		"0:	sfpc	%1\n"

		"	la	%0,0\n"

		"1:\n"

		EX_TABLE(0b,1b)

		: "=d" (rc), "=d" (orig_fpc)

		: "d" (fpc), "0" (-EINVAL));

	return rc;

}



static inline void save_fp_ctl(u32 *fpc)

{

	asm volatile(

		"       stfpc   %0\n"

		: "+Q" (*fpc));

}



static inline int restore_fp_ctl(u32 *fpc)

{

	int rc;



	asm volatile(

		"	lfpc    %1\n"

		"0:	la	%0,0\n"

		"1:\n"

		: "=d" (rc) : "Q" (*fpc), "0" (-EINVAL));

	return rc;

}



static inline void save_fp_regs(freg_t *fprs)

{

	asm volatile("std 0,%0" : "=Q" (fprs[0]));

	asm volatile("std 2,%0" : "=Q" (fprs[2]));

	asm volatile("std 4,%0" : "=Q" (fprs[4]));

	asm volatile("std 6,%0" : "=Q" (fprs[6]));

	asm volatile("std 1,%0" : "=Q" (fprs[1]));

	asm volatile("std 3,%0" : "=Q" (fprs[3]));

	asm volatile("std 5,%0" : "=Q" (fprs[5]));

	asm volatile("std 7,%0" : "=Q" (fprs[7]));

	asm volatile("std 8,%0" : "=Q" (fprs[8]));

	asm volatile("std 9,%0" : "=Q" (fprs[9]));

	asm volatile("std 10,%0" : "=Q" (fprs[10]));

	asm volatile("std 11,%0" : "=Q" (fprs[11]));

	asm volatile("std 12,%0" : "=Q" (fprs[12]));

	asm volatile("std 13,%0" : "=Q" (fprs[13]));

	asm volatile("std 14,%0" : "=Q" (fprs[14]));

	asm volatile("std 15,%0" : "=Q" (fprs[15]));

}



static inline void restore_fp_regs(freg_t *fprs)

{

	asm volatile("ld 0,%0" : : "Q" (fprs[0]));

	asm volatile("ld 2,%0" : : "Q" (fprs[2]));

	asm volatile("ld 4,%0" : : "Q" (fprs[4]));

	asm volatile("ld 6,%0" : : "Q" (fprs[6]));

	asm volatile("ld 1,%0" : : "Q" (fprs[1]));

	asm volatile("ld 3,%0" : : "Q" (fprs[3]));

	asm volatile("ld 5,%0" : : "Q" (fprs[5]));

	asm volatile("ld 7,%0" : : "Q" (fprs[7]));

	asm volatile("ld 8,%0" : : "Q" (fprs[8]));

	asm volatile("ld 9,%0" : : "Q" (fprs[9]));

	asm volatile("ld 10,%0" : : "Q" (fprs[10]));

	asm volatile("ld 11,%0" : : "Q" (fprs[11]));

	asm volatile("ld 12,%0" : : "Q" (fprs[12]));

	asm volatile("ld 13,%0" : : "Q" (fprs[13]));

	asm volatile("ld 14,%0" : : "Q" (fprs[14]));

	asm volatile("ld 15,%0" : : "Q" (fprs[15]));

}



static inline void save_vx_regs(__vector128 *vxrs)

{

	typedef struct { __vector128 _[__NUM_VXRS]; } addrtype;



	asm volatile(

		"	la	1,%0\n"

		"	.word	0xe70f,0x1000,0x003e\n"	/* vstm 0,15,0(1) */

		"	.word	0xe70f,0x1100,0x0c3e\n"	/* vstm 16,31,256(1) */

		: "=Q" (*(addrtype *) vxrs) : : "1");

}



static inline void save_vx_regs_safe(__vector128 *vxrs)

{

	unsigned long cr0, flags;



	flags = arch_local_irq_save();

	__ctl_store(cr0, 0, 0);

	__ctl_set_bit(0, 17);

	__ctl_set_bit(0, 18);

	save_vx_regs(vxrs);

	__ctl_load(cr0, 0, 0);

	arch_local_irq_restore(flags);

}



static inline void restore_vx_regs(__vector128 *vxrs)

{

	typedef struct { __vector128 _[__NUM_VXRS]; } addrtype;



	asm volatile(

		"	la	1,%0\n"

		"	.word	0xe70f,0x1000,0x0036\n"	/* vlm 0,15,0(1) */

		"	.word	0xe70f,0x1100,0x0c36\n"	/* vlm 16,31,256(1) */

		: : "Q" (*(addrtype *) vxrs) : "1");

}



static inline void save_fp_vx_regs(struct task_struct *task)

{

	if (task->thread.vxrs)

		save_vx_regs(task->thread.vxrs);

	else

		save_fp_regs(task->thread.fp_regs.fprs);

}



static inline void restore_fp_vx_regs(struct task_struct *task)

{

	if (task->thread.vxrs)

		restore_vx_regs(task->thread.vxrs);

	else

		restore_fp_regs(task->thread.fp_regs.fprs);

}



static inline void save_access_regs(unsigned int *acrs)

{

	typedef struct { int _[NUM_ACRS]; } acrstype;
@@ -156,15 +30,13 @@ static inline void restore_access_regs(unsigned int *acrs) 


#define switch_to(prev,next,last) do {					\

	if (prev->mm) {							\

		save_fp_ctl(&prev->thread.fp_regs.fpc);			\

		save_fp_vx_regs(prev);					\

		save_fpu_regs(&prev->thread.fpu);			\

		save_access_regs(&prev->thread.acrs[0]);		\

		save_ri_cb(prev->thread.ri_cb);				\

	}								\

	if (next->mm) {							\

		update_cr_regs(next);					\

		restore_fp_ctl(&next->thread.fp_regs.fpc);		\

		restore_fp_vx_regs(next);				\

		restore_fpu_regs(&next->thread.fpu);			\

		restore_access_regs(&next->thread.acrs[0]);		\

		restore_ri_cb(next->thread.ri_cb, prev->thread.ri_cb);	\

	}								\

arch/s390/kernel/compat_signal.c

+11 −32
Original line number Diff line number Diff line
@@ -153,33 +153,15 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) 
/* Store registers needed to create the signal frame */

static void store_sigregs(void)

{

	int i;



	save_access_regs(current->thread.acrs);

	save_fp_ctl(&current->thread.fp_regs.fpc);

	if (current->thread.vxrs) {

		save_vx_regs(current->thread.vxrs);

		for (i = 0; i < __NUM_FPRS; i++)

			current->thread.fp_regs.fprs[i] =

				*(freg_t *)(current->thread.vxrs + i);

	} else

		save_fp_regs(current->thread.fp_regs.fprs);

	save_fpu_regs(&current->thread.fpu);

}



/* Load registers after signal return */

static void load_sigregs(void)

{

	int i;



	restore_access_regs(current->thread.acrs);

	restore_fp_ctl(&current->thread.fp_regs.fpc);

	if (current->thread.vxrs) {

		for (i = 0; i < __NUM_FPRS; i++)

			*(freg_t *)(current->thread.vxrs + i) =

				current->thread.fp_regs.fprs[i];

		restore_vx_regs(current->thread.vxrs);

	} else

		restore_fp_regs(current->thread.fp_regs.fprs);

	restore_fpu_regs(&current->thread.fpu);

}



static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs)
@@ -196,8 +178,7 @@ static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs) 
		user_sregs.regs.gprs[i] = (__u32) regs->gprs[i];

	memcpy(&user_sregs.regs.acrs, current->thread.acrs,

	       sizeof(user_sregs.regs.acrs));

	memcpy(&user_sregs.fpregs, &current->thread.fp_regs,

	       sizeof(user_sregs.fpregs));

	fpregs_store((_s390_fp_regs *) &user_sregs.fpregs, &current->thread.fpu);

	if (__copy_to_user(sregs, &user_sregs, sizeof(_sigregs32)))

		return -EFAULT;

	return 0;
@@ -235,9 +216,7 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) 
		regs->gprs[i] = (__u64) user_sregs.regs.gprs[i];

	memcpy(&current->thread.acrs, &user_sregs.regs.acrs,

	       sizeof(current->thread.acrs));



	memcpy(&current->thread.fp_regs, &user_sregs.fpregs,

	       sizeof(current->thread.fp_regs));

	fpregs_load((_s390_fp_regs *) &user_sregs.fpregs, &current->thread.fpu);



	clear_pt_regs_flag(regs, PIF_SYSCALL); /* No longer in a system call */

	return 0;
@@ -258,13 +237,13 @@ static int save_sigregs_ext32(struct pt_regs *regs, 
		return -EFAULT;



	/* Save vector registers to signal stack */

	if (current->thread.vxrs) {

	if (is_vx_task(current)) {

		for (i = 0; i < __NUM_VXRS_LOW; i++)

			vxrs[i] = *((__u64 *)(current->thread.vxrs + i) + 1);

			vxrs[i] = *((__u64 *)(current->thread.fpu.vxrs + i) + 1);

		if (__copy_to_user(&sregs_ext->vxrs_low, vxrs,

				   sizeof(sregs_ext->vxrs_low)) ||

		    __copy_to_user(&sregs_ext->vxrs_high,

				   current->thread.vxrs + __NUM_VXRS_LOW,

				   current->thread.fpu.vxrs + __NUM_VXRS_LOW,

				   sizeof(sregs_ext->vxrs_high)))

			return -EFAULT;

	}
@@ -286,15 +265,15 @@ static int restore_sigregs_ext32(struct pt_regs *regs, 
		*(__u32 *)&regs->gprs[i] = gprs_high[i];



	/* Restore vector registers from signal stack */

	if (current->thread.vxrs) {

	if (is_vx_task(current)) {

		if (__copy_from_user(vxrs, &sregs_ext->vxrs_low,

				     sizeof(sregs_ext->vxrs_low)) ||

		    __copy_from_user(current->thread.vxrs + __NUM_VXRS_LOW,

		    __copy_from_user(current->thread.fpu.vxrs + __NUM_VXRS_LOW,

				     &sregs_ext->vxrs_high,

				     sizeof(sregs_ext->vxrs_high)))

			return -EFAULT;

		for (i = 0; i < __NUM_VXRS_LOW; i++)

			*((__u64 *)(current->thread.vxrs + i) + 1) = vxrs[i];

			*((__u64 *)(current->thread.fpu.vxrs + i) + 1) = vxrs[i];

	}

	return 0;

}
@@ -472,7 +451,7 @@ static int setup_rt_frame32(struct ksignal *ksig, sigset_t *set, 
	 */

	uc_flags = UC_GPRS_HIGH;

	if (MACHINE_HAS_VX) {

		if (current->thread.vxrs)

		if (is_vx_task(current))

			uc_flags |= UC_VXRS;

	} else

		frame_size -= sizeof(frame->uc.uc_mcontext_ext.vxrs_low) +

arch/s390/kernel/nmi.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/nmi.h>

#include <asm/crw.h>

#include <asm/switch_to.h>

#include <asm/fpu-internal.h>

#include <asm/ctl_reg.h>



struct mcck_struct {