From patchwork Tue Oct 25 00:13:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A . Shutemov" X-Patchwork-Id: 9393641 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 462A96086B for ; Tue, 25 Oct 2016 00:18:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36DF228F00 for ; Tue, 25 Oct 2016 00:18:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2AEA528F26; Tue, 25 Oct 2016 00:18:34 +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 D692728F26 for ; Tue, 25 Oct 2016 00:18:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965496AbcJYASP (ORCPT ); Mon, 24 Oct 2016 20:18:15 -0400 Received: from mga03.intel.com ([134.134.136.65]:64008 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S940867AbcJYAOb (ORCPT ); Mon, 24 Oct 2016 20:14:31 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 24 Oct 2016 17:14:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,543,1473145200"; d="scan'208";a="777123314" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 24 Oct 2016 17:14:23 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 4BD96D20; Tue, 25 Oct 2016 03:13:47 +0300 (EEST) 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: [PATCHv4 40/43] ext4: fix SEEK_DATA/SEEK_HOLE for huge pages Date: Tue, 25 Oct 2016 03:13:39 +0300 Message-Id: <20161025001342.76126-41-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161025001342.76126-1-kirill.shutemov@linux.intel.com> References: <20161025001342.76126-1-kirill.shutemov@linux.intel.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ext4_find_unwritten_pgoff() needs few tweaks to work with huge pages. Mostly trivial page_mapping()/page_to_pgoff() and adjustment to how we find relevant block. Signe-off-by: Kirill A. Shutemov --- fs/ext4/file.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 2a822d30e73f..8b70c1660342 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -467,7 +467,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, * range, it will be a hole. */ if (lastoff < endoff && whence == SEEK_HOLE && - page->index > end) { + page_to_pgoff(page) > end) { found = 1; *offset = lastoff; goto out; @@ -475,7 +475,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, lock_page(page); - if (unlikely(page->mapping != inode->i_mapping)) { + if (unlikely(page_mapping(page) != inode->i_mapping)) { unlock_page(page); continue; } @@ -486,8 +486,12 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, } if (page_has_buffers(page)) { + int diff; lastoff = page_offset(page); bh = head = page_buffers(page); + diff = (page - compound_head(page)) << inode->i_blkbits; + while (diff--) + bh = bh->b_this_page; do { if (buffer_uptodate(bh) || buffer_unwritten(bh)) { @@ -508,8 +512,12 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, } while (bh != head); } - lastoff = page_offset(page) + PAGE_SIZE; + lastoff = page_offset(page) + hpage_size(page); unlock_page(page); + if (PageTransCompound(page)) { + i++; + break; + } } /* @@ -522,7 +530,9 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, break; } - index = pvec.pages[i - 1]->index + 1; + index = page_to_pgoff(pvec.pages[i - 1]) + 1; + if (PageTransCompound(pvec.pages[i - 1])) + index = round_up(index, HPAGE_PMD_NR); pagevec_release(&pvec); } while (index <= end);