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;
MIME-Version: 1.0
References: <CAG8fp8Te=oT1JJhTpOZvgWJrgcTq2DXan8UOVZ=KYCYNa8cKog@mail.gmail.com>
 <CAMj1kXG0q-pJEnvqJxxpecVqJcB2jk3rj7S4KNp728THM=de3Q@mail.gmail.com>
In-Reply-To: <CAMj1kXG0q-pJEnvqJxxpecVqJcB2jk3rj7S4KNp728THM=de3Q@mail.gmail.com>
From:   Akihiro Suda <suda.kyoto@gmail.com>
Date:   Mon, 29 May 2023 09:51:08 +0900
Message-ID: <CAG8fp8Tnfb5tt3Eea4+=zznZLxBfqwha_wkQcPDvU4QhcSckEw@mail.gmail.com>
Subject: Re: [PATCH] efi: bump efistub version from 1.1 to 3.0 for
 VZLinuxBootLoader compatibility
To:     Ard Biesheuvel <ardb@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        linux-efi@vger.kernel.org, Linux x86 <x86@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

> > The next version will be 7 (0b111).
>
> How so? If this is going to be a monotonically increasing sequence
> after all, it is still not a bit mask, and this change defeats the
> purpose.

Sorry, I forgot to append ", if it will retain compatibility with 0b11".

> I'll queue this as a fix, but I'm going to tweak the comment (and the
> commit log) a bit, if you don't mind

Thanks, please feel free to tweak that.

> I'd appreciate it if you still report this as a bug with Apple, though.

Reported via https://www.apple.com/feedback/macos.html


2023=E5=B9=B45=E6=9C=8829=E6=97=A5(=E6=9C=88) 3:48 Ard Biesheuvel <ardb@ker=
nel.org>:
>
> On Sun, 28 May 2023 at 09:59, Akihiro Suda <suda.kyoto@gmail.com> wrote:
> >
> > - LINUX_EFISTUB_MAJOR_VERSION is bumped from 1 (0b1) to 3 (0b11).
> >   The value is now a bitfield.
> >
>
> OK
>
> > The next version will be 7 (0b111).
>
> How so? If this is going to be a monotonically increasing sequence
> after all, it is still not a bit mask, and this change defeats the
> purpose.
>
> > - LINUX_EFISTUB_MINOR_VERSION is pinned to 0x0, because Apple's
> >   VZLinuxBootLoader [1] cannot boot a kernel with other minor version v=
alue [2],
> >   even though it does not use UEFI. Tested with macOS 13.4 (x86_64).
> >
> > [1] https://developer.apple.com/documentation/virtualization/vzlinuxboo=
tloader
> > [2] https://lore.kernel.org/linux-efi/CAG8fp8Teu4G9JuenQrqGndFt2Gy+V4Yg=
J=3DhN1xX7AD940YKf3A@mail.gmail.com/
> >
> > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D217485
> > Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
>
> I'll queue this as a fix, but I'm going to tweak the comment (and the
> commit log) a bit, if you don't mind
>
> I'd appreciate it if you still report this as a bug with Apple, though.
>
> Thanks,
> Ard.
>
> > ---
> >  include/linux/pe.h | 20 ++++++++++++++++++--
> >  1 file changed, 18 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/linux/pe.h b/include/linux/pe.h
> > index 5e1e11540870..ee5ade19b7eb 100644
> > --- a/include/linux/pe.h
> > +++ b/include/linux/pe.h
> > @@ -27,9 +27,25 @@
> >   * On x86, LoadImage() and StartImage() can be omitted if the EFI hand=
over
> >   * protocol is implemented, which can be inferred from the version,
> >   * handover_offset and xloadflags fields in the bootparams structure.
> > + *
> > + * Linux EFI stub v1.1 unconditionally enabled initrd command line loa=
der,
> > + * which was previously gated by CONFIG_EFI_GENERIC_STUB_INITRD_CMDLIN=
E_LOADER.
> > + *
> > + * Linux EFI stub v3.0 changed the major version to be a bitfield (0b1=
1).
> > + * The rightmost bit means that it is compatible with v1.0 at least.
> > + * The second rightmost bit means that initrd command line loader is e=
nabled.
> > + * So, there is no v2.0 (0b10), and the next version will be v7.0 (0b1=
11).
> > + */
> > +#define LINUX_EFISTUB_MAJOR_VERSION            0x3
> > +
> > +/*
> > + * LINUX_EFISTUB_MINOR_VERSION is pinned to 0x0, because Apple's
> > + * VZLinuxBootLoader cannot boot a kernel with other minor version val=
ue, even
> > + * though it does not use UEFI. Tested with macOS 13.4 (x86_64).
> > + *
> > + * https://lore.kernel.org/linux-efi/CAG8fp8Teu4G9JuenQrqGndFt2Gy+V4Yg=
J=3DhN1xX7AD940YKf3A@mail.gmail.com/
> >   */
> > -#define LINUX_EFISTUB_MAJOR_VERSION            0x1
> > -#define LINUX_EFISTUB_MINOR_VERSION            0x1
> > +#define LINUX_EFISTUB_MINOR_VERSION            0x0
> >
> >  /*
> >   * LINUX_PE_MAGIC appears at offset 0x38 into the MS-DOS header of EFI=
 bootable
> > --
> > 2.39.2