Skip to contentSkip to conversation

sched/fair: Mark some static const with __maybe_unused

PATCH In review Andy Shevchenko 3 participants 4 messages Apr 4, 2025 – Apr 6, 2025 Locking primitives

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched/fair: Mark some static const with __maybe_unused

GCC considers that some static const defined in the lockdep_internals.h are unused, which prevents make W=1 and CONFIG_WERROR=y builds:

kernel/locking/lockdep_internals.h:69:28: error: ‘LOCKF_USED_IN_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
69 | static const unsigned long LOCKF_USED_IN_IRQ_READ =

      |                            ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:63:28: error: ‘LOCKF_ENABLED_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
   63 | static const unsigned long LOCKF_ENABLED_IRQ_READ =
      |                            ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:57:28: error: ‘LOCKF_USED_IN_IRQ’ defined but not used [-Werror=unused-const-variable=]
   57 | static const unsigned long LOCKF_USED_IN_IRQ =
      |                            ^~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:51:28: error: ‘LOCKF_ENABLED_IRQ’ defined but not used [-Werror=unused-const-variable=]
   51 | static const unsigned long LOCKF_ENABLED_IRQ =
      |                            ^~~~~~~~~~~~~~~~~

Fix this by marking them with __maybe_unused.

---
 kernel/locking/lockdep_internals.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/locking/lockdep_internals.h +4 -4
index 20f9ef58d3d0..82e71335f367 100644
@@ -48,25 +48,25 @@ enum {
 };
 
 #define LOCKDEP_STATE(__STATE)	LOCKF_ENABLED_##__STATE |
-static const unsigned long LOCKF_ENABLED_IRQ =
+static __maybe_unused const unsigned long LOCKF_ENABLED_IRQ =
 #include "lockdep_states.h"
 	0;
 #undef LOCKDEP_STATE
 
 #define LOCKDEP_STATE(__STATE)	LOCKF_USED_IN_##__STATE |
-static const unsigned long LOCKF_USED_IN_IRQ =
+static __maybe_unused const unsigned long LOCKF_USED_IN_IRQ =
 #include "lockdep_states.h"
 	0;
 #undef LOCKDEP_STATE
 
 #define LOCKDEP_STATE(__STATE)	LOCKF_ENABLED_##__STATE##_READ |
-static const unsigned long LOCKF_ENABLED_IRQ_READ =
+static __maybe_unused const unsigned long LOCKF_ENABLED_IRQ_READ =
 #include "lockdep_states.h"
 	0;
 #undef LOCKDEP_STATE
 
 #define LOCKDEP_STATE(__STATE)	LOCKF_USED_IN_##__STATE##_READ |
-static const unsigned long LOCKF_USED_IN_IRQ_READ =
+static __maybe_unused const unsigned long LOCKF_USED_IN_IRQ_READ =
 #include "lockdep_states.h"
 	0;
 #undef LOCKDEP_STATE
Signature · 1 line
2.47.2
#1 lore raw
Quoted 16 lines · Andy Shevchenko

GCC considers that some static const defined in the lockdep_internals.h are unused, which prevents make W=1 and CONFIG_WERROR=y builds:

kernel/locking/lockdep_internals.h:69:28: error: ‘LOCKF_USED_IN_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
69 | static const unsigned long LOCKF_USED_IN_IRQ_READ =
| ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:63:28: error: ‘LOCKF_ENABLED_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
63 | static const unsigned long LOCKF_ENABLED_IRQ_READ =
| ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:57:28: error: ‘LOCKF_USED_IN_IRQ’ defined but not used [-Werror=unused-const-variable=]
57 | static const unsigned long LOCKF_USED_IN_IRQ =
| ^~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:51:28: error: ‘LOCKF_ENABLED_IRQ’ defined but not used [-Werror=unused-const-variable=]
51 | static const unsigned long LOCKF_ENABLED_IRQ =
| ^~~~~~~~~~~~~~~~~

Quoted 1 line

Fix this by marking them with __maybe_unused.

The code changes look good, but the "sched/fair" heading is misleading. It is not related to scheduler at all, it should be "locking/lockdep" or just "lockdep".

Cheers,
Longman

Quoted 40 lines
---
  kernel/locking/lockdep_internals.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
kernel/locking/lockdep_internals.h +4 -4
index 20f9ef58d3d0..82e71335f367 100644
@@ -48,25 +48,25 @@ enum {
  };
 
  #define LOCKDEP_STATE(__STATE)	LOCKF_ENABLED_##__STATE |
