From patchwork Fri Jan 11 05:12:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 10757357 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 C850C14E5 for ; Fri, 11 Jan 2019 05:13:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB060299B3 for ; Fri, 11 Jan 2019 05:13:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE945299BC; Fri, 11 Jan 2019 05:13: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=-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=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 942FC299B3 for ; Fri, 11 Jan 2019 05:13:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0B5B8E0004; Fri, 11 Jan 2019 00:13:26 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ABB8E8E0001; Fri, 11 Jan 2019 00:13:26 -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 9AE368E0004; Fri, 11 Jan 2019 00:13:26 -0500 (EST) 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 5904D8E0001 for ; Fri, 11 Jan 2019 00:13:26 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id q64so9448405pfa.18 for ; Thu, 10 Jan 2019 21:13:26 -0800 (PST) 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=V+u0Zr0RniU+aM1CbZXWVIvdBXHEhjiwQS1respGVgg=; b=A9ekGnVvTel/TrZ9aTEHf+vkiSch5s1BE6wN+7D/+y3G34GG0i9sGXp7jyDeq/ECbV Tk2MEqvjo3eR33UzHc/JfxQ3S1wd7hu0To88p+sSqMu4JO7/eqLqJ9UNsFNR101fRV1q LCY0L1X3CB8p34476KwchlPeJimMdMDwdDqQeKlrPFUKEieMIoX36JxM1w5JV8OQEVcb 5iEVtsCfAiLo710wsjuB2wjW69/0VmDrEU0yMOoOLkCkQHoWC0PmrjPMYfjw0QV2BXGV 8x0B0ZzZwbbv1mtXjJa7nKD3OwUaUEOZLb7HCBM8xHx+yY6S7i+bdZ9ZgX59/0FlsKZh /0NQ== X-Gm-Message-State: AJcUukdhDcnjp7Ae6Cf16/AhsbtPKyslNIj98xvjUk8Ja4hpT9myyI7r yMGvyfIcWNLj2rkQWe4VEuI7bgvIXdeAMRAawxEmUVR6Q1VpR6lxO9EDPQZZJmhJyzGmy2rLUAe IQvcU+RWwvf/DzGAGy/VR/HEarAHB6geogzWKNoBCGZ5pTxP9V57V0WmuV58EG4PYWP13XQ7DJG 1mRGf7xhN2YuxYQ3leU+Y0ZJTUMamntNIm6oPB89a+W/2heF8xByaF/bBV/KSTfT/UAdoVNsnAC eAnPTPaK5mSKB+xbMU0ADrByJpdLfN/y68xtE1+bezGOuhpAl+fjqlG0KL26yDhXfpl0emgpiAm Cufv5HG0V54RAQPWC8RWBPx5PP0OubCJqpSZaBtUkytB5ZgO4hksY0BXAl6iw/ukU9QVXT1Cwqr 9 X-Received: by 2002:a17:902:bc3:: with SMTP id 61mr13296342plr.15.1547183605933; Thu, 10 Jan 2019 21:13:25 -0800 (PST) X-Received: by 2002:a17:902:bc3:: with SMTP id 61mr13296311plr.15.1547183605165; Thu, 10 Jan 2019 21:13:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547183605; cv=none; d=google.com; s=arc-20160816; b=x5P7ZXlmxZOi+VBqZSoXLTdQODW1854fBuOiwEP1xqdc4JFZjdKTGDhOYEPdJSLAcf jJWvjwYv3iXuyAuHxCjLLlJO7ZtHLwUt0xw4AkM1rtJU47RsxBqJ0HLVL8CXohwTdo+E 9QCr/7qWK4Bl7mhPqKNRflP8gtXpBI2jkInUbeEYBjVs8THfqYD2LTe9MYn6GfXN8m2x 7VqiZeeFzs2YlyX5W/Is7Ke7vW/VsZKBIHXrLTz0vS8JvZ/T6ReSFPHrZWoFMwFIXZ+T 2jc/pn0F3IgLSOvqf69j4C/Qfb6IH5L/LOaJYWbDBfZBKI0u0e5ZYevZC0YjaCJ868s+ nDFA== 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=V+u0Zr0RniU+aM1CbZXWVIvdBXHEhjiwQS1respGVgg=; b=qMRewYHyAJyJZftgkkwiZVkqjMRoLn4OysL/+PdLqgTyFkyhc9tJahUWRz31dGgQvf DVpeuoflZVbp/uja+dss5rrqSz7fO7xR8a1+TxFWyviLZw+N8nkYCqr34f5ffpJga3KX TC2st8d4UT108cgY0kb1bPqw/6HJI3PS6+bmR06YCstTXJv0gKTcweByUIjK8WjL9lp3 e0rTK/Fx8bWcgxEo8weZVlYG6NSMQ71ba5hhZw2vilyujmr9wEaYOv/xDfD03DYSvEAz CoBUNCvdVq5pjFGZZwVoWPVxOvyISP/m+iOVBOhs376k40McYi/UdkkHlA74KhkpX4LJ 3piw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QxIVKFSc; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@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 5sor1585555plx.26.2019.01.10.21.13.25 for (Google Transport Security); Thu, 10 Jan 2019 21:13:25 -0800 (PST) Received-SPF: pass (google.com: domain of kernelfans@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=QxIVKFSc; spf=pass (google.com: domain of kernelfans@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=kernelfans@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=V+u0Zr0RniU+aM1CbZXWVIvdBXHEhjiwQS1respGVgg=; b=QxIVKFSc+xLsuLW52+XUiU/TXXaB/qGlW4A3Cfa8HuJjgkRI/wq/+IAYzlXWpogLhL Vi+Dd9HsaFROyIJIagXcYbmzrfaIhR4PGbbxmRMZuH1yn1GgIFu/ZL7NZD+s46NfL45X 8C5AwFAPWdyoRQwJ+d8vsbAdzSku4NcDZqy+GyaEBdD+Of+l9fkrvT/Zmfbrtdy8w2LH 8PfhPnh/14bVlCBvekx6P9ZKTm6CqjiJ73oHlSYxKJy79q14FJP5w14Z3LD5SAuTolcL 7CzpEwS5A7hagjBChFbVjBPChSF2jmpenqDqd0Mx8UOyMdYFKVmG82yvL38fgM6TGyWF iFMw== X-Google-Smtp-Source: ALg8bN7eC57a6OGKT0WjXEulrsCn268Kwp8SuL/Sc5JAlDGxLx10K/Z81zjSvV5waQB2JL3h2km0FQ== X-Received: by 2002:a17:902:7614:: with SMTP id k20mr13420401pll.285.1547183604873; Thu, 10 Jan 2019 21:13:24 -0800 (PST) Received: from mylaptop.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id q7sm93490471pgp.40.2019.01.10.21.13.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 21:13:24 -0800 (PST) From: Pingfan Liu To: linux-kernel@vger.kernel.org Cc: Pingfan Liu , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , "Rafael J. Wysocki" , Len Brown , Yinghai Lu , Tejun Heo , Chao Fan , Baoquan He , Juergen Gross , Andrew Morton , Mike Rapoport , Vlastimil Babka , Michal Hocko , x86@kernel.org, linux-acpi@vger.kernel.org, linux-mm@kvack.org Subject: [PATCHv2 1/7] x86/mm: concentrate the code to memblock allocator enabled Date: Fri, 11 Jan 2019 13:12:51 +0800 Message-Id: <1547183577-20309-2-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547183577-20309-1-git-send-email-kernelfans@gmail.com> References: <1547183577-20309-1-git-send-email-kernelfans@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 This patch identifies the point where memblock alloc start. It has no functional. Signed-off-by: Pingfan Liu Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: Dave Hansen Cc: Andy Lutomirski Cc: Peter Zijlstra Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Yinghai Lu Cc: Tejun Heo Cc: Chao Fan Cc: Baoquan He Cc: Juergen Gross Cc: Andrew Morton Cc: Mike Rapoport Cc: Vlastimil Babka Cc: Michal Hocko Cc: x86@kernel.org Cc: linux-acpi@vger.kernel.org Cc: linux-mm@kvack.org --- arch/x86/kernel/setup.c | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d494b9b..ac432ae 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -962,29 +962,6 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_memblock_x86_reserve_range(); -#ifdef CONFIG_MEMORY_HOTPLUG - /* - * Memory used by the kernel cannot be hot-removed because Linux - * cannot migrate the kernel pages. When memory hotplug is - * enabled, we should prevent memblock from allocating memory - * for the kernel. - * - * ACPI SRAT records all hotpluggable memory ranges. But before - * SRAT is parsed, we don't know about it. - * - * The kernel image is loaded into memory at very early time. We - * cannot prevent this anyway. So on NUMA system, we set any - * node the kernel resides in as un-hotpluggable. - * - * Since on modern servers, one node could have double-digit - * gigabytes memory, we can assume the memory around the kernel - * image is also un-hotpluggable. So before SRAT is parsed, just - * allocate memory near the kernel image to try the best to keep - * the kernel away from hotpluggable memory. - */ - if (movable_node_is_enabled()) - memblock_set_bottom_up(true); -#endif x86_report_nx(); @@ -1096,9 +1073,6 @@ void __init setup_arch(char **cmdline_p) cleanup_highmap(); - memblock_set_current_limit(ISA_END_ADDRESS); - e820__memblock_setup(); - reserve_bios_regions(); if (efi_enabled(EFI_MEMMAP)) { @@ -1113,6 +1087,8 @@ void __init setup_arch(char **cmdline_p) efi_reserve_boot_services(); } + memblock_set_current_limit(0, ISA_END_ADDRESS, false); + e820__memblock_setup(); /* preallocate 4k for mptable mpc */ e820__memblock_alloc_reserved_mpc_new(); @@ -1130,7 +1106,31 @@ void __init setup_arch(char **cmdline_p) trim_platform_memory_ranges(); trim_low_memory_range(); +#ifdef CONFIG_MEMORY_HOTPLUG + /* + * Memory used by the kernel cannot be hot-removed because Linux + * cannot migrate the kernel pages. When memory hotplug is + * enabled, we should prevent memblock from allocating memory + * for the kernel. + * + * ACPI SRAT records all hotpluggable memory ranges. But before + * SRAT is parsed, we don't know about it. + * + * The kernel image is loaded into memory at very early time. We + * cannot prevent this anyway. So on NUMA system, we set any + * node the kernel resides in as un-hotpluggable. + * + * Since on modern servers, one node could have double-digit + * gigabytes memory, we can assume the memory around the kernel + * image is also un-hotpluggable. So before SRAT is parsed, just + * allocate memory near the kernel image to try the best to keep + * the kernel away from hotpluggable memory. + */ + if (movable_node_is_enabled()) + memblock_set_bottom_up(true); +#endif init_mem_mapping(); + memblock_set_current_limit(get_max_mapped()); idt_setup_early_pf(); @@ -1145,8 +1145,6 @@ void __init setup_arch(char **cmdline_p) */ mmu_cr4_features = __read_cr4() & ~X86_CR4_PCIDE; - memblock_set_current_limit(get_max_mapped()); - /* * NOTE: On x86-32, only from this point on, fixmaps are ready for use. */