From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 968ADC43334 for ; Tue, 14 Jun 2022 12:02:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26FC38D0001; Tue, 14 Jun 2022 08:02:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 246CD8D023C; Tue, 14 Jun 2022 08:02:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E9398D0001; Tue, 14 Jun 2022 08:02:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 014A08D023C for ; Tue, 14 Jun 2022 08:02:39 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id CB8D16120F for ; Tue, 14 Jun 2022 12:02:39 +0000 (UTC) X-FDA: 79576704438.31.A35C4CA Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf28.hostedemail.com (Postfix) with ESMTP id EF5B4C00A9 for ; Tue, 14 Jun 2022 12:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655208159; x=1686744159; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=z3vk4MiFaMowdZHoqTpUcMK79OckKcSoieuVm3Gi93o=; b=S8ssF3IRbE2k34OTwxIC6UxuYMUaqlhu7yOzUqU7KN2jxJ2JLO9esFg8 6KYyzXs7LbexuAccpLpYdjS0DaCFZ4AEGsBDtw87VBy4BtyxsdcPUXRL2 oSwJ1e0nF9q1vt9TkttTyKL00uxB9l0d15/LBLhVuDBUsReUADzSmaj2i exUgdz8uVLbkSEu6gcVU3KbLWvNUKwG2zQhBw0o9IYszEylhW3ZBeyHb6 KMUUhk/f+4tCZ7DrYlBcY9rJsdO+Jz2qfEH1Ko4UUg/T0sY8Eur3yv7hg N3Jq+O3r0zp1aSeY28zSxqeDP/qIeDSo3IN2ufJQkMhYrWyy8NulJuStm Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10377"; a="364934645" X-IronPort-AV: E=Sophos;i="5.91,300,1647327600"; d="scan'208";a="364934645" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2022 05:02:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,300,1647327600"; d="scan'208";a="652001263" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 14 Jun 2022 05:02:28 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 9CB1660E; Tue, 14 Jun 2022 15:02:32 +0300 (EEST) From: "Kirill A. Shutemov" To: Borislav Petkov , Andy Lutomirski , Sean Christopherson , Andrew Morton , Joerg Roedel , Ard Biesheuvel Cc: Andi Kleen , Kuppuswamy Sathyanarayanan , David Rientjes , Vlastimil Babka , Tom Lendacky , Thomas Gleixner , Peter Zijlstra , Paolo Bonzini , Ingo Molnar , Varad Gautam , Dario Faggioli , Dave Hansen , Mike Rapoport , David Hildenbrand , marcelo.cerri@canonical.com, tim.gardner@canonical.com, khalid.elmously@canonical.com, philip.cox@canonical.com, x86@kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCHv7 04/14] efi/x86: Get full memory map in allocate_e820() Date: Tue, 14 Jun 2022 15:02:21 +0300 Message-Id: <20220614120231.48165-5-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220614120231.48165-1-kirill.shutemov@linux.intel.com> References: <20220614120231.48165-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655208159; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZpVgGsM9M9IiCP2g7i9gOKhp4UtHGI9JInMO/6uWhoQ=; b=dZhNtbfkrBoa+cB3VeNqBH3cq+TPsyJM+uAgE0lSdsrcYMfRPfwi8etvrBIQr65mZbfw7u MQr3QoKN7IRBchgXcbGiPOLqob03tH5bMybfSW2dYOM3O3ZyuocvUwj0Gi+HcT0z/OSwaQ 2wjjjGH3NtXvDUl6Apya/I65CVj8fBw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=S8ssF3IR; spf=none (imf28.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.43) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655208159; a=rsa-sha256; cv=none; b=tBZiEgcq5EPSWd96uJa7JfHo1XDJ4ub3Qj2AALQpf8miDCumOqC5niHHcGIT5RZ73AvhQJ ONWHbWAya5hp9696QBdnGEFnWmoBJvS4M2AGMkANpX/eni6Katw7SQn6ZIAcTUbTNZpUhm d+TzbacT7RArN4W+MBmx0abjQErxCSw= X-Stat-Signature: yh6yzoi6ja9y5jpcj7d1pbostzxnk7yp X-Rspamd-Queue-Id: EF5B4C00A9 X-Rspamd-Server: rspam11 X-Rspam-User: Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=S8ssF3IR; spf=none (imf28.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 192.55.52.43) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com X-HE-Tag: 1655208158-709847 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: Currently allocate_e820() only interested in the size of map and size of memory descriptor to determine how many e820 entries the kernel needs. UEFI Specification version 2.9 introduces a new memory type -- unaccepted memory. To track unaccepted memory kernel needs to allocate a bitmap. The size of the bitmap is dependent on the maximum physical address present in the system. A full memory map is required to find the maximum address. Modify allocate_e820() to get a full memory map. This is preparation for the next patch that implements handling of unaccepted memory in EFI stub. Signed-off-by: Kirill A. Shutemov --- drivers/firmware/efi/libstub/x86-stub.c | 28 +++++++++++-------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c index 05ae8bcc9d67..504955368934 100644 --- a/drivers/firmware/efi/libstub/x86-stub.c +++ b/drivers/firmware/efi/libstub/x86-stub.c @@ -672,31 +672,27 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext, } static efi_status_t allocate_e820(struct boot_params *params, + struct efi_boot_memmap *map, struct setup_data **e820ext, u32 *e820ext_size) { - unsigned long map_size, desc_size, map_key; efi_status_t status; - __u32 nr_desc, desc_version; + __u32 nr_desc; - /* Only need the size of the mem map and size of each mem descriptor */ - map_size = 0; - status = efi_bs_call(get_memory_map, &map_size, NULL, &map_key, - &desc_size, &desc_version); - if (status != EFI_BUFFER_TOO_SMALL) - return (status != EFI_SUCCESS) ? status : EFI_UNSUPPORTED; - - nr_desc = map_size / desc_size + EFI_MMAP_NR_SLACK_SLOTS; + status = efi_get_memory_map(map); + if (status != EFI_SUCCESS) + return status; - if (nr_desc > ARRAY_SIZE(params->e820_table)) { - u32 nr_e820ext = nr_desc - ARRAY_SIZE(params->e820_table); + nr_desc = *map->map_size / *map->desc_size; + if (nr_desc > ARRAY_SIZE(params->e820_table) - EFI_MMAP_NR_SLACK_SLOTS) { + u32 nr_e820ext = nr_desc - ARRAY_SIZE(params->e820_table) + + EFI_MMAP_NR_SLACK_SLOTS; status = alloc_e820ext(nr_e820ext, e820ext, e820ext_size); - if (status != EFI_SUCCESS) - return status; } - return EFI_SUCCESS; + efi_bs_call(free_pool, *map->map); + return status; } struct exit_boot_struct { @@ -745,7 +741,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params, void *handle) priv.boot_params = boot_params; priv.efi = &boot_params->efi_info; - status = allocate_e820(boot_params, &e820ext, &e820ext_size); + status = allocate_e820(boot_params, &map, &e820ext, &e820ext_size); if (status != EFI_SUCCESS) return status; -- 2.35.1