-static const unsigned long LOCKF_ENABLED_IRQ =
+static __maybe_unused const unsigned long LOCKF_ENABLED_IRQ =
  #include "lockdep_states.h"
  	0;
  #undef LOCKDEP_STATE
 
  #define LOCKDEP_STATE(__STATE)	LOCKF_USED_IN_##__STATE |
-static const unsigned long LOCKF_USED_IN_IRQ =
+static __maybe_unused const unsigned long LOCKF_USED_IN_IRQ =
  #include "lockdep_states.h"
  	0;
  #undef LOCKDEP_STATE
 
  #define LOCKDEP_STATE(__STATE)	LOCKF_ENABLED_##__STATE##_READ |
-static const unsigned long LOCKF_ENABLED_IRQ_READ =
+static __maybe_unused const unsigned long LOCKF_ENABLED_IRQ_READ =
  #include "lockdep_states.h"
  	0;
  #undef LOCKDEP_STATE
 
  #define LOCKDEP_STATE(__STATE)	LOCKF_USED_IN_##__STATE##_READ |
-static const unsigned long LOCKF_USED_IN_IRQ_READ =
+static __maybe_unused const unsigned long LOCKF_USED_IN_IRQ_READ =
  #include "lockdep_states.h"
  	0;
  #undef LOCKDEP_STATE
#2 lore raw
In reply to Andy Shevchenko
Quoted 22 lines · Andy Shevchenko

GCC considers that some static const defined in the lockdep_internals.h are unused, which prevents make W=1 and CONFIG_WERROR=y builds:

kernel/locking/lockdep_internals.h:69:28: error:
‘LOCKF_USED_IN_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
69 | static const unsigned long LOCKF_USED_IN_IRQ_READ =

      |                            ^~~~~~~~~~~~~~~~~~~~~~

kernel/locking/lockdep_internals.h:63:28: error:
‘LOCKF_ENABLED_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
63 | static const unsigned long LOCKF_ENABLED_IRQ_READ =

      |                            ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:57:28: error: ‘LOCKF_USED_IN_IRQ’ 
defined but not used [-Werror=unused-const-variable=]
   57 | static const unsigned long LOCKF_USED_IN_IRQ =
      |                            ^~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:51:28: error: ‘LOCKF_ENABLED_IRQ’ 
defined but not used [-Werror=unused-const-variable=]
   51 | static const unsigned long LOCKF_ENABLED_IRQ =
      |                            ^~~~~~~~~~~~~~~~~
Quoted 3 lines

Fix this by marking them with __maybe_unused.

I posted as different patch for this a while ago:

https://lore.kernel.org/lkml/[email protected]/

Either of the two should be fine here, though I still like my version a bit better.

Arnd

#3 lore raw
Quoted 25 lines · Arnd Bergmann
Quoted 24 lines · Andy Shevchenko

GCC considers that some static const defined in the lockdep_internals.h are unused, which prevents make W=1 and CONFIG_WERROR=y builds:

kernel/locking/lockdep_internals.h:69:28: error:
‘LOCKF_USED_IN_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
69 | static const unsigned long LOCKF_USED_IN_IRQ_READ =

      |                            ^~~~~~~~~~~~~~~~~~~~~~

kernel/locking/lockdep_internals.h:63:28: error:
‘LOCKF_ENABLED_IRQ_READ’ defined but not used [-Werror=unused-const-variable=]
63 | static const unsigned long LOCKF_ENABLED_IRQ_READ =

      |                            ^~~~~~~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:57:28: error: ‘LOCKF_USED_IN_IRQ’ 
defined but not used [-Werror=unused-const-variable=]
   57 | static const unsigned long LOCKF_USED_IN_IRQ =
      |                            ^~~~~~~~~~~~~~~~~
kernel/locking/lockdep_internals.h:51:28: error: ‘LOCKF_ENABLED_IRQ’ 
defined but not used [-Werror=unused-const-variable=]
   51 | static const unsigned long LOCKF_ENABLED_IRQ =
      |                            ^~~~~~~~~~~~~~~~~

Fix this by marking them with __maybe_unused.

Quoted 8 lines
Quoted 1 line

I posted as different patch for this a while ago:

https://lore.kernel.org/lkml/[email protected]/

Either of the two should be fine here, though I still like my version a bit better.

I'm not a fan of __maybe_unused, I just didn't come up with better idea, you did. So, I also prefer your version. Can anybody apply that patch from Arnd, please?

Signature · 2 lines
With Best Regards,
Andy Shevchenko