* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 3:16 [PATCH] pwm: Avoid deadlock warning when removing PWM device Yoshihiro Shimoda
@ 2019-03-12 8:38 ` Geert Uytterhoeven
2019-03-12 9:23 ` Uwe Kleine-König
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Geert Uytterhoeven @ 2019-03-12 8:38 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: Thierry Reding, Linux PWM List, Linux-Renesas, Phong Hoang
Hi Shimoda-san,
On Tue, Mar 12, 2019 at 4:17 AM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> From: Phong Hoang <phong.hoang.wz@renesas.com>
>
> This patch fixes deadlock warning if removing PWM device
> when CONFIG_PROVE_LOCKING is enabled.
>
> This issue can be reproceduced by the following steps on
> the R-Car H3 Salvator-X board if the backlight is disabled:
>
> # cd /sys/class/pwm/pwmchip0
> # echo 0 > export
> # ls
> device export npwm power pwm0 subsystem uevent unexport
> # cd device/driver
> # ls
> bind e6e31000.pwm uevent unbind
> # echo e6e31000.pwm > unbind
>
> [ 87.659974] ======================================================
> [ 87.666149] WARNING: possible circular locking dependency detected
> [ 87.672327] 5.0.0 #7 Not tainted
[...]
> This warning occurs because pwmchip_remove still keeps pwm_lock
> when removing sysfs. That's why it leads to that conflict.
> Hence, this patch unlocks pwm_lock before removing sysfs.
> Also, pwmchip_sysfs_export() doesn't seem to need the pwm_lock
> held so that to achieve consistance between export and
> unexport this patch also modifies it.
>
> Signed-off-by: Phong Hoang <phong.hoang.wz@renesas.com>
> [shimoda: revise the commit log and code]
> Fixes: 76abbdde2d95 ("pwm: Add sysfs interface")
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> Tested-by: Hoan Nguyen An <na-hoan@jinso.co.jp>
Thanks for your patch!
Looks good to me: class_find_device() seems to use its own locking in
the class to protect against concurrent modification.
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 3:16 [PATCH] pwm: Avoid deadlock warning when removing PWM device Yoshihiro Shimoda
2019-03-12 8:38 ` Geert Uytterhoeven
@ 2019-03-12 9:23 ` Uwe Kleine-König
2019-03-12 9:49 ` Geert Uytterhoeven
2019-03-12 11:54 ` Thierry Reding
2019-03-12 12:45 ` Thierry Reding
3 siblings, 1 reply; 11+ messages in thread
From: Uwe Kleine-König @ 2019-03-12 9:23 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: thierry.reding, linux-pwm, linux-renesas-soc, Phong Hoang
On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> index 1581f6a..2fdd6611 100644
> --- a/drivers/pwm/core.c
> +++ b/drivers/pwm/core.c
> @@ -311,10 +311,12 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip,
> if (IS_ENABLED(CONFIG_OF))
> of_pwmchip_add(chip);
>
> - pwmchip_sysfs_export(chip);
> -
> out:
> mutex_unlock(&pwm_lock);
> +
> + if (!ret)
> + pwmchip_sysfs_export(chip);
> +
> return ret;
> }
> EXPORT_SYMBOL_GPL(pwmchip_add_with_polarity);
> @@ -368,10 +370,12 @@ int pwmchip_remove(struct pwm_chip *chip)
>
> free_pwms(chip);
>
> - pwmchip_sysfs_unexport(chip);
> -
> out:
> mutex_unlock(&pwm_lock);
> +
> + if (!ret)
> + pwmchip_sysfs_unexport(chip);
> +
I wonder if this needs to be done before free_pwms is called. Otherwise
the pwmchip is already gone and then something is requested via sysfs.
Also a comment about why it is important not to unexport while holding
the lock would be great.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 9:23 ` Uwe Kleine-König
@ 2019-03-12 9:49 ` Geert Uytterhoeven
2019-03-12 9:54 ` Uwe Kleine-König
0 siblings, 1 reply; 11+ messages in thread
From: Geert Uytterhoeven @ 2019-03-12 9:49 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Yoshihiro Shimoda, Thierry Reding, Linux PWM List, Linux-Renesas,
Phong Hoang
Hi Uwe,
On Tue, Mar 12, 2019 at 10:23 AM Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
> On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
> > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> > index 1581f6a..2fdd6611 100644
> > --- a/drivers/pwm/core.c
> > +++ b/drivers/pwm/core.c
> > @@ -368,10 +370,12 @@ int pwmchip_remove(struct pwm_chip *chip)
> >
> > free_pwms(chip);
> >
> > - pwmchip_sysfs_unexport(chip);
> > -
> > out:
> > mutex_unlock(&pwm_lock);
> > +
> > + if (!ret)
> > + pwmchip_sysfs_unexport(chip);
> > +
>
> I wonder if this needs to be done before free_pwms is called. Otherwise
> the pwmchip is already gone and then something is requested via sysfs.
The chip itself is not freed, only the pwms array inside, which is not needed
for matching in pwmchip_sysfs_unexport(), right?
> Also a comment about why it is important not to unexport while holding
> the lock would be great.
Thanks, good idea!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 9:49 ` Geert Uytterhoeven
@ 2019-03-12 9:54 ` Uwe Kleine-König
2019-03-12 11:47 ` Thierry Reding
0 siblings, 1 reply; 11+ messages in thread
From: Uwe Kleine-König @ 2019-03-12 9:54 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Yoshihiro Shimoda, Thierry Reding, Linux PWM List, Linux-Renesas,
Phong Hoang
On Tue, Mar 12, 2019 at 10:49:59AM +0100, Geert Uytterhoeven wrote:
> Hi Uwe,
>
> On Tue, Mar 12, 2019 at 10:23 AM Uwe Kleine-König
> <u.kleine-koenig@pengutronix.de> wrote:
> > On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
> > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> > > index 1581f6a..2fdd6611 100644
> > > --- a/drivers/pwm/core.c
> > > +++ b/drivers/pwm/core.c
>
> > > @@ -368,10 +370,12 @@ int pwmchip_remove(struct pwm_chip *chip)
> > >
> > > free_pwms(chip);
> > >
> > > - pwmchip_sysfs_unexport(chip);
> > > -
> > > out:
> > > mutex_unlock(&pwm_lock);
> > > +
> > > + if (!ret)
> > > + pwmchip_sysfs_unexport(chip);
> > > +
> >
> > I wonder if this needs to be done before free_pwms is called. Otherwise
> > the pwmchip is already gone and then something is requested via sysfs.
>
> The chip itself is not freed, only the pwms array inside, which is not needed
> for matching in pwmchip_sysfs_unexport(), right?
OK, then make this:
I wonder if pwmchip_sysfs_unexport needs to be done before free_pwms is
called. Otherwise the PWMs's representation is already gone and then
something might be requested via sysfs.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 9:54 ` Uwe Kleine-König
@ 2019-03-12 11:47 ` Thierry Reding
0 siblings, 0 replies; 11+ messages in thread
From: Thierry Reding @ 2019-03-12 11:47 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Geert Uytterhoeven, Yoshihiro Shimoda, Linux PWM List,
Linux-Renesas, Phong Hoang
[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]
On Tue, Mar 12, 2019 at 10:54:33AM +0100, Uwe Kleine-König wrote:
> On Tue, Mar 12, 2019 at 10:49:59AM +0100, Geert Uytterhoeven wrote:
> > Hi Uwe,
> >
> > On Tue, Mar 12, 2019 at 10:23 AM Uwe Kleine-König
> > <u.kleine-koenig@pengutronix.de> wrote:
> > > On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
> > > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> > > > index 1581f6a..2fdd6611 100644
> > > > --- a/drivers/pwm/core.c
> > > > +++ b/drivers/pwm/core.c
> >
> > > > @@ -368,10 +370,12 @@ int pwmchip_remove(struct pwm_chip *chip)
> > > >
> > > > free_pwms(chip);
> > > >
> > > > - pwmchip_sysfs_unexport(chip);
> > > > -
> > > > out:
> > > > mutex_unlock(&pwm_lock);
> > > > +
> > > > + if (!ret)
> > > > + pwmchip_sysfs_unexport(chip);
> > > > +
> > >
> > > I wonder if this needs to be done before free_pwms is called. Otherwise
> > > the pwmchip is already gone and then something is requested via sysfs.
> >
> > The chip itself is not freed, only the pwms array inside, which is not needed
> > for matching in pwmchip_sysfs_unexport(), right?
>
> OK, then make this:
>
> I wonder if pwmchip_sysfs_unexport needs to be done before free_pwms is
> called. Otherwise the PWMs's representation is already gone and then
> something might be requested via sysfs.
Agreed, I think sysfs needs to disappear before the chip does, otherwise
we could have userspace racing with the kernel for access to sysfs while
the PWM chip is already/only halfway gone.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 3:16 [PATCH] pwm: Avoid deadlock warning when removing PWM device Yoshihiro Shimoda
2019-03-12 8:38 ` Geert Uytterhoeven
2019-03-12 9:23 ` Uwe Kleine-König
@ 2019-03-12 11:54 ` Thierry Reding
2019-03-12 12:09 ` Geert Uytterhoeven
2019-03-12 12:45 ` Thierry Reding
3 siblings, 1 reply; 11+ messages in thread
From: Thierry Reding @ 2019-03-12 11:54 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: linux-pwm, linux-renesas-soc, Phong Hoang
[-- Attachment #1: Type: text/plain, Size: 4011 bytes --]
On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
> From: Phong Hoang <phong.hoang.wz@renesas.com>
>
> This patch fixes deadlock warning if removing PWM device
> when CONFIG_PROVE_LOCKING is enabled.
>
> This issue can be reproceduced by the following steps on
> the R-Car H3 Salvator-X board if the backlight is disabled:
>
> # cd /sys/class/pwm/pwmchip0
> # echo 0 > export
> # ls
> device export npwm power pwm0 subsystem uevent unexport
> # cd device/driver
> # ls
> bind e6e31000.pwm uevent unbind
> # echo e6e31000.pwm > unbind
>
> [ 87.659974] ======================================================
> [ 87.666149] WARNING: possible circular locking dependency detected
> [ 87.672327] 5.0.0 #7 Not tainted
> [ 87.675549] ------------------------------------------------------
> [ 87.681723] bash/2986 is trying to acquire lock:
> [ 87.686337] 000000005ea0e178 (kn->count#58){++++}, at: kernfs_remove_by_name_ns+0x50/0xa0
> [ 87.694528]
> [ 87.694528] but task is already holding lock:
> [ 87.700353] 000000006313b17c (pwm_lock){+.+.}, at: pwmchip_remove+0x28/0x13c
> [ 87.707405]
> [ 87.707405] which lock already depends on the new lock.
> [ 87.707405]
> [ 87.715574]
> [ 87.715574] the existing dependency chain (in reverse order) is:
> [ 87.723048]
> [ 87.723048] -> #1 (pwm_lock){+.+.}:
> [ 87.728017] __mutex_lock+0x70/0x7e4
> [ 87.732108] mutex_lock_nested+0x1c/0x24
> [ 87.736547] pwm_request_from_chip.part.6+0x34/0x74
> [ 87.741940] pwm_request_from_chip+0x20/0x40
> [ 87.746725] export_store+0x6c/0x1f4
> [ 87.750820] dev_attr_store+0x18/0x28
> [ 87.754998] sysfs_kf_write+0x54/0x64
> [ 87.759175] kernfs_fop_write+0xe4/0x1e8
> [ 87.763615] __vfs_write+0x40/0x184
> [ 87.767619] vfs_write+0xa8/0x19c
> [ 87.771448] ksys_write+0x58/0xbc
> [ 87.775278] __arm64_sys_write+0x18/0x20
> [ 87.779721] el0_svc_common+0xd0/0x124
> [ 87.783986] el0_svc_compat_handler+0x1c/0x24
> [ 87.788858] el0_svc_compat+0x8/0x18
> [ 87.792947]
> [ 87.792947] -> #0 (kn->count#58){++++}:
> [ 87.798260] lock_acquire+0xc4/0x22c
> [ 87.802353] __kernfs_remove+0x258/0x2c4
> [ 87.806790] kernfs_remove_by_name_ns+0x50/0xa0
> [ 87.811836] remove_files.isra.1+0x38/0x78
> [ 87.816447] sysfs_remove_group+0x48/0x98
> [ 87.820971] sysfs_remove_groups+0x34/0x4c
> [ 87.825583] device_remove_attrs+0x6c/0x7c
> [ 87.830197] device_del+0x11c/0x33c
> [ 87.834201] device_unregister+0x14/0x2c
> [ 87.838638] pwmchip_sysfs_unexport+0x40/0x4c
> [ 87.843509] pwmchip_remove+0xf4/0x13c
> [ 87.847773] rcar_pwm_remove+0x28/0x34
> [ 87.852039] platform_drv_remove+0x24/0x64
> [ 87.856651] device_release_driver_internal+0x18c/0x21c
> [ 87.862391] device_release_driver+0x14/0x1c
> [ 87.867175] unbind_store+0xe0/0x124
> [ 87.871265] drv_attr_store+0x20/0x30
> [ 87.875442] sysfs_kf_write+0x54/0x64
> [ 87.879618] kernfs_fop_write+0xe4/0x1e8
> [ 87.884055] __vfs_write+0x40/0x184
> [ 87.888057] vfs_write+0xa8/0x19c
> [ 87.891887] ksys_write+0x58/0xbc
> [ 87.895716] __arm64_sys_write+0x18/0x20
> [ 87.900154] el0_svc_common+0xd0/0x124
> [ 87.904417] el0_svc_compat_handler+0x1c/0x24
> [ 87.909289] el0_svc_compat+0x8/0x18
I'm not sure I understand this correctly. The above looks like pwm_lock
is held as part of the syscall writing 0 to the export attribute and the
second callchain looks like it's originating from the write to the
unbind attribute for the driver. But pwm_request_from_chip() should have
already released the lock before it returned, so how can the above
situation even happen?
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 11:54 ` Thierry Reding
@ 2019-03-12 12:09 ` Geert Uytterhoeven
0 siblings, 0 replies; 11+ messages in thread
From: Geert Uytterhoeven @ 2019-03-12 12:09 UTC (permalink / raw)
To: Thierry Reding
Cc: Yoshihiro Shimoda, Linux PWM List, Linux-Renesas, Phong Hoang
Hi Thierry,
On Tue, Mar 12, 2019 at 12:55 PM Thierry Reding
<thierry.reding@gmail.com> wrote:
> On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
> > From: Phong Hoang <phong.hoang.wz@renesas.com>
> >
> > This patch fixes deadlock warning if removing PWM device
> > when CONFIG_PROVE_LOCKING is enabled.
> >
> > This issue can be reproceduced by the following steps on
> > the R-Car H3 Salvator-X board if the backlight is disabled:
> >
> > # cd /sys/class/pwm/pwmchip0
> > # echo 0 > export
> > # ls
> > device export npwm power pwm0 subsystem uevent unexport
> > # cd device/driver
> > # ls
> > bind e6e31000.pwm uevent unbind
> > # echo e6e31000.pwm > unbind
> >
> > [ 87.659974] ======================================================
> > [ 87.666149] WARNING: possible circular locking dependency detected
> > [ 87.672327] 5.0.0 #7 Not tainted
> > [ 87.675549] ------------------------------------------------------
> > [ 87.681723] bash/2986 is trying to acquire lock:
> > [ 87.686337] 000000005ea0e178 (kn->count#58){++++}, at: kernfs_remove_by_name_ns+0x50/0xa0
> > [ 87.694528]
> > [ 87.694528] but task is already holding lock:
> > [ 87.700353] 000000006313b17c (pwm_lock){+.+.}, at: pwmchip_remove+0x28/0x13c
> > [ 87.707405]
> > [ 87.707405] which lock already depends on the new lock.
> > [ 87.707405]
> > [ 87.715574]
> > [ 87.715574] the existing dependency chain (in reverse order) is:
> > [ 87.723048]
> > [ 87.723048] -> #1 (pwm_lock){+.+.}:
> > [ 87.728017] __mutex_lock+0x70/0x7e4
> > [ 87.732108] mutex_lock_nested+0x1c/0x24
> > [ 87.736547] pwm_request_from_chip.part.6+0x34/0x74
> > [ 87.741940] pwm_request_from_chip+0x20/0x40
> > [ 87.746725] export_store+0x6c/0x1f4
> > [ 87.750820] dev_attr_store+0x18/0x28
> > [ 87.754998] sysfs_kf_write+0x54/0x64
> > [ 87.759175] kernfs_fop_write+0xe4/0x1e8
> > [ 87.763615] __vfs_write+0x40/0x184
> > [ 87.767619] vfs_write+0xa8/0x19c
> > [ 87.771448] ksys_write+0x58/0xbc
> > [ 87.775278] __arm64_sys_write+0x18/0x20
> > [ 87.779721] el0_svc_common+0xd0/0x124
> > [ 87.783986] el0_svc_compat_handler+0x1c/0x24
> > [ 87.788858] el0_svc_compat+0x8/0x18
> > [ 87.792947]
> > [ 87.792947] -> #0 (kn->count#58){++++}:
> > [ 87.798260] lock_acquire+0xc4/0x22c
> > [ 87.802353] __kernfs_remove+0x258/0x2c4
> > [ 87.806790] kernfs_remove_by_name_ns+0x50/0xa0
> > [ 87.811836] remove_files.isra.1+0x38/0x78
> > [ 87.816447] sysfs_remove_group+0x48/0x98
> > [ 87.820971] sysfs_remove_groups+0x34/0x4c
> > [ 87.825583] device_remove_attrs+0x6c/0x7c
> > [ 87.830197] device_del+0x11c/0x33c
> > [ 87.834201] device_unregister+0x14/0x2c
> > [ 87.838638] pwmchip_sysfs_unexport+0x40/0x4c
> > [ 87.843509] pwmchip_remove+0xf4/0x13c
> > [ 87.847773] rcar_pwm_remove+0x28/0x34
> > [ 87.852039] platform_drv_remove+0x24/0x64
> > [ 87.856651] device_release_driver_internal+0x18c/0x21c
> > [ 87.862391] device_release_driver+0x14/0x1c
> > [ 87.867175] unbind_store+0xe0/0x124
> > [ 87.871265] drv_attr_store+0x20/0x30
> > [ 87.875442] sysfs_kf_write+0x54/0x64
> > [ 87.879618] kernfs_fop_write+0xe4/0x1e8
> > [ 87.884055] __vfs_write+0x40/0x184
> > [ 87.888057] vfs_write+0xa8/0x19c
> > [ 87.891887] ksys_write+0x58/0xbc
> > [ 87.895716] __arm64_sys_write+0x18/0x20
> > [ 87.900154] el0_svc_common+0xd0/0x124
> > [ 87.904417] el0_svc_compat_handler+0x1c/0x24
> > [ 87.909289] el0_svc_compat+0x8/0x18
>
> I'm not sure I understand this correctly. The above looks like pwm_lock
> is held as part of the syscall writing 0 to the export attribute and the
> second callchain looks like it's originating from the write to the
> unbind attribute for the driver. But pwm_request_from_chip() should have
> already released the lock before it returned, so how can the above
> situation even happen?
Note that it says "_possible_ circular locking dependency detected".
AFAIU, this does not mean that the above two callchains actually did
happen at the same time.
Lockdep keeps tracks of the order in which locks are taken. If it
notices that one chain takes locks in one order, and a second chain
takes those locks in a different order, it prints a warning, as this
could cause a deadlock if/when the two callchains would ever happen
at the same time.
Note that there may be other reasons, outside the view of lockdep, which
guarantee this cannot actually happen...
So far my understanding...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 3:16 [PATCH] pwm: Avoid deadlock warning when removing PWM device Yoshihiro Shimoda
` (2 preceding siblings ...)
2019-03-12 11:54 ` Thierry Reding
@ 2019-03-12 12:45 ` Thierry Reding
2019-03-13 7:01 ` Yoshihiro Shimoda
3 siblings, 1 reply; 11+ messages in thread
From: Thierry Reding @ 2019-03-12 12:45 UTC (permalink / raw)
To: Yoshihiro Shimoda; +Cc: linux-pwm, linux-renesas-soc, Phong Hoang
[-- Attachment #1: Type: text/plain, Size: 8935 bytes --]
On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
> From: Phong Hoang <phong.hoang.wz@renesas.com>
>
> This patch fixes deadlock warning if removing PWM device
> when CONFIG_PROVE_LOCKING is enabled.
>
> This issue can be reproceduced by the following steps on
> the R-Car H3 Salvator-X board if the backlight is disabled:
>
> # cd /sys/class/pwm/pwmchip0
> # echo 0 > export
> # ls
> device export npwm power pwm0 subsystem uevent unexport
> # cd device/driver
> # ls
> bind e6e31000.pwm uevent unbind
> # echo e6e31000.pwm > unbind
>
> [ 87.659974] ======================================================
> [ 87.666149] WARNING: possible circular locking dependency detected
> [ 87.672327] 5.0.0 #7 Not tainted
> [ 87.675549] ------------------------------------------------------
> [ 87.681723] bash/2986 is trying to acquire lock:
> [ 87.686337] 000000005ea0e178 (kn->count#58){++++}, at: kernfs_remove_by_name_ns+0x50/0xa0
> [ 87.694528]
> [ 87.694528] but task is already holding lock:
> [ 87.700353] 000000006313b17c (pwm_lock){+.+.}, at: pwmchip_remove+0x28/0x13c
> [ 87.707405]
> [ 87.707405] which lock already depends on the new lock.
> [ 87.707405]
> [ 87.715574]
> [ 87.715574] the existing dependency chain (in reverse order) is:
> [ 87.723048]
> [ 87.723048] -> #1 (pwm_lock){+.+.}:
> [ 87.728017] __mutex_lock+0x70/0x7e4
> [ 87.732108] mutex_lock_nested+0x1c/0x24
> [ 87.736547] pwm_request_from_chip.part.6+0x34/0x74
> [ 87.741940] pwm_request_from_chip+0x20/0x40
> [ 87.746725] export_store+0x6c/0x1f4
> [ 87.750820] dev_attr_store+0x18/0x28
> [ 87.754998] sysfs_kf_write+0x54/0x64
> [ 87.759175] kernfs_fop_write+0xe4/0x1e8
> [ 87.763615] __vfs_write+0x40/0x184
> [ 87.767619] vfs_write+0xa8/0x19c
> [ 87.771448] ksys_write+0x58/0xbc
> [ 87.775278] __arm64_sys_write+0x18/0x20
> [ 87.779721] el0_svc_common+0xd0/0x124
> [ 87.783986] el0_svc_compat_handler+0x1c/0x24
> [ 87.788858] el0_svc_compat+0x8/0x18
> [ 87.792947]
> [ 87.792947] -> #0 (kn->count#58){++++}:
> [ 87.798260] lock_acquire+0xc4/0x22c
> [ 87.802353] __kernfs_remove+0x258/0x2c4
> [ 87.806790] kernfs_remove_by_name_ns+0x50/0xa0
> [ 87.811836] remove_files.isra.1+0x38/0x78
> [ 87.816447] sysfs_remove_group+0x48/0x98
> [ 87.820971] sysfs_remove_groups+0x34/0x4c
> [ 87.825583] device_remove_attrs+0x6c/0x7c
> [ 87.830197] device_del+0x11c/0x33c
> [ 87.834201] device_unregister+0x14/0x2c
> [ 87.838638] pwmchip_sysfs_unexport+0x40/0x4c
> [ 87.843509] pwmchip_remove+0xf4/0x13c
> [ 87.847773] rcar_pwm_remove+0x28/0x34
> [ 87.852039] platform_drv_remove+0x24/0x64
> [ 87.856651] device_release_driver_internal+0x18c/0x21c
> [ 87.862391] device_release_driver+0x14/0x1c
> [ 87.867175] unbind_store+0xe0/0x124
> [ 87.871265] drv_attr_store+0x20/0x30
> [ 87.875442] sysfs_kf_write+0x54/0x64
> [ 87.879618] kernfs_fop_write+0xe4/0x1e8
> [ 87.884055] __vfs_write+0x40/0x184
> [ 87.888057] vfs_write+0xa8/0x19c
> [ 87.891887] ksys_write+0x58/0xbc
> [ 87.895716] __arm64_sys_write+0x18/0x20
> [ 87.900154] el0_svc_common+0xd0/0x124
> [ 87.904417] el0_svc_compat_handler+0x1c/0x24
> [ 87.909289] el0_svc_compat+0x8/0x18
> [ 87.913378]
> [ 87.913378] other info that might help us debug this:
> [ 87.913378]
> [ 87.921374] Possible unsafe locking scenario:
> [ 87.921374]
> [ 87.927286] CPU0 CPU1
> [ 87.931808] ---- ----
> [ 87.936331] lock(pwm_lock);
> [ 87.939293] lock(kn->count#58);
> [ 87.945120] lock(pwm_lock);
> [ 87.950599] lock(kn->count#58);
> [ 87.953908]
> [ 87.953908] *** DEADLOCK ***
> [ 87.953908]
> [ 87.959821] 4 locks held by bash/2986:
> [ 87.963563] #0: 00000000ace7bc30 (sb_writers#6){.+.+}, at: vfs_write+0x188/0x19c
> [ 87.971044] #1: 00000000287991b2 (&of->mutex){+.+.}, at: kernfs_fop_write+0xb4/0x1e8
> [ 87.978872] #2: 00000000f739d016 (&dev->mutex){....}, at: device_release_driver_internal+0x40/0x21c
> [ 87.988001] #3: 000000006313b17c (pwm_lock){+.+.}, at: pwmchip_remove+0x28/0x13c
> [ 87.995481]
> [ 87.995481] stack backtrace:
> [ 87.999836] CPU: 0 PID: 2986 Comm: bash Not tainted 5.0.0 #7
> [ 88.005489] Hardware name: Renesas Salvator-X board based on r8a7795 ES1.x (DT)
> [ 88.012791] Call trace:
> [ 88.015235] dump_backtrace+0x0/0x190
> [ 88.018891] show_stack+0x14/0x1c
> [ 88.022204] dump_stack+0xb0/0xec
> [ 88.025514] print_circular_bug.isra.32+0x1d0/0x2e0
> [ 88.030385] __lock_acquire+0x1318/0x1864
> [ 88.034388] lock_acquire+0xc4/0x22c
> [ 88.037958] __kernfs_remove+0x258/0x2c4
> [ 88.041874] kernfs_remove_by_name_ns+0x50/0xa0
> [ 88.046398] remove_files.isra.1+0x38/0x78
> [ 88.050487] sysfs_remove_group+0x48/0x98
> [ 88.054490] sysfs_remove_groups+0x34/0x4c
> [ 88.058580] device_remove_attrs+0x6c/0x7c
> [ 88.062671] device_del+0x11c/0x33c
> [ 88.066154] device_unregister+0x14/0x2c
> [ 88.070070] pwmchip_sysfs_unexport+0x40/0x4c
> [ 88.074421] pwmchip_remove+0xf4/0x13c
> [ 88.078163] rcar_pwm_remove+0x28/0x34
> [ 88.081906] platform_drv_remove+0x24/0x64
> [ 88.085996] device_release_driver_internal+0x18c/0x21c
> [ 88.091215] device_release_driver+0x14/0x1c
> [ 88.095478] unbind_store+0xe0/0x124
> [ 88.099048] drv_attr_store+0x20/0x30
> [ 88.102704] sysfs_kf_write+0x54/0x64
> [ 88.106359] kernfs_fop_write+0xe4/0x1e8
> [ 88.110275] __vfs_write+0x40/0x184
> [ 88.113757] vfs_write+0xa8/0x19c
> [ 88.117065] ksys_write+0x58/0xbc
> [ 88.120374] __arm64_sys_write+0x18/0x20
> [ 88.124291] el0_svc_common+0xd0/0x124
> [ 88.128034] el0_svc_compat_handler+0x1c/0x24
> [ 88.132384] el0_svc_compat+0x8/0x18
>
> This warning occurs because pwmchip_remove still keeps pwm_lock
> when removing sysfs. That's why it leads to that conflict.
> Hence, this patch unlocks pwm_lock before removing sysfs.
> Also, pwmchip_sysfs_export() doesn't seem to need the pwm_lock
> held so that to achieve consistance between export and
> unexport this patch also modifies it.
>
> Signed-off-by: Phong Hoang <phong.hoang.wz@renesas.com>
> [shimoda: revise the commit log and code]
> Fixes: 76abbdde2d95 ("pwm: Add sysfs interface")
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> Tested-by: Hoan Nguyen An <na-hoan@jinso.co.jp>
> ---
> drivers/pwm/core.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> index 1581f6a..2fdd6611 100644
> --- a/drivers/pwm/core.c
> +++ b/drivers/pwm/core.c
> @@ -311,10 +311,12 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip,
> if (IS_ENABLED(CONFIG_OF))
> of_pwmchip_add(chip);
>
> - pwmchip_sysfs_export(chip);
> -
> out:
> mutex_unlock(&pwm_lock);
> +
> + if (!ret)
> + pwmchip_sysfs_export(chip);
> +
> return ret;
> }
> EXPORT_SYMBOL_GPL(pwmchip_add_with_polarity);
> @@ -368,10 +370,12 @@ int pwmchip_remove(struct pwm_chip *chip)
>
> free_pwms(chip);
>
> - pwmchip_sysfs_unexport(chip);
> -
> out:
> mutex_unlock(&pwm_lock);
> +
> + if (!ret)
> + pwmchip_sysfs_unexport(chip);
> +
I don't exactly remember why he sysfs unexport happens this late. It's
completely asymmetric to what we do in pwmchip_add_with_polarity() and
commit 0733424c9ba9 ("pwm: Unexport children before chip removal") is
a strong indication that this was wrong to begin with. Maybe we should
just move pwmchip_sysfs_unexport() where it belongs, which is right
after pwmchip_sysfs_unexport_children(). In that case, we probably do
not need separate functions anymore either.
We also really want to remove sysfs irrespective of whether or not the
chip will be removed as a result of pwmchip_remove(). We can only assume
that the driver will be gone after that, so we shouldn't leave any
dangling sysfs files around.
Yoshihiro, does it work if you move pwmchip_sysfs_unexport() to the top
of pwmchip_remove(), right below pwmchip_sysfs_unexport_children(),
instead? Does that get rid of the lockdep warning as well? That way it
is also outside of the pwm_lock section, which indeed doesn't seem to be
needed.
Moving the pwmchip_sysfs_export() call outside of that section also
seems fine and it'd be perfectly symmetric with pwmchip_remove() again.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* RE: [PATCH] pwm: Avoid deadlock warning when removing PWM device
2019-03-12 12:45 ` Thierry Reding
@ 2019-03-13 7:01 ` Yoshihiro Shimoda
0 siblings, 0 replies; 11+ messages in thread
From: Yoshihiro Shimoda @ 2019-03-13 7:01 UTC (permalink / raw)
To: Thierry Reding; +Cc: linux-pwm, linux-renesas-soc, Phong Hoang
Hi Thierry,
> From: Thierry Reding, Sent: Tuesday, March 12, 2019 9:46 PM
> On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
<snip>
> > @@ -368,10 +370,12 @@ int pwmchip_remove(struct pwm_chip *chip)
> >
> > free_pwms(chip);
> >
> > - pwmchip_sysfs_unexport(chip);
> > -
> > out:
> > mutex_unlock(&pwm_lock);
> > +
> > + if (!ret)
> > + pwmchip_sysfs_unexport(chip);
> > +
>
> I don't exactly remember why he sysfs unexport happens this late. It's
> completely asymmetric to what we do in pwmchip_add_with_polarity() and
> commit 0733424c9ba9 ("pwm: Unexport children before chip removal") is
> a strong indication that this was wrong to begin with. Maybe we should
> just move pwmchip_sysfs_unexport() where it belongs, which is right
> after pwmchip_sysfs_unexport_children(). In that case, we probably do
> not need separate functions anymore either.
I think so. So, I'll merge them on v2 patch.
> We also really want to remove sysfs irrespective of whether or not the
> chip will be removed as a result of pwmchip_remove(). We can only assume
> that the driver will be gone after that, so we shouldn't leave any
> dangling sysfs files around.
I think so.
> Yoshihiro, does it work if you move pwmchip_sysfs_unexport() to the top
> of pwmchip_remove(), right below pwmchip_sysfs_unexport_children(),
> instead? Does that get rid of the lockdep warning as well? That way it
> is also outside of the pwm_lock section, which indeed doesn't seem to be
> needed.
It works. That gets rid of the lockdep warning as well. So, I'll submit v2
patch later.
> Moving the pwmchip_sysfs_export() call outside of that section also
> seems fine and it'd be perfectly symmetric with pwmchip_remove() again.
I think so.
Best regards,
Yoshihiro Shimoda
> Thierry
^ permalink raw reply [flat|nested] 11+ messages in thread* RE: [PATCH] pwm: Avoid deadlock warning when removing PWM device
@ 2019-03-13 7:01 ` Yoshihiro Shimoda
0 siblings, 0 replies; 11+ messages in thread
From: Yoshihiro Shimoda @ 2019-03-13 7:01 UTC (permalink / raw)
To: Thierry Reding; +Cc: linux-pwm, linux-renesas-soc, Phong Hoang
Hi Thierry,
> From: Thierry Reding, Sent: Tuesday, March 12, 2019 9:46 PM
> On Tue, Mar 12, 2019 at 12:16:34PM +0900, Yoshihiro Shimoda wrote:
<snip>
> > @@ -368,10 +370,12 @@ int pwmchip_remove(struct pwm_chip *chip)
> >
> > free_pwms(chip);
> >
> > - pwmchip_sysfs_unexport(chip);
> > -
> > out:
> > mutex_unlock(&pwm_lock);
> > +
> > + if (!ret)
> > + pwmchip_sysfs_unexport(chip);
> > +
>
> I don't exactly remember why he sysfs unexport happens this late. It's
> completely asymmetric to what we do in pwmchip_add_with_polarity() and
> commit 0733424c9ba9 ("pwm: Unexport children before chip removal") is
> a strong indication that this was wrong to begin with. Maybe we should
> just move pwmchip_sysfs_unexport() where it belongs, which is right
> after pwmchip_sysfs_unexport_children(). In that case, we probably do
> not need separate functions anymore either.
I think so. So, I'll merge them on v2 patch.
> We also really want to remove sysfs irrespective of whether or not the
> chip will be removed as a result of pwmchip_remove(). We can only assume
> that the driver will be gone after that, so we shouldn't leave any
> dangling sysfs files around.
I think so.
> Yoshihiro, does it work if you move pwmchip_sysfs_unexport() to the top
> of pwmchip_remove(), right below pwmchip_sysfs_unexport_children(),
> instead? Does that get rid of the lockdep warning as well? That way it
> is also outside of the pwm_lock section, which indeed doesn't seem to be
> needed.
It works. That gets rid of the lockdep warning as well. So, I'll submit v2
patch later.
> Moving the pwmchip_sysfs_export() call outside of that section also
> seems fine and it'd be perfectly symmetric with pwmchip_remove() again.
I think so.
Best regards,
Yoshihiro Shimoda
> Thierry
^ permalink raw reply [flat|nested] 11+ messages in thread