From patchwork Wed May 9 08:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10388667 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 6775760353 for ; Wed, 9 May 2018 08:39:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5900C28E13 for ; Wed, 9 May 2018 08:39:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DBB828E26; Wed, 9 May 2018 08:39:46 +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 8604728E13 for ; Wed, 9 May 2018 08:39:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 768046B04A2; Wed, 9 May 2018 04:39:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7164D6B04A3; Wed, 9 May 2018 04:39:41 -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 6060F6B04A4; Wed, 9 May 2018 04:39:41 -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 204D76B04A3 for ; Wed, 9 May 2018 04:39:41 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id u7-v6so3389768plq.3 for ; Wed, 09 May 2018 01:39:41 -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=h0BhLMskpkA4WD+B97ftsoQHaP73izMryiJzwlboGKg=; b=jeXhp7gtOX5/Oii1SbTYM+z8KQU0Fdoiblg3YyltFahi4v0a873IzF/SCMqyTFIhmg ciKIGoCR0CMTacfJSbOTa6mN6Ex7oqqksBy1BLvkGfpbY6U3COb/Tx9PORmZPCyUv9P1 Oqh5UXRF5J/ql1pwRpeCWf+t4d7O7agYYm11oZFZbS18vSFT66MbEFny/NZ0A2RKpSqO J2mW9VGckJfYSgqSifefhaJ1ahDcbPkRk81gZ8dCr7fz3ydedZV/FSvUraLWw9puJH8u JOvbChVINal+uewSOARgOimPzYpE4nPuyK/4TnoMZMtKlpx+auK3ceaYh556kMvZI9JJ PFwQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=ying.huang@intel.com X-Gm-Message-State: ALQs6tCJZN4LWMqDtznuP/1oYt1DsZbY0NDNxvQPRWXlaq1c6fiOAN3M 9Rzwb8NrYyvVaU9TMaiwpVq/YcrxnkukrQEi/Pyb77i+bvHd1xzZlFaNYPXl9sg0GzdPHJjFYlF LtJiylLdMq9JXit35nVON7YZb1dBDAUbjOWeYrnUWKnt8uYQWZ079K+939CzpBqdh+g== X-Received: by 2002:a17:902:4b:: with SMTP id 69-v6mr21113581pla.178.1525855180800; Wed, 09 May 2018 01:39:40 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpD2CutR0Cs32YuuHHOzBhYfAix3lJ+YSbEvXmouFZxnzgWm0dWmYzAInru8QgxYq2ReT3Q X-Received: by 2002:a17:902:4b:: with SMTP id 69-v6mr21113528pla.178.1525855179922; Wed, 09 May 2018 01:39:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525855179; cv=none; d=google.com; s=arc-20160816; b=ogqkYTz+4Bs1QDpHG6SibiSpHWz8GXL6a/Kfjs0ARh5IA7as6VWUHo1Ixv05/HwJkE b4MktgyT1uoduxoWPcbimgzfm+EnUW8N6ekFZWFZgMCh5fYfV6C/MW+gYANY+N++A9ZA uKgC5ODQMzHSIgWTmNKmAjObrWvco/CnUib2VsephS0L1bA69rqkXzjg25fXhE2cNhwP R9A3iJEGh+xaB+NBV4AaF227V5Y1mp9VYZiN+l9AjsnJQLS1e4zI/cXNSLvJuGobkYbz IMc5mXtMalOYUzwOFdNXY/TB6ezT8i8iMi8GcjlPkuPlGcKWAsU8WgqoYnA4RDILC+bG s9Rw== 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=h0BhLMskpkA4WD+B97ftsoQHaP73izMryiJzwlboGKg=; b=Ah/hm/syW/mp34wIHOD+lHsNitKrk/SueAiaEZ1GJw620NXYTTxNxP691QrGMkCEJP BSUsLSW+QKHzDevYeJe7wLrOh++KYeyxbbHlcyLLhwTnv801mOpNp1UhpTR3J58IlbM5 wElYIQk9viNaV7OVRfjR05P7Obwgax9+Mg0gTPLeAdkp3m7z+RvEBVTaXuyMOZA6jaHU nC1t2YefsGca5PhuTXrxWiRfyOC4/qktjlfMnkA0mZPOz/R9QDkwHDZrNQ8kB26gL6ra UJxrBnp+ykTQ9kRMZNAXNkbk1edo4MGe1BjaQstyju5NRSNseJJkHPAgyWB+HA4xXtLP QBNw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=ying.huang@intel.com Received: from mga18.intel.com (mga18.intel.com. [134.134.136.126]) by mx.google.com with ESMTPS id y11-v6si18624861pgv.473.2018.05.09.01.39.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 01:39:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 134.134.136.126 as permitted sender) client-ip=134.134.136.126; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 134.134.136.126 as permitted sender) smtp.mailfrom=ying.huang@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 orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2018 01:39:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,381,1520924400"; d="scan'208";a="52769659" Received: from yhuang-gentoo.sh.intel.com ([10.239.193.148]) by fmsmga004.fm.intel.com with ESMTP; 09 May 2018 01:39:35 -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 -V2 11/21] mm, THP, swap: Add sysfs interface to configure THP swapin Date: Wed, 9 May 2018 16:38:36 +0800 Message-Id: <20180509083846.14823-12-ying.huang@intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180509083846.14823-1-ying.huang@intel.com> References: <20180509083846.14823-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 --- Documentation/vm/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/vm/transhuge.rst b/Documentation/vm/transhuge.rst index a87b1d880cd4..d727706cffc3 100644 --- a/Documentation/vm/transhuge.rst +++ b/Documentation/vm/transhuge.rst @@ -163,6 +163,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 +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 f5348d072351..1cfd43047f0d 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -62,6 +62,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; @@ -404,11 +406,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 7f4442e064b5..91af33e97ff3 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) { @@ -1655,23 +1709,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; } @@ -1783,6 +1822,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,