Skip to contentSkip to conversation

make the injection of interrupts run at sleepable mode.

PATCH In review Izik Eidus 4 participants 6 messages Oct 15, 2007 – Oct 17, 2007 3 messages not in the archive KVM

lore
Share & tools
lore

Izik Eidus

author
#0 lore raw

PATCH 2/2 make the injection of interrupts run at sleepable mode.

Quoted 1 line

From c5761ef6c1333062a7cd9d5b0003955bc7b7a93e Mon Sep 17 00:00:00 2001

From: Izik Eidus <izike-atKUWr5tajBWk0Htik3J/[email protected]>
Date: Mon, 15 Oct 2007 23:16:42 +0200
Subject: [PATCH] this patch make the injection of interrupts run at sleepable mode.

Signed-off-by Izik Eidus <izike-atKUWr5tajBWk0Htik3J/[email protected]>
---
 drivers/kvm/kvm.h      |    3 +++
 drivers/kvm/kvm_main.c |   20 ++++++++++++++++++--
 drivers/kvm/svm.c      |    1 +
 drivers/kvm/vmx.c      |    6 ++++--
 4 files changed, 26 insertions(+), 4 deletions(-)
drivers/kvm/kvm.h +3 -0
index 74b427f..0b12a98 100644
@@ -68,6 +68,7 @@
  * vcpu->requests bit members
  */
 #define KVM_TLB_FLUSH 0
+#define VMX_INJECT_RMODE_IRQ 1
 
 /*
  * Address types:

@@ -319,6 +320,7 @@ struct kvm_vcpu {
 	int guest_mode;
 	unsigned long requests;
 	unsigned long irq_summary; /* bit vector: 1 per word in irq_pending */
+	int inject_rmode_irq;
 	DECLARE_BITMAP(irq_pending, KVM_NR_INTERRUPTS);
 	unsigned long regs[NR_VCPU_REGS]; /* for rsp: vcpu_load_rsp_rip() */
 	unsigned long rip;      /* needs vcpu_load_rsp_rip() */

@@ -520,6 +522,7 @@ struct kvm_x86_ops {
 	void (*inject_pending_irq)(struct kvm_vcpu *vcpu);
 	void (*inject_pending_vectors)(struct kvm_vcpu *vcpu,
 				       struct kvm_run *run);
+	void (*vmx_inject_rmode_irq)(struct kvm_vcpu *vcpu, int irq);
 };
 
 extern struct kvm_x86_ops *kvm_x86_ops;
drivers/kvm/kvm_main.c +18 -2
index f58d49b..0e2bbe5 100644
@@ -2178,6 +2178,10 @@ again:
 	if (unlikely(r))
 		goto out;
 
+vmx_inject_rmode:
+	if (test_and_clear_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests))
+		kvm_x86_ops->vmx_inject_rmode_irq(vcpu, vcpu->inject_rmode_irq);
+
 	preempt_disable();
 
 	kvm_x86_ops->prepare_guest_switch(vcpu);

@@ -2194,10 +2198,22 @@ again:
 		goto out;
 	}
 
-	if (irqchip_in_kernel(vcpu->kvm))
+	if (irqchip_in_kernel(vcpu->kvm)) {
 		kvm_x86_ops->inject_pending_irq(vcpu);
-	else if (!vcpu->mmio_read_completed)
+		if (test_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests)) {
+			local_irq_enable();
+			preempt_enable();
+			goto vmx_inject_rmode;
+		}
+	}
+	else if (!vcpu->mmio_read_completed) {
 		kvm_x86_ops->inject_pending_vectors(vcpu, kvm_run);
+		if (test_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests)) {
+			local_irq_enable();
+			preempt_enable();
+			goto vmx_inject_rmode;
+		}
+	}
 
 	vcpu->guest_mode = 1;
