From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Borislav Petkov <bp@alien8.de>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Sean Christopherson <seanjc@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Joerg Roedel <jroedel@suse.de>, Ard Biesheuvel <ardb@kernel.org>,
Andi Kleen <ak@linux.intel.com>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
David Rientjes <rientjes@google.com>,
Vlastimil Babka <vbabka@suse.cz>,
Tom Lendacky <thomas.lendacky@amd.com>,
Thomas Gleixner <tglx@linutronix.de>,
Peter Zijlstra <peterz@infradead.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Ingo Molnar <mingo@redhat.com>,
Varad Gautam <varad.gautam@suse.com>,
Dario Faggioli <dfaggioli@suse.com>,
Dave Hansen <dave.hansen@intel.com>,
Brijesh Singh <brijesh.singh@amd.com>,
Mike Rapoport <rppt@kernel.org>,
David Hildenbrand <david@redhat.com>,
x86@kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev,
linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCHv4 2/8] efi/x86: Get full memory map in allocate_e820()
Date: Wed, 13 Apr 2022 14:45:23 +0300 [thread overview]
Message-ID: <20220413114523.5si2ywl7zlgestz5@box.shutemov.name> (raw)
In-Reply-To: <Ylae+bejPzRMPrDw@zn.tnic>
On Wed, Apr 13, 2022 at 11:59:21AM +0200, Borislav Petkov wrote:
> On Wed, Apr 06, 2022 at 02:43:37AM +0300, Kirill A. Shutemov wrote:
> > diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
> > index 01ddd4502e28..d18cac8ab436 100644
> > --- a/drivers/firmware/efi/libstub/x86-stub.c
> > +++ b/drivers/firmware/efi/libstub/x86-stub.c
> > @@ -569,30 +569,28 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext,
> > }
> >
> > static efi_status_t allocate_e820(struct boot_params *params,
> > + struct efi_boot_memmap *map,
> > struct setup_data **e820ext,
> > u32 *e820ext_size)
> > {
> > - unsigned long map_size, desc_size, map_key;
> > 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);
> > + 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;
> > + goto out;
>
> This looks weird. With the goto out of the way, this code turns into:
>
> status = alloc_e820ext(nr_e820ext, e820ext, e820ext_size);
> if (status != EFI_SUCCESS) {
> efi_bs_call(free_pool, *map->map);
> return EFI_SUCCESS;
> }
>
> I think you want to return status as above after having called
>
> efi_bs_call(free_pool, *map->map);
>
> ...
Ah. Right. I actually fix this in the next patch.
Will move it here.
--
Kirill A. Shutemov
next prev parent reply other threads:[~2022-04-13 11:43 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-05 23:43 [PATCHv4 0/8] mm, x86/cc: Implement support for unaccepted memory Kirill A. Shutemov
2022-04-05 23:43 ` [PATCHv4 1/8] mm: Add " Kirill A. Shutemov
2022-04-08 18:55 ` Dave Hansen
2022-04-09 15:54 ` Kirill A. Shutemov
2022-04-11 6:38 ` Dave Hansen
2022-04-11 10:07 ` Mike Rapoport
2022-04-13 11:40 ` Kirill A. Shutemov
2022-04-13 14:48 ` Mike Rapoport
2022-04-13 15:15 ` Kirill A. Shutemov
2022-04-13 20:06 ` Mike Rapoport
2022-04-11 8:47 ` David Hildenbrand
2022-04-08 19:04 ` David Hildenbrand
2022-04-08 19:11 ` Dave Hansen
2022-04-09 17:52 ` Kirill A. Shutemov
2022-04-11 6:41 ` Dave Hansen
2022-04-11 15:55 ` Borislav Petkov
2022-04-11 16:27 ` Dave Hansen
2022-04-11 18:55 ` Tom Lendacky
2022-04-12 8:15 ` David Hildenbrand
2022-04-12 16:08 ` Dave Hansen
2022-04-13 10:36 ` David Hildenbrand
2022-04-13 11:30 ` Kirill A. Shutemov
2022-04-13 11:32 ` David Hildenbrand
2022-04-13 15:36 ` Dave Hansen
2022-04-13 16:07 ` David Hildenbrand
2022-04-13 16:13 ` Dave Hansen
2022-04-13 16:24 ` Kirill A. Shutemov
2022-04-13 14:39 ` Mike Rapoport
2022-04-05 23:43 ` [PATCHv4 2/8] efi/x86: Get full memory map in allocate_e820() Kirill A. Shutemov
[not found] ` <Ylae+bejPzRMPrDw@zn.tnic>
2022-04-13 11:45 ` Kirill A. Shutemov [this message]
2022-04-05 23:43 ` [PATCHv4 3/8] efi/x86: Implement support for unaccepted memory Kirill A. Shutemov
2022-04-08 17:26 ` Dave Hansen
2022-04-09 19:41 ` Kirill A. Shutemov
2022-04-14 15:55 ` Borislav Petkov
2022-04-15 22:24 ` Borislav Petkov
2022-04-18 15:55 ` Kirill A. Shutemov
2022-04-18 16:38 ` Borislav Petkov
2022-04-18 20:24 ` Kirill A. Shutemov
2022-04-18 21:01 ` Borislav Petkov
2022-04-18 23:50 ` Kirill A. Shutemov
2022-04-19 7:39 ` Borislav Petkov
2022-04-19 15:30 ` Kirill A. Shutemov
2022-04-19 16:38 ` Dave Hansen
2022-04-19 19:23 ` Borislav Petkov
2022-04-21 12:26 ` Borislav Petkov
2022-04-22 0:21 ` Kirill A. Shutemov
2022-04-22 9:30 ` Borislav Petkov
2022-04-22 13:26 ` Kirill A. Shutemov
2022-04-05 23:43 ` [PATCHv4 4/8] x86/boot/compressed: Handle " Kirill A. Shutemov
2022-04-08 17:57 ` Dave Hansen
2022-04-09 20:20 ` Kirill A. Shutemov
2022-04-11 6:49 ` Dave Hansen
2022-04-05 23:43 ` [PATCHv4 5/8] x86/mm: Reserve unaccepted memory bitmap Kirill A. Shutemov
2022-04-08 18:08 ` Dave Hansen
2022-04-09 20:43 ` Kirill A. Shutemov
2022-04-05 23:43 ` [PATCHv4 6/8] x86/mm: Provide helpers for unaccepted memory Kirill A. Shutemov
2022-04-08 18:15 ` Dave Hansen
2022-04-08 19:21 ` Dave Hansen
2022-04-13 16:08 ` Kirill A. Shutemov
2022-04-05 23:43 ` [PATCHv4 7/8] x86/tdx: Unaccepted memory support Kirill A. Shutemov
2022-04-08 18:28 ` Dave Hansen
2022-04-05 23:43 ` [PATCHv4 8/8] mm/vmstat: Add counter for memory accepting Kirill A. Shutemov
2022-04-12 8:18 ` David Hildenbrand
2022-04-08 17:02 ` [PATCHv4 0/8] mm, x86/cc: Implement support for unaccepted memory Dave Hansen
2022-04-09 23:44 ` Kirill A. Shutemov
2022-04-21 12:29 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220413114523.5si2ywl7zlgestz5@box.shutemov.name \
--to=kirill@shutemov.name \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=dave.hansen@intel.com \
--cc=david@redhat.com \
--cc=dfaggioli@suse.com \
--cc=jroedel@suse.de \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-coco@lists.linux.dev \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=rppt@kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=varad.gautam@suse.com \
--cc=vbabka@suse.cz \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).