From nobody Fri Dec 19 15:48:16 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 90348220689; Mon, 19 May 2025 21:37:08 +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=1747690628; cv=none; b=djr2QPRcfTlsef29ytdTH7WyeK9mr4eGxnoTUYMGyLTGP2B4EwFr5r1kQfh3riz1qyaUAju4jkc0WGG8sFcT2hkaAuQ38G5SgG2O5T7BQU8jxCM++ewexZPhxg0ZQLuZr61Ac9I9q8i2W69MLmCotDfxWjzSsc56FnC9zrqPXc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747690628; c=relaxed/simple; bh=0fgRb7smdbJxtWhXJfFNuU3g4uIG5BjvmPrF/6j6wsY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h4m3teZYGGaMhDTLWB41XxmBl7VKa6plqzhSLoDgfNWk44rg4aI/riZ4nBUMVVU2FhhSCzD+hPueUBXLS4ZjNVJI9cCAd4plczk/ZrIGKfxMsyjb124Kb/N2C2TvhAJSjPSL2mW9D24sXv6hTn/tTDBjFMElu+SHB2r+fjRYw64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VwkJyDWm; 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="VwkJyDWm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4CB8C4CEE4; Mon, 19 May 2025 21:37:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747690628; bh=0fgRb7smdbJxtWhXJfFNuU3g4uIG5BjvmPrF/6j6wsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VwkJyDWmVXRv6RpivqQ72Uim6E032744c1wHkxMcbh6KKd7y52KCcVF9wBOMgrFh/ xViYGysieiKy/ajE4DERSli4ABxri9lJVuiEHwlZfu2SCI3U1vJj2v4hBC++yQD2uz pUp5oB/EECi2miKsALvnvhmu7vYrPVyDcePX/+bIk9mEMUvpCYiy6hSyKKG9UF4HWA fXI9ZrsjvlQAr/8aH63sBsGZu92ngd5DF2PtCSNY+21WCmisfP3jDpylnd3RYMiqhg dxuiOeT3uH8UBCLP2XDnfbe9gLJAB+tq4y+NaLxYTuYK3YN16OXzYL7syC9qFLQ/u8 /L+YvRDIMZ7UA== 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 11/16] PCI/AER: Check log level once and remember it Date: Mon, 19 May 2025 16:35:53 -0500 Message-ID: <20250519213603.1257897-12-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: Karolina Stolarek When reporting an AER error, we check its type multiple times to determine the log level for each message. Do this check only in the top-level functions (aer_isr_one_error(), pci_print_aer()) and save the level in struct aer_err_info. [bhelgaas: save log level in struct aer_err_info instead of passing it as a parameter] Link: https://lore.kernel.org/r/20250321015806.954866-2-pandoh@google.com Signed-off-by: Karolina Stolarek Signed-off-by: Bjorn Helgaas Reviewed-by: Ilpo J=C3=A4rvinen Reviewed-by: Kuppuswamy Sathyanarayanan --- drivers/pci/pci.h | 1 + drivers/pci/pcie/aer.c | 21 ++++++++++----------- drivers/pci/pcie/dpc.c | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index b81e99cd4b62..705f9ef58acc 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -588,6 +588,7 @@ static inline bool pci_dev_test_and_set_removed(struct = pci_dev *dev) struct aer_err_info { struct pci_dev *dev[AER_MAX_MULTI_ERR_DEVICES]; int error_dev_num; + const char *level; /* printk level */ =20 unsigned int id:16; =20 diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 4683a99c7568..73b03a195b14 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -672,21 +672,18 @@ static void pci_rootport_aer_stats_incr(struct pci_de= v *pdev, } } =20 -static void __aer_print_error(struct pci_dev *dev, - struct aer_err_info *info) +static void __aer_print_error(struct pci_dev *dev, struct aer_err_info *in= fo) { const char **strings; unsigned long status =3D info->status & ~info->mask; - const char *level, *errmsg; + const char *level =3D info->level; + const char *errmsg; int i; =20 - if (info->severity =3D=3D AER_CORRECTABLE) { + if (info->severity =3D=3D AER_CORRECTABLE) strings =3D aer_correctable_error_string; - level =3D KERN_WARNING; - } else { + else strings =3D aer_uncorrectable_error_string; - level =3D KERN_ERR; - } =20 for_each_set_bit(i, &status, 32) { errmsg =3D strings[i]; @@ -714,7 +711,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_er= r_info *info) { int layer, agent; int id =3D pci_dev_id(dev); - const char *level; + const char *level =3D info->level; =20 pci_dev_aer_stats_incr(dev, info); =20 @@ -727,8 +724,6 @@ void aer_print_error(struct pci_dev *dev, struct aer_er= r_info *info) layer =3D AER_GET_LAYER_ERROR(info->severity, info->status); agent =3D AER_GET_AGENT(info->severity, info->status); =20 - level =3D (info->severity =3D=3D AER_CORRECTABLE) ? KERN_WARNING : KERN_E= RR; - aer_printk(level, dev, "PCIe Bus Error: severity=3D%s, type=3D%s, (%s)\n", aer_error_severity_string[info->severity], aer_error_layer[layer], aer_agent_string[agent]); @@ -774,9 +769,11 @@ void pci_print_aer(struct pci_dev *dev, int aer_severi= ty, if (aer_severity =3D=3D AER_CORRECTABLE) { status =3D aer->cor_status; mask =3D aer->cor_mask; + info.level =3D KERN_WARNING; } else { status =3D aer->uncor_status; mask =3D aer->uncor_mask; + info.level =3D KERN_ERR; tlp_header_valid =3D status & AER_LOG_TLP_MASKS; } =20 @@ -1297,6 +1294,7 @@ static void aer_isr_one_error(struct aer_rpc *rpc, struct aer_err_info e_info =3D { .id =3D ERR_COR_ID(e_src->id), .severity =3D AER_CORRECTABLE, + .level =3D KERN_WARNING, .multi_error_valid =3D multi ? 1 : 0, }; =20 @@ -1312,6 +1310,7 @@ static void aer_isr_one_error(struct aer_rpc *rpc, struct aer_err_info e_info =3D { .id =3D ERR_UNCOR_ID(e_src->id), .severity =3D fatal ? AER_FATAL : AER_NONFATAL, + .level =3D KERN_ERR, .multi_error_valid =3D multi ? 1 : 0, }; =20 diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c index 315bf2bfd570..34af0ea45c0d 100644 --- a/drivers/pci/pcie/dpc.c +++ b/drivers/pci/pcie/dpc.c @@ -252,6 +252,7 @@ static int dpc_get_aer_uncorrect_severity(struct pci_de= v *dev, else info->severity =3D AER_NONFATAL; =20 + info->level =3D KERN_WARNING; return 1; } =20 --=20 2.43.0