From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org
Cc: "Juergen Gross" <jgross@suse.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Roger Pau Monné" <roger.pau@citrix.com>, "Wei Liu" <wl@xen.org>
Subject: [PATCH v3 3/3] xen/x86: issue pci_serr error message via NMI continuation
Date: Fri, 16 Oct 2020 10:53:50 +0200 [thread overview]
Message-ID: <20201016085350.10233-4-jgross@suse.com> (raw)
In-Reply-To: <20201016085350.10233-1-jgross@suse.com>
Instead of using a softirq pci_serr_error() can use NMI continuation
for issuing an error message.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
xen/arch/x86/traps.c | 9 +++------
xen/include/asm-x86/softirq.h | 5 ++---
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 6f4db9d549..7a68ac40be 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1659,7 +1659,7 @@ void do_general_protection(struct cpu_user_regs *regs)
panic("GENERAL PROTECTION FAULT\n[error_code=%04x]\n", regs->error_code);
}
-static void pci_serr_softirq(void)
+static void pci_serr_nmicont(void *arg)
{
printk("\n\nNMI - PCI system error (SERR)\n");
outb(inb(0x61) & 0x0b, 0x61); /* re-enable the PCI SERR error line. */
@@ -1687,9 +1687,8 @@ 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. */
+ set_nmi_continuation(pci_serr_nmicont, NULL);
break;
default: /* 'fatal' */
console_force_unlock();
@@ -2183,8 +2182,6 @@ void __init trap_init(void)
percpu_traps_init();
cpu_init();
-
- open_softirq(PCI_SERR_SOFTIRQ, pci_serr_softirq);
}
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)
#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
bool arch_skip_send_event_check(unsigned int cpu);
--
2.26.2
prev parent reply other threads:[~2020-10-16 8:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 8:53 [PATCH v3 0/3] xen/x86: implement NMI continuation Juergen Gross
2020-10-16 8:53 ` [PATCH v3 1/3] xen/x86: add nmi continuation framework Juergen Gross
2020-10-20 13:33 ` Jan Beulich
2020-11-05 10:22 ` Jürgen Groß
2020-11-05 11:25 ` Jan Beulich
2020-10-16 8:53 ` [PATCH v3 2/3] xen/oprofile: use set_nmi_continuation() for sending virq to guest Juergen Gross
2020-10-16 8:53 ` Juergen Gross [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201016085350.10233-4-jgross@suse.com \
--to=jgross@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=roger.pau@citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).