[PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Deepanshu Kartikey]

__xfs_healthmon_insert() asserts that hm->lock is held
(lockdep_assert_held), but xfs_ioc_health_monitor() called it right
after allocating hm, before ever taking the lock, triggering a
lockdep warning.

Take hm->lock around the call.

Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>
---
 fs/xfs/xfs_healthmon.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/xfs/xfs_healthmon.c b/fs/xfs/xfs_healthmon.c
index 3ae5f4496ad1..2f762f90d329 100644
--- a/fs/xfs/xfs_healthmon.c
+++ b/fs/xfs/xfs_healthmon.c
@@ -1219,7 +1219,9 @@ xfs_ioc_health_monitor(
 	}
 	running_event->type = XFS_HEALTHMON_RUNNING;
 	running_event->domain = XFS_HEALTHMON_MOUNT;
+	mutex_lock(&hm->lock);
 	__xfs_healthmon_insert(hm, running_event);
+	mutex_unlock(&hm->lock);
 
 	/*
 	 * Preallocate the unmount event so that we can't fail to notify the
-- 
2.34.1

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Darrick J. Wong]

On Sun, Sep 06, 2026 at 08:16:29PM +0530, Deepanshu Kartikey wrote:
> __xfs_healthmon_insert() asserts that hm->lock is held
> (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> after allocating hm, before ever taking the lock, triggering a
> lockdep warning.
> 
> Take hm->lock around the call.
> 
> Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
> Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
> Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>

Heh, I added a patch just like this one to my own tree.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/xfs_healthmon.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/fs/xfs/xfs_healthmon.c b/fs/xfs/xfs_healthmon.c
> index 3ae5f4496ad1..2f762f90d329 100644
> --- a/fs/xfs/xfs_healthmon.c
> +++ b/fs/xfs/xfs_healthmon.c
> @@ -1219,7 +1219,9 @@ xfs_ioc_health_monitor(
>  	}
>  	running_event->type = XFS_HEALTHMON_RUNNING;
>  	running_event->domain = XFS_HEALTHMON_MOUNT;
> +	mutex_lock(&hm->lock);
>  	__xfs_healthmon_insert(hm, running_event);
> +	mutex_unlock(&hm->lock);
>  
>  	/*
>  	 * Preallocate the unmount event so that we can't fail to notify the
> -- 
> 2.34.1
> 
> 

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Christoph Hellwig]

On Sun, Sep 06, 2026 at 09:51:50PM -0700, Darrick J. Wong wrote:
> On Sun, Sep 06, 2026 at 08:16:29PM +0530, Deepanshu Kartikey wrote:
> > __xfs_healthmon_insert() asserts that hm->lock is held
> > (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> > after allocating hm, before ever taking the lock, triggering a
> > lockdep warning.
> > 
> > Take hm->lock around the call.
> > 
> > Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
> > Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
> > Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
> > Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>
> 
> Heh, I added a patch just like this one to my own tree.
> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

Can we get this queued up ASAP?  It's also causing a lot of failures in
our zoned XFS CI.

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Carlos Maiolino]

On Wed, Sep 09, 2026 at 10:07:56PM -0700, Christoph Hellwig wrote:
> On Sun, Sep 06, 2026 at 09:51:50PM -0700, Darrick J. Wong wrote:
> > On Sun, Sep 06, 2026 at 08:16:29PM +0530, Deepanshu Kartikey wrote:
> > > __xfs_healthmon_insert() asserts that hm->lock is held
> > > (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> > > after allocating hm, before ever taking the lock, triggering a
> > > lockdep warning.
> > > 
> > > Take hm->lock around the call.
> > > 
> > > Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
> > > Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
> > > Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
> > > Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>
> > 
> > Heh, I added a patch just like this one to my own tree.
> > Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
> 
> Can we get this queued up ASAP?  It's also causing a lot of failures in
> our zoned XFS CI.
> 

Yes, give me a few minutes and I'll have it today, ready for the next rc

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Carlos Maiolino]

On Wed, Sep 09, 2026 at 10:07:56PM -0700, Christoph Hellwig wrote:
> On Sun, Sep 06, 2026 at 09:51:50PM -0700, Darrick J. Wong wrote:
> > On Sun, Sep 06, 2026 at 08:16:29PM +0530, Deepanshu Kartikey wrote:
> > > __xfs_healthmon_insert() asserts that hm->lock is held
> > > (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> > > after allocating hm, before ever taking the lock, triggering a
> > > lockdep warning.
> > > 
> > > Take hm->lock around the call.
> > > 
> > > Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
> > > Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
> > > Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
> > > Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>
> > 
> > Heh, I added a patch just like this one to my own tree.
> > Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
> 
> Can we get this queued up ASAP?  It's also causing a lot of failures in
> our zoned XFS CI.
> 
> 

Oh... this is actually already in my queue, I just need to push it :)

I'm just trying to get darricks attr fsblock fix in too because that is
also failing my own testing here.

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Carlos Maiolino]

On Sun, 06 Sep 2026 20:16:29 +0530, Deepanshu Kartikey wrote:
> __xfs_healthmon_insert() asserts that hm->lock is held
> (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> after allocating hm, before ever taking the lock, triggering a
> lockdep warning.
> 
> Take hm->lock around the call.
> 
> [...]

Applied to for-next, thanks!

[1/1] xfs: take hm->lock in xfs_ioc_health_monitor() before insert
      commit: 4870da4f49ae2df4f804a6f770d56846e57495d7

Best regards,
-- 
Carlos Maiolino <cem@kernel.org>

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Carlos Maiolino]

On Wed, Sep 09, 2026 at 10:07:56PM -0700, Christoph Hellwig wrote:
> On Sun, Sep 06, 2026 at 09:51:50PM -0700, Darrick J. Wong wrote:
> > On Sun, Sep 06, 2026 at 08:16:29PM +0530, Deepanshu Kartikey wrote:
> > > __xfs_healthmon_insert() asserts that hm->lock is held
> > > (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> > > after allocating hm, before ever taking the lock, triggering a
> > > lockdep warning.
> > > 
> > > Take hm->lock around the call.
> > > 
> > > Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
> > > Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
> > > Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
> > > Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>
> > 
> > Heh, I added a patch just like this one to my own tree.
> > Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
> 
> Can we get this queued up ASAP?  It's also causing a lot of failures in
> our zoned XFS CI.
> 
> 

Done. It's in for-next already. Not sure if I'll manage to push the
attrs fsblock fix yet this -rc, but this one will go to Linus on
Saturday

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Shigeru Yoshida]

Carlos Maiolino <cem@kernel.org> writes:

> On Wed, Sep 09, 2026 at 10:07:56PM -0700, Christoph Hellwig wrote:
>> On Sun, Sep 06, 2026 at 09:51:50PM -0700, Darrick J. Wong wrote:
>> > On Sun, Sep 06, 2026 at 08:16:29PM +0530, Deepanshu Kartikey wrote:
>> > > __xfs_healthmon_insert() asserts that hm->lock is held
>> > > (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
>> > > after allocating hm, before ever taking the lock, triggering a
>> > > lockdep warning.
>> > > 
>> > > Take hm->lock around the call.
>> > > 
>> > > Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
>> > > Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
>> > > Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
>> > > Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>
>> > 
>> > Heh, I added a patch just like this one to my own tree.
>> > Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
>> 
>> Can we get this queued up ASAP?  It's also causing a lot of failures in
>> our zoned XFS CI.
>> 
>> 
>
> Done. It's in for-next already. Not sure if I'll manage to push the
> attrs fsblock fix yet this -rc, but this one will go to Linus on
> Saturday

I noticed that the second mutex operation in this commit was
accidentally left as mutex_lock() instead of mutex_unlock(). I've
sent a fix as a separate patch ("xfs: fix double mutex_lock() call
in xfs_ioc_health_monitor()"). Feel free to use it if it helps.

Thanks,
Shigeru

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Carlos Maiolino]

On Thu, Sep 10, 2026 at 10:42:53PM +0900, Shigeru Yoshida wrote:
> Carlos Maiolino <cem@kernel.org> writes:
> 
> > On Wed, Sep 09, 2026 at 10:07:56PM -0700, Christoph Hellwig wrote:
> >> On Sun, Sep 06, 2026 at 09:51:50PM -0700, Darrick J. Wong wrote:
> >> > On Sun, Sep 06, 2026 at 08:16:29PM +0530, Deepanshu Kartikey wrote:
> >> > > __xfs_healthmon_insert() asserts that hm->lock is held
> >> > > (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> >> > > after allocating hm, before ever taking the lock, triggering a
> >> > > lockdep warning.
> >> > > 
> >> > > Take hm->lock around the call.
> >> > > 
> >> > > Fixes: b3a289a2a9397 ("xfs: create event queuing, formatting, and discovery infrastructure")
> >> > > Reported-by: syzbot+ccdf3469f5f653bff7ac@syzkaller.appspotmail.com
> >> > > Closes: https://syzkaller.appspot.com/bug?extid=ccdf3469f5f653bff7ac
> >> > > Signed-off-by: Deepanshu Kartikey <kartikey406@gmail.com>
> >> > 
> >> > Heh, I added a patch just like this one to my own tree.
> >> > Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
> >> 
> >> Can we get this queued up ASAP?  It's also causing a lot of failures in
> >> our zoned XFS CI.
> >> 
> >> 
> >
> > Done. It's in for-next already. Not sure if I'll manage to push the
> > attrs fsblock fix yet this -rc, but this one will go to Linus on
> > Saturday
> 
> I noticed that the second mutex operation in this commit was
> accidentally left as mutex_lock() instead of mutex_unlock(). I've
> sent a fix as a separate patch ("xfs: fix double mutex_lock() call
> in xfs_ioc_health_monitor()"). Feel free to use it if it helps.

Thanks for the info, something went pretty wrong with b4. I didn't touch
the patch manually and somehow it got twisted when I pulled it.
I'll figure it out what went wrong but first let me fix this...

This shouldn't be in the tree at all, so I'll remove the patch for now
as this has not been pulled into the linux-next.


> 
> Thanks,
> Shigeru
> 
> 

Re: [PATCH] xfs: take hm->lock in xfs_ioc_health_monitor() before insert

[Carlos Maiolino]

On Sun, 06 Sep 2026 20:16:29 +0530, Deepanshu Kartikey wrote:
> __xfs_healthmon_insert() asserts that hm->lock is held
> (lockdep_assert_held), but xfs_ioc_health_monitor() called it right
> after allocating hm, before ever taking the lock, triggering a
> lockdep warning.
> 
> Take hm->lock around the call.
> 
> [...]

Applied to for-next, thanks!

[1/1] xfs: take hm->lock in xfs_ioc_health_monitor() before insert
      commit: e240919ca727776f16a468d3d90686dc82cfe9cb

Best regards,
-- 
Carlos Maiolino <cem@kernel.org>