locking/rwsem: Move is_rwsem_reader_owned() and rwsem_owner() under CONFIG_DEBUG_RWSEMS
Waiman Long
reviewerPATCH 1/1 locking/rwsem: Move is_rwsem_reader_owned() and rwsem_owner() under CONFIG_DEBUG_RWSEMS
Both is_rwsem_reader_owned() and rwsem_owner() are currently only used when CONFIG_DEBUG_RWSEMS is defined. This causes a compilation error with clang when make W=1 and CONFIG_WERROR=y:
kernel/locking/rwsem.c:187:20: error: unused function 'is_rwsem_reader_owned' [-Werror,-Wunused-function]
187 | static inline bool is_rwsem_reader_owned(struct rw_semaphore *sem)
| ^~~~~~~~~~~~~~~~~~~~~
kernel/locking/rwsem.c:271:35: error: unused function 'rwsem_owner' [-Werror,-Wunused-function]
271 | static inline struct task_struct *rwsem_owner(struct rw_semaphore *sem)
| ^~~~~~~~~~~Fix this by moving these two functions under the CONFIG_DEBUG_RWSEMS define.
--- kernel/locking/rwsem.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
kernel/locking/rwsem.c +10 -12
@@ -181,12 +181,21 @@ static inline void rwsem_set_reader_owned(struct rw_semaphore *sem)__rwsem_set_reader_owned (sem, current); } +#ifdef CONFIG_DEBUG_RWSEMS +/* +* Return just the real task structure pointer of the owner +*/ +static inline struct task_struct *rwsem_owner (struct rw_semaphore *sem) +{ +return (struct task_struct *) + (atomic_long_read (&sem->owner) & ~RWSEM_OWNER_FLAGS_MASK ); +} +/* * Return true if the rwsem is owned by a reader. */ static inline bool is_rwsem_reader_owned (struct rw_semaphore *sem) { -#ifdef CONFIG_DEBUG_RWSEMS /* * Check the count to see if it is write-locked. */
@@ -194,11 +203,9 @@ static inline bool is_rwsem_reader_owned(struct rw_semaphore *sem)if (count &RWSEM_WRITER_MASK )return false; -#endif return rwsem_test_oflags (sem,RWSEM_READER_OWNED ); } -#ifdef CONFIG_DEBUG_RWSEMS /* * With CONFIG_DEBUG_RWSEMS configured, it will make sure that if there * is a task pointer in owner of a reader-owned rwsem, it will be the
@@ -265,15 +272,6 @@ static inline bool rwsem_write_trylock(struct rw_semaphore *sem)return false; } -/* -* Return just the real task structure pointer of the owner -*/ -static inline struct task_struct *rwsem_owner (struct rw_semaphore *sem) -{ -return (struct task_struct *) - (atomic_long_read (&sem->owner) & ~RWSEM_OWNER_FLAGS_MASK ); -} -/* * Return the real task structure pointer of the owner and the embedded * flags in the owner. pflags must be non-NULL.
Signature · 1 line
2.43.5
Quoted 4 lines · Waiman Long
Both
is_rwsem_reader_owned()andrwsem_owner()are currently only used whenCONFIG_DEBUG_RWSEMSis defined. This causes a compilation error with clang whenmake W=1andCONFIG_WERROR=y:
Quoted 8 lines
kernel/locking/rwsem.c:187:20: error: unused function 'is_rwsem_reader_owned' [-Werror,-Wunused-function]
187 | static inline boolis_rwsem_reader_owned(struct rw_semaphore *sem)| ^~~~~~~~~~~~~~~~~~~~~ kernel/locking/rwsem.c:271:35: error: unused function 'rwsem_owner' [-Werror,-Wunused-function] 271 | static inline struct task_struct *rwsem_owner(struct rw_semaphore *sem) | ^~~~~~~~~~~Fix this by moving these two functions under the
CONFIG_DEBUG_RWSEMSdefine.
At least this solves my issue,
Thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Andy Shevchenko
Tested-byQuoted 12 lines · Andy Shevchenko
Quoted 11 lines · Waiman Long
Both
is_rwsem_reader_owned()andrwsem_owner()are currently only used whenCONFIG_DEBUG_RWSEMSis defined. This causes a compilation error with clang whenmake W=1andCONFIG_WERROR=y:
kernel/locking/rwsem.c:187:20: error: unused function 'is_rwsem_reader_owned' [-Werror,-Wunused-function]
187 | static inline boolis_rwsem_reader_owned(struct rw_semaphore *sem)| ^~~~~~~~~~~~~~~~~~~~~ kernel/locking/rwsem.c:271:35: error: unused function 'rwsem_owner' [-Werror,-Wunused-function] 271 | static inline struct task_struct *rwsem_owner(struct rw_semaphore *sem) | ^~~~~~~~~~~
Quoted 4 lines
Quoted 1 line
Fix this by moving these two functions under the
CONFIG_DEBUG_RWSEMSdefine.At least this solves my issue,
Reviewed-by Andy Shevchenko <[email protected]>
...and
Signature · 2 lines
With Best Regards, Andy Shevchenko
Waiman Long
reviewerQuoted 13 lines · Andy Shevchenko
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Waiman Long
Both
is_rwsem_reader_owned()andrwsem_owner()are currently only used whenCONFIG_DEBUG_RWSEMSis defined. This causes a compilation error with clang whenmake W=1andCONFIG_WERROR=y:
kernel/locking/rwsem.c:187:20: error: unused function 'is_rwsem_reader_owned' [-Werror,-Wunused-function]
187 | static inline boolis_rwsem_reader_owned(struct rw_semaphore *sem)| ^~~~~~~~~~~~~~~~~~~~~ kernel/locking/rwsem.c:271:35: error: unused function 'rwsem_owner' [-Werror,-Wunused-function] 271 | static inline struct task_struct *rwsem_owner(struct rw_semaphore *sem) | ^~~~~~~~~~~
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Fix this by moving these two functions under the
CONFIG_DEBUG_RWSEMSdefine.At least this solves my issue,
Reviewed-by Andy Shevchenko <[email protected]>...and
Tested-by Andy Shevchenko <[email protected]>
Thanks for the testing.
No functional change is intended for this patch. Ingo & Peter, can this patch lands in v6.12 or has to wait until v6.13?
Thanks,
Longman
Quoted 17 lines · Waiman Long
Quoted 16 lines · Andy Shevchenko
Quoted 15 lines · Andy Shevchenko
Quoted 4 lines · Waiman Long
Both
is_rwsem_reader_owned()andrwsem_owner()are currently only used whenCONFIG_DEBUG_RWSEMSis defined. This causes a compilation error with clang whenmake W=1andCONFIG_WERROR=y:Quoted 8 lines
kernel/locking/rwsem.c:187:20: error: unused function 'is_rwsem_reader_owned' [-Werror,-Wunused-function]
187 | static inline boolis_rwsem_reader_owned(struct rw_semaphore *sem)| ^~~~~~~~~~~~~~~~~~~~~ kernel/locking/rwsem.c:271:35: error: unused function 'rwsem_owner' [-Werror,-Wunused-function] 271 | static inline struct task_struct *rwsem_owner(struct rw_semaphore *sem) | ^~~~~~~~~~~Fix this by moving these two functions under the
CONFIG_DEBUG_RWSEMSdefine.At least this solves my issue,
Reviewed-by Andy Shevchenko <[email protected]>
Quoted 8 lines
Quoted 3 lines
...and
Tested-by Andy Shevchenko <[email protected]>Thanks for the testing.
No functional change is intended for this patch. Ingo & Peter, can this patch lands in v6.12 or has to wait until v6.13?
I see it already in PeterZ's tree.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Waiman Long
reviewerQuoted 18 lines · Andy Shevchenko
Quoted 17 lines · Waiman Long
Quoted 16 lines · Andy Shevchenko
Quoted 15 lines · Andy Shevchenko
Quoted 4 lines · Waiman Long
Both
is_rwsem_reader_owned()andrwsem_owner()are currently only used whenCONFIG_DEBUG_RWSEMSis defined. This causes a compilation error with clang whenmake W=1andCONFIG_WERROR=y:Quoted 8 lines
kernel/locking/rwsem.c:187:20: error: unused function 'is_rwsem_reader_owned' [-Werror,-Wunused-function]
187 | static inline boolis_rwsem_reader_owned(struct rw_semaphore *sem)
| ^~~~~~~~~~~~~~~~~~~~~kernel/locking/rwsem.c:271:35: error: unused function 'rwsem_owner' [-Werror,-Wunused-function]
271 | static inline structtask_struct*rwsem_owner(structrw_semaphore*sem)
| ^~~~~~~~~~~Fix this by moving these two functions under the
CONFIG_DEBUG_RWSEMSdefine.At least this solves my issue,
Reviewed-by Andy Shevchenko <[email protected]>
Quoted 9 lines
Quoted 7 lines
Quoted 3 lines
...and
Tested-by Andy Shevchenko <[email protected]>Thanks for the testing.
No functional change is intended for this patch. Ingo & Peter, can this patch lands in v6.12 or has to wait until v6.13?
I see it already in PeterZ's tree.
Right. It is in PeterZ's tree. I didn't check his tree that often. Thanks for letting me know.
Cheers,
Longman
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: d00b83d416e73bc3fa4d21b14bec920e88b70ce6 Gitweb: https://git.kernel.org/tip/d00b83d416e73bc3fa4d21b14bec920e88b70ce6 Author: Waiman Long <[email protected]> AuthorDate: Mon, 09 Sep 2024 14:29:05 -04:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 10 Sep 2024 12:02:33 +02:00
locking/rwsem: Move is_rwsem_reader_owned() and rwsem_owner() under CONFIG_DEBUG_RWSEMS
Both is_rwsem_reader_owned() and rwsem_owner() are currently only used when CONFIG_DEBUG_RWSEMS is defined. This causes a compilation error with clang when make W=1 and CONFIG_WERROR=y:
kernel/locking/rwsem.c:187:20: error: unused function 'is_rwsem_reader_owned' [-Werror,-Wunused-function]
187 | static inline bool is_rwsem_reader_owned(struct rw_semaphore *sem)
| ^~~~~~~~~~~~~~~~~~~~~
kernel/locking/rwsem.c:271:35: error: unused function 'rwsem_owner' [-Werror,-Wunused-function]
271 | static inline struct task_struct *rwsem_owner(struct rw_semaphore *sem)
| ^~~~~~~~~~~Fix this by moving these two functions under the CONFIG_DEBUG_RWSEMS define.
--- kernel/locking/rwsem.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
kernel/locking/rwsem.c +10 -12
@@ -181,12 +181,21 @@ static inline void rwsem_set_reader_owned(struct rw_semaphore *sem)__rwsem_set_reader_owned (sem, current); } +#ifdef CONFIG_DEBUG_RWSEMS +/* +* Return just the real task structure pointer of the owner +*/ +static inline struct task_struct *rwsem_owner (struct rw_semaphore *sem) +{ +return (struct task_struct *) + (atomic_long_read (&sem->owner) & ~RWSEM_OWNER_FLAGS_MASK ); +} +/* * Return true if the rwsem is owned by a reader. */ static inline bool is_rwsem_reader_owned (struct rw_semaphore *sem) { -#ifdef CONFIG_DEBUG_RWSEMS /* * Check the count to see if it is write-locked. */
@@ -194,11 +203,9 @@ static inline bool is_rwsem_reader_owned(struct rw_semaphore *sem)if (count &RWSEM_WRITER_MASK )return false; -#endif return rwsem_test_oflags (sem,RWSEM_READER_OWNED ); } -#ifdef CONFIG_DEBUG_RWSEMS /* * With CONFIG_DEBUG_RWSEMS configured, it will make sure that if there * is a task pointer in owner of a reader-owned rwsem, it will be the
@@ -266,15 +273,6 @@ static inline bool rwsem_write_trylock(struct rw_semaphore *sem) }/* -* Return just the real task structure pointer of the owner -*/ -static inline struct task_struct *rwsem_owner (struct rw_semaphore *sem) -{ -return (struct task_struct *) - (atomic_long_read (&sem->owner) & ~RWSEM_OWNER_FLAGS_MASK ); -} - -/* * Return the real task structure pointer of the owner and the embedded * flags in the owner. pflags must be non-NULL. */