From patchwork Fri Jun 22 03:51: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: 10481155 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 C650560383 for ; Fri, 22 Jun 2018 03:55:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B95C628F91 for ; Fri, 22 Jun 2018 03:55:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE2A628F98; Fri, 22 Jun 2018 03:55:54 +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 07E7728F94 for ; Fri, 22 Jun 2018 03:55:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CBD5A6B0271; Thu, 21 Jun 2018 23:55:40 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C43656B0272; Thu, 21 Jun 2018 23:55:40 -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 AEB146B0273; Thu, 21 Jun 2018 23:55:40 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 5D6D86B0271 for ; Thu, 21 Jun 2018 23:55:40 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id z5-v6so2946433pln.20 for ; Thu, 21 Jun 2018 20:55:40 -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=PJbVbq0Rh9QzwVlbnel2x1NqUmnT0j2BLy6d6c1j1EA=; b=ZwF6SeI3dMj+hfkdg8xMbdnDS1+T/JvqlTFmfC/rJWLaP5mSCqZwPGTLVG0csR0v2L c3NxNVje7MC3zyWYSdttGObcsJWw04qHSUrjSPqbya6ObijHxuXMTlixZzRu0zV91TnG vgkTD/IRGWM4xAzz70cvVsCZDe4p1znfXIoOE+NWW1s2g67aUPFi5BQIBGB+ZXm6pZ7D egCRuWRzNwJCiJBVyw+ve7YWQ8QgsfdiaBM4ymMm/5YQ5UJtiwJ2XOzHLIkRh0uJhIkP 0dtEEqeDweMjQ70E2I0wbtymzb+AIGrkktY8aobh1fwyx4cl/pLpojFSQ4/XXLQH4n7m GCCA== 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: APt69E22y9OToxoYabK8coysOdY7+C1dC55p4raKV3sO6iFNOG4kotFx ePNnFnJdT2WDQlxLIFIFY60wDc9bpUWNopMAoSALiu2J6JBAJFrrIN77vGuO1wCrMzPME8ZAHLP LMoWx3+FSfD5V1IXIGKp1u6DWesBYUB6b6+oO1RqqN0xiJIdMS9jkHcobUUDh40Dm0w== X-Received: by 2002:a17:902:6b09:: with SMTP id o9-v6mr30829601plk.256.1529639740069; Thu, 21 Jun 2018 20:55:40 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLpnB6AeoFj4SHl34GkRl2iYXbUUGBIJhi3iMrsH5z0bx0o4fvGFov4hyXwiRqm7p8j5ybJ X-Received: by 2002:a17:902:6b09:: with SMTP id o9-v6mr30829569plk.256.1529639739297; Thu, 21 Jun 2018 20:55:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529639739; cv=none; d=google.com; s=arc-20160816; b=gOEtI00YXTlTvjBF4nq/O+pABCBQj5/+s+nr1AMd0u80gYU24QgLM5II5RFgN7h8SL qrtj51mdHwQIj6n0C4jNkcbGrup6HBoQOzpzfq5uFRSDDLPt1rOHYbYTdr0ZR7PTpYIT mNdcRkQ3sQYfdA+T7Nfq6miUELWeMtthuxTIPoNBN8NAjvDNgj2sOy7pjEn5HmMNyJeG scoV77a+82E6CgNSrhFIyJ/d3OqjJn4s3iKRT3fMEdXQby98Dl2A6Zflh03EImZi1SGl gfOca/XdVluO9FUc+OR8AoNtBVFKdf/MuzsiaTe/Iq1zrjnA8kP3cyAjNGlQ9ptCzmFX 3oVA== 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=PJbVbq0Rh9QzwVlbnel2x1NqUmnT0j2BLy6d6c1j1EA=; b=Ni+z880rx+ji54N935hEngFMqRxsTLYSZVWxmJQaKN/4ZMdEtJOr41bvufzKbyLa1F 5MFSNXgfhMX1LOOA636uRVdqOJg/L8hZSgLQ9iUEawSi0qmRhylxFeXQ4hf/iR/X6mXy O0nPnlWaG44u4YYazBncJ2Lf2lqsaQ9qNKa39zHwwGSNh7zkqzTN+XXAOM0Zgqlg+YKv +E6vLOxWsgFBqro5FULsJ0oZl34VboO5pUSZ1t7Mjvlwrkedz89paPbUDvMartXI/+rc lwpsEsOSXC47DV4qnlED1SyI3wgmHyxriUmkhTHHKJLGy9I5g4mcWlvAcoAxbUOS2lIz yHiA== 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 n61-v6si6160066plb.256.2018.06.21.20.55.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 20:55:39 -0700 (PDT) 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 fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jun 2018 20:55:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,255,1526367600"; d="scan'208";a="65335150" 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:55:36 -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 11/21] mm, THP, swap: Add sysfs interface to configure THP swapin Date: Fri, 22 Jun 2018 11:51:41 +0800 Message-Id: <20180622035151.6676-12-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 Swapin a THP as a whole isn't desirable at some situations. For example, for random access pattern, swapin a THP as a whole will inflate the reading greatly. So a sysfs interface: /sys/kernel/mm/transparent_hugepage/swapin_enabled is added to configure it. Three options as follow are provided, - always: THP swapin will be enabled always - madvise: THP swapin will be enabled only for VMA with VM_HUGEPAGE flag set. - never: THP swapin will be disabled always The default configuration is: madvise. During page fault, if a PMD swap mapping is found and THP swapin is disabled, the huge swap cluster and the PMD swap mapping will be split and fallback to normal page 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 --- Documentation/admin-guide/mm/transhuge.rst | 21 +++++++ include/linux/huge_mm.h | 31 +++++++++++ mm/huge_memory.c | 89 ++++++++++++++++++++++++------ 3 files changed, 123 insertions(+), 18 deletions(-) diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 85e33f785fd7..23aefb17101c 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -160,6 +160,27 @@ Some userspace (such as a test program, or an optimized memory allocation cat /sys/kernel/mm/transparent_hugepage/hpage_pmd_size +Transparent hugepage may be swapout and swapin in one piece without +splitting. This will improve the utility of transparent hugepage but +may inflate the read/write too. So whether to enable swapin +transparent hugepage in one piece can be configured as follow. + + echo always >/sys/kernel/mm/transparent_hugepage/swapin_enabled + echo madvise >/sys/kernel/mm/transparent_hugepage/swapin_enabled + echo never >/sys/kernel/mm/transparent_hugepage/swapin_enabled + +always + Attempt to allocate a transparent huge page and read it from + swap space in one piece every time. + +never + Always split the swap space and PMD swap mapping and swapin + the fault normal page during swapin. + +madvise + Only swapin the transparent huge page in one piece for + MADV_HUGEPAGE madvise regions. + khugepaged will be automatically started when transparent_hugepage/enabled is set to "always" or "madvise, and it'll be automatically shutdown if it's set to "never". diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 42117b75de2d..7931fa888f11 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -63,6 +63,8 @@ enum transparent_hugepage_flag { #ifdef CONFIG_DEBUG_VM TRANSPARENT_HUGEPAGE_DEBUG_COW_FLAG, #endif + TRANSPARENT_HUGEPAGE_SWAPIN_FLAG, + TRANSPARENT_HUGEPAGE_SWAPIN_REQ_MADV_FLAG, }; struct kobject; @@ -405,11 +407,40 @@ static inline gfp_t alloc_hugepage_direct_gfpmask(struct vm_area_struct *vma) #ifdef CONFIG_THP_SWAP extern int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd); + +static inline bool transparent_hugepage_swapin_enabled( + struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_NOHUGEPAGE) + return false; + + if (is_vma_temporary_stack(vma)) + return false; + + if (test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) + return false; + + if (transparent_hugepage_flags & + (1 << TRANSPARENT_HUGEPAGE_SWAPIN_FLAG)) + return true; + + if (transparent_hugepage_flags & + (1 << TRANSPARENT_HUGEPAGE_SWAPIN_REQ_MADV_FLAG)) + return !!(vma->vm_flags & VM_HUGEPAGE); + + return false; +} #else /* CONFIG_THP_SWAP */ static inline int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd) { return 0; } + +static inline bool transparent_hugepage_swapin_enabled( + struct vm_area_struct *vma) +{ + return false; +} #endif /* CONFIG_THP_SWAP */ #endif /* _LINUX_HUGE_MM_H */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8d49a11e83ee..da42d1cdc26a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -57,7 +57,8 @@ unsigned long transparent_hugepage_flags __read_mostly = #endif (1<address); if (!page) { + if (!transparent_hugepage_swapin_enabled(vma)) + goto split; + page = read_swap_cache_async(entry, GFP_HIGHUSER_MOVABLE, vma, haddr, false); if (!page) { @@ -1652,23 +1706,8 @@ int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd) * Back out if somebody else faulted in this pmd * while we released the pmd lock. */ - if (likely(pmd_same(*vmf->pmd, orig_pmd))) { - ret = split_swap_cluster(entry, false); - /* - * Retry if somebody else swap in the swap - * entry - */ - if (ret == -EEXIST) { - ret = 0; - goto retry; - /* swapoff occurs under us */ - } else if (ret == -EINVAL) - ret = 0; - else { - count_vm_event(THP_SWPIN_FALLBACK); - goto fallback; - } - } + if (likely(pmd_same(*vmf->pmd, orig_pmd))) + goto split; delayacct_clear_flag(DELAYACCT_PF_SWAPIN); goto out; } @@ -1780,6 +1819,20 @@ int do_huge_pmd_swap_page(struct vm_fault *vmf, pmd_t orig_pmd) if (page) put_page(page); return ret; +split: + ret = split_swap_cluster(entry, false); + /* Retry if somebody else swap in the swap entry */ + if (ret == -EEXIST) { + ret = 0; + goto retry; + } + /* swapoff occurs under us */ + if (ret == -EINVAL) { + delayacct_clear_flag(DELAYACCT_PF_SWAPIN); + return 0; + } + count_vm_event(THP_SWPIN_FALLBACK); + goto fallback; } #else static inline void __split_huge_swap_pmd(struct vm_area_struct *vma,