Re: [PATCH v6 07/16] PCI/AER: Initialize aer_err_info before using it

Ilpo Järvinen
2025-05-20T10:39:16Z

[-- Attachment #1: Type: text/plain, Size: 2941 bytes --]

On Mon, 19 May 2025, Bjorn Helgaas wrote:

> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Previously the struct aer_err_info "e_info" was allocated on the stack
> without being initialized, so it contained junk except for the fields we
> explicitly set later.
>
> Initialize "e_info" at declaration with a designated initializer list,
> which initializes the other members to zero.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/pcie/aer.c | 37 ++++++++++++++++---------------------
> 1 file changed, 16 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
> index 95a4cab1d517..40f003eca1c5 100644
> --- a/drivers/pci/pcie/aer.c
> +++ b/drivers/pci/pcie/aer.c
> @@ -1281,7 +1281,7 @@ static void aer_isr_one_error(struct aer_rpc *rpc,
> struct aer_err_source *e_src)

Unrelated to this change, these would fit on a single line.

Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

> {
> struct pci_dev *pdev = rpc->rpd;
> - struct aer_err_info e_info;
> + u32 status = e_src->status;
>
> pci_rootport_aer_stats_incr(pdev, e_src);
>
> @@ -1289,14 +1289,13 @@ static void aer_isr_one_error(struct aer_rpc *rpc,
> * There is a possibility that both correctable error and
> * uncorrectable error being logged. Report correctable error first.
> */
> - if (e_src->status & PCI_ERR_ROOT_COR_RCV) {
> - e_info.id = ERR_COR_ID(e_src->id);
> - e_info.severity = AER_CORRECTABLE;
> -
> - if (e_src->status & PCI_ERR_ROOT_MULTI_COR_RCV)
> - e_info.multi_error_valid = 1;
> - else
> - e_info.multi_error_valid = 0;
> + if (status & PCI_ERR_ROOT_COR_RCV) {
> + int multi = status & PCI_ERR_ROOT_MULTI_COR_RCV;
> + struct aer_err_info e_info = {
> + .id = ERR_COR_ID(e_src->id),
> + .severity = AER_CORRECTABLE,
> + .multi_error_valid = multi ? 1 : 0,
> + };
>
> if (find_source_device(pdev, &e_info)) {
> aer_print_source(pdev, &e_info, "");
> @@ -1304,18 +1303,14 @@ static void aer_isr_one_error(struct aer_rpc *rpc,
> }
> }
>
> - if (e_src->status & PCI_ERR_ROOT_UNCOR_RCV) {
> - e_info.id = ERR_UNCOR_ID(e_src->id);
> -
> - if (e_src->status & PCI_ERR_ROOT_FATAL_RCV)
> - e_info.severity = AER_FATAL;
> - else
> - e_info.severity = AER_NONFATAL;
> -
> - if (e_src->status & PCI_ERR_ROOT_MULTI_UNCOR_RCV)
> - e_info.multi_error_valid = 1;
> - else
> - e_info.multi_error_valid = 0;
> + if (status & PCI_ERR_ROOT_UNCOR_RCV) {
> + int fatal = status & PCI_ERR_ROOT_FATAL_RCV;
> + int multi = status & PCI_ERR_ROOT_MULTI_UNCOR_RCV;
> + struct aer_err_info e_info = {
> + .id = ERR_UNCOR_ID(e_src->id),
> + .severity = fatal ? AER_FATAL : AER_NONFATAL,
> + .multi_error_valid = multi ? 1 : 0,
> + };
>
> if (find_source_device(pdev, &e_info)) {
> aer_print_source(pdev, &e_info, "");
>

--
i.