Skip to content

Commit 273108f

Browse files
Lukas Czernertytso
Lukas Czerner
authored andcommitted
ext4: handle read only external journal device
Ext4 uses blkdev_get_by_dev() to get the block_device for journal device which does check to see if the read-only block device was opened read-only. As a result ext4 will hapily proceed mounting the file system with external journal on read-only device. This is bad as we would not be able to use the journal leading to errors later on. Instead of simply failing to mount file system in this case, treat it in a similar way we treat internal journal on read-only device. Allow to mount with -o noload in read-only mode. This can be reproduced easily like this: mke2fs -F -O journal_dev $JOURNAL_DEV 100M mkfs.$FSTYPE -F -J device=$JOURNAL_DEV $FS_DEV blockdev --setro $JOURNAL_DEV mount $FS_DEV $MNT touch $MNT/file umount $MNT leading to error like this [ 1307.318713] ------------[ cut here ]------------ [ 1307.323362] generic_make_request: Trying to write to read-only block-device dm-2 (partno 0) [ 1307.331741] WARNING: CPU: 36 PID: 3224 at block/blk-core.c:855 generic_make_request_checks+0x2c3/0x580 [ 1307.341041] Modules linked in: ext4 mbcache jbd2 rfkill intel_rapl_msr intel_rapl_common isst_if_commd [ 1307.419445] CPU: 36 PID: 3224 Comm: jbd2/dm-2 Tainted: G W I 5.8.0-rc5 #2 [ 1307.427359] Hardware name: Dell Inc. PowerEdge R740/01KPX8, BIOS 2.3.10 08/15/2019 [ 1307.434932] RIP: 0010:generic_make_request_checks+0x2c3/0x580 [ 1307.440676] Code: 94 03 00 00 48 89 df 48 8d 74 24 08 c6 05 cf 2b 18 01 01 e8 7f a4 ff ff 48 c7 c7 50e [ 1307.459420] RSP: 0018:ffffc0d70eb5fb48 EFLAGS: 00010286 [ 1307.464646] RAX: 0000000000000000 RBX: ffff9b33b2978300 RCX: 0000000000000000 [ 1307.471780] RDX: ffff9b33e12a81e0 RSI: ffff9b33e1298000 RDI: ffff9b33e1298000 [ 1307.478913] RBP: ffff9b7b9679e0c0 R08: 0000000000000837 R09: 0000000000000024 [ 1307.486044] R10: 0000000000000000 R11: ffffc0d70eb5f9f0 R12: 0000000000000400 [ 1307.493177] R13: 0000000000000000 R14: 0000000000000001 R15: 0000000000000000 [ 1307.500308] FS: 0000000000000000(0000) GS:ffff9b33e1280000(0000) knlGS:0000000000000000 [ 1307.508396] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1307.514142] CR2: 000055eaf4109000 CR3: 0000003dee40a006 CR4: 00000000007606e0 [ 1307.521273] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1307.528407] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 1307.535538] PKRU: 55555554 [ 1307.538250] Call Trace: [ 1307.540708] generic_make_request+0x30/0x340 [ 1307.544985] submit_bio+0x43/0x190 [ 1307.548393] ? bio_add_page+0x62/0x90 [ 1307.552068] submit_bh_wbc+0x16a/0x190 [ 1307.555833] jbd2_write_superblock+0xec/0x200 [jbd2] [ 1307.560803] jbd2_journal_update_sb_log_tail+0x65/0xc0 [jbd2] [ 1307.566557] jbd2_journal_commit_transaction+0x2ae/0x1860 [jbd2] [ 1307.572566] ? check_preempt_curr+0x7a/0x90 [ 1307.576756] ? update_curr+0xe1/0x1d0 [ 1307.580421] ? account_entity_dequeue+0x7b/0xb0 [ 1307.584955] ? newidle_balance+0x231/0x3d0 [ 1307.589056] ? __switch_to_asm+0x42/0x70 [ 1307.592986] ? __switch_to_asm+0x36/0x70 [ 1307.596918] ? lock_timer_base+0x67/0x80 [ 1307.600851] kjournald2+0xbd/0x270 [jbd2] [ 1307.604873] ? finish_wait+0x80/0x80 [ 1307.608460] ? commit_timeout+0x10/0x10 [jbd2] [ 1307.612915] kthread+0x114/0x130 [ 1307.616152] ? kthread_park+0x80/0x80 [ 1307.619816] ret_from_fork+0x22/0x30 [ 1307.623400] ---[ end trace 27490236265b1630 ]--- Signed-off-by: Lukas Czerner <lczerner@redhat.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Link: https://lore.kernel.org/r/20200717090605.2612-1-lczerner@redhat.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent 3cb77bd commit 273108f

