Commit 572a0a64 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by Dave Hansen
Browse files

selftests/sgx: Fix corrupted cpuid macro invocation 



The SGX selftest fails to build on tip/x86/sgx:

	main.c: In function ‘get_total_epc_mem’:
	main.c:296:17: error: implicit declaration of function ‘__cpuid’ [-Werror=implicit-function-declaration]
	  296 |                 __cpuid(&eax, &ebx, &ecx, &edx);
	      |                 ^~~~~~~

Include cpuid.h and use __cpuid_count() macro in order to fix the
compilation issue.

[ dhansen: tweak commit message ]

Fixes: f0ff2447 ("selftests/sgx: Add a new kselftest: Unclobbered_vdso_oversubscribed")
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Link: https://lkml.kernel.org/r/20211204202355.23005-1-jarkko@kernel.org
Cc: Shuah Khan <shuah@kernel.org>
parent 50468e43

tools/testing/selftests/sgx/main.c

+2 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*  Copyright(c) 2016-20 Intel Corporation. */



#include <cpuid.h>

#include <elf.h>

#include <errno.h>

#include <fcntl.h>
@@ -291,9 +292,7 @@ static unsigned long get_total_epc_mem(void) 
	int section = 0;



	while (true) {

		eax = SGX_CPUID;

		ecx = section + SGX_CPUID_EPC;

		__cpuid(&eax, &ebx, &ecx, &edx);

		__cpuid_count(SGX_CPUID, section + SGX_CPUID_EPC, eax, ebx, ecx, edx);



		type = eax & SGX_CPUID_EPC_MASK;

		if (type == SGX_CPUID_EPC_INVALID)