drivers/kvm/svm.c +1 -0
index f643379..77b19be 100644
@@ -1732,6 +1732,7 @@ static struct kvm_x86_ops svm_x86_ops = {
 	.set_irq = svm_set_irq,
 	.inject_pending_irq = svm_intr_assist,
 	.inject_pending_vectors = do_interrupt_requests,
+	.vmx_inject_rmode_irq = NULL,
 };
 
 static int __init svm_init(void)
drivers/kvm/vmx.c +4 -2
index 2d75599..f014971 100644
@@ -1678,10 +1678,11 @@ static void inject_rmode_irq(struct kvm_vcpu *vcpu, int irq)
 	vmcs_writel(GUEST_RSP, (vmcs_readl(GUEST_RSP) & ~0xffff) | (sp - 6));
 }
 
-static void vmx_inject_irq(struct kvm_vcpu *vcpu, int irq)
+void vmx_inject_irq(struct kvm_vcpu *vcpu, int irq)
 {
 	if (vcpu->rmode.active) {
-		inject_rmode_irq(vcpu, irq);
+		vcpu->inject_rmode_irq = irq;
+		set_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests);
 		return;
 	}
 	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,

@@ -2539,6 +2540,7 @@ static struct kvm_x86_ops vmx_x86_ops = {
 	.set_irq = vmx_inject_irq,
 	.inject_pending_irq = vmx_intr_assist,
 	.inject_pending_vectors = do_interrupt_requests,
+	.vmx_inject_rmode_irq = inject_rmode_irq,
 };
 
 static int __init vmx_init(void)
Signature · 1 line
1.5.2.4

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/

_______________________________________________
kvm-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel

A message that is not in the archive (sent off-list or not yet received): 4713DAD3.90904-atKUWr5tajBWk0Htik3J/[email protected]

#2 lore raw

On 10/15/07, Izik Eidus <izike-atKUWr5tajBWk0Htik3J/[email protected]> wrote:

I just took a quick overview on it, but to start with, why does it use a vmx specific naming ?

Signature · 11 lines
Glauber de Oliveira Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/

A message that is not in the archive (sent off-list or not yet received): 5d6222a80710151831p7ad47090qb478b304f6478859-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

author
#4 lore raw
Quoted 6 lines · Glauber de Oliveira Costa

On 10/15/07, Izik Eidus <izike-atKUWr5tajBWk0Htik3J/[email protected]> wrote:

I just took a quick overview on it, but to start with, why does it use a vmx specific naming ?

beacuse the problem is in the emulator function that the vmx have to run inside unsleepable mode for real mode.
svm have no such problem

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/

#5 lore raw
In reply to a message not in the archive
Quoted 57 lines · Izik Eidus
drivers/kvm/kvm.h +3 -0
index 74b427f..0b12a98 100644
@@ -68,6 +68,7 @@
  * vcpu->requests bit members
  */
 #define KVM_TLB_FLUSH 0
+#define VMX_INJECT_RMODE_IRQ 1
 
 /*
  * Address types:

@@ -319,6 +320,7 @@ struct kvm_vcpu {
 	int guest_mode;
 	unsigned long requests;
 	unsigned long irq_summary; /* bit vector: 1 per word in irq_pending */
+	int inject_rmode_irq;
 	DECLARE_BITMAP(irq_pending, KVM_NR_INTERRUPTS);
 	unsigned long regs[NR_VCPU_REGS]; /* for rsp: vcpu_load_rsp_rip() */
 	unsigned long rip;      /* needs vcpu_load_rsp_rip() */

@@ -520,6 +522,7 @@ struct kvm_x86_ops {
 	void (*inject_pending_irq)(struct kvm_vcpu *vcpu);
 	void (*inject_pending_vectors)(struct kvm_vcpu *vcpu,
 				       struct kvm_run *run);
+	void (*vmx_inject_rmode_irq)(struct kvm_vcpu *vcpu, int irq);
 };
 
 extern struct kvm_x86_ops *kvm_x86_ops;
drivers/kvm/kvm_main.c +11 -2
index f58d49b..0e2bbe5 100644
@@ -2178,6 +2178,10 @@ again:
 	if (unlikely(r))
 		goto out;
 
