From patchwork Thu Aug 23 18:25:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masayoshi Mizuma X-Patchwork-Id: 10574509 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 8495813B8 for ; Thu, 23 Aug 2018 18:25:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 694122C4F3 for ; Thu, 23 Aug 2018 18:25:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D3652C504; Thu, 23 Aug 2018 18:25:36 +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 E69422C4F3 for ; Thu, 23 Aug 2018 18:25:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D35536B2B6E; Thu, 23 Aug 2018 14:25:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CE29C6B2B6F; Thu, 23 Aug 2018 14:25:34 -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 BFAA66B2B70; Thu, 23 Aug 2018 14:25:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk0-f198.google.com (mail-qk0-f198.google.com [209.85.220.198]) by kanga.kvack.org (Postfix) with ESMTP id 949F46B2B6E for ; Thu, 23 Aug 2018 14:25:34 -0400 (EDT) Received: by mail-qk0-f198.google.com with SMTP id x204-v6so5368071qka.6 for ; Thu, 23 Aug 2018 11:25:34 -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; bh=XjIdE1a/8CcwW+OVb+YmWZJQvTVCpWbzLau9N26TmrA=; b=CXtDmKvu4Y9MY4MBjT6HCzwbqImS6t3YOP0SFzEw7rd6VDpD+NL0kZdWdwcIJM5AWS d/APYK47m7+//kg8XnzF1UGtrQw60nnk9HLr3jgVvPiyvDPuzED7zbqlfaGBQ4b5qPHu PLqqui1mszIZKD3av42obwauANwkpuRY7xYc0+8KfWmwzUfjMdOkI3xuwzebJlrpWj2W Svg/enYyrgghL9Mq9FTT6LS/3IWEZj0Br4kzcrKjI74FEPXyw2ik2LtFnpyRs0r+9Hsh zN7D75JS3L5/RQOKtrSfaRAAzAjuSacvDPRUVvi7JL0lYeizunjBwlcuK6KIWcRzW7MG b4zA== X-Gm-Message-State: APzg51BOtQOVGDOJXIYcxz+681MxX3jbZtYZ82y5gmxyUpEh6y38ICFB AyK1kxlK4qgigZZY/P3QO2WR/Q5LFRux6l6gAQzHj81EHV/75U+ldm299DPpMuKMG3P5TSOD5RO pxcZEor+LbHTigLvQiKPI/AB2Vttk4Zl+HR1lgZ+IyAc/J9g3eRkem8ZJ3JMs6+3l51V4oF0Vi7 npFvSNyzZO+QdHIvGSQIG7vBmi6y26Iufyy0ZbcV2oFGG+ab4hdHmwbvbl6zNw7xcIMNy5Wf8MR mg/58CO+CvgmckpI4naHqgp1KMUqwiZGOZo1MDUr5XM5nsL2P6v1DQ6AtCx9u7yGFLOasKCQ0Lp hvfqc+xSUsDOAVeZNYl0EMt88wU2wpGQJMv+2UDEru53CJI44ZYyjEUaJonHmJRIrwGzubEYzNs A X-Received: by 2002:ad4:414b:: with SMTP id z11-v6mr18557303qvp.77.1535048734331; Thu, 23 Aug 2018 11:25:34 -0700 (PDT) X-Received: by 2002:ad4:414b:: with SMTP id z11-v6mr18557247qvp.77.1535048733593; Thu, 23 Aug 2018 11:25:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535048733; cv=none; d=google.com; s=arc-20160816; b=wp24523RDmtZBttluDWLdDk4EfB4NgdFL20piTNcX/VlpR2atHEJeKpWSOkkdIX3td kEjc3LFnz9d7laFrFEn6h1uXIOqeCQgo9v9mqmdVVqhYekUJuBu3Bn1coU+YuH7EVMp5 4ughbjRNzysdxo7py5gL1PiFsxRq6/MtwVxN/Ci6Lp4fVRDrf6kIw82D/LURrfHEHjaX +JjTfB3osWaJdMlTKg1x7PSWZQjANU8lfBj1CAo9fr9f9mB5pOGKKzF+8HnQKHu9fH8W cSadlKh5hFQSrTQhqBTiHXcEi7ky+lTBQ+tgGrxDpNlkzJHPqTp7GNlxvdGsWoqtSYlB 4byg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=XjIdE1a/8CcwW+OVb+YmWZJQvTVCpWbzLau9N26TmrA=; b=H81qWuI7Bg+WSBigcm83iUFUjNNBSLWwHcwXycWsN70Ye94WYuQJOoKt6oeCNq784r HRt2n2JD7reGx7PMj70P4nbrG5Opiy2rHgx6HGhL8/wyeUP96lZl94Qz6cMbRcKHxJte 7UVSknPgrX/xi/8SFzE2MtnFsspN3B8p1ihF4ym2PnGvjn/VLQ8TgyY7ThwwrNhp/BZq jzL/P8R3f+N7C0h5yl3TpN7B9baJd1xivYZhczzoI7MXmsL4yUUxdoNA2xRZ7A5reD0m 35u74yJMN3RhLbRfK9vaoLdyMmmpa8rLw1hrGm89KPrduzO/BhsdCHYjRC03WyZtbHIm GPuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mFLDXqvc; 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 d14-v6sor2705222qvj.63.2018.08.23.11.25.33 for (Google Transport Security); Thu, 23 Aug 2018 11:25:33 -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=mFLDXqvc; 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; bh=XjIdE1a/8CcwW+OVb+YmWZJQvTVCpWbzLau9N26TmrA=; b=mFLDXqvcVaUL5HlBdbKNL+3MXRWEeTJtjWQKhgvsmNqfSUwMmYsPpdIbEql9ZFpOlu MgJmDYFhHSxnIe86bO0gyQvBW+4iocX3ZDGV5H2OLXT4WJriZcYnLvZYBnlAiNsGXHBS Ofdsd8tbqLpg1K9UrSXMoUOLVTEQrhgmAoeSP0GxzAJF7yOchmzbxW2ng3CC2BsG90B4 eT33AZwMkRYHMoqoyyQlODc5E7fyPb42oaEB5zHp4qPP7J4ggPgj0N0QHNE+Io2UioqG /hGRYu13CAOUI/6l11sbdRW+RzPaHrHqmVw7jE8RTEcTVjzBmSUR8CLJv/turKm7iGPX dgAw== X-Google-Smtp-Source: ANB0VdYU/yxgbxohH3wKRpg/NWHzRtfCkAO/MuwiXp27UTAxQVe83pCgQ1KDHr7x80xQJ1JDuQ5uHw== X-Received: by 2002:a0c:e083:: with SMTP id l3-v6mr21512515qvk.1.1535048733229; Thu, 23 Aug 2018 11:25:33 -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 o7-v6sm1233582qtp.75.2018.08.23.11.25.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Aug 2018 11:25:32 -0700 (PDT) From: Masayoshi Mizuma To: linux-mm@kvack.org, Naoya Horiguchi Cc: Masayoshi Mizuma , Masayoshi Mizuma , linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH 1/2] Revert "x86/e820: put !E820_TYPE_RAM regions into memblock.reserved" Date: Thu, 23 Aug 2018 14:25:12 -0400 Message-Id: <20180823182513.8801-1-msys.mizuma@gmail.com> X-Mailer: git-send-email 2.17.1 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: Masayoshi Mizuma commit 124049decbb1 ("x86/e820: put !E820_TYPE_RAM regions into memblock.reserved") breaks movable_node kernel option because it changed the memory gap range to reserved memblock. So, the node is marked as Normal zone even if the SRAT has Hot plaggable affinity. ===================================================================== kernel: BIOS-e820: [mem 0x0000180000000000-0x0000180fffffffff] usable kernel: BIOS-e820: [mem 0x00001c0000000000-0x00001c0fffffffff] usable ... kernel: reserved[0x12]#011[0x0000181000000000-0x00001bffffffffff], 0x000003f000000000 bytes flags: 0x0 ... kernel: ACPI: SRAT: Node 2 PXM 6 [mem 0x180000000000-0x1bffffffffff] hotplug kernel: ACPI: SRAT: Node 3 PXM 7 [mem 0x1c0000000000-0x1fffffffffff] hotplug ... kernel: Movable zone start for each node kernel: Node 3: 0x00001c0000000000 kernel: Early memory node ranges ... ===================================================================== Naoya's v1 patch [*] fixes the original issue and this movable_node issue doesn't occur. Let's revert commit 124049decbb1 ("x86/e820: put !E820_TYPE_RAM regions into memblock.reserved") and apply the v1 patch. [*] https://lkml.org/lkml/2018/6/13/27 Signed-off-by: Masayoshi Mizuma Reviewed-by: Pavel Tatashin --- arch/x86/kernel/e820.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index c88c23c658c1..d1f25c831447 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -1248,7 +1248,6 @@ void __init e820__memblock_setup(void) { int i; u64 end; - u64 addr = 0; /* * The bootstrap memblock region count maximum is 128 entries @@ -1265,21 +1264,13 @@ void __init e820__memblock_setup(void) struct e820_entry *entry = &e820_table->entries[i]; end = entry->addr + entry->size; - if (addr < entry->addr) - memblock_reserve(addr, entry->addr - addr); - addr = end; if (end != (resource_size_t)end) continue; - /* - * all !E820_TYPE_RAM ranges (including gap ranges) are put - * into memblock.reserved to make sure that struct pages in - * such regions are not left uninitialized after bootup. - */ if (entry->type != E820_TYPE_RAM && entry->type != E820_TYPE_RESERVED_KERN) - memblock_reserve(entry->addr, entry->size); - else - memblock_add(entry->addr, entry->size); + continue; + + memblock_add(entry->addr, entry->size); } /* Throw away partial pages: */