Skip to contentSkip to conversation

hugetlbfs: fix hugetlbfs_statfs() locking

PATCH Applied Mina Almasry 3 participants 4 messages Apr 29, 2022 – May 2, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hugetlbfs: fix hugetlbfs_statfs() locking

After commit db71ef79b59b ("hugetlb: make free_huge_page irq safe"), the subpool lock should be locked with spin_lock_irq() and all call sites was modified as such, except for the ones in hugetlbfs_statfs().

Fixes db71ef79b59b ("hugetlb: make free_huge_page irq safe")
---
 fs/hugetlbfs/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/hugetlbfs/inode.c +2 -2
index dd3a088db11d..591599829e2a 100644
@@ -1048,12 +1048,12 @@ static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 		if (sbinfo->spool) {
 			long free_pages;
 
-			spin_lock(&sbinfo->spool->lock);
+			spin_lock_irq(&sbinfo->spool->lock);
 			buf->f_blocks = sbinfo->spool->max_hpages;
 			free_pages = sbinfo->spool->max_hpages
 				- sbinfo->spool->used_hpages;
 			buf->f_bavail = buf->f_bfree = free_pages;
-			spin_unlock(&sbinfo->spool->lock);
+			spin_unlock_irq(&sbinfo->spool->lock);
 			buf->f_files = sbinfo->max_inodes;
 			buf->f_ffree = sbinfo->free_inodes;
 		}

--
2.36.0.464.gb9c8b46e94-goog

maintainer
#1 lore raw
Quoted 13 lines · On Fri, 29 Apr 2022 13:22:06 -0700 Mina Almasry <[email protected]> wrote:

After commit db71ef79b59b ("hugetlb: make free_huge_page irq safe"), the subpool lock should be locked with spin_lock_irq() and all call sites was modified as such, except for the ones in hugetlbfs_statfs().

...

fs/hugetlbfs/inode.c +0 -1
@@ -1048,12 +1048,12 @@ static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 		if (sbinfo->spool) {
 			long free_pages;
 
-			spin_lock(&sbinfo->spool->lock);

fs/hugetlbfs/inode.c static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf) · line 1059

Quoted 10 lines
fs/hugetlbfs/inode.c +2 -1
+			spin_lock_irq(&sbinfo->spool->lock);
 			buf->f_blocks = sbinfo->spool->max_hpages;
 			free_pages = sbinfo->spool->max_hpages
 				- sbinfo->spool->used_hpages;
 			buf->f_bavail = buf->f_bfree = free_pages;
-			spin_unlock(&sbinfo->spool->lock);
+			spin_unlock_irq(&sbinfo->spool->lock);
 			buf->f_files = sbinfo->max_inodes;
 			buf->f_ffree = sbinfo->free_inodes;
 		}

Looks good.

This seems to be theoretically deadlockable and less theoretically lockdep splattable, so I'm inclined to cc:stable on this.

I wonder why we didn't do that with db71ef79b59bb2e78dc4.

Reviewed-by
#2 lore raw
Quoted 14 lines · Andrew Morton
Quoted 12 lines · On Fri, 29 Apr 2022 13:22:06 -0700 Mina Almasry <[email protected]> wrote:

After commit db71ef79b59b ("hugetlb: make free_huge_page irq safe"), the subpool lock should be locked with spin_lock_irq() and all call sites was modified as such, except for the ones in hugetlbfs_statfs().

...

fs/hugetlbfs/inode.c +0 -0
@@ -1048,12 +1048,12 @@ static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 		if (sbinfo->spool) {
 			long free_pages;
 
Quoted 13 lines

fs/hugetlbfs/inode.c static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf) · line 1059

Quoted 11 lines
fs/hugetlbfs/inode.c +2 -2
-			spin_lock(&sbinfo->spool->lock);
+			spin_lock_irq(&sbinfo->spool->lock);
 			buf->f_blocks = sbinfo->spool->max_hpages;
 			free_pages = sbinfo->spool->max_hpages
 				- sbinfo->spool->used_hpages;
 			buf->f_bavail = buf->f_bfree = free_pages;
-			spin_unlock(&sbinfo->spool->lock);
+			spin_unlock_irq(&sbinfo->spool->lock);
 			buf->f_files = sbinfo->max_inodes;
 			buf->f_ffree = sbinfo->free_inodes;
 		}

Looks good.

Agree, thanks Mina!

Quoted 6 lines

This seems to be theoretically deadlockable and less theoretically lockdep splattable, so I'm inclined to cc:stable on this.

I wonder why we didn't do that with db71ef79b59bb2e78dc4.

I do not think it was considered because the "less theoretically lockdep splattable" was so rare.

IIRC, the issue of possibly freeing hugetlb pages in IRQ context existed
from almost the beginning of hugetlb. It was first discovered and 'addressed'
with c77c0a8ac4c5. That was not cc:stable. Then it was discovered that c77c0a8ac4c5 was not complete, so db71ef79b59b effectively replaced c77c0a8ac4c5. That also was not cc:stable. I guess we could cc:stable this.

Mina, did you find this with lockdep or just code inspection?

Signature · 1 line
Mike Kravetz
#3 lore raw
Quoted 40 lines · Mike Kravetz
Quoted 14 lines · Andrew Morton
Quoted 12 lines · On Fri, 29 Apr 2022 13:22:06 -0700 Mina Almasry <[email protected]> wrote:

After commit db71ef79b59b ("hugetlb: make free_huge_page irq safe"), the subpool lock should be locked with spin_lock_irq() and all call sites was modified as such, except for the ones in hugetlbfs_statfs().

...

fs/hugetlbfs/inode.c +0 -0
@@ -1048,12 +1048,12 @@ static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)
             if (sbinfo->spool) {
                     long free_pages;
 
Quoted 13 lines

fs/hugetlbfs/inode.c static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf) · line 1059

Quoted 11 lines
fs/hugetlbfs/inode.c +2 -2
-                    spin_lock(&sbinfo->spool->lock);
+                    spin_lock_irq(&sbinfo->spool->lock);
                     buf->f_blocks = sbinfo->spool->max_hpages;
                     free_pages = sbinfo->spool->max_hpages
                             - sbinfo->spool->used_hpages;
                     buf->f_bavail = buf->f_bfree = free_pages;
-                    spin_unlock(&sbinfo->spool->lock);
+                    spin_unlock_irq(&sbinfo->spool->lock);
                     buf->f_files = sbinfo->max_inodes;
                     buf->f_ffree = sbinfo->free_inodes;
             }

Looks good.

Agree, thanks Mina!

Quoted 6 lines

This seems to be theoretically deadlockable and less theoretically lockdep splattable, so I'm inclined to cc:stable on this.

I wonder why we didn't do that with db71ef79b59bb2e78dc4.

Quoted 7 lines

I do not think it was considered because the "less theoretically lockdep splattable" was so rare.

IIRC, the issue of possibly freeing hugetlb pages in IRQ context existed
from almost the beginning of hugetlb. It was first discovered and 'addressed'
with c77c0a8ac4c5. That was not cc:stable. Then it was discovered that c77c0a8ac4c5 was not complete, so db71ef79b59b effectively replaced c77c0a8ac4c5. That also was not cc:stable. I guess we could cc:stable this.

Mina, did you find this with lockdep or just code inspection?

Greg Thelen found this by code inspection. He was reviewing a related fix and noticed this particular instance of locking wasn't _irq(), and based on previous changes it ought to be. Lockdep did not complain about this.

Quoted 2 lines

--
Mike Kravetz