From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: "George Stark" <gnstark@salutedevices.com>,
"Marek Behún" <marek.behun@nic.cz>,
"Waiman Long" <longman@redhat.com>
Cc: "andy.shevchenko@gmail.com" <andy.shevchenko@gmail.com>,
"pavel@ucw.cz" <pavel@ucw.cz>, "lee@kernel.org" <lee@kernel.org>,
"vadimp@nvidia.com" <vadimp@nvidia.com>,
"mpe@ellerman.id.au" <mpe@ellerman.id.au>,
"npiggin@gmail.com" <npiggin@gmail.com>,
"hdegoede@redhat.com" <hdegoede@redhat.com>,
"mazziesaccount@gmail.com" <mazziesaccount@gmail.com>,
"peterz@infradead.org" <peterz@infradead.org>,
"mingo@redhat.com" <mingo@redhat.com>,
"will@kernel.org" <will@kernel.org>,
"boqun.feng@gmail.com" <boqun.feng@gmail.com>,
"nikitos.tr@gmail.com" <nikitos.tr@gmail.com>,
"kabel@kernel.org" <kabel@kernel.org>,
"linux-leds@vger.kernel.org" <linux-leds@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
"kernel@salutedevices.com" <kernel@salutedevices.com>
Subject: Re: [PATCH v5 02/10] locking/mutex: introduce devm_mutex_init
Date: Tue, 12 Mar 2024 18:17:24 +0000 [thread overview]
Message-ID: <7e174d78-faa9-4d29-967f-c1b3dedb3ef8@csgroup.eu> (raw)
In-Reply-To: <1f3395cb-ebab-44cd-b2b1-716e0130abad@salutedevices.com>
Le 12/03/2024 à 16:30, George Stark a écrit :
> [Vous ne recevez pas souvent de courriers de gnstark@salutedevices.com.
> Découvrez pourquoi ceci est important à
> https://aka.ms/LearnAboutSenderIdentification ]
>
> Hello Christophe
>
> On 3/12/24 14:51, Christophe Leroy wrote:
>>
>>
>> Le 12/03/2024 à 12:39, George Stark a écrit :
>>> [Vous ne recevez pas souvent de courriers de gnstark@salutedevices.com.
>>> Découvrez pourquoi ceci est important à
>>> https://aka.ms/LearnAboutSenderIdentification ]
>
> ...
>
>> You don't need that inline function, just change debug_devm_mutex_init()
>> to __devm_mutex_init().
>
> I stuck to debug_* name because mutex-debug.c already exports a set
> of debug_ calls so...
Ah yes you are right I didn't see that. On the other hand all those
debug_mutex_* are used by kernel/locking/mutex.c.
Here we really don't want our new function to be called by anything else
than devm_mutex_init so by calling it __devm_mutex_init() you kind of
tie them together.
> Well it's not essential anyway. Here's the next try:
Looks good to me.
>
> diff --git a/include/linux/mutex.h b/include/linux/mutex.h
> index 67edc4ca2bee..537b5ea18ceb 100644
> --- a/include/linux/mutex.h
> +++ b/include/linux/mutex.h
> @@ -22,6 +22,8 @@
> #include <linux/cleanup.h>
> #include <linux/mutex_types.h>
>
> +struct device;
> +
> #ifdef CONFIG_DEBUG_LOCK_ALLOC
> # define __DEP_MAP_MUTEX_INITIALIZER(lockname) \
> , .dep_map = { \
> @@ -117,6 +119,29 @@ do
> { \
> } while (0)
> #endif /* CONFIG_PREEMPT_RT */
>
> +#ifdef CONFIG_DEBUG_MUTEXES
> +
> +int __devm_mutex_init(struct device *dev, struct mutex *lock);
> +
> +#else
> +
> +static inline int __devm_mutex_init(struct device *dev, struct mutex
> *lock)
> +{
> + /*
> + * When CONFIG_DEBUG_MUTEXES is off mutex_destroy is just a nop so
> + * no really need to register it in devm subsystem.
> + */
> + return 0;
> +}
> +
> +#endif
> +
> +#define devm_mutex_init(dev, mutex) \
> +({ \
> + mutex_init(mutex); \
> + __devm_mutex_init(dev, mutex); \
> +})
> +
> /*
> * See kernel/locking/mutex.c for detailed documentation of these APIs.
> * Also see Documentation/locking/mutex-design.rst.
> diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
> index bc8abb8549d2..6aa77e3dc82e 100644
> --- a/kernel/locking/mutex-debug.c
> +++ b/kernel/locking/mutex-debug.c
> @@ -19,6 +19,7 @@
> #include <linux/kallsyms.h>
> #include <linux/interrupt.h>
> #include <linux/debug_locks.h>
> +#include <linux/device.h>
>
> #include "mutex.h"
>
> @@ -89,6 +90,16 @@ void debug_mutex_init(struct mutex *lock, const char
> *name,
> lock->magic = lock;
> }
>
> +static void devm_mutex_release(void *res)
> +{
> + mutex_destroy(res);
> +}
> +
> +int __devm_mutex_init(struct device *dev, struct mutex *lock)
> +{
> + return devm_add_action_or_reset(dev, devm_mutex_release, lock);
> +}
> +
> /***
> * mutex_destroy - mark a mutex unusable
> * @lock: the mutex to be destroyed
> --
> 2.25.1
>
>
>
>>> +
>>> +#else
>>> +
>>> +static inline int __devm_mutex_init(struct device *dev, struct mutex
>>> *lock)
>>> +{
>>> + /*
>>> + * When CONFIG_DEBUG_MUTEXES is off mutex_destroy is just a
>>> nop so
>>> + * no really need to register it in devm subsystem.
>>> + */
>>
>> Don't know if it is because tabs are replaced by blanks in you email,
>> but the stars should be aligned
>
> Ack
>
>
> --
> Best regards
> George
next prev parent reply other threads:[~2024-03-12 18:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 2:40 [PATCH v5 00/10] devm_led_classdev_register() usage problem George Stark
2024-03-07 2:40 ` [PATCH v5 01/10] locking/mutex: move mutex_destroy() definition lower George Stark
2024-03-07 2:40 ` [PATCH v5 02/10] locking/mutex: introduce devm_mutex_init George Stark
2024-03-07 9:56 ` Marek Behún
2024-03-07 13:39 ` Waiman Long
2024-03-07 16:44 ` Marek Behún
2024-03-11 23:47 ` George Stark
2024-03-12 1:10 ` Waiman Long
2024-03-12 5:44 ` Christophe Leroy
2024-03-12 6:04 ` Christophe Leroy
2024-03-12 11:39 ` George Stark
2024-03-12 11:51 ` Christophe Leroy
2024-03-12 15:30 ` George Stark
2024-03-12 18:17 ` Christophe Leroy [this message]
2024-03-07 10:34 ` Andy Shevchenko
2024-03-12 0:01 ` George Stark
2024-03-12 5:41 ` Christophe Leroy
2024-03-12 8:58 ` Andy Shevchenko
2024-03-07 13:50 ` Christophe Leroy
2024-03-11 23:31 ` George Stark
2024-03-07 2:40 ` [PATCH v5 03/10] leds: aw2013: use devm API to cleanup module's resources George Stark
2024-03-07 2:40 ` [PATCH v5 04/10] leds: aw200xx: " George Stark
2024-03-07 2:40 ` [PATCH v5 05/10] leds: lp3952: " George Stark
2024-03-07 2:40 ` [PATCH v5 06/10] leds: lm3532: " George Stark
2024-03-07 2:40 ` [PATCH v5 07/10] leds: nic78bx: " George Stark
2024-03-07 2:40 ` [PATCH v5 08/10] leds: mlxreg: use devm_mutex_init for mutex initializtion George Stark
2024-03-07 2:40 ` [PATCH v5 09/10] leds: an30259a: use devm_mutext_init for mutext initialization George Stark
2024-03-07 2:40 ` [PATCH v5 10/10] leds: powernv: use LED_RETAIN_AT_SHUTDOWN flag for leds George Stark
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=7e174d78-faa9-4d29-967f-c1b3dedb3ef8@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=andy.shevchenko@gmail.com \
--cc=boqun.feng@gmail.com \
--cc=gnstark@salutedevices.com \
--cc=hdegoede@redhat.com \
--cc=kabel@kernel.org \
--cc=kernel@salutedevices.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=longman@redhat.com \
--cc=marek.behun@nic.cz \
--cc=mazziesaccount@gmail.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=nikitos.tr@gmail.com \
--cc=npiggin@gmail.com \
--cc=pavel@ucw.cz \
--cc=peterz@infradead.org \
--cc=vadimp@nvidia.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).