From patchwork Fri Mar 11 22:59:09 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: 8570111 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 590329F44D for ; Fri, 11 Mar 2016 23:03:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96D142034A for ; Fri, 11 Mar 2016 23:03:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAFD3202B8 for ; Fri, 11 Mar 2016 23:03:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933121AbcCKXDf (ORCPT ); Fri, 11 Mar 2016 18:03:35 -0500 Received: from mga03.intel.com ([134.134.136.65]:43655 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932781AbcCKW7i (ORCPT ); Fri, 11 Mar 2016 17:59:38 -0500 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP; 11 Mar 2016 14:59:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,321,1455004800"; d="scan'208";a="64558723" Received: from black.fi.intel.com ([10.237.72.93]) by fmsmga004.fm.intel.com with ESMTP; 11 Mar 2016 14:59:30 -0800 Received: by black.fi.intel.com (Postfix, from userid 1000) id 77C4F958; Sat, 12 Mar 2016 00:59:20 +0200 (EET) From: "Kirill A. Shutemov" To: Hugh Dickins , Andrea Arcangeli , Andrew Morton Cc: Dave Hansen , Vlastimil Babka , Christoph Lameter , Naoya Horiguchi , Jerome Marchand , Yang Shi , Sasha Levin , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv4 17/25] vmscan: split file huge pages before paging them out Date: Sat, 12 Mar 2016 01:59:09 +0300 Message-Id: <1457737157-38573-18-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457737157-38573-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1457737157-38573-1-git-send-email-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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is preparation of vmscan for file huge pages. We cannot write out huge pages, so we need to split them on the way out. Signed-off-by: Kirill A. Shutemov --- mm/vmscan.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index c72032dbe8db..9fa9e15594e9 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -473,12 +473,14 @@ void drop_slab(void) static inline int is_page_cache_freeable(struct page *page) { + int radix_tree_pins = PageTransHuge(page) ? HPAGE_PMD_NR : 1; + /* * A freeable page cache page is referenced only by the caller * that isolated the page, the page cache radix tree and * optional buffer heads at page->private. */ - return page_count(page) - page_has_private(page) == 2; + return page_count(page) - page_has_private(page) == 1 + radix_tree_pins; } static int may_write_to_inode(struct inode *inode, struct scan_control *sc) @@ -548,8 +550,6 @@ static pageout_t pageout(struct page *page, struct address_space *mapping, * swap_backing_dev_info is bust: it doesn't reflect the * congestion state of the swapdevs. Easy to fix, if needed. */ - if (!is_page_cache_freeable(page)) - return PAGE_KEEP; if (!mapping) { /* * Some data journaling orphaned pages can have @@ -1112,6 +1112,15 @@ static unsigned long shrink_page_list(struct list_head *page_list, * starts and then write it out here. */ try_to_unmap_flush_dirty(); + + if (!is_page_cache_freeable(page)) + goto keep_locked; + + if (unlikely(PageTransHuge(page))) { + if (split_huge_page_to_list(page, page_list)) + goto keep_locked; + } + switch (pageout(page, mapping, sc)) { case PAGE_KEEP: goto keep_locked;