From patchwork Sun Dec 10 11:35:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 176325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6473154vqy; Sun, 10 Dec 2023 03:36:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEzBH9Y/FMmqQLBkJ/7meOvr05Gdxjr0rqb9KONznYrifpQ6vkOHXxynqaRqdMt0QxO1n7n X-Received: by 2002:a05:6871:7389:b0:1fb:75c:3fe6 with SMTP id na9-20020a056871738900b001fb075c3fe6mr4376276oac.70.1702208191814; Sun, 10 Dec 2023 03:36:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702208191; cv=none; d=google.com; s=arc-20160816; b=bK3p9DyqOKwleNRN8AFYMZcEy4P50jHksSOsvTW3RgphQGr/GveHELQ5qkO5g6Xg3s afz0WUdNUNOn5lLMKUfCHQfwWeGrQurOHGZGU4ypCSATX4nPtWtTtkfbZ5hYG5bQeIX2 +mIzb0jTBZMWeHGkMNzeNCripZdQWZL06/lhUnesFdBzZg94GGuhnRsQdStxatLDsYPs y6upwNBEAEX+tEpRgEU0RqspnQe3DwMm02tKD4a0Nuzm/SJk7Hw9WXkqtKEpSqMO/HkW 0x9/8p2C3Zt/QYAHt9C4qwdg1ooZgcC1WAz6tPm/Acvb9nFdkrWoIAwoJLMBiVBSdPuO MrKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8+1qvF+S90X+3f5I0kunpxz8Hd4Y0sJorduuL2QvI20=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=jPwujIYsrTbBDXe5AWKx0seEzFLuX+Zny8jHy/rIUkSK6ybwvSgED2Vr5JDhQBpCyC vt6Euy7IfFzotjfN9BeZi/MVJdxmLgTgXik4Vx0PxfPolGdXcTAqJJHgjET+NccjcJ2K Qtq3GIAqrEXxxhsz/GOriHq4MMtKGoNirlISFc+S8rL1cXP3A4Ju2Bw4aAXVtIKgzHcC B0We8G9LyArLfyi/wCu5k4+App7T8OFu6g94/3HWazgbV18s2Ry6QFBDHnObNhQaZohb YxSwl4GBKb2vVx+Xtpr8GwJi33Qw2sU9O03TpR2PlfyuPiv9Et42C2ZDTgQqHYSfB8PN CyeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=enRuddIE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id f13-20020a65400d000000b005c6001ec190si4497706pgp.892.2023.12.10.03.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 03:36:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=enRuddIE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id CC0FB808EECD; Sun, 10 Dec 2023 03:36:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231778AbjLJLfy (ORCPT + 99 others); Sun, 10 Dec 2023 06:35:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjLJLfx (ORCPT ); Sun, 10 Dec 2023 06:35:53 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9430FA for ; Sun, 10 Dec 2023 03:35:59 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8C3AC433C7; Sun, 10 Dec 2023 11:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702208159; bh=rLcyF1ZrszFFVhog4TqrXAnFuqCYoRmQyE22OkV/4iY=; h=From:To:Cc:Subject:Date:From; b=enRuddIEf8bqGYbgra4E2dbFPYn2xIF/4SgpYcYlljGw7xqldMI0SUQIgjvBO2nuA BKwyGFp0hMoAm4BiD+wo9ZE9GHHSXHVSNQUP92fw3zQjDW9b2/Hp5z/L5tv3KJbqby 8SaZ056f/hCouqDOEXQglytYMp4RBzHAtfgz2DQA2TY3uBHmNpNbmAfzMtQPmPosCN CnGBtmVKkIslvgul/9tI9fhJkuHrBXbszL6W0YqMp29yvWLNS4Oz4QmCVrDKzrEB+M 41GlkTNJN4EkLSvW8GBmhHLNHAfIMG9+ohCQQjFvmms8VWHqdsuiZ728EhdNnDLkvi 0d/fCyzrGQPLQ== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 1/6] f2fs: fix to tag gcing flag on page during block migration Date: Sun, 10 Dec 2023 19:35:42 +0800 Message-Id: <20231210113547.3412782-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 10 Dec 2023 03:36:06 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784894656921449118 X-GMAIL-MSGID: 1784894656921449118 It needs to add missing gcing flag on page during block migration, in order to garantee migrated data be persisted during checkpoint, otherwise out-of-order persistency between data and node may cause data corruption after SPOR. Similar issue was fixed by commit 2d1fe8a86bf5 ("f2fs: fix to tag gcing flag on page during file defragment"). Signed-off-by: Chao Yu --- fs/f2fs/compress.c | 4 +++- fs/f2fs/file.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index b35be5799726..c5a4364c4482 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -1036,8 +1036,10 @@ static void set_cluster_dirty(struct compress_ctx *cc) int i; for (i = 0; i < cc->cluster_size; i++) - if (cc->rpages[i]) + if (cc->rpages[i]) { set_page_dirty(cc->rpages[i]); + set_page_private_gcing(cc->rpages[i]); + } } static int prepare_compress_overwrite(struct compress_ctx *cc, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 60290940018d..156b0ff05a3b 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1312,6 +1312,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, } memcpy_page(pdst, 0, psrc, 0, PAGE_SIZE); set_page_dirty(pdst); + set_page_private_gcing(pdst); f2fs_put_page(pdst, 1); f2fs_put_page(psrc, 1); @@ -4046,6 +4047,7 @@ static int redirty_blocks(struct inode *inode, pgoff_t page_idx, int len) f2fs_bug_on(F2FS_I_SB(inode), !page); set_page_dirty(page); + set_page_private_gcing(page); f2fs_put_page(page, 1); f2fs_put_page(page, 0); } From patchwork Sun Dec 10 11:35:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 176324 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6473043vqy; Sun, 10 Dec 2023 03:36:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZR5hCRcvzr6n9QcQNREYT1HRMtB6aGQyeTUWKUe56bzh+LkFqg05dq7Ddr4+BZBK1qN8Y X-Received: by 2002:a17:902:e789:b0:1d0:7c31:197e with SMTP id cp9-20020a170902e78900b001d07c31197emr3471701plb.57.1702208170672; Sun, 10 Dec 2023 03:36:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702208170; cv=none; d=google.com; s=arc-20160816; b=B5zdJTSRvunE/Hyz57uSzPge/WMG0rktUQTO38goks820huuUD6U2d+HqLK/sYqXpc tF4Lt/GJZlUc4oYKFW3XNvYOwiPNUOxH9ptVC0VXjxzSfXsT+hZI0DRfZ//Yr0W+WFwi 7cHgo4FJwedmlaoR372K4g/ccRcsh8UKBnAEyxEqXuFkCDNzWsBeogT/46ulV5NmHP42 7T0qp7WK22EozhbV75B1k3B+ILMlw0zG9dS4V+d3w8HNiT/DS3lNEX2+G7fZDNMxMqlg /tgB0zHynd/2ULpaK15wDfn47d/nJy5RfMLPhvhVFKW+4kI1Cz3Xw6PKOUQFlxm/C13P L0qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jcL7Yex4CvXuPOOYTfHIYu62fStL4uVqhA/YSylsCCc=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=T5TdsSaDdSAsNdzrajQuW0i1hZnOAnVPj7ULLZWhf5utaN7AOSnfgM7P6QILw02pAZ ip+27nC2rETJGaVKtjKjLUuTyjam6bUS9MZ8YT57l+7NZhSNj5QBLFDVfcQu0NMgqVWT xEOtokFRe1JlhaRqKcC34kdOTsGqBCXPtvXGX1O6v8pDqEKBkhMg4pN3fv977pQDMDh8 DkrbYyWxhfZfRlHbLcu+XlhjXcpKsvBF6kWyQcWTqKXqVGl+4rYFEjX9wGcGN+ae6ivh bMH2rylSSL9wJHqtzkZJtL1+DNTsIuDjNoG2Qb99OvwsDz4YR3sRCuK1K8c/OaORmbXO I+iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f0r5UZOC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id e8-20020a170902744800b001d086133cdbsi4473800plt.491.2023.12.10.03.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 03:36:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=f0r5UZOC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 9F8F7806B117; Sun, 10 Dec 2023 03:36:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231924AbjLJLf5 (ORCPT + 99 others); Sun, 10 Dec 2023 06:35:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjLJLfz (ORCPT ); Sun, 10 Dec 2023 06:35:55 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12620FA for ; Sun, 10 Dec 2023 03:36:02 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E864C433C9; Sun, 10 Dec 2023 11:35:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702208161; bh=dLds5jvPY7Yl05BDqmaObZ0ySYYRFXngO3CypVRgnUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f0r5UZOClT+qxOhTdmYQ5XIChARJWxNgHecNvTNmjAykLquVh3aAgFAyVWKqs2xep qZREYMfFsuYh0dUfNi9MHVzHXWebCXChp9SK6Bjbc20Y8MSlastnbfp3NIJF/6s5Cx KAxkucpK0lghl+M4lfsuwHNlpRYHfo14s6Z/OMF7Ld/ewODQSRj0sBvPw3lfXk+riR wizq5S8I54LwWIrKPmNy3ZcJlpE6KTcZ8M/77szdlhGFcTOtmeEZoblhMNagdh9KdM W3SwghyJX35n9dRggoyvpJS9YhzTpPa8PGq3Exvx/H48b6W1pGCOrwjVZ83ZbmJvvC 9UdldAVXXF8Hg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 2/6] f2fs: fix to wait on block writeback for post_read case Date: Sun, 10 Dec 2023 19:35:43 +0800 Message-Id: <20231210113547.3412782-2-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231210113547.3412782-1-chao@kernel.org> References: <20231210113547.3412782-1-chao@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sun, 10 Dec 2023 03:36:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784894634843097575 X-GMAIL-MSGID: 1784894634843097575 If inode is compressed, but not encrypted, it missed to call f2fs_wait_on_block_writeback() to wait for GCed page writeback in IPU write path. Thread A GC-Thread - f2fs_gc - do_garbage_collect - gc_data_segment - move_data_block - f2fs_submit_page_write migrate normal cluster's block via meta_inode's page cache - f2fs_write_single_data_page - f2fs_do_write_data_page - f2fs_inplace_write_data - f2fs_submit_page_bio IRQ - f2fs_read_end_io IRQ old data overrides new data due to out-of-order GC and common IO. - f2fs_read_end_io Fixes: 4c8ff7095bef ("f2fs: support data compression") Signed-off-by: Chao Yu --- fs/f2fs/data.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 27015b7875ae..dce8defdf4c7 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2556,9 +2556,6 @@ int f2fs_encrypt_one_page(struct f2fs_io_info *fio) page = fio->compressed_page ? fio->compressed_page : fio->page; - /* wait for GCed page writeback via META_MAPPING */ - f2fs_wait_on_block_writeback(inode, fio->old_blkaddr); - if (fscrypt_inode_uses_inline_crypto(inode)) return 0; @@ -2745,6 +2742,10 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) goto out_writepage; } + /* wait for GCed page writeback via META_MAPPING */ + if (fio->post_read) + f2fs_wait_on_block_writeback(inode, fio->old_blkaddr); + /* * If current allocation needs SSR, * it had better in-place writes for updated data. From patchwork Sun Dec 10 11:35:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 176326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6473158vqy; Sun, 10 Dec 2023 03:36:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEO0gtI7AGC5xQqjRUobeHh5bVb8Ie+a+j42H85USGY6txkgfM5G60xsU7FxQYWjKb5anTc X-Received: by 2002:a05:6e02:1c02:b0:357:4a63:2ad2 with SMTP id l2-20020a056e021c0200b003574a632ad2mr4590383ilh.21.1702208192486; Sun, 10 Dec 2023 03:36:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702208192; cv=none; d=google.com; s=arc-20160816; b=B4BTxFUkuJBqTx9muRyhy4xRiNx/du8pd8oHLdcY/6+l59eQ98TyGLjdH3yOY3twiT HB7ApLR3enGglWnKlckxN2XyPK4Guydu79cTrHhoGgNhN+dsbsALzfSoCMrROq5EHBba bz0CdVnvkPERTlciaPAx1G0+oCxWJHSTexsjRBaO66bk+OzyR5GRtGJIofXFcUUwZwM8 eFpWCftUKh3ioz5zv+JzznAB1g/YCgf8e7T4H06CgRpSLRpiVsINkyJ6AV+QhEQNOmun CjAjUx09U1vrquoQ+vLzDUBPgTlq8ed3+pNTOLffjxB1yZzdiNq+8bJts1OexZKTUP3x m2Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iU1aT0mmJyAWhLFKiZQwM8RSU3RFe2MlFfjAeYq2rx0=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=MsWc9Y/UVThWCJGrrU794b4YObs38k/PzJGD4BU69U4eTgUicV83S1ErBCGVGSqZkH kZ3nxNXSKq13z+RAdOpakc1BQ2R4d6CPdkaAmFnCtx8jFUX7Ylx+5lNlcmHkCwlwlfH7 LeAdkxuknDCyAj3xMD4iY+kK+I+AqbohWATOzsvcd5aHBOmkY2+9rZFUzQEBugJVRlXD ikfBfTYbMub0Jf4Ug/Stp9Tz8y89RKnHMuZI9zmPdq/lh9qaK9SzhaMQNvdnz391BtXm 2S8R38nFbOODP8ccfNQvnSIoPe43x/qI4guaI+hYCe7ikdPrqUv6td+FRPCQqjF9EDDv 3vmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tdPbIg6h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id j14-20020a170903024e00b001d1ce46f067si4518186plh.485.2023.12.10.03.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 03:36:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tdPbIg6h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id E6AD9808EEE0; Sun, 10 Dec 2023 03:36:17 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232001AbjLJLf6 (ORCPT + 99 others); Sun, 10 Dec 2023 06:35:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231948AbjLJLf5 (ORCPT ); Sun, 10 Dec 2023 06:35:57 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 573E4FD for ; Sun, 10 Dec 2023 03:36:04 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58A48C433CA; Sun, 10 Dec 2023 11:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702208164; bh=VE5AOlHytLIsYFQS7gWhjGZv4ckuyxkhp1hOk55UcyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tdPbIg6hNIf4BrSLKKH6gkTlFHSLALJrVqs3hKrjjDzV1Z7N4lyErMKyrSrhPqF7d iDT98jSa2Mz2myBQzmpz0LGNxShqhREACRFoJFP8z9mMvMC4j7W5fVpKMk9dvkoEht ZBJYvH5X4Eb4MjaeI0gwVC6rd7/wMWDI09mb4LImSzt8t/LBzhR1tibOn1tVzB831a kyx429rqHwieBBykrwNU6dE2nr8JRecr3bFGyPcb873PK3V2sKqqhhLxiSkvC9A+Cf qdJCcEvhTGnogiltiFqOifxY4+RzPMm8+eZanbGQJTjrsqQF0hP6+oDYrsX8KmHQnS /RHhQZ8M3q9aw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 3/6] f2fs: fix to check compress file in f2fs_move_file_range() Date: Sun, 10 Dec 2023 19:35:44 +0800 Message-Id: <20231210113547.3412782-3-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231210113547.3412782-1-chao@kernel.org> References: <20231210113547.3412782-1-chao@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 10 Dec 2023 03:36:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784894657226970213 X-GMAIL-MSGID: 1784894657226970213 f2fs_move_file_range() doesn't support migrating compressed cluster data, let's add the missing check condition and return -EOPNOTSUPP for the case until we support it. Fixes: 4c8ff7095bef ("f2fs: support data compression") Signed-off-by: Chao Yu --- fs/f2fs/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 156b0ff05a3b..5c2f99ada6be 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2813,6 +2813,11 @@ static int f2fs_move_file_range(struct file *file_in, loff_t pos_in, goto out; } + if (f2fs_compressed_file(src) || f2fs_compressed_file(dst)) { + ret = -EOPNOTSUPP; + goto out_unlock; + } + ret = -EINVAL; if (pos_in + len > src->i_size || pos_in + len < pos_in) goto out_unlock; From patchwork Sun Dec 10 11:35:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 176328 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6473222vqy; Sun, 10 Dec 2023 03:36:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGZIl6brwzC+PnEkWFlkg8qTgSXA6k2mEINzwZldnLAq2H4+4DWU4SJq0kb9mXK0gDWPXW7 X-Received: by 2002:a05:6808:1a2a:b0:3b8:b063:9b63 with SMTP id bk42-20020a0568081a2a00b003b8b0639b63mr3843084oib.85.1702208205350; Sun, 10 Dec 2023 03:36:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702208205; cv=none; d=google.com; s=arc-20160816; b=wqD+P3KW1JU+f5JSN+VZX7qaQ3kcERd0AdB3xAw1fMfzTup5tqzY9Wd6Is3NCT3flp aUiWkMKLT+RRNxOcAADX5JZdQZ0bmacRjlfo5FsTYqRXGQUirjVX+FUEq03W1cYZH2KN bqMdcMBH+0Refp64+TqDLHcIATU7T65+oP5SOfvci29lNjBnczmmWs9GFuCSDkRh4Rh0 Nbl7YkCRoCppBnCTsjepSq69S5YfZwDJBDkw1iGKdIUDqLKpoB8uSEdACTB4/goG409D Gh9wXrxltHrG572y/FQeqzXqeYGR0yVwYaYeY1Ca4T8rhrP/QKanwbBEj+6ehUQ2w/2E ov4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LoV3aU+OeYj0J0DMe7rQ2hXcaDTfLCZAvSvKZ4YzN/M=; fh=57R/jbvao+bAlCd2JjbYfhdIp+jidOB22zrbEQ4DLvw=; b=oo0pj7tWthQnIkeKWnvQ+oYIXgy57Wco223Rhy59JM/XssGQ9m1BAjenZ+IiRmrS0M H+JZD5eKethzh09E1V/SjQUNtXI8iMJNrPUJrS0sA8MFibVKdcNKbTglnYMXlBUl3uUk vDJoot+qA3d4xil3dEnYQgi9LsagZkc66RNRDDpEtnpRRL2y0PpBBy5HLePSwDfQiuTi +QGjumy4v0TSdm2evdJzBVDY9mAOgxgR4NN6R/jAE/ESiU5Gs92wIP+tXV5Y/BTvvqAu jd0kFjG06EfaYQzXOHJwgU/VL05Jtv/TazZ93PxofXufUlQFHnAqfernDYUd1cfYp38J 87lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K6wvItDi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id f19-20020a056a00239300b006ce5ba4300esi4448968pfc.219.2023.12.10.03.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 03:36:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K6wvItDi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1BC6C80699D4; Sun, 10 Dec 2023 03:36:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232190AbjLJLgF (ORCPT + 99 others); Sun, 10 Dec 2023 06:36:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232032AbjLJLgA (ORCPT ); Sun, 10 Dec 2023 06:36:00 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E541DFE for ; Sun, 10 Dec 2023 03:36:06 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2476C433C7; Sun, 10 Dec 2023 11:36:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702208166; bh=hIUlpOJ3aDB7nGkcog2qFsHcADMxnRlMDotLaomis/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K6wvItDiHuOzned+j4BhIjpFIQoZDWqwoE4wwGaR4Fw+eY5+AkRtDWnwteNFlwMrv +CaTN0Kh7EwMjhsSMWh/CfmCoTSjUstW04Q4ro+besEvfsC0nVcfwpr256ctyDlolw QCKDXMbUs5vv2nMM4qA7zii7GlhNcLsokDcrr8yVYiHm9OLgW6xznggE816B5fwOnb o/8/3pCllvh2sUfJolQ+l0fVepwd1uImEVX8aMmesN5mM8e61tuCJROLZI5Pl1XUrO xOK08NqPz5D2euciBnLvdkzhWYo2cVrDSUTy+0hPQoWwhowAezT3QysEst52Hq92Tn GYBWdA36GuvXw== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu , Eric Biggers Subject: [PATCH 4/6] f2fs: don't set FI_PREALLOCATED_ALL for partial write Date: Sun, 10 Dec 2023 19:35:45 +0800 Message-Id: <20231210113547.3412782-4-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231210113547.3412782-1-chao@kernel.org> References: <20231210113547.3412782-1-chao@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 10 Dec 2023 03:36:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784894670723954639 X-GMAIL-MSGID: 1784894670723954639 In f2fs_preallocate_blocks(), if it is partial write in 4KB, it's not necessary to call f2fs_map_blocks() and set FI_PREALLOCATED_ALL flag. Cc: Eric Biggers Signed-off-by: Chao Yu --- fs/f2fs/file.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 5c2f99ada6be..1a3c29a9a6a0 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4561,13 +4561,14 @@ static int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *iter, return ret; } - /* Do not preallocate blocks that will be written partially in 4KB. */ map.m_lblk = F2FS_BLK_ALIGN(pos); map.m_len = F2FS_BYTES_TO_BLK(pos + count); - if (map.m_len > map.m_lblk) - map.m_len -= map.m_lblk; - else - map.m_len = 0; + + /* Do not preallocate blocks that will be written partially in 4KB. */ + if (map.m_len <= map.m_lblk) + return 0; + + map.m_len -= map.m_lblk; map.m_may_create = true; if (dio) { map.m_seg_type = f2fs_rw_hint_to_seg_type(inode->i_write_hint); From patchwork Sun Dec 10 11:35:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 176327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6473219vqy; Sun, 10 Dec 2023 03:36:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGTG5tt5mxVps9V6/y+DX1dxlPROlb1oWz2zWoCQuTslU6omAmSrnOQmg2QGMQLIlyXqdAL X-Received: by 2002:a05:6a00:10cc:b0:6ce:71af:842b with SMTP id d12-20020a056a0010cc00b006ce71af842bmr3739496pfu.8.1702208204652; Sun, 10 Dec 2023 03:36:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702208204; cv=none; d=google.com; s=arc-20160816; b=jnBgODJ+F2j/r5F65oYc4lSw30ND5kA0SxWCsWS/1sW/j+JxcQE9W8jmbh4u4URyxl s48nW6viUUKz+xxrhw0RlPeuX62n2CFc77tB56JE6piIFTmocP9jwS4NhDtU/IMAc7vH KRuoAgP+yICi4j5mw9QPoT5B6Heq1+pxS58xh49VZcK7uhkzHPhf3pISbOQURayHskA5 Xth6WfCf2VZ6B8aCjQ0LS1X5vJc8tab9F2B9y1ycGVsiQZRwRvLPbMYMdqAkEWsl1f+T G0/3bzLUETpBdjRrgLgcHbO884QERizbo8DN459TqNG8u8QwN7Xgm9Tu4VmTgA7YUncp +PYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AHfFwKYujQQVoHs5zJPh6KRKf6rlctCcGvr++i9cGOI=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=py2CKtwNimtP0pKzoHmv/N0VIF2VRTSIhXIZe77iMF4uaNMj/LoUt7Fp6sWpBkGNmv EG70Sz40QItEC0NASr+7HpvN7hk3l8M95k7VXZtCMijRS18TEF+YsXRRXUGmndIdcbbs O2hHJxcTOVlo3zDJBjTC4ILHbY606rKguVE13yZqXvNyzqvrlF+Zusf9o7QMFSVRPbk1 w8BbSV9bWbL1ejyL5RSC5wOHQx5/aN2M+4txx7AzsdkR5WItUIbW30I0KsKhG/uuT1Xd lHFiySfcQyn+Hc7uhZf/J+saG8D+4bFBZV2lcE/nE6aKYOGtYrHWlo7b38UArwl0dLFE rdkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VhKpZ6bM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id k21-20020aa788d5000000b006cc096fa2d6si4432659pff.70.2023.12.10.03.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 03:36:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VhKpZ6bM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 536B28092DA0; Sun, 10 Dec 2023 03:36:22 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232204AbjLJLgK (ORCPT + 99 others); Sun, 10 Dec 2023 06:36:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232064AbjLJLgE (ORCPT ); Sun, 10 Dec 2023 06:36:04 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B156F11F for ; Sun, 10 Dec 2023 03:36:09 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C726C433CB; Sun, 10 Dec 2023 11:36:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702208168; bh=17M2pG5LF+yTUT42vRyb2J9RQolF4UPApTsylmOgOqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VhKpZ6bMkrzIwnh96I+1vV0Y2OCIZV/ymzd7baK1mrWUah3lbAoHJjqI7MB/s3SRm Vl4hGgaRM7HzUXf8iw7IiZQTR7CQzPHnmb0NF2RrsVZY68DRUwdGsaX3fwKzgXd2zJ JKdR5UcjWAcNU3PFutjamQmTrdJ6ubvaKMJdHjtaw927MIKe9aFFER8GfR5+fqAqdJ s7YwuahFs/xFV/RUX/bvsLCDeKpZ+TG9cuTsIiDfGsdYKC8ihmdV605qwAcFRtmUXk FyPeza8fPKgHSCoeyAaBiwEjhicRI1nEZKg88Q61Hs5j/YhVbRf2K4ZkP0h16h6wGZ 5KsDwZJHvABfQ== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 5/6] f2fs: fix to restrict condition of compress inode conversion Date: Sun, 10 Dec 2023 19:35:46 +0800 Message-Id: <20231210113547.3412782-5-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231210113547.3412782-1-chao@kernel.org> References: <20231210113547.3412782-1-chao@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 10 Dec 2023 03:36:22 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784894670321207408 X-GMAIL-MSGID: 1784894670321207408 This patch adds i_size check during compress inode conversion in order to avoid .page_mkwrite races w/ conversion. Fixes: 4c8ff7095bef ("f2fs: support data compression") Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 8 +++++++- fs/f2fs/file.c | 5 ++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 65294e3b0bef..c9b8a1953913 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4397,13 +4397,19 @@ static inline int set_compress_context(struct inode *inode) #endif } +static inline bool inode_has_data(struct inode *inode) +{ + return (S_ISREG(inode->i_mode) && + (F2FS_HAS_BLOCKS(inode) || i_size_read(inode))); +} + static inline bool f2fs_disable_compressed_file(struct inode *inode) { struct f2fs_inode_info *fi = F2FS_I(inode); if (!f2fs_compressed_file(inode)) return true; - if (S_ISREG(inode->i_mode) && F2FS_HAS_BLOCKS(inode)) + if (inode_has_data(inode)) return false; fi->i_flags &= ~F2FS_COMPR_FL; diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 1a3c29a9a6a0..8af4b29c3e1a 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1922,8 +1922,7 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) f2fs_down_write(&F2FS_I(inode)->i_sem); if (!f2fs_may_compress(inode) || - (S_ISREG(inode->i_mode) && - F2FS_HAS_BLOCKS(inode))) { + inode_has_data(inode)) { f2fs_up_write(&F2FS_I(inode)->i_sem); return -EINVAL; } @@ -3996,7 +3995,7 @@ static int f2fs_ioc_set_compress_option(struct file *filp, unsigned long arg) goto out; } - if (F2FS_HAS_BLOCKS(inode)) { + if (inode_has_data(inode)) { ret = -EFBIG; goto out; } From patchwork Sun Dec 10 11:35:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Yu X-Patchwork-Id: 176329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6473226vqy; Sun, 10 Dec 2023 03:36:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IEuxw38cEe9pWXOKhm3nZmcn0KD1eF5Yv2rjSWuNnEu4k4DdQLjX1wE2zzOxHK+WYkIkcql X-Received: by 2002:a05:6808:1642:b0:3b8:b063:9b4e with SMTP id az2-20020a056808164200b003b8b0639b4emr3534725oib.64.1702208206119; Sun, 10 Dec 2023 03:36:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702208206; cv=none; d=google.com; s=arc-20160816; b=UiyZtGeb5eq/ZXBlLgKwGMzjCRIOlthWLolDdnYeHOYmc1cXZd8p62yf4iWx6eLqSV H3YdMv7TRdyq07Iq0y4Li2x0Ioq+fPF0P8I3uUSOyfxloIB9awdaQV7miny5AlmgPwWf qu5sHeg9/Pr5WY8Nyx0LORsYnBvT2a+vKsxUA2nUtgQRs2l1arJkvTbdDeJHjIMhAnlV bwtOWZf0Vga67L21DXu8DM/XGSEyo65hWVMwLjc3jWzpkyl4TRVusHTDpOemFifL1+hG DoXiPpblT1tPRxJiZxK8kz9fyTvAwpi0+cfELgIkX0wp/VPhMc6pHE8wPi7clbtyCmKA XhmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=glIgoNkSYkwhi0PRsV07rpou1zBi+ZyTwk4LSDuCG/Y=; fh=X1/oBJvTGJUQ0YtRp03u+3tPfRw/dXXALWynfOSlfQQ=; b=Noo0AWVRfBHQ18tCdgjiWGjq0jcTuMrfpGTqytGWUfEM7Bn4C4WYJ7GW/rwd5TG4UF blfAn88RHzc0SZBMCJD9qrX6vn2aZdmd5QKHl/i8LmJZe/x4LsLTQjZqK5zk4ZMIIoew eeMlEaUDwv1tCJpWALPFL2q6thj77T9Big6AJ1eqiiUdUF/fP/SBQN2gfl1Pel1+7N6Z jbu2NKnXvnmYL71RiiOHA3v7nMWS0EMtn+/wPRverBZDLdvQIz+a++jLa14HkwkjHU2T Zrp2lvdVixaUXmEmjuOchgX1oB0ZFHarP/CqklY3xC8pPa8B2fjQF/C8m2oiRoEqNPZn p4hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KbTG84Pg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ca14-20020a056a02068e00b005c660b46609si4561444pgb.486.2023.12.10.03.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 03:36:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KbTG84Pg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D53708069F1F; Sun, 10 Dec 2023 03:36:30 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232387AbjLJLgO (ORCPT + 99 others); Sun, 10 Dec 2023 06:36:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231948AbjLJLgG (ORCPT ); Sun, 10 Dec 2023 06:36:06 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AE3B10B for ; Sun, 10 Dec 2023 03:36:11 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8620BC433C8; Sun, 10 Dec 2023 11:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702208171; bh=Iri4gOpboj6iTV2Mhz6ZedWpHWCjZ25WFJYUfWjqqLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KbTG84Pgti9Rg9nuZefYagaar6MmND/pXxRIOKNqNqT7kT9DvjLj816128RaHnyWA 1t856A8+B9XNMgz1U6jkxsyJZfSbbXH5LsaHkzIxLMHS94A6dr2KUzJHxhqUCpESI6 2oifUZYES9vTPlrjTDMTkq8Xws9JxGq29abvtKfa+B84E/5BReFxri9KwO907sef/O YW7ozaSjlb5xmxfpYfqPd9dhbQJ2Nhwx6D+Gbcan9V3Pqy9AdGjLWVzv/dUHAtFEoq Auxeql1cK/woKVsSH7GMCnjm0ClHQnpn5xteCEPDbhx8FLCdeL+73O6coYb8KAqZsB awUKW8/7XI8QA== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH 6/6] f2fs: fix to update iostat correctly in f2fs_filemap_fault() Date: Sun, 10 Dec 2023 19:35:47 +0800 Message-Id: <20231210113547.3412782-6-chao@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231210113547.3412782-1-chao@kernel.org> References: <20231210113547.3412782-1-chao@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 10 Dec 2023 03:36:31 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784894671946044746 X-GMAIL-MSGID: 1784894671946044746 In f2fs_filemap_fault(), it fixes to update iostat info only if VM_FAULT_LOCKED is tagged in return value of filemap_fault(). Fixes: 8b83ac81f428 ("f2fs: support read iostat") Signed-off-by: Chao Yu --- fs/f2fs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 8af4b29c3e1a..0626da43fa84 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -42,7 +42,7 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) vm_fault_t ret; ret = filemap_fault(vmf); - if (!ret) + if (ret & VM_FAULT_LOCKED) f2fs_update_iostat(F2FS_I_SB(inode), inode, APP_MAPPED_READ_IO, F2FS_BLKSIZE);