lockdep: avoid struct return in lock_stats()
PATCH 1/1 lockdep: avoid struct return in lock_stats()
From: Arnd Bergmann <[email protected]>
Returning a large structure from the lock_stats() function causes clang to have multiple copies of it on the stack and copy between them, which can end up exceeding the frame size warning limit:
kernel/locking/lockdep.c:300:25: error: stack frame size (1464) exceeds limit (1280) in 'lock_stats' [-Werror,-Wframe-larger-than]
300 | struct lock_class_stats lock_stats(struct lock_class *class)
Change the calling conventions to directly operate on the caller's copy, which apparently is what gcc does already.
--- include/linux/lockdep_types.h | 2 +- kernel/locking/lockdep.c | 27 ++++++++++++--------------- kernel/locking/lockdep_proc.c | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-)
include/linux/lockdep_types.h +1 -1
@@ -175,7 +175,7 @@ struct lock_class_stats { unsigned long bounces[nr_bounce_types]; }; -struct lock_class_stats lock_stats (struct lock_class *class); +void lock_stats (struct lock_class *class,struct lock_class_stats *stats);void clear_lock_stats (struct lock_class *class);#endif
kernel/locking/lockdep.c +12 -15
@@ -297,33 +297,30 @@ static inline void lock_time_add(struct lock_time *src, struct lock_time *dst) dst->nr += src->nr; } -struct lock_class_stats lock_stats (struct lock_class *class) +void lock_stats (struct lock_class *class,struct lock_class_stats *stats) { -struct lock_class_stats stats;int cpu, i; -memset (&stats,0 ,sizeof (struct lock_class_stats )); +memset (stats,0 ,sizeof (struct lock_class_stats ));for_each_possible_cpu (cpu) {struct lock_class_stats *pcs = &per_cpu (cpu_lock_stats, cpu)[class - lock_classes]; -for (i =0 ; i <ARRAY_SIZE (stats.contention_point); i++) - stats.contention_point[i] += pcs->contention_point[i]; +for (i =0 ; i <ARRAY_SIZE (stats->contention_point); i++) + stats->contention_point[i] += pcs->contention_point[i]; -for (i =0 ; i <ARRAY_SIZE (stats.contending_point); i++) - stats.contending_point[i] += pcs->contending_point[i]; +for (i =0 ; i <ARRAY_SIZE (stats->contending_point); i++) + stats->contending_point[i] += pcs->contending_point[i]; -lock_time_add (&pcs->read_waittime, &stats.read_waittime); -lock_time_add (&pcs->write_waittime, &stats.write_waittime); +lock_time_add (&pcs->read_waittime, &stats->read_waittime); +lock_time_add (&pcs->write_waittime, &stats->write_waittime); -lock_time_add (&pcs->read_holdtime, &stats.read_holdtime); -lock_time_add (&pcs->write_holdtime, &stats.write_holdtime); +lock_time_add (&pcs->read_holdtime, &stats->read_holdtime); +lock_time_add (&pcs->write_holdtime, &stats->write_holdtime); -for (i =0 ; i <ARRAY_SIZE (stats.bounces); i++) - stats.bounces[i] += pcs->bounces[i]; +for (i =0 ; i <ARRAY_SIZE (stats->bounces); i++) + stats->bounces[i] += pcs->bounces[i]; } - -return stats; }void clear_lock_stats (struct lock_class *class)
kernel/locking/lockdep_proc.c +1 -1
@@ -657,7 +657,7 @@ static int lock_stat_open(struct inode *inode, struct file *file)if (!test_bit (idx, lock_classes_in_use))continue ; iter->class = class; - iter->stats =lock_stats (class); +lock_stats (class, &iter->stats); iter++; }
Signature · 1 line
2.39.5
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Returning a large structure from the
lock_stats()function causes clang to have multiple copies of it on the stack and copy between them, which can end up exceeding the frame size warning limit:
Quoted 7 lines
kernel/locking/lockdep.c:300:25: error: stack frame size (1464) exceeds limit (1280) in 'lock_stats' [-Werror,-Wframe-larger-than]
300 | structlock_class_statslock_stats(struct lock_class *class)Change the calling conventions to directly operate on the caller's copy, which apparently is what gcc does already.
Signed-off-by Arnd Bergmann <[email protected]>
Queued for more tests and reviews, thanks!
Regards,
Boqun
Quoted 10 lines · Boqun Feng
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Returning a large structure from the
lock_stats()function causes clang to have multiple copies of it on the stack and copy between them, which can end up exceeding the frame size warning limit:
kernel/locking/lockdep.c:300:25: error: stack frame size (1464) exceeds limit (1280) in 'lock_stats' [-Werror,-Wframe-larger-than]
300 | structlock_class_statslock_stats(struct lock_class *class)
Quoted 6 lines
Quoted 4 lines
Change the calling conventions to directly operate on the caller's copy, which apparently is what gcc does already.
Signed-off-by Arnd Bergmann <[email protected]>Queued for more tests and reviews, thanks!
What about this one:
lockdep: change 'static const' variables to enum values
?
(I can't quickly find the pointer right now, but I think in lore.kernel.org you can find it)
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 16 lines · Andy Shevchenko
Quoted 15 lines · Boqun Feng
Quoted 13 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Returning a large structure from the
lock_stats()function causes clang to have multiple copies of it on the stack and copy between them, which can end up exceeding the frame size warning limit:
kernel/locking/lockdep.c:300:25: error: stack frame size (1464) exceeds limit (1280) in 'lock_stats' [-Werror,-Wframe-larger-than]
300 | structlock_class_statslock_stats(struct lock_class *class)Change the calling conventions to directly operate on the caller's copy, which apparently is what gcc does already.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 9 lines
Quoted 1 line
Queued for more tests and reviews, thanks!
What about this one:
lockdep: change 'static const' variables to enum values?
(I can't quickly find the pointer right now, but I think in lore.kernel.org you can find it)
This one:
https://lore.kernel.org/lkml/[email protected]/
? I will take a look (give me some time to learn about that compiler option), but seems trivial enough, should be in the next merge window if no problem found. Thanks for bringing it up.
Regards,
Boqun
Quoted 5 lines
Signature · 2 lines
With Best Regards, Andy Shevchenko
[tip: locking/core] locking/lockdep: Avoid struct return in lock_stats()
In reply to Arnd BergmannThe 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: d7c36d6350b5a4b27256eaeeea3b72621a819c9a Gitweb: https://git.kernel.org/tip/d7c36d6350b5a4b27256eaeeea3b72621a819c9a Author: Arnd Bergmann <[email protected]> AuthorDate: Tue, 10 Jun 2025 11:29:21 +02:00 Committer: Boqun Feng <[email protected]> CommitterDate: Mon, 14 Jul 2025 21:57:20 -07:00
locking/lockdep: Avoid struct return in lock_stats()
Returning a large structure from the lock_stats() function causes clang to have multiple copies of it on the stack and copy between them, which can end up exceeding the frame size warning limit:
kernel/locking/lockdep.c:300:25: error: stack frame size (1464) exceeds limit (1280) in 'lock_stats' [-Werror,-Wframe-larger-than]
300 | struct lock_class_stats lock_stats(struct lock_class *class)
Change the calling conventions to directly operate on the caller's copy, which apparently is what gcc does already.
--- include/linux/lockdep_types.h | 2 +- kernel/locking/lockdep.c | 27 ++++++++++++--------------- kernel/locking/lockdep_proc.c | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-)
include/linux/lockdep_types.h +1 -1
@@ -175,7 +175,7 @@ struct lock_class_stats { unsigned long bounces[nr_bounce_types]; }; -struct lock_class_stats lock_stats (struct lock_class *class); +void lock_stats (struct lock_class *class,struct lock_class_stats *stats);void clear_lock_stats (struct lock_class *class);#endif
kernel/locking/lockdep.c +12 -15
@@ -297,33 +297,30 @@ static inline void lock_time_add(struct lock_time *src, struct lock_time *dst) dst->nr += src->nr; } -struct lock_class_stats lock_stats (struct lock_class *class) +void lock_stats (struct lock_class *class,struct lock_class_stats *stats) { -struct lock_class_stats stats;int cpu, i; -memset (&stats,0 ,sizeof (struct lock_class_stats )); +memset (stats,0 ,sizeof (struct lock_class_stats ));for_each_possible_cpu (cpu) {struct lock_class_stats *pcs = &per_cpu (cpu_lock_stats, cpu)[class - lock_classes]; -for (i =0 ; i <ARRAY_SIZE (stats.contention_point); i++) - stats.contention_point[i] += pcs->contention_point[i]; +for (i =0 ; i <ARRAY_SIZE (stats->contention_point); i++) + stats->contention_point[i] += pcs->contention_point[i]; -for (i =0 ; i <ARRAY_SIZE (stats.contending_point); i++) - stats.contending_point[i] += pcs->contending_point[i]; +for (i =0 ; i <ARRAY_SIZE (stats->contending_point); i++) + stats->contending_point[i] += pcs->contending_point[i]; -lock_time_add (&pcs->read_waittime, &stats.read_waittime); -lock_time_add (&pcs->write_waittime, &stats.write_waittime); +lock_time_add (&pcs->read_waittime, &stats->read_waittime); +lock_time_add (&pcs->write_waittime, &stats->write_waittime); -lock_time_add (&pcs->read_holdtime, &stats.read_holdtime); -lock_time_add (&pcs->write_holdtime, &stats.write_holdtime); +lock_time_add (&pcs->read_holdtime, &stats->read_holdtime); +lock_time_add (&pcs->write_holdtime, &stats->write_holdtime); -for (i =0 ; i <ARRAY_SIZE (stats.bounces); i++) - stats.bounces[i] += pcs->bounces[i]; +for (i =0 ; i <ARRAY_SIZE (stats->bounces); i++) + stats->bounces[i] += pcs->bounces[i]; } - -return stats; }void clear_lock_stats (struct lock_class *class)
kernel/locking/lockdep_proc.c +1 -1
@@ -657,7 +657,7 @@ static int lock_stat_open(struct inode *inode, struct file *file)if (!test_bit (idx, lock_classes_in_use))continue ; iter->class = class; - iter->stats =lock_stats (class); +lock_stats (class, &iter->stats); iter++; }