Commit d9e14a4e authored by Brian Foster's avatar Brian Foster Committed by Kent Overstreet

bcachefs: remove sb lock and flags update on explicit shutdown

bcachefs grabs s_umount and sets SB_RDONLY when the fs is shutdown
via the ioctl() interface. This has a couple issues related to
interactions between shutdown and freeze:

1. The flags == FSOP_GOING_FLAGS_DEFAULT case is a deadlock vector
   because freeze_bdev() calls into freeze_super(), which also
   acquires s_umount.

2. If an explicit shutdown occurs while the sb is frozen, SB_RDONLY
   alters the thaw path as if the sb was read-only at freeze time.
   This effectively leaks the frozen state and leaves the sb frozen
   indefinitely.

The usage of SB_RDONLY here goes back to the initial bcachefs commit
and AFAICT is simply historical behavior. This behavior is unique to
bcachefs relative to the handful of other filesystems that support
the shutdown ioctl(). Typically, SB_RDONLY is reserved for the
proper remount path, which itself is restricted from modifying
frozen superblocks in reconfigure_super(). Drop the unnecessary sb
lock and flags update bch2_ioc_goingdown() to address both of these
issues.
Signed-off-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent a56c6171
...@@ -285,34 +285,26 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg) ...@@ -285,34 +285,26 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg)
bch_notice(c, "shutdown by ioctl type %u", flags); bch_notice(c, "shutdown by ioctl type %u", flags);
down_write(&c->vfs_sb->s_umount);
switch (flags) { switch (flags) {
case FSOP_GOING_FLAGS_DEFAULT: case FSOP_GOING_FLAGS_DEFAULT:
ret = freeze_bdev(c->vfs_sb->s_bdev); ret = freeze_bdev(c->vfs_sb->s_bdev);
if (ret) if (ret)
goto err; break;
bch2_journal_flush(&c->journal); bch2_journal_flush(&c->journal);
c->vfs_sb->s_flags |= SB_RDONLY;
bch2_fs_emergency_read_only(c); bch2_fs_emergency_read_only(c);
thaw_bdev(c->vfs_sb->s_bdev); thaw_bdev(c->vfs_sb->s_bdev);
break; break;
case FSOP_GOING_FLAGS_LOGFLUSH: case FSOP_GOING_FLAGS_LOGFLUSH:
bch2_journal_flush(&c->journal); bch2_journal_flush(&c->journal);
fallthrough; fallthrough;
case FSOP_GOING_FLAGS_NOLOGFLUSH: case FSOP_GOING_FLAGS_NOLOGFLUSH:
c->vfs_sb->s_flags |= SB_RDONLY;
bch2_fs_emergency_read_only(c); bch2_fs_emergency_read_only(c);
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
err:
up_write(&c->vfs_sb->s_umount);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment