From patchwork Thu Jan 26 11:58:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 9538997 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 31B32601D7 for ; Thu, 26 Jan 2017 12:01:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AEE526E91 for ; Thu, 26 Jan 2017 12:01:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FA1B2818E; Thu, 26 Jan 2017 12:01:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE6AB26E91 for ; Thu, 26 Jan 2017 12:01:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753876AbdAZMBL (ORCPT ); Thu, 26 Jan 2017 07:01:11 -0500 Received: from mga07.intel.com ([134.134.136.100]:55662 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753623AbdAZL72 (ORCPT ); Thu, 26 Jan 2017 06:59:28 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP; 26 Jan 2017 03:59:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,289,1477983600"; d="scan'208";a="1118090025" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 26 Jan 2017 03:59:18 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id A9B2B687; Thu, 26 Jan 2017 13:58:26 +0200 (EET) From: "Kirill A. Shutemov" To: "Theodore Ts'o" , Andreas Dilger , Jan Kara , Andrew Morton Cc: Alexander Viro , Hugh Dickins , Andrea Arcangeli , Dave Hansen , Vlastimil Babka , Matthew Wilcox , Ross Zwisler , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv6 32/37] ext4: make EXT4_IOC_MOVE_EXT work with huge pages Date: Thu, 26 Jan 2017 14:58:14 +0300 Message-Id: <20170126115819.58875-33-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170126115819.58875-1-kirill.shutemov@linux.intel.com> References: <20170126115819.58875-1-kirill.shutemov@linux.intel.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Adjust how we find relevant block within page and how we clear the required part of the page. Signed-off-by: Kirill A. Shutemov --- fs/ext4/move_extent.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 6fc14def0c70..2efa9deb47a9 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -210,7 +210,9 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to) return err; } if (!buffer_mapped(bh)) { - zero_user(page, block_start, blocksize); + zero_user(page + block_start / PAGE_SIZE, + block_start % PAGE_SIZE, + blocksize); set_buffer_uptodate(bh); continue; } @@ -267,10 +269,11 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, unsigned int tmp_data_size, data_size, replaced_size; int i, err2, jblocks, retries = 0; int replaced_count = 0; - int from = data_offset_in_page << orig_inode->i_blkbits; + int from; int blocks_per_page = PAGE_SIZE >> orig_inode->i_blkbits; struct super_block *sb = orig_inode->i_sb; struct buffer_head *bh = NULL; + int diff; /* * It needs twice the amount of ordinary journal buffers because @@ -355,6 +358,9 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, goto unlock_pages; } data_copy: + diff = (pagep[0] - compound_head(pagep[0])) * blocks_per_page; + from = (data_offset_in_page + diff) << orig_inode->i_blkbits; + pagep[0] = compound_head(pagep[0]); *err = mext_page_mkuptodate(pagep[0], from, from + replaced_size); if (*err) goto unlock_pages; @@ -384,7 +390,7 @@ move_extent_per_page(struct file *o_filp, struct inode *donor_inode, if (!page_has_buffers(pagep[0])) create_empty_buffers(pagep[0], 1 << orig_inode->i_blkbits, 0); bh = page_buffers(pagep[0]); - for (i = 0; i < data_offset_in_page; i++) + for (i = 0; i < data_offset_in_page + diff; i++) bh = bh->b_this_page; for (i = 0; i < block_len_in_page; i++) { *err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);