From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 64BE428EE for ; Wed, 13 Apr 2022 11:43:52 +0000 (UTC) Received: by mail-lj1-f172.google.com with SMTP id o16so1853842ljp.3 for ; Wed, 13 Apr 2022 04:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=zEOvVQ8ODptnK3WwFBWfeYgjoqgGL18PHLUqQQVknZE=; b=IbDWQ6exmcYIF5xlYm/WQBVMxiI8gzxIlrURJHj4gun+Tfehojc623NglyuXPeXtem s3kj95CbN5IpEZiShOZ3p7KWR6T1IoH8Vve+GD9QG5gDR+5bRDwWfyK3ITy5zWsiBXXA OClXS6PkEVcFzkwMiMHnkuffDW2E3/DZN0BKFCw6B5FpphArioxoqdyai/uUZbJshTQY UxLKrifaPneqZ6/twcwWr+6+uR4Uw0E+Tmq9sBS9A0B1B5p1Ou835VDKJ3PdD3aX+Jza YPiSrtykL2uJOyQxThOQ0kd3qKwpkxfSZFANqbL7zFkBJBPclnW6dbKo1eZuEPcXqeUR 451Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=zEOvVQ8ODptnK3WwFBWfeYgjoqgGL18PHLUqQQVknZE=; b=7hNpYz75b3Wta7BaXApr5WP3utiF/y3uQ2KA+XAJugRVY+qUHUgU9CXP1UTiYc5nL+ UntXfhq9ALQ1OoBVvvToNY4sZ+gmBirGv81Kjznay9qDkROVzraSjek2ifkV5vrswjdg 4l/IyQaCiM5FJbPUW17ZDlALZlMwS9nLCwhkUawnBtrE19zMj4tNfJsosZh5Xnq5kzOK 38fRaLLyxB2ffgd7mRhD9CKeAJz00L92Qfj3g0T8E3QmzUQwYdKv6i8Vwg3v68Zhvg5y bxqrOt88h9w9fAncAi/MXTvDNL5yfnK8uN2fioXWmZ63WLYHy7NEgH4vdv3PAdmD8sWC 3CpQ== X-Gm-Message-State: AOAM531du5ixQr/tsSEQaMVN6juNarmSI+RPBqMFuc8hgS90IoXfvVKF VzrtGy3p/JvHVYbiokkZTfJaxw== X-Google-Smtp-Source: ABdhPJxSc2DiuJ8ztlJC/7du5pH7HUiYvKu1fv1sdTG2x0jctLC+Bp5dpszyE0eMhivO+pDlpFDILQ== X-Received: by 2002:a05:651c:1781:b0:247:daa7:4358 with SMTP id bn1-20020a05651c178100b00247daa74358mr25671523ljb.477.1649850230444; Wed, 13 Apr 2022 04:43:50 -0700 (PDT) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id j4-20020a05651231c400b0044ac20061ecsm4099397lfe.128.2022.04.13.04.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 04:43:49 -0700 (PDT) Received: by box.localdomain (Postfix, from userid 1000) id B7F8010369B; Wed, 13 Apr 2022 14:45:23 +0300 (+03) Date: Wed, 13 Apr 2022 14:45:23 +0300 From: "Kirill A. Shutemov" To: Borislav Petkov Cc: "Kirill A. Shutemov" , Andy Lutomirski , Sean Christopherson , Andrew Morton , Joerg Roedel , Ard Biesheuvel , Andi Kleen , Kuppuswamy Sathyanarayanan , David Rientjes , Vlastimil Babka , Tom Lendacky , Thomas Gleixner , Peter Zijlstra , Paolo Bonzini , Ingo Molnar , Varad Gautam , Dario Faggioli , Dave Hansen , Brijesh Singh , Mike Rapoport , David Hildenbrand , 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() Message-ID: <20220413114523.5si2ywl7zlgestz5@box.shutemov.name> References: <20220405234343.74045-1-kirill.shutemov@linux.intel.com> <20220405234343.74045-3-kirill.shutemov@linux.intel.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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