From patchwork Tue Nov 20 08:54:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10689995 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 C02C813BB for ; Tue, 20 Nov 2018 08:55:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF5522991D for ; Tue, 20 Nov 2018 08:55:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3B7C29A1B; Tue, 20 Nov 2018 08:55:22 +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 E30D22991D for ; Tue, 20 Nov 2018 08:55:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E04AB6B1F38; Tue, 20 Nov 2018 03:55:16 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DB52F6B1F39; Tue, 20 Nov 2018 03:55:16 -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 CCFB46B1F3A; Tue, 20 Nov 2018 03:55:16 -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 8D49D6B1F38 for ; Tue, 20 Nov 2018 03:55:16 -0500 (EST) Received: by mail-pf1-f200.google.com with SMTP id i22-v6so1106161pfj.1 for ; Tue, 20 Nov 2018 00:55:16 -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=1BD444hfUzmwBDRoXCZrzN5sxjXmXmtnBq/tQtaCj7M=; b=cs/gkmElo1e5QFSNC3F30lcP8N8F19YnBeUrUjsOa9D7TvPdhJU2Afpihy+ZKOTwjU zf7I6Y8oxVIaZBwumvrAXKPFrB9Sqo8UEV2IQm5pO+1pLUTYiz8dP1Rrp5Y2YebjktC4 QWrtbd1O7MJONc/8ZrPwgCohvnJWGQURD7109hcTLAfP3ZIzn/DSSPl2pia1yJ13nGVm lIoT5SEGJgriBuprwEjuXwlS8prbLCbJedESP0Ur9rjcDId6qx6ILoy0ggY2h33WOshV BQsDgtLQYYAaQSkt7BDFSXK0I2OMnihCwiA0NePJxAHWByIwY4vF9OeneMS3flJU4KUs 9UyQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 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+aEWaK4ed/rLlxbF5ZNIX1EJCxNpwvq9HHyGWNYWBKE2BIF+pGaoQ9 jv40LB85r2p0pKGSaXr5+4L+4I5A+2/SEMKIvb4vN7JNRl/VwklaSbKO1Lrje31/YNUTqDSA1Yy ZHMOT+ezKAs63k65A7iKCr70raElInswH23VQTRQjGj+OOejcyi2OqoybjxcCy+J9dQ== X-Received: by 2002:a17:902:2c03:: with SMTP id m3mr1298234plb.6.1542704116239; Tue, 20 Nov 2018 00:55:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/XTlHW/LiPrqVD+9fMQyJJ88/ln86ygFnnDnstNaaadxgYTpzgVAFElCugo6s7y2P8D/Eh/ X-Received: by 2002:a17:902:2c03:: with SMTP id m3mr1298191plb.6.1542704115449; Tue, 20 Nov 2018 00:55:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542704115; cv=none; d=google.com; s=arc-20160816; b=WH8JYU/XKfolKbQbcXZzH0xiHn1dEIJckFJiY9PngI0WgLpJc8fHqJqeAX5pEUTGFQ SGmB1h/WheT04dS/bbio6KQeH8EsL9XY9Je+w+jHjcnn5KH6aMgwsxnoU5nMqSlgD8tb 70NWJLev5qwzqcWrF8NmQWj0V5oLjQH6hkMHwNIAZdTsN80UQcc4WCZtiOhacOuvl+jk 1Ee2i3ja9xEFzqWRzbi5nc0RR2AU21cbkgqx9xP6a+ao0aSTWIRITeL30VGHkjIEKVnb qs9XHIJxjXjLzXSgAwcvoKBPuQsvoXvO9eCNXYnSyb0OG7Z2xqzBY5QJjokENxSaADC1 dCFQ== 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=1BD444hfUzmwBDRoXCZrzN5sxjXmXmtnBq/tQtaCj7M=; b=M5dUrjG75NGwXT/i85KzmZdVxE5g/qIMBBLPLSV+bdoYKoHyTK5Zn8VCm/nKjSws+k oAYvsbO0V0/bETiFcTZT0zwynTuYqqdCrQItSzLGcumyfpRNK9T6I0TlX/87dBZHynga GCgRWgxnNx/fD3uxXclyXMq/Z5qTFxpNiH4nqSRo0x6iyMpNRFcnBY8PA71E+WA13rj6 Tt1sbb6xonkxLxjqTrt81EA/dUdg+UlFEO8o8Bx52uhxI1IHqxs80eleckeXMasBy4rO 4E6HOT6v0SolfVTxrAvEFNmQr9C1x4M3CCGVtf2W4gTXyEhvzlqct+2e1p8TyrsjJfFn EcWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id b15si24149550plm.431.2018.11.20.00.55.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 00:55:15 -0800 (PST) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 as permitted sender) client-ip=192.55.52.88; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.88 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 fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2018 00:55:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,256,1539673200"; d="scan'208";a="106105804" Received: from yhuang-mobile.sh.intel.com ([10.239.197.245]) by fmsmga002.fm.intel.com with ESMTP; 20 Nov 2018 00:55:12 -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 -V7 RESEND 07/21] swap: Support PMD swap mapping in split_swap_cluster() Date: Tue, 20 Nov 2018 16:54:35 +0800 Message-Id: <20181120085449.5542-8-ying.huang@intel.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20181120085449.5542-1-ying.huang@intel.com> References: <20181120085449.5542-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 f8480465bd5f..a38d549fb4dc 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2524,6 +2524,17 @@ static void __split_huge_page(struct page *page, struct list_head *list, unfreeze_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) @@ -2747,12 +2758,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, 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 e83e3c93f3b3..a57967292a8d 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; @@ -4071,6 +4054,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)