Re: ACK: [PATCH 1/1] efi/efi_test: read RuntimeServicesSupported

From: Ard Biesheuvel
Date: Sat Nov 28 2020 - 16:51:05 EST


On Fri, 27 Nov 2020 at 20:28, Colin Ian King <colin.king@xxxxxxxxxxxxx> wrote:
>
> On 27/11/2020 19:20, Heinrich Schuchardt wrote:
> > Since the UEFI 2.8A specification the UEFI enabled firmware provides a
> > configuration table EFI_RT_PROPERTIES_TABLE which indicates which runtime
> > services are enabled. The EFI stub reads this table and saves the value of
> > the field RuntimeServicesSupported internally.
> >
> > The Firmware Test Suite requires the value to determine if UEFI runtime
> > services are correctly implemented.
> >
> > With this patch an IOCTL call is provided to read the value of the field
> > RuntimeServicesSupported, e.g.
> >
> > #define EFI_RUNTIME_GET_SUPPORTED_MASK \
> > _IOR('p', 0x0C, unsigned int)
> > unsigned int mask;
> > fd = open("/dev/efi_test", O_RDWR);
> > ret = ioctl(fd, EFI_RUNTIME_GET_SUPPORTED_MASK, &mask);
> >
> > Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
> > ---
> > drivers/firmware/efi/test/efi_test.c | 16 ++++++++++++++++
> > drivers/firmware/efi/test/efi_test.h | 3 +++
> > 2 files changed, 19 insertions(+)
> >
> > diff --git a/drivers/firmware/efi/test/efi_test.c b/drivers/firmware/efi/test/efi_test.c
> > index ddf9eae396fe..47d67bb0a516 100644
> > --- a/drivers/firmware/efi/test/efi_test.c
> > +++ b/drivers/firmware/efi/test/efi_test.c
> > @@ -663,6 +663,19 @@ static long efi_runtime_query_capsulecaps(unsigned long arg)
> > return rv;
> > }
> >
> > +static long efi_runtime_get_supported_mask(unsigned long arg)
> > +{
> > + unsigned int __user *supported_mask;
> > + int rv = 0;
> > +
> > + supported_mask = (unsigned int *)arg;
> > +
> > + if (put_user(efi.runtime_supported_mask, supported_mask))
> > + rv = -EFAULT;
> > +
> > + return rv;
> > +}
> > +
> > static long efi_test_ioctl(struct file *file, unsigned int cmd,
> > unsigned long arg)
> > {
> > @@ -699,6 +712,9 @@ static long efi_test_ioctl(struct file *file, unsigned int cmd,
> >
> > case EFI_RUNTIME_RESET_SYSTEM:
> > return efi_runtime_reset_system(arg);
> > +
> > + case EFI_RUNTIME_GET_SUPPORTED_MASK:
> > + return efi_runtime_get_supported_mask(arg);
> > }
> >
> > return -ENOTTY;
> > diff --git a/drivers/firmware/efi/test/efi_test.h b/drivers/firmware/efi/test/efi_test.h
> > index f2446aa1c2e3..117349e57993 100644
> > --- a/drivers/firmware/efi/test/efi_test.h
> > +++ b/drivers/firmware/efi/test/efi_test.h
> > @@ -118,4 +118,7 @@ struct efi_resetsystem {
> > #define EFI_RUNTIME_RESET_SYSTEM \
> > _IOW('p', 0x0B, struct efi_resetsystem)
> >
> > +#define EFI_RUNTIME_GET_SUPPORTED_MASK \
> > + _IOR('p', 0x0C, unsigned int)
> > +
> > #endif /* _DRIVERS_FIRMWARE_EFI_TEST_H_ */
> > --
> > 2.29.2
> >
>
> Looks good to me. Thanks Heinrich.
>
> The EFI driver needs to be also updated in the linux kernel - has that
> fix been submitted or do you require the fwts team to do that?
>

This /is/ the EFI driver.

I'll take this as an acked-by but I'd like Ivan to chime in as well.