From patchwork Mon Feb 24 10:46:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 11400187 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DFD6317D5 for ; Mon, 24 Feb 2020 10:48:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id BB72B20828 for ; Mon, 24 Feb 2020 10:48:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="e3su4wKk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB72B20828 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j6BGj-0004zY-3o; Mon, 24 Feb 2020 10:47:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j6BGh-0004ye-EQ for xen-devel@lists.xenproject.org; Mon, 24 Feb 2020 10:47:19 +0000 X-Inumbo-ID: 00cb8a50-56f3-11ea-8ae3-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 00cb8a50-56f3-11ea-8ae3-12813bfff9fa; Mon, 24 Feb 2020 10:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1582541227; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tgPH1WkDVXXMWZqS7MqzPlMLw2kiP4tQlPJKkocGJPM=; b=e3su4wKkgLBsVkVh6HbL7VbFW4Q4bdOyPgAtBqv4NQO7EiHYywyL3vd7 6wTQEZIb/GToLV/9df547tj0umkVFFJMt2pg8HGj9pzKo0iMiEEKnaDiz 7nS+tc8bUbY9TzV98Qxbljc1QPnDqC4oDpS/ShxRJlUHHMTPBSyMLcLwj Q=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: AbeTJRnocntcbpq2ku7Rbj06wW0cbD3x5M8AYQfu4wfcG0Nd9DaCsT28HgkGxcO4C998Fc4bs5 OhZgut+/RAoh8ITL+OLjpvABtUt6xpPbPHAqO5NL5DrOcp+GUO7ThQlE8JzhkdZQwFCDEnrwNv BpqpwbT+wWmACSTL8trTpI2jR8k3Cv8454PqT8T5yAYem3QS+C/nJiey9rlk7C/v3X10QnED3N HvIvGN9O+63PPSCmgJLzRimqOZ2+fG2QOvEfpJ/SHPGnldKXFYtpVc/ri12Sr8zdaErsFPdI0p vq4= X-SBRS: 2.7 X-MesageID: 13255828 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,479,1574139600"; d="scan'208";a="13255828" From: Roger Pau Monne To: Date: Mon, 24 Feb 2020 11:46:43 +0100 Message-ID: <20200224104645.96381-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200224104645.96381-1-roger.pau@citrix.com> References: <20200224104645.96381-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 3/5] x86: track when in #MC context X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Jan Beulich , Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Add helpers to track when executing in #MC context. This is modeled after the in_irq helpers. Note that there are no users of in_mc() introduced by the change, further users will be added by followup changes. Signed-off-by: Roger Pau Monné --- Changes since v2: - Move definition of mc_count to x86 hardirq.h. --- xen/arch/x86/cpu/mcheck/mce.c | 2 ++ xen/include/asm-x86/hardirq.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index d61e582af3..93ed5752ac 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -93,7 +93,9 @@ void x86_mce_vector_register(x86_mce_vector_t hdlr) void do_machine_check(const struct cpu_user_regs *regs) { + mc_enter(); _machine_check_vector(regs); + mc_exit(); } /* diff --git a/xen/include/asm-x86/hardirq.h b/xen/include/asm-x86/hardirq.h index 6ccce75881..16dbe27de4 100644 --- a/xen/include/asm-x86/hardirq.h +++ b/xen/include/asm-x86/hardirq.h @@ -8,6 +8,7 @@ typedef struct { unsigned int __softirq_pending; unsigned int __local_irq_count; unsigned int nmi_count; + unsigned int mc_count; bool_t __mwait_wakeup; } __cacheline_aligned irq_cpustat_t; @@ -23,6 +24,11 @@ typedef struct { #define nmi_enter() (nmi_count(smp_processor_id())++) #define nmi_exit() (nmi_count(smp_processor_id())--) +#define mc_count(cpu) __IRQ_STAT((cpu), mc_count) +#define in_mc() (mc_count(smp_processor_id()) != 0) +#define mc_enter() (mc_count(smp_processor_id())++) +#define mc_exit() (mc_count(smp_processor_id())--) + void ack_bad_irq(unsigned int irq); extern void apic_intr_init(void);