From patchwork Wed Dec 7 01:49:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 30585 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3156847wrr; Tue, 6 Dec 2022 17:51:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf6JROss/99joOcZHUYrQDk0Tn/T8l5bf5Tciru2nqNLZ5dMrkSeLBijNi8QsKAaNsgUCZMk X-Received: by 2002:a17:906:1e55:b0:7ad:a0cb:f79e with SMTP id i21-20020a1709061e5500b007ada0cbf79emr57246218ejj.458.1670377912918; Tue, 06 Dec 2022 17:51:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670377912; cv=none; d=google.com; s=arc-20160816; b=lBYNRNftDP39i86D6dWvjiOfi4jKU3Sz4VsWsRSCFQi0ePjfAIPRp5FLWo2rW95Xor 7bq5b+jd8XhB0ZbnUuWH9mUYGsA58ETCQk/rOf6A8/o5yFoFp7k9HjRXI05g21sX3rrK llQogFJnYJORsvXvDc/m7NCZIdyfnhaoWhsmbQzSz9Wg6vuHjb908diJt2dPErQPN2u5 Up5IukNuojZDeJgVG2Ml577b8pGZVfO4AAANJzx+xx8K4ACSudMeWgAUQaf+zmT65gRy 0uEMiyiOGSvE4TwA5onLQVzmP+LHNjKd4pQ7XiozMBocD/S8E8vStsr4yzlX06JQC+c+ tH3g== 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=3RNkOBOmz8kpmMAsTlTOkOKe/jwUeV5spebiVYy9bgk=; b=YgfLnNAA8KOjqk23MgWY/w5DScu8vW4Wl+N2XMz/qipe6ojrj+JzaSN2TP6dVqRI5b 1lkQ+S6RWau7oVq0+tbTTEVDbKa9PfecJjyz0kM9S83Ml0xygVkQ+4A2C2JS9Hxod2Ex pPUWiGqRP37GrL+oy6q4kKiPbmMR9WSHmbqcDwvy/FqOrLkMMQYCzuo/onWYaZE9CVPh 1Ck/Ge8Nmv8wCF+E7uOxdlY0Gb9kZMBUMyjcSd6YXHsbVebxBVkLQORcypmBBkw8jfm7 m2quOftC8JYqhugVKxVtvcXRcifUbmhwz+62xWzxGCyP1nRlU9HoJmP9k8XW8ya5ERDk j9ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IF5NgYFO; 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 dt3-20020a170907728300b00783ddc8b643si16061710ejc.317.2022.12.06.17.51.30; Tue, 06 Dec 2022 17:51:52 -0800 (PST) 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=IF5NgYFO; 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 S229886AbiLGBt5 (ORCPT + 99 others); Tue, 6 Dec 2022 20:49:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229678AbiLGBtw (ORCPT ); Tue, 6 Dec 2022 20:49:52 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79133528A4; Tue, 6 Dec 2022 17:49:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670377791; x=1701913791; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nVCMUIvJT1/LroShuz37RCPWW1tr+mbN1QZ4d2Ez7Bk=; b=IF5NgYFOEwrYXAsrXQkDrfdek7Krc+gGQTtWj4NN3f+dUGk4eTfndi+d VF4H42xiDAu/pnfwx9drc+f+gYyZTPALFxB33S6OmWo8FuHGvKued4oaq WufT5GPEKVxb/hRLWPS0Qn/hmRHZi1HoF8ULws1iZ2c5Mp7O2qn8S2wRN 3Xmg6rurNBPmZEtEdD+c3jO2KnIZQFd0/wP0op7qmNHp44guLN8QQA2ou A0wDtPL5dYNn7IM3bCBdu2/MS+7k1fLjo492+a9zWZzL4ElwCQrq+VEci /YLe2qb5PUQbL84YWfQunDVeyda2X86qgG7ipNpD8f7YKev94GdWtPdgB w==; X-IronPort-AV: E=McAfee;i="6500,9779,10553"; a="315494412" X-IronPort-AV: E=Sophos;i="5.96,223,1665471600"; d="scan'208";a="315494412" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2022 17:49:49 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10553"; a="646427591" X-IronPort-AV: E=Sophos;i="5.96,223,1665471600"; d="scan'208";a="646427591" Received: from puneets1-mobl.ger.corp.intel.com (HELO box.shutemov.name) ([10.252.38.123]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Dec 2022 17:49:41 -0800 Received: by box.shutemov.name (Postfix, from userid 1000) id 524FF109C88; Wed, 7 Dec 2022 04:49:39 +0300 (+03) From: "Kirill A. Shutemov" To: Borislav Petkov , Andy Lutomirski , 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 , Dave Hansen , 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: [PATCHv8 04/14] efi/x86: Get full memory map in allocate_e820() Date: Wed, 7 Dec 2022 04:49:23 +0300 Message-Id: <20221207014933.8435-5-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221207014933.8435-1-kirill.shutemov@linux.intel.com> References: <20221207014933.8435-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 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?1751518190743525752?= X-GMAIL-MSGID: =?utf-8?q?1751518190743525752?= 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 --- 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; - - 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 {