From patchwork Fri Dec 14 06:27:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10730623 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 66CE214E2 for ; Fri, 14 Dec 2018 06:28:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55B402CC8C for ; Fri, 14 Dec 2018 06:28:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 495DF2CC99; Fri, 14 Dec 2018 06:28:15 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 969952CC8C for ; Fri, 14 Dec 2018 06:28:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 13A088E01B2; Fri, 14 Dec 2018 01:28:06 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0F6BB8E0014; Fri, 14 Dec 2018 01:28:05 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBAB98E01B2; Fri, 14 Dec 2018 01:28:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 9D55C8E0014 for ; Fri, 14 Dec 2018 01:28:05 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id p15so3569548pfk.7 for ; Thu, 13 Dec 2018 22:28:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=zy8/cYBmUCDWIC2PKdCOC5C+rBMjybFE5MBESnGiePo=; b=uLEOXFsjnLvY02mTT2nSpCK/nDU0zaHoc27zuTn3JH4Rqb3LyqKWbWQ8QK5Tcml33h YDcZBHuItwkDks9n5/Qb1EtKLRjJBIMjEsVyA3seACkzyJvqJoLvlNGyMjT99mxVvfI1 5eAyDCamDBvpQjOULeotoYv+c4Wy+Y8sRtIrEIRp2SOCbAP8hX1GBAEq7S8k03mt/Yol RJuifXtQtLk81JRqlLN39jJm1fB7TDqX9RfzybSFOgDLE266vPi54LCzKsQ+gkbPPeY0 GP9US76X2HmOwzXVhc785+FS0CCJHvfOUSsM04kRtJuF9JGUsrD4QfjRBbQpBA+gVtsW RkDQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AA+aEWbu9QckoWDRB580kyzvBABuMG1RGbsWJTfk1BR/EoKND84LL1uG R7FQVnGe+y0WJ/PdzN/CueOWoaYeBZIvd4fvPqhrRK5e2LqS4x4TZxlcEsNBr4y2VsKmerWmoj3 noTYwwnVI89c43d7t1W1bLFMWgg7bfMcrYtaJE4lRMmFR2n+Gp2ASEklWfArFmalHsw== X-Received: by 2002:a63:d655:: with SMTP id d21mr1663922pgj.280.1544768885241; Thu, 13 Dec 2018 22:28:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/W9bUS2BGCaU7z6lht2754REuKQ79T9iU70OGZ+AZuv1+gI6/SrHJfLJteI7Gsi3K0kUTVe X-Received: by 2002:a63:d655:: with SMTP id d21mr1663884pgj.280.1544768884012; Thu, 13 Dec 2018 22:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544768883; cv=none; d=google.com; s=arc-20160816; b=gUztaDelEM3qTShhexrtXvXSgHd6+5st2jnZD23Ooq8YolyEgl/SHgUtfeoRqq79r/ /S8Hw+ph9nRpoDbSUMPsvWJJBqTNLE5vfxvAw9bq3jcAd6VZQno8SRotlAlwd2fncw6k +hLGeiu8okZY4aDJ0c6GA+/t2J/TE+noXdrfcBNjKIoRvuvfDtRtktVjy+xA7vcPh4Kk nzmGh2X9nWgz70J9Hu3+VXWaRPBZHKqz1CZ7J6/X2o+Cehm61o0ehnlgDkJjqU+clSWU dNIZT96PGDyPGM0wrosQDSjaNabSHh9B6G+jC7T7lo2R1vBeZYpSfr1+QWzPfbl3DUrE iwjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=zy8/cYBmUCDWIC2PKdCOC5C+rBMjybFE5MBESnGiePo=; b=ajmhxVJGueRN1EY96c7C2z7EPoRpJDXGcqngQUdrEomXu75eLMmso+IKeczkxFWsl9 WFYnTcFqnBm5/7iljE7DqQ8yTjxLj+dR5LvkEOmAEzt+whopcpKQtc9vlfSJc8uulOuC +kp1tJiVg0cEc4qDrVcTlMRbC9kNrp2PFBspt92QnbdKLxepgzyvuieygCXVdB7Tm0DN 7TxMjZISQbfO7au2KeWIxvJPBcMLXI9lzGryKJ1zMY4XPZ0Lzl6dMmnE5+BmGAwsXVCE FNjcJO9zfZkp1Vjxi8RHusy5s0ejlptEchslj1QUWZ9YHRsetRzqe3oex1eK51Ka3skd TKYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga07.intel.com (mga07.intel.com. [134.134.136.100]) by mx.google.com with ESMTPS id v19si3555849pfa.80.2018.12.13.22.28.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 22:28:03 -0800 (PST) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 134.134.136.100 as permitted sender) client-ip=134.134.136.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Dec 2018 22:28:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,351,1539673200"; d="scan'208";a="125840903" Received: from yhuang-mobile.sh.intel.com ([10.239.197.226]) by fmsmga002.fm.intel.com with ESMTP; 13 Dec 2018 22:28:00 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , "Kirill A. Shutemov" , Andrea Arcangeli , Michal Hocko , Johannes Weiner , Shaohua Li , Hugh Dickins , Minchan Kim , Rik van Riel , Dave Hansen , Naoya Horiguchi , Zi Yan , Daniel Jordan Subject: [PATCH -V9 08/21] swap: Support PMD swap mapping in split_swap_cluster() Date: Fri, 14 Dec 2018 14:27:41 +0800 Message-Id: <20181214062754.13723-9-ying.huang@intel.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181214062754.13723-1-ying.huang@intel.com> References: <20181214062754.13723-1-ying.huang@intel.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP When splitting a THP in swap cache or failing to allocate a THP when swapin a huge swap cluster, the huge swap cluster will be split. In addition to clear the huge flag of the swap cluster, the PMD swap mapping count recorded in cluster_count() will be set to 0. But we will not touch PMD swap mappings themselves, because it is hard to find them all sometimes. When the PMD swap mappings are operated later, it will be found that the huge swap cluster has been split and the PMD swap mappings will be split at that time. Unless splitting a THP in swap cache (specified via "force" parameter), split_swap_cluster() will return -EEXIST if there is SWAP_HAS_CACHE flag in swap_map[offset]. Because this indicates there is a THP corresponds to this huge swap cluster, and it isn't desired to split the THP. When splitting a THP in swap cache, the position to call split_swap_cluster() is changed to before unlocking sub-pages. So that all sub-pages will be kept locked from the THP has been split to the huge swap cluster is split. This makes the code much easier to be reasoned. Signed-off-by: "Huang, Ying" Cc: "Kirill A. Shutemov" Cc: Andrea Arcangeli Cc: Michal Hocko Cc: Johannes Weiner Cc: Shaohua Li Cc: Hugh Dickins Cc: Minchan Kim Cc: Rik van Riel Cc: Dave Hansen Cc: Naoya Horiguchi Cc: Zi Yan Cc: Daniel Jordan --- include/linux/swap.h | 6 +++-- mm/huge_memory.c | 18 +++++++++----- mm/swapfile.c | 58 +++++++++++++++++++++++++++++++------------- 3 files changed, 57 insertions(+), 25 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index a24d101b131d..441da4a832a6 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -617,11 +617,13 @@ static inline swp_entry_t get_swap_page(struct page *page) #endif /* CONFIG_SWAP */ +#define SSC_SPLIT_CACHED 0x1 + #ifdef CONFIG_THP_SWAP -extern int split_swap_cluster(swp_entry_t entry); +extern int split_swap_cluster(swp_entry_t entry, unsigned long flags); extern int split_swap_cluster_map(swp_entry_t entry); #else -static inline int split_swap_cluster(swp_entry_t entry) +static inline int split_swap_cluster(swp_entry_t entry, unsigned long flags) { return 0; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 49df3e7c96c7..fc31fc1ae0b3 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2507,6 +2507,17 @@ static void __split_huge_page(struct page *page, struct list_head *list, remap_page(head); + /* + * Split swap cluster before unlocking sub-pages. So all + * sub-pages will be kept locked from THP has been split to + * swap cluster is split. + */ + if (PageSwapCache(head)) { + swp_entry_t entry = { .val = page_private(head) }; + + split_swap_cluster(entry, SSC_SPLIT_CACHED); + } + for (i = 0; i < HPAGE_PMD_NR; i++) { struct page *subpage = head + i; if (subpage == page) @@ -2741,12 +2752,7 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) __dec_node_page_state(page, NR_SHMEM_THPS); spin_unlock(&pgdata->split_queue_lock); __split_huge_page(page, list, end, flags); - if (PageSwapCache(head)) { - swp_entry_t entry = { .val = page_private(head) }; - - ret = split_swap_cluster(entry); - } else - ret = 0; + ret = 0; } else { if (IS_ENABLED(CONFIG_DEBUG_VM) && mapcount) { pr_alert("total_mapcount: %u, page_count(): %u\n", diff --git a/mm/swapfile.c b/mm/swapfile.c index d38760b6d495..c59cc2ca7c2c 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1469,23 +1469,6 @@ void put_swap_page(struct page *page, swp_entry_t entry) unlock_cluster_or_swap_info(si, ci); } -#ifdef CONFIG_THP_SWAP -int split_swap_cluster(swp_entry_t entry) -{ - struct swap_info_struct *si; - struct swap_cluster_info *ci; - unsigned long offset = swp_offset(entry); - - si = _swap_info_get(entry); - if (!si) - return -EBUSY; - ci = lock_cluster(si, offset); - cluster_clear_huge(ci); - unlock_cluster(ci); - return 0; -} -#endif - static int swp_entry_cmp(const void *ent1, const void *ent2) { const swp_entry_t *e1 = ent1, *e2 = ent2; @@ -3972,6 +3955,47 @@ int split_swap_cluster_map(swp_entry_t entry) unlock_cluster(ci); return 0; } + +/* + * We will not try to split all PMD swap mappings to the swap cluster, + * because we haven't enough information available for that. Later, + * when the PMD swap mapping is duplicated or swapin, etc, the PMD + * swap mapping will be split and fallback to the PTE operations. + */ +int split_swap_cluster(swp_entry_t entry, unsigned long flags) +{ + struct swap_info_struct *si; + struct swap_cluster_info *ci; + unsigned long offset = swp_offset(entry); + int ret = 0; + + si = get_swap_device(entry); + if (!si) + return -EINVAL; + ci = lock_cluster(si, offset); + /* The swap cluster has been split by someone else, we are done */ + if (!cluster_is_huge(ci)) + goto out; + VM_BUG_ON(!IS_ALIGNED(offset, SWAPFILE_CLUSTER)); + VM_BUG_ON(cluster_count(ci) < SWAPFILE_CLUSTER); + /* + * If not requested, don't split swap cluster that has SWAP_HAS_CACHE + * flag. When the flag is cleared later, the huge swap cluster will + * be split if there is no PMD swap mapping. + */ + if (!(flags & SSC_SPLIT_CACHED) && + si->swap_map[offset] & SWAP_HAS_CACHE) { + ret = -EEXIST; + goto out; + } + cluster_set_swapcount(ci, 0); + cluster_clear_huge(ci); + +out: + unlock_cluster(ci); + put_swap_device(si); + return ret; +} #endif static int __init swapfile_init(void)