From: Roger Pau Monne <roger.pau@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Kevin Tian <kevin.tian@intel.com>,
Jun Nakajima <jun.nakajima@intel.com>, Wei Liu <wl@xen.org>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Jan Beulich <jbeulich@suse.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH v3 1/4] Revert "x86/vvmx: fix virtual interrupt injection when Ack on exit control is used"
Date: Thu, 26 Mar 2020 16:27:17 +0100 [thread overview]
Message-ID: <20200326152720.36970-2-roger.pau@citrix.com> (raw)
In-Reply-To: <20200326152720.36970-1-roger.pau@citrix.com>
This reverts commit f96e1469ad06b61796c60193daaeb9f8a96d7458.
The commit is wrong, as the whole point of nvmx_update_apicv is to
update the guest interrupt status field when the Ack on exit VMEXIT
control feature is enabled.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
---
xen/arch/x86/hvm/vmx/vvmx.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index f049920196..1b8461ba30 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1456,12 +1456,7 @@ static void virtual_vmexit(struct cpu_user_regs *regs)
/* updating host cr0 to sync TS bit */
__vmwrite(HOST_CR0, v->arch.hvm.vmx.host_cr0);
- if ( cpu_has_vmx_virtual_intr_delivery &&
- /*
- * Only inject the vector if the Ack on exit bit is not set, else the
- * interrupt will be signaled in the vmcs VM_EXIT_INTR_INFO field.
- */
- !(get_vvmcs(v, VM_EXIT_CONTROLS) & VM_EXIT_ACK_INTR_ON_EXIT) )
+ if ( cpu_has_vmx_virtual_intr_delivery )
nvmx_update_apicv(v);
nvcpu->nv_vmswitch_in_progress = 0;
--
2.26.0
next prev parent reply other threads:[~2020-03-26 15:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 15:27 [Xen-devel] [PATCH v3 0/4] x86/nvmx: fixes for interrupt injection Roger Pau Monne
2020-03-26 15:27 ` Roger Pau Monne [this message]
2020-03-26 15:27 ` [Xen-devel] [PATCH v3 2/4] x86/nvmx: only update SVI when using Ack on exit Roger Pau Monne
2020-03-26 15:27 ` [Xen-devel] [PATCH v3 3/4] x86/nvmx: split updating RVI from SVI in nvmx_update_apicv Roger Pau Monne
2020-03-27 2:21 ` Tian, Kevin
2020-03-27 9:48 ` Roger Pau Monné
2020-03-26 15:27 ` [Xen-devel] [PATCH v3 4/4] x86/nvmx: update exit bitmap when using virtual interrupt delivery Roger Pau Monne
2020-03-27 2:22 ` Tian, Kevin
2020-03-26 15:41 ` [Xen-devel] [PATCH v3 0/4] x86/nvmx: fixes for interrupt injection Jan Beulich
2020-03-26 15:49 ` Roger Pau Monné
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=20200326152720.36970-2-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=jun.nakajima@intel.com \
--cc=kevin.tian@intel.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).