From: Yang Zhang <yang.z.zhang@intel.com>
To: xen-devel@lists.xensource.com
Cc: Yang Zhang <yang.z.zhang@Intel.com>,
keir.xen@gmail.com, JBeulich@suse.com
Subject: [PATCH 2/7] Nested VMX: Allow to ack irq even virtual intr delivery is enabled
Date: Fri, 9 Aug 2013 16:49:30 +0800 [thread overview]
Message-ID: <1376038175-18571-3-git-send-email-yang.z.zhang@intel.com> (raw)
In-Reply-To: <1376038175-18571-1-git-send-email-yang.z.zhang@intel.com>
From: Yang Zhang <yang.z.zhang@Intel.com>
In some special cases, we want to ack irq regardless of virtual interrupt delivery.
Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
---
xen/arch/x86/hvm/irq.c | 2 +-
xen/arch/x86/hvm/vlapic.c | 4 ++--
xen/include/asm-x86/hvm/vlapic.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index 9eae5de..6a6fb68 100644
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -437,7 +437,7 @@ struct hvm_intack hvm_vcpu_ack_pending_irq(
intack.vector = (uint8_t)vector;
break;
case hvm_intsrc_lapic:
- if ( !vlapic_ack_pending_irq(v, intack.vector) )
+ if ( !vlapic_ack_pending_irq(v, intack.vector, 0) )
intack = hvm_intack_none;
break;
case hvm_intsrc_vector:
diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 7a154f9..20a36a0 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -1048,11 +1048,11 @@ int vlapic_has_pending_irq(struct vcpu *v)
return irr;
}
-int vlapic_ack_pending_irq(struct vcpu *v, int vector)
+int vlapic_ack_pending_irq(struct vcpu *v, int vector, int force_ack)
{
struct vlapic *vlapic = vcpu_vlapic(v);
- if ( vlapic_virtual_intr_delivery_enabled() )
+ if ( vlapic_virtual_intr_delivery_enabled() && !force_ack )
return 1;
vlapic_set_vector(vector, &vlapic->regs->data[APIC_ISR]);
diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h
index 021a5f2..d8c9511 100644
--- a/xen/include/asm-x86/hvm/vlapic.h
+++ b/xen/include/asm-x86/hvm/vlapic.h
@@ -96,7 +96,7 @@ bool_t is_vlapic_lvtpc_enabled(struct vlapic *vlapic);
void vlapic_set_irq(struct vlapic *vlapic, uint8_t vec, uint8_t trig);
int vlapic_has_pending_irq(struct vcpu *v);
-int vlapic_ack_pending_irq(struct vcpu *v, int vector);
+int vlapic_ack_pending_irq(struct vcpu *v, int vector, int force_ack);
int vlapic_init(struct vcpu *v);
void vlapic_destroy(struct vcpu *v);
--
1.7.1
next prev parent reply other threads:[~2013-08-09 8:49 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-09 8:49 [PATCH 0/7] Nested VMX: APIC-v related bug fixing Yang Zhang
2013-08-09 8:49 ` [PATCH 1/7] Nested VMX: Introduce interrupt source supporting Yang Zhang
2013-08-09 10:14 ` Andrew Cooper
2013-08-09 12:03 ` Jan Beulich
2013-08-11 2:30 ` Zhang, Yang Z
2013-08-09 8:49 ` Yang Zhang [this message]
2013-08-09 10:28 ` [PATCH 2/7] Nested VMX: Allow to ack irq even virtual intr delivery is enabled Andrew Cooper
2013-08-09 10:32 ` Zhang, Yang Z
2013-08-09 12:04 ` Jan Beulich
2013-08-11 2:30 ` Zhang, Yang Z
2013-08-09 12:06 ` Jan Beulich
2013-08-11 2:43 ` Zhang, Yang Z
2013-08-12 6:47 ` Jan Beulich
2013-08-13 1:10 ` Zhang, Yang Z
2013-08-13 10:30 ` Jan Beulich
2013-08-09 8:49 ` [PATCH 3/7] Nested VMX: Force check ISR when L2 is running Yang Zhang
2013-08-09 10:38 ` Andrew Cooper
2013-08-09 12:12 ` Jan Beulich
2013-08-11 2:49 ` Zhang, Yang Z
2013-08-12 6:47 ` Jan Beulich
2013-08-09 8:49 ` [PATCH 4/7] Nested VMX: Add interface to update vPPR Yang Zhang
2013-08-09 10:42 ` Andrew Cooper
2013-08-09 12:14 ` Jan Beulich
2013-08-11 2:50 ` Zhang, Yang Z
2013-08-09 8:49 ` [PATCH 5/7] Nested VMX: Check whether interrupt is blocked by TPR Yang Zhang
2013-08-09 10:43 ` Andrew Cooper
2013-08-09 12:16 ` Jan Beulich
2013-08-11 2:51 ` Zhang, Yang Z
2013-08-09 8:49 ` [PATCH 6/7] Nested VMX: Update APIC-v(RVI/SVI) when vmexit to L1 Yang Zhang
2013-08-09 10:49 ` Andrew Cooper
2013-08-09 12:31 ` Jan Beulich
2013-08-11 2:59 ` Zhang, Yang Z
2013-08-12 6:53 ` Jan Beulich
2013-08-13 1:08 ` Zhang, Yang Z
2013-08-15 1:41 ` Zhang, Yang Z
2013-08-15 6:26 ` Jan Beulich
2013-08-09 8:49 ` [PATCH 7/7] Nested VMX: Clear APIC-v control bit in vmcs02 Yang Zhang
2013-08-09 10:50 ` Andrew Cooper
2013-08-09 12:37 ` Jan Beulich
2013-08-11 3:04 ` Zhang, Yang Z
2013-08-09 12:00 ` [PATCH 0/7] Nested VMX: APIC-v related bug fixing 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=1376038175-18571-3-git-send-email-yang.z.zhang@intel.com \
--to=yang.z.zhang@intel.com \
--cc=JBeulich@suse.com \
--cc=keir.xen@gmail.com \
--cc=xen-devel@lists.xensource.com \
/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).