From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68CCD2620F5; Tue, 20 May 2025 22:35:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747780512; cv=none; b=lYRQsyrQyEvS1clo25Q+I5hxM9Zo1Hgfyo0olYnfGgs3tpCaDEWENvXPJ5hPuuhlrzrbfQRpDR9RqrPAIqGVcUDM7C7nFTNUnpddLqoQBbfGuEyCenz57bbI+Y9XvUOd17g2WkGvxBoHy0BsLLuJSdwx9cDD033Glku4LIZ5sj8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747780512; c=relaxed/simple; bh=IQkpAQPzHZXRcrPSkC3DW3/Yn3xi4KpmzCgvdp1oIV0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=rbx4MUgGZIvwOS38mnOKxN+BlVGvuy5ukDPJIcc7A8/RU0AHcP/yR6dPZFWQ3hUjzipBfWcejCAdrGnuYrlj0XNTXyL4X4nsk7+zE/Qn4HcdnU2tlx+IbGXwB19XrHUcpGXTQetn7+8Deag0OylxmbEFSPaay7PK0pywQtXPbK4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Yj1XEdZa; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Yj1XEdZa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747780510; x=1779316510; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=IQkpAQPzHZXRcrPSkC3DW3/Yn3xi4KpmzCgvdp1oIV0=; b=Yj1XEdZaKlyoP+IaE9UH6xCrzKl2qluWMNq93racliRTrEHZTtwmMLLT RmGYqRZMyaGg+ANAWErfT/JPEfqap4Ms8IzTdb1li8ZxoSRIZ47gCLL7t +WWQ+cnrY3Bwtx9ccDQ9WvZhCRgXL44bkelGD6A+rJIzGjXdSt5qApFfx A5EIJZWJFVMJhtIgan3+Q4YY65CqtuVAUTI5TrqHbmINWg80BSA9Ar2bP v++t/m8lMGZ0MUO5jcubrRYMRxpMfldPah0V3ME2U/7Cdw//CUSElDmCn rZj/SlAGkBBf+5LyhDxppVppUXjWEoJFJhMXoYqf5OTDA9tzFwkcZd6Nd w==; X-CSE-ConnectionGUID: EAV2Z53bRZOlCOJhS+yULw== X-CSE-MsgGUID: mQ5NBdv5Sou/A/5UQUYalA== X-IronPort-AV: E=McAfee;i="6700,10204,11439"; a="49665344" X-IronPort-AV: E=Sophos;i="6.15,303,1739865600"; d="scan'208";a="49665344" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2025 15:35:10 -0700 X-CSE-ConnectionGUID: 166wFNzmTLu5ve1EO8+i5A== X-CSE-MsgGUID: j+YAHzFdQ7qaOgCKKuCstQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,303,1739865600"; d="scan'208";a="140758647" Received: from iweiny-desk3.amr.corp.intel.com (HELO [10.124.222.89]) ([10.124.222.89]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2025 15:35:08 -0700 Message-ID: <11d6dbb5-34de-4008-bc0b-1f0599b02029@linux.intel.com> Date: Tue, 20 May 2025 15:35:07 -0700 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 17/17] PCI/AER: Add sysfs attributes for log ratelimits To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Jon Pan-Doh , Karolina Stolarek , Weinan Liu , Martin Petersen , Ben Fuller , Drew Walton , Anil Agrawal , Tony Luck , =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= , Lukas Wunner , Jonathan Cameron , Sargun Dhillon , "Paul E . McKenney" , Mahesh J Salgaonkar , Oliver O'Halloran , Kai-Heng Feng , Keith Busch , Robert Richter , Terry Bowman , Shiju Jose , Dave Jiang , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Bjorn Helgaas , =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= References: <20250520215047.1350603-1-helgaas@kernel.org> <20250520215047.1350603-18-helgaas@kernel.org> Content-Language: en-US From: Sathyanarayanan Kuppuswamy In-Reply-To: <20250520215047.1350603-18-helgaas@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 5/20/25 2:50 PM, Bjorn Helgaas wrote: > From: Jon Pan-Doh > > Allow userspace to read/write log ratelimits per device (including > enable/disable). Create aer/ sysfs directory to store them and any > future aer configs. > > Update AER sysfs ABI filename to reflect the broader scope of AER sysfs > attributes (e.g. stats and ratelimits). > > Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -> > sysfs-bus-pci-devices-aer > > Tested using aer-inject[1]. Configured correctable log ratelimit to 5. > Sent 6 AER errors. Observed 5 errors logged while AER stats > (cat /sys/bus/pci/devices//aer_dev_correctable) shows 6. > > Disabled ratelimiting and sent 6 more AER errors. Observed all 6 errors > logged and accounted in AER stats (12 total errors). > > [1] https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git > > [bhelgaas: note fatal errors are not ratelimited, "aer_report" -> "aer_info"] > Signed-off-by: Karolina Stolarek > Signed-off-by: Jon Pan-Doh > Signed-off-by: Bjorn Helgaas > Tested-by: Krzysztof Wilczyński > --- Reviewed-by: Kuppuswamy Sathyanarayanan > ...es-aer_stats => sysfs-bus-pci-devices-aer} | 34 +++++++ > Documentation/PCI/pcieaer-howto.rst | 5 +- > drivers/pci/pci-sysfs.c | 1 + > drivers/pci/pci.h | 1 + > drivers/pci/pcie/aer.c | 99 +++++++++++++++++++ > 5 files changed, 139 insertions(+), 1 deletion(-) > rename Documentation/ABI/testing/{sysfs-bus-pci-devices-aer_stats => sysfs-bus-pci-devices-aer} (77%) > > diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer > similarity index 77% > rename from Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats > rename to Documentation/ABI/testing/sysfs-bus-pci-devices-aer > index d1f67bb81d5d..01bb577bfee8 100644 > --- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats > +++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer > @@ -117,3 +117,37 @@ Date: July 2018 > KernelVersion: 4.19.0 > Contact: linux-pci@vger.kernel.org, rajatja@google.com > Description: Total number of ERR_NONFATAL messages reported to rootport. > + > +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//aer/ratelimit_log_enable > +Date: May 2025 > +KernelVersion: 6.16.0 > +Contact: linux-pci@vger.kernel.org, pandoh@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//aer/ratelimit_burst_cor_log > +Date: May 2025 > +KernelVersion: 6.16.0 > +Contact: linux-pci@vger.kernel.org, pandoh@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//aer/ratelimit_burst_uncor_log > +Date: May 2025 > +KernelVersion: 6.16.0 > +Contact: linux-pci@vger.kernel.org, pandoh@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. > diff --git a/Documentation/PCI/pcieaer-howto.rst b/Documentation/PCI/pcieaer-howto.rst > index 6fb31516fff1..4b71e2f43ca7 100644 > --- a/Documentation/PCI/pcieaer-howto.rst > +++ b/Documentation/PCI/pcieaer-howto.rst > @@ -97,12 +97,15 @@ DPC errors, are not ratelimited. > AER uses the default ratelimit of DEFAULT_RATELIMIT_BURST (10 events) over > DEFAULT_RATELIMIT_INTERVAL (5 seconds). > > +Ratelimits are exposed in the form of sysfs attributes and configurable. > +See Documentation/ABI/testing/sysfs-bus-pci-devices-aer. > + > AER Statistics / Counters > ------------------------- > > When PCIe AER errors are captured, the counters / statistics are also exposed > in the form of sysfs attributes which are documented at > -Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats > +Documentation/ABI/testing/sysfs-bus-pci-devices-aer. > > Developer Guide > =============== > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index c6cda56ca52c..278de99b00ce 100644 > --- a/drivers/pci/pci-sysfs.c > +++ b/drivers/pci/pci-sysfs.c > @@ -1805,6 +1805,7 @@ const struct attribute_group *pci_dev_attr_groups[] = { > &pcie_dev_attr_group, > #ifdef CONFIG_PCIEAER > &aer_stats_attr_group, > + &aer_attr_group, > #endif > #ifdef CONFIG_PCIEASPM > &aspm_ctrl_attr_group, > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > index 65c466279ade..a3261e842d6d 100644 > --- a/drivers/pci/pci.h > +++ b/drivers/pci/pci.h > @@ -963,6 +963,7 @@ void pci_no_aer(void); > void pci_aer_init(struct pci_dev *dev); > void pci_aer_exit(struct pci_dev *dev); > extern const struct attribute_group aer_stats_attr_group; > +extern const struct attribute_group aer_attr_group; > void pci_aer_clear_fatal_status(struct pci_dev *dev); > int pci_aer_clear_status(struct pci_dev *dev); > int pci_aer_raw_clear_status(struct pci_dev *dev); > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index f9e684ac7878..9b8dea317a79 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -627,6 +627,105 @@ const struct attribute_group aer_stats_attr_group = { > .is_visible = aer_stats_attrs_are_visible, > }; > > +/* > + * Ratelimit enable toggle > + * 0: disabled with ratelimit.interval = 0 > + * 1: enabled with ratelimit.interval = nonzero > + */ > +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_burst_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.burst); \ > +} \ > + \ > + 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 burst; \ > + \ > + if (!capable(CAP_SYS_ADMIN)) \ > + return -EPERM; \ > + \ > + if (kstrtoint(buf, 0, &burst) < 0) \ > + return -EINVAL; \ > + \ > + pdev->aer_info->ratelimit.burst = burst; \ > + \ > + return count; \ > +} \ > +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); > + > +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, > + NULL > +}; > + > +static umode_t aer_attrs_are_visible(struct kobject *kobj, > + struct attribute *a, int n) > +{ > + struct device *dev = kobj_to_dev(kobj); > + struct pci_dev *pdev = to_pci_dev(dev); > + > + if (!pdev->aer_info) > + return 0; > + > + return a->mode; > +} > + > +const struct attribute_group aer_attr_group = { > + .name = "aer", > + .attrs = aer_attrs, > + .is_visible = aer_attrs_are_visible, > +}; > + > static void pci_dev_aer_stats_incr(struct pci_dev *pdev, > struct aer_err_info *info) > { -- Sathyanarayanan Kuppuswamy Linux Kernel Developer