[PATCH v3 1/1] x86/cpu: Make sure flag_is_changeable_p() is always being used

[PATCH v3 1/1] x86/cpu: Make sure flag_is_changeable_p() is always being used

[Andy Shevchenko]

When flag_is_changeable_p() is unused, it prevents kernel builds
with clang, `make W=1` and CONFIG_WERROR=y:

arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
  351 | static inline int flag_is_changeable_p(u32 flag)
      |                   ^~~~~~~~~~~~~~~~~~~~

Fix this by moving core around to make sure flag_is_changeable_p() is
always being used.

See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static
inline functions for W=1 build").

Suggested-by: Dave Hansen <dave.hansen@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---

v3: rewritten as suggested (Dave)
v2: marked both 32- and 64-bit cases

 arch/x86/kernel/cpu/common.c | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d4e539d4e158..5525afa6e888 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -275,22 +275,14 @@ static int __init x86_noinvpcid_setup(char *s)
 }
 early_param("noinvpcid", x86_noinvpcid_setup);
 
-#ifdef CONFIG_X86_32
-static int cachesize_override = -1;
-static int disable_x86_serial_nr = 1;
-
-static int __init cachesize_setup(char *str)
-{
-	get_option(&str, &cachesize_override);
-	return 1;
-}
-__setup("cachesize=", cachesize_setup);
-
 /* Standard macro to see if a specific flag is changeable */
 static inline int flag_is_changeable_p(u32 flag)
 {
 	u32 f1, f2;
 
+	if (!IS_ENABLED(CONFIG_X86_32))
+		return 1;
+
 	/*
 	 * Cyrix and IDT cpus allow disabling of CPUID
 	 * so the code below may return different results
@@ -315,6 +307,17 @@ static inline int flag_is_changeable_p(u32 flag)
 	return ((f1^f2) & flag) != 0;
 }
 
+#ifdef CONFIG_X86_32
+static int cachesize_override = -1;
+static int disable_x86_serial_nr = 1;
+
+static int __init cachesize_setup(char *str)
+{
+	get_option(&str, &cachesize_override);
+	return 1;
+}
+__setup("cachesize=", cachesize_setup);
+
 /* Probe for the CPUID instruction */
 int have_cpuid_p(void)
 {
@@ -348,10 +351,6 @@ static int __init x86_serial_nr_setup(char *s)
 }
 __setup("serialnumber", x86_serial_nr_setup);
 #else
-static inline int flag_is_changeable_p(u32 flag)
-{
-	return 1;
-}
 static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
 {
 }
@@ -1087,7 +1086,6 @@ void get_cpu_address_sizes(struct cpuinfo_x86 *c)
 
 static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_X86_32
 	int i;
 
 	/*
@@ -1108,7 +1106,6 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
 				break;
 			}
 		}
-#endif
 }
 
 #define NO_SPECULATION		BIT(0)
-- 
2.43.0.rc1.1336.g36b5255a03ac

Re: [PATCH v3 1/1] x86/cpu: Make sure flag_is_changeable_p() is always being used

[Andy Shevchenko]

On Tue, Sep 10, 2024 at 11:42:42AM +0300, Andy Shevchenko wrote:
> When flag_is_changeable_p() is unused, it prevents kernel builds
> with clang, `make W=1` and CONFIG_WERROR=y:
> 
> arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
>   351 | static inline int flag_is_changeable_p(u32 flag)
>       |                   ^~~~~~~~~~~~~~~~~~~~
> 
> Fix this by moving core around to make sure flag_is_changeable_p() is
> always being used.
> 
> See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static
> inline functions for W=1 build").

Any comments on this? Can it be applied?

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v3 1/1] x86/cpu: Make sure flag_is_changeable_p() is always being used

[H. Peter Anvin]

On November 8, 2024 10:29:02 AM GMT+01:00, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
>On Tue, Sep 10, 2024 at 11:42:42AM +0300, Andy Shevchenko wrote:
>> When flag_is_changeable_p() is unused, it prevents kernel builds
>> with clang, `make W=1` and CONFIG_WERROR=y:
>> 
>> arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
>>   351 | static inline int flag_is_changeable_p(u32 flag)
>>       |                   ^~~~~~~~~~~~~~~~~~~~
>> 
>> Fix this by moving core around to make sure flag_is_changeable_p() is
>> always being used.
>> 
>> See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static
>> inline functions for W=1 build").
>
>Any comments on this? Can it be applied?
>

Incidentally, this really should be "unsigned long" rather than u32, although I believe it is only used on 32 bits.

Re: [PATCH v3 1/1] x86/cpu: Make sure flag_is_changeable_p() is always being used

[Andy Shevchenko]

On Fri, Nov 08, 2024 at 12:50:49PM +0100, H. Peter Anvin wrote:
> On November 8, 2024 10:29:02 AM GMT+01:00, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> >On Tue, Sep 10, 2024 at 11:42:42AM +0300, Andy Shevchenko wrote:
> >> When flag_is_changeable_p() is unused, it prevents kernel builds
> >> with clang, `make W=1` and CONFIG_WERROR=y:
> >> 
> >> arch/x86/kernel/cpu/common.c:351:19: error: unused function 'flag_is_changeable_p' [-Werror,-Wunused-function]
> >>   351 | static inline int flag_is_changeable_p(u32 flag)
> >>       |                   ^~~~~~~~~~~~~~~~~~~~
> >> 
> >> Fix this by moving core around to make sure flag_is_changeable_p() is
> >> always being used.
> >> 
> >> See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static
> >> inline functions for W=1 build").
> >
> >Any comments on this? Can it be applied?
> 
> Incidentally, this really should be "unsigned long" rather than u32, although
> I believe it is only used on 32 bits.

I can fix this in v4, does it warrant your Rb / Ack?

-- 
With Best Regards,
Andy Shevchenko