From: Ye Bin <yebin10@huawei.com>
To: <tytso@mit.edu>, <adilger.kernel@dilger.ca>,
<linux-ext4@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <jack@suse.cz>,
Ye Bin <yebin10@huawei.com>
Subject: [PATCH -next v2 6/6] ext4: fix possible store wrong check interval value in disk when umount
Date: Sat, 11 Sep 2021 17:00:59 +0800 [thread overview]
Message-ID: <20210911090059.1876456-7-yebin10@huawei.com> (raw)
In-Reply-To: <20210911090059.1876456-1-yebin10@huawei.com>
Test follow steps:
1. mkfs.ext4 /dev/sda -O mmp
2. mount /dev/sda /mnt
3. wait for about 1 minute
4. umount mnt
5. debugfs /dev/sda
6. dump_mmp
7. fsck.ext4 /dev/sda
I found 'check_interval' is range in [5, 10]. And sometime run fsck
print "MMP interval is 10 seconds and total wait time is 42 seconds.
Please wait...".
kmmpd:
...
if (diff < mmp_update_interval * HZ)
schedule_timeout_interruptible(mmp_update_interval * HZ - diff);
diff = jiffies - last_update_time;
...
mmp_check_interval = max(min(EXT4_MMP_CHECK_MULT * diff / HZ,
EXT4_MMP_MAX_CHECK_INTERVAL),
EXT4_MMP_MIN_CHECK_INTERVAL);
mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval);
...
We will call ext4_stop_mmpd to stop kmmpd kthread when umount, and
schedule_timeout_interruptible will be interrupted, so 'diff' maybe
little than mmp_update_interval. Then mmp_check_interval will range
in [EXT4_MMP_MAX_CHECK_INTERVAL, EXT4_MMP_CHECK_MULT * diff / HZ].
To solve this issue, if 'diff' little then mmp_update_interval * HZ
just break loop, don't update check interval.
Signed-off-by: Ye Bin <yebin10@huawei.com>
---
fs/ext4/mmp.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
index a0d47a906faa..f39e1fa0c6db 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c
@@ -205,6 +205,14 @@ static int kmmpd(void *data)
schedule_timeout_interruptible(mmp_update_interval *
HZ - diff);
diff = jiffies - last_update_time;
+ /* If 'diff' little 'than mmp_update_interval * HZ', it
+ * means someone call ext4_stop_mmpd to stop kmmpd
+ * kthread. We don't need to update mmp_check_interval
+ * any more, as 'diff' is not exact value.
+ */
+ if (unlikely(diff < mmp_update_interval * HZ &&
+ kthread_should_stop()))
+ break;
}
/*
--
2.31.1
next prev parent reply other threads:[~2021-09-11 8:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-11 9:00 [PATCH -next v2 0/6] Fix some issues about mmp Ye Bin
2021-09-11 9:00 ` [PATCH -next v2 1/6] ext4: init seq with random value in kmmpd Ye Bin
2021-10-07 12:26 ` Jan Kara
2021-10-08 1:50 ` yebin
2021-09-11 9:00 ` [PATCH -next v2 2/6] ext4: introduce last_check_time record previous check time Ye Bin
2021-10-07 12:31 ` Jan Kara
2021-10-08 1:56 ` yebin
2021-10-08 2:38 ` yebin
2021-10-12 8:47 ` Jan Kara
2021-10-12 11:46 ` yebin
2021-10-13 9:38 ` Jan Kara
2021-10-13 12:33 ` yebin
2021-10-13 21:41 ` Theodore Ts'o
2021-10-15 3:21 ` Andreas Dilger
2021-10-15 3:21 ` Andreas Dilger
2021-09-11 9:00 ` [PATCH -next v2 3/6] ext4: compare to local seq and nodename when check conflict Ye Bin
2021-10-07 12:36 ` Jan Kara
2021-09-11 9:00 ` [PATCH -next v2 4/6] ext4: avoid to re-read mmp check data get from page cache Ye Bin
2021-10-07 12:44 ` Jan Kara
2021-10-08 3:52 ` yebin
2021-09-11 9:00 ` [PATCH -next v2 5/6] ext4: avoid to double free s_mmp_bh Ye Bin
2021-09-11 9:00 ` Ye Bin [this message]
2021-10-07 13:12 ` [PATCH -next v2 6/6] ext4: fix possible store wrong check interval value in disk when umount Jan Kara
2021-10-08 3:49 ` yebin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210911090059.1876456-7-yebin10@huawei.com \
--to=yebin10@huawei.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).