From patchwork Wed May 23 08:26:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10420575 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 21D3B60224 for ; Wed, 23 May 2018 08:26:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13ADD28E3F for ; Wed, 23 May 2018 08:26:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0872428E5F; Wed, 23 May 2018 08:26:38 +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 596B028E3F for ; Wed, 23 May 2018 08:26:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1EE8D6B0007; Wed, 23 May 2018 04:26:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1C3CE6B0008; Wed, 23 May 2018 04:26:36 -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 0DCC46B000A; Wed, 23 May 2018 04:26:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f72.google.com (mail-pg0-f72.google.com [74.125.83.72]) by kanga.kvack.org (Postfix) with ESMTP id C125D6B0007 for ; Wed, 23 May 2018 04:26:35 -0400 (EDT) Received: by mail-pg0-f72.google.com with SMTP id t11-v6so6475499pgn.9 for ; Wed, 23 May 2018 01:26:35 -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=K0C6gygmq55jUhquMIDZFFbicfMHgTKbDvsJfvEhTcM=; b=Hh4dFQ1k4W9kbDQ7lTYJ6ZCF1KgPAsGQ5LqixV4UWO56UG6GinRXP3zDE0sTLACVP7 BzRDToheoUN80eCqMT0okd2lO2B4qM9IQ5vOgaeTFKadg81fcvoTxxk37lfid5JKT7yz ZDRNhZVMav7uou8Qp0RbqTe2tpp7ZOlEXVqnXV/2jm0hw5GLMh99Ikj4trlrKK8xWMFi 1iMJjF881XIHFcQldIewZMESi6n4/TOWHON4eIAlob8yPp/LT25PhosQJs6yRSnljUXH 3qnwm35qrWs2tsBdy0USCATh8FKaWSPdsOzY3rsrUeXF13BvWyeLjkyrfUYj++MjKZ+g 5WkA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 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: ALKqPweVm4yjXAhqtxRqCxndesH6PijMaUtYFfc7DRE0Rr8Cbzl2l/dM spM6b9hsh4hkr99eqBn4yFCHx/H6m7A5BaPR5osBmicQwvDs2QLbjKsB3rmZeG3vputt/Zy3Ss1 uiudE7yHODI8FWuGLTbVbP1KmsIlV3mrb/rwM4FmBq5zuMhRAf5qUIbkvnHk2DfycCQ== X-Received: by 2002:a62:8dc9:: with SMTP id p70-v6mr1946230pfk.72.1527063995420; Wed, 23 May 2018 01:26:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpXmRc6FvOoMU03sS/un3SUSMQnU7gbtug8JtzMGDdqcYktqGmFSNeD3MV+wJX+zcKpNJeR X-Received: by 2002:a62:8dc9:: with SMTP id p70-v6mr1946175pfk.72.1527063994507; Wed, 23 May 2018 01:26:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527063994; cv=none; d=google.com; s=arc-20160816; b=scsIZTyyDAW4vUBThtskkyJVBwx39xWfCxXk3U7R0iGKjbVr6AU+qm7IZJbIEgORg2 CUT9gg7q33NPVdSQvqObGpC+kCdf9P86A/aOWG4iyAAKEIxQB7j0K7KkfB7tOl3mKUqx dHDl6IRwYANKTov4IMDEPzohsHn8EqA5CCaEXdUpdPfKPhN1X5y+x3VHGmSLklb9HpOF ZI1Ol7zGL+l5q9BDNCz8KdYkEA1ex9hxyIQ0Ar0SOvZo8VCKlyL7xrgniGUbqCEs6hER tFYxc7BYwvSPdO8hkgMh18U4qOUFbAM9zAiGTcQ5Ttj1itc5QnkuE3p2pAQ3QP9WM3Qo TmHg== 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=K0C6gygmq55jUhquMIDZFFbicfMHgTKbDvsJfvEhTcM=; b=cZqInQrML2ppZ7ouQglkeaE0tX0iW0xJuJ5UPLuXW2odHyXlNU1Sa7z1QjUrLtAD5M O7F+gnUgmdw8HJGzluYydoqNttSlS9p4SYT4jRdSVzqxJdaFjHW7SjYjhKSCHP7zaF3+ CFHV1VSmcuUsimd7JgwZ3jce39d2XAlw0+eXxjb7s5DP0i77QJQxwvVrg5tMSH3gI/0K w1b+uRXZap99+Lgt+B5EG4CiWfPhr4RPoe92zNrLVcW52yMMh8iiPQ+XXc81AUmzXAhO CEAoNjruF8OB7RdA6XPrit5B+3ohMxhYjhPLqDcXcl0N94na4YVFalj7jESNW5MYQZeE egRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga17.intel.com (mga17.intel.com. [192.55.52.151]) by mx.google.com with ESMTPS id 3-v6si19009042plf.84.2018.05.23.01.26.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 01:26:34 -0700 (PDT) Received-SPF: pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 as permitted sender) client-ip=192.55.52.151; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ying.huang@intel.com designates 192.55.52.151 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 fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2018 01:26:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,432,1520924400"; d="scan'208";a="57725948" Received: from yhuang6-ux31a.sh.intel.com ([10.239.197.97]) by fmsmga001.fm.intel.com with ESMTP; 23 May 2018 01:26:31 -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 01/21] mm, THP, swap: Enable PMD swap operations for CONFIG_THP_SWAP Date: Wed, 23 May 2018 16:26:05 +0800 Message-Id: <20180523082625.6897-2-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> 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 Previously, the PMD swap operations are only enabled for CONFIG_ARCH_ENABLE_THP_MIGRATION. Because they are only used by the THP migration support. We will support PMD swap mapping to the huge swap cluster and swapin the THP as a whole. That will be enabled via CONFIG_THP_SWAP and needs these PMD swap operations. So enable the PMD swap operations for CONFIG_THP_SWAP too. 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 --- arch/x86/include/asm/pgtable.h | 2 +- include/asm-generic/pgtable.h | 2 +- include/linux/swapops.h | 44 ++++++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index f1633de5a675..0dff03085197 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1224,7 +1224,7 @@ static inline pte_t pte_swp_clear_soft_dirty(pte_t pte) return pte_clear_flags(pte, _PAGE_SWP_SOFT_DIRTY); } -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#if defined(CONFIG_ARCH_ENABLE_THP_MIGRATION) || defined(CONFIG_THP_SWAP) static inline pmd_t pmd_swp_mksoft_dirty(pmd_t pmd) { return pmd_set_flags(pmd, _PAGE_SWP_SOFT_DIRTY); diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index f59639afaa39..bb8354981a36 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -675,7 +675,7 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm, #endif #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY -#ifndef CONFIG_ARCH_ENABLE_THP_MIGRATION +#if !defined(CONFIG_ARCH_ENABLE_THP_MIGRATION) && !defined(CONFIG_THP_SWAP) static inline pmd_t pmd_swp_mksoft_dirty(pmd_t pmd) { return pmd; diff --git a/include/linux/swapops.h b/include/linux/swapops.h index 1d3877c39a00..f1be5a52f5c8 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -258,17 +258,7 @@ static inline int is_write_migration_entry(swp_entry_t entry) #endif -struct page_vma_mapped_walk; - -#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION -extern void set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, - struct page *page); - -extern void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, - struct page *new); - -extern void pmd_migration_entry_wait(struct mm_struct *mm, pmd_t *pmd); - +#if defined(CONFIG_ARCH_ENABLE_THP_MIGRATION) || defined(CONFIG_THP_SWAP) static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd) { swp_entry_t arch_entry; @@ -286,6 +276,28 @@ static inline pmd_t swp_entry_to_pmd(swp_entry_t entry) arch_entry = __swp_entry(swp_type(entry), swp_offset(entry)); return __swp_entry_to_pmd(arch_entry); } +#else +static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd) +{ + return swp_entry(0, 0); +} + +static inline pmd_t swp_entry_to_pmd(swp_entry_t entry) +{ + return __pmd(0); +} +#endif + +struct page_vma_mapped_walk; + +#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +extern void set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, + struct page *page); + +extern void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, + struct page *new); + +extern void pmd_migration_entry_wait(struct mm_struct *mm, pmd_t *pmd); static inline int is_pmd_migration_entry(pmd_t pmd) { @@ -306,16 +318,6 @@ static inline void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, static inline void pmd_migration_entry_wait(struct mm_struct *m, pmd_t *p) { } -static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd) -{ - return swp_entry(0, 0); -} - -static inline pmd_t swp_entry_to_pmd(swp_entry_t entry) -{ - return __pmd(0); -} - static inline int is_pmd_migration_entry(pmd_t pmd) { return 0;