File tree

1 file changed

+33
-18
lines changed

1 file changed

+33
-18
lines changed

fs/ext4/super.c

+33-18
Original file line numberDiff line numberDiff line change
@@ -5079,6 +5079,7 @@ static int ext4_load_journal(struct super_block *sb,
50795079
dev_t journal_dev;
50805080
int err = 0;
50815081
int really_read_only;
5082+
int journal_dev_ro;
50825083

50835084
if (WARN_ON_ONCE(!ext4_has_feature_journal(sb)))
50845085
return -EFSCORRUPTED;
@@ -5091,7 +5092,31 @@ static int ext4_load_journal(struct super_block *sb,
50915092
} else
50925093
journal_dev = new_decode_dev(le32_to_cpu(es->s_journal_dev));
50935094

5094-
really_read_only = bdev_read_only(sb->s_bdev);
5095+
if (journal_inum && journal_dev) {
5096+
ext4_msg(sb, KERN_ERR,
5097+
"filesystem has both journal inode and journal device!");
5098+
return -EINVAL;
5099+
}
5100+
5101+
if (journal_inum) {
5102+
journal = ext4_get_journal(sb, journal_inum);
5103+
if (!journal)
5104+
return -EINVAL;
5105+
} else {
5106+
journal = ext4_get_dev_journal(sb, journal_dev);
5107+
if (!journal)
5108+
return -EINVAL;
5109+
}
5110+
5111+
journal_dev_ro = bdev_read_only(journal->j_dev);
5112+
really_read_only = bdev_read_only(sb->s_bdev) | journal_dev_ro;
5113+
5114+
if (journal_dev_ro && !sb_rdonly(sb)) {
5115+
ext4_msg(sb, KERN_ERR,
5116+
"journal device read-only, try mounting with '-o ro'");
5117+
err = -EROFS;
5118+
goto err_out;
5119+
}
50955120

50965121
/*
50975122
* Are we loading a blank journal or performing recovery after a
@@ -5106,27 +5131,14 @@ static int ext4_load_journal(struct super_block *sb,
51065131
ext4_msg(sb, KERN_ERR, "write access "
51075132
"unavailable, cannot proceed "
51085133
"(try mounting with noload)");
5109-
return -EROFS;
5134+
err = -EROFS;
5135+
goto err_out;
51105136
}
51115137
ext4_msg(sb, KERN_INFO, "write access will "
51125138
"be enabled during recovery");
51135139
}
51145140
}
51155141

5116-
if (journal_inum && journal_dev) {
5117-
ext4_msg(sb, KERN_ERR, "filesystem has both journal "
5118-
"and inode journals!");
5119-
return -EINVAL;
5120-
}
5121-
5122-
if (journal_inum) {
5123-
if (!(journal = ext4_get_journal(sb, journal_inum)))
5124-
return -EINVAL;
5125-
} else {
5126-
if (!(journal = ext4_get_dev_journal(sb, journal_dev)))
5127-
return -EINVAL;
5128-
}
5129-
51305142
if (!(journal->j_flags & JBD2_BARRIER))
51315143
ext4_msg(sb, KERN_INFO, "barriers disabled");
51325144

@@ -5146,8 +5158,7 @@ static int ext4_load_journal(struct super_block *sb,
51465158

51475159
if (err) {
51485160
ext4_msg(sb, KERN_ERR, "error loading journal");
5149-
jbd2_journal_destroy(journal);
5150-
return err;
5161+
goto err_out;
51515162
}
51525163

51535164
EXT4_SB(sb)->s_journal = journal;
@@ -5167,6 +5178,10 @@ static int ext4_load_journal(struct super_block *sb,
51675178
}
51685179

51695180
return 0;
5181+
5182+
err_out:
5183+
jbd2_journal_destroy(journal);
5184+
return err;
51705185
}
51715186

51725187
static int ext4_commit_super(struct super_block *sb, int sync)

0 commit comments

Comments
 (0)