* [PATCH] locking/lockdep: Fix overflow in presentation of average lock-time
@ 2020-07-25 18:51 Chris Wilson
2020-07-25 19:51 ` [tip: locking/urgent] " tip-bot2 for Chris Wilson
0 siblings, 1 reply; 2+ messages in thread
From: Chris Wilson @ 2020-07-25 18:51 UTC (permalink / raw)
To: linux-kernel; +Cc: Chris Wilson, Peter Zijlstra, Ingo Molnar, Will Deacon
Though the number of lock-acquisitions is tracked as unsigned long, this
is passed as the divisor to div_s64() which interprets it as a s32,
giving nonsense values with more than 2 billion acquisitons. E.g.
acquisitions holdtime-min holdtime-max holdtime-total holdtime-avg
-------------------------------------------------------------------------
2350439395 0.07 353.38 649647067.36 0.-32
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
---
kernel/locking/lockdep_proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index 5525cd3ba0c8..02ef87f50df2 100644
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -423,7 +423,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)
seq_time(m, lt->min);
seq_time(m, lt->max);
seq_time(m, lt->total);
- seq_time(m, lt->nr ? div_s64(lt->total, lt->nr) : 0);
+ seq_time(m, lt->nr ? div64_u64(lt->total, lt->nr) : 0);
}
static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: locking/urgent] locking/lockdep: Fix overflow in presentation of average lock-time
2020-07-25 18:51 [PATCH] locking/lockdep: Fix overflow in presentation of average lock-time Chris Wilson
@ 2020-07-25 19:51 ` tip-bot2 for Chris Wilson
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Chris Wilson @ 2020-07-25 19:51 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Chris Wilson, Ingo Molnar, Peter Zijlstra, x86, LKML
The following commit has been merged into the locking/urgent branch of tip:
Commit-ID: a7ef9b28aa8d72a1656fa6f0a01bbd1493886317
Gitweb: https://git.kernel.org/tip/a7ef9b28aa8d72a1656fa6f0a01bbd1493886317
Author: Chris Wilson <chris@chris-wilson.co.uk>
AuthorDate: Sat, 25 Jul 2020 19:51:10 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sat, 25 Jul 2020 21:47:42 +02:00
locking/lockdep: Fix overflow in presentation of average lock-time
Though the number of lock-acquisitions is tracked as unsigned long, this
is passed as the divisor to div_s64() which interprets it as a s32,
giving nonsense values with more than 2 billion acquisitons. E.g.
acquisitions holdtime-min holdtime-max holdtime-total holdtime-avg
-------------------------------------------------------------------------
2350439395 0.07 353.38 649647067.36 0.-32
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20200725185110.11588-1-chris@chris-wilson.co.uk
---
kernel/locking/lockdep_proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index 5525cd3..02ef87f 100644
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -423,7 +423,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)
seq_time(m, lt->min);
seq_time(m, lt->max);
seq_time(m, lt->total);
- seq_time(m, lt->nr ? div_s64(lt->total, lt->nr) : 0);
+ seq_time(m, lt->nr ? div64_u64(lt->total, lt->nr) : 0);
}
static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-25 19:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-25 18:51 [PATCH] locking/lockdep: Fix overflow in presentation of average lock-time Chris Wilson
2020-07-25 19:51 ` [tip: locking/urgent] " tip-bot2 for Chris Wilson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).