From patchwork Wed Jun 13 05:41:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 10461579 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 4AE5E6020A for ; Wed, 13 Jun 2018 05:43:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2863C28BCC for ; Wed, 13 Jun 2018 05:43:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A98F28BD4; Wed, 13 Jun 2018 05:43:02 +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 2B48A28BCC for ; Wed, 13 Jun 2018 05:43:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3ED46B0005; Wed, 13 Jun 2018 01:42:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9EEE96B0006; Wed, 13 Jun 2018 01:42:59 -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 8908C6B0007; Wed, 13 Jun 2018 01:42:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-io0-f197.google.com (mail-io0-f197.google.com [209.85.223.197]) by kanga.kvack.org (Postfix) with ESMTP id 60BF56B0005 for ; Wed, 13 Jun 2018 01:42:59 -0400 (EDT) Received: by mail-io0-f197.google.com with SMTP id n11-v6so1354294ioa.23 for ; Tue, 12 Jun 2018 22:42:59 -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:thread-topic:thread-index:date:message-id:references :in-reply-to:accept-language:content-language:content-id :content-transfer-encoding:mime-version; bh=cgQRHlq5TvI65ys5rDOyqDYdpb4SeQVGinCSco74Po4=; b=m6HMxuORlHh5mqiE7pPGtqsvEqSDtVOuFjmdPCz+Vi3L/AZ156Lh1+rrSisF2B9diL 0wopLjAL+GRzfWPGeLmXq83vSX53qeySRQfDC+N3YLS/vtHnQcg8dFEbuAJBrbDyCbgw mFJw6LGB8Ditrz6vpIXtmGbSJyGt4pq0jM9N0+asb13rElV+C/pua1GSLJLa4JTPPpyf +D6/YtVpl4TofrGBEs+8q8lm9WvoYo/+nCPEyUV7U4QWcQ43Zs9NDkxJYO3NmlcFGvoi LLMdg+px5sN4jZXnvPwulTXBUX7aymAnxt6zyKNuA5/4hwPkgv+8ehni8OZE2eVasCTE hycw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of n-horiguchi@ah.jp.nec.com designates 114.179.232.161 as permitted sender) smtp.mailfrom=n-horiguchi@ah.jp.nec.com X-Gm-Message-State: APt69E0q5NrqMh6LPrmmEHrCXGWZt6hJjURgHJ14Jqw7FFcdmywgUBvw kDSjLatK1uZKHcGOTKK8aXyllq6gCnmhjjuAR4KGHjhNgkxmkuf1H0mpvWPLvvrZ7b1SahZ902T 1Q6pFULmladkVVJIrlz5pSrSFMDhKlWZuI2I3TvHSW8wqrnBpQwZBsmYQf6b+bmhJ4Q== X-Received: by 2002:a6b:c309:: with SMTP id t9-v6mr3507406iof.157.1528868579051; Tue, 12 Jun 2018 22:42:59 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJGTBgQ2oTL6W0z1l4MihRRxyEgY2TdO03GBJ/KyMhceKo9OcxYFgzJjfKhjkzrkqiAfLpr X-Received: by 2002:a6b:c309:: with SMTP id t9-v6mr3507354iof.157.1528868577886; Tue, 12 Jun 2018 22:42:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528868577; cv=none; d=google.com; s=arc-20160816; b=iZnteL6s5OD93sHYMCKMoJn5oMli0aT0UqTKlu7Yc2qIc4pUz9KceiYKCaSQAxc/hn UrdPpXJcNWtXuwreC7zL0QJp0UxWmCn5pkwS6oxUYcErMNXrdlx7jaofviU1JsE9y1o0 EcFnTkz6PeueIDcHGDHobl7WchuMeNtU3O2UTRNpN9cs2GxJLcdDQF7ByNCq57KwiSft vILIaF74V2ivaTDigLCM6mytWZszalD/rT/wr8RU1yvG6FUCTflpbqykMJGVyf714xbU lymvyK+EVqhP6d0nVmzpQ5fKDUh4v1tBXpjFDHSS+GXxq8CBNM+MyIvYhiwBKdmwv4kS npuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-id:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:arc-authentication-results; bh=cgQRHlq5TvI65ys5rDOyqDYdpb4SeQVGinCSco74Po4=; b=em9Cordqp7loIgnPaKAlZwG6O+YmjxOsxASzeQNVnu3RB70/c1PeGPOhxilO6QUJUh i+oBEum89wwX5VZA7WTdNC8ogOWsnO16silth+CLHAaXkYY4YxVcNsaFK2aVBHxUqWvg ObPODdof+1vpA4LJ5hKs3HNRLg60TxXtTpAohdyJNVlz8jH5gTfApzcD2fnvffrd/SAO /mRlG10SQXPsT35zK17zET5zmssTB56Po6/pxb0dOBhsVQOmjxzeN23jcUNg755b2c02 IT3XMoTz/lxur00qfakAhrRr2ot98+MBK2xJsPAkJWkkzTxb6aEevcFU7HkYRYQmEvLD EdLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of n-horiguchi@ah.jp.nec.com designates 114.179.232.161 as permitted sender) smtp.mailfrom=n-horiguchi@ah.jp.nec.com Received: from tyo161.gate.nec.co.jp (tyo161.gate.nec.co.jp. [114.179.232.161]) by mx.google.com with ESMTPS id v1-v6si1489725iob.195.2018.06.12.22.42.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 22:42:57 -0700 (PDT) Received-SPF: pass (google.com: domain of n-horiguchi@ah.jp.nec.com designates 114.179.232.161 as permitted sender) client-ip=114.179.232.161; Authentication-Results: mx.google.com; spf=pass (google.com: domain of n-horiguchi@ah.jp.nec.com designates 114.179.232.161 as permitted sender) smtp.mailfrom=n-horiguchi@ah.jp.nec.com Received: from mailgate02.nec.co.jp ([114.179.233.122]) by tyo161.gate.nec.co.jp (8.15.1/8.15.1) with ESMTPS id w5D5gQhB025141 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 13 Jun 2018 14:42:26 +0900 Received: from mailsv01.nec.co.jp (mailgate-v.nec.co.jp [10.204.236.94]) by mailgate02.nec.co.jp (8.15.1/8.15.1) with ESMTP id w5D5gQwD005260; Wed, 13 Jun 2018 14:42:26 +0900 Received: from mail01b.kamome.nec.co.jp (mail01b.kamome.nec.co.jp [10.25.43.2]) by mailsv01.nec.co.jp (8.15.1/8.15.1) with ESMTP id w5D5gQrZ005802; Wed, 13 Jun 2018 14:42:26 +0900 Received: from bpxc99gp.gisp.nec.co.jp ([10.38.151.150] [10.38.151.150]) by mail03.kamome.nec.co.jp with ESMTP id BT-MMP-1169676; Wed, 13 Jun 2018 14:41:09 +0900 Received: from BPXM23GP.gisp.nec.co.jp ([10.38.151.215]) by BPXC22GP.gisp.nec.co.jp ([10.38.151.150]) with mapi id 14.03.0319.002; Wed, 13 Jun 2018 14:41:08 +0900 From: Naoya Horiguchi To: "linux-mm@kvack.org" CC: Pavel Tatashin , Steven Sistare , Daniel Jordan , "Bob Picco" , Oscar Salvador , Matthew Wilcox , "linux-kernel@vger.kernel.org" , Andrew Morton , Michal Hocko , "mingo@kernel.org" , "dan.j.williams@intel.com" , Huang Ying Subject: [PATCH v1] mm: zero remaining unavailable struct pages (Re: kernel panic in reading /proc/kpageflags when enabling RAM-simulated PMEM) Thread-Topic: [PATCH v1] mm: zero remaining unavailable struct pages (Re: kernel panic in reading /proc/kpageflags when enabling RAM-simulated PMEM) Thread-Index: AQHUAtkgPBcB1vgLY0uIXLgyPjVYAA== Date: Wed, 13 Jun 2018 05:41:08 +0000 Message-ID: <20180613054107.GA5329@hori1.linux.bs1.fc.nec.co.jp> References: <20180605073500.GA23766@hori1.linux.bs1.fc.nec.co.jp> <20180606051624.GA16021@hori1.linux.bs1.fc.nec.co.jp> <20180606080408.GA31794@techadventures.net> <20180606085319.GA32052@techadventures.net> <20180606090630.GA27065@hori1.linux.bs1.fc.nec.co.jp> <20180606092405.GA6562@hori1.linux.bs1.fc.nec.co.jp> <20180607062218.GB22554@hori1.linux.bs1.fc.nec.co.jp> <20180607065940.GA7334@techadventures.net> <20180607094921.GA8545@techadventures.net> <20180607100256.GA9129@hori1.linux.bs1.fc.nec.co.jp> In-Reply-To: <20180607100256.GA9129@hori1.linux.bs1.fc.nec.co.jp> Accept-Language: en-US, ja-JP Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.51.8.82] Content-ID: MIME-Version: 1.0 X-TM-AS-MML: disable 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 Hi everyone, I wrote a patch for this issue. There was a discussion about prechecking approach, but I finally found out it's hard to make change on memblock after numa_init, so I take another apporach (see patch description). I'm glad if you check that it works for you. Thanks, Naoya Horiguchi Tested-by: Oscar Salvador --- From: Naoya Horiguchi Date: Wed, 13 Jun 2018 12:43:27 +0900 Subject: [PATCH] mm: zero remaining unavailable struct pages There is a kernel panic that is triggered when reading /proc/kpageflags on the kernel booted with kernel parameter 'memmap=nn[KMG]!ss[KMG]': BUG: unable to handle kernel paging request at fffffffffffffffe PGD 9b20e067 P4D 9b20e067 PUD 9b210067 PMD 0 Oops: 0000 [#1] SMP PTI CPU: 2 PID: 1728 Comm: page-types Not tainted 4.17.0-rc6-mm1-v4.17-rc6-180605-0816-00236-g2dfb086ef02c+ #160 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.fc28 04/01/2014 RIP: 0010:stable_page_flags+0x27/0x3c0 Code: 00 00 00 0f 1f 44 00 00 48 85 ff 0f 84 a0 03 00 00 41 54 55 49 89 fc 53 48 8b 57 08 48 8b 2f 48 8d 42 ff 83 e2 01 48 0f 44 c7 <48> 8b 00 f6 c4 01 0f 84 10 03 00 00 31 db 49 8b 54 24 08 4c 89 e7 RSP: 0018:ffffbbd44111fde0 EFLAGS: 00010202 RAX: fffffffffffffffe RBX: 00007fffffffeff9 RCX: 0000000000000000 RDX: 0000000000000001 RSI: 0000000000000202 RDI: ffffed1182fff5c0 RBP: ffffffffffffffff R08: 0000000000000001 R09: 0000000000000001 R10: ffffbbd44111fed8 R11: 0000000000000000 R12: ffffed1182fff5c0 R13: 00000000000bffd7 R14: 0000000002fff5c0 R15: ffffbbd44111ff10 FS: 00007efc4335a500(0000) GS:ffff93a5bfc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: fffffffffffffffe CR3: 00000000b2a58000 CR4: 00000000001406e0 Call Trace: kpageflags_read+0xc7/0x120 proc_reg_read+0x3c/0x60 __vfs_read+0x36/0x170 vfs_read+0x89/0x130 ksys_pread64+0x71/0x90 do_syscall_64+0x5b/0x160 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7efc42e75e23 Code: 09 00 ba 9f 01 00 00 e8 ab 81 f4 ff 66 2e 0f 1f 84 00 00 00 00 00 90 83 3d 29 0a 2d 00 00 75 13 49 89 ca b8 11 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 34 c3 48 83 ec 08 e8 db d3 01 00 48 89 04 24 According to kernel bisection, this problem became visible due to commit f7f99100d8d9 which changes how struct pages are initialized. Memblock layout affects the pfn ranges covered by node/zone. Consider that we have a VM with 2 NUMA nodes and each node has 4GB memory, and the default (no memmap= given) memblock layout is like below: MEMBLOCK configuration: memory size = 0x00000001fff75c00 reserved size = 0x000000000300c000 memory.cnt = 0x4 memory[0x0] [0x0000000000001000-0x000000000009efff], 0x000000000009e000 bytes on node 0 flags: 0x0 memory[0x1] [0x0000000000100000-0x00000000bffd6fff], 0x00000000bfed7000 bytes on node 0 flags: 0x0 memory[0x2] [0x0000000100000000-0x000000013fffffff], 0x0000000040000000 bytes on node 0 flags: 0x0 memory[0x3] [0x0000000140000000-0x000000023fffffff], 0x0000000100000000 bytes on node 1 flags: 0x0 ... If you give memmap=1G!4G (so it just covers memory[0x2]), the range [0x100000000-0x13fffffff] is gone: MEMBLOCK configuration: memory size = 0x00000001bff75c00 reserved size = 0x000000000300c000 memory.cnt = 0x3 memory[0x0] [0x0000000000001000-0x000000000009efff], 0x000000000009e000 bytes on node 0 flags: 0x0 memory[0x1] [0x0000000000100000-0x00000000bffd6fff], 0x00000000bfed7000 bytes on node 0 flags: 0x0 memory[0x2] [0x0000000140000000-0x000000023fffffff], 0x0000000100000000 bytes on node 1 flags: 0x0 ... This causes shrinking node 0's pfn range because it is calculated by the address range of memblock.memory. So some of struct pages in the gap range are left uninitialized. We have a function zero_resv_unavail() which does zeroing the struct pages outside memblock.memory, but currently it covers only the reserved unavailable range (i.e. memblock.memory && !memblock.reserved). This patch extends it to cover all unavailable range, which fixes the reported issue. Fixes: f7f99100d8d9 ("mm: stop zeroing memory during allocation in vmemmap") Signed-off-by: Naoya Horiguchi --- include/linux/memblock.h | 16 ---------------- mm/page_alloc.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index ca59883c8364..f191e51c5d2a 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -236,22 +236,6 @@ void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn, for_each_mem_range_rev(i, &memblock.memory, &memblock.reserved, \ nid, flags, p_start, p_end, p_nid) -/** - * for_each_resv_unavail_range - iterate through reserved and unavailable memory - * @i: u64 used as loop variable - * @flags: pick from blocks based on memory attributes - * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL - * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL - * - * Walks over unavailable but reserved (reserved && !memory) areas of memblock. - * Available as soon as memblock is initialized. - * Note: because this memory does not belong to any physical node, flags and - * nid arguments do not make sense and thus not exported as arguments. - */ -#define for_each_resv_unavail_range(i, p_start, p_end) \ - for_each_mem_range(i, &memblock.reserved, &memblock.memory, \ - NUMA_NO_NODE, MEMBLOCK_NONE, p_start, p_end, NULL) - static inline void memblock_set_region_flags(struct memblock_region *r, unsigned long flags) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 1772513358e9..098f7c2c127b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6487,25 +6487,40 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, * struct pages which are reserved in memblock allocator and their fields * may be accessed (for example page_to_pfn() on some configuration accesses * flags). We must explicitly zero those struct pages. + * + * This function also addresses a similar issue where struct pages are left + * uninitialized because the physical address range is not covered by + * memblock.memory or memblock.reserved. That could happen when memblock + * layout is manually configured via memmap=. */ void __paginginit zero_resv_unavail(void) { phys_addr_t start, end; unsigned long pfn; u64 i, pgcnt; + phys_addr_t next = 0; /* - * Loop through ranges that are reserved, but do not have reported - * physical memory backing. + * Loop through unavailable ranges not covered by memblock.memory. */ pgcnt = 0; - for_each_resv_unavail_range(i, &start, &end) { - for (pfn = PFN_DOWN(start); pfn < PFN_UP(end); pfn++) { - if (!pfn_valid(ALIGN_DOWN(pfn, pageblock_nr_pages))) - continue; - mm_zero_struct_page(pfn_to_page(pfn)); - pgcnt++; + for_each_mem_range(i, &memblock.memory, NULL, + NUMA_NO_NODE, MEMBLOCK_NONE, &start, &end, NULL) { + if (next < start) { + for (pfn = PFN_DOWN(next); pfn < PFN_UP(start); pfn++) { + if (!pfn_valid(ALIGN_DOWN(pfn, pageblock_nr_pages))) + continue; + mm_zero_struct_page(pfn_to_page(pfn)); + pgcnt++; + } } + next = end; + } + for (pfn = PFN_DOWN(next); pfn < max_pfn; pfn++) { + if (!pfn_valid(ALIGN_DOWN(pfn, pageblock_nr_pages))) + continue; + mm_zero_struct_page(pfn_to_page(pfn)); + pgcnt++; } /* @@ -6516,7 +6531,7 @@ void __paginginit zero_resv_unavail(void) * this code can be removed. */ if (pgcnt) - pr_info("Reserved but unavailable: %lld pages", pgcnt); + pr_info("Zeroed struct page in unavailable ranges: %lld pages", pgcnt); } #endif /* CONFIG_HAVE_MEMBLOCK */