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: 93618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5995812vqo; Sat, 13 May 2023 15:23:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Qd81tFGEENe1fQh7W/Hj6oo+jcZea93dki6b+p01rTvw8ygPz9ZslpCF9IyYqSKMUdzZN X-Received: by 2002:a17:902:7889:b0:1ad:edbd:8547 with SMTP id q9-20020a170902788900b001adedbd8547mr4631978pll.15.1684016624683; Sat, 13 May 2023 15:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684016624; cv=none; d=google.com; s=arc-20160816; b=pltgKMEQujnroQN5cda+vke+f9M/c+lP69dXfOTRlt556b2IDGkb4ZC1ebGBWcdMu2 s+T9aTDn3pK9Lw/FeEKvJvI6HYBwxpG06K3CL7P6qT8mR1whEefZ72Il70+qWdxA+/iF 40hT0cl2w7umhXvV1loO61RLuf/gkfccd2OnFtkogybNoR45uz6PW0rO8UmNGkeKTZ/y InzIm+osC6lfd+irD3kqSxrhX0uU5JI0KeclcbwJPTQQmfBz+X8fYMf61/13mzlSY1eV yWOqtjrDqJ6rz+iArDjcP5wofEC72wSpYuWS2h1JntlqDng/aQPCSZGacKqbEO/nG4bE qqIQ== 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=8eER3nj4kauYEk3c3ghrCd1PHqJJZIa9/Zb2oGBx6Ro=; b=FtTW64q4P4+VDZk/Wq+G9nGTJ2NKCBvMCWMxa6L9N+wPnwJikAzZtzOTGWVRoeY7N7 Dj9ZWNAw4MIHSm2AWrh9iPEx271Y3AUeafieBHCfNlLbwIY+P2B9gh80qUkCas4KuUuI 3+alU95ApS8SSpJuKvNrf6+cMk/FEEQkg3TLWe3BNgYKjUt/aVdEdGSLvihvF0lQNoOz 36GuMElBpOYT6sN7UOTiuBmUy5eP6JZ8XdeQIsxZNGetAcHz5N3RlkJa4buc/nqPdou3 laFQd9KUzPrWstBifx6ZsPSyLvNx7DMuWrOLgTh4u/GgCmpAXrgVaHB8krysx6NL+ivn D7PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=O5R3YRyi; 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 12-20020a17090a000c00b0025021842c2bsi21404255pja.185.2023.05.13.15.23.29; Sat, 13 May 2023 15:23:44 -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=O5R3YRyi; 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 S233239AbjEMWFA (ORCPT + 99 others); Sat, 13 May 2023 18:05:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229464AbjEMWEr (ORCPT ); Sat, 13 May 2023 18:04:47 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1105E2D58; Sat, 13 May 2023 15:04:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684015486; x=1715551486; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=F0wEDPSvMabnYNajFJWO6701ciPheAFu0TDqu98qRss=; b=O5R3YRyisldaMsDxqXNnRtfuBCARy3IhcsK7HDYMDN5KsebbFv4ZF6V5 5VWmamv/iUJPJeeW4+NhhvBMQJ1QQjhfBiL9MNPT+O5rFonEfA8Rvcq6y ZQ44rOX3TxbS8Ajixs9aPIZVba1s9t+C589O3Ouw9xpduL35Yf5hzOPGO MWpIOU1Tq5UkAefsM6hQFkmrQ/IhcJh25QAgXoLR6r2zDKHe2PlT9c/ey 8NqrvxZZOLyq6ejjVICLI6bbfu/c/WcHDbDeDPEAxaNJdL7JdqzaevmSa EK54soGFQ9no4xN3yzRy3C7ek6uVNwe6qwAz/pgKHxPK+1KLA59lPMk1h A==; X-IronPort-AV: E=McAfee;i="6600,9927,10709"; a="437325185" X-IronPort-AV: E=Sophos;i="5.99,273,1677571200"; d="scan'208";a="437325185" 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-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,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1765819416533090390?= X-GMAIL-MSGID: =?utf-8?q?1765819416533090390?= 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 {