hfs: rework MDB locking scheme
Subsystems (2)
Viacheslav Dubeyko
maintainerPATCH 1/1 hfs: rework MDB locking scheme
hfs_mdb_commit() used to hold the primary MDB buffer_head (mdb_bh) locked for the whole commit, including writing the alternate MDB and the volume bitmap. A corrupted image can set drVBMSt so the bitmap block aliases mdb_bh. The bitmap writeback path then calls lock_buffer() on that same buffer_head while it is already locked by hfs_mdb_commit(). Finally, we have a deadlock during flushing the MDB to the file system volume. However, even for valid images, the locking scheme of holding the mdb_bh locked across this much unrelated I/O is fragile anyway.
This patch adds a dedicated sbi->mdb_lock and take it around every hfs_mdb_commit() caller (hfs_sync_fs(), flush_mdb(), and the initial hfs_mdb_get() in hfs_fill_super()).
Additionally, this patch makes sbi->mdb/sbi->alt_mdb independent in-memory copies (allocated with kmemdup()) instead of pointers into mdb_bh's/alt_mdb_bh's page cache data. Every MDB field read or write in hfs_mdb_commit(), hfs_mdb_close() and hfs_mdb_get() now operates on these copies. Also, hfs_mdb_publish() and hfs_alt_mdb_publish() are the only places left that touch the buffer_heads. The hfs_mdb_put() frees the two copies.
--- fs/hfs/hfs_fs.h | 12 +++++-- fs/hfs/mdb.c | 84 ++++++++++++++++++++++++++++++++++++++----------- fs/hfs/super.c | 14 +++++++-- 3 files changed, 87 insertions(+), 23 deletions(-)
fs/hfs/hfs_fs.h +10 -2
@@ -64,14 +64,22 @@ struct hfs_inode_info {* The HFS-specific part of a Linux (struct super_block) */ struct hfs_sb_info { +struct mutex mdb_lock;/* MDB operations lock */ struct buffer_head *mdb_bh;/* The hfs_buffer holding the real superblock (aka VIB or MDB) */ -struct hfs_mdb *mdb; +unsigned int mdb_offset;/* byte offset of the MDB +sector within mdb_bh's +data */ +struct hfs_mdb *mdb;/* in-memory copy of the MDB */ struct buffer_head *alt_mdb_bh;/* The hfs_buffer holding the alternate superblock */ -struct hfs_mdb *alt_mdb; +unsigned int alt_mdb_offset;/* byte offset of the alternate +MDB sector within +alt_mdb_bh's data */ +struct hfs_mdb *alt_mdb;/* in-memory copy of the +alternate MDB */ __be32 *bitmap;/* The page holding the allocation bitmap */ struct hfs_btree *ext_tree;/* Information about
fs/hfs/mdb.c +65 -19
156 lines not on this page · raw message
fs/hfs/super.c +12 -2
@@ -34,8 +34,14 @@ MODULE_LICENSE("GPL");static int hfs_sync_fs (struct super_block *sb,int wait) { +int ret; + +mutex_lock (&HFS_SB (sb)->mdb_lock);is_hfs_cnid_counts_valid (sb); -return hfs_mdb_commit (sb); + ret =hfs_mdb_commit (sb); +mutex_unlock (&HFS_SB (sb)->mdb_lock); + +return ret; }/*
@@ -65,9 +71,10 @@ static void flush_mdb(struct work_struct *work) sbi->work_queued =0 ;spin_unlock (&sbi->work_lock); +mutex_lock (&sbi->mdb_lock);is_hfs_cnid_counts_valid (sb); -hfs_mdb_commit (sb); +mutex_unlock (&sbi->mdb_lock); }void hfs_mark_mdb_dirty (struct super_block *sb)
@@ -338,9 +345,12 @@ static int hfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_op = &hfs_super_operations; sb->s_xattr = hfs_xattr_handlers; sb->s_flags |=SB_NOATIME |SB_NODIRATIME ; +mutex_init (&sbi->mdb_lock);mutex_init (&sbi->bitmap_lock); +mutex_lock (&sbi->mdb_lock); res =hfs_mdb_get (sb); +mutex_unlock (&sbi->mdb_lock);if (res) {if (!silent) pr_warn("can't find a HFS filesystem on dev %s\n",
Signature · 1 line
2.43.0