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.