From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39EA1C77B75 for ; Mon, 8 May 2023 07:19:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB64A6B0078; Mon, 8 May 2023 03:19:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B66986B007D; Mon, 8 May 2023 03:19:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A55396B007E; Mon, 8 May 2023 03:19:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 96EDD6B0078 for ; Mon, 8 May 2023 03:19:55 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 63EFA1C7386 for ; Mon, 8 May 2023 07:19:55 +0000 (UTC) X-FDA: 80766238350.17.C00C754 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id 7CE1F1C0004 for ; Mon, 8 May 2023 07:19:53 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="AVS+L7/p"; spf=pass (imf21.hostedemail.com: domain of ardb@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ardb@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683530393; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MuCrFG+6XI9zHt/XFSgNbP6lGV8sGfC9nxx+jDBSzgk=; b=XhYkVo1/KjgaVv6ng6FD0IXQpTJxM3dQZf+JenKYfgMI2DWaU8E93obpgApTc64UJvI4/c nDNckHToGsjGx03UH/TAtja1GHIGwWY75lKJ2iLA04nBu4tBPzuQ9utN5wcGPemdsf3imv RiuGvrq+C3+izO3zZILtpClTlAn+wDg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683530393; a=rsa-sha256; cv=none; b=LHLQVcgYTgALAUDP4M+bq7mAoItQ8kflKNAtOjb+S5eREYD8TlWWi/jy1r7Cmv7ZlmAAj8 6MxU0X0Y+naYmXRSt5TscLpGiAsLjWW8oIk9Fk+6h4FU8Fnk6/GUNKLidFfbg7xftHUYYS kKxVE0JmxyNhPDSZG2kXvp3nogKa2uw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="AVS+L7/p"; spf=pass (imf21.hostedemail.com: domain of ardb@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ardb@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 62C2861FF8 for ; Mon, 8 May 2023 07:19:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 510AEC433A0 for ; Mon, 8 May 2023 07:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683530391; bh=6rOQ5NbJZcxzZSxkaCY+XurJ69PAlQjGw84WzWS8G1Q=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=AVS+L7/pJIeUn0n9W87kFXUcETAPzGxN1m4r3j+rxHh93FZ+1kjOn8qxRwvpgwW4D kQdYGkurJwrrrIlYczUphQq37LlzvhJp/N5CMEzYZVmiGUkfe7q0l6C0xEH5dUlpl1 kPrXbyapvWYUWgJwTrrcklDJEpiQseQNMtwdBv/tFCepoMTAUIsBZpGAs1/2BF8wQO ACqilnqVQBBkMBURdaWjbNl7U32u7zfWQlyHqe2MBNzNg79/030jTKztqI9qQz3+jt TVK8xaCXS/KfhhE2LChb/9+HDLoIrXSJuwkeNIDEa2rR5XEQLkHHFKMVTozoFdzN6C F0mWb9E/MAZ7Q== Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-4efe8991b8aso4793219e87.0 for ; Mon, 08 May 2023 00:19:51 -0700 (PDT) X-Gm-Message-State: AC+VfDxrFSNnVclZMxZZ2nZm01v+WTdyVv0RtB0kzz0DCTnnfT1p+/5z M0UBhYgOXgrOBtygex/xBC7+caMF96R1W8u7DdQ= X-Google-Smtp-Source: ACHHUZ6Lr2KTv0yM1wNOHpOdrJL0IajT8cMul1NTtl5PaGquY5kQh44lWRaZjtVgvX94CbeoAVX2DSx6ApFYn5Q9v1Q= X-Received: by 2002:ac2:511d:0:b0:4f1:4040:8143 with SMTP id q29-20020ac2511d000000b004f140408143mr2574670lfb.60.1683530389163; Mon, 08 May 2023 00:19:49 -0700 (PDT) MIME-Version: 1.0 References: <20230507234618.18067-1-kirill.shutemov@linux.intel.com> <20230507234618.18067-3-kirill.shutemov@linux.intel.com> In-Reply-To: <20230507234618.18067-3-kirill.shutemov@linux.intel.com> From: Ard Biesheuvel Date: Mon, 8 May 2023 09:19:37 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCHv10 02/11] efi/x86: Get full memory map in allocate_e820() To: "Kirill A. Shutemov" Cc: Borislav Petkov , Andy Lutomirski , Dave Hansen , Sean Christopherson , Andrew Morton , Joerg Roedel , 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, Borislav Petkov Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: 9cr4pugi9fuznrsi3a8cxwwpis81wegn X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7CE1F1C0004 X-Rspam-User: X-HE-Tag: 1683530393-929493 X-HE-Meta: U2FsdGVkX1+Y+hmblqjFqcwWqXKgX6f1He08VooPvzPhDplFbU0rNAt9oq94ROc4ArjNe4P8EmFAqFH5OG1xr9EQbS2vdfnkmd3/a4mfe+sP5JmLs2Aq3IFgSdR6bSlvTRqmaflOjnBn7vllLSsQmi0lJpnEonXoY/gzsbFncsSCw8xVMo/4bPNOmmbyP+7JgzNQcF3O30nEwqMFGqnH3a2nPbtaEbcKH3NNYb78YPlMw/NdLRkpKn1bxPmyvwUSvyKsohycf6Zs/nVDCErutP3TwQ7/uiAv3kb8+UeC3Cr4oH99rDzRohpyKz6fTsm3Fa9eXXQDDFvy+E4tzIetplYoRGJCMqvhphqxevKcAjoYOOeoMqkymKN1RXV/24vFqHL4hlFk9ggnV8HGY5Xl/bOfay1qaUB6M7Ousjuc/VbQrpo9oK0ZyV9xpKBivYwTMR55zJo7+ptvqu1qjt4KNuxSMNa60sk5phUtB4eTkJLVe0AaOxP330PQ3vAYCU69IfBkTyzhiKnvmhNCcVMU0oXnWftc0AQj5vIMwZhw0Zk4DnEKsaKeiItc6RwDrhiXxXHWYXQq8LUPlOfBuLLcsnxDZmV1skXoRqJ59kfMcCCrnNrH8Fb82iQV1LrAaqUCjbbt4HYrMJ/2Kc+Zxaw5ty1+8IG24Tnlf4+2MCI1/Ea2RloDQKK4DoHkTc0CXaZTSvpF29p+Pvm3C0gXIBTahhgHMiPPczIZiz3bzeYdRv2ZMdzkPcsQD1FvqQt3CgYdrnk2hRghoqgNMx4OvGYR2x+TePIFyUvK3PJa/xC1nhLvPiJ5oYfrake/9u4G7y/Wx1GtmMk6kgFkb0eSbimbzQBoLVsT3WyHLAEnzlMGpt5Fv8w7UfMYPcVYo5g+dn7Trt7rYFheUt+WKHbKFX5s2c6MswQZyDKVwCDXqFwD4Jr839A+mypxYAg/T+ghbEHEkUiiqtdJ95ZE9bT5e7V +nwfWEA8 HY4p1ZrFkTAeMueCoZ1SL1kgE6bCT1ZIOt0k9Aq6xKeHB1x0UpaR5pUdDwX0kzIdIA2gGkvNL0VGT8CSpNt+i3gLP0uN78v02IjogUebksz6dfAKEcOSHv2Tgzot0XfzK24TH60J6U8ICwkG3Ho+nrLPKb1wQ6BAVsJtVSebfc514hqZ+BavdRB8AiJwJfq/US4wsYzcaSuKBFxwuntukBktvgPhlBvtvsnAvqnAe7fcKHOKITd0FpPXr2CulCgvcVPybdcGdCTvtDPbmg7cWoNvnpQoZvAigXk6BUCDWw+992gjz7Oa36Vp5cBqepdQRuRRIJJahae7ktQy5yuzXYvsnp6077ObXDATzMMEcM0gW/ehSRNjdBaQhDGLAb/qmNoxPhSYmnbhvPJuYHuFbZW5HpFdbJLVh7hP1d7W2vpLLmHYR2XjzkqXMuvKcMPkkcvHz X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, 8 May 2023 at 01:46, Kirill A. Shutemov wrote: > > 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 > --- > 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 { > -- > 2.39.3 >