From patchwork Wed Oct 21 06:25:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 11848437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18B4EC4363A for ; Wed, 21 Oct 2020 06:28:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D0D521D43 for ; Wed, 21 Oct 2020 06:28:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="hA1KDPxO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440874AbgJUG2b (ORCPT ); Wed, 21 Oct 2020 02:28:31 -0400 Received: from mx2.suse.de ([195.135.220.15]:45196 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440872AbgJUG2a (ORCPT ); Wed, 21 Oct 2020 02:28:30 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1603261709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WwtEX9GctKS04n+aWQNMJNQy7nnQbIwcQUC6nbpgzR8=; b=hA1KDPxObv8cefecz5Nks60lBgQvRCqbhh2QCUQRdwPYg2GSmCtSaJ1fcoQzbj7Qygx3BJ CYj84ORr6aBLvgZLC+0+Xu0d7QOqTHQiBl5mihHHWFrBN1lLpE5wvg3BFYeGCoH5mq5QYz ZyStmyl3eYjJ5PXIxXYkNS7bunUtx4w= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0A53EAC1D for ; Wed, 21 Oct 2020 06:28:29 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v4 67/68] btrfs: reflink: do full page writeback for reflink prepare Date: Wed, 21 Oct 2020 14:25:53 +0800 Message-Id: <20201021062554.68132-68-wqu@suse.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201021062554.68132-1-wqu@suse.com> References: <20201021062554.68132-1-wqu@suse.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Since we don't support subpage writeback yet, let btrfs_remap_file_range_prep() to do full page writeback. This only affects subpage support, as the regular sectorsize support already has its sectorsize == PAGE_SIZE. Signed-off-by: Qu Wenruo --- fs/btrfs/reflink.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c index 5cd02514cf4d..e8023c1dcb5d 100644 --- a/fs/btrfs/reflink.c +++ b/fs/btrfs/reflink.c @@ -700,9 +700,15 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in, { struct inode *inode_in = file_inode(file_in); struct inode *inode_out = file_inode(file_out); - u64 bs = BTRFS_I(inode_out)->root->fs_info->sb->s_blocksize; + /* + * We don't support subpage write yet, thus for data writeback we + * must use PAGE_SIZE here. But for reflink we still support proper + * sector alignment. + */ + u32 wb_bs = PAGE_SIZE; bool same_inode = inode_out == inode_in; - u64 wb_len; + u64 in_wb_len; + u64 out_wb_len; int ret; if (!(remap_flags & REMAP_FILE_DEDUP)) { @@ -735,11 +741,21 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in, * waits for the writeback to complete, i.e. for IO to be done, and * not for the ordered extents to complete. We need to wait for them * to complete so that new file extent items are in the fs tree. + * + * Also for subpage case, since at different offset the same length can + * cover different number of pages, we have to calculate the wb_len for + * each file. */ - if (*len == 0 && !(remap_flags & REMAP_FILE_DEDUP)) - wb_len = ALIGN(inode_in->i_size, bs) - ALIGN_DOWN(pos_in, bs); - else - wb_len = ALIGN(*len, bs); + if (*len == 0 && !(remap_flags & REMAP_FILE_DEDUP)) { + in_wb_len = round_up(inode_in->i_size, wb_bs) - + round_down(pos_in, wb_bs); + out_wb_len = in_wb_len; + } else { + in_wb_len = round_up(pos_in + *len, wb_bs) - + round_down(pos_in, wb_bs); + out_wb_len = round_up(pos_out + *len, wb_bs) - + round_down(pos_out, wb_bs); + } /* * Since we don't lock ranges, wait for ongoing lockless dio writes (as @@ -771,12 +787,12 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in, if (ret < 0) return ret; - ret = btrfs_wait_ordered_range(inode_in, ALIGN_DOWN(pos_in, bs), - wb_len); + ret = btrfs_wait_ordered_range(inode_in, round_down(pos_in, wb_bs), + in_wb_len); if (ret < 0) return ret; - ret = btrfs_wait_ordered_range(inode_out, ALIGN_DOWN(pos_out, bs), - wb_len); + ret = btrfs_wait_ordered_range(inode_out, round_down(pos_out, wb_bs), + out_wb_len); if (ret < 0) return ret;