On Mon, May 09, 2022 at 06:14:41PM +0000, Mohamed Khalfella wrote:
> PCI AER stats counters sysfs attributes need to iterate over
> stats counters instead of stats names. Also, added a build
> time check to make sure all counters have entries in strings
> array.
>
> Fixes: 0678e3109a3c ("PCI/AER: Simplify __aer_print_error()")
> Cc: stable@xxxxxxxxxxxxxxx
> Reported-by: Meeta Saggi <msaggi@xxxxxxxxxxxxxxx>
> Signed-off-by: Mohamed Khalfella <mkhalfella@xxxxxxxxxxxxxxx>
> Reviewed-by: Meeta Saggi <msaggi@xxxxxxxxxxxxxxx>
> Reviewed-by: Eric Badger <ebadger@xxxxxxxxxxxxxxx>
I added some info about why we need this to the commit log and applied
to pci/err for v5.20. Thank you!
> ---
> drivers/pci/pcie/aer.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
> index 9fa1f97e5b27..ce99a6d44786 100644
> --- a/drivers/pci/pcie/aer.c
> +++ b/drivers/pci/pcie/aer.c
> @@ -533,7 +533,7 @@ static const char *aer_agent_string[] = {
> u64 *stats = pdev->aer_stats->stats_array; \
> size_t len = 0; \
> \
> - for (i = 0; i < ARRAY_SIZE(strings_array); i++) { \
> + for (i = 0; i < ARRAY_SIZE(pdev->aer_stats->stats_array); i++) {\
> if (strings_array[i]) \
> len += sysfs_emit_at(buf, len, "%s %llu\n", \
> strings_array[i], \
> @@ -1342,6 +1342,11 @@ static int aer_probe(struct pcie_device *dev)
> struct device *device = &dev->device;
> struct pci_dev *port = dev->port;
>
> + BUILD_BUG_ON(ARRAY_SIZE(aer_correctable_error_string) <
> + AER_MAX_TYPEOF_COR_ERRS);
> + BUILD_BUG_ON(ARRAY_SIZE(aer_uncorrectable_error_string) <
> + AER_MAX_TYPEOF_UNCOR_ERRS);
> +
> /* Limit to Root Ports or Root Complex Event Collectors */
> if ((pci_pcie_type(port) != PCI_EXP_TYPE_RC_EC) &&
> (pci_pcie_type(port) != PCI_EXP_TYPE_ROOT_PORT))
> --
> 2.29.0
>
