From patchwork Thu Jun 1 18:25:36 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: 102123 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp532512vqr; Thu, 1 Jun 2023 11:30:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6QF8O6IK4LcKqC7W+JgnvuZr2kN9qJ5PnSDCYim4pGJVTaX9xzdmZ3yi99EpgpMFjnK2Gd X-Received: by 2002:a05:6a21:339a:b0:110:d78f:813e with SMTP id yy26-20020a056a21339a00b00110d78f813emr11822385pzb.40.1685644221459; Thu, 01 Jun 2023 11:30:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685644221; cv=none; d=google.com; s=arc-20160816; b=kebPzvHWIGLLu6RQYHdfcW87SW+mBSdfS/zVJNr26xlEfbrQNwN9rTFiPXZpP0bxTA lRHHBCMT6H2LXcN6spOlZLzi2ydxYEGhnsUbQmyqIfteveshQcaturYHRoysHL5MhqaN dvHyUX4Dc7slqPfsTDvNI7rlaOyV2pC7jc/EjRMGuNQ/03O/YWGim4RRTCj1eq95Cq5v 0B1HX+9AFiHkcS7KnaMRy8udhHhoqg5i1uX+9bDf7BVM4pDMOm9d/WbciAfcYMAGtQKG P3AYl/GWvcujRj/ed4IXOqHkVq8f95PayWWalZUXMPrrYTjUoEq164hfhNqcBADyK9Dd KkNQ== 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=exRsuAdszZUGNuMUl/U0JkHW9nhOLBKTMxztD8ZNfRkSeONrqdOMp+VT3YsioPZm5Z QoAly7ppTEgBat1kxKrIr4uTenOr57b615QBC7vbPAs5ldUArSPNYlVv2ENOijWvUs/s ApKh+bKpS2oqtBoXV2IztGnSYRFhfwT59pS3tQB9jJBU4rdsHRjOfCgoPKjeywbdrDcQ TBv19dwK7mZmylacRl7eJYZMyCNo7Kv7+cBu2duXauuRoiBT/tFjfoWz7rBghoNlQfO9 7IKqhrUtaJ/urRltGIJSWC2HGzTQeAnRUQCIDmK/w4ZEyi6zc6UU7sxV+iszx+GR+G/7 UvYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iaqofVfn; 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 q196-20020a632acd000000b0053fc3bc33desi178157pgq.661.2023.06.01.11.30.06; Thu, 01 Jun 2023 11:30:21 -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=iaqofVfn; 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 S229884AbjFAS0L (ORCPT + 99 others); Thu, 1 Jun 2023 14:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbjFAS0H (ORCPT ); Thu, 1 Jun 2023 14:26:07 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DA501A5; Thu, 1 Jun 2023 11:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685643965; x=1717179965; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LJWuKaqvYOvqAXDR1TKqUlI78Dny7nmmQ0aMOVcXkCg=; b=iaqofVfnhAxH0atcMbBkimsj1IZ0/eN5GGPyv3qcQV7cBGeXaplh/e8G K20byEF6SJFRoeZx/met/0guifEtxQaDX5CArPw6G52iUQxjjnII8XkMC HK/whp7++DhpyIXVALKJMDq/Zsnu80bX+GRdgjIZBKA7ZidauwcK9lxNt X3iHw5KZiCAEIVB2HfGvkl6y/Bo7y0HU0SiyZX7wo5SuTZNzCtKtHe117 WUTHdL40XUMro17DT5rfraj2GDcsEP96k487AYNy/o5fKB4a8Iv4kC10t EySrRegKk4g1XGugUuP5hRURfQNcWqjBYZOkrpw+6CFA2KOgzB3QuOqiL g==; X-IronPort-AV: E=McAfee;i="6600,9927,10728"; a="383920491" X-IronPort-AV: E=Sophos;i="6.00,210,1681196400"; d="scan'208";a="383920491" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2023 11:26:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10728"; a="772539902" X-IronPort-AV: E=Sophos;i="6.00,210,1681196400"; d="scan'208";a="772539902" Received: from fmaislin-mobl1.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.47.213]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2023 11:25:54 -0700 Received: by box.shutemov.name (Postfix, from userid 1000) id 5E20C10B6A9; Thu, 1 Jun 2023 21:25:52 +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: [PATCHv13 2/9] efi/x86: Get full memory map in allocate_e820() Date: Thu, 1 Jun 2023 21:25:36 +0300 Message-Id: <20230601182543.19036-3-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230601182543.19036-1-kirill.shutemov@linux.intel.com> References: <20230601182543.19036-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.5 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?1767526075176955770?= X-GMAIL-MSGID: =?utf-8?q?1767526075176955770?= 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 {