Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 109d71c6 authored by Frank Rowand's avatar Frank Rowand Committed by Ingo Molnar
Browse files

lockstat: Fix min, max times in /proc/lock_stats 



Fix min, max times in /proc/lock_stats

(1) When collecting lock hold and wait times, if the current minimum
    time is zero, it will be replaced by the next time.

(2) When aggregating minimum and maximum lock hold and wait times
    accross cpus, the values are added, instead of selecting the
    minimum and maximum.

Signed-off-by: default avatarFrank Rowand <frank.rowand@am.sony.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <4B05BBAE.2050005@am.sony.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6ec22f9b

kernel/lockdep.c

+10 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void lock_time_inc(struct lock_time *lt, u64 time) 
	if (time > lt->max)

		lt->max = time;



	if (time < lt->min || !lt->min)

	if (time < lt->min || !lt->nr)

		lt->min = time;



	lt->total += time;
@@ -177,8 +177,15 @@ static void lock_time_inc(struct lock_time *lt, u64 time) 


static inline void lock_time_add(struct lock_time *src, struct lock_time *dst)

{

	dst->min += src->min;

	dst->max += src->max;

	if (!src->nr)

		return;



	if (src->max > dst->max)

		dst->max = src->max;



	if (src->min < dst->min || !dst->nr)

		dst->min = src->min;



	dst->total += src->total;

	dst->nr += src->nr;

}