From patchwork Thu Jan 17 00:32:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 10767291 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 487986C2 for ; Thu, 17 Jan 2019 00:34:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCA692DE41 for ; Thu, 17 Jan 2019 00:34:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C018C2E297; Thu, 17 Jan 2019 00:34:28 +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 3E4402DE41 for ; Thu, 17 Jan 2019 00:34:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2715E8E000F; Wed, 16 Jan 2019 19:33:42 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1CBB98E0012; Wed, 16 Jan 2019 19:33:42 -0500 (EST) 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 E05858E0014; Wed, 16 Jan 2019 19:33:41 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 6440B8E000B for ; Wed, 16 Jan 2019 19:33:41 -0500 (EST) Received: by mail-pl1-f197.google.com with SMTP id 12so4923704plb.18 for ; Wed, 16 Jan 2019 16:33:41 -0800 (PST) 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=YA6cxWpgPEbPNtR1Fs7WK/CCwe2Q1Rjy/WvJom+wYlI=; b=qxCoi9tqxJjC92Cmt17a3PWWXRWf+X1Gcj+mKx5UMXcMPI0n+vFgiPwfZrvscrHYd1 M89ARCL+nqsEKOaEf415o+6lBRfB85j1AqI6AmPLUuY8HkmefqUlbVXGePaM9KrRhib8 +eJfNadBQBwdZZNjrmMub5Xd8gDF319mKwchn9wP75bow0/iLymEBAsLARbVz/xrzBwU nvbjLH3fIz6F+3OJMYy5LEvGhSSRZj/p/770Qool6hX6hEWBG9CItOgLypdAMc2JgyIF Y+grEmEoytLV/0GnP0C0pfFwupiDJ1iB64rubI9wgG/hep70bKfoD5BHDZ0bfWpuWrNX tdcw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AJcUukdPPqSsa/ZvNeeAzAEh2zLS+uMrELhXRMFxa47rDHR1p0Gso9KW oJ5wh/1AwTxsNYvNQERZt6xVEMRuWazvg/SWnC4y9taj20Aa2znqROa21BP7RPM/VDk/AiUukyn ouTBmjqTdLBRSq0aXFx/KPGUaJ6XzZiRggXQWisI0FUrRL03yxhefqTxuqTmEp+uLHQ== X-Received: by 2002:a63:e5c:: with SMTP id 28mr4500137pgo.369.1547685221044; Wed, 16 Jan 2019 16:33:41 -0800 (PST) X-Google-Smtp-Source: ALg8bN7badaV97gr6P+HUlIPp+qWQ2JQLH1+iR1MemqP5bp63iK4P78MdrO8Yo7efP5cEdmCYo3H X-Received: by 2002:a63:e5c:: with SMTP id 28mr4500051pgo.369.1547685219798; Wed, 16 Jan 2019 16:33:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547685219; cv=none; d=google.com; s=arc-20160816; b=UiCZXJR6FbwzOrsvA7a8Xx33Bq7rhne3iwnZ/f+VBj6b3ukHOPb+G4STtEu27ypRW5 FftX+qhq+7kzsDIC2Qt/vSuFiJnZZkIjAknfxKMA0JqC3iqGGWbIA5qAjqA7fzeooTrj MY51I7eigZizuxT1W6UQ5dFpQ2lqCQN3DH3InZXipMLqu30YrJ8Ci5tO3ayw3A18B3ly zL03WfJYzz21QOd31EzYovGb1+8Zf0Y+bxcXdxUMET0FTH6MVeUgenGMwE/ReX9yTIys VV10HDMPT9BGeyqsZ0ijdm2cvlnLTS6mO7AN6Wgqw/hbl2BaGx8SfXqmlRD1piXPmpXi 3JYQ== 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=YA6cxWpgPEbPNtR1Fs7WK/CCwe2Q1Rjy/WvJom+wYlI=; b=uDnD1PxD3Cgr0au7CwNzjugfAb3IpwRFN3h92HaCffoUQWZ6myYnv91L0KoTBbRrJU V4+YJLUs+xHdX1+z2OzLCtk+6ufsmCPLEnvl33yi5z2FPCG+Bh4OJ2v98z6X9mPXdFYo EMSRQIGJdMnWmAla4rdoaTuMtzQSU/QcRYfC9PUzjRPAgkloR/JKyfabaTdTua2Odg0G bA9GzdKJiRYzBVE+tYqtPAPAjYzqYOW5HOAANJ7FsawwA7ZWY8Ao/H3n+gW6KQA5RKI9 Gdj7ZGi3W6qGSNmDgR0TmUbC5BTONtPcfs03yd5HwkrDHgvUSrdgDdKHdRs2q8WQCVLE uNRw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id q20si7678846pll.255.2019.01.16.16.33.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 16:33:39 -0800 (PST) Received-SPF: pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=rick.p.edgecombe@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 orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 16:33:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="292166053" Received: from rpedgeco-desk5.jf.intel.com ([10.54.75.79]) by orsmga005.jf.intel.com with ESMTP; 16 Jan 2019 16:33:36 -0800 From: Rick Edgecombe To: Andy Lutomirski , Ingo Molnar Cc: linux-kernel@vger.kernel.org, x86@kernel.org, hpa@zytor.com, Thomas Gleixner , Borislav Petkov , Nadav Amit , Dave Hansen , Peter Zijlstra , linux_dti@icloud.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, akpm@linux-foundation.org, kernel-hardening@lists.openwall.com, linux-mm@kvack.org, will.deacon@arm.com, ard.biesheuvel@linaro.org, kristen@linux.intel.com, deneen.t.dock@intel.com, Rick Edgecombe , "Rafael J. Wysocki" , Pavel Machek Subject: [PATCH 14/17] mm: Make hibernate handle unmapped pages Date: Wed, 16 Jan 2019 16:32:56 -0800 Message-Id: <20190117003259.23141-15-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190117003259.23141-1-rick.p.edgecombe@intel.com> References: <20190117003259.23141-1-rick.p.edgecombe@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 For architectures with CONFIG_ARCH_HAS_SET_ALIAS, pages can be unmapped briefly on the directmap, even when CONFIG_DEBUG_PAGEALLOC is not configured. So this changes kernel_map_pages and kernel_page_present to be defined when CONFIG_ARCH_HAS_SET_ALIAS is defined as well. It also changes places (page_alloc.c) where those functions are assumed to only be implemented when CONFIG_DEBUG_PAGEALLOC is defined. So now when CONFIG_ARCH_HAS_SET_ALIAS=y, hibernate will handle not present page when saving. Previously this was already done when CONFIG_DEBUG_PAGEALLOC was configured. It does not appear to have a big hibernating performance impact. Before: [ 4.670938] PM: Wrote 171996 kbytes in 0.21 seconds (819.02 MB/s) After: [ 4.504714] PM: Wrote 178932 kbytes in 0.22 seconds (813.32 MB/s) Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: "Rafael J. Wysocki" Cc: Pavel Machek Signed-off-by: Rick Edgecombe Acked-by: Pavel Machek --- arch/x86/mm/pageattr.c | 4 ---- include/linux/mm.h | 18 ++++++------------ mm/page_alloc.c | 6 ++++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 3a51915a1410..717bdc188aab 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -2257,7 +2257,6 @@ int set_alias_default_noflush(struct page *page) return __set_pages_p(page, 1); } -#ifdef CONFIG_DEBUG_PAGEALLOC void __kernel_map_pages(struct page *page, int numpages, int enable) { if (PageHighMem(page)) @@ -2302,11 +2301,8 @@ bool kernel_page_present(struct page *page) pte = lookup_address((unsigned long)page_address(page), &level); return (pte_val(*pte) & _PAGE_PRESENT); } - #endif /* CONFIG_HIBERNATION */ -#endif /* CONFIG_DEBUG_PAGEALLOC */ - int __init kernel_map_pages_in_pgd(pgd_t *pgd, u64 pfn, unsigned long address, unsigned numpages, unsigned long page_flags) { diff --git a/include/linux/mm.h b/include/linux/mm.h index 80bb6408fe73..b362a280a919 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2642,37 +2642,31 @@ static inline void kernel_poison_pages(struct page *page, int numpages, int enable) { } #endif -#ifdef CONFIG_DEBUG_PAGEALLOC extern bool _debug_pagealloc_enabled; -extern void __kernel_map_pages(struct page *page, int numpages, int enable); static inline bool debug_pagealloc_enabled(void) { - return _debug_pagealloc_enabled; + return IS_ENABLED(CONFIG_DEBUG_PAGEALLOC) && _debug_pagealloc_enabled; } +#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_ARCH_HAS_SET_ALIAS) +extern void __kernel_map_pages(struct page *page, int numpages, int enable); + static inline void kernel_map_pages(struct page *page, int numpages, int enable) { - if (!debug_pagealloc_enabled()) - return; - __kernel_map_pages(page, numpages, enable); } #ifdef CONFIG_HIBERNATION extern bool kernel_page_present(struct page *page); #endif /* CONFIG_HIBERNATION */ -#else /* CONFIG_DEBUG_PAGEALLOC */ +#else /* CONFIG_DEBUG_PAGEALLOC || CONFIG_ARCH_HAS_SET_ALIAS */ static inline void kernel_map_pages(struct page *page, int numpages, int enable) {} #ifdef CONFIG_HIBERNATION static inline bool kernel_page_present(struct page *page) { return true; } #endif /* CONFIG_HIBERNATION */ -static inline bool debug_pagealloc_enabled(void) -{ - return false; -} -#endif /* CONFIG_DEBUG_PAGEALLOC */ +#endif /* CONFIG_DEBUG_PAGEALLOC || CONFIG_ARCH_HAS_SET_ALIAS */ #ifdef __HAVE_ARCH_GATE_AREA extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d295c9bc01a8..c10a0d484aa6 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1074,7 +1074,8 @@ static __always_inline bool free_pages_prepare(struct page *page, } arch_free_page(page, order); kernel_poison_pages(page, 1 << order, 0); - kernel_map_pages(page, 1 << order, 0); + if (debug_pagealloc_enabled()) + kernel_map_pages(page, 1 << order, 0); kasan_free_nondeferred_pages(page, order); return true; @@ -1944,7 +1945,8 @@ inline void post_alloc_hook(struct page *page, unsigned int order, set_page_refcounted(page); arch_alloc_page(page, order); - kernel_map_pages(page, 1 << order, 1); + if (debug_pagealloc_enabled()) + kernel_map_pages(page, 1 << order, 1); kernel_poison_pages(page, 1 << order, 1); kasan_alloc_pages(page, order); set_page_owner(page, order, gfp_flags);