From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C2CCCC3ABDD for ; Mon, 19 May 2025 21:38:06 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4b1WH940Vyz303d; Tue, 20 May 2025 07:37:09 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=147.75.193.91 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1747690629; cv=none; b=ZCn4/GmlaJ0A/tTnFr2+WhagM/AAFjGoQ+D0YMNAyQdmhL1MkrKkFhUzigfxJwC6rbUC5miPOW/77xnRNftOxWb5ntUFiM877/BBXLGRYwZP/4CnwZmEvMWuWbzM5q46stOC1YFdwX0kdmYxPD0rWdJrF3CGd1UxtI6yzXNn98YNmMCgtI+pYulbt1HvQLKaYwvpzs8MvrsLh13FPyza782wzEmVoenJ+84iJFa3F9I26JQ3vg7Xq8ZNKfsuEdFmS97rSPpsLRpK2Yu3i2i9ZJKkRRsoJgjYam/jAeuM44tvZbrP6kPa5hftwsUEgcFElJ4o7uN3G4MjoSMX86wHjw== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1747690629; c=relaxed/relaxed; bh=3iUz+gztcXxZWv/wentUl2gzZOyjIpu5GgAW8Cp5mhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dNPlo0pd+w3+0M6+lF7y23y4m7MVCLfkNABf0j7bANqnqrHW7kDbFdUkPrTti9+NKz5T/1D8hiIf1gTtje8q7lm+Gu8DZRiW0R6u7NJNpqhbC/+33Egwgc9BoDd+aF0DZFOXdxXyuByGSwemnyHJU0etIriOOEr7zg+j6OmgDh2HT7sDvKhIV4fsO73T9LNm9G90xvZ62y8vitjuDv09CDSeMfoRBlxEix2KzVUyhjsuIC5MVWhVBc6Bp065E3v1w4WrHMVEX7Q6KU4sYhSmiDr6/nB4LYOYbTodU1SRf7o31oHVSwCGsS9jh4DcaCksWQRL+kCHNfz61ojv72/nOg== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=gAAYFKyt; dkim-atps=neutral; spf=pass (client-ip=147.75.193.91; helo=nyc.source.kernel.org; envelope-from=helgaas@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=gAAYFKyt; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=147.75.193.91; helo=nyc.source.kernel.org; envelope-from=helgaas@kernel.org; receiver=lists.ozlabs.org) Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4b1WH85S26z2yqg for ; Tue, 20 May 2025 07:37:08 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id CA5A7A48B1B; Mon, 19 May 2025 21:37:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DA77C4CEE4; Mon, 19 May 2025 21:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747690626; bh=NAhGtd5JfzeBCzQA1T4NEmRuVhhFv6g9vasKC+2bs3E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gAAYFKytJKXtguC5OPN1vhjjWORgKkZigyL38b0hhsQXwcn4lVNVWyJadazNUOw2e Uj40NWIQbfSHMR1iNgSam3gqXtzMymyBWMJtEGvbXCtG4uUfL+YxwT7ZZKwChpfcc/ JQRK1MP4GmjKcBUkEv/7ICdkHqIYkpKfkfr+VRiuWrIjXUdshB/XWAP2IflgiHgOX/ Dpsy6Asz22yeMeR0l7LHgZx/fxDsgR5Yt3qq2os9g53ntjlEv6yWLfH1oiyScwDqqw XS6b0kFhQzFoQ4DnzDLUpXb6sA3gZgjx9eDKxMVoQ/AFklCNrf5uCsVPMQ/61IHR+a NaAFQQqbXNz2g== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Jon Pan-Doh , Karolina Stolarek , Martin Petersen , Ben Fuller , Drew Walton , Anil Agrawal , Tony Luck , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sathyanarayanan Kuppuswamy , 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 Subject: [PATCH v6 10/16] PCI/AER: Combine trace_aer_event() with statistics updates Date: Mon, 19 May 2025 16:35:52 -0500 Message-ID: <20250519213603.1257897-11-helgaas@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250519213603.1257897-1-helgaas@kernel.org> References: <20250519213603.1257897-1-helgaas@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bjorn Helgaas As with the AER statistics, we always want to emit trace events, even if the actual dmesg logging is rate limited. Call trace_aer_event() directly from pci_dev_aer_stats_incr(), where we update the statistics. Signed-off-by: Bjorn Helgaas --- drivers/pci/pcie/aer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index eb80c382187d..4683a99c7568 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -625,6 +625,9 @@ static void pci_dev_aer_stats_incr(struct pci_dev *pdev, u64 *counter = NULL; struct aer_stats *aer_stats = pdev->aer_stats; + trace_aer_event(pci_name(pdev), (info->status & ~info->mask), + info->severity, info->tlp_header_valid, &info->tlp); + if (!aer_stats) return; @@ -741,9 +744,6 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) out: if (info->id && info->error_dev_num > 1 && info->id == id) pci_err(dev, " Error of this Agent is reported first\n"); - - trace_aer_event(dev_name(&dev->dev), (info->status & ~info->mask), - info->severity, info->tlp_header_valid, &info->tlp); } #ifdef CONFIG_ACPI_APEI_PCIEAER @@ -782,6 +782,9 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, info.status = status; info.mask = mask; + info.tlp_header_valid = tlp_header_valid; + if (tlp_header_valid) + info.tlp = aer->header_log; pci_dev_aer_stats_incr(dev, &info); @@ -799,9 +802,6 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity, if (tlp_header_valid) pcie_print_tlp_log(dev, &aer->header_log, dev_fmt(" ")); - - trace_aer_event(pci_name(dev), (status & ~mask), - aer_severity, tlp_header_valid, &aer->header_log); } EXPORT_SYMBOL_NS_GPL(pci_print_aer, "CXL"); -- 2.43.0