Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933327AbdDSHGz (ORCPT ); Wed, 19 Apr 2017 03:06:55 -0400 Received: from mga09.intel.com ([134.134.136.24]:17780 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760301AbdDSHGu (ORCPT ); Wed, 19 Apr 2017 03:06:50 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,220,1488873600"; d="scan'208";a="91213769" From: "Huang, Ying" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Johannes Weiner Subject: [PATCH -mm -v9 3/3] mm, THP, swap: Enable THP swap optimization only if has compound map Date: Wed, 19 Apr 2017 15:06:25 +0800 Message-Id: <20170419070625.19776-4-ying.huang@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170419070625.19776-1-ying.huang@intel.com> References: <20170419070625.19776-1-ying.huang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1288 Lines: 39 From: Huang Ying If there is no compound map for a THP (Transparent Huge Page), it is possible that the map count of some sub-pages of the THP is 0. So it is better to split the THP before swapping out. In this way, the sub-pages not mapped will be freed, and we can avoid the unnecessary swap out operations for these sub-pages. Cc: Johannes Weiner Signed-off-by: "Huang, Ying" --- mm/swap_state.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 3a3217f68937..b025c9878e5e 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -192,9 +192,15 @@ int add_to_swap(struct page *page, struct list_head *list) VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(!PageUptodate(page), page); - /* cannot split, skip it */ - if (unlikely(PageTransHuge(page)) && !can_split_huge_page(page, NULL)) - return 0; + if (unlikely(PageTransHuge(page))) { + /* cannot split, skip it */ + if (!can_split_huge_page(page, NULL)) + return 0; + /* fallback to split huge page firstly if no PMD map */ + if (!compound_mapcount(page) && + split_huge_page_to_list(page, list)) + return 0; + } retry: entry = get_swap_page(page); -- 2.11.0