Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH 1/1] efi/efi_test: read RuntimeServicesSupported
To:     Ivan Hu <ivan.hu@canonical.com>, Ard Biesheuvel <ardb@kernel.org>
Cc:     linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
        Colin King <colin.king@canonical.com>,
        fwts-devel@lists.ubuntu.com
References: <20201127192051.1430-1-xypron.glpk@gmx.de>
From:   Heinrich Schuchardt <xypron.glpk@gmx.de>
Message-ID: <bb31dcbe-cf19-64c5-daa0-5eb84f1a3583@gmx.de>
Date:   Sat, 26 Dec 2020 11:16:22 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.5.1
MIME-Version: 1.0
In-Reply-To: <20201127192051.1430-1-xypron.glpk@gmx.de>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On 11/27/20 8:20 PM, Heinrich Schuchardt wrote:
> Since the UEFI 2.8A specification the UEFI enabled firmware provides a
> configuration table EFI_RT_PROPERTIES_TABLE which indicates which runtim=
e
> 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 =3D open("/dev/efi_test", O_RDWR);
>      ret =3D ioctl(fd, EFI_RUNTIME_GET_SUPPORTED_MASK, &mask);
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Hello Ard,

the patch has now been admitted to Linus' branch.

Could we, please, have this patch applied to the 5.10 long term release,
too.

Best regards

Heinrich

> ---
>   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 =3D 0;
> +
> +	supported_mask =3D (unsigned int *)arg;
> +
> +	if (put_user(efi.runtime_supported_mask, supported_mask))
> +		rv =3D -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, unsign=
ed 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
>