From patchwork Tue Sep 25 15:35:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masayoshi Mizuma X-Patchwork-Id: 10614307 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 CFD94161F for ; Tue, 25 Sep 2018 15:36:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0A64296A0 for ; Tue, 25 Sep 2018 15:36:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B49102975C; Tue, 25 Sep 2018 15:36: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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 8017B2A648 for ; Tue, 25 Sep 2018 15:36:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 989698E00A7; Tue, 25 Sep 2018 11:35:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8E4328E00A4; Tue, 25 Sep 2018 11:35: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 7D3DD8E00A7; Tue, 25 Sep 2018 11:35:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by kanga.kvack.org (Postfix) with ESMTP id 46AD58E00A4 for ; Tue, 25 Sep 2018 11:35:59 -0400 (EDT) Received: by mail-qk1-f200.google.com with SMTP id s22-v6so281545qkg.2 for ; Tue, 25 Sep 2018 08:35:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=yMIZaky490zrCi7TzYwl7/YRlXWpbT5ib/m7bZER82s=; b=jBHfovOlVLmWMHfrIN/iQ1mTjcNZmTdAJkYO1OCGI1XjP3uMwHwlwJ1+vBKbPWxYqs M+fKVQdVf8vQ7FphjISDM6j+SMc3aG7hiCB9E6eaWtHLug6rg8a5mSfLRw9q0qqO71mP 024SIVRyiEl6Q7o4wAsYu5x3CRbIfYnVXqR/4TYA4Ud4UIw1SKPaHRtP+6iK2rlisa/X 47H63vKQUl6406tJGhBA889oWMNa+gp6LTjJy51sj6pLo2TO2XRjWnTcbdNov6Lm4jzR dOtZ27CRYMcD1iJQ4NGO2hOADpoK/46n2KPUtwHcdP7KVzl/2AVp+YNzZoDBN3foftLF kGKw== X-Gm-Message-State: ABuFfohmrivn+6ptKsjEetQENGGeBYNURdJBG6KruVflHKNTLmLPxqn/ AGIV8vvIsGxpxsgeC+F0S9QCfyL2ap0vG6Q52p6nXdoJznQKWqHi6gHbUE01ayqXnw34n2AvP4L /PtSo4w6N8+Z6j+/m79TARulYdQLjYPAY6DUNMjUx1f7D03K5hNKiECgPyfNfkJfjv2fqU6WcKv TDss/sNMbo0dFn757MEhGneedJkKMkcE+D3qG+dJ8jnXKVjPHEP3xkmdOUesP2WsTr87FuiVQAk SDy9hur5heBzKItOPDSoZrgh11wMvc/VWqozVFHuEDg1GF2ykklgrX6XoZbCaZak3D6Ku5q75xi TN4gdunuu4ejUieH/+J1iWOu4jC/KPXGm+442cTvJFV4+HtTqwv33qfCsvzIDUBUDEPCGD21Tlm P X-Received: by 2002:aed:3539:: with SMTP id a54-v6mr1193003qte.153.1537889759021; Tue, 25 Sep 2018 08:35:59 -0700 (PDT) X-Received: by 2002:aed:3539:: with SMTP id a54-v6mr1192942qte.153.1537889757987; Tue, 25 Sep 2018 08:35:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537889757; cv=none; d=google.com; s=arc-20160816; b=lOiAGt3hYvb33IHtBrBLX5PDcEhZCIm1AMbQtVzQ5gRzZr7H2fh7tHM0mV9oLdZVyf WUx1L9x8FftHV/uiQuhQR3EwbyQSHdkVsu4082FoWOOZpTYLyIh/MScasunAvk/hgtoZ ZsTfzTZLgEwX1pkUGYlI+KQcBvZogDRyPSApGVcnTAJl+G1Oi2s7nxGv01uKykD99eb1 rgzlXYNYY+xQeDxbqDVlILbWqdlb4X2dQ45A8q/PNaHpTkrkxe3c4SVDvsFf56Qr5m/i vi3c7hrX62w+r0C+rb+XjqGurZ9Ncc3haLM/I9ImrTBPAF4sELU29Ung7MZwQNQURXuq 2IOQ== 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 :dkim-signature; bh=yMIZaky490zrCi7TzYwl7/YRlXWpbT5ib/m7bZER82s=; b=JZoO0GxmYUZuDe98W2SvIXPgujhOhqvVu2BD8xrphkJkQZoluk4cC+m8j0iyF/r6fY Ul61YWRoBuJMKApr1IsosGdFFNmTH6ODLi20y1FoQqxVbUqBpRo6yIzw9nah+No9ZIUz DOKayjbgkK7Gp3H9LDR1e4BpM9s5H0Q+lH8JcI9JxPM0DKicV3tAo8SnYUvg7VerplSH mpeglkM45fV6OfOie4NNZoa54yL54h6Bn9hLBY9gdho5d3WssQWRvr3NyIPDy5bx8HGu paatFR+8Z5kKfJhLTBfs7UPU0oMZus4VFxCSakBI8f5Qejq72uRTqltqMO1RGZwnj0gM WfLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=T1rUMeZL; spf=pass (google.com: domain of msys.mizuma@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=msys.mizuma@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v6-v6sor369016qkg.99.2018.09.25.08.35.57 for (Google Transport Security); Tue, 25 Sep 2018 08:35:57 -0700 (PDT) Received-SPF: pass (google.com: domain of msys.mizuma@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=T1rUMeZL; spf=pass (google.com: domain of msys.mizuma@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=msys.mizuma@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yMIZaky490zrCi7TzYwl7/YRlXWpbT5ib/m7bZER82s=; b=T1rUMeZLierRq8NkZ2UO3x8ONyv40fCqB33dyVeaJkwnbFIHs4H4Fe7l0QvhOPPSRq lBDSK5pDm63Hta7ykXbeBYJsGKgeT5sOHrHLtAWeCSN+DlMhM6/qHK6cJVCTewHOpDLE utMhgV6UDfWE/DvNKCKxoalCArtDYsA2BlCqHNJaiC5GWJ1V897ll7VLB3aUx8RRgN+R 0yG+r/LuLmpLpBxvv+PDB1KicnMF6YOkCWs+k4DMsMsihcTgIXh15pb7l5TAeIge8Eiu 93UwHipgw9fRY4C8ixAxbrEPvY8Fspy+9+spQlr1+bNdQhBb4Gw2bzCukTXUeG0lUomI hT8A== X-Google-Smtp-Source: ACcGV62xSPi51p6DshgcyABVlpng/UOpf6lFrUshDW3+7IUh1jur5lijdpUepGszp08Aj+1mUI1XMA== X-Received: by 2002:a37:3086:: with SMTP id w128-v6mr1105728qkw.315.1537889757270; Tue, 25 Sep 2018 08:35:57 -0700 (PDT) Received: from gabell.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id p18-v6sm2056304qtp.3.2018.09.25.08.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 08:35:55 -0700 (PDT) From: Masayoshi Mizuma To: linux-mm@kvack.org, Naoya Horiguchi , Pavel Tatashin , Michal Hocko Cc: Masayoshi Mizuma , linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH v2 2/3] mm: zero remaining unavailable struct pages Date: Tue, 25 Sep 2018 11:35:31 -0400 Message-Id: <20180925153532.6206-3-msys.mizuma@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925153532.6206-1-msys.mizuma@gmail.com> References: <20180925153532.6206-1-msys.mizuma@gmail.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: Naoya Horiguchi 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 Tested-by: Oscar Salvador Tested-by: Masayoshi Mizuma --- include/linux/memblock.h | 15 --------------- mm/page_alloc.c | 36 +++++++++++++++++++++++++----------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 5169205..2acdd04 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -265,21 +265,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 - * @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, enum memblock_flags flags) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 89d2a2a..3b9d89e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6446,29 +6446,42 @@ void __init 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 __init 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))) { - pfn = ALIGN_DOWN(pfn, pageblock_nr_pages) - + pageblock_nr_pages - 1; - continue; + 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++; } - 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++; + } + /* * Struct pages that do not have backing memory. This could be because @@ -6478,7 +6491,8 @@ void __init 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 && !CONFIG_FLAT_NODE_MEM_MAP */