Unverified Commit ead7132e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13357 x86/selftests: Skip the tests if prerequisites aren't fulfilled 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jiangshan Yi <yijiangshan@kylinos.cn>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HLCIV6626SPI4EIQ6NZWMF2Y7SZOVLQZ/ 
 
https://gitee.com/openeuler/kernel/issues/IB5O23 
 
Link:https://gitee.com/openeuler/kernel/pulls/13357

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 8f14affc 7460d49a

tools/testing/selftests/x86/amx.c

+10 −17
Original line number Diff line number Diff line
@@ -103,21 +103,6 @@ static void clearhandler(int sig) 


#define CPUID_LEAF1_ECX_XSAVE_MASK	(1 << 26)

#define CPUID_LEAF1_ECX_OSXSAVE_MASK	(1 << 27)

static inline void check_cpuid_xsave(void)

{

	uint32_t eax, ebx, ecx, edx;



	/*

	 * CPUID.1:ECX.XSAVE[bit 26] enumerates general

	 * support for the XSAVE feature set, including

	 * XGETBV.

	 */

	__cpuid_count(1, 0, eax, ebx, ecx, edx);

	if (!(ecx & CPUID_LEAF1_ECX_XSAVE_MASK))

		fatal_error("cpuid: no CPU xsave support");

	if (!(ecx & CPUID_LEAF1_ECX_OSXSAVE_MASK))

		fatal_error("cpuid: no OS xsave support");

}



static uint32_t xbuf_size;
@@ -350,6 +335,7 @@ enum expected_result { FAIL_EXPECTED, SUCCESS_EXPECTED }; 


/* arch_prctl() and sigaltstack() test */



#define ARCH_GET_XCOMP_SUPP	0x1021

#define ARCH_GET_XCOMP_PERM	0x1022

#define ARCH_REQ_XCOMP_PERM	0x1023
@@ -928,8 +914,15 @@ static void test_ptrace(void) 


int main(void)

{

	/* Check hardware availability at first */

	check_cpuid_xsave();

	unsigned long features;

	long rc;



	rc = syscall(SYS_arch_prctl, ARCH_GET_XCOMP_SUPP, &features);

	if (rc || (features & XFEATURE_MASK_XTILE) != XFEATURE_MASK_XTILE) {

		ksft_print_msg("no AMX support\n");

		return KSFT_SKIP;

	}



	check_cpuid_xtiledata();



	init_stashed_xsave();

tools/testing/selftests/x86/lam.c

+1 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ int main(int argc, char **argv) 


	if (!cpu_has_lam()) {

		ksft_print_msg("Unsupported LAM feature!\n");

		return -1;

		return KSFT_SKIP;

	}



	while ((c = getopt(argc, argv, "ht:")) != -1) {