From: Karolina Stolarek <karolina.stolarek@oracle.com>
To: Jon Pan-Doh <pandoh@google.com>, Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org,
"Martin Petersen" <martin.petersen@oracle.com>,
"Ben Fuller" <ben.fuller@oracle.com>,
"Drew Walton" <drewwalton@microsoft.com>,
"Anil Agrawal" <anilagrawal@meta.com>,
"Tony Luck" <tony.luck@intel.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Sathyanarayanan Kuppuswamy"
<sathyanarayanan.kuppuswamy@linux.intel.com>,
"Lukas Wunner" <lukas@wunner.de>,
"Jonathan Cameron" <Jonathan.Cameron@huawei.com>
Subject: Re: [PATCH v2 5/8] PCI/AER: Introduce ratelimit for error logs
Date: Mon, 17 Feb 2025 12:29:43 +0100 [thread overview]
Message-ID: <ba1b05d1-d77e-4f35-af1c-836fc881135d@oracle.com> (raw)
In-Reply-To: <20250214023543.992372-6-pandoh@google.com>
On 14/02/2025 03:35, Jon Pan-Doh wrote:
> Spammy devices can flood kernel logs with AER errors and slow/stall
> execution. Add per-device ratelimits for AER errors (correctable and
> uncorrectable). Set the default rate to the default kernel ratelimit
> (10 per 5s).
I'd rephrase the last sentence to say "Add per-device ratelimits for AER
correctable and uncorrectable errors that use the kernel defaults (10
bursts per 5s)", but it's just a nit.
Overall, it looks good to me:
Reviewed-by: Karolina Stolarek <karolina.stolarek@oracle.com>
>
> Tested using aer-inject[1]. Sent 11 AER errors. Observed 10 errors logged
> while AER stats (cat /sys/bus/pci/devices/<dev>/aer_dev_correctable) show
> true count of 11.
>
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git
>
> Signed-off-by: Jon Pan-Doh <pandoh@google.com>
> ---
> drivers/pci/pcie/aer.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
> index b4f902fd5ef6..c5b5381e2930 100644
> --- a/drivers/pci/pcie/aer.c
> +++ b/drivers/pci/pcie/aer.c
> @@ -28,6 +28,7 @@
> #include <linux/interrupt.h>
> #include <linux/delay.h>
> #include <linux/kfifo.h>
> +#include <linux/ratelimit.h>
> #include <linux/slab.h>
> #include <acpi/apei.h>
> #include <acpi/ghes.h>
> @@ -88,6 +89,10 @@ struct aer_report {
> u64 rootport_total_cor_errs;
> u64 rootport_total_fatal_errs;
> u64 rootport_total_nonfatal_errs;
> +
> + /* Ratelimits for errors */
> + struct ratelimit_state cor_log_ratelimit;
> + struct ratelimit_state uncor_log_ratelimit;
> };
>
> #define AER_LOG_TLP_MASKS (PCI_ERR_UNC_POISON_TLP| \
> @@ -378,6 +383,10 @@ void pci_aer_init(struct pci_dev *dev)
> return;
>
> dev->aer_report = kzalloc(sizeof(struct aer_report), GFP_KERNEL);
> + ratelimit_state_init(&dev->aer_report->cor_log_ratelimit,
> + DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);
> + ratelimit_state_init(&dev->aer_report->uncor_log_ratelimit,
> + DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);
>
> /*
> * We save/restore PCI_ERR_UNCOR_MASK, PCI_ERR_UNCOR_SEVER,
> @@ -697,6 +706,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info,
> {
> int layer, agent;
> int id = pci_dev_id(dev);
> + struct ratelimit_state *ratelimit;
>
> if (!info->status) {
> pci_err(dev, "PCIe Bus Error: severity=%s, type=Inaccessible, (Unregistered Agent ID)\n",
> @@ -704,6 +714,14 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info,
> goto out;
> }
>
> + if (info->severity == AER_CORRECTABLE)
> + ratelimit = &dev->aer_report->cor_log_ratelimit;
> + else
> + ratelimit = &dev->aer_report->uncor_log_ratelimit;
> +
> + if (!__ratelimit(ratelimit))
> + return;
> +
> layer = AER_GET_LAYER_ERROR(info->severity, info->status);
> agent = AER_GET_AGENT(info->severity, info->status);
>
> @@ -749,12 +767,15 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity,
> u32 status, mask;
> const char *level;
> struct aer_err_info info;
> + struct ratelimit_state *ratelimit;
>
> if (aer_severity == AER_CORRECTABLE) {
> + ratelimit = &dev->aer_report->cor_log_ratelimit;
> status = aer->cor_status;
> mask = aer->cor_mask;
> level = KERN_WARNING;
> } else {
> + ratelimit = &dev->aer_report->uncor_log_ratelimit;
> status = aer->uncor_status;
> mask = aer->uncor_mask;
> tlp_header_valid = status & AER_LOG_TLP_MASKS;
> @@ -772,6 +793,9 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity,
>
> pci_dev_aer_stats_incr(dev, &info);
>
> + if (!__ratelimit(ratelimit))
> + return;
> +
> aer_printk(level, dev, "aer_status: 0x%08x, aer_mask: 0x%08x\n", status, mask);
> __aer_print_error(dev, &info, level);
> aer_printk(level, dev, "aer_layer=%s, aer_agent=%s\n",
next prev parent reply other threads:[~2025-02-17 11:30 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 2:35 [PATCH v2 0/8] Rate limit AER logs Jon Pan-Doh
2025-02-14 2:35 ` [PATCH v2 1/8] PCI/AER: Remove aer_print_port_info Jon Pan-Doh
2025-03-04 18:32 ` Bjorn Helgaas
2025-03-05 1:04 ` Jon Pan-Doh
2025-03-05 22:35 ` Bjorn Helgaas
2025-03-06 1:32 ` Jon Pan-Doh
2025-03-07 0:02 ` Bjorn Helgaas
2025-02-14 2:35 ` [PATCH v2 2/8] PCI/AER: Use the same log level for all messages Jon Pan-Doh
2025-02-17 11:25 ` Karolina Stolarek
2025-02-19 2:48 ` Jon Pan-Doh
2025-02-24 11:26 ` Karolina Stolarek
2025-02-28 22:25 ` Jon Pan-Doh
2025-03-04 18:59 ` Bjorn Helgaas
2025-03-07 12:04 ` Karolina Stolarek
2025-03-13 21:15 ` Jon Pan-Doh
2025-02-14 2:35 ` [PATCH v2 3/8] PCI/AER: Move AER stat collection out of __aer_print_error Jon Pan-Doh
2025-02-17 11:29 ` Karolina Stolarek
2025-02-19 2:48 ` Jon Pan-Doh
2025-02-24 11:26 ` Karolina Stolarek
2025-02-14 2:35 ` [PATCH v2 4/8] PCI/AER: Rename struct aer_stats to aer_report Jon Pan-Doh
2025-02-17 11:29 ` Karolina Stolarek
2025-02-19 2:49 ` Jon Pan-Doh
2025-02-14 2:35 ` [PATCH v2 5/8] PCI/AER: Introduce ratelimit for error logs Jon Pan-Doh
2025-02-17 11:29 ` Karolina Stolarek [this message]
2025-02-19 2:49 ` Jon Pan-Doh
2025-02-14 2:35 ` [PATCH v2 6/8] PCI/AER: Add ratelimits to PCI AER Documentation Jon Pan-Doh
2025-02-17 11:30 ` Karolina Stolarek
2025-02-14 2:35 ` [PATCH v2 7/8] PCI/AER: Add AER sysfs attributes for log ratelimits Jon Pan-Doh
2025-02-17 13:31 ` Karolina Stolarek
2025-02-19 2:50 ` Jon Pan-Doh
2025-02-24 11:28 ` Karolina Stolarek
2025-02-19 5:42 ` Jon Pan-Doh
2025-02-25 13:56 ` Karolina Stolarek
2025-02-28 22:28 ` Jon Pan-Doh
2025-03-03 8:31 ` Karolina Stolarek
2025-03-04 0:58 ` Jon Pan-Doh
2025-03-07 12:10 ` Karolina Stolarek
2025-03-07 19:41 ` Bjorn Helgaas
2025-02-14 2:35 ` [PATCH v2 8/8] PCI/AER: Update AER sysfs ABI filename Jon Pan-Doh
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=ba1b05d1-d77e-4f35-af1c-836fc881135d@oracle.com \
--to=karolina.stolarek@oracle.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=anilagrawal@meta.com \
--cc=ben.fuller@oracle.com \
--cc=bhelgaas@google.com \
--cc=drewwalton@microsoft.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=martin.petersen@oracle.com \
--cc=pandoh@google.com \
--cc=sathyanarayanan.kuppuswamy@linux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox