From nobody Thu Apr 25 15:30:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1605186898; cv=none; d=zohomail.com; s=zohoarc; b=CPwyDbIfeiIHgJO7JGG4nyTBnkurXf5b6q5yqztP/80exe+xiqxFJ3ixKLC38QEpO6Pz0cBwmlg6lv9/UXlugUIIxoy/x6+TjD7JVOtdFX4MGVQcKXUDShek3w8SXkk9bbCxL/H1Qnxh8DIzkDGhE5nE9Weu+AiCGcPwtgdli7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605186898; 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=zktMZTHwnyh8KDaewloiOYrp8NVJ08f3acWn1GTzuRQ=; b=M1lprruXNjrRPfjD/BlcHI2u5Revd2wwBVunN/NnAOQpYNcS1MYS7+I2eSXV8EWHWgyIaZdz+2rdKg07lNCyV4moVC+KHt0n00UJgOpUqppCoPS1WWW2aksrL41x+DYuP+hwg2X32ViB6wgieGAIlghPWyKNkwC3+yUpDapuM/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine 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 1605186898786902.4426447720842; Thu, 12 Nov 2020 05:14:58 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.25847.53906 (Exim 4.92) (envelope-from ) id 1kdCQx-00068s-U2; Thu, 12 Nov 2020 13:14:39 +0000 Received: by outflank-mailman (output) from mailman id 25847.53906; Thu, 12 Nov 2020 13:14:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdCQx-00068j-PT; Thu, 12 Nov 2020 13:14:39 +0000 Received: by outflank-mailman (input) for mailman id 25847; Thu, 12 Nov 2020 13:14:38 +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.92) (envelope-from ) id 1kdCQw-0005zc-Lh for xen-devel@lists.xenproject.org; Thu, 12 Nov 2020 13:14:38 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8df1d582-b3fc-4503-9774-fc9fc284423b; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E34EDAC75; Thu, 12 Nov 2020 13:14:26 +0000 (UTC) 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.92) (envelope-from ) id 1kdCQw-0005zc-Lh for xen-devel@lists.xenproject.org; Thu, 12 Nov 2020 13:14:38 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8df1d582-b3fc-4503-9774-fc9fc284423b; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E34EDAC75; Thu, 12 Nov 2020 13:14:26 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 8df1d582-b3fc-4503-9774-fc9fc284423b X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1605186867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zktMZTHwnyh8KDaewloiOYrp8NVJ08f3acWn1GTzuRQ=; b=bwAv/CKwTJZpEl6+vBsDSeyO95J4zYnx4pm7vVM4JqM0x8OBmK9YXUTY2gKvlwrZFQy+MR OQQSn4+piHpPWQPoy2QctIrKrU/Xv3JMn1xXvdj7gPdEnc6IlWZHQoM7tpytZaUeZrjPh6 BHC4IJtPNJ7lTEJY6jKRTFiczBDcpU8= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH v5 1/3] xen/x86: add nmi continuation framework Date: Thu, 12 Nov 2020 14:14:22 +0100 Message-Id: <20201112131424.9930-2-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201112131424.9930-1-jgross@suse.com> References: <20201112131424.9930-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Actions in NMI context are rather limited as e.g. locking is rather fragile. Add a framework to continue processing in normal interrupt context after leaving NMI processing. This is done by a high priority interrupt vector triggered via a self IPI from NMI context, which will then call the continuation function specified during NMI handling. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- V5: - add comment (Jan Beulich) V4: - make the framework less generic V2: - add prototype for continuation function (Roger Pau Monn=C3=A9) - switch from softirq to explicit self-IPI (Jan Beulich) Signed-off-by: Juergen Gross --- xen/arch/x86/apic.c | 13 ++++++++++--- xen/arch/x86/genapic/x2apic.c | 1 + xen/arch/x86/smp.c | 1 + xen/arch/x86/traps.c | 21 +++++++++++++++++++++ xen/include/asm-x86/nmi.h | 11 ++++++++++- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 60627fd6e6..7497ddb5da 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -40,6 +40,7 @@ #include #include #include +#include #include =20 static bool __read_mostly tdt_enabled; @@ -1376,16 +1377,22 @@ void spurious_interrupt(struct cpu_user_regs *regs) { /* * Check if this is a vectored interrupt (most likely, as this is prob= ably - * a request to dump local CPU state). Vectored interrupts are ACKed; - * spurious interrupts are not. + * a request to dump local CPU state or to continue NMI handling). + * Vectored interrupts are ACKed; spurious interrupts are not. */ if (apic_isr_read(SPURIOUS_APIC_VECTOR)) { + bool is_spurious; + ack_APIC_irq(); + is_spurious =3D !nmi_check_continuation(); if (this_cpu(state_dump_pending)) { this_cpu(state_dump_pending) =3D false; dump_execstate(regs); - return; + is_spurious =3D false; } + + if ( !is_spurious ) + return; } =20 /* see sw-dev-man vol 3, chapter 7.4.13.5 */ diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index 077a576a7f..40284b70d1 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -89,6 +89,7 @@ static unsigned int cpu_mask_to_apicid_x2apic_cluster(con= st cpumask_t *cpumask) =20 static void send_IPI_self_x2apic(uint8_t vector) { + /* NMI continuation handling relies on using a shorthand here. */ apic_wrmsr(APIC_SELF_IPI, vector); } =20 diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 14aa355a6b..eef0f9c6cb 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -163,6 +163,7 @@ void send_IPI_self(int vector) =20 void send_IPI_self_legacy(uint8_t vector) { + /* NMI continuation handling relies on using a shorthand here. */ send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL); } =20 diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c27dd4cd43..5cbaa49031 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -79,6 +79,7 @@ #include #include #include +#include #include #include =20 @@ -1800,6 +1801,26 @@ void unset_nmi_callback(void) nmi_callback =3D dummy_nmi_callback; } =20 +bool nmi_check_continuation(void) +{ + bool ret =3D false; + + return ret; +} + +void trigger_nmi_continuation(void) +{ + /* + * Issue a self-IPI. Handling is done in spurious_interrupt(). + * NMI could have happened in IPI sequence, so wait for ICR being idle + * again before leaving NMI handler. + * This relies on self-IPI using a simple shorthand, thus avoiding any + * use of locking or percpu cpumasks. + */ + send_IPI_self(SPURIOUS_APIC_VECTOR); + apic_wait_icr_idle(); +} + void do_device_not_available(struct cpu_user_regs *regs) { #ifdef CONFIG_PV diff --git a/xen/include/asm-x86/nmi.h b/xen/include/asm-x86/nmi.h index a288f02a50..9a5da14162 100644 --- a/xen/include/asm-x86/nmi.h +++ b/xen/include/asm-x86/nmi.h @@ -33,5 +33,14 @@ nmi_callback_t *set_nmi_callback(nmi_callback_t *callbac= k); void unset_nmi_callback(void); =20 DECLARE_PER_CPU(unsigned int, nmi_count); -=20 + +/** + * trigger_nmi_continuation + * + * Schedule continuation to be started in interrupt context after NMI hand= ling. + */ +void trigger_nmi_continuation(void); + +/* Check for NMI continuation pending. */ +bool nmi_check_continuation(void); #endif /* ASM_NMI_H */ --=20 2.26.2 From nobody Thu Apr 25 15:30:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1605186897; cv=none; d=zohomail.com; s=zohoarc; b=n93sjfRnqS1S0dChYZXz1VPfT+krjqOQ+SdnVZYTtUp3yPJCJcHhhazzp/04AS8WVwTMv+gU9Vi7AcBQeZ6w+HkSUhVfdBA4GZbpA4qG7u/gfuaRDO1XTWcYi4Lhjq+X21IjVaKd7FCbb8/J3C9GwU2QhfazwkRQ8eTYx7fETQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605186897; h=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=fMXlwXyF+4tXesHMIFZzu/eTSNLM+Yoxq+N7JqzPdL0=; b=LuXXDfuIrshMbyhNRvvRS7l4fV5EvFU2UU34zamzcxALlXo2aGJYriVjfKRB1ZYM77mPeTEtiHjzFnjKOw4g2wzU3rhVoEDoq7G3/EBEDFCWCGaF2tMsVSUfWMt93AftDbSRatCUPuBhylu3zepD1ubVI96Ulw/QzOvFdY0gnYU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine 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 1605186896952856.6112811083749; Thu, 12 Nov 2020 05:14:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.25844.53870 (Exim 4.92) (envelope-from ) id 1kdCQo-0005zt-Ub; Thu, 12 Nov 2020 13:14:30 +0000 Received: by outflank-mailman (output) from mailman id 25844.53870; Thu, 12 Nov 2020 13:14:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdCQo-0005zm-Pt; Thu, 12 Nov 2020 13:14:30 +0000 Received: by outflank-mailman (input) for mailman id 25844; Thu, 12 Nov 2020 13:14:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdCQm-0005zd-Rb for xen-devel@lists.xenproject.org; Thu, 12 Nov 2020 13:14:28 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4a20110c-d835-4432-bc95-9ad6e4a819ca; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0639EAD31; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdCQm-0005zd-Rb for xen-devel@lists.xenproject.org; Thu, 12 Nov 2020 13:14:28 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4a20110c-d835-4432-bc95-9ad6e4a819ca; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 0639EAD31; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 4a20110c-d835-4432-bc95-9ad6e4a819ca X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1605186867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fMXlwXyF+4tXesHMIFZzu/eTSNLM+Yoxq+N7JqzPdL0=; b=JDE5qnZR4u+Zq1WJB6ZqJyBKZJFybw6R6w8kazehxa0oN32V0eBsZPGb/WEeyFqkeVMZuM Bm63Y9xjhWJpJ/YsMXTckP/rKNzlySF4lrbHvUE1jGM/FBvcgJZOHdMhlaoueHAJA7GQ11 kjb3KXmNwwdUxAb92B06K8zAeJjrIT4= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH v5 2/3] xen/oprofile: use NMI continuation for sending virq to guest Date: Thu, 12 Nov 2020 14:14:23 +0100 Message-Id: <20201112131424.9930-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201112131424.9930-1-jgross@suse.com> References: <20201112131424.9930-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Instead of calling send_guest_vcpu_virq() from NMI context use the NMI continuation framework for that purpose. This avoids taking locks in NMI mode. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- V5: - use Linux coding style (Jan Beulich) - assume races could happen (Jan Beulich) V4: - rework to less generic approach Signed-off-by: Juergen Gross --- xen/arch/x86/oprofile/nmi_int.c | 19 +++++++++++++++++-- xen/arch/x86/traps.c | 4 ++++ xen/include/asm-x86/xenoprof.h | 7 +++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_in= t.c index 0f103d80a6..a13bd82915 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -38,6 +38,8 @@ static unsigned long saved_lvtpc[NR_CPUS]; =20 static char *cpu_type; =20 +static DEFINE_PER_CPU(struct vcpu *, nmi_cont_vcpu); + static int passive_domain_msr_op_checks(unsigned int msr, int *typep, int = *indexp) { struct vpmu_struct *vpmu =3D vcpu_vpmu(current); @@ -83,14 +85,27 @@ void passive_domain_destroy(struct vcpu *v) model->free_msr(v); } =20 +bool nmi_oprofile_send_virq(void) +{ + struct vcpu *v =3D xchg(&this_cpu(nmi_cont_vcpu), NULL); + + if (v) + send_guest_vcpu_virq(v, VIRQ_XENOPROF); + + return v; +} + static int nmi_callback(const struct cpu_user_regs *regs, int cpu) { int xen_mode, ovf; =20 ovf =3D model->check_ctrs(cpu, &cpu_msrs[cpu], regs); xen_mode =3D ring_0(regs); - if ( ovf && is_active(current->domain) && !xen_mode ) - send_guest_vcpu_virq(current, VIRQ_XENOPROF); + if (ovf && is_active(current->domain) && !xen_mode && + !this_cpu(nmi_cont_vcpu)) { + this_cpu(nmi_cont_vcpu) =3D current; + trigger_nmi_continuation(); + } =20 if ( ovf =3D=3D 2 ) current->arch.nmi_pending =3D true; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 5cbaa49031..240fd1b089 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -65,6 +65,7 @@ #include #include #include +#include #include #include #include @@ -1805,6 +1806,9 @@ bool nmi_check_continuation(void) { bool ret =3D false; =20 + if ( nmi_oprofile_send_virq() ) + ret =3D true; + return ret; } =20 diff --git a/xen/include/asm-x86/xenoprof.h b/xen/include/asm-x86/xenoprof.h index 1026ba2e1f..cf6af8c5df 100644 --- a/xen/include/asm-x86/xenoprof.h +++ b/xen/include/asm-x86/xenoprof.h @@ -69,6 +69,8 @@ int passive_domain_do_rdmsr(unsigned int msr, uint64_t *m= sr_content); int passive_domain_do_wrmsr(unsigned int msr, uint64_t msr_content); void passive_domain_destroy(struct vcpu *v); =20 +bool nmi_oprofile_send_virq(void); + #else =20 static inline int passive_domain_do_rdmsr(unsigned int msr, @@ -85,6 +87,11 @@ static inline int passive_domain_do_wrmsr(unsigned int m= sr, =20 static inline void passive_domain_destroy(struct vcpu *v) {} =20 +static inline bool nmi_oprofile_send_virq(void) +{ + return false; +} + #endif /* CONFIG_XENOPROF */ =20 #endif /* __ASM_X86_XENOPROF_H__ */ --=20 2.26.2 From nobody Thu Apr 25 15:30:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1605186897; cv=none; d=zohomail.com; s=zohoarc; b=U1+ugIpRPXi5jHf4pofzaLlcl2zUTJIoZbOI38FjNoMf3zlSNsYKsg40xJHaUxrX/3HWeMDyIri/981VUP09VQtAgce/Y29q6P6LN1hgP40iOmPuO+ILBBsWz4NVg3KHNjJ0WhxyqVzJjmLI2WkPMRGqjkrknfzvYseOQdOa/PI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605186897; h=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=o5mPHjtNvM0yH04ZefCYBX4buH74RoSJz6jycMDPprc=; b=Y0THfkM1wk8Tok4n/Y9mHKxg3S4VkXTVDutuf9azHY9ki8/6BI6OlH6e4cNlnmSumAaRaxO3EKnQRQjpVwGbpae497sNhTINXHwyjXXyvR47Jw8PhIW8hcYxOVYEK2QhFGK34oa4GWfqJjojqubowYytuBAPFM0OcJyrfLL6DB0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine 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 1605186897741444.75081435187315; Thu, 12 Nov 2020 05:14:57 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.25846.53894 (Exim 4.92) (envelope-from ) id 1kdCQs-00063e-KP; Thu, 12 Nov 2020 13:14:34 +0000 Received: by outflank-mailman (output) from mailman id 25846.53894; Thu, 12 Nov 2020 13:14:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kdCQs-00063U-HJ; Thu, 12 Nov 2020 13:14:34 +0000 Received: by outflank-mailman (input) for mailman id 25846; Thu, 12 Nov 2020 13:14:33 +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.92) (envelope-from ) id 1kdCQr-0005zc-LT for xen-devel@lists.xenproject.org; Thu, 12 Nov 2020 13:14:33 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1999fd1d-427f-4341-a99f-98b0cbee6c58; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 30214AD35; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) 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.92) (envelope-from ) id 1kdCQr-0005zc-LT for xen-devel@lists.xenproject.org; Thu, 12 Nov 2020 13:14:33 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1999fd1d-427f-4341-a99f-98b0cbee6c58; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 30214AD35; Thu, 12 Nov 2020 13:14:27 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 1999fd1d-427f-4341-a99f-98b0cbee6c58 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1605186867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o5mPHjtNvM0yH04ZefCYBX4buH74RoSJz6jycMDPprc=; b=oEpRvoOdLB5fo5jNnw8aZ55Gx118FqotuNyKj1o63IPHzGeRyZ50h08TtRhLR+wld+sa4U oAIoOwFGnaVnUIiQn3V4qkt82GXaKTYtagwaMYDntKAbBTpXNHCiMdVWkRr2HNiCcz5+Lq 6w2nE6GX/UCdUCzhmy+oSN7sOtFiqus= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH v5 3/3] xen/x86: issue pci_serr error message via NMI continuation Date: Thu, 12 Nov 2020 14:14:24 +0100 Message-Id: <20201112131424.9930-4-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201112131424.9930-1-jgross@suse.com> References: <20201112131424.9930-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Instead of using a softirq pci_serr_error() can use NMI continuation for issuing an error message. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- V5: - make PCISERR higher prior than oprofile (Jan Beulich) V4: - rework to less generic approach --- xen/arch/x86/traps.c | 21 +++++++++++++++------ xen/include/asm-x86/softirq.h | 5 ++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 240fd1b089..0459cee9fb 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1661,10 +1661,18 @@ void do_general_protection(struct cpu_user_regs *re= gs) panic("GENERAL PROTECTION FAULT\n[error_code=3D%04x]\n", regs->error_c= ode); } =20 -static void pci_serr_softirq(void) +static bool pci_serr_cont; + +static bool pci_serr_nmicont(void) { + if ( !pci_serr_cont ) + return false; + + pci_serr_cont =3D false; printk("\n\nNMI - PCI system error (SERR)\n"); outb(inb(0x61) & 0x0b, 0x61); /* re-enable the PCI SERR error line. */ + + return true; } =20 static void nmi_hwdom_report(unsigned int reason_idx) @@ -1689,9 +1697,9 @@ static void pci_serr_error(const struct cpu_user_regs= *regs) nmi_hwdom_report(_XEN_NMIREASON_pci_serr); /* fallthrough */ case 'i': /* 'ignore' */ - /* Would like to print a diagnostic here but can't call printk() - from NMI context -- raise a softirq instead. */ - raise_softirq(PCI_SERR_SOFTIRQ); + /* Issue error message in NMI continuation. */ + pci_serr_cont =3D true; + trigger_nmi_continuation(); break; default: /* 'fatal' */ console_force_unlock(); @@ -1806,6 +1814,9 @@ bool nmi_check_continuation(void) { bool ret =3D false; =20 + if ( pci_serr_nmicont() ) + ret =3D true; + if ( nmi_oprofile_send_virq() ) ret =3D true; =20 @@ -2157,8 +2168,6 @@ void __init trap_init(void) percpu_traps_init(); =20 cpu_init(); - - open_softirq(PCI_SERR_SOFTIRQ, pci_serr_softirq); } =20 void activate_debugregs(const struct vcpu *curr) diff --git a/xen/include/asm-x86/softirq.h b/xen/include/asm-x86/softirq.h index 0b7a77f11f..415ee866c7 100644 --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -6,9 +6,8 @@ #define VCPU_KICK_SOFTIRQ (NR_COMMON_SOFTIRQS + 2) =20 #define MACHINE_CHECK_SOFTIRQ (NR_COMMON_SOFTIRQS + 3) -#define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) -#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 5) -#define NR_ARCH_SOFTIRQS 6 +#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) +#define NR_ARCH_SOFTIRQS 5 =20 bool arch_skip_send_event_check(unsigned int cpu); =20 --=20 2.26.2