From patchwork Fri Jun 22 03:51:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10481183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25D1E60383 for ; Fri, 22 Jun 2018 03:56:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 170E528F91 for ; Fri, 22 Jun 2018 03:56:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B47B28F98; Fri, 22 Jun 2018 03:56:25 +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=unavailable 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 6822928F91 for ; Fri, 22 Jun 2018 03:56:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1727E6B0286; Thu, 21 Jun 2018 23:56:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0D4556B0288; Thu, 21 Jun 2018 23:56:07 -0400 (EDT) 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 E3E706B0289; Thu, 21 Jun 2018 23:56:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 9D0B46B0286 for ; Thu, 21 Jun 2018 23:56:06 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id i1-v6so2944340pld.11 for ; Thu, 21 Jun 2018 20:56:06 -0700 (PDT) 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=FnvLaaDQ4JJ7GOTHxtDdntd0ek9kZOx/QY1T+7OLOlI=; b=X4lAVquqrXwJOSOuDeltseNlYAhQor5rYuOiZXu0stevrU8r7ptJDT8bFyiYrzANEj X0I/Ml8ZAZfIc8vy+hwtU37olz6mhIKVJLXvIpDJ39UbwWwWDp7XcRn8es1Lc8SiL+qQ 0Eq4HcUdVe2V9owmr9DH6W6hvUgd1ERK+t5Qf5S+uD67rv/wz9OufWpa0Q0xC11v97hi RAbdvDvd9LpeIJnCyXpGVJx1MQ00tx7XY31LcVf9KzMrlmWNRLbv4EgVTEG+PIsJwHwj bncsE4sShM/RNN4HZz3OMB84noQQ3gRDaCCaiPfnmcyqtHTRPz0yYjFsiF3imbGED+VC VrWQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.24 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: APt69E1PqNPC73H/8vcsDQQbSAHt5mnzwMmml2GH3AgUuj7UKIIzLnj6 g/ssMn+S4I8hKn4uqZUwG3Sa0/ImDAPVQjx49mL3AjMASCTimwjBnRJHGEbub+WWUDySvJeuSM6 G/G3b8nsSmoNpwLfXJ7b6Ch7ZnKdIKAWTXl9si3qEbBBCmS4oQlwr64Uh4RTWSNUCow== X-Received: by 2002:a17:902:a5:: with SMTP id a34-v6mr31710047pla.80.1529639765643; Thu, 21 Jun 2018 20:56:05 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIgsZpE2S53Ab5Lhwdv03d+VcEP2E9TkkgfnHr3pt/zNM4U/7xBkYmWCxxjFi05a+xGKdRD X-Received: by 2002:a17:902:a5:: with SMTP id a34-v6mr31709983pla.80.1529639764106; Thu, 21 Jun 2018 20:56:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529639764; cv=none; d=google.com; s=arc-20160816; b=qtm+p2PipbXzUPiAaqHuvX2bir18K00QsG55ERfV4BasfS3/p4iDFBkbh5KDm/PGdp HH2/5V+0luJ0VW79tAzsVD7PYkMVvQiuXIzI0FXvzc9R5qKM4U3/dm9n8PiElJasnB/Z bPZ6pEDT6vQM+dWSu3m1VJkWDP4pVoKIDrnAH4z5siG6ofHJtqrB4ubV08fMOQ4qarBt mBc5nyH/XAuZsT1VypJqVGEUQEGTzlSzfU6g+AiIipKARBSXmEn11jJrd6REw7oCTZgw KEvlUf8uPwfnbtmr566PuJ9a/+vlAP29Fnr6TAZOa77A3UGZz9hsBxGpE/aOgTbMCebn ErvQ== 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 :arc-authentication-results; bh=FnvLaaDQ4JJ7GOTHxtDdntd0ek9kZOx/QY1T+7OLOlI=; b=eBSGkSNG9THQz7smx2T8z6+ENFzHVjWQXwVk3PwoGxnol/hxOCzNFF9n+cJeorFWRp Wx2y2K31vGeXuQJgaR+15Kw3t3uEoX90m4VLodFy8A/r/yvh8YzTRpwDCXEvs5M0mAx8 If4v/+dwrnv8WQ9YkFJDV/OdsNFWz/uEFcNtFiqJsHcxotb6Y4rbZTGB8DV4b1qbT6uS 6agFIsaahaHbl4n+LmTFErmOk4gA0WcExu5B/UlZe2peVEGJDWuVodeAHx0MzRm5XKRP BbwHGnU3y+IBm2ycbu9Yh4sG4GV9lZxXPtvPHUVC/kRkW5JsFBSE8BSKaHq7w/fAAMF4 L/PA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga09.intel.com (mga09.intel.com. [134.134.136.24]) by mx.google.com with ESMTPS id k74-v6si5146207pgc.304.2018.06.21.20.56.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 20:56:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) client-ip=134.134.136.24; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.24 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 fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jun 2018 20:56:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,255,1526367600"; d="scan'208";a="65335228" Received: from wanpingl-mobl.ccr.corp.intel.com (HELO yhuang6-ux31a.ccr.corp.intel.com) ([10.254.212.200]) by fmsmga004.fm.intel.com with ESMTP; 21 Jun 2018 20:56:00 -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 , Daniel Jordan Subject: [PATCH -mm -v4 20/21] mm, THP, swap: create PMD swap mapping when unmap the THP Date: Fri, 22 Jun 2018 11:51:50 +0800 Message-Id: <20180622035151.6676-21-ying.huang@intel.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180622035151.6676-1-ying.huang@intel.com> References: <20180622035151.6676-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 From: Huang Ying This is the final step of the THP swapin support. When reclaiming a anonymous THP, after allocating the huge swap cluster and add the THP into swap cache, the PMD page mapping will be changed to the mapping to the swap space. Previously, the PMD page mapping will be split before being changed. In this patch, the unmap code is enhanced not to split the PMD mapping, but create a PMD swap mapping to replace it instead. So later when clear the SWAP_HAS_CACHE flag in the last step of swapout, the huge swap cluster will be kept instead of being split, and when swapin, the huge swap cluster will be read as a whole into a THP. That is, the THP will not be split during swapout/swapin. This can eliminate the overhead of splitting/collapsing, and reduce the page fault count, etc. But more important, the utilization of THP is improved greatly, that is, much more THP will be kept when swapping is used, so that we can take full advantage of THP including its high performance for swapout/swapin. 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/huge_mm.h | 11 +++++++++++ mm/huge_memory.c | 30 ++++++++++++++++++++++++++++++ mm/rmap.c | 43 +++++++++++++++++++++++++++++++++++++++++-- mm/vmscan.c | 6 +----- 4 files changed, 83 insertions(+), 7 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 8e706590fbc1..28e46f078e73 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -405,6 +405,8 @@ static inline gfp_t alloc_hugepage_direct_gfpmask(struct vm_area_struct *vma) } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +struct page_vma_mapped_walk; + #ifdef CONFIG_THP_SWAP extern void __split_huge_swap_pmd(struct vm_area_struct *vma, unsigned long haddr, @@ -412,6 +414,8 @@ extern void __split_huge_swap_pmd(struct vm_area_struct *vma, extern int split_huge_swap_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, pmd_t orig_pmd); extern int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd); +extern bool set_pmd_swap_entry(struct page_vma_mapped_walk *pvmw, + struct page *page, unsigned long address, pmd_t pmdval); static inline bool transparent_hugepage_swapin_enabled( struct vm_area_struct *vma) @@ -453,6 +457,13 @@ static inline int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd) return 0; } +static inline bool set_pmd_swap_entry(struct page_vma_mapped_walk *pvmw, + struct page *page, unsigned long address, + pmd_t pmdval) +{ + return false; +} + static inline bool transparent_hugepage_swapin_enabled( struct vm_area_struct *vma) { diff --git a/mm/huge_memory.c b/mm/huge_memory.c index e50adc6b59b2..195f24040b41 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1876,6 +1876,36 @@ int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd) count_vm_event(THP_SWPIN_FALLBACK); goto fallback; } + +bool set_pmd_swap_entry(struct page_vma_mapped_walk *pvmw, struct page *page, + unsigned long address, pmd_t pmdval) +{ + struct vm_area_struct *vma = pvmw->vma; + struct mm_struct *mm = vma->vm_mm; + pmd_t swp_pmd; + swp_entry_t entry = { .val = page_private(page) }; + + if (swap_duplicate(&entry, true) < 0) { + set_pmd_at(mm, address, pvmw->pmd, pmdval); + return false; + } + if (list_empty(&mm->mmlist)) { + spin_lock(&mmlist_lock); + if (list_empty(&mm->mmlist)) + list_add(&mm->mmlist, &init_mm.mmlist); + spin_unlock(&mmlist_lock); + } + add_mm_counter(mm, MM_ANONPAGES, -HPAGE_PMD_NR); + add_mm_counter(mm, MM_SWAPENTS, HPAGE_PMD_NR); + swp_pmd = swp_entry_to_pmd(entry); + if (pmd_soft_dirty(pmdval)) + swp_pmd = pmd_swp_mksoft_dirty(swp_pmd); + set_pmd_at(mm, address, pvmw->pmd, swp_pmd); + + page_remove_rmap(page, true); + put_page(page); + return true; +} #endif static inline void zap_deposited_table(struct mm_struct *mm, pmd_t *pmd) diff --git a/mm/rmap.c b/mm/rmap.c index 5f45d6325c40..4861b1a86e2a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1402,12 +1402,51 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, continue; } + address = pvmw.address; + +#ifdef CONFIG_THP_SWAP + /* PMD-mapped THP swap entry */ + if (thp_swap_supported() && !pvmw.pte && PageAnon(page)) { + pmd_t pmdval; + + VM_BUG_ON_PAGE(PageHuge(page) || + !PageTransCompound(page), page); + + flush_cache_range(vma, address, + address + HPAGE_PMD_SIZE); + mmu_notifier_invalidate_range_start(mm, address, + address + HPAGE_PMD_SIZE); + if (should_defer_flush(mm, flags)) { + /* check comments for PTE below */ + pmdval = pmdp_huge_get_and_clear(mm, address, + pvmw.pmd); + set_tlb_ubc_flush_pending(mm, + pmd_dirty(pmdval)); + } else + pmdval = pmdp_huge_clear_flush(vma, address, + pvmw.pmd); + + /* + * Move the dirty bit to the page. Now the pmd + * is gone. + */ + if (pmd_dirty(pmdval)) + set_page_dirty(page); + + /* Update high watermark before we lower rss */ + update_hiwater_rss(mm); + + ret = set_pmd_swap_entry(&pvmw, page, address, pmdval); + mmu_notifier_invalidate_range_end(mm, address, + address + HPAGE_PMD_SIZE); + continue; + } +#endif + /* Unexpected PMD-mapped THP? */ VM_BUG_ON_PAGE(!pvmw.pte, page); subpage = page - page_to_pfn(page) + pte_pfn(*pvmw.pte); - address = pvmw.address; - if (IS_ENABLED(CONFIG_MIGRATION) && (flags & TTU_MIGRATION) && diff --git a/mm/vmscan.c b/mm/vmscan.c index 03822f86f288..891d3c7b8f21 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1148,11 +1148,7 @@ static unsigned long shrink_page_list(struct list_head *page_list, * processes. Try to unmap it here. */ if (page_mapped(page)) { - enum ttu_flags flags = ttu_flags | TTU_BATCH_FLUSH; - - if (unlikely(PageTransHuge(page))) - flags |= TTU_SPLIT_HUGE_PMD; - if (!try_to_unmap(page, flags)) { + if (!try_to_unmap(page, ttu_flags | TTU_BATCH_FLUSH)) { nr_unmap_fail++; goto activate_locked; }