* [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states
@ 2019-03-01 9:40 Geert Uytterhoeven
2019-03-01 14:13 ` Will Deacon
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2019-03-01 9:40 UTC (permalink / raw)
To: Jonathan Corbet, Peter Zijlstra, Ingo Molnar, Will Deacon
Cc: Paul E . McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, Joel Fernandes, Juri Lelli,
linux-kernel, linux-doc, Geert Uytterhoeven
Since the removal of FS_RECLAIM annotations, lockdep states contain four
characters, not six.
Fixes: e5684bbfc3f03480 ("Documentation/locking/lockdep: Update info about states")
Fixes: d92a8cfcb37ecd13 ("locking/lockdep: Rework FS_RECLAIM annotation")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
- Fix silly before/after inversion in patch description.
---
Documentation/RCU/lockdep-splat.txt | 6 +++---
Documentation/locking/lockdep-design.txt | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/RCU/lockdep-splat.txt b/Documentation/RCU/lockdep-splat.txt
index 238e9f61352f6187..9423b633526d14df 100644
--- a/Documentation/RCU/lockdep-splat.txt
+++ b/Documentation/RCU/lockdep-splat.txt
@@ -24,11 +24,11 @@ other info that might help us debug this:
rcu_scheduler_active = 1, debug_locks = 0
3 locks held by scsi_scan_6/1552:
- #0: (&shost->scan_mutex){+.+.+.}, at: [<ffffffff8145efca>]
+ #0: (&shost->scan_mutex){+.+.}, at: [<ffffffff8145efca>]
scsi_scan_host_selected+0x5a/0x150
- #1: (&eq->sysfs_lock){+.+...}, at: [<ffffffff812a5032>]
+ #1: (&eq->sysfs_lock){+.+.}, at: [<ffffffff812a5032>]
elevator_exit+0x22/0x60
- #2: (&(&q->__queue_lock)->rlock){-.-...}, at: [<ffffffff812b6233>]
+ #2: (&(&q->__queue_lock)->rlock){-.-.}, at: [<ffffffff812b6233>]
cfq_exit_queue+0x43/0x190
stack backtrace:
diff --git a/Documentation/locking/lockdep-design.txt b/Documentation/locking/lockdep-design.txt
index 49f58a07ee7b19c8..39fae143c9cbf5ff 100644
--- a/Documentation/locking/lockdep-design.txt
+++ b/Documentation/locking/lockdep-design.txt
@@ -45,10 +45,10 @@ When locking rules are violated, these state bits are presented in the
locking error messages, inside curlies. A contrived example:
modprobe/2287 is trying to acquire lock:
- (&sio_locks[i].lock){-.-...}, at: [<c02867fd>] mutex_lock+0x21/0x24
+ (&sio_locks[i].lock){-.-.}, at: [<c02867fd>] mutex_lock+0x21/0x24
but task is already holding lock:
- (&sio_locks[i].lock){-.-...}, at: [<c02867fd>] mutex_lock+0x21/0x24
+ (&sio_locks[i].lock){-.-.}, at: [<c02867fd>] mutex_lock+0x21/0x24
The bit position indicates STATE, STATE-read, for each of the states listed
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states
2019-03-01 9:40 [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states Geert Uytterhoeven
@ 2019-03-01 14:13 ` Will Deacon
2019-03-01 17:06 ` Paul E. McKenney
2019-03-04 19:55 ` Jonathan Corbet
2 siblings, 0 replies; 4+ messages in thread
From: Will Deacon @ 2019-03-01 14:13 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Jonathan Corbet, Peter Zijlstra, Ingo Molnar, Paul E . McKenney,
Josh Triplett, Steven Rostedt, Mathieu Desnoyers, Lai Jiangshan,
Joel Fernandes, Juri Lelli, linux-kernel, linux-doc
On Fri, Mar 01, 2019 at 10:40:52AM +0100, Geert Uytterhoeven wrote:
> Since the removal of FS_RECLAIM annotations, lockdep states contain four
> characters, not six.
>
> Fixes: e5684bbfc3f03480 ("Documentation/locking/lockdep: Update info about states")
> Fixes: d92a8cfcb37ecd13 ("locking/lockdep: Rework FS_RECLAIM annotation")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> v2:
> - Fix silly before/after inversion in patch description.
> ---
> Documentation/RCU/lockdep-splat.txt | 6 +++---
> Documentation/locking/lockdep-design.txt | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
Looks sensible to me:
Acked-by: Will Deacon <will.deacon@arm.com>
Will
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states
2019-03-01 9:40 [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states Geert Uytterhoeven
2019-03-01 14:13 ` Will Deacon
@ 2019-03-01 17:06 ` Paul E. McKenney
2019-03-04 19:55 ` Jonathan Corbet
2 siblings, 0 replies; 4+ messages in thread
From: Paul E. McKenney @ 2019-03-01 17:06 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Jonathan Corbet, Peter Zijlstra, Ingo Molnar, Will Deacon,
Josh Triplett, Steven Rostedt, Mathieu Desnoyers, Lai Jiangshan,
Joel Fernandes, Juri Lelli, linux-kernel, linux-doc
On Fri, Mar 01, 2019 at 10:40:52AM +0100, Geert Uytterhoeven wrote:
> Since the removal of FS_RECLAIM annotations, lockdep states contain four
> characters, not six.
>
> Fixes: e5684bbfc3f03480 ("Documentation/locking/lockdep: Update info about states")
> Fixes: d92a8cfcb37ecd13 ("locking/lockdep: Rework FS_RECLAIM annotation")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Paul E. McKenney <paulmck@linux.ibm.com>
Or let me know if you would rather me take this via the -rcu tree, either
way works for me!
Thanx, Paul
> ---
> v2:
> - Fix silly before/after inversion in patch description.
> ---
> Documentation/RCU/lockdep-splat.txt | 6 +++---
> Documentation/locking/lockdep-design.txt | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/RCU/lockdep-splat.txt b/Documentation/RCU/lockdep-splat.txt
> index 238e9f61352f6187..9423b633526d14df 100644
> --- a/Documentation/RCU/lockdep-splat.txt
> +++ b/Documentation/RCU/lockdep-splat.txt
> @@ -24,11 +24,11 @@ other info that might help us debug this:
>
> rcu_scheduler_active = 1, debug_locks = 0
> 3 locks held by scsi_scan_6/1552:
> - #0: (&shost->scan_mutex){+.+.+.}, at: [<ffffffff8145efca>]
> + #0: (&shost->scan_mutex){+.+.}, at: [<ffffffff8145efca>]
> scsi_scan_host_selected+0x5a/0x150
> - #1: (&eq->sysfs_lock){+.+...}, at: [<ffffffff812a5032>]
> + #1: (&eq->sysfs_lock){+.+.}, at: [<ffffffff812a5032>]
> elevator_exit+0x22/0x60
> - #2: (&(&q->__queue_lock)->rlock){-.-...}, at: [<ffffffff812b6233>]
> + #2: (&(&q->__queue_lock)->rlock){-.-.}, at: [<ffffffff812b6233>]
> cfq_exit_queue+0x43/0x190
>
> stack backtrace:
> diff --git a/Documentation/locking/lockdep-design.txt b/Documentation/locking/lockdep-design.txt
> index 49f58a07ee7b19c8..39fae143c9cbf5ff 100644
> --- a/Documentation/locking/lockdep-design.txt
> +++ b/Documentation/locking/lockdep-design.txt
> @@ -45,10 +45,10 @@ When locking rules are violated, these state bits are presented in the
> locking error messages, inside curlies. A contrived example:
>
> modprobe/2287 is trying to acquire lock:
> - (&sio_locks[i].lock){-.-...}, at: [<c02867fd>] mutex_lock+0x21/0x24
> + (&sio_locks[i].lock){-.-.}, at: [<c02867fd>] mutex_lock+0x21/0x24
>
> but task is already holding lock:
> - (&sio_locks[i].lock){-.-...}, at: [<c02867fd>] mutex_lock+0x21/0x24
> + (&sio_locks[i].lock){-.-.}, at: [<c02867fd>] mutex_lock+0x21/0x24
>
>
> The bit position indicates STATE, STATE-read, for each of the states listed
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states
2019-03-01 9:40 [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states Geert Uytterhoeven
2019-03-01 14:13 ` Will Deacon
2019-03-01 17:06 ` Paul E. McKenney
@ 2019-03-04 19:55 ` Jonathan Corbet
2 siblings, 0 replies; 4+ messages in thread
From: Jonathan Corbet @ 2019-03-04 19:55 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Peter Zijlstra, Ingo Molnar, Will Deacon, Paul E . McKenney,
Josh Triplett, Steven Rostedt, Mathieu Desnoyers, Lai Jiangshan,
Joel Fernandes, Juri Lelli, linux-kernel, linux-doc
On Fri, 1 Mar 2019 10:40:52 +0100
Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> Since the removal of FS_RECLAIM annotations, lockdep states contain four
> characters, not six.
>
> Fixes: e5684bbfc3f03480 ("Documentation/locking/lockdep: Update info about states")
> Fixes: d92a8cfcb37ecd13 ("locking/lockdep: Rework FS_RECLAIM annotation")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> v2:
> - Fix silly before/after inversion in patch description.
Applied, thanks.
jon
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-04 19:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-01 9:40 [PATCH v2] Documentation/locking/lockdep: Drop last two chars of sample states Geert Uytterhoeven
2019-03-01 14:13 ` Will Deacon
2019-03-01 17:06 ` Paul E. McKenney
2019-03-04 19:55 ` Jonathan Corbet
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.