From nobody Fri Dec 19 15:59:29 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 042A222424C; Mon, 19 May 2025 21:37:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747690627; cv=none; b=dP03CjZ50ym55VqUxnE7lZY6ztyn72Wg+D8IMWbf6+oLPf4xh/6zLx8QVdMRieqO0ACgTA49mIjps95AgLMXK8AwYqxQZatsTpG/P4Y3CogtFSUrxTkQDUWBR3PgLqJuQsxP0UyvBIqKKaCWHL60NeemPbsres08NZl7crjmj8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747690627; c=relaxed/simple; bh=NAhGtd5JfzeBCzQA1T4NEmRuVhhFv6g9vasKC+2bs3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=omI5on8dy3AEtKod09HEgXtqIFoVVBZfR0fFwxnMFLTinC6B5J8TNGNjutrG0DTb/rBynSv/VV91IbOr9TOPKhNjg6AgNXJZOjD7IT3+Wa4z3ahnalv6K3hh4HA6iBerDAePyFVuFBC+C9401YPrusK7oAZEXdp39nMdyW8XxQs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gAAYFKyt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gAAYFKyt" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Ilpo J=C3=A4rvinen Reviewed-by: Kuppuswamy Sathyanarayanan --- 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 =3D NULL; struct aer_stats *aer_stats =3D pdev->aer_stats; =20 + trace_aer_event(pci_name(pdev), (info->status & ~info->mask), + info->severity, info->tlp_header_valid, &info->tlp); + if (!aer_stats) return; =20 @@ -741,9 +744,6 @@ void aer_print_error(struct pci_dev *dev, struct aer_er= r_info *info) out: if (info->id && info->error_dev_num > 1 && info->id =3D=3D 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); } =20 #ifdef CONFIG_ACPI_APEI_PCIEAER @@ -782,6 +782,9 @@ void pci_print_aer(struct pci_dev *dev, int aer_severit= y, =20 info.status =3D status; info.mask =3D mask; + info.tlp_header_valid =3D tlp_header_valid; + if (tlp_header_valid) + info.tlp =3D aer->header_log; =20 pci_dev_aer_stats_incr(dev, &info); =20 @@ -799,9 +802,6 @@ void pci_print_aer(struct pci_dev *dev, int aer_severit= y, =20 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"); =20 --=20 2.43.0