From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Arvind Sankar <nivedita@alum.mit.edu>
Cc: Ard Biesheuvel <ardb@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-efi <linux-efi@vger.kernel.org>,
Hans de Goede <hdegoede@redhat.com>,
Matthew Garrett <matthewgarrett@google.com>,
Ingo Molnar <mingo@kernel.org>, Andy Lutomirski <luto@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH 10/10] efi/libstub/x86: avoid thunking for native firmware calls
Date: Tue, 17 Dec 2019 08:32:39 +0000 [thread overview]
Message-ID: <CAKv+Gu9Ycs8JRvimxfFMRy=tQ0SqX3MYnv0VfUPVAE_Q1S0y1A@mail.gmail.com> (raw)
In-Reply-To: <20191215193054.GA2187004@rani.riverdale.lan>
On Sun, 15 Dec 2019 at 21:31, Arvind Sankar <nivedita@alum.mit.edu> wrote:
>
> On Sat, Dec 14, 2019 at 06:57:35PM +0100, Ard Biesheuvel wrote:
> >
> > @@ -232,7 +232,7 @@ static inline bool efi_is_native(void)
> > #define efi_table_attr(table, attr, instance) ({ \
> > __typeof__(((table##_t *)0)->attr) __ret; \
> > if (efi_is_native()) { \
> > - __ret = ((table##_t *)instance)->attr; \
> > + __ret = instance->attr; \
> > } else { \
> > __typeof__(((table##_32_t *)0)->attr) at; \
> > at = (((table##_32_t *)(unsigned long)instance)->attr); \
>
> Is there a reason we didn't remove this cast for native-mode earlier in
> the series?
>
Yes. In patch 9/10, I fix a couple of occurrences where the protocol
pointer is a void*, so without the cast, things break.
> > @@ -242,19 +242,25 @@ static inline bool efi_is_native(void)
> > })
> >
> > #define efi_call_proto(protocol, f, instance, ...) \
> > - __efi_early()->call((unsigned long) \
> > + efi_is_native() \
> > + ? instance->f(instance, ##__VA_ARGS__) \
> > + : efi64_thunk((unsigned long) \
> > efi_table_attr(protocol, f, instance), \
> > - instance, ##__VA_ARGS__)
> > + instance, ##__VA_ARGS__)
> >
> > #define efi_call_early(f, ...) \
> > - __efi_early()->call((unsigned long) \
> > + efi_is_native() \
> > + ? __efi_early()->boot_services->f(__VA_ARGS__) \
> > + : efi64_thunk((unsigned long) \
> > efi_table_attr(efi_boot_services, f, \
> > - __efi_early()->boot_services), __VA_ARGS__)
> > + __efi_early()->boot_services), __VA_ARGS__)
> >
> > #define efi_call_runtime(f, ...) \
> > - __efi_early()->call((unsigned long) \
> > + efi_is_native() \
> > + ? __efi_early()->runtime_services->f(__VA_ARGS__) \
> > + : efi64_thunk((unsigned long) \
> > efi_table_attr(efi_runtime_services, f, \
> > - __efi_early()->runtime_services), __VA_ARGS__)
> > + __efi_early()->runtime_services), __VA_ARGS__)
> >
> > extern bool efi_reboot_required(void);
> > extern bool efi_is_table_address(unsigned long phys_addr);
>
> For the efi_call macros, their definition should be enclosed in
> parentheses now that it's a ternary operator.
Ack
prev parent reply other threads:[~2019-12-17 8:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 17:57 [PATCH 00/10] efi/x86: confine type unsafe casting to mixed mode Ard Biesheuvel
2019-12-14 17:57 ` [PATCH 01/10] efi/libstub: remove unused __efi_call_early() macro Ard Biesheuvel
2019-12-14 17:57 ` [PATCH 02/10] efi/x86: rename efi_is_native() to efi_is_mixed() Ard Biesheuvel
2019-12-14 17:57 ` [PATCH 03/10] efi/libstub: use a helper to iterate over a EFI handle array Ard Biesheuvel
2019-12-14 20:32 ` Arvind Sankar
2019-12-14 20:40 ` Ard Biesheuvel
2019-12-14 21:04 ` Ard Biesheuvel
2019-12-14 21:11 ` Arvind Sankar
2019-12-14 21:07 ` Arvind Sankar
2019-12-14 17:57 ` [PATCH 04/10] efi/libstub: add missing apple_properties_protocol_t definition Ard Biesheuvel
2019-12-14 17:57 ` [PATCH 05/10] efi/libstub: distinguish between native/mixed not 32/64 bit Ard Biesheuvel
2019-12-14 19:46 ` Arvind Sankar
2019-12-14 19:49 ` Arvind Sankar
2019-12-14 19:54 ` Ard Biesheuvel
2019-12-14 20:13 ` Arvind Sankar
2019-12-14 20:27 ` Ard Biesheuvel
2019-12-14 21:17 ` Arvind Sankar
2019-12-14 21:30 ` Ard Biesheuvel
2019-12-14 22:14 ` Arvind Sankar
2019-12-14 22:14 ` Ard Biesheuvel
2019-12-14 23:02 ` Arvind Sankar
2019-12-14 17:57 ` [PATCH 06/10] efi/libstub/x86: use mixed mode helpers to populate efi_config Ard Biesheuvel
2019-12-14 17:57 ` [PATCH 07/10] efi/libstub: drop explicit 64-bit protocol definitions Ard Biesheuvel
2019-12-14 17:57 ` [PATCH 08/10] efi/libstub: use stricter typing for firmware function pointers Ard Biesheuvel
2019-12-14 17:57 ` [PATCH 09/10] efi/libstub: annotate firmware routines as __efiapi Ard Biesheuvel
2019-12-17 15:01 ` Brian Gerst
2019-12-14 17:57 ` [PATCH 10/10] efi/libstub/x86: avoid thunking for native firmware calls Ard Biesheuvel
2019-12-15 19:30 ` Arvind Sankar
2019-12-17 8:32 ` Ard Biesheuvel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKv+Gu9Ycs8JRvimxfFMRy=tQ0SqX3MYnv0VfUPVAE_Q1S0y1A@mail.gmail.com' \
--to=ard.biesheuvel@linaro.org \
--cc=ardb@kernel.org \
--cc=hdegoede@redhat.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=matthewgarrett@google.com \
--cc=mingo@kernel.org \
--cc=nivedita@alum.mit.edu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).