Re: [edk2-devel] [PATCH 01/11] OvmfPkg/Sec: Use correct prototype of ProcessLibraryConstructorList()

["Ard Biesheuvel" <ardb@kernel.org>]

On Wed, 7 Feb 2024 at 02:04, Laszlo Ersek <lersek@redhat.com> wrote:
>
> From: Ard Biesheuvel <ardb@kernel.org>
>
> The prototype of ProcessLibraryConstructorList(), which is generated by
> the build tools, depends on the boot phase, and SEC and PEI differ in
> this regard. However, OVMF's SEC implemention includes PeimEntryPoint.h
> and calls the PEI version of the protoype (passing NULL arguments),
> whereas the actual implementation observed by the compiler follows the
> SEC version, which takes VOID.
>
> The compiler usually doesn't spot the difference, but the LTO linker
> does, and throws an error:
>
> MdePkg/Include/Library/PeimEntryPoint.h:74:1: error: type of 'ProcessLibraryConstructorList' does not match original declaration [-Werror=lto-type-mismatch]
>    74 | ProcessLibraryConstructorList (
>       | ^
> Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG/AutoGen.c:310:1: note: type mismatch in parameter 1
>   310 | ProcessLibraryConstructorList (
>       | ^
> Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG/AutoGen.c:310:1: note: type 'void' should match type 'void *'
> Build/OvmfX64/RELEASE_GCC5/X64/OvmfPkg/Sec/SecMain/DEBUG/AutoGen.c:310:1: note: 'ProcessLibraryConstructorList' was previously declared here
>
> Fix this by dropping the #include, and providing a declaration of
> ProcessLibraryConstructorList() in SecMain.c
>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4643
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> Message-Id: <20240202182455.1535328-1-ardb+git@google.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Erdem Aktas <erdemaktas@google.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Michael Roth <michael.roth@amd.com>
> Cc: Min Xu <min.m.xu@intel.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=990
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Where appropriate in the series

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>


Thanks for cleaning this up.



> ---
>
> Notes:
>     Picked up Ard's patch from the list with no changes. The URL is
>     <https://edk2.groups.io/g/devel/message/115091>; see also the Message-Id
>     included by git-am in the commit message.
>
>     This patch is necessary at the front of the series; otherwise a
>     subsequent patch causes a build error (conflicting prototypes).
>
>  OvmfPkg/Sec/SecMain.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
> index 31da5d0ace51..7b7d4793984c 100644
> --- a/OvmfPkg/Sec/SecMain.c
> +++ b/OvmfPkg/Sec/SecMain.c
> @@ -11,7 +11,6 @@
>
>  #include <PiPei.h>
>
> -#include <Library/PeimEntryPoint.h>
>  #include <Library/BaseLib.h>
>  #include <Library/DebugLib.h>
>  #include <Library/BaseMemoryLib.h>
> @@ -39,6 +38,12 @@ typedef struct _SEC_IDT_TABLE {
>    IA32_IDT_GATE_DESCRIPTOR    IdtTable[SEC_IDT_ENTRY_COUNT];
>  } SEC_IDT_TABLE;
>
> +VOID
> +EFIAPI
> +ProcessLibraryConstructorList (
> +  VOID
> +  );
> +
>  VOID
>  EFIAPI
>  SecStartupPhase2 (
> @@ -844,7 +849,7 @@ SecCoreStartupWithStack (
>      InitializeCpuExceptionHandlers (NULL);
>    }
>
> -  ProcessLibraryConstructorList (NULL, NULL);
> +  ProcessLibraryConstructorList ();
>
>    if (!SevEsIsEnabled ()) {
>      //
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115458): https://edk2.groups.io/g/devel/message/115458
Mute This Topic: https://groups.io/mt/104210775/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-