Commit dbd6b649 authored by Chang S. Bae's avatar Chang S. Bae Committed by Ingo Molnar
Browse files

selftests/x86: Consolidate redundant signal helper functions 



The x86 selftests frequently register and clean up signal handlers, but
the sethandler() and clearhandler() functions have been redundantly
copied across multiple .c files.

Move these functions to helpers.h to enable reuse across tests,
eliminating around 250 lines of duplicate code.

Converge the error handling by using ksft_exit_fail_msg(), which is
functionally equivalent with err() within the selftest framework.

This change is a prerequisite for the upcoming xstate selftest, which
requires signal handling for registering and cleaning up handlers.

Signed-off-by: default avatarChang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250226010731.2456-2-chang.seok.bae@intel.com
parent ac3144f9

tools/testing/selftests/x86/amx.c

+1 −24
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <sys/uio.h>



#include "../kselftest.h" /* For __cpuid_count() */

#include "helpers.h"



#ifndef __x86_64__

# error This test is 64-bit only
@@ -61,30 +62,6 @@ static inline void xrstor(struct xsave_buffer *xbuf, uint64_t rfbm) 
/* err() exits and will not return */

#define fatal_error(msg, ...)	err(1, "[FAIL]\t" msg, ##__VA_ARGS__)



static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *),

		       int flags)

{

	struct sigaction sa;



	memset(&sa, 0, sizeof(sa));

	sa.sa_sigaction = handler;

	sa.sa_flags = SA_SIGINFO | flags;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		fatal_error("sigaction");

}



static void clearhandler(int sig)

{

	struct sigaction sa;



	memset(&sa, 0, sizeof(sa));

	sa.sa_handler = SIG_DFL;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		fatal_error("sigaction");

}



#define XFEATURE_XTILECFG	17

#define XFEATURE_XTILEDATA	18

#define XFEATURE_MASK_XTILECFG	(1 << XFEATURE_XTILECFG)

tools/testing/selftests/x86/corrupt_xstate_header.c

+1 −13
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <sys/wait.h>



#include "../kselftest.h" /* For __cpuid_count() */

#include "helpers.h"



static inline int xsave_enabled(void)

{
@@ -29,19 +30,6 @@ static inline int xsave_enabled(void) 
	return ecx & (1U << 27);

}



static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *),

		       int flags)

{

	struct sigaction sa;



	memset(&sa, 0, sizeof(sa));

	sa.sa_sigaction = handler;

	sa.sa_flags = SA_SIGINFO | flags;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		err(1, "sigaction");

}



static void sigusr1(int sig, siginfo_t *info, void *uc_void)

{

	ucontext_t *uc = uc_void;

tools/testing/selftests/x86/entry_from_vm86.c

+2 −22
Original line number Diff line number Diff line
@@ -24,31 +24,11 @@ 
#include <errno.h>

#include <sys/vm86.h>



#include "helpers.h"



static unsigned long load_addr = 0x10000;

static int nerrs = 0;



static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *),

		       int flags)

{

	struct sigaction sa;

	memset(&sa, 0, sizeof(sa));

	sa.sa_sigaction = handler;

	sa.sa_flags = SA_SIGINFO | flags;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		err(1, "sigaction");

}



static void clearhandler(int sig)

{

	struct sigaction sa;

	memset(&sa, 0, sizeof(sa));

	sa.sa_handler = SIG_DFL;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		err(1, "sigaction");

}



static sig_atomic_t got_signal;



static void sighandler(int sig, siginfo_t *info, void *ctx_void)

tools/testing/selftests/x86/fsgsbase.c

+2 −22
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <sys/wait.h>

#include <setjmp.h>



#include "helpers.h"



#ifndef __x86_64__

# error This test is 64-bit only

#endif
@@ -39,28 +41,6 @@ static unsigned short *shared_scratch; 


static int nerrs;



static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *),

		       int flags)

{

	struct sigaction sa;

	memset(&sa, 0, sizeof(sa));

	sa.sa_sigaction = handler;

	sa.sa_flags = SA_SIGINFO | flags;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		err(1, "sigaction");

}



static void clearhandler(int sig)

{

	struct sigaction sa;

	memset(&sa, 0, sizeof(sa));

	sa.sa_handler = SIG_DFL;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		err(1, "sigaction");

}



static void sigsegv(int sig, siginfo_t *si, void *ctx_void)

{

	ucontext_t *ctx = (ucontext_t*)ctx_void;

tools/testing/selftests/x86/helpers.h

+28 −0
Original line number Diff line number Diff line
@@ -2,8 +2,13 @@ 
#ifndef __SELFTESTS_X86_HELPERS_H

#define __SELFTESTS_X86_HELPERS_H



#include <signal.h>

#include <string.h>



#include <asm/processor-flags.h>



#include "../kselftest.h"



static inline unsigned long get_eflags(void)

{

#ifdef __x86_64__
@@ -22,4 +27,27 @@ static inline void set_eflags(unsigned long eflags) 
#endif

}



static inline void sethandler(int sig, void (*handler)(int, siginfo_t *, void *), int flags)

{

	struct sigaction sa;



	memset(&sa, 0, sizeof(sa));

	sa.sa_sigaction = handler;

	sa.sa_flags = SA_SIGINFO | flags;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		ksft_exit_fail_msg("sigaction failed");

}



static inline void clearhandler(int sig)

{

	struct sigaction sa;



	memset(&sa, 0, sizeof(sa));

	sa.sa_handler = SIG_DFL;

	sigemptyset(&sa.sa_mask);

	if (sigaction(sig, &sa, 0))

		ksft_exit_fail_msg("sigaction failed");

}



#endif /* __SELFTESTS_X86_HELPERS_H */