From patchwork Tue Sep 25 20:20:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10614785 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 37C2D174A for ; Tue, 25 Sep 2018 20:20:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C7672AD74 for ; Tue, 25 Sep 2018 20:20:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E0B32AD65; Tue, 25 Sep 2018 20:20: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=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 410CE2AD6A for ; Tue, 25 Sep 2018 20:20:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 418268E00BC; Tue, 25 Sep 2018 16:20:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3C8268E00A4; Tue, 25 Sep 2018 16:20:32 -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 2DE738E00BC; Tue, 25 Sep 2018 16:20:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id E09848E00A4 for ; Tue, 25 Sep 2018 16:20:31 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id j15-v6so13226702pfi.10 for ; Tue, 25 Sep 2018 13:20:31 -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:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=6yCc4dIGwjjqYKqZsk0S704AskE7eH68lGQlfn8PRns=; b=Fm2IYVI765rWbYXikjvJJUS4DsFwsqoxKdXU54OZ6/0ksAcEMyk1ITvRsuxEDpoFMC 6vca77hKSNyFgWugu3VpxlY8WOkbnQDJK/2lSzHpwiNNNj9tGqgZNauxrADmrCiRLzfw jIvChJrz+BuN7XWDYKcDiDXiKBFWCk1qEqHyoQZgijTF7gU+bwAhWaeaT9CEgg20DuNW 7KcOyXfZnUXlBcR0TGLpF1CAY3nJMF8yp1i9GuwnZcW3AaER2uB/BBa0Zy/OI03Pwrxi Lp/UW2UMqZ4ccV302pzr1Flr/oHm8th6UOd0CbWzlDkiOsMczMnuueKyT5GRKcbOW8eQ 2ylA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: ABuFfohSlp7nsCQuO9QUgbi2FGm8U71OZe4x9yWlyDNV0sBc0yrts1zE Fp0y/+zxZDTdcvuh4rmkORaKZwiD0LQRGF0P3cwaU98wSHvMstddf6w1EasQS3mtWnUkm0ok3FB DqYSv7Em9pTf3OFrtPNSE21AaQPMH80auHRdZMB5v4mp2/lmHodr8mVdI7d0jTfONVw== X-Received: by 2002:a63:6c89:: with SMTP id h131-v6mr2457996pgc.237.1537906831484; Tue, 25 Sep 2018 13:20:31 -0700 (PDT) X-Google-Smtp-Source: ACcGV60n66/bVK1INgCsSvwAq5TKKYCdtcn+bQ0jh9/HuJvQMjQH2yrBiM7cFkWW0pFCqVdeubbe X-Received: by 2002:a63:6c89:: with SMTP id h131-v6mr2457945pgc.237.1537906830401; Tue, 25 Sep 2018 13:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537906830; cv=none; d=google.com; s=arc-20160816; b=IjfIhYGDEuerNGET/itkRWoERpiRdgraMxEmiHh1zy4XQw6ICgw30t8CQahPZlLVys kCXdikrGS8ukRz6aUsHAhOMSof/PPEC3p6cvkAROA2t/rfoCJW3fJEN3RUbQ4XRY6mna zbo0mpj71mIdFGPCbSmjqHn9NBxrzg+LkgpERnrMfLM/0qgwA2F1wi6vEQDWrDBGnLQl G+w750XA7Fe0ZuTidqCCyjpODN2SazezmNrtwMYpd48syMirml/BJG11PWxtBy85GjJ3 ekim3VIUBLSbWzHprljSsxqhoQm1MmehbquxiNgx/tbCV6f6562oHNM7M0A5lT9uMrEG 55FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject; bh=6yCc4dIGwjjqYKqZsk0S704AskE7eH68lGQlfn8PRns=; b=cTRYQn28K6kTP7WfSH0tU2bggiuFK5N/exo39K7JL+n/bo02afQgm8yJc+o9ArnQ/S xtGMTOWofxw2rlwyuNPdmjekqgh8i0swzDNHjmD9vmspjB3e36lv2RWOx7TFyQZAI+30 7M7bhUvW5Sd3sdAWrnOXtbnyIOIcFKx0xGpgyYkmuNUIOHOsdHrtuLNb2+Im4E0ZDNug uZhJMZTX4ETwPplLgp6XS4xBimSoVyx2iWxx5bYWJHawxLJ20j2imQG4fWsU/K0qefRE xwoY/GkCuX26mPUSO49wycy4R+sJJvMAc2pDtSr0bzYRhhopidX5QmbjfyjPau5FPZq/ AQXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id l10-v6si2298288pfe.310.2018.09.25.13.20.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 13:20:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (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 orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2018 13:20:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,303,1534834800"; d="scan'208";a="77230187" Received: from ahduyck-mobl.amr.corp.intel.com (HELO localhost.localdomain) ([10.7.198.152]) by orsmga006.jf.intel.com with ESMTP; 25 Sep 2018 13:20:12 -0700 Subject: [PATCH v5 2/4] mm: Provide kernel parameter to allow disabling page init poisoning From: Alexander Duyck To: linux-mm@kvack.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org Cc: pavel.tatashin@microsoft.com, mhocko@suse.com, dave.jiang@intel.com, dave.hansen@intel.com, jglisse@redhat.com, rppt@linux.vnet.ibm.com, dan.j.williams@intel.com, logang@deltatee.com, mingo@kernel.org, kirill.shutemov@linux.intel.com Date: Tue, 25 Sep 2018 13:20:12 -0700 Message-ID: <20180925201921.3576.84239.stgit@localhost.localdomain> In-Reply-To: <20180925200551.3576.18755.stgit@localhost.localdomain> References: <20180925200551.3576.18755.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 On systems with a large amount of memory it can take a significant amount of time to initialize all of the page structs with the PAGE_POISON_PATTERN value. I have seen it take over 2 minutes to initialize a system with over 12TB of RAM. In order to work around the issue I had to disable CONFIG_DEBUG_VM and then the boot time returned to something much more reasonable as the arch_add_memory call completed in milliseconds versus seconds. However in doing that I had to disable all of the other VM debugging on the system. In order to work around a kernel that might have CONFIG_DEBUG_VM enabled on a system that has a large amount of memory I have added a new kernel parameter named "vm_debug" that can be set to "-" in order to disable it. Reviewed-by: Pavel Tatashin Signed-off-by: Alexander Duyck --- v3: Switched from kernel config option to parameter v4: Added comment to parameter handler to record when option is disabled Updated parameter description based on feedback from Michal Hocko Fixed GB vs TB typo in patch description. Switch to vm_debug option similar to slub_debug v5: Rebased on latest linux-next Documentation/admin-guide/kernel-parameters.txt | 12 ++++++ include/linux/page-flags.h | 8 ++++ mm/debug.c | 46 +++++++++++++++++++++++ mm/memblock.c | 5 +-- mm/sparse.c | 4 +- 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 42d9150047f2..d9ad70ccbdc2 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4811,6 +4811,18 @@ This is actually a boot loader parameter; the value is passed to the kernel using a special protocol. + vm_debug[=options] [KNL] Available with CONFIG_DEBUG_VM=y. + May slow down system boot speed, especially when + enabled on systems with a large amount of memory. + All options are enabled by default, and this + interface is meant to allow for selectively + enabling or disabling specific virtual memory + debugging features. + + Available options are: + P Enable page structure init time poisoning + - Disable all of the above options + vmalloc=nn[KMG] [KNL,BOOT] Forces the vmalloc area to have an exact size of . This can be used to increase the minimum size (128MB on x86). It can also be used to diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 4d99504f6496..934f91ef3f54 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -163,6 +163,14 @@ static inline int PagePoisoned(const struct page *page) return page->flags == PAGE_POISON_PATTERN; } +#ifdef CONFIG_DEBUG_VM +void page_init_poison(struct page *page, size_t size); +#else +static inline void page_init_poison(struct page *page, size_t size) +{ +} +#endif + /* * Page flags policies wrt compound pages * diff --git a/mm/debug.c b/mm/debug.c index bd10aad8539a..cdacba12e09a 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "internal.h" @@ -175,4 +176,49 @@ void dump_mm(const struct mm_struct *mm) ); } +static bool page_init_poisoning __read_mostly = true; + +static int __init setup_vm_debug(char *str) +{ + bool __page_init_poisoning = true; + + /* + * Calling vm_debug with no arguments is equivalent to requesting + * to enable all debugging options we can control. + */ + if (*str++ != '=' || !*str) + goto out; + + __page_init_poisoning = false; + if (*str == '-') + goto out; + + while (*str) { + switch (tolower(*str)) { + case'p': + __page_init_poisoning = true; + break; + default: + pr_err("vm_debug option '%c' unknown. skipped\n", + *str); + } + + str++; + } +out: + if (page_init_poisoning && !__page_init_poisoning) + pr_warn("Page struct poisoning disabled by kernel command line option 'vm_debug'\n"); + + page_init_poisoning = __page_init_poisoning; + + return 1; +} +__setup("vm_debug", setup_vm_debug); + +void page_init_poison(struct page *page, size_t size) +{ + if (page_init_poisoning) + memset(page, PAGE_POISON_PATTERN, size); +} +EXPORT_SYMBOL_GPL(page_init_poison); #endif /* CONFIG_DEBUG_VM */ diff --git a/mm/memblock.c b/mm/memblock.c index 32e5c62ee142..b0ebca546ba1 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1503,10 +1503,9 @@ void * __init memblock_alloc_try_nid_raw( ptr = memblock_alloc_internal(size, align, min_addr, max_addr, nid); -#ifdef CONFIG_DEBUG_VM if (ptr && size > 0) - memset(ptr, PAGE_POISON_PATTERN, size); -#endif + page_init_poison(ptr, size); + return ptr; } diff --git a/mm/sparse.c b/mm/sparse.c index c0788e3d8513..ab2ac45e0440 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -696,13 +696,11 @@ int __meminit sparse_add_one_section(struct pglist_data *pgdat, goto out; } -#ifdef CONFIG_DEBUG_VM /* * Poison uninitialized struct pages in order to catch invalid flags * combinations. */ - memset(memmap, PAGE_POISON_PATTERN, sizeof(struct page) * PAGES_PER_SECTION); -#endif + page_init_poison(memmap, sizeof(struct page) * PAGES_PER_SECTION); section_mark_present(ms); sparse_init_one_section(ms, section_nr, memmap, usemap);