+vmx_inject_rmode:
+	if (test_and_clear_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests))
+		kvm_x86_ops->vmx_inject_rmode_irq(vcpu, vcpu->inject_rmode_irq);
+
 	preempt_disable();
 
 	kvm_x86_ops->prepare_guest_switch(vcpu);

@@ -2194,10 +2198,22 @@ again:
 		goto out;
 	}
 
-	if (irqchip_in_kernel(vcpu->kvm))
+	if (irqchip_in_kernel(vcpu->kvm)) {
 		kvm_x86_ops->inject_pending_irq(vcpu);
-	else if (!vcpu->mmio_read_completed)
+		if (test_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests)) {
+			local_irq_enable();
+			preempt_enable();
+			goto vmx_inject_rmode;
+		}
+	}

drivers/kvm/kvm_main.c again: · line 2218

Quoted 10 lines
drivers/kvm/kvm_main.c +7 -0
+	else if (!vcpu->mmio_read_completed) {
 		kvm_x86_ops->inject_pending_vectors(vcpu, kvm_run);
+		if (test_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests)) {
+			local_irq_enable();
+			preempt_enable();
+			goto vmx_inject_rmode;
+		}
+	}

This exposes a minor implementation details (how real mode irqs are injected on intel) to the core code. How about we move all interrupt injection out of the critical section? That will improve latency as well.

Signature · 8 lines
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
#6 lore raw

Re: [PATCH 2/2] make the injection of interrupts run atsleepable mode.

In reply to a message not in the archive

Not quit understand the following code. If we just set a vcpu request bits w/o real irq injection, we can't resume to guest? Othrewise, the guest is in interruptable state and can
see irq pending, but it doesn't get the interrupt.

Something missing?
thx,eddie

drivers/kvm/vmx.c +0 -0
@@ -1678,10 +1678,11 @@ static void inject_rmode_irq(struct kvm_vcpu

*vcpu, int irq)
vmcs_writel(GUEST_RSP, (vmcs_readl(GUEST_RSP) & ~0xffff) | (sp -
6));
}

-static void vmx_inject_irq(struct kvm_vcpu *vcpu, int irq) +void vmx_inject_irq(struct kvm_vcpu *vcpu, int irq)
{
if (vcpu->rmode.active) {
- inject_rmode_irq(vcpu, irq);
+ vcpu->inject_rmode_irq = irq;
+ set_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests);
return;
}
vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/

A message that is not in the archive (sent off-list or not yet received): 10EA09EFD8728347A513008B6B0DA77A023A7914-wq7ZOvIWXbNpB2pF5aRoyrfspsVTdybXVpNB7YpNyf8@public.gmane.org

author
#8 lore raw

Re: [PATCH 2/2] make the injection of interrupts run atsleepable mode.

Quoted 27 lines · Eddie

Not quit understand the following code. If we just set a vcpu request bits w/o real irq injection, we can't resume to guest? Othrewise, the guest is in interruptable state and can
see irq pending, but it doesn't get the interrupt.

Something missing?
thx,eddie

drivers/kvm/vmx.c +3 -2
@@ -1678,10 +1678,11 @@ static void inject_rmode_irq(struct kvm_vcpu
 *vcpu, int irq)
 	vmcs_writel(GUEST_RSP, (vmcs_readl(GUEST_RSP) & ~0xffff) | (sp -
 6));
 }
 
-static void vmx_inject_irq(struct kvm_vcpu *vcpu, int irq)
+void vmx_inject_irq(struct kvm_vcpu *vcpu, int irq)
 {
 	if (vcpu->rmode.active) {
-		inject_rmode_irq(vcpu, irq);
+		vcpu->inject_rmode_irq = irq;
+		set_bit(VMX_INJECT_RMODE_IRQ, &vcpu->requests);
 		return;

drivers/kvm/vmx.c

Quoted 2 lines
drivers/kvm/vmx.c +0 -0
 	}
 	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,

this come wont be applied anyway, avi wrote a better solution that was applied.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/