iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

u64_stats: fix u64_stats_init() for lockdep when used repeatedly in one file

Browse Source 
Fix bogus lockdep warnings if multiple u64_stats_sync variables are
initialized in the same file.

With CONFIG_LOCKDEP, seqcount_init() is a macro which declares:

	static struct lock_class_key __key;

Since u64_stats_init() is a function (albeit an inline one), all calls
within the same file end up using the same instance, effectively treating
them all as a single lock-class.

Fixes: 9464ca650008 ("net: make u64_stats_init() a function")
Closes: https://lore.kernel.org/netdev/ea1567d9-ce66-45e6-8168-ac40a47d1821@roeck-us.net/
Signed-off-by: Petr Tesarik <petr@tesarici.cz>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20240404075740.30682-1-petr@tesarici.cz
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Petr Tesarik 2024-04-04 09:57:40 +02:00 committed by Jakub Kicinski
parent 4539f91f2a
commit 38a15d0a50
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/u64_stats_sync.h
View File

@ -135,10 +135,11 @@ static inline void u64_stats_inc(u64_stats_t *p)
p->v++; p->v++;
} }
static inline void u64_stats_init(struct u64_stats_sync *syncp) #define u64_stats_init(syncp) \
{ do { \
seqcount_init(&syncp->seq); struct u64_stats_sync *__s = (syncp); \
} seqcount_init(&__s->seq); \
} while (0)
static inline void __u64_stats_update_begin(struct u64_stats_sync *syncp) static inline void __u64_stats_update_begin(struct u64_stats_sync *syncp)
{ {