From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 4E51A280253 for ; Thu, 15 Sep 2016 07:55:47 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id v67so90199376pfv.1 for ; Thu, 15 Sep 2016 04:55:47 -0700 (PDT) Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id bm5si1150675pad.46.2016.09.15.04.55.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 15 Sep 2016 04:55:46 -0700 (PDT) From: "Kirill A. Shutemov" Subject: [PATCHv3 27/41] truncate: make invalidate_inode_pages2_range() aware about huge pages Date: Thu, 15 Sep 2016 14:55:09 +0300 Message-Id: <20160915115523.29737-28-kirill.shutemov@linux.intel.com> In-Reply-To: <20160915115523.29737-1-kirill.shutemov@linux.intel.com> References: <20160915115523.29737-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 | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/mm/truncate.c b/mm/truncate.c index 9c339e6255f2..6a445278aaaf 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -708,27 +708,34 @@ int invalidate_inode_pages2_range(struct address_space *mapping, continue; } wait_on_page_writeback(page); + page = compound_head(page); + if (page_mapped(page)) { + loff_t begin, len; + + begin = page->index << PAGE_SHIFT; + if (!did_range_unmap) { /* * Zap the rest of the file in one hit. */ + len = (loff_t)(1 + end - page->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)) @@ -737,6 +744,10 @@ int invalidate_inode_pages2_range(struct address_space *mapping, if (ret2 < 0) ret = ret2; unlock_page(page); + if (PageTransHuge(page)) { + index = page->index + HPAGE_PMD_NR - 1; + break; + } } pagevec_remove_exceptionals(&pvec); pagevec_release(&pvec); -- 2.9.3 -- 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