From patchwork Tue Jun 6 19:42:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 104100 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3644009vqr; Tue, 6 Jun 2023 13:12:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5EGmSoQHwPllL0O+OlBf2DslHnILc3TuXZKUx3d51WTLjwVBtnF/m2ZOMA9mh1tjfhEBOa X-Received: by 2002:a17:902:d509:b0:1b0:663e:4b10 with SMTP id b9-20020a170902d50900b001b0663e4b10mr3574996plg.64.1686082338130; Tue, 06 Jun 2023 13:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686082338; cv=none; d=google.com; s=arc-20160816; b=RiKFc0r43EzGwvfyfsVQ7JPhbOwsch7h8Ai9v50xu+2dLw72q3p3LC8PXnfrddYDNd rc+zvQrimG1QbhnGlEHBIV4FtlVx2t65Jn4SD/zX23EEDl33B9O6N811QIVjAKV7ZWWt PemopKX8wq23ZbkP4Ulqk4G+vr0vbBYb3vDFzSJMDXVhGMk/H/01lFDi5ONeNOabPoY7 Ywhqrf3sW9oDX+xJWCY7k+iawwKNVGXoTay+e66VPWA2Uag5z66NXoNStojMUuPL/DYW pvGYu2bP5+2SVQUxaSQ3+IlpVeA5vmDpSez9iL379Y2hHkFz1UW6xugcIlNEp1Gx8ZEy +VeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=o426dMTVXaZkR3BKacRwFAubACNkduqHxPzr3LyXDZA=; b=XhQsnTrfzPmExt+Vrz+1t+1I9MgZmGRJlP0hItddrBGrp0qN4d/FLOh7hsI2hBD446 WiRyA1GH43dxGAU8U9ZnemLiNr9e5LKrDCYIgYw6n47ZOwP/LYWy38d1/Zb3izd9WxSP +PdPDRO21QVfg4jnuaNcqQTPcBoP2ZUA7HRDo3B3nj+XWqpNIMwCtFzcTiaBWCATHfGi xic18acDR2Hoij3lAuvR1hSnYDG4SEi7FKDRd5J8gz5VXCXa5v52rosk0W7bhXhzznPy lAknEoGHG/GSYFqX3gr53R4mGTsElfIiaQ1DQ/bvTV5SwE5XzrKFvosvz8Jan23Q6Ujh 6GqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=2ADkJAq2; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j11-20020a170902690b00b001ae0691dfdbsi7477112plk.158.2023.06.06.13.12.05; Tue, 06 Jun 2023 13:12:18 -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=@linutronix.de header.s=2020 header.b=2ADkJAq2; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239584AbjFFTnZ (ORCPT + 99 others); Tue, 6 Jun 2023 15:43:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239249AbjFFTmp (ORCPT ); Tue, 6 Jun 2023 15:42:45 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F08571701; Tue, 6 Jun 2023 12:42:42 -0700 (PDT) Date: Tue, 06 Jun 2023 19:42:40 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686080561; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o426dMTVXaZkR3BKacRwFAubACNkduqHxPzr3LyXDZA=; b=2ADkJAq2BEymZlB5JJ2fLYXJK4IQuz7/BhnauCeGfsH5B439CEEdUS8hsFizSo8T3LWkYm hGX+MC3u1RftxJJJytx692sK/1K8MyaRUY3uR6mQglWZdEGxKE9lR7lkUiJ39ThhzFevBR Lq3Ie/RYymZywBmJ09gA0uFiToRQ1v7ivVarJ/4E+OAYUNjowrf4m2U7h7S2rr9bLu5zVm GPyBUBz4+QehuMU1E3PwYql1MEzk/wvDe50gnvD7kFoH/EWmEsBBQYz/z1erp2T4pDwDk8 R3Pb2ajE4+s3Nx7Tl+95Q+71AxfpRQOv7YPdQKxkG7gWfVWBpUghIOEAAIS0yQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686080561; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o426dMTVXaZkR3BKacRwFAubACNkduqHxPzr3LyXDZA=; b=/ubYCh8qVN+vRJoygws1hmvX2VYJmM5mSashYq/QKkslxsqp7zlZP62vzQY7yVXjPb/Sx9 JP9TmRFxUCcOA0Dw== From: "tip-bot2 for Kirill A. Shutemov" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cc] efi/x86: Get full memory map in allocate_e820() Cc: "Kirill A. Shutemov" , "Borislav Petkov (AMD)" , Borislav Petkov , Tom Lendacky , Ard Biesheuvel , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230606142637.5171-3-kirill.shutemov@linux.intel.com> References: <20230606142637.5171-3-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Message-ID: <168608056067.404.15241671538092730395.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,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?1767964170744492196?= X-GMAIL-MSGID: =?utf-8?q?1767985473533413803?= The following commit has been merged into the x86/cc branch of tip: Commit-ID: 2e9f46ee1599be8a50a5366eb3ef4a4b5acff0b7 Gitweb: https://git.kernel.org/tip/2e9f46ee1599be8a50a5366eb3ef4a4b5acff0b7 Author: Kirill A. Shutemov AuthorDate: Tue, 06 Jun 2023 17:26:30 +03:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 06 Jun 2023 16:45:14 +02:00 efi/x86: Get full memory map in allocate_e820() 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, the 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 Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Borislav Petkov Reviewed-by: Tom Lendacky Acked-by: Ard Biesheuvel Link: https://lore.kernel.org/r/20230606142637.5171-3-kirill.shutemov@linux.intel.com --- 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 a0bfd31..cd77a7a 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 {