* Re: [PATCH V5 2/4] target-i386:add coalesced_pio API
@ 2018-08-31 7:58 peng.hao2
0 siblings, 0 replies; 4+ messages in thread
From: peng.hao2 @ 2018-08-31 7:58 UTC (permalink / raw)
To: mst; +Cc: qemu-devel, pbonzini, ehabkost, kvm, rkrcmar
>> +static void kvm_coalesce_pio_add(MemoryListener *listener,
>> + MemoryRegionSection *section,
>> + hwaddr start, hwaddr size)
>> +{
>> + KVMState *s = kvm_state;
>> +
>> + if (s->coalesced_pio) {
>> + struct kvm_coalesced_mmio_zone zone;
>> +
>> + zone.addr = start;
>> + zone.size = size;
>> + zone.pio = 1;
>> +
>> + (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone);
>> + }
>> +}
>> +
>> +static void kvm_coalesce_pio_del(MemoryListener *listener,
>> + MemoryRegionSection *section,
>> + hwaddr start, hwaddr size)
>> +{
>> + KVMState *s = kvm_state;
>> +
>> + if (s->coalesced_pio) {
>> + struct kvm_coalesced_mmio_zone zone;
>> +
>> + zone.addr = start;
>> + zone.size = size;
>> + zone.pio = 1;
>> +
>> + (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone);
>> + }
>> +}
>assert rather than (void)?
I think (void) is better. qemu can work well even if coalesced mmio/pio regiser operation failed.
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH V5 0/4] introduce coalesced pio support
@ 2018-08-31 9:05 Peng Hao
2018-08-31 9:05 ` [PATCH V5 2/4] target-i386:add coalesced_pio API Peng Hao
0 siblings, 1 reply; 4+ messages in thread
From: Peng Hao @ 2018-08-31 9:05 UTC (permalink / raw)
To: pbonzini, rkrcmar, mst, ehabkost; +Cc: Peng Hao, qemu-devel, kvm
Coalesced pio is base on coalesced mmio and can be used for some port
like rtc port, pci-host config port, virtio-pci config port and so on.
Specially in case of rtc as coalesced pio, some versions of windows guest
access rtc frequently because of rtc as system tick. guest access rtc like
this: write register index to 0x70, then write or read data from 0x71.
writing 0x70 port is just as index and do nothing else. So we can use
coalesced pio to handle this scene to reduce VM-EXIT time.
When it starts and closes the virtual machine, it will access pci-host config
port or virtio-pci config port frequently. So setting these port as
coalesced pio can reduce startup and shutdown time. In qemu I just realize
piixfx's pci-host, it is convenient for other pci-host type implementations.
without my patch, get the vm-exit time of accessing rtc 0x70 and piix 0xcf8
using perf tools: (guest OS : windows 7 64bit)
IO Port Access Samples Samples% Time% Min Time Max Time Avg time
0x70:POUT 86 30.99% 74.59% 9us 29us 10.75us (+- 3.41%)
0xcf8:POUT 1119 2.60% 2.12% 2.79us 56.83us 3.41us (+- 2.23%)
with my patch
IO Port Access Samples Samples% Time% Min Time Max Time Avg time
0x70:POUT 106 32.02% 29.47% 0us 10us 1.57us (+- 7.38%)
0xcf8:POUT 1065 1.67% 0.28% 0.41us 65.44us 0.66us (+- 10.55%)
These are just qemu's patches, another patches are for kernel.
Changes v4 --> v5:
update kvm header, improve compatibility.
Changes v3 --> v4
modify coalesced_mmio_{add|del} to coalesced_io_{add|del}
delete unnecessary macro define
Peng Hao (4):
target-i386: introduce coalesced_pio kvm header update
target-i386: add coalesced_pio API
target-i386: add rtc 0x70 port as coalesced_pio
target-i386: add i440fx 0xcf8 port as coalesced_pio
accel/kvm/kvm-all.c | 61 ++++++++++++++++++++++++++++++++++++++++++-----
hw/pci-host/piix.c | 4 ++++
hw/timer/mc146818rtc.c | 8 +++++++
include/exec/memory.h | 4 ++--
linux-headers/linux/kvm.h | 11 +++++++--
memory.c | 4 ++--
6 files changed, 80 insertions(+), 12 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH V5 2/4] target-i386:add coalesced_pio API 2018-08-31 9:05 [PATCH V5 0/4] introduce coalesced pio support Peng Hao @ 2018-08-31 9:05 ` Peng Hao 2018-08-31 3:35 ` Michael S. Tsirkin 0 siblings, 1 reply; 4+ messages in thread From: Peng Hao @ 2018-08-31 9:05 UTC (permalink / raw) To: pbonzini, rkrcmar, mst, ehabkost; +Cc: Peng Hao, qemu-devel, kvm Signed-off-by: Peng Hao <peng.hao2@zte.com.cn> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> --- accel/kvm/kvm-all.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++---- include/exec/memory.h | 4 ++-- memory.c | 4 ++-- 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 4a3909d..11d8d78 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -78,6 +78,7 @@ struct KVMState int fd; int vmfd; int coalesced_mmio; + int coalesced_pio; struct kvm_coalesced_mmio_ring *coalesced_mmio_ring; bool coalesced_flush_in_progress; int vcpu_events; @@ -559,6 +560,45 @@ static void kvm_uncoalesce_mmio_region(MemoryListener *listener, } } +static void kvm_coalesce_pio_add(MemoryListener *listener, + MemoryRegionSection *section, + hwaddr start, hwaddr size) +{ + KVMState *s = kvm_state; + + if (s->coalesced_pio) { + struct kvm_coalesced_mmio_zone zone; + + zone.addr = start; + zone.size = size; + zone.pio = 1; + + (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone); + } +} + +static void kvm_coalesce_pio_del(MemoryListener *listener, + MemoryRegionSection *section, + hwaddr start, hwaddr size) +{ + KVMState *s = kvm_state; + + if (s->coalesced_pio) { + struct kvm_coalesced_mmio_zone zone; + + zone.addr = start; + zone.size = size; + zone.pio = 1; + + (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone); + } +} + +static MemoryListener kvm_coalesced_pio_listener = { + .coalesced_io_add = kvm_coalesce_pio_add, + .coalesced_io_del = kvm_coalesce_pio_del, +}; + int kvm_check_extension(KVMState *s, unsigned int extension) { int ret; @@ -1615,6 +1655,8 @@ static int kvm_init(MachineState *ms) } s->coalesced_mmio = kvm_check_extension(s, KVM_CAP_COALESCED_MMIO); + s->coalesced_pio = s->coalesced_mmio && + kvm_check_extension(s, KVM_CAP_COALESCED_PIO); #ifdef KVM_CAP_VCPU_EVENTS s->vcpu_events = kvm_check_extension(s, KVM_CAP_VCPU_EVENTS); @@ -1687,13 +1729,15 @@ static int kvm_init(MachineState *ms) s->memory_listener.listener.eventfd_add = kvm_mem_ioeventfd_add; s->memory_listener.listener.eventfd_del = kvm_mem_ioeventfd_del; } - s->memory_listener.listener.coalesced_mmio_add = kvm_coalesce_mmio_region; - s->memory_listener.listener.coalesced_mmio_del = kvm_uncoalesce_mmio_region; + s->memory_listener.listener.coalesced_io_add = kvm_coalesce_mmio_region; + s->memory_listener.listener.coalesced_io_del = kvm_uncoalesce_mmio_region; kvm_memory_listener_register(s, &s->memory_listener, &address_space_memory, 0); memory_listener_register(&kvm_io_listener, &address_space_io); + memory_listener_register(&kvm_coalesced_pio_listener, + &address_space_io); s->many_ioeventfds = kvm_check_many_ioeventfds(); @@ -1775,8 +1819,13 @@ void kvm_flush_coalesced_mmio_buffer(void) struct kvm_coalesced_mmio *ent; ent = &ring->coalesced_mmio[ring->first]; - - cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); + if (ent->pio == 1) { + address_space_rw(&address_space_io, ent->phys_addr, + MEMTXATTRS_UNSPECIFIED, ent->data, + ent->len, true); + } else { + cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); + } smp_wmb(); ring->first = (ring->first + 1) % KVM_COALESCED_MMIO_MAX; } diff --git a/include/exec/memory.h b/include/exec/memory.h index 448d41a..4600fa3 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -410,9 +410,9 @@ struct MemoryListener { bool match_data, uint64_t data, EventNotifier *e); void (*eventfd_del)(MemoryListener *listener, MemoryRegionSection *section, bool match_data, uint64_t data, EventNotifier *e); - void (*coalesced_mmio_add)(MemoryListener *listener, MemoryRegionSection *section, + void (*coalesced_io_add)(MemoryListener *listener, MemoryRegionSection *section, hwaddr addr, hwaddr len); - void (*coalesced_mmio_del)(MemoryListener *listener, MemoryRegionSection *section, + void (*coalesced_io_del)(MemoryListener *listener, MemoryRegionSection *section, hwaddr addr, hwaddr len); /* Lower = earlier (during add), later (during del) */ unsigned priority; diff --git a/memory.c b/memory.c index e9cd446..8b0311e 100644 --- a/memory.c +++ b/memory.c @@ -2126,7 +2126,7 @@ static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa .size = fr->addr.size, }; - MEMORY_LISTENER_CALL(as, coalesced_mmio_del, Reverse, §ion, + MEMORY_LISTENER_CALL(as, coalesced_io_del, Reverse, §ion, int128_get64(fr->addr.start), int128_get64(fr->addr.size)); QTAILQ_FOREACH(cmr, &mr->coalesced, link) { @@ -2137,7 +2137,7 @@ static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa continue; } tmp = addrrange_intersection(tmp, fr->addr); - MEMORY_LISTENER_CALL(as, coalesced_mmio_add, Forward, §ion, + MEMORY_LISTENER_CALL(as, coalesced_io_add, Forward, §ion, int128_get64(tmp.start), int128_get64(tmp.size)); } -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V5 2/4] target-i386:add coalesced_pio API 2018-08-31 9:05 ` [PATCH V5 2/4] target-i386:add coalesced_pio API Peng Hao @ 2018-08-31 3:35 ` Michael S. Tsirkin 0 siblings, 0 replies; 4+ messages in thread From: Michael S. Tsirkin @ 2018-08-31 3:35 UTC (permalink / raw) To: Peng Hao; +Cc: qemu-devel, pbonzini, ehabkost, kvm, rkrcmar On Fri, Aug 31, 2018 at 05:05:03PM +0800, Peng Hao wrote: > Signed-off-by: Peng Hao <peng.hao2@zte.com.cn> > Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > accel/kvm/kvm-all.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++---- > include/exec/memory.h | 4 ++-- > memory.c | 4 ++-- > 3 files changed, 57 insertions(+), 8 deletions(-) > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 4a3909d..11d8d78 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -78,6 +78,7 @@ struct KVMState > int fd; > int vmfd; > int coalesced_mmio; > + int coalesced_pio; > struct kvm_coalesced_mmio_ring *coalesced_mmio_ring; > bool coalesced_flush_in_progress; > int vcpu_events; > @@ -559,6 +560,45 @@ static void kvm_uncoalesce_mmio_region(MemoryListener *listener, > } > } > > +static void kvm_coalesce_pio_add(MemoryListener *listener, > + MemoryRegionSection *section, > + hwaddr start, hwaddr size) > +{ > + KVMState *s = kvm_state; > + > + if (s->coalesced_pio) { > + struct kvm_coalesced_mmio_zone zone; > + > + zone.addr = start; > + zone.size = size; > + zone.pio = 1; > + > + (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone); > + } > +} > + > +static void kvm_coalesce_pio_del(MemoryListener *listener, > + MemoryRegionSection *section, > + hwaddr start, hwaddr size) > +{ > + KVMState *s = kvm_state; > + > + if (s->coalesced_pio) { > + struct kvm_coalesced_mmio_zone zone; > + > + zone.addr = start; > + zone.size = size; > + zone.pio = 1; > + > + (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone); > + } > +} assert rather than (void)? > + > +static MemoryListener kvm_coalesced_pio_listener = { > + .coalesced_io_add = kvm_coalesce_pio_add, > + .coalesced_io_del = kvm_coalesce_pio_del, > +}; > + > int kvm_check_extension(KVMState *s, unsigned int extension) > { > int ret; > @@ -1615,6 +1655,8 @@ static int kvm_init(MachineState *ms) > } > > s->coalesced_mmio = kvm_check_extension(s, KVM_CAP_COALESCED_MMIO); > + s->coalesced_pio = s->coalesced_mmio && > + kvm_check_extension(s, KVM_CAP_COALESCED_PIO); > > #ifdef KVM_CAP_VCPU_EVENTS > s->vcpu_events = kvm_check_extension(s, KVM_CAP_VCPU_EVENTS); > @@ -1687,13 +1729,15 @@ static int kvm_init(MachineState *ms) > s->memory_listener.listener.eventfd_add = kvm_mem_ioeventfd_add; > s->memory_listener.listener.eventfd_del = kvm_mem_ioeventfd_del; > } > - s->memory_listener.listener.coalesced_mmio_add = kvm_coalesce_mmio_region; > - s->memory_listener.listener.coalesced_mmio_del = kvm_uncoalesce_mmio_region; > + s->memory_listener.listener.coalesced_io_add = kvm_coalesce_mmio_region; > + s->memory_listener.listener.coalesced_io_del = kvm_uncoalesce_mmio_region; > > kvm_memory_listener_register(s, &s->memory_listener, > &address_space_memory, 0); > memory_listener_register(&kvm_io_listener, > &address_space_io); > + memory_listener_register(&kvm_coalesced_pio_listener, > + &address_space_io); > > s->many_ioeventfds = kvm_check_many_ioeventfds(); > > @@ -1775,8 +1819,13 @@ void kvm_flush_coalesced_mmio_buffer(void) > struct kvm_coalesced_mmio *ent; > > ent = &ring->coalesced_mmio[ring->first]; > - > - cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); > + if (ent->pio == 1) { > + address_space_rw(&address_space_io, ent->phys_addr, > + MEMTXATTRS_UNSPECIFIED, ent->data, > + ent->len, true); > + } else { > + cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); > + } > smp_wmb(); > ring->first = (ring->first + 1) % KVM_COALESCED_MMIO_MAX; > } > diff --git a/include/exec/memory.h b/include/exec/memory.h > index 448d41a..4600fa3 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -410,9 +410,9 @@ struct MemoryListener { > bool match_data, uint64_t data, EventNotifier *e); > void (*eventfd_del)(MemoryListener *listener, MemoryRegionSection *section, > bool match_data, uint64_t data, EventNotifier *e); > - void (*coalesced_mmio_add)(MemoryListener *listener, MemoryRegionSection *section, > + void (*coalesced_io_add)(MemoryListener *listener, MemoryRegionSection *section, > hwaddr addr, hwaddr len); > - void (*coalesced_mmio_del)(MemoryListener *listener, MemoryRegionSection *section, > + void (*coalesced_io_del)(MemoryListener *listener, MemoryRegionSection *section, > hwaddr addr, hwaddr len); > /* Lower = earlier (during add), later (during del) */ > unsigned priority; > diff --git a/memory.c b/memory.c > index e9cd446..8b0311e 100644 > --- a/memory.c > +++ b/memory.c > @@ -2126,7 +2126,7 @@ static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa > .size = fr->addr.size, > }; > > - MEMORY_LISTENER_CALL(as, coalesced_mmio_del, Reverse, §ion, > + MEMORY_LISTENER_CALL(as, coalesced_io_del, Reverse, §ion, > int128_get64(fr->addr.start), > int128_get64(fr->addr.size)); > QTAILQ_FOREACH(cmr, &mr->coalesced, link) { > @@ -2137,7 +2137,7 @@ static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa > continue; > } > tmp = addrrange_intersection(tmp, fr->addr); > - MEMORY_LISTENER_CALL(as, coalesced_mmio_add, Forward, §ion, > + MEMORY_LISTENER_CALL(as, coalesced_io_add, Forward, §ion, > int128_get64(tmp.start), > int128_get64(tmp.size)); > } > -- > 1.8.3.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH V5 0/4] introduce coalesced pio support
@ 2018-08-30 15:50 Peng Hao
2018-08-30 15:50 ` [PATCH V5 2/4] target-i386:add coalesced_pio API Peng Hao
0 siblings, 1 reply; 4+ messages in thread
From: Peng Hao @ 2018-08-30 15:50 UTC (permalink / raw)
To: pbonzini, rkrcmar, mst, ehabkost; +Cc: Peng Hao, zhong.weidong, qemu-devel, kvm
Coalesced pio is base on coalesced mmio and can be used for some port
like rtc port, pci-host config port, virtio-pci config port and so on.
Specially in case of rtc as coalesced pio, some versions of windows guest
access rtc frequently because of rtc as system tick. guest access rtc like
this: write register index to 0x70, then write or read data from 0x71.
writing 0x70 port is just as index and do nothing else. So we can use
coalesced pio to handle this scene to reduce VM-EXIT time.
When it starts and closes the virtual machine, it will access pci-host config
port or virtio-pci config port frequently. So setting these port as
coalesced pio can reduce startup and shutdown time. In qemu I just realize
piixfx's pci-host, it is convenient for other pci-host type implementations.
without my patch, get the vm-exit time of accessing rtc 0x70 and piix 0xcf8
using perf tools: (guest OS : windows 7 64bit)
IO Port Access Samples Samples% Time% Min Time Max Time Avg time
0x70:POUT 86 30.99% 74.59% 9us 29us 10.75us (+- 3.41%)
0xcf8:POUT 1119 2.60% 2.12% 2.79us 56.83us 3.41us (+- 2.23%)
with my patch
IO Port Access Samples Samples% Time% Min Time Max Time Avg time
0x70:POUT 106 32.02% 29.47% 0us 10us 1.57us (+- 7.38%)
0xcf8:POUT 1065 1.67% 0.28% 0.41us 65.44us 0.66us (+- 10.55%)
These are just qemu's patches, another patches are for kernel.
Changes v4 --> v5:
update kvm header, improve compatibility.
Changes v3 --> v4
modify coalesced_mmio_{add|del} to coalesced_io_{add|del}
delete unnecessary macro define
Peng Hao (4):
target-i386: introduce coalesced_pio kvm header update
target-i386: add coalesced_pio API
target-i386: add rtc 0x70 port as coalesced_pio
target-i386: add i440fx 0xcf8 port as coalesced_pio
accel/kvm/kvm-all.c | 61 ++++++++++++++++++++++++++++++++++++++++++-----
hw/pci-host/piix.c | 4 ++++
hw/timer/mc146818rtc.c | 8 +++++++
include/exec/memory.h | 4 ++--
linux-headers/linux/kvm.h | 11 +++++++--
memory.c | 4 ++--
6 files changed, 80 insertions(+), 12 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH V5 2/4] target-i386:add coalesced_pio API 2018-08-30 15:50 [PATCH V5 0/4] introduce coalesced pio support Peng Hao @ 2018-08-30 15:50 ` Peng Hao 0 siblings, 0 replies; 4+ messages in thread From: Peng Hao @ 2018-08-30 15:50 UTC (permalink / raw) To: pbonzini, rkrcmar, mst, ehabkost; +Cc: Peng Hao, zhong.weidong, qemu-devel, kvm Signed-off-by: Peng Hao <peng.hao2@zte.com.cn> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> --- accel/kvm/kvm-all.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++---- include/exec/memory.h | 4 ++-- memory.c | 4 ++-- 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 4a3909d..11d8d78 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -78,6 +78,7 @@ struct KVMState int fd; int vmfd; int coalesced_mmio; + int coalesced_pio; struct kvm_coalesced_mmio_ring *coalesced_mmio_ring; bool coalesced_flush_in_progress; int vcpu_events; @@ -559,6 +560,45 @@ static void kvm_uncoalesce_mmio_region(MemoryListener *listener, } } +static void kvm_coalesce_pio_add(MemoryListener *listener, + MemoryRegionSection *section, + hwaddr start, hwaddr size) +{ + KVMState *s = kvm_state; + + if (s->coalesced_pio) { + struct kvm_coalesced_mmio_zone zone; + + zone.addr = start; + zone.size = size; + zone.pio = 1; + + (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone); + } +} + +static void kvm_coalesce_pio_del(MemoryListener *listener, + MemoryRegionSection *section, + hwaddr start, hwaddr size) +{ + KVMState *s = kvm_state; + + if (s->coalesced_pio) { + struct kvm_coalesced_mmio_zone zone; + + zone.addr = start; + zone.size = size; + zone.pio = 1; + + (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone); + } +} + +static MemoryListener kvm_coalesced_pio_listener = { + .coalesced_io_add = kvm_coalesce_pio_add, + .coalesced_io_del = kvm_coalesce_pio_del, +}; + int kvm_check_extension(KVMState *s, unsigned int extension) { int ret; @@ -1615,6 +1655,8 @@ static int kvm_init(MachineState *ms) } s->coalesced_mmio = kvm_check_extension(s, KVM_CAP_COALESCED_MMIO); + s->coalesced_pio = s->coalesced_mmio && + kvm_check_extension(s, KVM_CAP_COALESCED_PIO); #ifdef KVM_CAP_VCPU_EVENTS s->vcpu_events = kvm_check_extension(s, KVM_CAP_VCPU_EVENTS); @@ -1687,13 +1729,15 @@ static int kvm_init(MachineState *ms) s->memory_listener.listener.eventfd_add = kvm_mem_ioeventfd_add; s->memory_listener.listener.eventfd_del = kvm_mem_ioeventfd_del; } - s->memory_listener.listener.coalesced_mmio_add = kvm_coalesce_mmio_region; - s->memory_listener.listener.coalesced_mmio_del = kvm_uncoalesce_mmio_region; + s->memory_listener.listener.coalesced_io_add = kvm_coalesce_mmio_region; + s->memory_listener.listener.coalesced_io_del = kvm_uncoalesce_mmio_region; kvm_memory_listener_register(s, &s->memory_listener, &address_space_memory, 0); memory_listener_register(&kvm_io_listener, &address_space_io); + memory_listener_register(&kvm_coalesced_pio_listener, + &address_space_io); s->many_ioeventfds = kvm_check_many_ioeventfds(); @@ -1775,8 +1819,13 @@ void kvm_flush_coalesced_mmio_buffer(void) struct kvm_coalesced_mmio *ent; ent = &ring->coalesced_mmio[ring->first]; - - cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); + if (ent->pio == 1) { + address_space_rw(&address_space_io, ent->phys_addr, + MEMTXATTRS_UNSPECIFIED, ent->data, + ent->len, true); + } else { + cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len); + } smp_wmb(); ring->first = (ring->first + 1) % KVM_COALESCED_MMIO_MAX; } diff --git a/include/exec/memory.h b/include/exec/memory.h index 448d41a..4600fa3 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -410,9 +410,9 @@ struct MemoryListener { bool match_data, uint64_t data, EventNotifier *e); void (*eventfd_del)(MemoryListener *listener, MemoryRegionSection *section, bool match_data, uint64_t data, EventNotifier *e); - void (*coalesced_mmio_add)(MemoryListener *listener, MemoryRegionSection *section, + void (*coalesced_io_add)(MemoryListener *listener, MemoryRegionSection *section, hwaddr addr, hwaddr len); - void (*coalesced_mmio_del)(MemoryListener *listener, MemoryRegionSection *section, + void (*coalesced_io_del)(MemoryListener *listener, MemoryRegionSection *section, hwaddr addr, hwaddr len); /* Lower = earlier (during add), later (during del) */ unsigned priority; diff --git a/memory.c b/memory.c index e9cd446..8b0311e 100644 --- a/memory.c +++ b/memory.c @@ -2126,7 +2126,7 @@ static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa .size = fr->addr.size, }; - MEMORY_LISTENER_CALL(as, coalesced_mmio_del, Reverse, §ion, + MEMORY_LISTENER_CALL(as, coalesced_io_del, Reverse, §ion, int128_get64(fr->addr.start), int128_get64(fr->addr.size)); QTAILQ_FOREACH(cmr, &mr->coalesced, link) { @@ -2137,7 +2137,7 @@ static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpa continue; } tmp = addrrange_intersection(tmp, fr->addr); - MEMORY_LISTENER_CALL(as, coalesced_mmio_add, Forward, §ion, + MEMORY_LISTENER_CALL(as, coalesced_io_add, Forward, §ion, int128_get64(tmp.start), int128_get64(tmp.size)); } -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-31 9:05 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-08-31 7:58 [PATCH V5 2/4] target-i386:add coalesced_pio API peng.hao2 -- strict thread matches above, loose matches on Subject: below -- 2018-08-31 9:05 [PATCH V5 0/4] introduce coalesced pio support Peng Hao 2018-08-31 9:05 ` [PATCH V5 2/4] target-i386:add coalesced_pio API Peng Hao 2018-08-31 3:35 ` Michael S. Tsirkin 2018-08-30 15:50 [PATCH V5 0/4] introduce coalesced pio support Peng Hao 2018-08-30 15:50 ` [PATCH V5 2/4] target-i386:add coalesced_pio API Peng Hao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox