From patchwork Tue Nov 29 11:22:41 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: 9451633 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 BADF960710 for ; Tue, 29 Nov 2016 11:31:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DE05281A7 for ; Tue, 29 Nov 2016 11:31:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 907C0282E2; Tue, 29 Nov 2016 11:31:04 +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 950AF281A7 for ; Tue, 29 Nov 2016 11:31:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757275AbcK2LXp (ORCPT ); Tue, 29 Nov 2016 06:23:45 -0500 Received: from mga09.intel.com ([134.134.136.24]:51634 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756396AbcK2LXc (ORCPT ); Tue, 29 Nov 2016 06:23:32 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 29 Nov 2016 03:23:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,568,1473145200"; d="scan'208";a="10982345" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 29 Nov 2016 03:23:26 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id 8A1717C4; Tue, 29 Nov 2016 13:23:12 +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: [PATCHv5 13/36] mm: make write_cache_pages() work on huge pages Date: Tue, 29 Nov 2016 14:22:41 +0300 Message-Id: <20161129112304.90056-14-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161129112304.90056-1-kirill.shutemov@linux.intel.com> References: <20161129112304.90056-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 We writeback whole huge page a time. Let's adjust iteration this way. Signed-off-by: Kirill A. Shutemov --- include/linux/mm.h | 1 + include/linux/pagemap.h | 1 + mm/page-writeback.c | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 4424784ac374..582844ca0b23 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1045,6 +1045,7 @@ extern pgoff_t __page_file_index(struct page *page); */ static inline pgoff_t page_index(struct page *page) { + page = compound_head(page); if (unlikely(PageSwapCache(page))) return __page_file_index(page); return page->index; diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index e530e7b3b6b2..faa3fa173939 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -546,6 +546,7 @@ static inline void wait_on_page_locked(struct page *page) */ static inline void wait_on_page_writeback(struct page *page) { + page = compound_head(page); if (PageWriteback(page)) wait_on_page_bit(page, PG_writeback); } diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 290e8b7d3181..47d5b12c460e 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2209,7 +2209,7 @@ int write_cache_pages(struct address_space *mapping, * mapping. However, page->index will not change * because we have a reference on the page. */ - if (page->index > end) { + if (page_to_pgoff(page) > end) { /* * can't be range_cyclic (1st pass) because * end == -1 in that case. @@ -2218,7 +2218,12 @@ int write_cache_pages(struct address_space *mapping, break; } - done_index = page->index; + done_index = page_to_pgoff(page); + if (PageTransCompound(page)) { + index = round_up(index + 1, HPAGE_PMD_NR); + i += HPAGE_PMD_NR - + done_index % HPAGE_PMD_NR - 1; + } lock_page(page); @@ -2230,7 +2235,7 @@ int write_cache_pages(struct address_space *mapping, * even if there is now a new, dirty page at the same * pagecache address. */ - if (unlikely(page->mapping != mapping)) { + if (unlikely(page_mapping(page) != mapping)) { continue_unlock: unlock_page(page); continue; @@ -2268,7 +2273,8 @@ int write_cache_pages(struct address_space *mapping, * not be suitable for data integrity * writeout). */ - done_index = page->index + 1; + done_index = compound_head(page)->index + + hpage_nr_pages(page); done = 1; break; } @@ -2280,7 +2286,8 @@ int write_cache_pages(struct address_space *mapping, * keep going until we have written all the pages * we tagged for writeback prior to entering this loop. */ - if (--wbc->nr_to_write <= 0 && + wbc->nr_to_write -= hpage_nr_pages(page); + if (wbc->nr_to_write <= 0 && wbc->sync_mode == WB_SYNC_NONE) { done = 1; break;