From nobody Mon Feb 9 10:29:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1582541265; cv=none; d=zohomail.com; s=zohoarc; b=k9x0+GisZJQ5UGaAYIixo7PtxZ5zk5vGbO0hCqvA6nA41Zoy0n7yOHQSmV5jy3rTelwQqxgyUvtKVxPmku88JOlaiLZym/zsZmFTHRS7Hj40Ugyk3JPKuFljrArfZroY6/GCUTV9l8YS4FFN6v7dgWmwaiGthIQjZ35OL6ge6aE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582541265; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YZ133DXi5Wb9OXCBsBl5MnH6QM5wYsOTG96eW2Uvu7I=; b=BfGc1t/rJsxvXf0orbcj64p5/Q1v7HGuWTfzXCI46TU6ewfEOn8fledyMpyW/fHQUAmFe60Ot09DFRLipljmnKSHPnkC5So12XlvaD3On97DWLkLFbJmaqLTIaW4Gx2gWZuT8a6pWh063wodFzD5xqirrQaWVFe70+pF6v7IEW0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1582541265179892.3143739417089; Mon, 24 Feb 2020 02:47:45 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j6BGd-0004vG-7V; Mon, 24 Feb 2020 10:47:15 +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 1j6BGc-0004ui-E9 for xen-devel@lists.xenproject.org; Mon, 24 Feb 2020 10:47:14 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ff593ac9-56f2-11ea-8ae3-12813bfff9fa; Mon, 24 Feb 2020 10:47:07 +0000 (UTC) X-Inumbo-ID: ff593ac9-56f2-11ea-8ae3-12813bfff9fa 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=TZGAL5hiLy9HUPmxEbmzKb3cybQ/vBg7leeFHU/gW84=; b=TwnI6wn9dhDFpoMzNS0MMHMnSynbIoR1dMlNn20HSFgMgGVp4fb419HM srEdG+0WkRZTZBwTt1zAAHWOnXUp7hXBrjbmX6iBb2P1mSK0VQhz6ffMh cJ9rpQ4REjtWDjSHTkBQJkXA4kVvM0Xi62GYjBtFWVe1JCLe0XwI6U7/4 I=; 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 (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; 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: AN9iZEfhtX8i4tJ5QYK7IOk1OXNMp5Hu6tLS9AUJjQo8NKU7/5E6prgdWvF9C8EkiTkZPaaLAr pDLBmbzRqiFITbnxOh37FvM2ycWbUle5Nck9rmVTJBesoOA0C/17Uq1S+OGJc/FDsxLZmob0ST pMyra9SdluymrJh+Fw9unlynHU30JiLWzFkU0JXIPM2F1/OK9M7KpwpuMLS2NGEX/n5JXEm0xP B3yUXxjSKn+a58ddiPgtwBPle4kX8SCZoR8VcUb0zmNx8pFRIkd3P+D/DGBGYcyR7XMK5R+D8C +vU= X-SBRS: 2.7 X-MesageID: 13255827 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="13255827" From: Roger Pau Monne To: Date: Mon, 24 Feb 2020 11:46:42 +0100 Message-ID: <20200224104645.96381-3-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 2/5] 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: Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , Andrew Cooper , Ian Jackson , George Dunlap , Jan Beulich , Roger Pau Monne Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add helpers to track when running in #NMI context. This is modeled after the in_irq helpers. The SDM states that no #NMI can be delivered while handling a #NMI until the processor has executed an iret instruction. It's possible however that another fault is received while handling the #NMI (a #MC for example), and thus the iret from that fault would allow further #NMIs to be injected while still processing the previous one, and hence an integer is needed in order to keep track of in service #NMIs. While there move nmi_count() into a x86 specific header and drop the leading underscores from __nmi_count field. Note that there are no users of in_nmi() introduced by the change, further users will be added by followup changes. Signed-off-by: Roger Pau Monn=C3=A9 --- Changes since v2: - Use an integer instead of a boolean to keep track of in service #NMIs. - Move nmi_count into x86 specific header. - Drop leading underscores from __nmi_count field. --- xen/arch/x86/traps.c | 6 ++++++ xen/include/asm-x86/hardirq.h | 7 ++++++- xen/include/xen/irq_cpustat.h | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) 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 =3D false; =20 this_cpu(nmi_count)++; + nmi_enter(); =20 if ( nmi_callback(regs, cpu) ) + { + nmi_exit(); return; + } =20 /* * 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(); } =20 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 34e1b49260..6ccce75881 100644 --- a/xen/include/asm-x86/hardirq.h +++ b/xen/include/asm-x86/hardirq.h @@ -7,7 +7,7 @@ typedef struct { unsigned int __softirq_pending; unsigned int __local_irq_count; - unsigned int __nmi_count; + unsigned int nmi_count; bool_t __mwait_wakeup; } __cacheline_aligned irq_cpustat_t; =20 @@ -18,6 +18,11 @@ typedef struct { #define irq_enter() (local_irq_count(smp_processor_id())++) #define irq_exit() (local_irq_count(smp_processor_id())--) =20 +#define nmi_count(cpu) __IRQ_STAT((cpu), nmi_count) +#define in_nmi() (nmi_count(smp_processor_id()) !=3D 0) +#define nmi_enter() (nmi_count(smp_processor_id())++) +#define nmi_exit() (nmi_count(smp_processor_id())--) + void ack_bad_irq(unsigned int irq); =20 extern void apic_intr_init(void); diff --git a/xen/include/xen/irq_cpustat.h b/xen/include/xen/irq_cpustat.h index 73629f6ec8..b9629f25c2 100644 --- a/xen/include/xen/irq_cpustat.h +++ b/xen/include/xen/irq_cpustat.h @@ -24,7 +24,6 @@ extern irq_cpustat_t irq_stat[]; /* arch independent irq_stat fields */ #define softirq_pending(cpu) __IRQ_STAT((cpu), __softirq_pending) #define local_irq_count(cpu) __IRQ_STAT((cpu), __local_irq_count) -#define nmi_count(cpu) __IRQ_STAT((cpu), __nmi_count) #define mwait_wakeup(cpu) __IRQ_STAT((cpu), __mwait_wakeup) =20 #endif /* __irq_cpustat_h */ --=20 2.25.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel