From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id EB7766B027A for ; Thu, 26 Jan 2017 06:58:50 -0500 (EST) Received: by mail-pf0-f200.google.com with SMTP id y143so306627931pfb.6 for ; Thu, 26 Jan 2017 03:58:50 -0800 (PST) Received: from mga07.intel.com (mga07.intel.com. [134.134.136.100]) by mx.google.com with ESMTPS id j9si1196448pfc.290.2017.01.26.03.58.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 03:58:50 -0800 (PST) From: "Kirill A. Shutemov" Subject: [PATCHv6 21/37] truncate: make invalidate_inode_pages2_range() aware about huge pages Date: Thu, 26 Jan 2017 14:58:03 +0300 Message-Id: <20170126115819.58875-22-kirill.shutemov@linux.intel.com> In-Reply-To: <20170126115819.58875-1-kirill.shutemov@linux.intel.com> References: <20170126115819.58875-1-kirill.shutemov@linux.intel.com> Sender: owner-linux-mm@kvack.org List-ID: 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" For huge pages we need to unmap whole range covered by the huge page. Signed-off-by: Kirill A. Shutemov --- mm/truncate.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/mm/truncate.c b/mm/truncate.c index 81e1a13acb63..ddb615e6a193 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -703,27 +703,32 @@ int invalidate_inode_pages2_range(struct address_space *mapping, continue; } wait_on_page_writeback(page); + if (page_mapped(page)) { + loff_t begin, len; + + begin = index << PAGE_SHIFT; if (!did_range_unmap) { /* * Zap the rest of the file in one hit. */ + len = (loff_t)(1 + end - index) << + PAGE_SHIFT; + if (len < hpage_size(page)) + len = hpage_size(page); unmap_mapping_range(mapping, - (loff_t)index << PAGE_SHIFT, - (loff_t)(1 + end - index) - << PAGE_SHIFT, - 0); + begin, len, 0); did_range_unmap = 1; } else { /* * Just zap this page */ - unmap_mapping_range(mapping, - (loff_t)index << PAGE_SHIFT, - PAGE_SIZE, 0); + len = hpage_size(page); + unmap_mapping_range(mapping, begin, + len, 0); } } - BUG_ON(page_mapped(page)); + VM_BUG_ON_PAGE(page_mapped(page), page); ret2 = do_launder_page(mapping, page); if (ret2 == 0) { if (!invalidate_complete_page2(mapping, page)) @@ -734,9 +739,9 @@ int invalidate_inode_pages2_range(struct address_space *mapping, unlock_page(page); } pagevec_remove_exceptionals(&pvec); + index += pvec.nr ? hpage_nr_pages(pvec.pages[pvec.nr - 1]) : 1; pagevec_release(&pvec); cond_resched(); - index++; } cleancache_invalidate_inode(mapping); return ret; -- 2.11.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org