From patchwork Fri Mar 17 16:10:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 13179307 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 6545AC6FD1D for ; Fri, 17 Mar 2023 17:07:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.511179.790131 (Exim 4.92) (envelope-from ) id 1pdDXa-0000rZ-8H; Fri, 17 Mar 2023 17:06:54 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 511179.790131; Fri, 17 Mar 2023 17:06:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pdDXa-0000rS-5d; Fri, 17 Mar 2023 17:06:54 +0000 Received: by outflank-mailman (input) for mailman id 511179; Fri, 17 Mar 2023 17:06:52 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pdDXY-0000rM-OP for xen-devel@lists.xenproject.org; Fri, 17 Mar 2023 17:06:52 +0000 Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 1a0be55e-c4e6-11ed-87f5-c1b5be75604c; Fri, 17 Mar 2023 18:06:50 +0100 (CET) Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.16.1/8.15.2) with ESMTPS id 32HH6J3F064584 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 17 Mar 2023 13:06:25 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 32HH6JPj064583; Fri, 17 Mar 2023 10:06:19 -0700 (PDT) (envelope-from ehem) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1a0be55e-c4e6-11ed-87f5-c1b5be75604c Message-Id: From: Elliott Mitchell To: xen-devel@lists.xenproject.org Cc: Jan Beulich Cc: Andrew Cooper Cc: =?unknown-8bit?b?IlJvZ2VyIFBhdSBNb25uw6kiIDxyb2dlci5wYXVAY2l0cml4LmNv?= =?unknown-8bit?b?bT4=?= Cc: Wei Liu Date: Fri, 17 Mar 2023 09:10:56 -0700 Subject: [PATCH] x86/APIC: modify error_interrupt() to output using single printk() This takes care of the issue of APIC errors tending to occur on multiple cores at one. In turn this tends to causes the error messages to be merged together, making understanding them difficult. Signed-off-by: Elliott Mitchell --- xen/arch/x86/apic.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index f71474d47d..5399488120 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -1412,6 +1412,12 @@ static void cf_check error_interrupt(struct cpu_user_regs *regs) }; unsigned int v, v1; int i; + char head[] = XENLOG_DEBUG "APIC error on CPU%u: %02x(%02x)"; + char entry[] = ", %s"; + /* header string, ", %s" for each potential entry, newline */ + char fmt[sizeof(head) + ARRAY_SIZE(esr_fields) * (sizeof(entry) - 1) + 1]; + const char *args[ARRAY_SIZE(esr_fields)]; + unsigned int count = 0; /* First tickle the hardware, only then report what went on. -- REW */ v = apic_read(APIC_ESR); @@ -1419,12 +1425,18 @@ static void cf_check error_interrupt(struct cpu_user_regs *regs) v1 = apic_read(APIC_ESR); ack_APIC_irq(); - printk(XENLOG_DEBUG "APIC error on CPU%u: %02x(%02x)", - smp_processor_id(), v , v1); + memcpy(fmt, head, sizeof(head) - 1); + for ( i = 7; i >= 0; --i ) - if ( v1 & (1 << i) ) - printk(", %s", esr_fields[i]); - printk("\n"); + if ( v1 & (1 << i) ) { + memcpy(fmt + sizeof(head) + (sizeof(entry) - 1) * count - 1, entry, + sizeof(entry) - 1); + args[count++] = esr_fields[i]; + } + memcpy(fmt + sizeof(head) + (sizeof(entry) - 1) * count - 1, "\n", 2); + /*_Static_assert(ARRAY_SIZE(args) == 8, "printk() here needs args added");*/ + printk(fmt, smp_processor_id(), v , v1, args[0], args[1], args[2], args[3], + args[4], args[5], args[6], args[7]); } /*