From: Kees Cook <keescook@chromium.org>
To: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Cc: ardb@kernel.org, tony.luck@intel.com, matt@codeblueprint.co.uk,
liming.gao@intel.com, linux-efi@vger.kernel.org
Subject: Re: [PATCH v6 1/2] efi: Add 'nr_config_table' variable in efi structure
Date: Fri, 13 Mar 2020 20:23:37 -0700 [thread overview]
Message-ID: <202003132023.68BFCB0@keescook> (raw)
In-Reply-To: <20200312011324.70701-1-qiuxu.zhuo@intel.com>
On Thu, Mar 12, 2020 at 09:13:24AM +0800, Qiuxu Zhuo wrote:
> The 'nr_config_table' and 'config_table' (already in efi structure)
> in efi structure provide a way for some driver(e.g. capsule-pstore
> goes through the configuration table to extract crash capsules to
> aid in debugging) to iterate over the EFI configuration table array.
>
> Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
> ---
> arch/x86/platform/efi/efi.c | 1 +
> drivers/firmware/efi/arm-init.c | 4 +++-
> drivers/firmware/efi/efi.c | 1 +
> include/linux/efi.h | 1 +
> 4 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
> index ae923ee8e2b4..2f3065905e8a 100644
> --- a/arch/x86/platform/efi/efi.c
> +++ b/arch/x86/platform/efi/efi.c
> @@ -456,6 +456,7 @@ void __init efi_init(void)
> return;
>
> efi.config_table = (unsigned long)efi.systab->tables;
> + efi.nr_config_table = (unsigned long)efi.systab->nr_tables;
> efi.fw_vendor = (unsigned long)efi.systab->fw_vendor;
> efi.runtime = (unsigned long)efi.systab->runtime;
>
> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index d99f5b0c8a09..f2e2e1c1624b 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -143,8 +143,10 @@ static int __init uefi_init(void)
> sizeof(efi_config_table_t),
> arch_tables);
>
> - if (!retval)
> + if (!retval) {
> efi.config_table = (unsigned long)efi.systab->tables;
> + efi.nr_config_table = (unsigned long)efi.systab->nr_tables;
> + }
>
> early_memunmap(config_tables, table_size);
> out:
> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> index 621220ab3d0e..1b599941bad3 100644
> --- a/drivers/firmware/efi/efi.c
> +++ b/drivers/firmware/efi/efi.c
> @@ -46,6 +46,7 @@ struct efi __read_mostly efi = {
> .fw_vendor = EFI_INVALID_TABLE_ADDR,
> .runtime = EFI_INVALID_TABLE_ADDR,
> .config_table = EFI_INVALID_TABLE_ADDR,
> + .nr_config_table = 0,
> .esrt = EFI_INVALID_TABLE_ADDR,
> .properties_table = EFI_INVALID_TABLE_ADDR,
> .mem_attr_table = EFI_INVALID_TABLE_ADDR,
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index 7efd7072cca5..13b3fe069f1f 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -913,6 +913,7 @@ extern struct efi {
> unsigned long fw_vendor; /* fw_vendor */
> unsigned long runtime; /* runtime table */
> unsigned long config_table; /* config tables */
> + unsigned long nr_config_table; /* the number of config tables */
nit: please use a tab character before the comment to get correct
alignemnt.
> unsigned long esrt; /* ESRT table */
> unsigned long properties_table; /* properties table */
> unsigned long mem_attr_table; /* memory attributes table */
> --
> 2.17.1
>
--
Kees Cook
next prev parent reply other threads:[~2020-03-14 3:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 1:13 [PATCH v6 1/2] efi: Add 'nr_config_table' variable in efi structure Qiuxu Zhuo
2020-03-14 3:23 ` Kees Cook [this message]
2020-03-15 13:20 ` Zhuo, Qiuxu
2020-03-25 17:34 ` Ard Biesheuvel
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=202003132023.68BFCB0@keescook \
--to=keescook@chromium.org \
--cc=ardb@kernel.org \
--cc=liming.gao@intel.com \
--cc=linux-efi@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=qiuxu.zhuo@intel.com \
--cc=tony.luck@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.