Skip to content

Commit 3b9ed30

Browse files
melverPeter Zijlstra
authored andcommitted
cleanup: Make __DEFINE_LOCK_GUARD handle commas in initializers
Initialization macros can expand to structure initializers containing commas, which when used as a "lock" function resulted in errors such as: >> include/linux/spinlock.h:582:56: error: too many arguments provided to function-like macro invocation 582 | DEFINE_LOCK_GUARD_1(raw_spinlock_init, raw_spinlock_t, raw_spin_lock_init(_T->lock), /* */) | ^ include/linux/spinlock.h:113:17: note: expanded from macro 'raw_spin_lock_init' 113 | do { *(lock) = __RAW_SPIN_LOCK_UNLOCKED(lock); } while (0) | ^ include/linux/spinlock_types_raw.h:70:19: note: expanded from macro '__RAW_SPIN_LOCK_UNLOCKED' 70 | (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname) | ^ include/linux/spinlock_types_raw.h:67:34: note: expanded from macro '__RAW_SPIN_LOCK_INITIALIZER' 67 | RAW_SPIN_DEP_MAP_INIT(lockname) } | ^ include/linux/cleanup.h:496:9: note: macro '__DEFINE_LOCK_GUARD_1' defined here 496 | #define __DEFINE_LOCK_GUARD_1(_name, _type, _lock) \ | ^ include/linux/spinlock.h:582:1: note: parentheses are required around macro argument containing braced initializer list 582 | DEFINE_LOCK_GUARD_1(raw_spinlock_init, raw_spinlock_t, raw_spin_lock_init(_T->lock), /* */) | ^ | ( include/linux/cleanup.h:558:60: note: expanded from macro 'DEFINE_LOCK_GUARD_1' 558 | __DEFINE_UNLOCK_GUARD(_name, _type, _unlock, __VA_ARGS__) \ | ^ Make __DEFINE_LOCK_GUARD_0 and __DEFINE_LOCK_GUARD_1 variadic so that __VA_ARGS__ captures everything. Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Marco Elver <elver@google.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://patch.msgid.link/20260119094029.1344361-2-elver@google.com
1 parent f88a313 commit 3b9ed30

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

include/linux/cleanup.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,22 +493,22 @@ static __always_inline void class_##_name##_destructor(class_##_name##_t *_T) \
493493
\
494494
__DEFINE_GUARD_LOCK_PTR(_name, &_T->lock)
495495

496-
#define __DEFINE_LOCK_GUARD_1(_name, _type, _lock) \
496+
#define __DEFINE_LOCK_GUARD_1(_name, _type, ...) \
497497
static __always_inline class_##_name##_t class_##_name##_constructor(_type *l) \
498498
__no_context_analysis \
499499
{ \
500500
class_##_name##_t _t = { .lock = l }, *_T = &_t; \
501-
_lock; \
501+
__VA_ARGS__; \
502502
return _t; \
503503
}
504504

505-
#define __DEFINE_LOCK_GUARD_0(_name, _lock) \
505+
#define __DEFINE_LOCK_GUARD_0(_name, ...) \
506506
static __always_inline class_##_name##_t class_##_name##_constructor(void) \
507507
__no_context_analysis \
508508
{ \
509509
class_##_name##_t _t = { .lock = (void*)1 }, \
510510
*_T __maybe_unused = &_t; \
511-
_lock; \
511+
__VA_ARGS__; \
512512
return _t; \
513513
}
514514

0 commit comments

Comments
 (0)