From patchwork Thu Jan 11 06:42:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 187190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1267137dyi; Wed, 10 Jan 2024 22:43:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmDY7WeBJC6lrSTTs76tvk2TzjlR6JLgF/eOpeJM/1Q9vya6OIgfG7wq/uY2jBVdvKPDJ0 X-Received: by 2002:a17:902:c94a:b0:1d4:b4b8:90c3 with SMTP id i10-20020a170902c94a00b001d4b4b890c3mr479587pla.6.1704955409147; Wed, 10 Jan 2024 22:43:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704955409; cv=none; d=google.com; s=arc-20160816; b=Vlk28K+t6swiarxgyOnPNdGfiGdnbY1EjPJ9l7wiKFSdpPt4rFbYEmUN2F3+T/g8Vk Hut3qJkAAwWZM2aFx2MG9Heb0Lv+v1c2vghGCZoAraf5JWtsa/rsF5mLtMids1mIYrFQ HeYjoZBvKZjQIaxD5IGIWENQxjMZ2ACHYwOKygpM1Iq6+U0SoRTz4HBc2d+k6HhSwOWB 7OvMN9KoBR5mUXOpwuAhHjsBBX7sgTR+dAf2BgUcyK0KM3yK6SHp7y7n0LEHZIeBUi8P tzClqYAxhLnsYeRdH+ZTNGmQ/NDi8+TBOZlRVbbExS+SrrWP/v4/YDwrNwEcRjaDCA6U qN1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=yeKIuTz1bsCdfikp5FUYPOopKkEcUeZEzGM9Lwmstm4=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=CVovajLWsPpwLi5jkrFbF1Y8UWIRQIJ4FBbjQEeKyq1po1bRmFea0vJZA82YoNC7vh Sjlcsc4WPG5582ocCsFe/KyRu+UUHG5/x/ueQtxoR5bqx4mE52RGK17mIWxBR7V9TjA0 Sp2sIKZ7Id7L4sraea5KQeBrrxtT2cKMwzG04BRyeufgpvmNyL+klxaJB6rKvddwyg/L 5oQHdRIqZcnVQEqT9d6MW4Zi2M19xnp3uPmD+TC9QP6ivApaA2R4mfGcbWHrVMJzrU1g mhPe15NJokBSBD5/LkyTN/Vh9d0Xm3FVBywJwCl3+sxnjbnKkcrYv9fuYk1XBAkK9ITA k9Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PMBIZr6M; spf=pass (google.com: domain of linux-kernel+bounces-23107-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23107-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id iw22-20020a170903045600b001d0a7201fe4si445190plb.310.2024.01.10.22.43.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 22:43:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-23107-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PMBIZr6M; spf=pass (google.com: domain of linux-kernel+bounces-23107-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-23107-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id C5A46B20F20 for ; Thu, 11 Jan 2024 06:43:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CAB30D282; Thu, 11 Jan 2024 06:42:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PMBIZr6M" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38CF76D39 for ; Thu, 11 Jan 2024 06:42:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC498C43394; Thu, 11 Jan 2024 06:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704955341; bh=6/dY3d4oSi9Bh/Fos8e/8u+HBUaz1c+XWFnL4CrSMbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PMBIZr6M9BCf1/BAuoqKsr1BxR5KPS+i0WbAys2Yqb3mjdqCnF+qlCNdRcVuA6xsz h5EyLqpY8gYtNIQCV+iWjl9K4H5IALD6R6YR1lxrFQwLg9h4wn98CvsVhPkdB/hsHc qE1T2tMtwkHwxQa2H4jNvV2YMRwUZK1iuTxhVOddWerMfuwsFRL9GqqtT5ZSJp19eL UihsqPjdwjXRC8Qy5M0epykzFuzvt+w9SadDKu8ioUqGGFoaE+VC+oeuFF85cSz0Df jPPGzLRHzOLwj2vjck3yWQ9/L0N/8kiHhPVxzhDn1Xy99BG27z0M/eMArfyQLJ/8L6 Q+ta8ZbL7UcbQ== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH v4 4/6] f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode Date: Thu, 11 Jan 2024 14:42:06 +0800 Message-Id: <20240111064208.2969599-4-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240111064208.2969599-1-chao@kernel.org> References: <20240111064208.2969599-1-chao@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787775322878964377 X-GMAIL-MSGID: 1787775322878964377 In reserve_compress_blocks(), we update blkaddrs of dnode in prior to inc_valid_block_count(), it may cause inconsistent status bewteen i_blocks and blkaddrs once inc_valid_block_count() fails. To fix this issue, it needs to reverse their invoking order. Fixes: c75488fb4d82 ("f2fs: introduce F2FS_IOC_RESERVE_COMPRESS_BLOCKS") Signed-off-by: Chao Yu Reviewed-by: Daeho Jeong --- fs/f2fs/data.c | 5 +++-- fs/f2fs/f2fs.h | 7 ++++++- fs/f2fs/file.c | 26 ++++++++++++++------------ fs/f2fs/segment.c | 2 +- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index b171a9980f6a..8d2ace723310 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1219,7 +1219,8 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count) if (unlikely(is_inode_flag_set(dn->inode, FI_NO_ALLOC))) return -EPERM; - if (unlikely((err = inc_valid_block_count(sbi, dn->inode, &count)))) + err = inc_valid_block_count(sbi, dn->inode, &count, true); + if (unlikely(err)) return err; trace_f2fs_reserve_new_blocks(dn->inode, dn->nid, @@ -1476,7 +1477,7 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type) dn->data_blkaddr = f2fs_data_blkaddr(dn); if (dn->data_blkaddr == NULL_ADDR) { - err = inc_valid_block_count(sbi, dn->inode, &count); + err = inc_valid_block_count(sbi, dn->inode, &count, true); if (unlikely(err)) return err; } diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 50f3d546ded8..69e71460a950 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2252,7 +2252,7 @@ static inline bool __allow_reserved_blocks(struct f2fs_sb_info *sbi, static inline void f2fs_i_blocks_write(struct inode *, block_t, bool, bool); static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, - struct inode *inode, blkcnt_t *count) + struct inode *inode, blkcnt_t *count, bool partial) { blkcnt_t diff = 0, release = 0; block_t avail_user_block_count; @@ -2292,6 +2292,11 @@ static inline int inc_valid_block_count(struct f2fs_sb_info *sbi, avail_user_block_count = 0; } if (unlikely(sbi->total_valid_block_count > avail_user_block_count)) { + if (!partial) { + spin_unlock(&sbi->stat_lock); + goto enospc; + } + diff = sbi->total_valid_block_count - avail_user_block_count; if (diff > *count) diff = *count; diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 80d9c4c096f0..53c495651789 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -3614,14 +3614,16 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count) blkcnt_t reserved; int ret; - for (i = 0; i < cluster_size; i++, dn->ofs_in_node++) { - blkaddr = f2fs_data_blkaddr(dn); + for (i = 0; i < cluster_size; i++) { + blkaddr = data_blkaddr(dn->inode, dn->node_page, + dn->ofs_in_node + i); if (i == 0) { - if (blkaddr == COMPRESS_ADDR) - continue; - dn->ofs_in_node += cluster_size; - goto next; + if (blkaddr != COMPRESS_ADDR) { + dn->ofs_in_node += cluster_size; + goto next; + } + continue; } /* @@ -3634,20 +3636,20 @@ static int reserve_compress_blocks(struct dnode_of_data *dn, pgoff_t count) compr_blocks++; continue; } - - f2fs_set_data_blkaddr(dn, NEW_ADDR); } reserved = cluster_size - compr_blocks; if (!reserved) goto next; - ret = inc_valid_block_count(sbi, dn->inode, &reserved); - if (ret) + ret = inc_valid_block_count(sbi, dn->inode, &reserved, false); + if (unlikely(ret)) return ret; - if (reserved != cluster_size - compr_blocks) - return -ENOSPC; + for (i = 0; i < cluster_size; i++, dn->ofs_in_node++) { + if (f2fs_data_blkaddr(dn) == NULL_ADDR) + f2fs_set_data_blkaddr(dn, NEW_ADDR); + } f2fs_i_compr_blocks_update(dn->inode, compr_blocks, true); diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 4c8836ded90f..ef5b3848426b 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -248,7 +248,7 @@ static int __replace_atomic_write_block(struct inode *inode, pgoff_t index, } else { blkcnt_t count = 1; - err = inc_valid_block_count(sbi, inode, &count); + err = inc_valid_block_count(sbi, inode, &count, true); if (err) { f2fs_put_dnode(&dn); return err;