From patchwork Mon Feb 17 18:43:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Roger Pau Monne X-Patchwork-Id: 11387189 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 DE2DD109A for ; Mon, 17 Feb 2020 18:44:59 +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 B9E2B222D9 for ; Mon, 17 Feb 2020 18:44:59 +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="eAYZbMzl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9E2B222D9 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 1j3lN1-0000iR-3l; Mon, 17 Feb 2020 18:43:51 +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 1j3lMz-0000hW-9q for xen-devel@lists.xenproject.org; Mon, 17 Feb 2020 18:43:49 +0000 X-Inumbo-ID: 6898f1bb-51b5-11ea-8038-12813bfff9fa Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6898f1bb-51b5-11ea-8038-12813bfff9fa; Mon, 17 Feb 2020 18:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1581965019; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rG8KLMeN06AJxdotn6i7hM/KmkebutaAnlDONowQjhw=; b=eAYZbMzlRNewwslS8fgsC6Ae6JgNQ0zUwLKRq5EIWtKWBInH4UyTMFVa TAEhOlxPx5JCWYyECw6JeQ6xh1p15fU3VGcMS/RNEkTqLSa11Qa9lCiJA 8JNGMdI0E4xZTpk0YI3PGT56nJtYnDYKs9Pkkb2vR3vkZQYY1btIK532i A=; Authentication-Results: esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.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=esa3.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 (esa3.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=esa3.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: TD5CMsJuxOKjuqygVLYHDDocyC5WLDc+97MjO5N0kR0AxqqiKjzSqhmfOd7yvGwulMNaCogCHB IH+2kBIA1tsZ3O5nX9yzRROThONTMRhpCnXmhISKUsrG0Ll7BIx+lh8j1d4eoj+Li6Nz6adrX0 nNZvHlTJ7ltZPNLFSSrCitsT2jY2kERDI3+yzoEKWDycnLvEiFBJCsQ0HaCFJQ1RgyW9icuNMo YYl6AyBmxjhSyAr9AO723Cb+hVLwTGXAT9LsjYVZN3hBDGFMoZwZsThxcBhH9WA72eF0TTtX4u cNA= X-SBRS: 2.7 X-MesageID: 12569860 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,453,1574139600"; d="scan'208";a="12569860" From: Roger Pau Monne To: Date: Mon, 17 Feb 2020 19:43:22 +0100 Message-ID: <20200217184324.73762-5-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200217184324.73762-1-roger.pau@citrix.com> References: <20200217184324.73762-1-roger.pau@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 4/6] x86: track when in #NMI 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 running in #MC context. This is modeled after the in_irq helpers, but does not support reentry. 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é --- xen/arch/x86/traps.c | 6 ++++++ xen/include/asm-x86/hardirq.h | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3dbc66bb64..f4f2c13ae9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1692,9 +1692,13 @@ void do_nmi(const struct cpu_user_regs *regs) bool handle_unknown = false; this_cpu(nmi_count)++; + nmi_enter(); if ( nmi_callback(regs, cpu) ) + { + nmi_exit(); return; + } /* * Accessing port 0x61 may trap to SMM which has been actually @@ -1720,6 +1724,8 @@ void do_nmi(const struct cpu_user_regs *regs) if ( !(reason & 0xc0) && handle_unknown ) unknown_nmi_error(regs, reason); } + + nmi_exit(); } nmi_callback_t *set_nmi_callback(nmi_callback_t *callback) diff --git a/xen/include/asm-x86/hardirq.h b/xen/include/asm-x86/hardirq.h index af3eab6a4d..8bcae99eac 100644 --- a/xen/include/asm-x86/hardirq.h +++ b/xen/include/asm-x86/hardirq.h @@ -2,12 +2,14 @@ #define __ASM_HARDIRQ_H #include +#include +#include #include typedef struct { unsigned int __softirq_pending; unsigned int __local_irq_count; - unsigned int __nmi_count; + bool in_nmi; unsigned int mc_count; bool_t __mwait_wakeup; } __cacheline_aligned irq_cpustat_t; @@ -23,6 +25,20 @@ typedef struct { #define mc_enter() (mc_count(smp_processor_id())++) #define mc_exit() (mc_count(smp_processor_id())--) +#define in_nmi() __IRQ_STAT(smp_processor_id(), in_nmi) + +static inline void nmi_enter(void) +{ + ASSERT(!in_nmi()); + in_nmi() = true; +} + +static inline void nmi_exit(void) +{ + ASSERT(in_nmi()); + in_nmi() = false; +} + void ack_bad_irq(unsigned int irq); extern void apic_intr_init(void);