From patchwork Wed May 23 17:58:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 919260 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="IHa4HCWq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rgKX0C7Sz9s0W for ; Thu, 24 May 2018 04:00:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933593AbeEWSAG (ORCPT ); Wed, 23 May 2018 14:00:06 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:37943 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933824AbeEWR6p (ORCPT ); Wed, 23 May 2018 13:58:45 -0400 Received: by mail-pl0-f65.google.com with SMTP id c11-v6so13492505plr.5 for ; Wed, 23 May 2018 10:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lWXdoHBojoAI8FDQqlYl7uv53Q0VOOWpE8AirUaJNuQ=; b=IHa4HCWqrfieKuMrypmL0fdX4bbijJ6ye+H+Xs7F2gPhm1tUeRtJu3coXogyZYh0Qw 42Fw5NLePU0fym2fH8/FNINxif8sro2btXpydEAyJqh7XR/5AH3yaYZIeIfNHPdeOfFg o1/ytbLtqVhn8Az3jAkRztSvDtGMs7Go0yGajwXA2zh48t/ewenvxGlNrW/5/TnYRZQh xlpfow0IQ7dLU9DHWZ4pgQu1TRi0dvY9dqUUwny/3OudnmL1oJ12gZbNVf+wrUIr/zbp qxg3vhbNq135D+QEvs2oSoOtOI6me8ILzaW4tw67Pf2vReg1xAVzbI4v9398OzlgWc+Z 0FUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lWXdoHBojoAI8FDQqlYl7uv53Q0VOOWpE8AirUaJNuQ=; b=YJXjQ7Rwdn/vvXyDo/R7XVs/6V/EGmBte20qlzIFWsZGbnGZCguKDyHJwSisAk20Pp 66w2jdHLmgAfFN0ulQdfVYJ60nHiafuJKm9i8QO25K2M4IooMoHRm7mLzRSxbf60OHNK 0lmXQvGwaXKNyuxuFFWaHj1FuOM/Rfy2EVKcDVxEhALg4JLAM+i0QWFrD8Bx/ZQjm33W EKhoHYR1QxGU8U0pbYWs5AHcIyMZL7wjaNJKODsFpWw4XwrPd8e2flzZAOsjHf6eID6t su8AsYImffjjV0aQ4KWB62Bvmbb/HyfIyUhLLU0J13iGGpuZPfyu8X+LLN8l/XaHo+05 pz0w== X-Gm-Message-State: ALKqPwduyI1vCp1OKFr9nETdSfPP7P8p/25rQjI7KB5uykzPHjFkA/Pr dLgEjId/iXb32te1IdDxMRlwQQ== X-Google-Smtp-Source: AB8JxZqmLCzaE9qEmZUGJ4IcHZ+nc0wz+HNHxV2sLKECMziWAvKR6ogmgEovjoJ1HxU17DKaUUFSBA== X-Received: by 2002:a17:902:b58e:: with SMTP id a14-v6mr3933781pls.261.1527098324771; Wed, 23 May 2018 10:58:44 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([2620:0:1000:1501:dc81:9a9e:fdee:decf]) by smtp.gmail.com with ESMTPSA id k186-v6sm41433025pfc.142.2018.05.23.10.58.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 10:58:44 -0700 (PDT) From: Rajat Jain To: Bjorn Helgaas , Jonathan Corbet , Philippe Ombredanne , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Rajat Jain , Frederick Lawler , Oza Pawandeep , Keith Busch , Gabriele Paoloni , Alexandru Gagniuc , Thomas Tai , "Steven Rostedt (VMware)" , linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jes Sorensen , Kyle McMartin Cc: rajatxjain@gmail.com Subject: [PATCH v2 1/5] PCI/AER: Define and allocate aer_stats structure for AER capable devices Date: Wed, 23 May 2018 10:58:04 -0700 Message-Id: <20180523175808.28030-2-rajatja@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180523175808.28030-1-rajatja@google.com> References: <20180522222805.80314-1-rajatja@google.com> <20180523175808.28030-1-rajatja@google.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Define a structure to hold the AER statistics. There are 2 groups of statistics: dev_* counters that are to be collected for all AER capable devices and rootport_* counters that are collected for all (AER capable) rootports only. Allocate and free this structure when device is added or released (thus counters survive the lifetime of the device). Add a new file aerdrv_stats.c to hold the AER stats collection logic. Signed-off-by: Rajat Jain --- v2: Fix the license header as per Greg's suggestions (Since there is disagreement with using "//" vs "/* */" for license I decided to keep the one preferred by Linus, also used by others in this directory) drivers/pci/pcie/aer/Makefile | 2 +- drivers/pci/pcie/aer/aerdrv.h | 6 +++ drivers/pci/pcie/aer/aerdrv_core.c | 9 +++++ drivers/pci/pcie/aer/aerdrv_stats.c | 61 +++++++++++++++++++++++++++++ drivers/pci/probe.c | 1 + include/linux/pci.h | 3 ++ 6 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/pcie/aer/aerdrv_stats.c diff --git a/drivers/pci/pcie/aer/Makefile b/drivers/pci/pcie/aer/Makefile index 09bd890875a3..a06f9cc2bde5 100644 --- a/drivers/pci/pcie/aer/Makefile +++ b/drivers/pci/pcie/aer/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_PCIEAER) += aerdriver.o obj-$(CONFIG_PCIE_ECRC) += ecrc.o -aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o +aerdriver-objs := aerdrv_errprint.o aerdrv_core.o aerdrv.o aerdrv_stats.o aerdriver-$(CONFIG_ACPI) += aerdrv_acpi.o obj-$(CONFIG_PCIEAER_INJECT) += aer_inject.o diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index b4c950683cc7..d8b9fba536ed 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h @@ -33,6 +33,10 @@ PCI_ERR_UNC_MALF_TLP) #define AER_MAX_MULTI_ERR_DEVICES 5 /* Not likely to have more */ + +#define AER_MAX_TYPEOF_CORRECTABLE_ERRS 16 /* as per PCI_ERR_COR_STATUS */ +#define AER_MAX_TYPEOF_UNCORRECTABLE_ERRS 26 /* as per PCI_ERR_UNCOR_STATUS*/ + struct aer_err_info { struct pci_dev *dev[AER_MAX_MULTI_ERR_DEVICES]; int error_dev_num; @@ -81,6 +85,8 @@ void aer_isr(struct work_struct *work); void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info); 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); #ifdef CONFIG_ACPI_APEI int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 36e622d35c48..42a6f913069a 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -95,9 +95,18 @@ int pci_cleanup_aer_error_status_regs(struct pci_dev *dev) int pci_aer_init(struct pci_dev *dev) { dev->aer_cap = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); + + if (!dev->aer_cap || pci_aer_stats_init(dev)) + return -EIO; + return pci_cleanup_aer_error_status_regs(dev); } +void pci_aer_exit(struct pci_dev *dev) +{ + pci_aer_stats_exit(dev); +} + /** * add_error_device - list device to be handled * @e_info: pointer to error info diff --git a/drivers/pci/pcie/aer/aerdrv_stats.c b/drivers/pci/pcie/aer/aerdrv_stats.c new file mode 100644 index 000000000000..2f48d6bc81f1 --- /dev/null +++ b/drivers/pci/pcie/aer/aerdrv_stats.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2018 Google Inc, All Rights Reserved. + * + * Rajat Jain (rajatja@google.com) + * + * AER Statistics - exposed to userspace via /sysfs attributes. + */ + +#include +#include "aerdrv.h" + +/* AER stats for the device */ +struct aer_stats { + + /* + * Fields for all AER capable devices. They indicate the errors + * "as seen by this device". Note that this may mean that if an + * end point is causing problems, the AER counters may increment + * at its link partner (e.g. root port) because the errors will be + * "seen" by the link partner and not the the problematic end point + * itself (which may report all counters as 0 as it never saw any + * problems). + */ + /* Individual counters for different type of correctable errors */ + u64 dev_cor_errs[AER_MAX_TYPEOF_CORRECTABLE_ERRS]; + /* Individual counters for different type of uncorrectable errors */ + u64 dev_uncor_errs[AER_MAX_TYPEOF_UNCORRECTABLE_ERRS]; + /* Total number of correctable errors seen by this device */ + u64 dev_total_cor_errs; + /* Total number of fatal uncorrectable errors seen by this device */ + u64 dev_total_fatal_errs; + /* Total number of fatal uncorrectable errors seen by this device */ + u64 dev_total_nonfatal_errs; + + /* + * Fields for Root ports only, these indicate the total number of + * ERR_COR, ERR_FATAL, and ERR_NONFATAL messages received by the + * rootport, INCLUDING the ones that are generated internally (by + * the rootport itself) + */ + u64 rootport_total_cor_errs; + u64 rootport_total_fatal_errs; + u64 rootport_total_nonfatal_errs; +}; + +int pci_aer_stats_init(struct pci_dev *pdev) +{ + pdev->aer_stats = kzalloc(sizeof(struct aer_stats), GFP_KERNEL); + if (!pdev->aer_stats) { + dev_err(&pdev->dev, "No memory for aer_stats\n"); + return -ENOMEM; + } + return 0; +} + +void pci_aer_stats_exit(struct pci_dev *pdev) +{ + kfree(pdev->aer_stats); + pdev->aer_stats = NULL; +} diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 384020757b81..dd662c241373 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2064,6 +2064,7 @@ static void pci_configure_device(struct pci_dev *dev) static void pci_release_capabilities(struct pci_dev *dev) { + pci_aer_exit(dev); pci_vpd_release(dev); pci_iov_release(dev); pci_free_cap_save_buffers(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 21965e0dbe62..5c84b1304de7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -299,6 +299,7 @@ struct pci_dev { u8 hdr_type; /* PCI header type (`multi' flag masked out) */ #ifdef CONFIG_PCIEAER u16 aer_cap; /* AER capability offset */ + struct aer_stats *aer_stats; /* AER stats for this device */ #endif u8 pcie_cap; /* PCIe capability offset */ u8 msi_cap; /* MSI capability offset */ @@ -1470,10 +1471,12 @@ static inline bool pcie_aspm_support_enabled(void) { return false; } void pci_no_aer(void); bool pci_aer_available(void); int pci_aer_init(struct pci_dev *dev); +void pci_aer_exit(struct pci_dev *dev); #else static inline void pci_no_aer(void) { } static inline bool pci_aer_available(void) { return false; } static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; } +static inline void pci_aer_exit(struct pci_dev *d) { } #endif #ifdef CONFIG_PCIE_ECRC From patchwork Wed May 23 17:58:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 919258 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Lg9l9OQJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rgJy1jsjz9s0W for ; Thu, 24 May 2018 04:00:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933884AbeEWR6y (ORCPT ); Wed, 23 May 2018 13:58:54 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:37628 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933858AbeEWR6s (ORCPT ); Wed, 23 May 2018 13:58:48 -0400 Received: by mail-pl0-f68.google.com with SMTP id w19-v6so13481580plq.4 for ; Wed, 23 May 2018 10:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1z6WlIioae4RJkNxz63Hd/MK6NhhxjTdMf3aE2BQvnA=; b=Lg9l9OQJ2YtWy8xvPLDBmjaapHNf2ndZgaxX3wNqhxCnBB/byuUQ5j3WGjdp6gAuro PYw51LAloq0MwzlqQOeuB05ztUQ2QxZzkwhhtjNkBgFunPIdd7Kj98ccrLvg2/GXXD+q NV4A4SZWDwIlHrwvf5v1k1Kvh6DEUsszFRof+PCHsM0k3/6WUS9/4/5EG2WzLMx7YTbd gezy1VWeqoEHlAaiANmxIsbJRaQaoEo+O15YIlzeDUGkUCAjfhXOpV81k6QTq1S2ELAg yZ13nv8DftUMtBjJLliSQZVmCWcaEgVMsr+JZ5fASaKxd6eV+JbrqLdWAODns77HKKBY FeFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1z6WlIioae4RJkNxz63Hd/MK6NhhxjTdMf3aE2BQvnA=; b=Z9viCb/rWPi5SB82XcbeGlTcsPDuTVuS8EVhLUumNsXS/HLTTKrHaFIPuH8Ng7DPi4 sh5cj6AVOcDQszy9csLdZoWOsmiPeKGzizQmPteJJ6JEXmZHDNPLRSN7keSEP0tCjEds RAVYbJQYrOcQnDmydP9arcTOC/AdLx6AHvUaABhzcONndoLtQ6RELkmRcCdVNlQMyrbi N1i6Yzc17XLw9nHabnMRGFiY7+jIbxw3M3YPjdIe1wchIcSXI1+IIMVmxTpXh0y246H5 BZ5h7EkhqAR0VNHc4aOfH+lcukkv3EEFMRpxwJdz3+1CDCajfHKtqX1yXk8m9Iq5tQ1M S2pA== X-Gm-Message-State: ALKqPwe7C+kunyHgHNnnDCzCeQBOc7P7S7rfckKBxqsfCAmUVr3bx4yk /ACv5eC45qrKFqy8sIFMXBE8Bg== X-Google-Smtp-Source: AB8JxZrxMqKdSYp4VWWIEmBL6HKVrT8ZJwTGTmpfX/YwsZLYxgD5I6n8X0zoVgGx2CkiUQ1qlkJiPQ== X-Received: by 2002:a17:902:6687:: with SMTP id e7-v6mr3983984plk.242.1527098327759; Wed, 23 May 2018 10:58:47 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([2620:0:1000:1501:dc81:9a9e:fdee:decf]) by smtp.gmail.com with ESMTPSA id k186-v6sm41433025pfc.142.2018.05.23.10.58.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 10:58:46 -0700 (PDT) From: Rajat Jain To: Bjorn Helgaas , Jonathan Corbet , Philippe Ombredanne , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Rajat Jain , Frederick Lawler , Oza Pawandeep , Keith Busch , Gabriele Paoloni , Alexandru Gagniuc , Thomas Tai , "Steven Rostedt (VMware)" , linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jes Sorensen , Kyle McMartin Cc: rajatxjain@gmail.com Subject: [PATCH v2 2/5] PCI/AER: Add sysfs stats for AER capable devices Date: Wed, 23 May 2018 10:58:05 -0700 Message-Id: <20180523175808.28030-3-rajatja@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180523175808.28030-1-rajatja@google.com> References: <20180522222805.80314-1-rajatja@google.com> <20180523175808.28030-1-rajatja@google.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add the following AER sysfs stats to represent the counters for each kind of error as seen by the device: dev_total_cor_errs dev_total_fatal_errs dev_total_nonfatal_errs Signed-off-by: Rajat Jain --- v2: Use tabs instead of spaces at the end of macro lines, and remove the use of unlikely() as per Greg's suggestion. drivers/pci/pci-sysfs.c | 3 ++ drivers/pci/pci.h | 4 +- drivers/pci/pcie/aer/aerdrv.h | 1 + drivers/pci/pcie/aer/aerdrv_errprint.c | 1 + drivers/pci/pcie/aer/aerdrv_stats.c | 72 ++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 366d93af051d..730f985a3dc9 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1743,6 +1743,9 @@ static const struct attribute_group *pci_dev_attr_groups[] = { #endif &pci_bridge_attr_group, &pcie_dev_attr_group, +#ifdef CONFIG_PCIEAER + &aer_stats_attr_group, +#endif NULL, }; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index c358e7a07f3f..9a28ec600225 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -181,7 +181,9 @@ extern const struct attribute_group *pci_dev_groups[]; extern const struct attribute_group *pcibus_groups[]; extern const struct device_type pci_dev_type; extern const struct attribute_group *pci_bus_groups[]; - +#ifdef CONFIG_PCIEAER +extern const struct attribute_group aer_stats_attr_group; +#endif /** * pci_match_one_device - Tell if a PCI device structure has a matching diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index d8b9fba536ed..b5d5ad6f2c03 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h @@ -87,6 +87,7 @@ void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info); 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); #ifdef CONFIG_ACPI_APEI int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 21ca5e1b0ded..5e8b98deda08 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -155,6 +155,7 @@ static void __aer_print_error(struct pci_dev *dev, pci_err(dev, " [%2d] Unknown Error Bit%s\n", i, info->first_error == i ? " (First)" : ""); } + pci_dev_aer_stats_incr(dev, info); } void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) diff --git a/drivers/pci/pcie/aer/aerdrv_stats.c b/drivers/pci/pcie/aer/aerdrv_stats.c index 2f48d6bc81f1..5555beffef2b 100644 --- a/drivers/pci/pcie/aer/aerdrv_stats.c +++ b/drivers/pci/pcie/aer/aerdrv_stats.c @@ -44,6 +44,78 @@ struct aer_stats { u64 rootport_total_nonfatal_errs; }; +#define aer_stats_aggregate_attr(field) \ + static ssize_t \ + field##_show(struct device *dev, struct device_attribute *attr, \ + char *buf) \ +{ \ + struct pci_dev *pdev = to_pci_dev(dev); \ + return sprintf(buf, "0x%llx\n", pdev->aer_stats->field); \ +} \ +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); + +static struct attribute *aer_stats_attrs[] __ro_after_init = { + &dev_attr_dev_total_cor_errs.attr, + &dev_attr_dev_total_fatal_errs.attr, + &dev_attr_dev_total_nonfatal_errs.attr, + NULL +}; + +static umode_t aer_stats_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_stats) + return 0; + + return a->mode; +} + +const struct attribute_group aer_stats_attr_group = { + .name = "aer_stats", + .attrs = aer_stats_attrs, + .is_visible = aer_stats_attrs_are_visible, +}; + +void pci_dev_aer_stats_incr(struct pci_dev *pdev, struct aer_err_info *info) +{ + int status, i, max = -1; + u64 *counter = NULL; + struct aer_stats *aer_stats = pdev->aer_stats; + + if (!aer_stats) + return; + + switch (info->severity) { + case AER_CORRECTABLE: + aer_stats->dev_total_cor_errs++; + counter = &aer_stats->dev_cor_errs[0]; + max = AER_MAX_TYPEOF_CORRECTABLE_ERRS; + break; + case AER_NONFATAL: + aer_stats->dev_total_nonfatal_errs++; + counter = &aer_stats->dev_uncor_errs[0]; + max = AER_MAX_TYPEOF_UNCORRECTABLE_ERRS; + break; + case AER_FATAL: + aer_stats->dev_total_fatal_errs++; + counter = &aer_stats->dev_uncor_errs[0]; + max = AER_MAX_TYPEOF_UNCORRECTABLE_ERRS; + break; + } + + status = (info->status & ~info->mask); + for (i = 0; i < max; i++) + if (status & (1 << i)) + counter[i]++; +} + int pci_aer_stats_init(struct pci_dev *pdev) { pdev->aer_stats = kzalloc(sizeof(struct aer_stats), GFP_KERNEL); From patchwork Wed May 23 17:58:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 919253 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="S5vR2tXA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rgHn20Dhz9s15 for ; Thu, 24 May 2018 03:59:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933865AbeEWR65 (ORCPT ); Wed, 23 May 2018 13:58:57 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40237 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933872AbeEWR6u (ORCPT ); Wed, 23 May 2018 13:58:50 -0400 Received: by mail-pl0-f65.google.com with SMTP id t12-v6so13486280plo.7 for ; Wed, 23 May 2018 10:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lGeDCO5KZ5HItt68m3W4CPfVPF88mA0i3ujcMAiFAH4=; b=S5vR2tXAlQ7wefnc3Mvnghw8BBzWzuZLDuTY4FSrhDcvR6PAb4tJipuBF9fcPQE+Nx oHDo35Gv4KQaqMvwsyuwG4z+qFVXEIOCbUu1TxIOGrDlUhX9VrB71+Vzf0im6ExIBr/Y loUuKBKsqCc0abQZyIHYszx+X0WczciTyHTmvwoKEAIYGRetRSnFLXHXe+5CQCO5Lc6E QhxpwgM/JgHcTW7X+abOOo6slGHZyhJqK6rRBzNU+rZn4Nmx7PiNJWUhf+JfZxG5gVk8 o/wWnP3P6dWTmdYNFkz7Otv4ycnhGw9I349jMU5WmsvW1y43Af10kZtkaVOmoXLBeqJY Nvtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lGeDCO5KZ5HItt68m3W4CPfVPF88mA0i3ujcMAiFAH4=; b=gzAggOVZEardbzoYNdxB3XsEeDoGojDWTdtW17iq88jhQYuYDHp8fN+3nWkbVF0fzc 7w2caKfmHCPP3Eobvf98vs6q14opaCAcC/fJQ3u2sI0mdDJS0um/JXTfs40qA3EQ8aVO oKCpLTDtacsGjHPI6Q2ruTQsWcAQ1U5jFbF//C84+AvkmDV/EyQAjUIL5DqyaDKeygdo WY8nFIoUeEcTILIPDJwgO/PRBU7RZKntXGO8c9ACR99dJnXVAz9VX3KaCQsnKw2TNaMR jtLevjscW5+ja+dEt7z8IXd721NtejnjqkRXoCXRjyZzxGh01AnycLEUW3OsEIJPozAG sCGg== X-Gm-Message-State: ALKqPwcN8eprpUTkYzeDLwSojZ8CIHzEXUDr9EJFPljLgVa+Xt1GmDR2 UuJpriHZLWd8CrQ5w9UXAXqlKA== X-Google-Smtp-Source: AB8JxZpANP7RRVLgE9Map1o+daOHFMLJQf8w7bGDmcbQM/YJK0CR6JK8FrlDveuA7A2vvFWsTO/u8g== X-Received: by 2002:a17:902:6f16:: with SMTP id w22-v6mr3860123plk.216.1527098329768; Wed, 23 May 2018 10:58:49 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([2620:0:1000:1501:dc81:9a9e:fdee:decf]) by smtp.gmail.com with ESMTPSA id k186-v6sm41433025pfc.142.2018.05.23.10.58.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 10:58:49 -0700 (PDT) From: Rajat Jain To: Bjorn Helgaas , Jonathan Corbet , Philippe Ombredanne , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Rajat Jain , Frederick Lawler , Oza Pawandeep , Keith Busch , Gabriele Paoloni , Alexandru Gagniuc , Thomas Tai , "Steven Rostedt (VMware)" , linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jes Sorensen , Kyle McMartin Cc: rajatxjain@gmail.com, Rajat Jain Subject: [PATCH v2 3/5] PCI/AER: Add sysfs attributes to provide breakdown of AERs Date: Wed, 23 May 2018 10:58:06 -0700 Message-Id: <20180523175808.28030-4-rajatja@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180523175808.28030-1-rajatja@google.com> References: <20180522222805.80314-1-rajatja@google.com> <20180523175808.28030-1-rajatja@google.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add sysfs attributes to provide breakdown of the AERs seen, into different type of correctable or uncorrectable errors: dev_breakdown_correctable dev_breakdown_uncorrectable Signed-off-by: Rajat Jain --- v2: Use tabs instead of spaces, fix the subject, and print all non zero counters. drivers/pci/pcie/aer/aerdrv.h | 6 ++++++ drivers/pci/pcie/aer/aerdrv_errprint.c | 6 ++++-- drivers/pci/pcie/aer/aerdrv_stats.c | 28 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index b5d5ad6f2c03..048fbd7c9633 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h @@ -89,6 +89,12 @@ 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); +extern const char +*aer_correctable_error_string[AER_MAX_TYPEOF_CORRECTABLE_ERRS]; + +extern const char +*aer_uncorrectable_error_string[AER_MAX_TYPEOF_UNCORRECTABLE_ERRS]; + #ifdef CONFIG_ACPI_APEI int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); #else diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 5e8b98deda08..5585f309f1a8 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -68,7 +68,8 @@ static const char *aer_error_layer[] = { "Transaction Layer" }; -static const char *aer_correctable_error_string[] = { +const char +*aer_correctable_error_string[AER_MAX_TYPEOF_CORRECTABLE_ERRS] = { "Receiver Error", /* Bit Position 0 */ NULL, NULL, @@ -87,7 +88,8 @@ static const char *aer_correctable_error_string[] = { "Header Log Overflow", /* Bit Position 15 */ }; -static const char *aer_uncorrectable_error_string[] = { +const char +*aer_uncorrectable_error_string[AER_MAX_TYPEOF_UNCORRECTABLE_ERRS] = { "Undefined", /* Bit Position 0 */ NULL, NULL, diff --git a/drivers/pci/pcie/aer/aerdrv_stats.c b/drivers/pci/pcie/aer/aerdrv_stats.c index 5555beffef2b..e47321b267f6 100644 --- a/drivers/pci/pcie/aer/aerdrv_stats.c +++ b/drivers/pci/pcie/aer/aerdrv_stats.c @@ -58,10 +58,38 @@ aer_stats_aggregate_attr(dev_total_cor_errs); aer_stats_aggregate_attr(dev_total_fatal_errs); aer_stats_aggregate_attr(dev_total_nonfatal_errs); +#define aer_stats_breakdown_attr(field, stats_array, strings_array) \ + static ssize_t \ + field##_show(struct device *dev, struct device_attribute *attr, \ + char *buf) \ +{ \ + unsigned int i; \ + char *str = buf; \ + struct pci_dev *pdev = to_pci_dev(dev); \ + u64 *stats = pdev->aer_stats->stats_array; \ + for (i = 0; i < ARRAY_SIZE(strings_array); i++) { \ + if (strings_array[i]) \ + str += sprintf(str, "%s = 0x%llx\n", \ + strings_array[i], stats[i]); \ + else if (stats[i]) \ + str += sprintf(str, #stats_array "bit[%d] = 0x%llx\n",\ + i, stats[i]); \ + } \ + return str-buf; \ +} \ +static DEVICE_ATTR_RO(field) + +aer_stats_breakdown_attr(dev_breakdown_correctable, dev_cor_errs, + aer_correctable_error_string); +aer_stats_breakdown_attr(dev_breakdown_uncorrectable, dev_uncor_errs, + aer_uncorrectable_error_string); + static struct attribute *aer_stats_attrs[] __ro_after_init = { &dev_attr_dev_total_cor_errs.attr, &dev_attr_dev_total_fatal_errs.attr, &dev_attr_dev_total_nonfatal_errs.attr, + &dev_attr_dev_breakdown_correctable.attr, + &dev_attr_dev_breakdown_uncorrectable.attr, NULL }; From patchwork Wed May 23 17:58:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 919261 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="f5WpiZnj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rgKb5yMqz9s0W for ; Thu, 24 May 2018 04:00:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932962AbeEWSAF (ORCPT ); Wed, 23 May 2018 14:00:05 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:34690 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933880AbeEWR6w (ORCPT ); Wed, 23 May 2018 13:58:52 -0400 Received: by mail-pl0-f67.google.com with SMTP id ay10-v6so13494224plb.1 for ; Wed, 23 May 2018 10:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rRJmxrzXnUxJl5YE/ieiOxX3vdnvlw4/Cw16gBRP6I0=; b=f5WpiZnjE2Z0ZdMKxx/JMooxieg6CgiFpCXUpYMqRul2gSz+T0stNdzzGG9WV6qfi/ Yg0NKY1ZY56TIV5yNKB2dMbr9BtATvhEA9e27ZFsqMvIhnaNkyW0kmSPiMR4PLrLpOgL dPdcobj0J73n02ClCCFGlsi+FoI18rzI0UK5un24y2NNKWZxQ6r+YsXZLHS2/exLbC81 bxcExxZd6v7vbF73xcKyqleMAQItLshG/qkroF9ZnW+PK4X7DZpHotBqkrzI6yTA83ZM PdGizY2n2qS/PHIp5rl23CkUgobdqqsWHldhTPQ3PdHREwGT4sub6dTgJiFLV3JKoXaG ZOHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rRJmxrzXnUxJl5YE/ieiOxX3vdnvlw4/Cw16gBRP6I0=; b=BL1jR03ZRYHFSiRsyhUWCsSTycpe/54Qm5njdlSeKknFRnFCmsNKbSaNI+xC3HDIkk y20WbEMQEoLousLob6IUxFGqaOW10NXpBECdA0L+KUmPygy+yskIYheMAjLn06qFzqY0 rT3ykoHMVFwPrIZgXzfZ4LL4I+1RlnOae7w7AuxYvmAkEH3Cxu9UgXmn5XKoiU6eOwuT N38SPpoYjQf4eTZerxwUt2tt/SR4pYflK/OMrptRTZkZt+E49XtqNIpvkxidsM4830BZ kOt/2qb9jv806V9NiT5E0XgsBcaGUDmtnaTlKEd9vb+O9LsEvJwqmlg1HxOp+Km+ZL5w gpyg== X-Gm-Message-State: ALKqPwcUGnYlv+zia6qDnI0T1g0V/FlXy03t/W+mkOMMYwwdPDtzMGv1 5pb3vFSPS2H2/W49XgaaBIpkdg== X-Google-Smtp-Source: AB8JxZoJ0vsBkwR20eATk59eL6A+UeO5JRaGh5s88NT4oUzdax+soTzsJ9gthppCwZ9EpSbOnQy1vw== X-Received: by 2002:a17:902:28a7:: with SMTP id f36-v6mr3890374plb.155.1527098331982; Wed, 23 May 2018 10:58:51 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([2620:0:1000:1501:dc81:9a9e:fdee:decf]) by smtp.gmail.com with ESMTPSA id k186-v6sm41433025pfc.142.2018.05.23.10.58.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 10:58:51 -0700 (PDT) From: Rajat Jain To: Bjorn Helgaas , Jonathan Corbet , Philippe Ombredanne , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Rajat Jain , Frederick Lawler , Oza Pawandeep , Keith Busch , Gabriele Paoloni , Alexandru Gagniuc , Thomas Tai , "Steven Rostedt (VMware)" , linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jes Sorensen , Kyle McMartin Cc: rajatxjain@gmail.com Subject: [PATCH v2 4/5] PCI/AER: Add sysfs attributes for rootport cumulative stats Date: Wed, 23 May 2018 10:58:07 -0700 Message-Id: <20180523175808.28030-5-rajatja@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180523175808.28030-1-rajatja@google.com> References: <20180522222805.80314-1-rajatja@google.com> <20180523175808.28030-1-rajatja@google.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add sysfs attributes for rootport statistics (that are cumulative of all the ERR_* messages seen on this PCI hierarchy). Signed-off-by: Rajat Jain --- v2: same as v1 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 e47321b267f6..898c9bc02ec2 100644 --- a/drivers/pci/pcie/aer/aerdrv_stats.c +++ b/drivers/pci/pcie/aer/aerdrv_stats.c @@ -57,6 +57,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 (!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); From patchwork Wed May 23 17:58:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 919257 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="PB0Ho++U"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rgJl3W0Bz9s15 for ; Thu, 24 May 2018 03:59:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933907AbeEWR7A (ORCPT ); Wed, 23 May 2018 13:59:00 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:42255 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933891AbeEWR6z (ORCPT ); Wed, 23 May 2018 13:58:55 -0400 Received: by mail-pg0-f65.google.com with SMTP id p9-v6so9746667pgc.9 for ; Wed, 23 May 2018 10:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2EJ4D+L/5H9znFFvXT8cS2yNFydduxQdfWP8MkCCpCY=; b=PB0Ho++UDSX86btyoWRXqC1Djl9bfLrR7i3orXdiboy4BkwUN8Q/NGNhOZT5yD1E6f XezwC/7BrycTX4uwMFDZ2PUGPU3oPcdAEltyCYn5NnS0Jm+eiA6u9dxb1HpEHmX3hoHu NteX6WMFSjQU8hhRPXZK9eibRDrsNJbQJRJM5qCckdEy1ZMi8q53f8guer5ML3MhW95x fWcgqk2/4NXTGnI+tq4zbX873lRMnTfDoMJH5vlb17gVf4+2NQzVypgIQOfN5/NA4bmj Oi4mqys6sQZusMcJCSGi5jcXbUGuQxuxIfiX0doNIzQHv1lRwRolRr9REsAF+wLPV0Lc 5+Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2EJ4D+L/5H9znFFvXT8cS2yNFydduxQdfWP8MkCCpCY=; b=Q51434UlN5nCa1tjVIYWbYSr6bbMmNhC71JvbC0pkgUW8vbkvEqySgbCTeh+UyUsPG URIxnEX0ACzsk3lJ3x4v9+ygrMdUFY+sOfoH5JalTWlcqMQWtnZICCGdyHzfIBW46r4r O6EoG/esZMwV5FZr6YF8EUYPfqNCHxaiFM+hEsJxxGNYwi+uXG1NP2oX7uO1avdcmZrO i1q5PItxGgphur5vGiJ1XIGagrPOEB9hvUfxjcx3UcSqTpA2V3A3xVON+lPBSyqC3eAu TPmHec983nLjBe/t1DLzhkDLG2vgYOtunXUpL+LKaVubgjTEAlwWXDSkImTHah+Zgayg p0Dg== X-Gm-Message-State: ALKqPwelayu3wHhPKsLQG8BDTstksODIiiIW2IYEdX9ZE11EIv9ad1gd 7IKUkBPwLbHvmDB9lOhaTyivHQ== X-Google-Smtp-Source: AB8JxZomxsrEJinog35+5xAo3ZeUIpJNr3Xq4Si+cwbjBhi7QbK75AGd3dqLdO+Ysk/Lt5/jLRH0qQ== X-Received: by 2002:a63:a743:: with SMTP id w3-v6mr3085079pgo.374.1527098334165; Wed, 23 May 2018 10:58:54 -0700 (PDT) Received: from rajat.mtv.corp.google.com ([2620:0:1000:1501:dc81:9a9e:fdee:decf]) by smtp.gmail.com with ESMTPSA id k186-v6sm41433025pfc.142.2018.05.23.10.58.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 10:58:53 -0700 (PDT) From: Rajat Jain To: Bjorn Helgaas , Jonathan Corbet , Philippe Ombredanne , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Rajat Jain , Frederick Lawler , Oza Pawandeep , Keith Busch , Gabriele Paoloni , Alexandru Gagniuc , Thomas Tai , "Steven Rostedt (VMware)" , linux-pci@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Jes Sorensen , Kyle McMartin Cc: rajatxjain@gmail.com Subject: [PATCH v2 5/5] Documentation/ABI: Add details of PCI AER statistics Date: Wed, 23 May 2018 10:58:08 -0700 Message-Id: <20180523175808.28030-6-rajatja@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180523175808.28030-1-rajatja@google.com> References: <20180522222805.80314-1-rajatja@google.com> <20180523175808.28030-1-rajatja@google.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add the PCI AER statistics details to Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats and provide a pointer to it in Documentation/PCI/pcieaer-howto.txt Signed-off-by: Rajat Jain --- v2: Move the documentation to Documentation/ABI/ .../testing/sysfs-bus-pci-devices-aer_stats | 103 ++++++++++++++++++ Documentation/PCI/pcieaer-howto.txt | 5 + 2 files changed, 108 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats new file mode 100644 index 000000000000..f55c389290ac --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats @@ -0,0 +1,103 @@ +========================== +PCIe Device AER statistics +========================== +These attributes show up under all the devices that are AER capable. These +statistical counters indicate the errors "as seen/reported by the device". +Note that this may mean that if an end point is causing problems, the AER +counters may increment at its link partner (e.g. root port) because the +errors will be "seen" / reported by the link partner and not the the +problematic end point itself (which may report all counters as 0 as it never +saw any problems). + +Where: /sys/bus/pci/devices//aer_stats/dev_total_cor_errs +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Total number of correctable errors seen and reported by this + PCI device using ERR_COR. + +Where: /sys/bus/pci/devices//aer_stats/dev_total_fatal_errs +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Total number of uncorrectable fatal errors seen and reported + by this PCI device using ERR_FATAL. + +Where: /sys/bus/pci/devices//aer_stats/dev_total_nonfatal_errs +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Total number of uncorrectable non-fatal errors seen and reported + by this PCI device using ERR_NONFATAL. + +Where: /sys/bus/pci/devices//aer_stats/dev_breakdown_correctable +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Breakdown of of correctable errors seen and reported by this + PCI device using ERR_COR. A sample result looks like this: +----------------------------------------- +Receiver Error = 0x174 +Bad TLP = 0x19 +Bad DLLP = 0x3 +RELAY_NUM Rollover = 0x0 +Replay Timer Timeout = 0x1 +Advisory Non-Fatal = 0x0 +Corrected Internal Error = 0x0 +Header Log Overflow = 0x0 +----------------------------------------- + +Where: /sys/bus/pci/devices//aer_stats/dev_breakdown_uncorrectable +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Breakdown of of correctable errors seen and reported by this + PCI device using ERR_FATAL or ERR_NONFATAL. A sample result + looks like this: +----------------------------------------- +Undefined = 0x0 +Data Link Protocol = 0x0 +Surprise Down Error = 0x0 +Poisoned TLP = 0x0 +Flow Control Protocol = 0x0 +Completion Timeout = 0x0 +Completer Abort = 0x0 +Unexpected Completion = 0x0 +Receiver Overflow = 0x0 +Malformed TLP = 0x0 +ECRC = 0x0 +Unsupported Request = 0x0 +ACS Violation = 0x0 +Uncorrectable Internal Error = 0x0 +MC Blocked TLP = 0x0 +AtomicOp Egress Blocked = 0x0 +TLP Prefix Blocked Error = 0x0 +----------------------------------------- + +============================ +PCIe Rootport AER statistics +============================ +These attributes showup under only the rootports that are AER capable. These +indicate the number of error messages as "reported to" the rootport. Please note +that the rootports also transmit (internally) the ERR_* messages for errors seen +by the internal rootport PCI device, so these counters includes them and are +thus cumulative of all the error messages on the PCI hierarchy originating +at that root port. + +Where: /sys/bus/pci/devices//aer_stats/rootport_total_cor_errs +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Total number of ERR_COR messages reported to rootport. + +Where: /sys/bus/pci/devices//aer_stats/rootport_total_fatal_errs +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Total number of ERR_FATAL messages reported to rootport. + +Where: /sys/bus/pci/devices//aer_stats/rootport_total_nonfatal_errs +Date: May 2018 +Kernel Version: 4.17.0 +Contact: linux-pci@vger.kernel.org, rajatja@google.com +Description: Total number of ERR_NONFATAL messages reported to rootport. diff --git a/Documentation/PCI/pcieaer-howto.txt b/Documentation/PCI/pcieaer-howto.txt index acd0dddd6bb8..91b6e677cb8c 100644 --- a/Documentation/PCI/pcieaer-howto.txt +++ b/Documentation/PCI/pcieaer-howto.txt @@ -73,6 +73,11 @@ In the example, 'Requester ID' means the ID of the device who sends the error message to root port. Pls. refer to pci express specs for other fields. +2.4 AER Statistics / Counters + +When PCIe AER errors are captured, the counters / statistics are also exposed +in form of sysfs attributes which are documented at +Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats 3. Developer Guide