In order to let all the APIs under <cpuid/api.h> have a shared "cpuid_"
namespace, rename native_cpuid() to cpuid_native().
Adjust all call-sites accordingly.
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
---
arch/x86/boot/compressed/sev.c | 6 +++---
arch/x86/include/asm/cpuid/api.h | 6 +++---
arch/x86/kernel/cpu/microcode/intel.c | 2 +-
arch/x86/kernel/cpu/microcode/internal.h | 4 ++--
arch/x86/kernel/paravirt.c | 2 +-
arch/x86/mm/mem_encrypt_identity.c | 6 +++---
arch/x86/xen/enlighten_pv.c | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c
index f054bf52c10a..4b617f8f9b7f 100644
--- a/arch/x86/boot/compressed/sev.c
+++ b/arch/x86/boot/compressed/sev.c
@@ -494,7 +494,7 @@ static int sev_check_cpu_support(void)
/* Check for the SME/SEV support leaf */
eax = 0x80000000;
ecx = 0;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
if (eax < 0x8000001f)
return -ENODEV;
@@ -508,7 +508,7 @@ static int sev_check_cpu_support(void)
*/
eax = 0x8000001f;
ecx = 0;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
/* Check whether SEV is supported */
if (!(eax & BIT(1)))
return -ENODEV;
@@ -666,7 +666,7 @@ bool early_is_sevsnp_guest(void)
*/
eax = 0x8000001f;
ecx = 0;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
if (eax & BIT(28)) {
struct msr m;
diff --git a/arch/x86/include/asm/cpuid/api.h b/arch/x86/include/asm/cpuid/api.h
index e957f09d8a8f..7f4644747649 100644
--- a/arch/x86/include/asm/cpuid/api.h
+++ b/arch/x86/include/asm/cpuid/api.h
@@ -22,7 +22,7 @@ static inline bool cpuid_feature(void)
}
#endif
-static inline void native_cpuid(u32 *eax, u32 *ebx,
+static inline void cpuid_native(u32 *eax, u32 *ebx,
u32 *ecx, u32 *edx)
{
/* ecx is often an input as well as an output. */
@@ -40,7 +40,7 @@ static inline u32 native_cpuid_##reg(u32 op) \
{ \
u32 eax = op, ebx, ecx = 0, edx; \
\
- native_cpuid(&eax, &ebx, &ecx, &edx); \
+ cpuid_native(&eax, &ebx, &ecx, &edx); \
\
return reg; \
}
@@ -56,7 +56,7 @@ NATIVE_CPUID_REG(edx)
#ifdef CONFIG_PARAVIRT_XXL
# include <asm/paravirt.h>
#else
-# define __cpuid native_cpuid
+# define __cpuid cpuid_native
#endif
/*
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 819199bc0119..66693831f665 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -347,7 +347,7 @@ static __init bool load_builtin_intel_microcode(struct cpio_data *cp)
if (IS_ENABLED(CONFIG_X86_32))
return false;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
sprintf(name, "intel-ucode/%02x-%02x-%02x",
x86_family(eax), x86_model(eax), x86_stepping(eax));
diff --git a/arch/x86/kernel/cpu/microcode/internal.h b/arch/x86/kernel/cpu/microcode/internal.h
index 5df621752fef..6049fd7ac16a 100644
--- a/arch/x86/kernel/cpu/microcode/internal.h
+++ b/arch/x86/kernel/cpu/microcode/internal.h
@@ -73,7 +73,7 @@ static inline int x86_cpuid_vendor(void)
u32 eax = 0x00000000;
u32 ebx, ecx = 0, edx;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
if (CPUID_IS(CPUID_INTEL1, CPUID_INTEL2, CPUID_INTEL3, ebx, ecx, edx))
return X86_VENDOR_INTEL;
@@ -89,7 +89,7 @@ static inline unsigned int x86_cpuid_family(void)
u32 eax = 0x00000001;
u32 ebx, ecx = 0, edx;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
return x86_family(eax);
}
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 1ccd05d8999f..e2c812beb06c 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -122,7 +122,7 @@ struct paravirt_patch_template pv_ops = {
.cpu.io_delay = native_io_delay,
#ifdef CONFIG_PARAVIRT_XXL
- .cpu.cpuid = native_cpuid,
+ .cpu.cpuid = cpuid_native,
.cpu.get_debugreg = pv_native_get_debugreg,
.cpu.set_debugreg = pv_native_set_debugreg,
.cpu.read_cr0 = native_read_cr0,
diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c
index 5eecdd92da10..6bad28dd8b07 100644
--- a/arch/x86/mm/mem_encrypt_identity.c
+++ b/arch/x86/mm/mem_encrypt_identity.c
@@ -501,7 +501,7 @@ void __head sme_enable(struct boot_params *bp)
/* Check for the SME/SEV support leaf */
eax = 0x80000000;
ecx = 0;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
if (eax < 0x8000001f)
return;
@@ -518,7 +518,7 @@ void __head sme_enable(struct boot_params *bp)
*/
eax = 0x8000001f;
ecx = 0;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
/* Check whether SEV or SME is supported */
if (!(eax & (AMD_SEV_BIT | AMD_SME_BIT)))
return;
@@ -552,7 +552,7 @@ void __head sme_enable(struct boot_params *bp)
*/
eax = 1;
ecx = 0;
- native_cpuid(&eax, &ebx, &ecx, &edx);
+ cpuid_native(&eax, &ebx, &ecx, &edx);
if (ecx & BIT(31))
return;
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index 21c7f524766e..d1a1a3546bd5 100644
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -327,7 +327,7 @@ static bool __init xen_check_mwait(void)
ax = 1;
cx = 0;
- native_cpuid(&ax, &bx, &cx, &dx);
+ cpuid_native(&ax, &bx, &cx, &dx);
mwait_mask = (1 << (X86_FEATURE_EST % 32)) |
(1 << (X86_FEATURE_MWAIT % 32));
@@ -344,7 +344,7 @@ static bool __init xen_check_mwait(void)
cx = 0;
dx = 0;
- native_cpuid(&ax, &bx, &cx, &dx);
+ cpuid_native(&ax, &bx, &cx, &dx);
/* Ask the Hypervisor whether to clear ACPI_PROC_CAP_C_C2C3_FFH. If so,
* don't expose MWAIT_LEAF and let ACPI pick the IOPORT version of C3.
--
2.49.0* Ahmed S. Darwish <darwi@linutronix.de> wrote: > In order to let all the APIs under <cpuid/api.h> have a shared "cpuid_" > namespace, rename native_cpuid() to cpuid_native(). > > Adjust all call-sites accordingly. > > Suggested-by: Ingo Molnar <mingo@kernel.org> > Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de> > --- > arch/x86/boot/compressed/sev.c | 6 +++--- > arch/x86/include/asm/cpuid/api.h | 6 +++--- > arch/x86/kernel/cpu/microcode/intel.c | 2 +- > arch/x86/kernel/cpu/microcode/internal.h | 4 ++-- > arch/x86/kernel/paravirt.c | 2 +- > arch/x86/mm/mem_encrypt_identity.c | 6 +++--- > arch/x86/xen/enlighten_pv.c | 4 ++-- > 7 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c > index f054bf52c10a..4b617f8f9b7f 100644 > --- a/arch/x86/boot/compressed/sev.c > +++ b/arch/x86/boot/compressed/sev.c > @@ -494,7 +494,7 @@ static int sev_check_cpu_support(void) > /* Check for the SME/SEV support leaf */ > eax = 0x80000000; > ecx = 0; > - native_cpuid(&eax, &ebx, &ecx, &edx); > + cpuid_native(&eax, &ebx, &ecx, &edx); > if (eax < 0x8000001f) > return -ENODEV; I'm torn about this one. native_*() is a pretty generic way to denote baremetal methods, all around the x86 tree: starship:~/tip> git grep -E '\<native_' arch/x86/ | wc -l 682 Likewise for: native_cpuid_eax() native_cpuid_ebx() native_cpuid_ecx() native_cpuid_edx() I think it might be better to leave these as native_cpuid_*, because shifting a naming inconsistency into another namespace isn't really a net improvement. 'git grep cpuid_eax' will still give meaningful results, so greppability of cpuid_ APIs only suffers somewhat. The for_each_cpuid_ methods are already outliers. There's always a bigger fish^W prefix. ;-) Thanks, Ingo
On Thu, 15 May 2025, Ingo Molnar wrote:
>
> * Ahmed S. Darwish <darwi@linutronix.de> wrote:
> >
> > diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c
> > index f054bf52c10a..4b617f8f9b7f 100644
> > --- a/arch/x86/boot/compressed/sev.c
> > +++ b/arch/x86/boot/compressed/sev.c
> > @@ -494,7 +494,7 @@ static int sev_check_cpu_support(void)
> > /* Check for the SME/SEV support leaf */
> > eax = 0x80000000;
> > ecx = 0;
> > - native_cpuid(&eax, &ebx, &ecx, &edx);
> > + cpuid_native(&eax, &ebx, &ecx, &edx);
> > if (eax < 0x8000001f)
> > return -ENODEV;
>
> I'm torn about this one.
>
> native_*() is a pretty generic way to denote baremetal methods, all
> around the x86 tree:
>
> starship:~/tip> git grep -E '\<native_' arch/x86/ | wc -l
> 682
...
>
> I think it might be better to leave these as native_cpuid_*, because
> shifting a naming inconsistency into another namespace isn't really a
> net improvement.
>
Yeah, I admit I was a little bit uncomfortable about this one, especially
when modifying a call-site like:
=> arch/x86/kernel/paravirt.c:
struct paravirt_patch_template pv_ops = {
.cpu.io_delay = native_io_delay,
.cpu.cpuid = cpuid_native, // stands out
.cpu.read_cr0 = native_read_cr0,
.cpu.write_cr0 = native_write_cr0,
.cpu.write_cr4 = native_write_cr4,
.cpu.read_msr = native_read_msr,
...
};
So, indeed, ACK.
Thanks!
~ Ahmed
© 2016 - 2025 Red Hat, Inc.