lockdep: Mark chain_hlock_class_idx() with __maybe_unused
PATCH 1/1 lockdep: Mark chain_hlock_class_idx() with __maybe_unused
When chain_hlock_class_idx() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]
Fix this by marking it with __maybe_unused.
See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").
--- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/locking/lockdep.c +1 -1
@@ -432,7 +432,7 @@ static inline u16 hlock_id(struct held_lock *hlock)return (hlock->class_idx | (hlock->read <<MAX_LOCKDEP_KEYS_BITS )); } -static inline unsigned int chain_hlock_class_idx (u16 hlock_id) +static inline __maybe_unused unsigned int chain_hlock_class_idx (u16 hlock_id) {return hlock_id & (MAX_LOCKDEP_KEYS -1 ); }
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Hi Andy,
Quoted 11 lines · Andy Shevchenko
When
chain_hlock_class_idx()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]Fix this by marking it with
__maybe_unused.See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").Signed-off-by Andy Shevchenko <[email protected]>
This looks fine to me, so I'm going to queue it, but could you do me favor if you could share the exact configs that would make chain_hlock_class_idx() an unused fuction in kernel/locking/lockdep.c ?
I might add these information in commit log.
Thanks!
Regards,
Boqun
Quoted 20 lines
--- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/locking/lockdep.c +1
-1@@ -432,7 +432,7 @@ static inline u16 hlock_id(struct held_lock *hlock)return (hlock->class_idx | (hlock->read <<MAX_LOCKDEP_KEYS_BITS )); } -static inline unsigned int chain_hlock_class_idx (u16 hlock_id) +static inline __maybe_unused unsigned int chain_hlock_class_idx (u16 hlock_id) {return hlock_id & (MAX_LOCKDEP_KEYS -1 ); }Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Quoted 8 lines · Boqun Feng
Quoted 7 lines · Andy Shevchenko
When
chain_hlock_class_idx()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]Fix this by marking it with
__maybe_unused.
Quoted 8 lines
Quoted 4 lines
See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").Signed-off-by Andy Shevchenko <[email protected]>This looks fine to me, so I'm going to queue it, but could you do me favor if you could share the exact configs that would make
chain_hlock_class_idx()an unused fuction inkernel/locking/lockdep.c?
I might harvest this when I come from vacations (some around mid-January).
Quoted 1 line
I might add these information in commit log.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Boqun Feng
Quoted 10 lines · Andy Shevchenko
When
chain_hlock_class_idx()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]Fix this by marking it with
__maybe_unused.See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>This looks fine to me, so I'm going to queue it, but could you do me favor if you could share the exact configs that would make
chain_hlock_class_idx()an unused fuction inkernel/locking/lockdep.c?I might harvest this when I come from vacations (some around mid-January).
After some investigation myself, it turns out that chain_hlock_class_idx() is defined outside "#ifdef CONFIG_PROVING_LOCK", but only used under CONFIG_PROVING_LOCK=y, hence the unused warning.
TBH, I feel we should really clean-up/consolidate those "#ifdef" to make internal definition/usage more clear. But nothing blocks this patch, it fixes a real issue, I will add the CONFIG_PROVING_LOCK part in the commit log. Thanks!
Regards,
Boqun
Quoted 8 lines
Quoted 1 line
I might add these information in commit log.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 21 lines · Boqun Feng
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Boqun Feng
Quoted 10 lines · Andy Shevchenko
When
chain_hlock_class_idx()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]Fix this by marking it with
__maybe_unused.See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>This looks fine to me, so I'm going to queue it, but could you do me favor if you could share the exact configs that would make
chain_hlock_class_idx()an unused fuction inkernel/locking/lockdep.c?I might harvest this when I come from vacations (some around mid-January).
Quoted 8 lines
After some investigation myself, it turns out that
chain_hlock_class_idx()is defined outside "#ifdefCONFIG_PROVING_LOCK", but only used underCONFIG_PROVING_LOCK=y, hence the unused warning.TBH, I feel we should really clean-up/consolidate those "#ifdef" to make internal definition/usage more clear. But nothing blocks this patch, it fixes a real issue, I will add the
CONFIG_PROVING_LOCKpart in the commit log. Thanks!
I take this as no AR from me needed anymore, tell me if it's not the case. Thanks!
Quoted 1 line
Quoted 1 line
Quoted 1 line
I might add these information in commit log.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 22 lines · Boqun Feng
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Boqun Feng
Quoted 10 lines · Andy Shevchenko
When
chain_hlock_class_idx()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]Fix this by marking it with
__maybe_unused.See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>This looks fine to me, so I'm going to queue it, but could you do me favor if you could share the exact configs that would make
chain_hlock_class_idx()an unused fuction inkernel/locking/lockdep.c?I might harvest this when I come from vacations (some around mid-January).
Quoted 8 lines
After some investigation myself, it turns out that
chain_hlock_class_idx()is defined outside "#ifdefCONFIG_PROVING_LOCK", but only used underCONFIG_PROVING_LOCK=y, hence the unused warning.TBH, I feel we should really clean-up/consolidate those "#ifdef" to make internal definition/usage more clear. But nothing blocks this patch, it fixes a real issue, I will add the
CONFIG_PROVING_LOCKpart in the commit log. Thanks!
So now that we have:
343060092585 lockdep: Move lockdep_assert_locked() under #ifdef CONFIG_PROVE_LOCKING
Do we really need:
8148fa2e022b lockdep: Mark chain_hlock_class_idx() with __maybe_unused
As it would hide the problem fixed by 343060092585?
__maybe_unused annotations are almost always canaries of something messy being hidden.
Thanks,
Ingo
Quoted 36 lines · Ingo Molnar
Quoted 22 lines · Boqun Feng
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Boqun Feng
Quoted 10 lines · Andy Shevchenko
When
chain_hlock_class_idx()is unused, it prevents kernel builds with clang,make W=1andCONFIG_WERROR=y:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]Fix this by marking it with
__maybe_unused.See also commit
6863f5643dd7("kbuild: allow Clang to find unused static inline functions for W=1 build").Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Andy Shevchenko <[email protected]>This looks fine to me, so I'm going to queue it, but could you do me favor if you could share the exact configs that would make
chain_hlock_class_idx()an unused fuction inkernel/locking/lockdep.c?I might harvest this when I come from vacations (some around mid-January).
Quoted 8 lines
After some investigation myself, it turns out that
chain_hlock_class_idx()is defined outside "#ifdefCONFIG_PROVING_LOCK", but only used underCONFIG_PROVING_LOCK=y, hence the unused warning.TBH, I feel we should really clean-up/consolidate those "#ifdef" to make internal definition/usage more clear. But nothing blocks this patch, it fixes a real issue, I will add the
CONFIG_PROVING_LOCKpart in the commit log. Thanks!So now that we have:
Quoted 8 lines
343060092585 lockdep: Move
lockdep_assert_locked()under #ifdefCONFIG_PROVE_LOCKINGDo we really need:
8148fa2e022blockdep: Markchain_hlock_class_idx()with__maybe_unusedAs it would hide the problem fixed by 343060092585?
These two commits fix different functions, so they are both needed. Though, we could probably regroup the functions into one big #ifdef block so that we won't need the __maybe_unused annotations.
I will take a look.
Regards,
Boqun
Quoted 6 lines
__maybe_unusedannotations are almost always canaries of something messy being hidden.Thanks,
Ingo
The following commit has been merged into the locking/core branch of tip:
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 8148fa2e022bae29f21bb9a2c4cc796334fd372b Gitweb: https://git.kernel.org/tip/8148fa2e022bae29f21bb9a2c4cc796334fd372b Author: Andy Shevchenko <[email protected]> AuthorDate: Mon, 09 Dec 2024 19:08:10 +02:00 Committer: Boqun Feng <[email protected]> CommitterDate: Thu, 19 Dec 2024 13:57:53 -08:00
lockdep: Mark chain_hlock_class_idx() with __maybe_unused
When chain_hlock_class_idx() is unused, it prevents kernel builds with clang, make W=1 and CONFIG_WERROR=y, CONFIG_LOCKDEP=y and CONFIG_PROVE_LOCKING=n:
kernel/locking/lockdep.c:435:28: error: unused function 'chain_hlock_class_idx' [-Werror,-Wunused-function]
Fix this by marking it with __maybe_unused.
See also commit 6863f5643dd7 ("kbuild: allow Clang to find unused static inline functions for W=1 build").
[Boqun: add more config information of the error]
--- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/locking/lockdep.c +1 -1
@@ -430,7 +430,7 @@ static inline u16 hlock_id(struct held_lock *hlock)return (hlock->class_idx | (hlock->read <<MAX_LOCKDEP_KEYS_BITS )); } -static inline unsigned int chain_hlock_class_idx (u16 hlock_id) +static inline __maybe_unused unsigned int chain_hlock_class_idx (u16 hlock_id) {return hlock_id & (MAX_LOCKDEP_KEYS -1 ); }