* [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd
@ 2012-03-20 12:31 Michael S. Tsirkin
2012-03-21 23:34 ` Amos Kong
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2012-03-20 12:31 UTC (permalink / raw)
To: Avi Kivity, Marcelo Tosatti, Anthony Liguori, Richard Henderson,
Isaku Yamahata, Jan Kiszka, qemu-devel
We use a 2 byte ioeventfd for virtio memory,
add support for this.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/ivshmem.c | 8 ++++----
kvm-all.c | 15 ++++++++-------
kvm-stub.c | 2 +-
kvm.h | 3 ++-
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 5ebf840..f02530c 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -354,8 +354,8 @@ static void close_guest_eventfds(IVShmemState *s, int posn)
guest_curr_max = s->peers[posn].nb_eventfds;
for (i = 0; i < guest_curr_max; i++) {
- kvm_set_ioeventfd_mmio_long(s->peers[posn].eventfds[i],
- s->mmio_addr + DOORBELL, (posn << 16) | i, 0);
+ kvm_set_ioeventfd_mmio(s->peers[posn].eventfds[i],
+ s->mmio_addr + DOORBELL, (posn << 16) | i, 0, 4);
close(s->peers[posn].eventfds[i]);
}
@@ -500,8 +500,8 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags)
}
if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
- if (kvm_set_ioeventfd_mmio_long(incoming_fd, s->mmio_addr + DOORBELL,
- (incoming_posn << 16) | guest_max_eventfd, 1) < 0) {
+ if (kvm_set_ioeventfd_mmio(incoming_fd, s->mmio_addr + DOORBELL,
+ (incoming_posn << 16) | guest_max_eventfd, 1, 4) < 0) {
fprintf(stderr, "ivshmem: ioeventfd not available\n");
}
}
diff --git a/kvm-all.c b/kvm-all.c
index 42e5e23..bcf0dbe 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -744,10 +744,10 @@ static void kvm_mem_ioeventfd_add(MemoryRegionSection *section,
{
int r;
- assert(match_data && section->size == 4);
+ assert(match_data && section->size <= 8);
- r = kvm_set_ioeventfd_mmio_long(fd, section->offset_within_address_space,
- data, true);
+ r = kvm_set_ioeventfd_mmio(fd, section->offset_within_address_space,
+ data, true, section->size);
if (r < 0) {
abort();
}
@@ -758,8 +758,8 @@ static void kvm_mem_ioeventfd_del(MemoryRegionSection *section,
{
int r;
- r = kvm_set_ioeventfd_mmio_long(fd, section->offset_within_address_space,
- data, false);
+ r = kvm_set_ioeventfd_mmio(fd, section->offset_within_address_space,
+ data, false, section->size);
if (r < 0) {
abort();
}
@@ -1639,14 +1639,15 @@ int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset)
return r;
}
-int kvm_set_ioeventfd_mmio_long(int fd, uint32_t addr, uint32_t val, bool assign)
+int kvm_set_ioeventfd_mmio(int fd, uint32_t addr, uint32_t val, bool assign,
+ uint32_t size)
{
int ret;
struct kvm_ioeventfd iofd;
iofd.datamatch = val;
iofd.addr = addr;
- iofd.len = 4;
+ iofd.len = size;
iofd.flags = KVM_IOEVENTFD_FLAG_DATAMATCH;
iofd.fd = fd;
diff --git a/kvm-stub.c b/kvm-stub.c
index 69a1228..0d426db 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -120,7 +120,7 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign)
return -ENOSYS;
}
-int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign)
+int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool assign, uint32_t len)
{
return -ENOSYS;
}
diff --git a/kvm.h b/kvm.h
index 330f17b..9bdbdb0 100644
--- a/kvm.h
+++ b/kvm.h
@@ -210,7 +210,8 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr,
#endif
#endif
-int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign);
+int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool assign,
+ uint32_t size);
int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign);
#endif
--
1.7.9.111.gf3fb0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd
2012-03-20 12:31 [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd Michael S. Tsirkin
@ 2012-03-21 23:34 ` Amos Kong
2012-03-22 13:28 ` Jan Kiszka
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Amos Kong @ 2012-03-21 23:34 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Anthony Liguori, Jan Kiszka, Marcelo Tosatti, qemu-devel,
Isaku Yamahata, Avi Kivity, Richard Henderson
----- Original Message -----
> We use a 2 byte ioeventfd for virtio memory,
> add support for this.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Amos Kong <akong@redhat.com>
> ---
> hw/ivshmem.c | 8 ++++----
> kvm-all.c | 15 ++++++++-------
> kvm-stub.c | 2 +-
> kvm.h | 3 ++-
> 4 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/hw/ivshmem.c b/hw/ivshmem.c
> index 5ebf840..f02530c 100644
> --- a/hw/ivshmem.c
> +++ b/hw/ivshmem.c
> @@ -354,8 +354,8 @@ static void close_guest_eventfds(IVShmemState *s,
> int posn)
> guest_curr_max = s->peers[posn].nb_eventfds;
>
> for (i = 0; i < guest_curr_max; i++) {
> - kvm_set_ioeventfd_mmio_long(s->peers[posn].eventfds[i],
> - s->mmio_addr + DOORBELL, (posn << 16) | i, 0);
> + kvm_set_ioeventfd_mmio(s->peers[posn].eventfds[i],
> + s->mmio_addr + DOORBELL, (posn << 16) | i, 0,
> 4);
> close(s->peers[posn].eventfds[i]);
> }
>
> @@ -500,8 +500,8 @@ static void ivshmem_read(void *opaque, const
> uint8_t * buf, int flags)
> }
>
> if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
> - if (kvm_set_ioeventfd_mmio_long(incoming_fd, s->mmio_addr +
> DOORBELL,
> - (incoming_posn << 16) | guest_max_eventfd,
> 1) < 0) {
> + if (kvm_set_ioeventfd_mmio(incoming_fd, s->mmio_addr +
> DOORBELL,
> + (incoming_posn << 16) | guest_max_eventfd,
> 1, 4) < 0) {
> fprintf(stderr, "ivshmem: ioeventfd not available\n");
> }
> }
> diff --git a/kvm-all.c b/kvm-all.c
> index 42e5e23..bcf0dbe 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -744,10 +744,10 @@ static void
> kvm_mem_ioeventfd_add(MemoryRegionSection *section,
> {
> int r;
>
> - assert(match_data && section->size == 4);
> + assert(match_data && section->size <= 8);
>
> - r = kvm_set_ioeventfd_mmio_long(fd,
> section->offset_within_address_space,
> - data, true);
> + r = kvm_set_ioeventfd_mmio(fd,
> section->offset_within_address_space,
> + data, true, section->size);
> if (r < 0) {
> abort();
> }
> @@ -758,8 +758,8 @@ static void
> kvm_mem_ioeventfd_del(MemoryRegionSection *section,
> {
> int r;
>
> - r = kvm_set_ioeventfd_mmio_long(fd,
> section->offset_within_address_space,
> - data, false);
> + r = kvm_set_ioeventfd_mmio(fd,
> section->offset_within_address_space,
> + data, false, section->size);
> if (r < 0) {
> abort();
> }
> @@ -1639,14 +1639,15 @@ int kvm_set_signal_mask(CPUArchState *env,
> const sigset_t *sigset)
> return r;
> }
>
> -int kvm_set_ioeventfd_mmio_long(int fd, uint32_t addr, uint32_t val,
> bool assign)
> +int kvm_set_ioeventfd_mmio(int fd, uint32_t addr, uint32_t val, bool
> assign,
> + uint32_t size)
> {
> int ret;
> struct kvm_ioeventfd iofd;
>
> iofd.datamatch = val;
> iofd.addr = addr;
> - iofd.len = 4;
> + iofd.len = size;
> iofd.flags = KVM_IOEVENTFD_FLAG_DATAMATCH;
> iofd.fd = fd;
>
> diff --git a/kvm-stub.c b/kvm-stub.c
> index 69a1228..0d426db 100644
> --- a/kvm-stub.c
> +++ b/kvm-stub.c
> @@ -120,7 +120,7 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t
> addr, uint16_t val, bool assign)
> return -ENOSYS;
> }
>
> -int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val,
> bool assign)
> +int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool
> assign, uint32_t len)
> {
> return -ENOSYS;
> }
> diff --git a/kvm.h b/kvm.h
> index 330f17b..9bdbdb0 100644
> --- a/kvm.h
> +++ b/kvm.h
> @@ -210,7 +210,8 @@ int kvm_physical_memory_addr_from_host(KVMState
> *s, void *ram_addr,
> #endif
>
> #endif
> -int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val,
> bool assign);
> +int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool
> assign,
> + uint32_t size);
>
> int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val,
> bool assign);
> #endif
> --
> 1.7.9.111.gf3fb0
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd
2012-03-20 12:31 [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd Michael S. Tsirkin
2012-03-21 23:34 ` Amos Kong
@ 2012-03-22 13:28 ` Jan Kiszka
2012-03-22 13:28 ` Jan Kiszka
2012-03-22 13:32 ` Avi Kivity
3 siblings, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2012-03-22 13:28 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Anthony Liguori, Marcelo Tosatti, qemu-devel, Isaku Yamahata,
Avi Kivity, Richard Henderson
On 2012-03-20 13:31, Michael S. Tsirkin wrote:
> We use a 2 byte ioeventfd for virtio memory,
> add support for this.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/ivshmem.c | 8 ++++----
> kvm-all.c | 15 ++++++++-------
> kvm-stub.c | 2 +-
> kvm.h | 3 ++-
> 4 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/hw/ivshmem.c b/hw/ivshmem.c
> index 5ebf840..f02530c 100644
> --- a/hw/ivshmem.c
> +++ b/hw/ivshmem.c
> @@ -354,8 +354,8 @@ static void close_guest_eventfds(IVShmemState *s, int posn)
> guest_curr_max = s->peers[posn].nb_eventfds;
>
> for (i = 0; i < guest_curr_max; i++) {
> - kvm_set_ioeventfd_mmio_long(s->peers[posn].eventfds[i],
> - s->mmio_addr + DOORBELL, (posn << 16) | i, 0);
> + kvm_set_ioeventfd_mmio(s->peers[posn].eventfds[i],
> + s->mmio_addr + DOORBELL, (posn << 16) | i, 0, 4);
> close(s->peers[posn].eventfds[i]);
> }
>
> @@ -500,8 +500,8 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags)
> }
>
> if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
> - if (kvm_set_ioeventfd_mmio_long(incoming_fd, s->mmio_addr + DOORBELL,
> - (incoming_posn << 16) | guest_max_eventfd, 1) < 0) {
> + if (kvm_set_ioeventfd_mmio(incoming_fd, s->mmio_addr + DOORBELL,
> + (incoming_posn << 16) | guest_max_eventfd, 1, 4) < 0) {
> fprintf(stderr, "ivshmem: ioeventfd not available\n");
> }
> }
> diff --git a/kvm-all.c b/kvm-all.c
> index 42e5e23..bcf0dbe 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -744,10 +744,10 @@ static void kvm_mem_ioeventfd_add(MemoryRegionSection *section,
> {
> int r;
>
> - assert(match_data && section->size == 4);
> + assert(match_data && section->size <= 8);
Probably nitpicking, but does it also work with non-power-of-two sizes?
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd
2012-03-20 12:31 [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd Michael S. Tsirkin
2012-03-21 23:34 ` Amos Kong
2012-03-22 13:28 ` Jan Kiszka
@ 2012-03-22 13:28 ` Jan Kiszka
2012-03-22 13:31 ` Avi Kivity
2012-03-22 13:32 ` Avi Kivity
3 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2012-03-22 13:28 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Anthony Liguori, Marcelo Tosatti, qemu-devel, Isaku Yamahata,
Avi Kivity, Richard Henderson
On 2012-03-20 13:31, Michael S. Tsirkin wrote:
> We use a 2 byte ioeventfd for virtio memory,
> add support for this.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/ivshmem.c | 8 ++++----
> kvm-all.c | 15 ++++++++-------
> kvm-stub.c | 2 +-
> kvm.h | 3 ++-
> 4 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/hw/ivshmem.c b/hw/ivshmem.c
> index 5ebf840..f02530c 100644
> --- a/hw/ivshmem.c
> +++ b/hw/ivshmem.c
> @@ -354,8 +354,8 @@ static void close_guest_eventfds(IVShmemState *s, int posn)
> guest_curr_max = s->peers[posn].nb_eventfds;
>
> for (i = 0; i < guest_curr_max; i++) {
> - kvm_set_ioeventfd_mmio_long(s->peers[posn].eventfds[i],
> - s->mmio_addr + DOORBELL, (posn << 16) | i, 0);
> + kvm_set_ioeventfd_mmio(s->peers[posn].eventfds[i],
> + s->mmio_addr + DOORBELL, (posn << 16) | i, 0, 4);
> close(s->peers[posn].eventfds[i]);
> }
>
> @@ -500,8 +500,8 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags)
> }
>
> if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
> - if (kvm_set_ioeventfd_mmio_long(incoming_fd, s->mmio_addr + DOORBELL,
> - (incoming_posn << 16) | guest_max_eventfd, 1) < 0) {
> + if (kvm_set_ioeventfd_mmio(incoming_fd, s->mmio_addr + DOORBELL,
> + (incoming_posn << 16) | guest_max_eventfd, 1, 4) < 0) {
> fprintf(stderr, "ivshmem: ioeventfd not available\n");
> }
> }
> diff --git a/kvm-all.c b/kvm-all.c
> index 42e5e23..bcf0dbe 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -744,10 +744,10 @@ static void kvm_mem_ioeventfd_add(MemoryRegionSection *section,
> {
> int r;
>
> - assert(match_data && section->size == 4);
> + assert(match_data && section->size <= 8);
Probably nitpicking, but does it also work with non-power-of-two sizes?
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd
2012-03-22 13:28 ` Jan Kiszka
@ 2012-03-22 13:31 ` Avi Kivity
0 siblings, 0 replies; 6+ messages in thread
From: Avi Kivity @ 2012-03-22 13:31 UTC (permalink / raw)
To: Jan Kiszka
Cc: Anthony Liguori, Michael S. Tsirkin, Marcelo Tosatti, qemu-devel,
Isaku Yamahata, Richard Henderson
On 03/22/2012 03:28 PM, Jan Kiszka wrote:
> On 2012-03-20 13:31, Michael S. Tsirkin wrote:
> > We use a 2 byte ioeventfd for virtio memory,
> > add support for this.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > hw/ivshmem.c | 8 ++++----
> > kvm-all.c | 15 ++++++++-------
> > kvm-stub.c | 2 +-
> > kvm.h | 3 ++-
> > 4 files changed, 15 insertions(+), 13 deletions(-)
> >
> > diff --git a/hw/ivshmem.c b/hw/ivshmem.c
> > index 5ebf840..f02530c 100644
> > --- a/hw/ivshmem.c
> > +++ b/hw/ivshmem.c
> > @@ -354,8 +354,8 @@ static void close_guest_eventfds(IVShmemState *s, int posn)
> > guest_curr_max = s->peers[posn].nb_eventfds;
> >
> > for (i = 0; i < guest_curr_max; i++) {
> > - kvm_set_ioeventfd_mmio_long(s->peers[posn].eventfds[i],
> > - s->mmio_addr + DOORBELL, (posn << 16) | i, 0);
> > + kvm_set_ioeventfd_mmio(s->peers[posn].eventfds[i],
> > + s->mmio_addr + DOORBELL, (posn << 16) | i, 0, 4);
> > close(s->peers[posn].eventfds[i]);
> > }
> >
> > @@ -500,8 +500,8 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags)
> > }
> >
> > if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
> > - if (kvm_set_ioeventfd_mmio_long(incoming_fd, s->mmio_addr + DOORBELL,
> > - (incoming_posn << 16) | guest_max_eventfd, 1) < 0) {
> > + if (kvm_set_ioeventfd_mmio(incoming_fd, s->mmio_addr + DOORBELL,
> > + (incoming_posn << 16) | guest_max_eventfd, 1, 4) < 0) {
> > fprintf(stderr, "ivshmem: ioeventfd not available\n");
> > }
> > }
> > diff --git a/kvm-all.c b/kvm-all.c
> > index 42e5e23..bcf0dbe 100644
> > --- a/kvm-all.c
> > +++ b/kvm-all.c
> > @@ -744,10 +744,10 @@ static void kvm_mem_ioeventfd_add(MemoryRegionSection *section,
> > {
> > int r;
> >
> > - assert(match_data && section->size == 4);
> > + assert(match_data && section->size <= 8);
>
> Probably nitpicking, but does it also work with non-power-of-two sizes?
>
It won't, but it's hard to generate 3-byte writes (not impossible though).
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd
2012-03-20 12:31 [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd Michael S. Tsirkin
` (2 preceding siblings ...)
2012-03-22 13:28 ` Jan Kiszka
@ 2012-03-22 13:32 ` Avi Kivity
3 siblings, 0 replies; 6+ messages in thread
From: Avi Kivity @ 2012-03-22 13:32 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Anthony Liguori, Jan Kiszka, Marcelo Tosatti, qemu-devel,
Isaku Yamahata, Richard Henderson
On 03/20/2012 02:31 PM, Michael S. Tsirkin wrote:
> We use a 2 byte ioeventfd for virtio memory,
> add support for this.
>
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-22 13:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-20 12:31 [Qemu-devel] [PATCH] kvm: allow arbitrarily sized mmio ioeventfd Michael S. Tsirkin
2012-03-21 23:34 ` Amos Kong
2012-03-22 13:28 ` Jan Kiszka
2012-03-22 13:28 ` Jan Kiszka
2012-03-22 13:31 ` Avi Kivity
2012-03-22 13:32 ` Avi Kivity
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).