Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp562306imm; Wed, 23 May 2018 01:34:36 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqyWu8Cnv93c26yZAu8uoX+72BAtHeji4Kv9ldELNiNwJt3NDo6NkRTQV6Jzuj4oG3N1g6y X-Received: by 2002:a62:2f44:: with SMTP id v65-v6mr1942161pfv.83.1527064476055; Wed, 23 May 2018 01:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527064476; cv=none; d=google.com; s=arc-20160816; b=Isb09yvrtwPHW7Y4gWBYPkZisScX5JevCZUR+yo6ugoFh+pSqC3sdHvEVSJv+f56F9 iykaPXgY8qwEupmsGoKw/wxElGGhqJRXP8Z4p1hUDskS1VEobVT6x5MGqYTpWGiGWbW2 EcGSTVUoJi0VL6ULUig8dm8M5L3H2A1r5Cc0tRKZWM9ryEgYsQ6C8+M1a9mPvqIrv+Gt AB5QaNtjdb5KLF0GewUr8VVsfiQz9Cfzo72nDa5oF7InLF1JaMyWoWHWBxNiMC5wqolO 45b7ZsYf/BkNL9+6cK8BCHspv5DoYKxLhuTec3HH0Og5wyEy2HQOSZW6G+YtweLjnnVD L/aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=+eYUOADIYMgRhlyh/JT7MnhG0GE1ggZD2kwAMfksK+E=; b=tbxP9ixzOkGCqi75AQ28Qff1dNZnr+Q0/pcFgLmFwk1cVvm85ILVeLrsw8JO+RSu8q 64QAcGsFvFgJmsZt8bzCcFwPnjF+Q99j3ZFMglZ3EAhcw66Z7VudoBjAtz20WYC25tsq STiBdIzDV7A0q3zTwdjuYH5Ixp0DTgDOHCKo74ObYxflmMBTCBiYemI3dL0ni7h9SpVv yRyC6PLFfH2QoDN5FcjphTbGdJoJVuuN2T5qO9cDP9XQZdcu50DyWc2An+0DP4kXy0nl rB/OQKLLFjfQWA1Xqnc8IEcxWAuclTJMVRbQZAZs0vSjPA2jF/3ZXur3nFFQtpo5LRNw znJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g5-v6si17814818plp.108.2018.05.23.01.34.21; Wed, 23 May 2018 01:34:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754539AbeEWIdF (ORCPT + 99 others); Wed, 23 May 2018 04:33:05 -0400 Received: from mga03.intel.com ([134.134.136.65]:7695 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754427AbeEWI0k (ORCPT ); Wed, 23 May 2018 04:26:40 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2018 01:26:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,432,1520924400"; d="scan'208";a="57725963" Received: from yhuang6-ux31a.sh.intel.com ([10.239.197.97]) by fmsmga001.fm.intel.com with ESMTP; 23 May 2018 01:26:37 -0700 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 Subject: [PATCH -mm -V3 03/21] mm, THP, swap: Support PMD swap mapping in swap_duplicate() Date: Wed, 23 May 2018 16:26:07 +0800 Message-Id: <20180523082625.6897-4-ying.huang@intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180523082625.6897-1-ying.huang@intel.com> References: <20180523082625.6897-1-ying.huang@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Ying To support to swapin the THP as a whole, we need to create PMD swap mapping during swapout, and maintain PMD swap mapping count. This patch implements the support to increase the PMD swap mapping count (for swapout, fork, etc.) and set SWAP_HAS_CACHE flag (for swapin, etc.) for a huge swap cluster in swap_duplicate() function family. Although it only implements a part of the design of the swap reference count with PMD swap mapping, the whole design is described as follow to make it easy to understand the patch and the whole picture. A huge swap cluster is used to hold the contents of a swapouted THP. After swapout, a PMD page mapping to the THP will become a PMD swap mapping to the huge swap cluster via a swap entry in PMD. While a PTE page mapping to a subpage of the THP will become the PTE swap mapping to a swap slot in the huge swap cluster via a swap entry in PTE. If there is no PMD swap mapping and the corresponding THP is removed from the page cache (reclaimed), the huge swap cluster will be split and become a normal swap cluster. The count (cluster_count()) of the huge swap cluster is SWAPFILE_CLUSTER (= HPAGE_PMD_NR) + PMD swap mapping count. Because all swap slots in the huge swap cluster are mapped by PTE or PMD, or has SWAP_HAS_CACHE bit set, the usage count of the swap cluster is HPAGE_PMD_NR. And the PMD swap mapping count is recorded too to make it easy to determine whether there are remaining PMD swap mappings. The count in swap_map[offset] is the sum of PTE and PMD swap mapping count. This means when we increase the PMD swap mapping count, we need to increase swap_map[offset] for all swap slots inside the swap cluster. An alternative choice is to make swap_map[offset] to record PTE swap map count only, given we have recorded PMD swap mapping count in the count of the huge swap cluster. But this need to increase swap_map[offset] when splitting the PMD swap mapping, that may fail because of memory allocation for swap count continuation. That is hard to dealt with. So we choose current solution. The PMD swap mapping to a huge swap cluster may be split when unmap a part of PMD mapping etc. That is easy because only the count of the huge swap cluster need to be changed. When the last PMD swap mapping is gone and SWAP_HAS_CACHE is unset, we will split the huge swap cluster (clear the huge flag). This makes it easy to reason the cluster state. A huge swap cluster will be split when splitting the THP in swap cache, or failing to allocate THP during swapin, etc. But when splitting the huge swap cluster, we will not try to split all PMD swap mappings, because we haven't enough information available for that sometimes. Later, when the PMD swap mapping is duplicated or swapin, etc, the PMD swap mapping will be split and fallback to the PTE operation. When a THP is added into swap cache, the SWAP_HAS_CACHE flag will be set in the swap_map[offset] of all swap slots inside the huge swap cluster backing the THP. This huge swap cluster will not be split unless the THP is split even if its PMD swap mapping count dropped to 0. Later, when the THP is removed from swap cache, the SWAP_HAS_CACHE flag will be cleared in the swap_map[offset] of all swap slots inside the huge swap cluster. And this huge swap cluster will be split if its PMD swap mapping count is 0. 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 --- include/linux/huge_mm.h | 5 + include/linux/swap.h | 9 +- mm/memory.c | 2 +- mm/rmap.c | 2 +- mm/swapfile.c | 287 +++++++++++++++++++++++++++++++++--------------- 5 files changed, 213 insertions(+), 92 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index a8a126259bc4..0d0cfddbf4b7 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -79,6 +79,11 @@ extern struct kobj_attribute shmem_enabled_attr; #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) #define HPAGE_PMD_NR (1<lock); } +static inline bool is_cluster_offset(unsigned long offset) +{ + return !(offset % SWAPFILE_CLUSTER); +} + static inline bool cluster_list_empty(struct swap_cluster_list *list) { return cluster_is_null(&list->head); @@ -1166,16 +1174,14 @@ struct swap_info_struct *get_swap_device(swp_entry_t entry) return NULL; } -static unsigned char __swap_entry_free(struct swap_info_struct *p, - swp_entry_t entry, unsigned char usage) +static unsigned char __swap_entry_free_locked(struct swap_info_struct *p, + struct swap_cluster_info *ci, + unsigned long offset, + unsigned char usage) { - struct swap_cluster_info *ci; - unsigned long offset = swp_offset(entry); unsigned char count; unsigned char has_cache; - ci = lock_cluster_or_swap_info(p, offset); - count = p->swap_map[offset]; has_cache = count & SWAP_HAS_CACHE; @@ -1203,6 +1209,17 @@ static unsigned char __swap_entry_free(struct swap_info_struct *p, usage = count | has_cache; p->swap_map[offset] = usage ? : SWAP_HAS_CACHE; + return usage; +} + +static unsigned char __swap_entry_free(struct swap_info_struct *p, + swp_entry_t entry, unsigned char usage) +{ + struct swap_cluster_info *ci; + unsigned long offset = swp_offset(entry); + + ci = lock_cluster_or_swap_info(p, offset); + usage = __swap_entry_free_locked(p, ci, offset, usage); unlock_cluster_or_swap_info(p, ci); return usage; @@ -3449,32 +3466,12 @@ void si_swapinfo(struct sysinfo *val) spin_unlock(&swap_lock); } -/* - * Verify that a swap entry is valid and increment its swap map count. - * - * Returns error code in following case. - * - success -> 0 - * - swp_entry is invalid -> EINVAL - * - swp_entry is migration entry -> EINVAL - * - swap-cache reference is requested but there is already one. -> EEXIST - * - swap-cache reference is requested but the entry is not used. -> ENOENT - * - swap-mapped reference requested but needs continued swap count. -> ENOMEM - */ -static int __swap_duplicate(swp_entry_t entry, unsigned char usage) +static int __swap_duplicate_locked(struct swap_info_struct *p, + unsigned long offset, unsigned char usage) { - struct swap_info_struct *p; - struct swap_cluster_info *ci; - unsigned long offset; unsigned char count; unsigned char has_cache; - int err = -EINVAL; - - p = get_swap_device(entry); - if (!p) - goto out; - - offset = swp_offset(entry); - ci = lock_cluster_or_swap_info(p, offset); + int err = 0; count = p->swap_map[offset]; @@ -3484,12 +3481,11 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) */ if (unlikely(swap_count(count) == SWAP_MAP_BAD)) { err = -ENOENT; - goto unlock_out; + goto out; } has_cache = count & SWAP_HAS_CACHE; count &= ~SWAP_HAS_CACHE; - err = 0; if (usage == SWAP_HAS_CACHE) { @@ -3516,11 +3512,39 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) p->swap_map[offset] = count | has_cache; -unlock_out: +out: + return err; +} + +/* + * Verify that a swap entry is valid and increment its swap map count. + * + * Returns error code in following case. + * - success -> 0 + * - swp_entry is invalid -> EINVAL + * - swp_entry is migration entry -> EINVAL + * - swap-cache reference is requested but there is already one. -> EEXIST + * - swap-cache reference is requested but the entry is not used. -> ENOENT + * - swap-mapped reference requested but needs continued swap count. -> ENOMEM + */ +static int __swap_duplicate(swp_entry_t entry, unsigned char usage) +{ + struct swap_info_struct *p; + struct swap_cluster_info *ci; + unsigned long offset; + int err = -EINVAL; + + p = get_swap_device(entry); + if (!p) + goto out; + + offset = swp_offset(entry); + ci = lock_cluster_or_swap_info(p, offset); + err = __swap_duplicate_locked(p, offset, usage); unlock_cluster_or_swap_info(p, ci); + + put_swap_device(p); out: - if (p) - put_swap_device(p); return err; } @@ -3533,6 +3557,81 @@ void swap_shmem_alloc(swp_entry_t entry) __swap_duplicate(entry, SWAP_MAP_SHMEM); } +#ifdef CONFIG_THP_SWAP +static int __swap_duplicate_cluster(swp_entry_t *entry, unsigned char usage) +{ + struct swap_info_struct *si; + struct swap_cluster_info *ci; + unsigned long offset; + unsigned char *map; + int i, err = 0; + + si = get_swap_device(*entry); + if (!si) { + err = -EINVAL; + goto out; + } + offset = swp_offset(*entry); + ci = lock_cluster(si, offset); + if (cluster_is_free(ci)) { + err = -ENOENT; + goto unlock; + } + if (!cluster_is_huge(ci)) { + err = -ENOTDIR; + goto unlock; + } + VM_BUG_ON(!is_cluster_offset(offset)); + VM_BUG_ON(cluster_count(ci) < SWAPFILE_CLUSTER); + map = si->swap_map + offset; + if (usage == SWAP_HAS_CACHE) { + if (map[0] & SWAP_HAS_CACHE) { + err = -EEXIST; + goto unlock; + } + for (i = 0; i < SWAPFILE_CLUSTER; i++) { + VM_BUG_ON(map[i] & SWAP_HAS_CACHE); + map[i] |= SWAP_HAS_CACHE; + } + } else { + for (i = 0; i < SWAPFILE_CLUSTER; i++) { +retry: + err = __swap_duplicate_locked(si, offset + i, 1); + if (err == -ENOMEM) { + struct page *page; + + page = alloc_page(GFP_ATOMIC | __GFP_HIGHMEM); + err = add_swap_count_continuation_locked( + si, offset + i, page); + if (err) { + *entry = swp_entry(si->type, offset+i); + goto undup; + } + goto retry; + } else if (err) + goto undup; + } + cluster_set_count(ci, cluster_count(ci) + 1); + } +unlock: + unlock_cluster(ci); + put_swap_device(si); +out: + return err; +undup: + for (i--; i >= 0; i--) + __swap_entry_free_locked( + si, ci, offset + i, 1); + goto unlock; +} +#else +static inline int __swap_duplicate_cluster(swp_entry_t *entry, + unsigned char usage) +{ + return 0; +} +#endif + /* * Increase reference count of swap entry by 1. * Returns 0 for success, or -ENOMEM if a swap_count_continuation is required @@ -3540,12 +3639,15 @@ void swap_shmem_alloc(swp_entry_t entry) * if __swap_duplicate() fails for another reason (-EINVAL or -ENOENT), which * might occur if a page table entry has got corrupted. */ -int swap_duplicate(swp_entry_t entry) +int swap_duplicate(swp_entry_t *entry, bool cluster) { int err = 0; - while (!err && __swap_duplicate(entry, 1) == -ENOMEM) - err = add_swap_count_continuation(entry, GFP_ATOMIC); + if (thp_swap_supported() && cluster) + return __swap_duplicate_cluster(entry, 1); + + while (!err && __swap_duplicate(*entry, 1) == -ENOMEM) + err = add_swap_count_continuation(*entry, GFP_ATOMIC); return err; } @@ -3557,9 +3659,12 @@ int swap_duplicate(swp_entry_t entry) * -EBUSY means there is a swap cache. * Note: return code is different from swap_duplicate(). */ -int swapcache_prepare(swp_entry_t entry) +int swapcache_prepare(swp_entry_t entry, bool cluster) { - return __swap_duplicate(entry, SWAP_HAS_CACHE); + if (thp_swap_supported() && cluster) + return __swap_duplicate_cluster(&entry, SWAP_HAS_CACHE); + else + return __swap_duplicate(entry, SWAP_HAS_CACHE); } struct swap_info_struct *swp_swap_info(swp_entry_t entry) @@ -3589,51 +3694,13 @@ pgoff_t __page_file_index(struct page *page) } EXPORT_SYMBOL_GPL(__page_file_index); -/* - * add_swap_count_continuation - called when a swap count is duplicated - * beyond SWAP_MAP_MAX, it allocates a new page and links that to the entry's - * page of the original vmalloc'ed swap_map, to hold the continuation count - * (for that entry and for its neighbouring PAGE_SIZE swap entries). Called - * again when count is duplicated beyond SWAP_MAP_MAX * SWAP_CONT_MAX, etc. - * - * These continuation pages are seldom referenced: the common paths all work - * on the original swap_map, only referring to a continuation page when the - * low "digit" of a count is incremented or decremented through SWAP_MAP_MAX. - * - * add_swap_count_continuation(, GFP_ATOMIC) can be called while holding - * page table locks; if it fails, add_swap_count_continuation(, GFP_KERNEL) - * can be called after dropping locks. - */ -int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask) +static int add_swap_count_continuation_locked(struct swap_info_struct *si, + unsigned long offset, + struct page *page) { - struct swap_info_struct *si; - struct swap_cluster_info *ci; struct page *head; - struct page *page; struct page *list_page; - pgoff_t offset; unsigned char count; - int ret = 0; - - /* - * When debugging, it's easier to use __GFP_ZERO here; but it's better - * for latency not to zero a page while GFP_ATOMIC and holding locks. - */ - page = alloc_page(gfp_mask | __GFP_HIGHMEM); - - si = get_swap_device(entry); - if (!si) { - /* - * An acceptable race has occurred since the failing - * __swap_duplicate(): the swap device may be swapoff - */ - goto outer; - } - spin_lock(&si->lock); - - offset = swp_offset(entry); - - ci = lock_cluster(si, offset); count = si->swap_map[offset] & ~SWAP_HAS_CACHE; @@ -3643,13 +3710,11 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask) * will race to add swap count continuation: we need to avoid * over-provisioning. */ - goto out; + return 0; } - if (!page) { - ret = -ENOMEM; - goto out; - } + if (!page) + return -ENOMEM; /* * We are fortunate that although vmalloc_to_page uses pte_offset_map, @@ -3697,7 +3762,57 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask) page = NULL; /* now it's attached, don't free it */ out_unlock_cont: spin_unlock(&si->cont_lock); -out: + if (page) + __free_page(page); + return 0; +} + +/* + * add_swap_count_continuation - called when a swap count is duplicated + * beyond SWAP_MAP_MAX, it allocates a new page and links that to the entry's + * page of the original vmalloc'ed swap_map, to hold the continuation count + * (for that entry and for its neighbouring PAGE_SIZE swap entries). Called + * again when count is duplicated beyond SWAP_MAP_MAX * SWAP_CONT_MAX, etc. + * + * These continuation pages are seldom referenced: the common paths all work + * on the original swap_map, only referring to a continuation page when the + * low "digit" of a count is incremented or decremented through SWAP_MAP_MAX. + * + * add_swap_count_continuation(, GFP_ATOMIC) can be called while holding + * page table locks; if it fails, add_swap_count_continuation(, GFP_KERNEL) + * can be called after dropping locks. + */ +int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask) +{ + struct swap_info_struct *si; + struct swap_cluster_info *ci; + struct page *page; + unsigned long offset; + int ret = 0; + + /* + * When debugging, it's easier to use __GFP_ZERO here; but it's better + * for latency not to zero a page while GFP_ATOMIC and holding locks. + */ + page = alloc_page(gfp_mask | __GFP_HIGHMEM); + + si = get_swap_device(entry); + if (!si) { + /* + * An acceptable race has occurred since the failing + * __swap_duplicate(): the swap device may be swapoff + */ + goto outer; + } + spin_lock(&si->lock); + + offset = swp_offset(entry); + + ci = lock_cluster(si, offset); + + ret = add_swap_count_continuation_locked(si, offset, page); + page = NULL; + unlock_cluster(ci); spin_unlock(&si->lock); put_swap_device(si); -- 2.16.1