From patchwork Sat May 13 22:04:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 13240346 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 5ED49C7EE2A for ; Sat, 13 May 2023 22:04:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 84000900002; Sat, 13 May 2023 18:04:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8189C280001; Sat, 13 May 2023 18:04:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66A63900002; Sat, 13 May 2023 18:04:52 -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 4A04D900004 for ; Sat, 13 May 2023 18:04:52 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 18F92A1179 for ; Sat, 13 May 2023 22:04:52 +0000 (UTC) X-FDA: 80786612424.03.9D56217 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf04.hostedemail.com (Postfix) with ESMTP id B7DF540008 for ; Sat, 13 May 2023 22:04:49 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UwXwwpzp; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf04.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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684015490; 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=8eER3nj4kauYEk3c3ghrCd1PHqJJZIa9/Zb2oGBx6Ro=; b=7ooaM1X1W3x18SJFuncpxtNZE72zDNa4BZMEh6VD5leZVyN8iWnd9i6ASHPhP/hjAqWwmL MLQDoGab+aO+LQ7g/jF0tbgRtQMDs8a+pmVOIU3exgIQafQ69BcbPNw+c1i5o90G6afybH yew+7EcEBk+TIAlZZFKPKTOIkrug8nA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=UwXwwpzp; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf04.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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684015490; a=rsa-sha256; cv=none; b=iB4C7W+QPFQHT8LoCNiuGjbiTziZBxb7ALImANNy2Q4FPv6QxObi+2gjdcW2XUop46K+O7 vvFNwnidKrx04ELORmJEHHeib+aTcNWL3b8ptb2Ce5jGDIjl5bBAxAn1x+KOpibu+boKN2 j6WVbcfq9F3CDO4bSWUM8r66dLW+aA0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684015490; x=1715551490; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=F0wEDPSvMabnYNajFJWO6701ciPheAFu0TDqu98qRss=; b=UwXwwpzpv59CCd2ccaCSzmV0wTKO9unu1812lcfwmyDhFYVxZpvrCmCZ aG9zgkiqQ7NmoPq5+fITKd/ztwJ0eNdeHpWdZdJzmXuIGI4soMaiqxSy8 Uk0nj71rKH7rnyTbFkIEPAOENzExtitztgkKtpkCCzJ/l6qPnq20W6vOl gJeAz3S2+6uBcIz37ouMPB7G3YWgyV91qt7g553LALLtDwjam2bfPa+GA +UT3B5o7D2L65Q7rrOvzlrUZ9R4BiV27nYjFkjxGbGhjh8MlBc2l4JNwj u2OuVbiqrs+c3Qa/VYd1EYw6aoTfuNYf9mrR+i0TUrxsufW1Ir9pmTi6f A==; X-IronPort-AV: E=McAfee;i="6600,9927,10709"; a="437325178" X-IronPort-AV: E=Sophos;i="5.99,273,1677571200"; d="scan'208";a="437325178" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2023 15:04:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10709"; a="790199649" X-IronPort-AV: E=Sophos;i="5.99,273,1677571200"; d="scan'208";a="790199649" Received: from sorinaau-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.62.145]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2023 15:04:36 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id E090C10CF78; Sun, 14 May 2023 01:04:33 +0300 (+03) From: "Kirill A. Shutemov" To: Borislav Petkov , Andy Lutomirski , Dave Hansen , 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 , 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: [PATCHv11 2/9] efi/x86: Get full memory map in allocate_e820() Date: Sun, 14 May 2023 01:04:11 +0300 Message-Id: <20230513220418.19357-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230513220418.19357-1-kirill.shutemov@linux.intel.com> References: <20230513220418.19357-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Stat-Signature: bpfcucnci89d46h4gwh4zwo6un5uwaxx X-Rspam-User: X-Rspamd-Queue-Id: B7DF540008 X-Rspamd-Server: rspam07 X-HE-Tag: 1684015489-759982 X-HE-Meta: U2FsdGVkX18uaCzkfExT8J6AuID2PPQPcQDV/jsVb8paoyQQA3hXIYV6llhGZ0AGOe+P4939JYH9CU77xdf80KNnYEsveQzDpjLzUNOYjEK4ZDYiH5+QYzYG5ApXE3MpaOtvc0gAVXG1debcYDHo5Lw/A0AHdIQ0UqwgF5qbYA4iB7IRW2ktZs0fRQKP2YiK7NRkg4V/hI7Fqgg6KvyljShXra9SMd0ZQgL9+lSPUSe49z9ld6ttmkg3dSMPWN16Su0Ee7pAlwCv6DQRJMjOOyQ0yVacbO3JS6zUnSxhGC3f2Cz0MzGJeWvNhx0JOd7Si36mnMeCFftRGCg43m18V5FoOVImcvpGCHtBwDPyrmfDXqZlGWyU34GMsgsmXD95hql1h1LnX70xun3Dda6oioa+Gl7AyBKb2KDUhOxmPF8XAsF00dG800bdWJw6gqTMk130mnhBwRKgsdCNndXUYF8zwW56IWplKmV+Q0fyNAWV+tF9sqfzdnWyk2sh++fT9Zqe5XiJFp87DrOcXeaHBdF8aToyTNgWxta63QHVUXFKVwE0B+TUe4tvWPec/ufZ+08CrbkRzHxP2YKdRsMhsG4TjXLt1yNUH1ooxZ0yM+mpRbqNP4kWpc371npZxqgCmmDGX5gz4lf+LZkzJnwSXNbH1il0w2vUENMa2zn7D0YbMdkbA0mtI9MmWxZvCnte5h801E97QWNgOlbUXg8+EK3Jt1sN2VcNjolDsi3FPi19/XX9PWcMTJoo4P1dqU9uBRVqS2LVMaf1oC29d+wpW1cSjUmy926bhLm1yuPsAOTDEhQpVlHtPOrX4bLBX0/EzR4j2thVs4YGkBijIZ4C54Y3usTvwCPQNTfg+wdJnGwoaNDaAcoybAoe/dWUdNHq4K9SYIa6U73JfXZc6o3ZZuUHirarFUb6xIF2/gYAtIB793z5QwWbdH8LGsm/qFRrC00l0WwkJalC1SAlu/U KxeV3qh0 vmKha0PeaLimp2a5IK1qtPPtu4qHfI1oqC5N+1g6ofpHMPzAZ3R6GK+4DxPbiZ76cJDrTlNuWoCENa7V2BbVZ+3zkwpeHcscNUNkHf/RpUpE8qtqtbI/A62ZBYdcJHf+7vaR4Hlh49izjhiFYrfwh43g+RUa28JCuhDtrq4+Av0m38lNPPjuCG8jlcYzNT7tEkKRF6ygb4SgI+Jsa0TW+8l9ip3vvTF4NBGAuPv3RgZCpZBdA/8KrtAbNjg== 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 Acked-by: Ard Biesheuvel Reviewed-by: Tom Lendacky --- 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; + status = efi_get_memory_map(&map, false); + if (status != EFI_SUCCESS) + return status; - nr_desc = map_size / desc_size + EFI_MMAP_NR_SLACK_SLOTS; - - 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 {