On Tue, May 20, 2025 at 04:50:34PM -0500, Bjorn Helgaas wrote:
> From: Jon Pan-Doh <pan...@google.com>
>
> Allow userspace to read/write log ratelimits per device (including
> enable/disable). Create aer/ sysfs directory to store them and any
> future aer configs.
> +PCIe AER ratelimits
> +-------------------
> +
> +These attributes show up under all the devices that are AER capable.
> +They represent configurable ratelimits of logs per error type.
> +
> +See Documentation/PCI/pcieaer-howto.rst for more info on ratelimits.
> +
> +What: /sys/bus/pci/devices/<dev>/aer/ratelimit_log_enable
> +Date: May 2025
> +KernelVersion: 6.16.0
> +Contact: linux-...@vger.kernel.org, pan...@google.com
> +Description: Writing 1/0 enables/disables AER log ratelimiting. Reading
> + gets whether or not AER ratelimiting is currently enabled.
> + Enabled by default.
> +
> +What: /sys/bus/pci/devices/<dev>/aer/ratelimit_burst_cor_log
> +Date: May 2025
> +KernelVersion: 6.16.0
> +Contact: linux-...@vger.kernel.org, pan...@google.com
> +Description: Ratelimit burst for correctable error logs. Writing a value
> + changes the number of errors (burst) allowed per interval
> + (5 second window) before ratelimiting. Reading gets the
> + current ratelimit burst.
> +
> +What: /sys/bus/pci/devices/<dev>/aer/ratelimit_burst_uncor_log
> +Date: May 2025
> +KernelVersion: 6.16.0
> +Contact: linux-...@vger.kernel.org, pan...@google.com
> +Description: Ratelimit burst for non-fatal uncorrectable error logs.
> + Writing a value changes the number of errors (burst)
> + allowed per interval (5 second window) before ratelimiting.
> + Reading gets the current ratelimit burst.
I propose that we rename these to:
aer/correctable_ratelimit_burst
aer/nonfatal_ratelimit_burst
I think "log" is probably unnecessary, and the error type part
should correspond with the existing entries (unfortunately not in the
"aer" directory):
aer_dev_correctable
aer_dev_nonfatal
and making "ratelimit_burst" a suffix will make it correspond to
these:
fs/ext4/sysfs.c: ATTR_LIST(err_ratelimit_burst),
fs/ext4/sysfs.c: ATTR_LIST(warning_ratelimit_burst),
fs/ext4/sysfs.c: ATTR_LIST(msg_ratelimit_burst),
lib/fault-inject.c:FAULT_CONFIGFS_ATTR_NAMED(ratelimit_burst,
"verbose_ratelimit_burst",
Also, I think we should split up "aer/ratelimit_log_enable" so we can
do it separately for correctable and nonfatal errors and name as:
aer/correctable_ratelimit_interval_ms
aer/nonfatal_ratelimit_interval_ms
so we can set the interval as well as the burst and to match these:
fs/ext4/sysfs.c: ATTR_LIST(err_ratelimit_interval_ms),
fs/ext4/sysfs.c: ATTR_LIST(warning_ratelimit_interval_ms),
fs/ext4/sysfs.c: ATTR_LIST(msg_ratelimit_interval_ms),
lib/fault-inject.c:FAULT_CONFIGFS_ATTR_NAMED(ratelimit_interval,
"verbose_ratelimit_interval_ms",
I'll post the series as a whole again, but here's the interdiff
related to this particular change:
diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer
b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer
index 01bb577bfee8..5ed284523956 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer
+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer
@@ -126,28 +126,38 @@ They represent configurable ratelimits of logs per error
type.
See Documentation/PCI/pcieaer-howto.rst for more info on ratelimits.
-What: /sys/bus/pci/devices/<dev>/aer/ratelimit_log_enable
+What: /sys/bus/pci/devices/<dev>/aer/correctable_ratelimit_interval_ms
Date: May 2025
KernelVersion: 6.16.0
-Contact: linux-...@vger.kernel.org, pan...@google.com
-Description: Writing 1/0 enables/disables AER log ratelimiting. Reading
- gets whether or not AER ratelimiting is currently enabled.
- Enabled by default.
+Contact: linux-...@vger.kernel.org
+Description: Writing 0 disables AER correctable error log ratelimiting.
+ Writing a positive value sets the ratelimit interval in ms.
+ Default is DEFAULT_RATELIMIT_INTERVAL (5000 ms).
-What: /sys/bus/pci/devices/<dev>/aer/ratelimit_burst_cor_log
+What: /sys/bus/pci/devices/<dev>/aer/correctable_ratelimit_burst
Date: May 2025
KernelVersion: 6.16.0
-Contact: linux-...@vger.kernel.org, pan...@google.com
+Contact: linux-...@vger.kernel.org
Description: Ratelimit burst for correctable error logs. Writing a value
changes the number of errors (burst) allowed per interval
- (5 second window) before ratelimiting. Reading gets the
- current ratelimit burst.
+ before ratelimiting. Reading gets the current ratelimit
+ burst. Default is DEFAULT_RATELIMIT_BURST (10).
-What: /sys/bus/pci/devices/<dev>/aer/ratelimit_burst_uncor_log
+What: /sys/bus/pci/devices/<dev>/aer/nonfatal_ratelimit_interval_ms
Date: May 2025
KernelVersion: 6.16.0
-Contact: linux-...@vger.kernel.org, pan...@google.com
+Contact: linux-...@vger.kernel.org
+Description: Writing 0 disables AER non-fatal uncorrectable error log
+ ratelimiting. Writing a positive value sets the ratelimit
+ interval in ms. Default is DEFAULT_RATELIMIT_INTERVAL
+ (5000 ms).
+
+What: /sys/bus/pci/devices/<dev>/aer/nonfatal_ratelimit_burst
+Date: May 2025
+KernelVersion: 6.16.0
+Contact: linux-...@vger.kernel.org
Description: Ratelimit burst for non-fatal uncorrectable error logs.
Writing a value changes the number of errors (burst)
- allowed per interval (5 second window) before ratelimiting.
- Reading gets the current ratelimit burst.
+ allowed per interval before ratelimiting. Reading gets the
+ current ratelimit burst. Default is DEFAULT_RATELIMIT_BURST
+ (10).
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 48014010dc8b..6c331695af58 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -91,8 +91,8 @@ struct aer_info {
u64 rootport_total_nonfatal_errs;
/* Ratelimits for errors */
- struct ratelimit_state cor_log_ratelimit;
- struct ratelimit_state uncor_log_ratelimit;
+ struct ratelimit_state correctable_ratelimit;
+ struct ratelimit_state nonfatal_ratelimit;
};
#define AER_LOG_TLP_MASKS (PCI_ERR_UNC_POISON_TLP| \
@@ -384,9 +384,9 @@ void pci_aer_init(struct pci_dev *dev)
dev->aer_info = kzalloc(sizeof(*dev->aer_info), GFP_KERNEL);
- ratelimit_state_init(&dev->aer_info->cor_log_ratelimit,
+ ratelimit_state_init(&dev->aer_info->correctable_ratelimit,
DEFAULT_RATELIMIT_INTERVAL,
DEFAULT_RATELIMIT_BURST);
- ratelimit_state_init(&dev->aer_info->uncor_log_ratelimit,
+ ratelimit_state_init(&dev->aer_info->nonfatal_ratelimit,
DEFAULT_RATELIMIT_INTERVAL,
DEFAULT_RATELIMIT_BURST);
/*
@@ -628,45 +628,44 @@ const struct attribute_group aer_stats_attr_group = {
};
/*
- * Ratelimit enable toggle
- * 0: disabled with ratelimit.interval = 0
- * 1: enabled with ratelimit.interval = nonzero
+ * Ratelimit interval
+ * <=0: disabled with ratelimit.interval = 0
+ * >0: enabled with ratelimit.interval in ms
*/
-static ssize_t ratelimit_log_enable_show(struct device *dev,
- struct device_attribute *attr,
- char *buf)
-{
- struct pci_dev *pdev = to_pci_dev(dev);
- bool enabled = pdev->aer_info->cor_log_ratelimit.interval != 0;
-
- return sysfs_emit(buf, "%d\n", enabled);
-}
-
-static ssize_t ratelimit_log_enable_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- struct pci_dev *pdev = to_pci_dev(dev);
- bool enable;
- int interval;
-
- if (!capable(CAP_SYS_ADMIN))
- return -EPERM;
-
- if (kstrtobool(buf, &enable) < 0)
- return -EINVAL;
-
- if (enable)
- interval = DEFAULT_RATELIMIT_INTERVAL;
- else
- interval = 0;
-
- pdev->aer_info->cor_log_ratelimit.interval = interval;
- pdev->aer_info->uncor_log_ratelimit.interval = interval;
-
- return count;
-}
-static DEVICE_ATTR_RW(ratelimit_log_enable);
+#define aer_ratelimit_interval_attr(name, ratelimit) \
+ static ssize_t \
+ name##_show(struct device *dev, struct device_attribute *attr, \
+ char *buf) \
+ { \
+ struct pci_dev *pdev = to_pci_dev(dev); \
+ \
+ return sysfs_emit(buf, "%d\n", \
+ pdev->aer_info->ratelimit.interval); \
+ } \
+ \
+ static ssize_t \
+ name##_store(struct device *dev, struct device_attribute *attr, \
+ const char *buf, size_t count) \
+ { \
+ struct pci_dev *pdev = to_pci_dev(dev); \
+ int interval; \
+ \
+ if (!capable(CAP_SYS_ADMIN)) \
+ return -EPERM; \
+ \
+ if (kstrtoint(buf, 0, &interval) < 0) \
+ return -EINVAL; \
+ \
+ if (interval <= 0) \
+ interval = 0; \
+ else \
+ interval = msecs_to_jiffies(interval); \
+ \
+ pdev->aer_info->ratelimit.interval = interval; \
+ \
+ return count; \
+ } \
+ static DEVICE_ATTR_RW(name);
#define aer_ratelimit_burst_attr(name, ratelimit) \
static ssize_t \
@@ -696,15 +695,22 @@ static DEVICE_ATTR_RW(ratelimit_log_enable);
\
return count; \
} \
- static DEVICE_ATTR_RW(name)
+ static DEVICE_ATTR_RW(name);
-aer_ratelimit_burst_attr(ratelimit_burst_cor_log, cor_log_ratelimit);
-aer_ratelimit_burst_attr(ratelimit_burst_uncor_log, uncor_log_ratelimit);
+#define aer_ratelimit_attrs(name) \
+ aer_ratelimit_interval_attr(name##_ratelimit_interval_ms, \
+ name##_ratelimit) \
+ aer_ratelimit_burst_attr(name##_ratelimit_burst, \
+ name##_ratelimit)
+
+aer_ratelimit_attrs(correctable)
+aer_ratelimit_attrs(nonfatal)
static struct attribute *aer_attrs[] = {
- &dev_attr_ratelimit_log_enable.attr,
- &dev_attr_ratelimit_burst_cor_log.attr,
- &dev_attr_ratelimit_burst_uncor_log.attr,
+ &dev_attr_correctable_ratelimit_interval_ms.attr,
+ &dev_attr_correctable_ratelimit_burst.attr,
+ &dev_attr_nonfatal_ratelimit_interval_ms.attr,
+ &dev_attr_nonfatal_ratelimit_burst.attr,
NULL
};
@@ -786,9 +792,9 @@ static int aer_ratelimit(struct pci_dev *dev, unsigned int
severity)
return 1; /* AER_FATAL not ratelimited */
if (severity == AER_CORRECTABLE)
- ratelimit = &dev->aer_info->cor_log_ratelimit;
+ ratelimit = &dev->aer_info->correctable_ratelimit;
else
- ratelimit = &dev->aer_info->uncor_log_ratelimit;
+ ratelimit = &dev->aer_info->nonfatal_ratelimit;
return __ratelimit(ratelimit);
}
