[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 3/3] x86/boot: Rewrite EFI start part in C


  • To: Frediano Ziglio <frediano.ziglio@xxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Tue, 24 Sep 2024 17:26:32 +0200
  • Autocrypt: addr=jbeulich@xxxxxxxx; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, "Daniel P. Smith" <dpsmith@xxxxxxxxxxxxxxxxxxxx>, Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx
  • Delivery-date: Tue, 24 Sep 2024 15:26:39 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

On 24.09.2024 17:21, Frediano Ziglio wrote:
> On Mon, Sep 23, 2024 at 3:26 PM Jan Beulich <jbeulich@xxxxxxxx> wrote:
>>
> 
> ... omissis ...
> 
>>
>>>>> --- a/xen/arch/x86/efi/stub.c
>>>>> +++ b/xen/arch/x86/efi/stub.c
>>>>> @@ -17,7 +17,8 @@
>>>>>   */
>>>>>
>>>>>  void __init noreturn efi_multiboot2(EFI_HANDLE ImageHandle,
>>>>> -                                    EFI_SYSTEM_TABLE *SystemTable)
>>>>> +                                    EFI_SYSTEM_TABLE *SystemTable,
>>>>> +                                    const char *cmdline)
>>>>>  {
>>>>>      static const CHAR16 __initconst err[] =
>>>>>          L"Xen does not have EFI code build in!\r\nSystem halted!\r\n";
>>>>
>>>> This, if not a separate change, wants mentioning in the description.
>>>> It's a related observation that this wasn't properly updated, but
>>>> nothing that necessarily needs doing here. Question is whether the
>>>> declaration of the function wouldn't better go into a header now in
>>>> the first place.
>>>
>>> I had the same though about a header. But currently there's no such
>>> header, I mean it should be able to be included by both stub.c and
>>> efi-boot.h which are both x86 only code so it should go in
>>> xen/arch/x86/ I suppose. Suggestions? Maybe a different solution would
>>> be to have a xen/arch/x86/efi/efi-boot-stub.h instead of
>>> xen/arch/x86/efi/stub.c ?
>>
>> It's not quite the right place, but maybe (ab)using asm/efibind.h would
>> be slightly better than introducing asm/efi.h just for a single decl?
>>
>> Jan
> 
> Okay, I found the comment on the header to place the declaration.
> 
> Kind of works... but the headers are very crazily depending on each
> other, the header change is
> 
> diff --git a/xen/arch/x86/include/asm/efibind.h
> b/xen/arch/x86/include/asm/efibind.h
> index bce02f3707..1fa5522a0d 100644
> --- a/xen/arch/x86/include/asm/efibind.h
> +++ b/xen/arch/x86/include/asm/efibind.h
> @@ -1,2 +1,13 @@
> #include <xen/types.h>
> +#include <xen/init.h>
> #include <asm/x86_64/efibind.h>
> +#include <efi/efidef.h>
> +#include <efi/eficapsule.h>
> +#include <efi/eficon.h>
> +#include <efi/efidevp.h>
> +#include <efi/efiapi.h>
> +
> +void __init efi_multiboot2(EFI_HANDLE ImageHandle,
> +                           EFI_SYSTEM_TABLE *SystemTable,
> +                           const char *cmdline);
> +
> 
> How does it sound ?

Hmm, no, not good at all. All these #include-s are against the purpose
of the header. We'll need asm/efi.h then, I think.

As an aside - you don't need xen/init.h here, as declarations shouldn't
have __init attributes.

Jan



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.