* [PATCH 0/3] selftests: Remove duplicate CPUID wrappers
@ 2022-02-04 19:17 Reinette Chatre
2022-02-04 19:17 ` [PATCH 1/3] selftests/vm/pkeys: Use existing __cpuid_count() macro Reinette Chatre
2022-02-04 23:39 ` [PATCH 0/3] selftests: Remove duplicate CPUID wrappers Shuah Khan
0 siblings, 2 replies; 6+ messages in thread
From: Reinette Chatre @ 2022-02-04 19:17 UTC (permalink / raw)
To: shuah, linux-kselftest
Cc: linux-kernel, Reinette Chatre, Dave Hansen, Ram Pai,
Sandipan Das, Florian Weimer, Desnes A. Nunes do Rosario,
Ingo Molnar, Thiago Jung Bauermann, Michael Ellerman,
Michal Suchanek, linux-mm, Chang S . Bae, Borislav Petkov,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86,
Andy Lutomirski
A few tests that require running CPUID do so with a private
implementation of a wrapper for CPUID. This duplication of
the CPUID wrapper should be avoided but having one is also
unnecessary because of the existence of a macro that can
be used instead.
This series replaces private CPUID wrappers with calls
to the __cpuid_count() macro from cpuid.h as made available
by gcc and clang/llvm.
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ram Pai <linuxram@us.ibm.com>
Cc: Sandipan Das <sandipan@linux.ibm.com>
Cc: Florian Weimer <fweimer@redhat.com>
Cc: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Suchanek <msuchanek@suse.de>
Cc: linux-mm@kvack.org
Cc: Chang S. Bae <chang.seok.bae@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Andy Lutomirski <luto@kernel.org>
Reinette Chatre (3):
selftests/vm/pkeys: Use existing __cpuid_count() macro
selftests/x86/amx: Use existing __cpuid_count() macro
selftests/x86/corrupt_xstate_header: Use existing __cpuid_count()
macro
tools/testing/selftests/vm/pkey-x86.h | 22 +++---------------
tools/testing/selftests/x86/amx.c | 23 +++++--------------
.../selftests/x86/corrupt_xstate_header.c | 17 ++------------
3 files changed, 11 insertions(+), 51 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] selftests/vm/pkeys: Use existing __cpuid_count() macro 2022-02-04 19:17 [PATCH 0/3] selftests: Remove duplicate CPUID wrappers Reinette Chatre @ 2022-02-04 19:17 ` Reinette Chatre 2022-02-04 23:39 ` [PATCH 0/3] selftests: Remove duplicate CPUID wrappers Shuah Khan 1 sibling, 0 replies; 6+ messages in thread From: Reinette Chatre @ 2022-02-04 19:17 UTC (permalink / raw) To: shuah, linux-kselftest Cc: linux-kernel, Reinette Chatre, Dave Hansen, Ram Pai, Sandipan Das, Florian Weimer, Desnes A. Nunes do Rosario, Ingo Molnar, Thiago Jung Bauermann, Michael Ellerman, Michal Suchanek, linux-mm gcc as well as clang makes the __cpuid_count() macro available via cpuid.h to conveniently call the CPUID instruction. Below is a copy of the macro as found in cpuid.h: #define __cpuid_count(level, count, a, b, c, d) \ __asm__ ("cpuid\n\t" \ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \ : "0" (level), "2" (count)) The pkeys test contains a local function used as wrapper of the CPUID instruction. One difference between the pkeys implementation and the macro from cpuid.h is that the pkeys implementation provides the "volatile" qualifier to the asm() call. The "volatile" qualifier is necessary if CPUID has side effects and thus specifies that any optimizations should be avoided. The pkeys test uses CPUID to query the system for its protection keys status and save area properties, queries without side effect, the "volatile" qualifier is not required and the macro from cpuid.h can be used instead. Remove the duplicated wrapper to CPUID and use __cpuid_count() from cpuid.h instead. Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Ram Pai <linuxram@us.ibm.com> Cc: Sandipan Das <sandipan@linux.ibm.com> Cc: Florian Weimer <fweimer@redhat.com> Cc: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Suchanek <msuchanek@suse.de> Cc: linux-mm@kvack.org Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> --- tools/testing/selftests/vm/pkey-x86.h | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/vm/pkey-x86.h b/tools/testing/selftests/vm/pkey-x86.h index e4a4ce2b826d..17b20af8d8f8 100644 --- a/tools/testing/selftests/vm/pkey-x86.h +++ b/tools/testing/selftests/vm/pkey-x86.h @@ -2,6 +2,7 @@ #ifndef _PKEYS_X86_H #define _PKEYS_X86_H +#include <cpuid.h> #ifdef __i386__ @@ -80,19 +81,6 @@ static inline void __write_pkey_reg(u64 pkey_reg) assert(pkey_reg == __read_pkey_reg()); } -static inline void __cpuid(unsigned int *eax, unsigned int *ebx, - unsigned int *ecx, unsigned int *edx) -{ - /* ecx is often an input as well as an output. */ - asm volatile( - "cpuid;" - : "=a" (*eax), - "=b" (*ebx), - "=c" (*ecx), - "=d" (*edx) - : "0" (*eax), "2" (*ecx)); -} - /* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx) */ #define X86_FEATURE_PKU (1<<3) /* Protection Keys for Userspace */ #define X86_FEATURE_OSPKE (1<<4) /* OS Protection Keys Enable */ @@ -104,9 +92,7 @@ static inline int cpu_has_pkeys(void) unsigned int ecx; unsigned int edx; - eax = 0x7; - ecx = 0x0; - __cpuid(&eax, &ebx, &ecx, &edx); + __cpuid_count(0x7, 0x0, eax, ebx, ecx, edx); if (!(ecx & X86_FEATURE_PKU)) { dprintf2("cpu does not have PKU\n"); @@ -142,9 +128,7 @@ int pkey_reg_xstate_offset(void) /* assume that XSTATE_PKEY is set in XCR0 */ leaf = XSTATE_PKEY_BIT; { - eax = XSTATE_CPUID; - ecx = leaf; - __cpuid(&eax, &ebx, &ecx, &edx); + __cpuid_count(XSTATE_CPUID, leaf, eax, ebx, ecx, edx); if (leaf == XSTATE_PKEY_BIT) { xstate_offset = ebx; -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] selftests: Remove duplicate CPUID wrappers 2022-02-04 19:17 [PATCH 0/3] selftests: Remove duplicate CPUID wrappers Reinette Chatre 2022-02-04 19:17 ` [PATCH 1/3] selftests/vm/pkeys: Use existing __cpuid_count() macro Reinette Chatre @ 2022-02-04 23:39 ` Shuah Khan 2022-02-05 0:11 ` Reinette Chatre 1 sibling, 1 reply; 6+ messages in thread From: Shuah Khan @ 2022-02-04 23:39 UTC (permalink / raw) To: Reinette Chatre, shuah, linux-kselftest Cc: linux-kernel, Dave Hansen, Ram Pai, Sandipan Das, Florian Weimer, Desnes A. Nunes do Rosario, Ingo Molnar, Thiago Jung Bauermann, Michael Ellerman, Michal Suchanek, linux-mm, Chang S . Bae, Borislav Petkov, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Andy Lutomirski, Shuah Khan On 2/4/22 12:17 PM, Reinette Chatre wrote: > A few tests that require running CPUID do so with a private > implementation of a wrapper for CPUID. This duplication of > the CPUID wrapper should be avoided but having one is also > unnecessary because of the existence of a macro that can > be used instead. > > This series replaces private CPUID wrappers with calls > to the __cpuid_count() macro from cpuid.h as made available > by gcc and clang/llvm. > > Cc: Dave Hansen <dave.hansen@linux.intel.com> > Cc: Ram Pai <linuxram@us.ibm.com> > Cc: Sandipan Das <sandipan@linux.ibm.com> > Cc: Florian Weimer <fweimer@redhat.com> > Cc: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com> > Cc: Ingo Molnar <mingo@kernel.org> > Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Michal Suchanek <msuchanek@suse.de> > Cc: linux-mm@kvack.org > Cc: Chang S. Bae <chang.seok.bae@intel.com> > Cc: Borislav Petkov <bp@suse.de> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: "H. Peter Anvin" <hpa@zytor.com> > Cc: x86@kernel.org > Cc: Andy Lutomirski <luto@kernel.org> > > Reinette Chatre (3): > selftests/vm/pkeys: Use existing __cpuid_count() macro > selftests/x86/amx: Use existing __cpuid_count() macro > selftests/x86/corrupt_xstate_header: Use existing __cpuid_count() > macro > > tools/testing/selftests/vm/pkey-x86.h | 22 +++--------------- > tools/testing/selftests/x86/amx.c | 23 +++++-------------- > .../selftests/x86/corrupt_xstate_header.c | 17 ++------------ > 3 files changed, 11 insertions(+), 51 deletions(-) > I am all for this cleanup. However, I am not finding __cpuid_count() marco on my system with gcc: gcc --version gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0 My concern is regression on older gcc versions. thanks, -- Shuah ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] selftests: Remove duplicate CPUID wrappers 2022-02-04 23:39 ` [PATCH 0/3] selftests: Remove duplicate CPUID wrappers Shuah Khan @ 2022-02-05 0:11 ` Reinette Chatre 2022-02-07 18:00 ` Shuah Khan 0 siblings, 1 reply; 6+ messages in thread From: Reinette Chatre @ 2022-02-05 0:11 UTC (permalink / raw) To: Shuah Khan, shuah, linux-kselftest Cc: linux-kernel, Dave Hansen, Ram Pai, Sandipan Das, Florian Weimer, Desnes A. Nunes do Rosario, Ingo Molnar, Thiago Jung Bauermann, Michael Ellerman, Michal Suchanek, linux-mm, Chang S . Bae, Borislav Petkov, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Andy Lutomirski Hi Shuah, On 2/4/2022 3:39 PM, Shuah Khan wrote: > On 2/4/22 12:17 PM, Reinette Chatre wrote: >> A few tests that require running CPUID do so with a private >> implementation of a wrapper for CPUID. This duplication of >> the CPUID wrapper should be avoided but having one is also >> unnecessary because of the existence of a macro that can >> be used instead. >> >> This series replaces private CPUID wrappers with calls >> to the __cpuid_count() macro from cpuid.h as made available >> by gcc and clang/llvm. >> >> Cc: Dave Hansen <dave.hansen@linux.intel.com> >> Cc: Ram Pai <linuxram@us.ibm.com> >> Cc: Sandipan Das <sandipan@linux.ibm.com> >> Cc: Florian Weimer <fweimer@redhat.com> >> Cc: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com> >> Cc: Ingo Molnar <mingo@kernel.org> >> Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> >> Cc: Michael Ellerman <mpe@ellerman.id.au> >> Cc: Michal Suchanek <msuchanek@suse.de> >> Cc: linux-mm@kvack.org >> Cc: Chang S. Bae <chang.seok.bae@intel.com> >> Cc: Borislav Petkov <bp@suse.de> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Ingo Molnar <mingo@redhat.com> >> Cc: "H. Peter Anvin" <hpa@zytor.com> >> Cc: x86@kernel.org >> Cc: Andy Lutomirski <luto@kernel.org> >> >> Reinette Chatre (3): >> selftests/vm/pkeys: Use existing __cpuid_count() macro >> selftests/x86/amx: Use existing __cpuid_count() macro >> selftests/x86/corrupt_xstate_header: Use existing __cpuid_count() >> macro >> >> tools/testing/selftests/vm/pkey-x86.h | 22 +++--------------- >> tools/testing/selftests/x86/amx.c | 23 +++++-------------- >> .../selftests/x86/corrupt_xstate_header.c | 17 ++------------ >> 3 files changed, 11 insertions(+), 51 deletions(-) >> > > I am all for this cleanup. However, I am not finding __cpuid_count() > marco on my system with gcc: > > gcc --version > gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0 > > My concern is regression on older gcc versions. Please see this message from our earlier thread where you were able to find it on your system: https://lore.kernel.org/linux-kselftest/63293c72-55ca-9446-35eb-74aff4c8ba5d@linuxfoundation.org/ As mentioned in that thread, on my system it arrived via user space's libgcc-dev package. This does not seem to be the first time including files from this source - I did a quick check and from what I can tell existing kselftest includes like stdarg.h, stdbool.h, stdatomic.h, unwind.h, x86intrin.h ... arrive via libgcc-dev. Reinette ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] selftests: Remove duplicate CPUID wrappers 2022-02-05 0:11 ` Reinette Chatre @ 2022-02-07 18:00 ` Shuah Khan 2022-02-07 19:13 ` Reinette Chatre 0 siblings, 1 reply; 6+ messages in thread From: Shuah Khan @ 2022-02-07 18:00 UTC (permalink / raw) To: Reinette Chatre, shuah, linux-kselftest Cc: linux-kernel, Dave Hansen, Ram Pai, Sandipan Das, Florian Weimer, Desnes A. Nunes do Rosario, Ingo Molnar, Thiago Jung Bauermann, Michael Ellerman, Michal Suchanek, linux-mm, Chang S . Bae, Borislav Petkov, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Andy Lutomirski, Shuah Khan On 2/4/22 5:11 PM, Reinette Chatre wrote: > Hi Shuah, > > On 2/4/2022 3:39 PM, Shuah Khan wrote: >> On 2/4/22 12:17 PM, Reinette Chatre wrote: >>> A few tests that require running CPUID do so with a private >>> implementation of a wrapper for CPUID. This duplication of >>> the CPUID wrapper should be avoided but having one is also >>> unnecessary because of the existence of a macro that can >>> be used instead. >>> >>> This series replaces private CPUID wrappers with calls >>> to the __cpuid_count() macro from cpuid.h as made available >>> by gcc and clang/llvm. >>> >>> Cc: Dave Hansen <dave.hansen@linux.intel.com> >>> Cc: Ram Pai <linuxram@us.ibm.com> >>> Cc: Sandipan Das <sandipan@linux.ibm.com> >>> Cc: Florian Weimer <fweimer@redhat.com> >>> Cc: "Desnes A. Nunes do Rosario" <desnesn@linux.vnet.ibm.com> >>> Cc: Ingo Molnar <mingo@kernel.org> >>> Cc: Thiago Jung Bauermann <bauerman@linux.ibm.com> >>> Cc: Michael Ellerman <mpe@ellerman.id.au> >>> Cc: Michal Suchanek <msuchanek@suse.de> >>> Cc: linux-mm@kvack.org >>> Cc: Chang S. Bae <chang.seok.bae@intel.com> >>> Cc: Borislav Petkov <bp@suse.de> >>> Cc: Thomas Gleixner <tglx@linutronix.de> >>> Cc: Ingo Molnar <mingo@redhat.com> >>> Cc: "H. Peter Anvin" <hpa@zytor.com> >>> Cc: x86@kernel.org >>> Cc: Andy Lutomirski <luto@kernel.org> >>> >>> Reinette Chatre (3): >>> selftests/vm/pkeys: Use existing __cpuid_count() macro >>> selftests/x86/amx: Use existing __cpuid_count() macro >>> selftests/x86/corrupt_xstate_header: Use existing __cpuid_count() >>> macro >>> >>> tools/testing/selftests/vm/pkey-x86.h | 22 +++--------------- >>> tools/testing/selftests/x86/amx.c | 23 +++++-------------- >>> .../selftests/x86/corrupt_xstate_header.c | 17 ++------------ >>> 3 files changed, 11 insertions(+), 51 deletions(-) >>> >> >> I am all for this cleanup. However, I am not finding __cpuid_count() >> marco on my system with gcc: >> >> gcc --version >> gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0 >> >> My concern is regression on older gcc versions. > > Please see this message from our earlier thread where you were able > to find it on your system: > https://lore.kernel.org/linux-kselftest/63293c72-55ca-9446-35eb-74aff4c8ba5d@linuxfoundation.org/ > Right. After I sent off the response, I was thinking we discussed this before. Thanks for the refresh. > As mentioned in that thread, on my system it arrived via user space's > libgcc-dev package. This does not seem to be the first time including > files from this source - I did a quick check and from what I can tell > existing kselftest includes like stdarg.h, stdbool.h, stdatomic.h, > unwind.h, x86intrin.h ... arrive via libgcc-dev. > This will work fine on newer versions of gcc/clang. However this could fail when mainline kselftest is used on stable releases on test rings and so on, especially if they have older versions of gcc/clang. We will have to find a solution for this. Instead of deleting the local define, let's keep it under ifndef __cpuid_count /usr/lib/gcc/x86_64-linux-gnu/11/include/cpuid.h #define __cpuid_count(level, count, a, b, c, d) \ __asm__ __volatile__ ("cpuid\n\t" \ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \ : "0" (level), "2" (count)) thanks, -- Shuah ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] selftests: Remove duplicate CPUID wrappers 2022-02-07 18:00 ` Shuah Khan @ 2022-02-07 19:13 ` Reinette Chatre 0 siblings, 0 replies; 6+ messages in thread From: Reinette Chatre @ 2022-02-07 19:13 UTC (permalink / raw) To: Shuah Khan, shuah, linux-kselftest Cc: linux-kernel, Dave Hansen, Ram Pai, Sandipan Das, Florian Weimer, Desnes A. Nunes do Rosario, Ingo Molnar, Thiago Jung Bauermann, Michael Ellerman, Michal Suchanek, linux-mm, Chang S . Bae, Borislav Petkov, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Andy Lutomirski Hi Shuah, On 2/7/2022 10:00 AM, Shuah Khan wrote: > > This will work fine on newer versions of gcc/clang. However this could > fail when mainline kselftest is used on stable releases on test rings > and so on, especially if they have older versions of gcc/clang. Indeed. It thus seems that kselftest has a minimal required version for gcc/clang that is not the current mainline minimal version but the minimal version of the oldest supported stable kernel, which is v4.9. __cpuid_count() was added to gcc in commit: cb0dee885cb30b4e9beeef070cf000baa7d09abe and thus available since gcc 4.4. Looking at Documentation/Changes or later Documentation/process/changes.rst kernels v4.9 and v4.14 have the minimal required version of gcc of 3.2. So this change would encounter an issue if mainline kselftest is used to test a v4.9 or v4.14 kernel on a system that only supports its minimal gcc. Kernel v4.19 moved the gcc minimal required version to 4.6 that does contain this macro. There does not seem to be a minimum required version of clang/LLVM in v4.19. The first time I see a minimal version for Clang/LLVM for a stable kernel is in kernel v5.10 with Clang/LLVM minimal version 10.0.1 and from what I can tell the __cpuid_count() macro was added to Clang/LLVM in version 3.4.0 (commit 4dcb5dbb53ea4fbeab48bc6bc3c4d392361dabc1). > > We will have to find a solution for this. Instead of deleting the local > define, let's keep it under ifndef __cpuid_count > > /usr/lib/gcc/x86_64-linux-gnu/11/include/cpuid.h > > #define __cpuid_count(level, count, a, b, c, d) \ > __asm__ __volatile__ ("cpuid\n\t" \ > : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \ > : "0" (level), "2" (count)) > Will do. I see that gcc obtained the volatile qualifier in v11.1 so I can use the most recent macro as you have here. Reinette ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-07 19:13 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-02-04 19:17 [PATCH 0/3] selftests: Remove duplicate CPUID wrappers Reinette Chatre 2022-02-04 19:17 ` [PATCH 1/3] selftests/vm/pkeys: Use existing __cpuid_count() macro Reinette Chatre 2022-02-04 23:39 ` [PATCH 0/3] selftests: Remove duplicate CPUID wrappers Shuah Khan 2022-02-05 0:11 ` Reinette Chatre 2022-02-07 18:00 ` Shuah Khan 2022-02-07 19:13 ` Reinette Chatre
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).