From patchwork Thu May 18 23:14:27 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: 96104 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp867659vqo; Thu, 18 May 2023 16:34:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4kDwsgMRJO533toXCFlYK0P26cE1uBfO3Bsl1TRYAXBCqERAmdOfpMSl3nFZtG2ThtStuM X-Received: by 2002:a05:6a21:32a1:b0:106:47d1:63bc with SMTP id yt33-20020a056a2132a100b0010647d163bcmr93167pzb.36.1684452892585; Thu, 18 May 2023 16:34:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684452892; cv=none; d=google.com; s=arc-20160816; b=qVB8V3Nw+YZbbnHkwt7uiSwbRt1uW/2oFp6rkCIiZ2QK8sEt6yVTCcUiI1tpqtZ8rT bhztDwH/F/YxbqtAvCghBiAGMC4Chi44AzaYsYb00gOLrsfZ5sPfCFKNOIdSFDhIDU3H QQMQUhfigVspmNbgt+XvpYBuF/QTxf7zox1MRvkPY6gcAOsjLa0p11j/h08rc/7maAuK vjvM3q9ixoGxFsZIiW4DGKEIKuv6f+OVTmDLJJA/MTLfh5lRr1HQGCrlfbJIkwYEa/io Q3ltFFWuYYu5jDW9LDN+4a9gmYF8QEZjww5VD5o5uu09xdkmtfGlKJjMBoI0M1z/uZ9y o9BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BaZyb9j0toOFpXjTH7X5V8WTk1CeGrfyPyJRw/21oXU=; b=qagKVvoU3V7Vg+WEru9VGSau+7W1NMcFcqJ4+iQ17dKHqEXu7CyEpOoQtnXv0oTW8t UjzbdKMPge6CwCjqFUZKrCeTOoP+1J2QnkuYywniHWUAlTLZUYNQtAx5X3MEZuq4B+bh HdirNwsbkX79fD8hJ+MxgyuY2xmuu8+p31JKGUy1/inBDUMHbocxPCuk9CNwbO/oxLgA iLtF3SUEo0irLKqwB1Zr/MO9jgrSF7M8Y9D0Jcv7TsnIfdWfs8XWoPR3u8F7KPcAV4jo 9+FMtjJHk6+oqtqg13r8j5QprkRYm+kqF/h7rMk6LDgxtKULodejREBbcWCcgGF+YTac Ik3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="G303A/Qu"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i5-20020aa796e5000000b0063b1739532esi2786709pfq.139.2023.05.18.16.34.40; Thu, 18 May 2023 16:34:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="G303A/Qu"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230096AbjERXO7 (ORCPT + 99 others); Thu, 18 May 2023 19:14:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbjERXOv (ORCPT ); Thu, 18 May 2023 19:14:51 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E89E3E48; Thu, 18 May 2023 16:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684451690; x=1715987690; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LJWuKaqvYOvqAXDR1TKqUlI78Dny7nmmQ0aMOVcXkCg=; b=G303A/QuLi10GQZWr2fLSW5eXRV/AgkIALDsn9v66paL4d28vAn+Rk5q cm815CRJ/xxVRPtuAXo25cTfanOQDRYJRkc4Z4xkJershL+zT0xuQb5Lj 3VDRi5gN657SeoYnxDzwiJX6Qw5xDJLKAFmv7eh2lp6l/C1AaoTtwIdha KeDhg4SM32DRnwWDSGsHEGBf4BH1CYGfKmZdZP5WW/nHnf9yFenjRY2gk 0y1uf8KFCKAPcBM+9fPtH6V16dyV8GPX+T8Y9wusXZkTmV6tjK09xP/lK rujNWcdqsPkcDmXEdi+TjviiBWmcZhRKC6K+9nBr3qm052EevgLcXTeKS w==; X-IronPort-AV: E=McAfee;i="6600,9927,10714"; a="341652063" X-IronPort-AV: E=Sophos;i="6.00,175,1681196400"; d="scan'208";a="341652063" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2023 16:14:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10714"; a="772065073" X-IronPort-AV: E=Sophos;i="6.00,175,1681196400"; d="scan'208";a="772065073" Received: from rkiyama-mobl1.amr.corp.intel.com (HELO box.shutemov.name) ([10.251.222.16]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2023 16:14:42 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 2A6C610DFC6; Fri, 19 May 2023 02:14:40 +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: [PATCHv12 2/9] efi/x86: Get full memory map in allocate_e820() Date: Fri, 19 May 2023 02:14:27 +0300 Message-Id: <20230518231434.26080-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230518231434.26080-1-kirill.shutemov@linux.intel.com> References: <20230518231434.26080-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766276876337273162?= X-GMAIL-MSGID: =?utf-8?q?1766276876337273162?= 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 {