Commit 18564756 authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

s390/fpu: get rid of MACHINE_HAS_VX 



Get rid of MACHINE_HAS_VX and replace it with cpu_has_vx() which is a
short readable wrapper for "test_facility(129)".

Facility bit 129 is set if the vector facility is present. test_facility()
returns also true for all bits which are set in the architecture level set
of the cpu that the kernel is compiled for. This means that
test_facility(129) is a compile time constant which returns true for z13
and later, since the vector facility bit is part of the z13 kernel ALS.

In result the compiled code will have less runtime checks, and less code.

Reviewed-by: default avatarHendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 68422c00

arch/s390/crypto/chacha-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, 
	 * it cannot handle a block of data or less, but otherwise

	 * it can handle data of arbitrary size

	 */

	if (bytes <= CHACHA_BLOCK_SIZE || nrounds != 20 || !MACHINE_HAS_VX)

	if (bytes <= CHACHA_BLOCK_SIZE || nrounds != 20 || !cpu_has_vx())

		chacha_crypt_generic(state, dst, src, bytes, nrounds);

	else

		chacha20_crypt_s390(state, dst, src, bytes,

arch/s390/include/asm/fpu/api.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#include <linux/preempt.h>

#include <asm/asm-extable.h>

#include <asm/fpu/internal.h>



void save_fpu_regs(void);

void load_fpu_regs(void);

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

+8 −2
Original line number Diff line number Diff line
@@ -10,8 +10,14 @@ 
#define _ASM_S390_FPU_INTERNAL_H



#include <linux/string.h>

#include <asm/facility.h>

#include <asm/fpu/types.h>



static inline bool cpu_has_vx(void)

{

	return likely(test_facility(129));

}



static inline void save_vx_regs(__vector128 *vxrs)

{

	asm volatile(
@@ -41,7 +47,7 @@ static inline void fpregs_store(_s390_fp_regs *fpregs, struct fpu *fpu) 
{

	fpregs->pad = 0;

	fpregs->fpc = fpu->fpc;

	if (MACHINE_HAS_VX)

	if (cpu_has_vx())

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

	else

		memcpy((freg_t *)&fpregs->fprs, fpu->fprs,
@@ -51,7 +57,7 @@ static inline void fpregs_store(_s390_fp_regs *fpregs, struct fpu *fpu) 
static inline void fpregs_load(_s390_fp_regs *fpregs, struct fpu *fpu)

{

	fpu->fpc = fpregs->fpc;

	if (MACHINE_HAS_VX)

	if (cpu_has_vx())

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

	else

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

arch/s390/include/asm/setup.h

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#define MACHINE_FLAG_TOPOLOGY	BIT(10)

#define MACHINE_FLAG_TE		BIT(11)

#define MACHINE_FLAG_TLB_LC	BIT(12)

#define MACHINE_FLAG_VX		BIT(13)

#define MACHINE_FLAG_TLB_GUEST	BIT(14)

#define MACHINE_FLAG_NX		BIT(15)

#define MACHINE_FLAG_GS		BIT(16)
@@ -90,7 +89,6 @@ extern unsigned long mio_wb_bit_mask; 
#define MACHINE_HAS_TOPOLOGY	(S390_lowcore.machine_flags & MACHINE_FLAG_TOPOLOGY)

#define MACHINE_HAS_TE		(S390_lowcore.machine_flags & MACHINE_FLAG_TE)

#define MACHINE_HAS_TLB_LC	(S390_lowcore.machine_flags & MACHINE_FLAG_TLB_LC)

#define MACHINE_HAS_VX		(S390_lowcore.machine_flags & MACHINE_FLAG_VX)

#define MACHINE_HAS_TLB_GUEST	(S390_lowcore.machine_flags & MACHINE_FLAG_TLB_GUEST)

#define MACHINE_HAS_NX		(S390_lowcore.machine_flags & MACHINE_FLAG_NX)

#define MACHINE_HAS_GS		(S390_lowcore.machine_flags & MACHINE_FLAG_GS)

arch/s390/kernel/compat_signal.c

+7 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/lowcore.h>

#include <asm/switch_to.h>

#include <asm/vdso.h>

#include <asm/fpu/api.h>

#include "compat_linux.h"

#include "compat_ptrace.h"

#include "entry.h"
@@ -133,7 +134,7 @@ static int save_sigregs_ext32(struct pt_regs *regs, 
		return -EFAULT;



	/* Save vector registers to signal stack */

	if (MACHINE_HAS_VX) {

	if (cpu_has_vx()) {

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

			vxrs[i] = current->thread.fpu.vxrs[i].low;

		if (__copy_to_user(&sregs_ext->vxrs_low, vxrs,
@@ -161,7 +162,7 @@ static int restore_sigregs_ext32(struct pt_regs *regs, 
		*(__u32 *)&regs->gprs[i] = gprs_high[i];



	/* Restore vector registers from signal stack */

	if (MACHINE_HAS_VX) {

	if (cpu_has_vx()) {

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

				     sizeof(sregs_ext->vxrs_low)) ||

		    __copy_from_user(current->thread.fpu.vxrs + __NUM_VXRS_LOW,
@@ -261,7 +262,7 @@ static int setup_frame32(struct ksignal *ksig, sigset_t *set, 
	 * the machine supports it

	 */

	frame_size = sizeof(*frame) - sizeof(frame->sregs_ext.__reserved);

	if (!MACHINE_HAS_VX)

	if (!cpu_has_vx())

		frame_size -= sizeof(frame->sregs_ext.vxrs_low) +

			      sizeof(frame->sregs_ext.vxrs_high);

	frame = get_sigframe(&ksig->ka, regs, frame_size);
@@ -344,11 +345,12 @@ static int setup_rt_frame32(struct ksignal *ksig, sigset_t *set, 
	 * the machine supports it

	 */

	uc_flags = UC_GPRS_HIGH;

	if (MACHINE_HAS_VX) {

	if (cpu_has_vx()) {

		uc_flags |= UC_VXRS;

	} else

	} else {

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

			      sizeof(frame->uc.uc_mcontext_ext.vxrs_high);

	}

	frame = get_sigframe(&ksig->ka, regs, frame_size);

	if (frame == (void __user *) -1UL)

		return -EFAULT;