From: Waiman Long <longman@redhat.com>
To: Heiner Kallweit <hkallweit1@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>, Will Deacon <will@kernel.org>,
Boqun Feng <boqun@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] lockdep: constify usage of struct lock_class_key where possible
Date: Wed, 29 Apr 2026 16:34:52 -0400 [thread overview]
Message-ID: <63a78fbd-1e93-45a0-9179-a0a6b1f8143c@redhat.com> (raw)
In-Reply-To: <c9b10185-c876-489d-96c4-3c3465b64cd6@gmail.com>
On 4/29/26 3:40 PM, Heiner Kallweit wrote:
> On 29.04.2026 19:04, Waiman Long wrote:
>> On 4/28/26 5:05 PM, Heiner Kallweit wrote:
>>> Constify usage of struct lock_class_key where possible. This requires
>>> to constify also usage of struct lockdep_subclass_key in two places.
>>>
>>> Especially relevant is constification of lockdep_map.key, as it makes
>>> clear that the key isn't changed during lifetime of struct lockdep_map.
>> Other than making clear that the lock_class_key isn't being modified, is there other benefit of making this change like helping compiler to generate better code?
>>
> Doing an objdump -o kernel/locking/lockdep.o I see no difference in section
> sizes. Hence at least with gcc it doesn't seem to affect code generation.
> I didn't check whether it affects callers of e.g. lockdep_init_map_wait().
I asked because just stating the nature of the lock_class_key doesn't
contribute much to the lockdep code. I am not against this change, but
it is up others to decide if they will take the patch.
Cheers,
Longman
>
>> Cheers,
>> Longman
>>
>>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>>> ---
>>> include/linux/lockdep.h | 18 ++++++++++--------
>>> include/linux/lockdep_types.h | 2 +-
>>> kernel/locking/lockdep.c | 12 ++++++------
>>> 3 files changed, 17 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
>>> index 621566345..3fa2b62f2 100644
>>> --- a/include/linux/lockdep.h
>>> +++ b/include/linux/lockdep.h
>>> @@ -125,25 +125,27 @@ extern void lockdep_unregister_key(struct lock_class_key *key);
>>> * to lockdep:
>>> */
>>> -extern void lockdep_init_map_type(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, int subclass, u8 inner, u8 outer, u8 lock_type);
>>> +void lockdep_init_map_type(struct lockdep_map *lock, const char *name,
>>> + const struct lock_class_key *key, int subclass,
>>> + u8 inner, u8 outer, u8 lock_type);
>>> static inline void
>>> lockdep_init_map_waits(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, int subclass, u8 inner, u8 outer)
>>> + const struct lock_class_key *key, int subclass,
>>> + u8 inner, u8 outer)
>>> {
>>> lockdep_init_map_type(lock, name, key, subclass, inner, outer, LD_LOCK_NORMAL);
>>> }
>>> static inline void
>>> lockdep_init_map_wait(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, int subclass, u8 inner)
>>> + const struct lock_class_key *key, int subclass, u8 inner)
>>> {
>>> lockdep_init_map_waits(lock, name, key, subclass, inner, LD_WAIT_INV);
>>> }
>>> static inline void lockdep_init_map(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, int subclass)
>>> + const struct lock_class_key *key, int subclass)
>>> {
>>> lockdep_init_map_wait(lock, name, key, subclass, LD_WAIT_INV);
>>> }
>>> @@ -252,9 +254,9 @@ static inline int lock_is_held(const struct lockdep_map *lock)
>>> #define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map)
>>> #define lockdep_is_held_type(lock, r) lock_is_held_type(&(lock)->dep_map, (r))
>>> -extern void lock_set_class(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, unsigned int subclass,
>>> - unsigned long ip);
>>> +void lock_set_class(struct lockdep_map *lock, const char *name,
>>> + const struct lock_class_key *key, unsigned int subclass,
>>> + unsigned long ip);
>>> #define lock_set_novalidate_class(l, n, i) \
>>> lock_set_class(l, n, &__lockdep_no_validate__, 0, i)
>>> diff --git a/include/linux/lockdep_types.h b/include/linux/lockdep_types.h
>>> index eae115a26..0d3df9019 100644
>>> --- a/include/linux/lockdep_types.h
>>> +++ b/include/linux/lockdep_types.h
>>> @@ -184,7 +184,7 @@ void clear_lock_stats(struct lock_class *class);
>>> * This is embedded into specific lock instances:
>>> */
>>> struct lockdep_map {
>>> - struct lock_class_key *key;
>>> + const struct lock_class_key *key;
>>> struct lock_class *class_cache[NR_LOCKDEP_CACHING_CLASSES];
>>> const char *name;
>>> u8 wait_type_outer; /* can be taken in this context */
>>> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
>>> index f13883162..fe1415260 100644
>>> --- a/kernel/locking/lockdep.c
>>> +++ b/kernel/locking/lockdep.c
>>> @@ -888,7 +888,7 @@ static int count_matching_names(struct lock_class *new_class)
>>> static noinstr struct lock_class *
>>> look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass)
>>> {
>>> - struct lockdep_subclass_key *key;
>>> + const struct lockdep_subclass_key *key;
>>> struct hlist_head *hash_head;
>>> struct lock_class *class;
>>> @@ -1286,7 +1286,7 @@ static bool is_dynamic_key(const struct lock_class_key *key)
>>> static struct lock_class *
>>> register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
>>> {
>>> - struct lockdep_subclass_key *key;
>>> + const struct lockdep_subclass_key *key;
>>> struct hlist_head *hash_head;
>>> struct lock_class *class;
>>> int idx;
>>> @@ -4937,8 +4937,8 @@ static inline int check_wait_context(struct task_struct *curr,
>>> * Initialize a lock instance's lock-class mapping info:
>>> */
>>> void lockdep_init_map_type(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, int subclass,
>>> - u8 inner, u8 outer, u8 lock_type)
>>> + const struct lock_class_key *key, int subclass,
>>> + u8 inner, u8 outer, u8 lock_type)
>>> {
>>> int i;
>>> @@ -5408,7 +5408,7 @@ static int reacquire_held_locks(struct task_struct *curr, unsigned int depth,
>>> static int
>>> __lock_set_class(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, unsigned int subclass,
>>> + const struct lock_class_key *key, unsigned int subclass,
>>> unsigned long ip)
>>> {
>>> struct task_struct *curr = current;
>>> @@ -5733,7 +5733,7 @@ static noinstr void check_flags(unsigned long flags)
>>> }
>>> void lock_set_class(struct lockdep_map *lock, const char *name,
>>> - struct lock_class_key *key, unsigned int subclass,
>>> + const struct lock_class_key *key, unsigned int subclass,
>>> unsigned long ip)
>>> {
>>> unsigned long flags;
next prev parent reply other threads:[~2026-04-29 20:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-28 21:05 Heiner Kallweit
2026-04-29 17:04 ` Waiman Long
2026-04-29 19:40 ` Heiner Kallweit
2026-04-29 20:34 ` Waiman Long [this message]
2026-05-04 7:28 ` Peter Zijlstra
2026-05-04 20:37 ` Heiner Kallweit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=63a78fbd-1e93-45a0-9179-a0a6b1f8143c@redhat.com \
--to=longman@redhat.com \
--cc=boqun@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®