locking: add missing __sched attributes
PATCH 1/1 locking: add missing __sched attributes
This patch adds __sched attributes to a few missing places to show blocked function rather than locking function in get_wchan.
--- kernel/locking/percpu-rwsem.c | 5 +++-- kernel/locking/rwsem.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
kernel/locking/percpu-rwsem.c +3 -2
@@ -7,6 +7,7 @@#include <linux/rcupdate.h> #include <linux/sched.h> #include <linux/sched/task.h> +#include <linux/sched/debug.h> #include <linux/errno.h> int __percpu_init_rwsem(struct percpu_rw_semaphore *sem,
@@ -162,7 +163,7 @@ static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader)__set_current_state (TASK_RUNNING ); } -bool __percpu_down_read (struct percpu_rw_semaphore *sem,bool try) +bool __sched __percpu_down_read(struct percpu_rw_semaphore *sem, bool try) {if (__percpu_down_read_trylock (sem))return true;
@@ -211,7 +212,7 @@ static bool readers_active_check(struct percpu_rw_semaphore *sem)return true; } -void percpu_down_write (struct percpu_rw_semaphore *sem) +void __sched percpu_down_write(struct percpu_rw_semaphore *sem) {might_sleep ();rwsem_acquire (&sem->dep_map,0 ,0 , _RET_IP_);
kernel/locking/rwsem.c +1 -1
@@ -1048,7 +1048,7 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int stat/* * Wait until we successfully acquire the write lock */ -static struct rw_semaphore * +static struct rw_semaphore __sched *rwsem_down_write_slowpath (struct rw_semaphore *sem,int state) {long count;
Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
On Sat, Jan 15, 2022 at 03:16:57PM -0800, Minchan Kim wrote:
Bumping up.
Quoted 56 lines
This patch adds
__schedattributes to a few missing places to show blocked function rather than locking function inget_wchan.Signed-off-by Minchan Kim <[email protected]>--- kernel/locking/percpu-rwsem.c | 5 +++-- kernel/locking/rwsem.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)kernel/locking/percpu-rwsem.c +3
-2@@ -7,6 +7,7 @@#include <linux/rcupdate.h> #include <linux/sched.h> #include <linux/sched/task.h> +#include <linux/sched/debug.h> #include <linux/errno.h> int __percpu_init_rwsem(struct percpu_rw_semaphore *sem,@@ -162,7 +163,7 @@ static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader)__set_current_state (TASK_RUNNING ); } -bool __percpu_down_read (struct percpu_rw_semaphore *sem,bool try) +bool __sched __percpu_down_read(struct percpu_rw_semaphore *sem, bool try) {if (__percpu_down_read_trylock (sem))return true;@@ -211,7 +212,7 @@ static bool readers_active_check(struct percpu_rw_semaphore *sem)return true; } -void percpu_down_write (struct percpu_rw_semaphore *sem) +void __sched percpu_down_write(struct percpu_rw_semaphore *sem) {might_sleep ();rwsem_acquire (&sem->dep_map,0 ,0 , _RET_IP_);kernel/locking/rwsem.c +1
-1@@ -1048,7 +1048,7 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int stat/* * Wait until we successfully acquire the write lock */ -static struct rw_semaphore * +static struct rw_semaphore __sched *rwsem_down_write_slowpath (struct rw_semaphore *sem,int state) {long count;Signature · 1 line
2.34.1.703.g22d0c6ccf7-goog
Peter Zijlstra
maintainerQuoted 5 lines · Minchan Kim
This patch adds
__schedattributes to a few missing places to show blocked function rather than locking function inget_wchan.Signed-off-by Minchan Kim <[email protected]>
Thanks!
[tip: locking/core] locking: Add missing __sched attributes
In reply to Minchan KimThe 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: c441e934b604a3b5f350a9104124cf6a3ba07a34 Gitweb: https://git.kernel.org/tip/c441e934b604a3b5f350a9104124cf6a3ba07a34 Author: Minchan Kim <[email protected]> AuthorDate: Sat, 15 Jan 2022 15:16:57 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 11 Feb 2022 12:13:55 +01:00
locking: Add missing __sched attributes
This patch adds __sched attributes to a few missing places to show blocked function rather than locking function in get_wchan.
--- kernel/locking/percpu-rwsem.c | 5 +++-- kernel/locking/rwsem.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
kernel/locking/percpu-rwsem.c +3 -2
@@ -7,6 +7,7 @@#include <linux/rcupdate.h> #include <linux/sched.h> #include <linux/sched/task.h> +#include <linux/sched/debug.h> #include <linux/errno.h> int __percpu_init_rwsem(struct percpu_rw_semaphore *sem,
@@ -162,7 +163,7 @@ static void percpu_rwsem_wait(struct percpu_rw_semaphore *sem, bool reader)__set_current_state (TASK_RUNNING ); } -bool __percpu_down_read (struct percpu_rw_semaphore *sem,bool try) +bool __sched __percpu_down_read(struct percpu_rw_semaphore *sem, bool try) {if (__percpu_down_read_trylock (sem))return true;
@@ -211,7 +212,7 @@ static bool readers_active_check(struct percpu_rw_semaphore *sem)return true; } -void percpu_down_write (struct percpu_rw_semaphore *sem) +void __sched percpu_down_write(struct percpu_rw_semaphore *sem) {might_sleep ();rwsem_acquire (&sem->dep_map,0 ,0 , _RET_IP_);
kernel/locking/rwsem.c +1 -1
@@ -1048,7 +1048,7 @@ out_nolock:/* * Wait until we successfully acquire the write lock */ -static struct rw_semaphore * +static struct rw_semaphore __sched *rwsem_down_write_slowpath (struct rw_semaphore *sem,int state) {long count;