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 40FDCC77B60 for ; Thu, 30 Mar 2023 11:50:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 350A66B007E; Thu, 30 Mar 2023 07:50:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3018B6B0080; Thu, 30 Mar 2023 07:50:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 154886B0081; Thu, 30 Mar 2023 07:50:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 07CE96B007E for ; Thu, 30 Mar 2023 07:50:38 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 671D1160F29 for ; Thu, 30 Mar 2023 11:50:37 +0000 (UTC) X-FDA: 80625397314.23.1BBDE59 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf24.hostedemail.com (Postfix) with ESMTP id 3F092180015 for ; Thu, 30 Mar 2023 11:50:35 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ACkDroNn; spf=none (imf24.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.24) 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=1680177035; a=rsa-sha256; cv=none; b=FrXtNK479f2Iv3g7xu72PyRaQDO6lId5yMnMryJTNVfBVedeJ5Ok+whXqlFN34bwvbh+9l koVbgH/RQ1k/2adHo00q/K6GnegqPHnEviIq4CXnQOAA90PwUYfPH6kW1YS7AOg88V2n5S SPn0N4A2FdJISN0nmo8IYYpWLbEsJFE= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ACkDroNn; spf=none (imf24.hostedemail.com: domain of kirill.shutemov@linux.intel.com has no SPF policy when checking 134.134.136.24) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680177035; 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=ruFNRYlkeA7U/LySXAwK77bGHsdZfakSttMzy8rXOc4=; b=fscNm0BRS+Jp+mKcy9aenVGLewTV789zwYc2JuXk8KRbdVpiS/SvhoR9XAfflomGcOrOJl C8QFteRQCdAPFBzZXM0mcyKUMmRqYAIM0+6pr7Ficx0TPufly4jTp87+2d4haPBlwXWqtU wg8tpljMSpb+nfAp9pyRyje00Fewa8c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680177035; x=1711713035; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hKxUht4bI1oBBOH1u/ajoAci1RdtaLogFa2+swkKZCg=; b=ACkDroNn1FmCxfzgS/j16p6406vDEoohPGYPHvwVNc5yC56drK3vIps1 H4rEpL+YNCGV90BF3vJQiPQtjox0NZWpFrqXWs2dZa1AwRvE4lrwViZGE TpcjD5e1PLifac+btP2FIk7oz/ztcqAGBJgDXx5xfIsoG8A9+VW/KBk+G UgL3MAlkqgX19hV8IC7E+RhAnBTgk609RHKUxgSgh7X+x+J0YfQhbtizB /R74XpLlFU6DaU9JjNB0fu9lp5Htgf85YQK6SflRiU+OjcT3JAzk+IuK3 0hRZmCshrTmWFoLLWAYTay/WQ34FWyrWeLuiAWbxerbUoBMIKZIf1U/45 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="342756772" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="342756772" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 04:50:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10664"; a="634856509" X-IronPort-AV: E=Sophos;i="5.98,303,1673942400"; d="scan'208";a="634856509" Received: from ngreburx-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.251.209.91]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2023 04:50:17 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 1B89A104390; Thu, 30 Mar 2023 14:50:00 +0300 (+03) 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 , Dario Faggioli , Dave Hansen , Mike Rapoport , David Hildenbrand , Mel Gorman , marcelo.cerri@canonical.com, tim.gardner@canonical.com, khalid.elmously@canonical.com, philip.cox@canonical.com, aarcange@redhat.com, peterx@redhat.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" , Borislav Petkov Subject: [PATCHv9 05/14] efi/x86: Get full memory map in allocate_e820() Date: Thu, 30 Mar 2023 14:49:47 +0300 Message-Id: <20230330114956.20342-6-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330114956.20342-1-kirill.shutemov@linux.intel.com> References: <20230330114956.20342-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 3F092180015 X-Rspamd-Server: rspam01 X-Stat-Signature: pxrcy689cy87esgxh49ke1idudpke66c X-HE-Tag: 1680177035-508195 X-HE-Meta: U2FsdGVkX19N+JolTedtpQR9nQAnBEcYcPmsegDdLOgXQteccy4Hv6FMJmwsHeUCLscSLFWamMwNQWZUp6aK5TAxS1wWAO94PMrxZeJwFOwpCZRu7j1EVewPS0uXkE5LGINcGA9J3f4fYbW97e+iVZIROosAIAua2E9YZWuSHM5ldKDut+x9fpD8JtyJAsC00IhxSHO52+TFE8zSDvhBX9hxsMc2M4morKPg35ocnyqydOYqeoWs8xo8ULb6HypLjruGxmPz1NncWh7gG4miaq0ytjfHDwN/1oIBVwvH6jkCW0HVHF96wRphcxz76X65ZgBLEz1S9A5BhSeRNu+yZVm6RVnHZFDWSoDwFRfQqS36Uce/0qlbrWj73AqXQV8VoJpOhx2LkQifjNFjrIDwC6imqv+rMGtsUyTzjAJiDoij94IQNsK2fu2wSj0t01g3V3lK/21auDjrEDuueK8485fXieMOiRA12toT8Ucn8e8whpOZU2IT8f0D0sDFEnk9MCfBdGnWLh3P8FpK+0FQKJGr/CZeQIkGEwuQCz2fPsBdUZkrGHETFcXjsfPFOWvp+Kd97OqHzuN6hPcwLKdax/QKS/MyAsAMqJzmDyRCRAeBRlDM2zRCL0WaY4RHdilp3o534AjQLQFSlRu0/O0gHOyUOFZUtQeg2x6fo1HmY5Iadpbp8ZryYNqigYRRRbns3sEwSBs6yxk33asv9Q6NHSxRoHzacKO6lOVNE/tAo8lOg5+t0DMaUSrLp14shRCk89hh4fxmRlQDONYaZhe7VX22bt5NQtJmTCxkEFtnqqh04fz37URSkuGL5vDlubNf/i9JZ1r8vf+POE3LLmluKEXXXBtsPTmu05MUhW+8U1e6GYm0yxXEh7BB6mObt7oL7PEN0teAu6NjXFOwNIBLbh4iJqIJ0csjuyDcXkmvD9ZS8WUe1HEWSFoWxZcv8zZOCldKU01gGnmYkiaRSjN 0uIUNuYJ qJF6DP4959F2x6I4GxG0KWNTk2PAwL37Hy743ogIwMlyGibOB3lm3d1CSFuo+pqmzB4S9JPL2cbbx1zXa71FSqB/1aV+e2Tvw8TUB/dKaCvSAnxW/Q4rI/dVmwHU3M5iz+6GInw20dK2WY8UxMxbaiEF13yOHdH5W0QshsCA+mEpJ9GPzuh2IZ7R3lA3VSeoQU7f7HPY5Jrc5JVY= 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() is 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. Signed-off-by: Kirill A. Shutemov Reviewed-by: Borislav Petkov --- drivers/firmware/efi/libstub/x86-stub.c | 26 +++++++++++-------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c index a0bfd31358ba..fff81843169c 100644 --- a/drivers/firmware/efi/libstub/x86-stub.c +++ b/drivers/firmware/efi/libstub/x86-stub.c @@ -681,28 +681,24 @@ static efi_status_t allocate_e820(struct boot_params *params, struct setup_data **e820ext, u32 *e820ext_size) { - unsigned long map_size, desc_size, map_key; + struct efi_boot_memmap *map; 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, false); + 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); + return status; } struct exit_boot_struct { -- 2.39.2