From patchwork Fri Jan 11 05:12:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 10757367 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 91B0114E5 for ; Fri, 11 Jan 2019 05:13:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80AAF299BE for ; Fri, 11 Jan 2019 05:13:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73DB6299C9; Fri, 11 Jan 2019 05:13:51 +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 B17A4299BE for ; Fri, 11 Jan 2019 05:13:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A94EB8E0007; Fri, 11 Jan 2019 00:13:49 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A44E48E0001; Fri, 11 Jan 2019 00:13:49 -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 95C408E0007; Fri, 11 Jan 2019 00:13:49 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 57D558E0001 for ; Fri, 11 Jan 2019 00:13:49 -0500 (EST) Received: by mail-pf1-f199.google.com with SMTP id i3so9496837pfj.4 for ; Thu, 10 Jan 2019 21:13:49 -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=sIr0XR9JtSIXTySKwYaIUFJCPnOMAPJJ3pzvm0xJRbI=; b=I8iT1jKu0CzbSjLbtdotHxmyASbgUvF9aAkkE4iSBM5Dro++yeQ9JNVrFFoCaMnKRJ iWPWPRZMXkww5ZIv3glgyZ0mSfIsVkk8V/tOQlqZ930aZVnXhlMO6bQpJbJ9L3JrClaZ MKPz19QPLIDfG6MWOBD33c64NOqkwnrxWDjB2tT/Z2AYl8yzmwOxG4ZOL6SdUEGsD3hI AgFIIgCLhATrpSq62mPA9T7oeICWsIfJxmNTVBrP9/zWONpKVyqAmimggNvtQPWmuTGQ ceSFoDLiUBGocxCpdlm95IJ4DRThEUkyyZMTUtKwgPgibV3SQF/DVps53FxRTQ/LOmeu bMMQ== X-Gm-Message-State: AJcUukc35T6Vxi41MPNcpE3S0OzCywoCIS3XmgUdU642jf6rOFtE8kXw o3/DS6adP7s5Qk4pmHBLtX/DQAKjK2TF451rKLJ4IE3o3lwbr/Iy8I3sUlXYDK1532RUXfhFp9X +MHvg5hQv3o2gVo1YhyeJGrXB8We6HT34QnJcPYXojHM6NyflK5G0n7McccnNVLNb4zwlfSH5FG 083p5BZbJunMxOHhULA3EbuMvmBmM0chLf6YopNHSSlZd6hZYucTxNQ8vyY+Mzy4Oyf+tEpSKQ1 BTrUbzeHjtpVcdZGyBRyoB7O4ozpgVdoKfKGaHlMjGYICLVAVShV+80xM06YCypxf9x6Ljn3nBw BoMRC1KQYj6BtG/2Sfg1j5CV7gA626+XYybfdQsXJ+sJ6W6C/tu45e8ZZt19GcIPizz2T3OFywQ A X-Received: by 2002:a17:902:74cc:: with SMTP id f12mr13382314plt.134.1547183629005; Thu, 10 Jan 2019 21:13:49 -0800 (PST) X-Received: by 2002:a17:902:74cc:: with SMTP id f12mr13382253plt.134.1547183627209; Thu, 10 Jan 2019 21:13:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547183627; cv=none; d=google.com; s=arc-20160816; b=CwT02xeszxGyWbt6xWB6MtisvqlA6CisIg7W63tWF8wKpG9A0Ije+vYTI/7GPtNRcx r4aupPVOA7aUjaBjbI7iwocebOooJNHSuXo+dTIttSUwrpTvUENLQxbaOdBPSts2OYAR zmpKZ2KWFhNUkQWQ2jgUbZLLvwhaqz1lkToauXyp5kbMXPE14GyjksYI82odqjxVSOoU eMUvhWLL1tDtpqGYZnizFw91RobVU7M2IYxKO0LeDOu0rnNu14RmHeQxZ4deEJKbz0Ee PCYc5z9StZDysvRnGkK6Cs4cRgQcemTdyq3FCAz+Qr06ENy07FWxQskfPf3oZnccX0U8 4vcQ== 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=sIr0XR9JtSIXTySKwYaIUFJCPnOMAPJJ3pzvm0xJRbI=; b=ohAGzVOmVqVALiF0M9P6Pl7X9qF/WqhEMrPWYEGRZAsgs47A680D5gGlzrLca5CCkQ 3sq0C+e12/n8xlLPLVIxgC3oreysOA1LHv1lwLIcf9dRVj9gfbyQZxq50Q4N+QjmvfCb Ryix+2UFgN0D04s+euhDiF+MxyjlPNDUyrxf32Ain6pMD8KAvjBsKcD+1jgiNaInHYcq B1yEwW/m7RRz4MTy6GBecFY5GNngWaVwBbFEl/oqGQvhKzH9TsXWLL3eeCA04iHmpOjv m8UpsftlC1yKpSRwIVLhRcINZil+Z4DL9rmjDZvRwq2nwPAa9jwa1IzJDC+jhmsDSZQC 7XWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=U+2XdPO+; 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 b36sor54771245pgl.8.2019.01.10.21.13.47 for (Google Transport Security); Thu, 10 Jan 2019 21:13:47 -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=U+2XdPO+; 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=sIr0XR9JtSIXTySKwYaIUFJCPnOMAPJJ3pzvm0xJRbI=; b=U+2XdPO+b0Y5Wq2bgrVPFxop20iY3m6KFjB8cQoC5apiFJca48DoqliwuouseL3L/e eh6IxYxOa85yqcUFI7BCKmI6qiniRhQs4coDnUm1DrT6aq+y0ZGeJojpjfjPTF4p3C3j 71eLod8/Ay0jeql+cTR0ld0+eiik2VnZ2Ni+V5FuXw+m2M6V3r1LFrkM/c1IwsPr3Kb6 /RV5KgQYyZojMXJCot4Oy09nUdkSs5Lb3MtSaAcPfax6+91pO+YyxiDL8q5JGbAIiBy8 5J5Vxglbrhf3xFYUfq5sC+t34E8jd78cEoOkmOMyEFk67vQfNXDtpt5ggBB0z0q1OtS8 /8LA== X-Google-Smtp-Source: ALg8bN6MrepyiJeI9/hkg0ePCAkRL+WmhJa6GehuKilZH1gz5v9005Y4X/lsU0mx1lt2nZCPdWtAfg== X-Received: by 2002:a63:7512:: with SMTP id q18mr11105826pgc.231.1547183626904; Thu, 10 Jan 2019 21:13:46 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 21:13:46 -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 4/7] x86/setup: parse acpi to get hotplug info before init_mem_mapping() Date: Fri, 11 Jan 2019 13:12:54 +0800 Message-Id: <1547183577-20309-5-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 At present, memblock bottom-up allocation can help us against staining over movable node in very high probability. But if the hotplug info has already been parsed, the memblock allocator can step around the movable node by itself. This patch pushes the parsing step forward, just ahead of where, the memblock allocator can work. About how memblock allocator steps around the movable node, referring to the cond check on memblock_is_hotpluggable() in __next_mem_range(). Later in this series, the bottom-up allocation style can be removed on x86_64. 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 | 39 ++++++++++++++++++++++++++++++--------- include/linux/acpi.h | 1 + 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a0122cd..9b57e01 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -804,6 +804,35 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p) return 0; } +static void early_acpi_parse(void) +{ + phys_addr_t start, end, orig_start, orig_end; + bool enforcing; + + enforcing = memblock_get_current_limit(&orig_start, &orig_end); + /* find a 16MB slot for temporary usage by the following routines. */ + start = memblock_find_in_range(ISA_END_ADDRESS, + max_pfn, 1 << 24, 1); + end = start + 1 + (1 << 24); + memblock_set_current_limit(start, end, true); +#ifdef CONFIG_BLK_DEV_INITRD + if (get_ramdisk_size()) + acpi_table_upgrade(__va(get_ramdisk_image()), + get_ramdisk_size()); +#endif + /* + * Parse the ACPI tables for possible boot-time SMP configuration. + */ + acpi_boot_table_init(); + early_acpi_boot_init(); + initmem_init(); + /* check whether memory is returned or not */ + start = memblock_find_in_range(start, end, 1<<24, 1); + if (!start) + pr_warn("the above acpi routines change and consume memory\n"); + memblock_set_current_limit(orig_start, orig_end, enforcing); +} + /* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures @@ -1129,6 +1158,7 @@ void __init setup_arch(char **cmdline_p) if (movable_node_is_enabled()) memblock_set_bottom_up(true); #endif + early_acpi_parse(); init_mem_mapping(); memblock_set_current_limit(0, get_max_mapped(), false); @@ -1173,21 +1203,12 @@ void __init setup_arch(char **cmdline_p) reserve_initrd(); - acpi_table_upgrade((void *)initrd_start, initrd_end - initrd_start); vsmp_init(); io_delay_init(); early_platform_quirks(); - /* - * Parse the ACPI tables for possible boot-time SMP configuration. - */ - acpi_boot_table_init(); - - early_acpi_boot_init(); - - initmem_init(); dma_contiguous_reserve(max_pfn_mapped << PAGE_SHIFT); /* diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0b6e0b6..4f6b391 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -235,6 +235,7 @@ int acpi_mps_check (void); int acpi_numa_init (void); int acpi_table_init (void); +void acpi_tb_terminate(void); int acpi_table_parse(char *id, acpi_tbl_table_handler handler); int __init acpi_table_parse_entries(char *id, unsigned long table_size, int entry_id,