Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp1356018imm; Wed, 20 Jun 2018 16:45:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL1vgS/A/0+Ri56nv39K8J0RBwhoyDtYrd0R2Tet5G7tIPiLg36OAjCcUmdAj5r3TVi08bT X-Received: by 2002:a17:902:4c88:: with SMTP id b8-v6mr25039227ple.285.1529538301961; Wed, 20 Jun 2018 16:45:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529538301; cv=none; d=google.com; s=arc-20160816; b=B/vMP3/7mpH2YprISLGylaLJTBqqHYbmKGnKSR99z0/KqMDBdZvpX+PRpK6SDeOVds 9PPUbYsTFn5ahBONgx2VWQPkUHPFv8Ed3tUmoshVUn5RI9jzOZGThDbpRdZkqnlUb0iP iIuCaF4WiYiaHMYVoBoDt/uH4Xgruo5hbgEwGTYv5mlHZ3ML9NKnsg0puCR8qSD8Z1/3 JkRtP4xaTkRkSP2Ec8WKEXL935BDtCwegjzsQwpORKtT1z29/62cIvGocK8DDifqomkC oGfJbwYcVLVLeYQ3O5E2S4ZtLNvwlRAwegDmmCsW+pDHON9gEWquGiJkcRJ1MzN25pUl ztiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references:message-id :in-reply-to:date:mime-version:dkim-signature :arc-authentication-results; bh=HbPphrPgrwZiI0UaiOZxcuo16fa2Czqq94oYMKrxuKw=; b=FrJKWaaCFtCe9NqxY68vxuTlnA3La9Mf/vgaW5H6b2uNHfl9Z2DK0G2NmzXBpCTLYy KAkLr+quF5pnINkFIYyFTw7XM19NXCXOIPEPSGFjrMFRv5MacRRU/fzZqPR1Y3nHkeDZ ctpSrN51juNT4RnDmDGaBd2SCZsDN2QDs837qg2/6gvjEJLS4heyrtV3AMKB4Uv70lrm dTLpNP3tenh+cxM9EtTGSMhlUKobzUWxYT6r/ARkBU0lLWLSwmaxQMUKHy3raPEjnWfA uMfSNpk0pnSkKYJH2mYbaf5SEHT97aok6CIF66oZ989meTNMz6C5t2phHI7TglWdCKnq v5AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=NlZoJsB5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bc5-v6si3376387plb.413.2018.06.20.16.44.48; Wed, 20 Jun 2018 16:45:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=NlZoJsB5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933014AbeFTXmA (ORCPT + 99 others); Wed, 20 Jun 2018 19:42:00 -0400 Received: from mail-io0-f201.google.com ([209.85.223.201]:35870 "EHLO mail-io0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932795AbeFTXl6 (ORCPT ); Wed, 20 Jun 2018 19:41:58 -0400 Received: by mail-io0-f201.google.com with SMTP id k22-v6so1091453iob.3 for ; Wed, 20 Jun 2018 16:41:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:in-reply-to:message-id:references:subject:from:to :cc; bh=HbPphrPgrwZiI0UaiOZxcuo16fa2Czqq94oYMKrxuKw=; b=NlZoJsB59uqg3I6uPfO2ldvT/SEKfrpONu/M+HwEvIbGMByuyjrgGe3ozmPKaGjPxr NxY7D4fh4Ue0dWT8anpTGIA0JivwvDKV0HXR0TnR3cXqXICMdZaj4E3mlO1ankd0VR3b O/qnmJYlX+Hon8sRBxNgaZ71HnxuWZiykvDCCPqpo0MPcqFlQKOlJ/RMeXBx4Y+vHDzA YGS6Mp5/9DGJo4Xiq+whNouzPZtZFkJn7oDv32oj3Ob+RRdaStZUqlcrsYYVd7C0u119 UevEIgDJWrSiRzDOlbrMr3McOTlEytBsGuzFKFGarnPaBGzNjBMAPb0k3mP7T5jYs5QP +UGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:in-reply-to:message-id :references:subject:from:to:cc; bh=HbPphrPgrwZiI0UaiOZxcuo16fa2Czqq94oYMKrxuKw=; b=BDIrEeiWpXRfHar1lK5s3t8V0r4T28KVHgG4bz5XPAl+VNJWE4mdxHLTwdAR1Dro1v GevmJbZpozrInbQTmx0Gv1QExKc25OaaCMasZlQQC+ZG/5mIzPzseHA8WiwPQylZNwBp NL4XonMD76aE02UmvxLyYBbZ2E2rVbCa5AAyLyU16CIovZ9xfNDiEiiWjDgAuBGVs85u zPcb/3puuBkFvW7TXfcx1tRr6AP2v8nBEmj+FURkTSTuu2knNR3j8NvEOY72sSAM8cfc lVmmbQfPkik4clTWyZg1Wj3xDR5/LrNar4DOYDPtaywzrJrVXUkaglvrd7AVc6lXb2ln qGcw== X-Gm-Message-State: APt69E1VBXoP0yvoReg6y3ZD/4Qpj4pggFYEJC2UpfODcj9d/g/Ci04y kNbxFVVYrobOeiWtXcODYp9edXSiBMjc MIME-Version: 1.0 X-Received: by 2002:a24:2545:: with SMTP id g66-v6mr1725181itg.19.1529538117815; Wed, 20 Jun 2018 16:41:57 -0700 (PDT) Date: Wed, 20 Jun 2018 16:41:43 -0700 In-Reply-To: <20180522222805.80314-1-rajatja@google.com> Message-Id: <20180620234147.48438-1-rajatja@google.com> References: <20180522222805.80314-1-rajatja@google.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog Subject: [PATCH v5 1/5] PCI/AER: Define and allocate aer_stats structure for AER capable devices From: Rajat Jain To: Bjorn Helgaas , Jonathan Corbet , Philippe Ombredanne , Kate Stewart , Thomas Gleixner , Greg Kroah-Hartman , Frederick Lawler , Oza Pawandeep , Keith Busch , 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 , rajatxjain@gmail.com, helgaas@kernel.org Cc: Rajat Jain Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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). Signed-off-by: Rajat Jain --- v5: Same as v4 v4: Same as v3 v3: Merge everything in aer.c drivers/pci/pcie/aer.c | 60 ++++++++++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 1 + include/linux/pci.h | 3 +++ 3 files changed, 64 insertions(+) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index a2e88386af28..f9fa994b6c33 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -33,6 +33,9 @@ #define AER_ERROR_SOURCES_MAX 100 #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; @@ -76,6 +79,40 @@ struct aer_rpc { */ }; +/* 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; +}; + #define AER_LOG_TLP_MASKS (PCI_ERR_UNC_POISON_TLP| \ PCI_ERR_UNC_ECRC| \ PCI_ERR_UNC_UNSUP| \ @@ -402,12 +439,35 @@ int pci_cleanup_aer_error_status_regs(struct pci_dev *dev) return 0; } +static 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; +} + +static void pci_aer_stats_exit(struct pci_dev *pdev) +{ + kfree(pdev->aer_stats); + pdev->aer_stats = NULL; +} + 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); +} + #define AER_AGENT_RECEIVER 0 #define AER_AGENT_REQUESTER 1 #define AER_AGENT_COMPLETER 2 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ac876e32de4b..48edd0c9e4bc 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 340029b2fb38..8d59c6c19a19 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 */ @@ -1471,10 +1472,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 -- 2.18.0.rc1.244.gcf134e6275-goog