* [PATCH 1/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio console
@ 2011-05-08 2:14 Asias He
2011-05-08 2:14 ` [PATCH 2/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio blk Asias He
2011-05-08 2:14 ` [PATCH 3/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio rng Asias He
0 siblings, 2 replies; 3+ messages in thread
From: Asias He @ 2011-05-08 2:14 UTC (permalink / raw)
To: Pekka Enberg, Cyrill Gorcunov, Ingo Molnar, Sasha Levin,
Prasad Joshi
Cc: kvm, Asias He
This patch uses IRQ injection mechanism introduced by
virt_queue__trigger_irq() which respect virtio IRQ status
and VRING_AVAIL_F_NO_INTERRUPT.
Signed-off-by: Asias He <asias.hejun@gmail.com>
---
tools/kvm/virtio/console.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/kvm/virtio/console.c b/tools/kvm/virtio/console.c
index 188227b..f5449ba 100644
--- a/tools/kvm/virtio/console.c
+++ b/tools/kvm/virtio/console.c
@@ -49,6 +49,7 @@ struct con_dev {
u32 guest_features;
u16 config_vector;
u8 status;
+ u8 isr;
u16 queue_selector;
void *jobs[VIRTIO_CONSOLE_NUM_QUEUES];
@@ -85,7 +86,7 @@ static void virtio_console__inject_interrupt_callback(struct kvm *self, void *pa
head = virt_queue__get_iov(vq, iov, &out, &in, self);
len = term_getc_iov(CONSOLE_VIRTIO, iov, in);
virt_queue__set_used_elem(vq, head, len);
- kvm__irq_line(self, virtio_console_pci_device.irq_line, 1);
+ virt_queue__trigger_irq(vq, virtio_console_pci_device.irq_line, &cdev.isr, self);
}
mutex_unlock(&cdev.mutex);
@@ -139,8 +140,9 @@ static bool virtio_console_pci_io_in(struct kvm *self, u16 port, void *data, int
ioport__write8(data, cdev.status);
break;
case VIRTIO_PCI_ISR:
- ioport__write8(data, 0x1);
- kvm__irq_line(self, virtio_console_pci_device.irq_line, 0);
+ ioport__write8(data, cdev.isr);
+ kvm__irq_line(self, virtio_console_pci_device.irq_line, VIRTIO_IRQ_LOW);
+ cdev.isr = VIRTIO_IRQ_LOW;
break;
case VIRTIO_MSI_CONFIG_VECTOR:
ioport__write16(data, cdev.config_vector);
@@ -170,7 +172,7 @@ static void virtio_console_handle_callback(struct kvm *self, void *param)
virt_queue__set_used_elem(vq, head, len);
}
- kvm__irq_line(self, virtio_console_pci_device.irq_line, 1);
+ virt_queue__trigger_irq(vq, virtio_console_pci_device.irq_line, &cdev.isr, self);
}
static bool virtio_console_pci_io_out(struct kvm *self, u16 port, void *data, int size, u32 count)
--
1.7.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio blk
2011-05-08 2:14 [PATCH 1/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio console Asias He
@ 2011-05-08 2:14 ` Asias He
2011-05-08 2:14 ` [PATCH 3/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio rng Asias He
1 sibling, 0 replies; 3+ messages in thread
From: Asias He @ 2011-05-08 2:14 UTC (permalink / raw)
To: Pekka Enberg, Cyrill Gorcunov, Ingo Molnar, Sasha Levin,
Prasad Joshi
Cc: kvm, Asias He
This patch uses IRQ injection mechanism introduced by
virt_queue__trigger_irq() which respect virtio IRQ status
and VRING_AVAIL_F_NO_INTERRUPT.
Signed-off-by: Asias He <asias.hejun@gmail.com>
---
tools/kvm/virtio/blk.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c
index cc3dc78..12c7029 100644
--- a/tools/kvm/virtio/blk.c
+++ b/tools/kvm/virtio/blk.c
@@ -38,6 +38,7 @@ struct blk_dev {
u32 guest_features;
u16 config_vector;
u8 status;
+ u8 isr;
u8 idx;
/* virtio queue */
@@ -102,8 +103,9 @@ static bool virtio_blk_pci_io_in(struct kvm *self, u16 port, void *data, int siz
ioport__write8(data, bdev->status);
break;
case VIRTIO_PCI_ISR:
- ioport__write8(data, 0x1);
- kvm__irq_line(self, bdev->pci_hdr.irq_line, 0);
+ ioport__write8(data, bdev->isr);
+ kvm__irq_line(self, bdev->pci_hdr.irq_line, VIRTIO_IRQ_LOW);
+ bdev->isr = VIRTIO_IRQ_LOW;
break;
case VIRTIO_MSI_CONFIG_VECTOR:
ioport__write16(data, bdev->config_vector);
@@ -167,7 +169,7 @@ static void virtio_blk_do_io(struct kvm *kvm, void *param)
while (virt_queue__available(vq))
virtio_blk_do_io_request(kvm, bdev, vq);
- kvm__irq_line(kvm, bdev->pci_hdr.irq_line, 1);
+ virt_queue__trigger_irq(vq, bdev->pci_hdr.irq_line, &bdev->isr, kvm);
}
static bool virtio_blk_pci_io_out(struct kvm *self, u16 port, void *data, int size, u32 count)
--
1.7.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio rng
2011-05-08 2:14 [PATCH 1/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio console Asias He
2011-05-08 2:14 ` [PATCH 2/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio blk Asias He
@ 2011-05-08 2:14 ` Asias He
1 sibling, 0 replies; 3+ messages in thread
From: Asias He @ 2011-05-08 2:14 UTC (permalink / raw)
To: Pekka Enberg, Cyrill Gorcunov, Ingo Molnar, Sasha Levin,
Prasad Joshi
Cc: kvm, Asias He
This patch uses IRQ injection mechanism introduced by
virt_queue__trigger_irq() which respect virtio IRQ status
and VRING_AVAIL_F_NO_INTERRUPT.
Signed-off-by: Asias He <asias.hejun@gmail.com>
---
tools/kvm/virtio/rng.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/kvm/virtio/rng.c b/tools/kvm/virtio/rng.c
index d355cf8..f692dfd 100644
--- a/tools/kvm/virtio/rng.c
+++ b/tools/kvm/virtio/rng.c
@@ -37,6 +37,7 @@ static struct pci_device_header virtio_rng_pci_device = {
struct rng_dev {
u8 status;
+ u8 isr;
u16 config_vector;
int fd;
@@ -72,8 +73,9 @@ static bool virtio_rng_pci_io_in(struct kvm *kvm, u16 port, void *data, int size
ioport__write8(data, rdev.status);
break;
case VIRTIO_PCI_ISR:
- ioport__write8(data, 0x1);
- kvm__irq_line(kvm, virtio_rng_pci_device.irq_line, 0);
+ ioport__write8(data, rdev.isr);
+ kvm__irq_line(kvm, virtio_rng_pci_device.irq_line, VIRTIO_IRQ_LOW);
+ rdev.isr = VIRTIO_IRQ_LOW;
break;
case VIRTIO_MSI_CONFIG_VECTOR:
ioport__write16(data, rdev.config_vector);
@@ -106,7 +108,7 @@ static void virtio_rng_do_io(struct kvm *kvm, void *param)
while (virt_queue__available(vq)) {
virtio_rng_do_io_request(kvm, vq);
- kvm__irq_line(kvm, virtio_rng_pci_device.irq_line, 1);
+ virt_queue__trigger_irq(vq, virtio_rng_pci_device.irq_line, &rdev.isr, kvm);
}
}
--
1.7.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-08 2:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-08 2:14 [PATCH 1/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio console Asias He
2011-05-08 2:14 ` [PATCH 2/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio blk Asias He
2011-05-08 2:14 ` [PATCH 3/3] kvm tools: Use virt_queue__trigger_irq() to trigger IRQ for virtio rng Asias He
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).