From: Rajat Jain <rajatja@google.com> To: Bjorn Helgaas <bhelgaas@google.com>, Jonathan Corbet <corbet@lwn.net>, Philippe Ombredanne <pombredanne@nexb.com>, Kate Stewart <kstewart@linuxfoundation.org>, Thomas Gleixner <tglx@linutronix.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rajat Jain <rajatja@google.com>, Frederick Lawler <fred@fredlawl.com>, Oza Pawandeep <poza@codeaurora.org>, Keith Busch <keith.busch@intel.com>, Gabriele Paoloni <gabriele.paoloni@huawei.com>, Alexandru Gagniuc <mr.nuke.me@gmail.com>, Thomas Tai <thomas.tai@oracle.com>, "Steven Rostedt (VMware)" <rostedt@goodmis.org>, linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jes Sorensen <jsorensen@fb.com>, Kyle McMartin <jkkm@fb.com> Cc: rajatxjain@gmail.com Subject: [PATCH 4/5] PCI/AER: Add sysfs attributes for rootport cumulative stats Date: Tue, 22 May 2018 15:28:04 -0700 [thread overview] Message-ID: <20180522222805.80314-5-rajatja@google.com> (raw) In-Reply-To: <20180522222805.80314-1-rajatja@google.com> Add sysfs attributes for rootport statistics (that are cumulative of all the ERR_* messages seen on this PCI hierarchy). Signed-off-by: Rajat Jain <rajatja@google.com> --- drivers/pci/pcie/aer/aerdrv.h | 2 ++ drivers/pci/pcie/aer/aerdrv_core.c | 2 ++ drivers/pci/pcie/aer/aerdrv_stats.c | 31 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index 048fbd7c9633..77d8355551d9 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h @@ -88,6 +88,8 @@ irqreturn_t aer_irq(int irq, void *context); int pci_aer_stats_init(struct pci_dev *pdev); void pci_aer_stats_exit(struct pci_dev *pdev); void pci_dev_aer_stats_incr(struct pci_dev *pdev, struct aer_err_info *info); +void pci_rootport_aer_stats_incr(struct pci_dev *pdev, + struct aer_err_source *e_src); extern const char *aer_correctable_error_string[AER_MAX_TYPEOF_CORRECTABLE_ERRS]; diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 42a6f913069a..0f70e22563f3 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -424,6 +424,8 @@ static void aer_isr_one_error(struct pcie_device *p_device, struct aer_rpc *rpc = get_service_data(p_device); struct aer_err_info *e_info = &rpc->e_info; + pci_rootport_aer_stats_incr(p_device->port, e_src); + /* * There is a possibility that both correctable error and * uncorrectable error being logged. Report correctable error first. diff --git a/drivers/pci/pcie/aer/aerdrv_stats.c b/drivers/pci/pcie/aer/aerdrv_stats.c index 5f0a6e144f56..a526e26c8683 100644 --- a/drivers/pci/pcie/aer/aerdrv_stats.c +++ b/drivers/pci/pcie/aer/aerdrv_stats.c @@ -60,6 +60,9 @@ static DEVICE_ATTR_RO(field) aer_stats_aggregate_attr(dev_total_cor_errs); aer_stats_aggregate_attr(dev_total_fatal_errs); aer_stats_aggregate_attr(dev_total_nonfatal_errs); +aer_stats_aggregate_attr(rootport_total_cor_errs); +aer_stats_aggregate_attr(rootport_total_fatal_errs); +aer_stats_aggregate_attr(rootport_total_nonfatal_errs); #define aer_stats_breakdown_attr(field, stats_array, strings_array) \ static ssize_t \ @@ -90,6 +93,9 @@ static struct attribute *aer_stats_attrs[] __ro_after_init = { &dev_attr_dev_total_nonfatal_errs.attr, &dev_attr_dev_breakdown_correctable.attr, &dev_attr_dev_breakdown_uncorrectable.attr, + &dev_attr_rootport_total_cor_errs.attr, + &dev_attr_rootport_total_fatal_errs.attr, + &dev_attr_rootport_total_nonfatal_errs.attr, NULL }; @@ -102,6 +108,12 @@ static umode_t aer_stats_attrs_are_visible(struct kobject *kobj, if (!pdev->aer_stats) return 0; + if ((a == &dev_attr_rootport_total_cor_errs.attr || + a == &dev_attr_rootport_total_fatal_errs.attr || + a == &dev_attr_rootport_total_nonfatal_errs.attr) && + pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) + return 0; + return a->mode; } @@ -144,6 +156,25 @@ void pci_dev_aer_stats_incr(struct pci_dev *pdev, struct aer_err_info *info) counter[i]++; } +void pci_rootport_aer_stats_incr(struct pci_dev *pdev, + struct aer_err_source *e_src) +{ + struct aer_stats *aer_stats = pdev->aer_stats; + + if (unlikely(!aer_stats)) + return; + + if (e_src->status & PCI_ERR_ROOT_COR_RCV) + aer_stats->rootport_total_cor_errs++; + + if (e_src->status & PCI_ERR_ROOT_UNCOR_RCV) { + if (e_src->status & PCI_ERR_ROOT_FATAL_RCV) + aer_stats->rootport_total_fatal_errs++; + else + aer_stats->rootport_total_nonfatal_errs++; + } +} + int pci_aer_stats_init(struct pci_dev *pdev) { pdev->aer_stats = kzalloc(sizeof(struct aer_stats), GFP_KERNEL); -- 2.17.0.441.gb46fe60e1d-goog
WARNING: multiple messages have this Message-ID (diff)
From: Rajat Jain <rajatja@google.com> To: Bjorn Helgaas <bhelgaas@google.com>, Jonathan Corbet <corbet@lwn.net>, Philippe Ombredanne <pombredanne@nexb.com>, Kate Stewart <kstewart@linuxfoundation.org>, Thomas Gleixner <tglx@linutronix.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rajat Jain <rajatja@google.com>, Frederick Lawler <fred@fredlawl.com>, Oza Pawandeep <poza@codeaurora.org>, Keith Busch <keith.busch@intel.com>, Gabriele Paoloni <gabriele.paoloni@huawei.com>, Alexandru Gagniuc <mr.nuke.me@gmail.com>, Thomas Tai <thomas.tai@oracle.com>, "Steven Rostedt (VMware)" <rostedt@goodmis.org>, linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jes Sorensen <jsorensen@fb.com>, Kyle McMartin <jkkm@fb.com> Cc: rajatxjain@gmail.com Subject: [PATCH 4/5] PCI/AER: Add sysfs attributes for rootport cumulative stats Date: Tue, 22 May 2018 15:28:04 -0700 [thread overview] Message-ID: <20180522222805.80314-5-rajatja@google.com> (raw) In-Reply-To: <20180522222805.80314-1-rajatja@google.com> Add sysfs attributes for rootport statistics (that are cumulative of all the ERR_* messages seen on this PCI hierarchy). Signed-off-by: Rajat Jain <rajatja@google.com> --- drivers/pci/pcie/aer/aerdrv.h | 2 ++ drivers/pci/pcie/aer/aerdrv_core.c | 2 ++ drivers/pci/pcie/aer/aerdrv_stats.c | 31 +++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index 048fbd7c9633..77d8355551d9 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h @@ -88,6 +88,8 @@ irqreturn_t aer_irq(int irq, void *context); int pci_aer_stats_init(struct pci_dev *pdev); void pci_aer_stats_exit(struct pci_dev *pdev); void pci_dev_aer_stats_incr(struct pci_dev *pdev, struct aer_err_info *info); +void pci_rootport_aer_stats_incr(struct pci_dev *pdev, + struct aer_err_source *e_src); extern const char *aer_correctable_error_string[AER_MAX_TYPEOF_CORRECTABLE_ERRS]; diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 42a6f913069a..0f70e22563f3 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -424,6 +424,8 @@ static void aer_isr_one_error(struct pcie_device *p_device, struct aer_rpc *rpc = get_service_data(p_device); struct aer_err_info *e_info = &rpc->e_info; + pci_rootport_aer_stats_incr(p_device->port, e_src); + /* * There is a possibility that both correctable error and * uncorrectable error being logged. Report correctable error first. diff --git a/drivers/pci/pcie/aer/aerdrv_stats.c b/drivers/pci/pcie/aer/aerdrv_stats.c index 5f0a6e144f56..a526e26c8683 100644 --- a/drivers/pci/pcie/aer/aerdrv_stats.c +++ b/drivers/pci/pcie/aer/aerdrv_stats.c @@ -60,6 +60,9 @@ static DEVICE_ATTR_RO(field) aer_stats_aggregate_attr(dev_total_cor_errs); aer_stats_aggregate_attr(dev_total_fatal_errs); aer_stats_aggregate_attr(dev_total_nonfatal_errs); +aer_stats_aggregate_attr(rootport_total_cor_errs); +aer_stats_aggregate_attr(rootport_total_fatal_errs); +aer_stats_aggregate_attr(rootport_total_nonfatal_errs); #define aer_stats_breakdown_attr(field, stats_array, strings_array) \ static ssize_t \ @@ -90,6 +93,9 @@ static struct attribute *aer_stats_attrs[] __ro_after_init = { &dev_attr_dev_total_nonfatal_errs.attr, &dev_attr_dev_breakdown_correctable.attr, &dev_attr_dev_breakdown_uncorrectable.attr, + &dev_attr_rootport_total_cor_errs.attr, + &dev_attr_rootport_total_fatal_errs.attr, + &dev_attr_rootport_total_nonfatal_errs.attr, NULL }; @@ -102,6 +108,12 @@ static umode_t aer_stats_attrs_are_visible(struct kobject *kobj, if (!pdev->aer_stats) return 0; + if ((a == &dev_attr_rootport_total_cor_errs.attr || + a == &dev_attr_rootport_total_fatal_errs.attr || + a == &dev_attr_rootport_total_nonfatal_errs.attr) && + pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) + return 0; + return a->mode; } @@ -144,6 +156,25 @@ void pci_dev_aer_stats_incr(struct pci_dev *pdev, struct aer_err_info *info) counter[i]++; } +void pci_rootport_aer_stats_incr(struct pci_dev *pdev, + struct aer_err_source *e_src) +{ + struct aer_stats *aer_stats = pdev->aer_stats; + + if (unlikely(!aer_stats)) + return; + + if (e_src->status & PCI_ERR_ROOT_COR_RCV) + aer_stats->rootport_total_cor_errs++; + + if (e_src->status & PCI_ERR_ROOT_UNCOR_RCV) { + if (e_src->status & PCI_ERR_ROOT_FATAL_RCV) + aer_stats->rootport_total_fatal_errs++; + else + aer_stats->rootport_total_nonfatal_errs++; + } +} + int pci_aer_stats_init(struct pci_dev *pdev) { pdev->aer_stats = kzalloc(sizeof(struct aer_stats), GFP_KERNEL); -- 2.17.0.441.gb46fe60e1d-goog -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-05-22 22:28 UTC|newest] Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-22 22:28 [PATCH 0/5] Expose PCIe AER stats via sysfs Rajat Jain 2018-05-22 22:28 ` Rajat Jain 2018-05-22 22:28 ` [PATCH 1/5] PCI/AER: Define and allocate aer_stats structure for AER capable devices Rajat Jain 2018-05-22 22:28 ` Rajat Jain 2018-05-23 8:27 ` Greg Kroah-Hartman 2018-05-23 8:27 ` Greg Kroah-Hartman 2018-05-23 14:20 ` Jes Sorensen 2018-05-23 14:20 ` Jes Sorensen 2018-05-23 14:26 ` Alex G. 2018-05-23 14:26 ` Alex G. 2018-05-23 14:28 ` Jes Sorensen 2018-05-23 14:28 ` Jes Sorensen 2018-05-23 14:26 ` Matthew Wilcox 2018-05-23 14:26 ` Matthew Wilcox 2018-05-23 14:32 ` Jes Sorensen 2018-05-23 14:32 ` Jes Sorensen 2018-05-23 14:33 ` Alex G. 2018-05-23 14:33 ` Alex G. 2018-05-23 14:46 ` Steven Rostedt 2018-05-23 14:46 ` Steven Rostedt 2018-05-22 22:28 ` [PATCH 2/5] PCI/AER: Add sysfs stats " Rajat Jain 2018-05-22 22:28 ` Rajat Jain 2018-05-22 22:50 ` Alex G. 2018-05-22 22:50 ` Alex G. 2018-05-22 23:27 ` Rajat Jain 2018-05-22 23:27 ` Rajat Jain 2018-05-22 23:30 ` Sinan Kaya 2018-05-22 23:30 ` Sinan Kaya 2018-05-23 8:22 ` Greg Kroah-Hartman 2018-05-23 8:22 ` Greg Kroah-Hartman 2018-05-23 8:24 ` Greg Kroah-Hartman 2018-05-23 8:24 ` Greg Kroah-Hartman 2018-05-22 22:28 ` [PATCH 3/5] PCP/AER: Add sysfs attributes to provide breakdown of AERs Rajat Jain 2018-05-22 22:28 ` Rajat Jain 2018-05-23 8:25 ` Greg Kroah-Hartman 2018-05-23 8:25 ` Greg Kroah-Hartman 2018-05-22 22:28 ` Rajat Jain [this message] 2018-05-22 22:28 ` [PATCH 4/5] PCI/AER: Add sysfs attributes for rootport cumulative stats Rajat Jain 2018-05-22 22:28 ` [PATCH 5/5] Documentation/PCI: Add details of PCI AER statistics Rajat Jain 2018-05-22 22:28 ` Rajat Jain 2018-05-22 22:52 ` Alex G. 2018-05-22 22:52 ` Alex G. 2018-05-22 23:18 ` Rajat Jain 2018-05-22 23:18 ` Rajat Jain 2018-05-23 8:23 ` Greg Kroah-Hartman 2018-05-23 8:23 ` Greg Kroah-Hartman 2018-05-23 17:58 ` [PATCH v2 0/5] Expose PCIe AER stats via sysfs Rajat Jain 2018-05-23 17:58 ` Rajat Jain 2018-05-23 17:58 ` [PATCH v2 1/5] PCI/AER: Define and allocate aer_stats structure for AER capable devices Rajat Jain 2018-05-23 17:58 ` Rajat Jain 2018-05-24 6:08 ` Greg Kroah-Hartman 2018-05-24 6:08 ` Greg Kroah-Hartman 2018-05-23 17:58 ` [PATCH v2 2/5] PCI/AER: Add sysfs stats " Rajat Jain 2018-05-23 17:58 ` Rajat Jain 2018-05-23 17:58 ` [PATCH v2 3/5] PCI/AER: Add sysfs attributes to provide breakdown of AERs Rajat Jain 2018-05-23 17:58 ` Rajat Jain 2018-05-23 17:58 ` [PATCH v2 4/5] PCI/AER: Add sysfs attributes for rootport cumulative stats Rajat Jain 2018-05-23 17:58 ` Rajat Jain 2018-05-23 17:58 ` [PATCH v2 5/5] Documentation/ABI: Add details of PCI AER statistics Rajat Jain 2018-05-23 17:58 ` Rajat Jain 2018-06-17 5:24 ` poza 2018-06-17 5:24 ` poza 2018-06-19 0:11 ` Rajat Jain 2018-06-19 0:11 ` Rajat Jain 2018-06-19 0:32 ` Rajat Jain 2018-06-19 0:32 ` Rajat Jain 2018-06-19 6:03 ` poza 2018-06-19 6:03 ` poza 2018-06-19 16:31 ` Rajat Jain 2018-06-19 16:31 ` Rajat Jain 2018-06-21 9:19 ` poza 2018-06-21 9:19 ` poza 2018-06-22 0:45 ` Rajat Jain 2018-06-22 0:45 ` Rajat Jain 2018-06-19 22:16 ` [PATCH v2 0/5] Expose PCIe AER stats via sysfs Bjorn Helgaas 2018-06-19 22:16 ` Bjorn Helgaas 2018-06-19 22:17 ` Rajat Jain 2018-06-19 22:17 ` Rajat Jain 2018-06-19 22:20 ` Alex G. 2018-06-19 22:20 ` Alex G. 2018-06-19 22:25 ` Steven Rostedt 2018-06-19 22:25 ` Steven Rostedt 2018-06-19 22:29 ` Alex G. 2018-06-19 22:29 ` Alex G. 2018-06-20 1:12 ` [PATCH v3 1/5] PCI/AER: Define and allocate aer_stats structure for AER capable devices Rajat Jain 2018-06-20 1:12 ` Rajat Jain 2018-06-20 1:12 ` [PATCH v3 2/5] PCI/AER: Add sysfs stats " Rajat Jain 2018-06-20 1:12 ` Rajat Jain 2018-06-20 1:12 ` [PATCH v3 3/5] PCI/AER: Add sysfs attributes to provide breakdown of AERs Rajat Jain 2018-06-20 1:12 ` Rajat Jain 2018-06-20 1:12 ` [PATCH v3 4/5] PCI/AER: Add sysfs attributes for rootport cumulative stats Rajat Jain 2018-06-20 1:12 ` Rajat Jain 2018-06-20 3:13 ` kbuild test robot 2018-06-20 3:13 ` kbuild test robot 2018-06-20 1:12 ` [PATCH v3 5/5] Documentation/ABI: Add details of PCI AER statistics Rajat Jain 2018-06-20 1:12 ` Rajat Jain 2018-06-20 23:28 ` [PATCH v4 1/5] PCI/AER: Define and allocate aer_stats structure for AER capable devices Rajat Jain 2018-06-20 23:28 ` Rajat Jain 2018-06-20 23:28 ` [PATCH v4 2/5] PCI/AER: Add sysfs stats " Rajat Jain 2018-06-20 23:28 ` Rajat Jain 2018-06-20 23:41 ` [PATCH v5 1/5] PCI/AER: Define and allocate aer_stats structure " Rajat Jain 2018-06-20 23:41 ` Rajat Jain 2018-06-20 23:41 ` [PATCH v5 2/5] PCI/AER: Add sysfs stats " Rajat Jain 2018-06-20 23:41 ` Rajat Jain 2018-06-20 23:41 ` [PATCH v5 3/5] PCI/AER: Add sysfs attributes to provide breakdown of AERs Rajat Jain 2018-06-20 23:41 ` Rajat Jain 2018-06-21 18:48 ` Bjorn Helgaas 2018-06-21 18:48 ` Bjorn Helgaas 2018-06-21 21:25 ` Rajat Jain 2018-06-21 21:25 ` Rajat Jain 2018-06-22 16:38 ` Tyler Baicar 2018-06-22 16:38 ` Tyler Baicar 2018-06-22 17:27 ` Bjorn Helgaas 2018-06-22 17:27 ` Bjorn Helgaas 2018-06-20 23:41 ` [PATCH v5 4/5] PCI/AER: Add sysfs attributes for rootport cumulative stats Rajat Jain 2018-06-20 23:41 ` Rajat Jain 2018-06-20 23:41 ` [PATCH v5 5/5] Documentation/ABI: Add details of PCI AER statistics Rajat Jain 2018-06-20 23:41 ` Rajat Jain 2018-06-21 13:17 ` [PATCH v5 1/5] PCI/AER: Define and allocate aer_stats structure for AER capable devices Bjorn Helgaas 2018-06-21 13:17 ` Bjorn Helgaas 2018-06-21 20:41 ` Rajat Jain 2018-06-21 20:41 ` Rajat Jain
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=20180522222805.80314-5-rajatja@google.com \ --to=rajatja@google.com \ --cc=bhelgaas@google.com \ --cc=corbet@lwn.net \ --cc=fred@fredlawl.com \ --cc=gabriele.paoloni@huawei.com \ --cc=gregkh@linuxfoundation.org \ --cc=jkkm@fb.com \ --cc=jsorensen@fb.com \ --cc=keith.busch@intel.com \ --cc=kstewart@linuxfoundation.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=mr.nuke.me@gmail.com \ --cc=pombredanne@nexb.com \ --cc=poza@codeaurora.org \ --cc=rajatxjain@gmail.com \ --cc=rostedt@goodmis.org \ --cc=tglx@linutronix.de \ --cc=thomas.tai@oracle.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.