Skip to content

Commit 0e4b77d

Browse files
committed
Merge tag 'core-debugobjects-2024-07-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull debugobjects update from Thomas Gleixner: "A single update for debugobjects to annotate all intentionally racy global debug variables so that KCSAN ignores them" * tag 'core-debugobjects-2024-07-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: debugobjects: Annotate racy debug variables
2 parents 3e78198 + 5b5baba commit 0e4b77d

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

lib/debugobjects.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,17 @@ static bool obj_freeing;
7878
/* The number of objs on the global free list */
7979
static int obj_nr_tofree;
8080

81-
static int debug_objects_maxchain __read_mostly;
82-
static int __maybe_unused debug_objects_maxchecked __read_mostly;
83-
static int debug_objects_fixups __read_mostly;
84-
static int debug_objects_warnings __read_mostly;
85-
static int debug_objects_enabled __read_mostly
86-
= CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT;
87-
static int debug_objects_pool_size __read_mostly
88-
= ODEBUG_POOL_SIZE;
89-
static int debug_objects_pool_min_level __read_mostly
90-
= ODEBUG_POOL_MIN_LEVEL;
81+
static int __data_racy debug_objects_maxchain __read_mostly;
82+
static int __data_racy __maybe_unused debug_objects_maxchecked __read_mostly;
83+
static int __data_racy debug_objects_fixups __read_mostly;
84+
static int __data_racy debug_objects_warnings __read_mostly;
85+
static int __data_racy debug_objects_enabled __read_mostly
86+
= CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT;
87+
static int __data_racy debug_objects_pool_size __read_mostly
88+
= ODEBUG_POOL_SIZE;
89+
static int __data_racy debug_objects_pool_min_level __read_mostly
90+
= ODEBUG_POOL_MIN_LEVEL;
91+
9192
static const struct debug_obj_descr *descr_test __read_mostly;
9293
static struct kmem_cache *obj_cache __ro_after_init;
9394

0 commit comments

Comments
 (0)