From patchwork Wed Sep 12 00:43:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 10596521 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 869CC109C for ; Wed, 12 Sep 2018 00:44:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75E9229AC1 for ; Wed, 12 Sep 2018 00:44:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A4FD29AD2; Wed, 12 Sep 2018 00:44:10 +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 9939229AC1 for ; Wed, 12 Sep 2018 00:44:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E57C8E0003; Tue, 11 Sep 2018 20:44:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 06EE68E0001; Tue, 11 Sep 2018 20:44: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 E537F8E0003; Tue, 11 Sep 2018 20:44:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id A01788E0001 for ; Tue, 11 Sep 2018 20:44:07 -0400 (EDT) Received: by mail-pl1-f200.google.com with SMTP id bh1-v6so105954plb.15 for ; Tue, 11 Sep 2018 17:44:07 -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=rTxtROfDkWGJkUE1RjNDBHt+BJWzTSNV9bEGFt+NSBE=; b=aEKPAivjF5ursTI2i3554h4C70xXzFw4S04oT6razfCr3HVcB9hU/lmMgeAFbcU5Ut fvXFkijlRrIH9EV2pOsHVgx+93XNmP7eoYXoENhXQByj0YzjnP0wg22mnQlINXhByiJs hfa+3T9zzZMGSsK4EvBSo9d7vVJP5uVphkKtY5u9aJ9TD6ziqTvUJBQubcazK37tcl2c RY1eMbx3yeGccyZuZXs0/rxrsMmq3Bjv1XH4/787heP/CmQeWwf9d7vI0J25XS7qHH6U FYywFE7UtBH+gzYQh0XOwtxU4D09+iQg8wDqA2bEuaNy34dY3tkKI/FybatsXVM2pWHb GVLA== 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: APzg51A7S0R2jhrMKQ1Kdu6j7du8auHieyBxVwl7GTvvLsos7N5HwMyz BkuwBszCnam8BuJGKnDauc3/uZgYuEYtl56Lh0YCM1G5fwlwKI+J4gOLm0fDNj5bE0X+qmTz4F+ JWbUHjQof0SjHpGq3NgEKeob8Kd5VSOzApFgWumk4ui8EE5+L5wuMamVtmMeOXfo+yA== X-Received: by 2002:a63:2354:: with SMTP id u20-v6mr31284758pgm.122.1536713047332; Tue, 11 Sep 2018 17:44:07 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZXm4Xs1nknl9d55YTKqrL/eyPoysPSFMLUQyrwCpwNqYdF4VB2WAGnUC6TLkcPCzHgyDyH X-Received: by 2002:a63:2354:: with SMTP id u20-v6mr31284714pgm.122.1536713046526; Tue, 11 Sep 2018 17:44:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536713046; cv=none; d=google.com; s=arc-20160816; b=zjHy5sGf7EWkTZjIKs0uBzDSWwldRoZ9EwHc0wVY/e1p57dFrtHF4XAvnMfqIDU1je l4u2UvSM4L01Z5dYkSk17kT410I6qErvgS03S0dKMvq8pE8xzVzv4tMM6ILPEkVm8OgB 4FL8p/7hsMs9n5mk/f6i+sz+OBtWrkurbxzLh5/InhQw1dSavNHRB1jLnzVz+6EBWqX8 W3DRMEtB5qY8jpp/mahz9MO4u6giRTgOIV/aizd09zv3EFS1/FJpkkPvmR4vdVBmvdVk GD5KRO1+2WsxWz++xVB9EAAPb62HQYDCm9J1MDQckLNUI7/wvzTpBC1117NuDmLK/dfb K5gQ== 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; bh=rTxtROfDkWGJkUE1RjNDBHt+BJWzTSNV9bEGFt+NSBE=; b=l/q9dODdBmrzyfkA7NTbnfZq7UHU5OZ1OncQgdticmUTIUzMqmUp5OYLk37Xh/LlOP pUnb5aZfR92GWS0WfTkR1pc0K6USpCxOucvbSvohJ9s95PICer1FQBQG6ljS9OQUiMPq jF9fh4WgCwAiFJ7UqeQIfwip44/8DkN1mRQnvDyd/hOuLa9nxP/LLuF7TRy+WFIS77Q5 CV7fU+B4SFeatZUQFjAs7CC9HEXNTCekGE/sFo5m4RTVN40as1+XuFCPOZV0Sbd2p6QW i52PH30B3aZRG4L+/nbCLKqsbaHKnHDV0nGeujrYxjxN9jT6gQEG5MCV0chAKCXbMkRt iPnA== 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 p21-v6si20648717plq.338.2018.09.11.17.44.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Sep 2018 17:44:06 -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 fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Sep 2018 17:44:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,362,1531810800"; d="scan'208";a="69283795" Received: from unknown (HELO yhuang-mobile.sh.intel.com) ([10.239.198.87]) by fmsmga007.fm.intel.com with ESMTP; 11 Sep 2018 17:44:01 -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 -V5 RESEND 01/21] swap: Enable PMD swap operations for CONFIG_THP_SWAP Date: Wed, 12 Sep 2018 08:43:54 +0800 Message-Id: <20180912004414.22583-2-ying.huang@intel.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180912004414.22583-1-ying.huang@intel.com> References: <20180912004414.22583-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 Currently, "the swap entry" in the page tables is used for a number of things outside of actual swap, like page migration, etc. We support the THP/PMD "swap entry" for page migration currently and the functions behind this are tied to page migration's config option (CONFIG_ARCH_ENABLE_THP_MIGRATION). But, we also need them for THP swap optimization. So a new config option (CONFIG_HAVE_PMD_SWAP_ENTRY) is added. It is enabled when either CONFIG_ARCH_ENABLE_THP_MIGRATION or CONFIG_THP_SWAP is enabled. And PMD swap entry functions are tied to this new config option instead. Some functions enabled by CONFIG_ARCH_ENABLE_THP_MIGRATION are for page migration only, they are still enabled only for that. 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 --- arch/x86/include/asm/pgtable.h | 2 +- include/asm-generic/pgtable.h | 2 +- include/linux/swapops.h | 44 ++++++++++++++++++++++-------------------- mm/Kconfig | 8 ++++++++ 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index e4ffa565a69f..194f97dc4583 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1334,7 +1334,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 +#ifdef CONFIG_HAVE_PMD_SWAP_ENTRY 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 5657a20e0c59..eb1e9d17371b 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 +#ifndef CONFIG_HAVE_PMD_SWAP_ENTRY 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 22af9d8a84ae..79ccbf8789d5 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -259,17 +259,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); - +#ifdef CONFIG_HAVE_PMD_SWAP_ENTRY static inline swp_entry_t pmd_to_swp_entry(pmd_t pmd) { swp_entry_t arch_entry; @@ -287,6 +277,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) { @@ -307,16 +319,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; diff --git a/mm/Kconfig b/mm/Kconfig index 7bf074bf79e5..9a6e7e27e8d5 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -430,6 +430,14 @@ config THP_SWAP For selection by architectures with reasonable THP sizes. +# +# "PMD swap entry" in the page table is used both for migration and +# actual swap. +# +config HAVE_PMD_SWAP_ENTRY + def_bool y + depends on THP_SWAP || ARCH_ENABLE_THP_MIGRATION + config TRANSPARENT_HUGE_PAGECACHE def_bool y depends on TRANSPARENT_HUGEPAGE