From: Roger Pau Monne <roger.pau@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Roger Pau Monne <roger.pau@citrix.com>,
Manuel Bouyer <bouyer@antioche.eu.org>
Subject: [PATCH] vpci/msix: exit early if MSI-X is disabled
Date: Tue, 1 Dec 2020 18:40:14 +0100 [thread overview]
Message-ID: <20201201174014.27878-1-roger.pau@citrix.com> (raw)
Do not attempt to mask an MSI-X entry if MSI-X is not enabled. Else it
will lead to hitting the following assert on debug builds:
(XEN) Panic on CPU 13:
(XEN) Assertion 'entry->arch.pirq != INVALID_PIRQ' failed at vmsi.c:843
In order to fix it exit early from the switch in msix_write if MSI-X
is not enabled.
Fixes: d6281be9d0145 ('vpci/msix: add MSI-X handlers')
Reported-by: Manuel Bouyer <bouyer@antioche.eu.org>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
xen/drivers/vpci/msix.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/xen/drivers/vpci/msix.c b/xen/drivers/vpci/msix.c
index 64dd0a929c..93902ba7db 100644
--- a/xen/drivers/vpci/msix.c
+++ b/xen/drivers/vpci/msix.c
@@ -357,7 +357,11 @@ static int msix_write(struct vcpu *v, unsigned long addr, unsigned int len,
* so that it picks the new state.
*/
entry->masked = new_masked;
- if ( !new_masked && msix->enabled && !msix->masked && entry->updated )
+
+ if ( !msix->enabled )
+ break;
+
+ if ( !new_masked && !msix->masked && entry->updated )
{
/*
* If MSI-X is enabled, the function mask is not active, the entry
--
2.29.2
next reply other threads:[~2020-12-01 17:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 17:40 Roger Pau Monne [this message]
2020-12-02 8:38 ` [PATCH] vpci/msix: exit early if MSI-X is disabled Jan Beulich
2020-12-03 13:40 ` Jan Beulich
2020-12-06 11:15 ` Roger Pau Monné
2020-12-07 8:19 ` Jan Beulich
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=20201201174014.27878-1-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=bouyer@antioche.eu.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).