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 4/4] x86/nvmx: update exit bitmap when using virtual interrupt delivery
Date: Thu, 26 Mar 2020 16:27:20 +0100 [thread overview]
Message-ID: <20200326152720.36970-5-roger.pau@citrix.com> (raw)
In-Reply-To: <20200326152720.36970-1-roger.pau@citrix.com>
Force an update of the EOI exit bitmap in nvmx_update_apicv, because
the one performed in vmx_intr_assist might not be reached if the
interrupt is intercepted by nvmx_intr_intercept returning true.
Extract the code to update the exit bitmap from vmx_intr_assist into a
helper and use it in nvmx_update_apicv.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Changes since v2:
- Only update the EOI exit bitmap if GUEST_INTR_STATUS is changed.
Changes since v1:
- Reword commit message.
---
xen/arch/x86/hvm/vmx/intr.c | 21 +++++++++++++--------
xen/arch/x86/hvm/vmx/vvmx.c | 3 +++
xen/include/asm-x86/hvm/vmx/vmx.h | 2 ++
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c
index 49a1295f09..000e14af49 100644
--- a/xen/arch/x86/hvm/vmx/intr.c
+++ b/xen/arch/x86/hvm/vmx/intr.c
@@ -224,6 +224,18 @@ static int nvmx_intr_intercept(struct vcpu *v, struct hvm_intack intack)
return 0;
}
+void vmx_sync_exit_bitmap(struct vcpu *v)
+{
+ const unsigned int n = ARRAY_SIZE(v->arch.hvm.vmx.eoi_exit_bitmap);
+ unsigned int i;
+
+ while ( (i = find_first_bit(&v->arch.hvm.vmx.eoi_exitmap_changed, n)) < n )
+ {
+ clear_bit(i, &v->arch.hvm.vmx.eoi_exitmap_changed);
+ __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm.vmx.eoi_exit_bitmap[i]);
+ }
+}
+
void vmx_intr_assist(void)
{
struct hvm_intack intack;
@@ -318,7 +330,6 @@ void vmx_intr_assist(void)
intack.source != hvm_intsrc_vector )
{
unsigned long status;
- unsigned int i, n;
/*
* intack.vector is the highest priority vector. So we set eoi_exit_bitmap
@@ -379,13 +390,7 @@ void vmx_intr_assist(void)
intack.vector;
__vmwrite(GUEST_INTR_STATUS, status);
- n = ARRAY_SIZE(v->arch.hvm.vmx.eoi_exit_bitmap);
- while ( (i = find_first_bit(&v->arch.hvm.vmx.eoi_exitmap_changed,
- n)) < n )
- {
- clear_bit(i, &v->arch.hvm.vmx.eoi_exitmap_changed);
- __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm.vmx.eoi_exit_bitmap[i]);
- }
+ vmx_sync_exit_bitmap(v);
pt_intr_post(v, intack);
}
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index 39fb553590..452f69e2f7 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1420,7 +1420,10 @@ static void nvmx_update_apicv(struct vcpu *v)
}
if ( status )
+ {
__vmwrite(GUEST_INTR_STATUS, status);
+ vmx_sync_exit_bitmap(v);
+ }
}
static void virtual_vmexit(struct cpu_user_regs *regs)
diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h
index b334e1ec94..111ccd7e61 100644
--- a/xen/include/asm-x86/hvm/vmx/vmx.h
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h
@@ -610,6 +610,8 @@ void update_guest_eip(void);
void vmx_pi_per_cpu_init(unsigned int cpu);
void vmx_pi_desc_fixup(unsigned int cpu);
+void vmx_sync_exit_bitmap(struct vcpu *v);
+
#ifdef CONFIG_HVM
void vmx_pi_hooks_assign(struct domain *d);
void vmx_pi_hooks_deassign(struct domain *d);
--
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 ` [Xen-devel] [PATCH v3 1/4] Revert "x86/vvmx: fix virtual interrupt injection when Ack on exit control is used" Roger Pau Monne
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 ` Roger Pau Monne [this message]
2020-03-27 2:22 ` [Xen-devel] [PATCH v3 4/4] x86/nvmx: update exit bitmap when using virtual interrupt delivery 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-5-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).