On 07/17/2018 06:49 AM, Ram Pai wrote:
-static inline int cpu_has_pku(void) +static inline bool is_pkey_supported(void) {
- return 1;
- /*
* No simple way to determine this.* Lets try allocating a key and see if it succeeds.*/- int ret = sys_pkey_alloc(0, 0);
- if (ret > 0) {
sys_pkey_free(ret);return true;- }
- return false;
}
This actually works on x86 too.
static inline int arch_reserved_keys(void) diff --git a/tools/testing/selftests/vm/pkey-x86.h b/tools/testing/selftests/vm/pkey-x86.h index f5d0ff2..887acf2 100644 --- a/tools/testing/selftests/vm/pkey-x86.h +++ b/tools/testing/selftests/vm/pkey-x86.h @@ -105,7 +105,7 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx, #define X86_FEATURE_PKU (1<<3) /* Protection Keys for Userspace */ #define X86_FEATURE_OSPKE (1<<4) /* OS Protection Keys Enable */ -static inline int cpu_has_pku(void) +static inline bool is_pkey_supported(void) { unsigned int eax; unsigned int ebx; @@ -118,13 +118,13 @@ static inline int cpu_has_pku(void) if (!(ecx & X86_FEATURE_PKU)) { dprintf2("cpu does not have PKU\n");
return 0;
return false;
return 0;
return false;
- return 1;
- return true;
}
#define XSTATE_PKEY_BIT (9) diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index 18e1bb7..d27fa5e 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -1389,8 +1389,8 @@ void test_mprotect_pkey_on_unsupported_cpu(int *ptr, u16 pkey) int size = PAGE_SIZE; int sret;
- if (cpu_has_pku()) {
dprintf1("SKIP: %s: no CPU support\n", __func__);
- if (is_pkey_supported()) {
dprintf1("SKIP: %s: no CPU/kernel support\n", __func__);
I actually wanted a kernel-independent check, based entirely on CPUID. That's specifically why I said "no CPU support".
If you want to do this, please do:
/* powerpc has no enumeration, just assume it has support: */ static inline bool cpu_has_cpu(void) { return true; };
if (cpu_has_pku()) { dprintf1("SKIP: %s: no CPU support\n", __func__); return }
if (kernel_pkey_supported()) { dprintf1("SKIP: %s: no kernel support\n", __func__); return; }
-- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html