Received-SPF: pass (google.com: domain of linux-kernel+bounces-111458-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240322110058.557329-1-kazuma-kondo@nec.com>
In-Reply-To: <20240322110058.557329-1-kazuma-kondo@nec.com>
From: Ard Biesheuvel <ardb@kernel.org>
Date: Fri, 22 Mar 2024 14:17:55 +0100
Message-ID: <CAMj1kXFSpF0YzwtgER11ocBrhjyG0Us7=kp7a92tDm3aZy=WrA@mail.gmail.com>
Subject: Re: [PATCH] efi/libstub: fix efi_random_alloc() to allocate memory at
 alloc_min or higher address
To: =?UTF-8?B?S09ORE8gS0FaVU1BKOi/keiXpCDlkoznnJ8p?= <kazuma-kondo@nec.com>
Cc: "linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>, 
	"tomenglund26@gmail.com" <tomenglund26@gmail.com>, 
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, 22 Mar 2024 at 12:01, KONDO KAZUMA(=E8=BF=91=E8=97=A4=E3=80=80=E5=
=92=8C=E7=9C=9F) <kazuma-kondo@nec.com> wrote:
>
> Following warning is sometimes observed while booting my servers:
>   [    3.594838] DMA: preallocated 4096 KiB GFP_KERNEL pool for atomic al=
locations
>   [    3.602918] swapper/0: page allocation failure: order:10, mode:0xcc1=
(GFP_KERNEL|GFP_DMA), nodemask=3D(null),cpuset=3D/,mems_allowed=3D0-1
>   ...
>   [    3.851862] DMA: preallocated 1024 KiB GFP_KERNEL|GFP_DMA pool for a=
tomic allocation
>
> If 'nokaslr' boot option is set, the warning always happens.
>
> On x86, ZONE_DMA is small zone at the first 16MB of physical address
> space. When this problem happens, most of that space seems to be used
> by decompressed kernel. Thereby, there is not enough space at DMA_ZONE
> to meet the request of DMA pool allocation.
>
> The commit 2f77465b05b1 ("x86/efistub: Avoid placing the kernel below LOA=
D_PHYSICAL_ADDR")
> tried to fix this problem by introducing lower bound of allocation.
>
> But the fix is not complete.
>
> efi_random_alloc() allocates pages by following steps.
> 1. Count total available slots ('total_slots')
> 2. Select a slot ('target_slot') to allocate randomly
> 3. Calculate a starting address ('target') to be included target_slot
> 4. Allocate pages, which starting address is 'target'
>
> In step 1, 'alloc_min' is used to offset the starting address of
> memory chunk. But in step 3 'alloc_min' is not considered at all.
> As the result, 'target' can be miscalculated and become lower
> than 'alloc_min'.
>
> When KASLR is disabled, 'target_slot' is always 0 and
> the problem happens everytime if the EFI memory map of the system
> meets the condition.
>
> Fix this problem by calculating 'target' considering 'alloc_min'.
>
> Cc: linux-efi@vger.kernel.org
> Cc: Tom Englund <tomenglund26@gmail.com>
> Cc: linux-kernel@vger.kernel.org
> Fixes: 2f77465b05b1 ("x86/efistub: Avoid placing the kernel below LOAD_PH=
YSICAL_ADDR")
> Signed-off-by: Kazuma Kondo <kazuma-kondo@nec.com>

Hello Kazuma Kondo,

Thanks for your patch. I will take it as a fix.

You sent the same patch twice, right? Is there any difference between the t=
wo?


> ---
>  drivers/firmware/efi/libstub/randomalloc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/randomalloc.c b/drivers/firmwar=
e/efi/libstub/randomalloc.c
> index 4e96a855fdf4..7e1852859550 100644
> --- a/drivers/firmware/efi/libstub/randomalloc.c
> +++ b/drivers/firmware/efi/libstub/randomalloc.c
> @@ -120,7 +120,7 @@ efi_status_t efi_random_alloc(unsigned long size,
>                         continue;
>                 }
>
> -               target =3D round_up(md->phys_addr, align) + target_slot *=
 align;
> +               target =3D round_up(max(md->phys_addr, alloc_min), align)=
 + target_slot * align;
>                 pages =3D size / EFI_PAGE_SIZE;
>
>                 status =3D efi_bs_call(allocate_pages, EFI_ALLOCATE_ADDRE=
SS,
> --
> 2.39.3