From patchwork Wed Oct 20 03:18:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yebin (H)" X-Patchwork-Id: 1543681 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee2:21ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HYwTn6v9Zz9sNH for ; Wed, 20 Oct 2021 14:05:33 +1100 (AEDT) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4HYwTn67mdz4xd8 for ; Wed, 20 Oct 2021 14:05:33 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4HYwTn66HVz4xd9; Wed, 20 Oct 2021 14:05:33 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4HYwTn63pzz4xd8 for ; Wed, 20 Oct 2021 14:05:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbhJTDHp (ORCPT ); Tue, 19 Oct 2021 23:07:45 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:29915 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229657AbhJTDHo (ORCPT ); Tue, 19 Oct 2021 23:07:44 -0400 Received: from dggeme754-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4HYwNS097CzbnBN; Wed, 20 Oct 2021 11:00:56 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggeme754-chm.china.huawei.com (10.3.19.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.15; Wed, 20 Oct 2021 11:05:28 +0800 From: Ye Bin To: , , CC: , , Ye Bin Subject: [PATCH -next v5 1/3] ext4: compare to local seq and nodename when check conflict Date: Wed, 20 Oct 2021 11:18:00 +0800 Message-ID: <20211020031802.2312022-2-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211020031802.2312022-1-yebin10@huawei.com> References: <20211020031802.2312022-1-yebin10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggeme754-chm.china.huawei.com (10.3.19.100) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org As mmp and check_mmp is point to the same data, so there will never detect conflict. To solve this issue just compare to local data. Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/ext4.h | 5 ++++- fs/ext4/mmp.c | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 404dd50856e5..9a487a558787 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2601,6 +2601,8 @@ struct ext4_features { #define EXT4_MMP_SEQ_FSCK 0xE24D4D50U /* mmp_seq value when being fscked */ #define EXT4_MMP_SEQ_MAX 0xE24D4D4FU /* maximum valid mmp_seq value */ +#define EXT4_MMP_NODENAME_LEN 64 /* mmp_nodename length */ + struct mmp_struct { __le32 mmp_magic; /* Magic number for MMP */ __le32 mmp_seq; /* Sequence no. updated periodically */ @@ -2610,7 +2612,8 @@ struct mmp_struct { * purposes and do not affect the correctness of the algorithm */ __le64 mmp_time; /* Time last updated */ - char mmp_nodename[64]; /* Node which last updated MMP block */ + /* Node which last updated MMP block */ + char mmp_nodename[EXT4_MMP_NODENAME_LEN]; char mmp_bdevname[32]; /* Bdev which last updated MMP block */ /* diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c index cebea4270817..97d5a8136eb2 100644 --- a/fs/ext4/mmp.c +++ b/fs/ext4/mmp.c @@ -138,6 +138,7 @@ static int kmmpd(void *data) unsigned mmp_check_interval; unsigned long last_update_time; unsigned long diff; + char nodename[EXT4_MMP_NODENAME_LEN]; int retval = 0; mmp_block = le64_to_cpu(es->s_mmp_block); @@ -153,8 +154,8 @@ static int kmmpd(void *data) BUILD_BUG_ON(sizeof(mmp->mmp_bdevname) < BDEVNAME_SIZE); bdevname(bh->b_bdev, mmp->mmp_bdevname); - memcpy(mmp->mmp_nodename, init_utsname()->nodename, - sizeof(mmp->mmp_nodename)); + memcpy(nodename, init_utsname()->nodename, sizeof(nodename)); + memcpy(mmp->mmp_nodename, nodename, sizeof(mmp->mmp_nodename)); while (!kthread_should_stop() && !sb_rdonly(sb)) { if (!ext4_has_feature_mmp(sb)) { @@ -206,8 +207,8 @@ static int kmmpd(void *data) } mmp_check = (struct mmp_struct *)(bh_check->b_data); - if (mmp->mmp_seq != mmp_check->mmp_seq || - memcmp(mmp->mmp_nodename, mmp_check->mmp_nodename, + if (seq != mmp_check->mmp_seq || + memcmp(nodename, mmp_check->mmp_nodename, sizeof(mmp->mmp_nodename))) { dump_mmp_msg(sb, mmp_check, "Error while updating MMP info. " From patchwork Wed Oct 20 03:18:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yebin (H)" X-Patchwork-Id: 1543684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HYwTt3Yvwz9sNH for ; Wed, 20 Oct 2021 14:05:38 +1100 (AEDT) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee2:21ea]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4HYwTt2t1Mz4xbT for ; Wed, 20 Oct 2021 14:05:38 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4HYwTt2rcJz4xdB; Wed, 20 Oct 2021 14:05:38 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4HYwTt2nrnz4xbT for ; Wed, 20 Oct 2021 14:05:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229843AbhJTDHu (ORCPT ); Tue, 19 Oct 2021 23:07:50 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:25171 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbhJTDHp (ORCPT ); Tue, 19 Oct 2021 23:07:45 -0400 Received: from dggeme754-chm.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4HYwRg3bVDz1DHfD; Wed, 20 Oct 2021 11:03:43 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggeme754-chm.china.huawei.com (10.3.19.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.15; Wed, 20 Oct 2021 11:05:29 +0800 From: Ye Bin To: , , CC: , , Ye Bin Subject: [PATCH -next v5 2/3] ext4: remove useless bh_check variable Date: Wed, 20 Oct 2021 11:18:01 +0800 Message-ID: <20211020031802.2312022-3-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211020031802.2312022-1-yebin10@huawei.com> References: <20211020031802.2312022-1-yebin10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggeme754-chm.china.huawei.com (10.3.19.100) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Since we initialize 'bh_check' to NULL and pass it to read_mmp_block(), that function will just call sb_getblk() which will just return the buffer_head we have in 'bh'. So just remove the pointless 'bh_check' variable and use 'bh' directly. Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/mmp.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c index 97d5a8136eb2..9788c617e593 100644 --- a/fs/ext4/mmp.c +++ b/fs/ext4/mmp.c @@ -195,10 +195,7 @@ static int kmmpd(void *data) */ diff = jiffies - last_update_time; if (diff > mmp_check_interval * HZ) { - struct buffer_head *bh_check = NULL; - struct mmp_struct *mmp_check; - - retval = read_mmp_block(sb, &bh_check, mmp_block); + retval = read_mmp_block(sb, &bh, mmp_block); if (retval) { ext4_error_err(sb, -retval, "error reading MMP data: %d", @@ -206,20 +203,18 @@ static int kmmpd(void *data) goto wait_to_exit; } - mmp_check = (struct mmp_struct *)(bh_check->b_data); - if (seq != mmp_check->mmp_seq || - memcmp(nodename, mmp_check->mmp_nodename, - sizeof(mmp->mmp_nodename))) { - dump_mmp_msg(sb, mmp_check, + mmp = (struct mmp_struct *)(bh->b_data); + if (seq != le32_to_cpu(mmp->mmp_seq) || + memcmp(nodename, mmp->mmp_nodename, + sizeof(nodename))) { + dump_mmp_msg(sb, mmp, "Error while updating MMP info. " "The filesystem seems to have been" " multiply mounted."); ext4_error_err(sb, EBUSY, "abort"); - put_bh(bh_check); retval = -EBUSY; goto wait_to_exit; } - put_bh(bh_check); } /* From patchwork Wed Oct 20 03:18:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "yebin (H)" X-Patchwork-Id: 1543682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee2:21ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HYwTs64hNz9sNH for ; Wed, 20 Oct 2021 14:05:37 +1100 (AEDT) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4HYwTs5N0cz4xd9 for ; Wed, 20 Oct 2021 14:05:37 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4HYwTs5Lkzz4xdB; Wed, 20 Oct 2021 14:05:37 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4HYwTs5HxJz4xd9 for ; Wed, 20 Oct 2021 14:05:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229790AbhJTDHs (ORCPT ); Tue, 19 Oct 2021 23:07:48 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:14832 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229678AbhJTDHp (ORCPT ); Tue, 19 Oct 2021 23:07:45 -0400 Received: from dggeme754-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4HYwN20g05z905l; Wed, 20 Oct 2021 11:00:34 +0800 (CST) Received: from huawei.com (10.175.127.227) by dggeme754-chm.china.huawei.com (10.3.19.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.15; Wed, 20 Oct 2021 11:05:29 +0800 From: Ye Bin To: , , CC: , , Ye Bin Subject: [PATCH -next v5 3/3] ext4: simplify read_mmp_block fucntion Date: Wed, 20 Oct 2021 11:18:02 +0800 Message-ID: <20211020031802.2312022-4-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211020031802.2312022-1-yebin10@huawei.com> References: <20211020031802.2312022-1-yebin10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggeme754-chm.china.huawei.com (10.3.19.100) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch is according to Jan Kara's suggestion: I guess I would just get rid of sb_getblk() in read_mmp_block() and always expect valid bh passed. The only place that passes NULL bh after this patch is one case in ext4_multi_mount_protect() and that can call sb_getblk() on its own. That way we can also simplify read_mmp_block() prototype to: static int read_mmp_block(struct super_block *sb, struct buffer_head *bh); Signed-off-by: Ye Bin Reviewed-by: Jan Kara --- fs/ext4/mmp.c | 46 +++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c index 9788c617e593..d46239a0e36b 100644 --- a/fs/ext4/mmp.c +++ b/fs/ext4/mmp.c @@ -64,33 +64,26 @@ static int write_mmp_block(struct super_block *sb, struct buffer_head *bh) /* * Read the MMP block. It _must_ be read from disk and hence we clear the * uptodate flag on the buffer. + * Caller must ensure pass valid 'bh'. */ -static int read_mmp_block(struct super_block *sb, struct buffer_head **bh, - ext4_fsblk_t mmp_block) +static int read_mmp_block(struct super_block *sb, struct buffer_head *bh) { struct mmp_struct *mmp; int ret; - if (*bh) - clear_buffer_uptodate(*bh); - - /* This would be sb_bread(sb, mmp_block), except we need to be sure - * that the MD RAID device cache has been bypassed, and that the read - * is not blocked in the elevator. */ - if (!*bh) { - *bh = sb_getblk(sb, mmp_block); - if (!*bh) { - ret = -ENOMEM; - goto warn_exit; - } + if (!bh) { + ret = -EINVAL; + goto warn_exit; } - lock_buffer(*bh); - ret = ext4_read_bh(*bh, REQ_META | REQ_PRIO, NULL); + clear_buffer_uptodate(bh); + + lock_buffer(bh); + ret = ext4_read_bh(bh, REQ_META | REQ_PRIO, NULL); if (ret) goto warn_exit; - mmp = (struct mmp_struct *)((*bh)->b_data); + mmp = (struct mmp_struct *)((bh)->b_data); if (le32_to_cpu(mmp->mmp_magic) != EXT4_MMP_MAGIC) { ret = -EFSCORRUPTED; goto warn_exit; @@ -101,10 +94,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh, } return 0; warn_exit: - brelse(*bh); - *bh = NULL; - ext4_warning(sb, "Error %d while reading MMP block %llu", - ret, mmp_block); + ext4_warning(sb, "Error %d while reading MMP block", ret); return ret; } @@ -131,7 +121,6 @@ static int kmmpd(void *data) struct ext4_super_block *es = EXT4_SB(sb)->s_es; struct buffer_head *bh = EXT4_SB(sb)->s_mmp_bh; struct mmp_struct *mmp; - ext4_fsblk_t mmp_block; u32 seq = 0; unsigned long failed_writes = 0; int mmp_update_interval = le16_to_cpu(es->s_mmp_update_interval); @@ -141,7 +130,6 @@ static int kmmpd(void *data) char nodename[EXT4_MMP_NODENAME_LEN]; int retval = 0; - mmp_block = le64_to_cpu(es->s_mmp_block); mmp = (struct mmp_struct *)(bh->b_data); mmp->mmp_time = cpu_to_le64(ktime_get_real_seconds()); /* @@ -195,7 +183,7 @@ static int kmmpd(void *data) */ diff = jiffies - last_update_time; if (diff > mmp_check_interval * HZ) { - retval = read_mmp_block(sb, &bh, mmp_block); + retval = read_mmp_block(sb, bh); if (retval) { ext4_error_err(sb, -retval, "error reading MMP data: %d", @@ -289,7 +277,11 @@ int ext4_multi_mount_protect(struct super_block *sb, goto failed; } - retval = read_mmp_block(sb, &bh, mmp_block); + bh = sb_getblk(sb, mmp_block); + if (!bh) + goto failed; + + retval = read_mmp_block(sb, bh); if (retval) goto failed; @@ -327,7 +319,7 @@ int ext4_multi_mount_protect(struct super_block *sb, goto failed; } - retval = read_mmp_block(sb, &bh, mmp_block); + retval = read_mmp_block(sb, bh); if (retval) goto failed; mmp = (struct mmp_struct *)(bh->b_data); @@ -356,7 +348,7 @@ int ext4_multi_mount_protect(struct super_block *sb, goto failed; } - retval = read_mmp_block(sb, &bh, mmp_block); + retval = read_mmp_block(sb, bh); if (retval) goto failed; mmp = (struct mmp_struct *)(bh->b_data);