From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Pavel Fedin <p.fedin@samsung.com>, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 05/45] memory: emulate ioeventfd
Date: Thu, 17 Dec 2015 18:46:01 +0100 [thread overview]
Message-ID: <1450374401-31352-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1450374401-31352-1-git-send-email-pbonzini@redhat.com>
From: Pavel Fedin <p.fedin@samsung.com>
The ioeventfd mechanism is used by vhost, dataplane, and virtio-pci to
turn guest MMIO/PIO writes into eventfd file descriptor events. This
allows arbitrary threads to be notified when the guest writes to a
specific MMIO/PIO address.
qtest and TCG do not support ioeventfd because memory writes are not
checked against registered ioeventfds in QEMU. This patch implements
this in memory_region_dispatch_write() so qtest can use ioeventfd.
Also this patch fixes vhost aborting on some misconfigured old kernels
like 3.18.0 on ARM. It is possible to explicitly enable CONFIG_EVENTFD
in expert settings, while MMIO binding support in KVM will still be
missing.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Message-Id: <006e01d12377$0b9c2d40$22d487c0$@samsung.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
kvm-all.c | 6 ++++--
memory.c | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index a45c92b..ed707fe 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1628,8 +1628,10 @@ static int kvm_init(MachineState *ms)
kvm_state = s;
- s->memory_listener.listener.eventfd_add = kvm_mem_ioeventfd_add;
- s->memory_listener.listener.eventfd_del = kvm_mem_ioeventfd_del;
+ if (kvm_eventfds_allowed) {
+ 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;
diff --git a/memory.c b/memory.c
index af08cf1..1c1c192 100644
--- a/memory.c
+++ b/memory.c
@@ -18,12 +18,14 @@
#include "exec/ioport.h"
#include "qapi/visitor.h"
#include "qemu/bitops.h"
+#include "qemu/error-report.h"
#include "qom/object.h"
#include "trace.h"
#include <assert.h>
#include "exec/memory-internal.h"
#include "exec/ram_addr.h"
+#include "sysemu/kvm.h"
#include "sysemu/sysemu.h"
//#define DEBUG_UNASSIGNED
@@ -1136,6 +1138,32 @@ MemTxResult memory_region_dispatch_read(MemoryRegion *mr,
return r;
}
+/* Return true if an eventfd was signalled */
+static bool memory_region_dispatch_write_eventfds(MemoryRegion *mr,
+ hwaddr addr,
+ uint64_t data,
+ unsigned size,
+ MemTxAttrs attrs)
+{
+ MemoryRegionIoeventfd ioeventfd = {
+ .addr = addrrange_make(int128_make64(addr), int128_make64(size)),
+ .data = data,
+ };
+ unsigned i;
+
+ for (i = 0; i < mr->ioeventfd_nb; i++) {
+ ioeventfd.match_data = mr->ioeventfds[i].match_data;
+ ioeventfd.e = mr->ioeventfds[i].e;
+
+ if (memory_region_ioeventfd_equal(ioeventfd, mr->ioeventfds[i])) {
+ event_notifier_set(ioeventfd.e);
+ return true;
+ }
+ }
+
+ return false;
+}
+
MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
hwaddr addr,
uint64_t data,
@@ -1149,6 +1177,11 @@ MemTxResult memory_region_dispatch_write(MemoryRegion *mr,
adjust_endianness(mr, &data, size);
+ if ((!kvm_eventfds_enabled()) &&
+ memory_region_dispatch_write_eventfds(mr, addr, data, size, attrs)) {
+ return MEMTX_OK;
+ }
+
if (mr->ops->write) {
return access_with_adjusted_size(addr, &data, size,
mr->ops->impl.min_access_size,
@@ -1667,6 +1700,8 @@ void memory_region_clear_global_locking(MemoryRegion *mr)
mr->global_locking = false;
}
+static bool userspace_eventfd_warning;
+
void memory_region_add_eventfd(MemoryRegion *mr,
hwaddr addr,
unsigned size,
@@ -1683,6 +1718,13 @@ void memory_region_add_eventfd(MemoryRegion *mr,
};
unsigned i;
+ if (kvm_enabled() && (!(kvm_eventfds_enabled() ||
+ userspace_eventfd_warning))) {
+ userspace_eventfd_warning = true;
+ error_report("Using eventfd without MMIO binding in KVM. "
+ "Suboptimal performance expected");
+ }
+
if (size) {
adjust_endianness(mr, &mrfd.data, size);
}
--
2.5.0
next prev parent reply other threads:[~2015-12-17 17:46 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-17 17:45 [Qemu-devel] [PULL 00/45] KVM, memory, SCSI, qemu_log, Coverity patches for 2015-12-17 Paolo Bonzini
2015-12-17 17:45 ` [Qemu-devel] [PULL 01/45] exec: Eliminate qemu_ram_free_from_ptr() Paolo Bonzini
2015-12-17 17:45 ` [Qemu-devel] [PULL 02/45] memory: Eliminate memory_region_destructor_ram_from_ptr() Paolo Bonzini
2015-12-17 17:45 ` [Qemu-devel] [PULL 03/45] exec: Remove unnecessary RAM_FILE flag Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 04/45] kvm-all: PAGE_SIZE should be real host page size Paolo Bonzini
2015-12-17 17:46 ` Paolo Bonzini [this message]
2015-12-17 17:46 ` [Qemu-devel] [PULL 06/45] vmw_pvscsi: Set device subsystem and revision Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 07/45] vmw_pvscsi: Change offset of msi pci capability Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 08/45] vmw_pvscsi: Introduce 'x-old-pci-configuration' backword compatability property Paolo Bonzini
2015-12-17 18:08 ` Eric Blake
2015-12-18 6:21 ` Shmulik Ladkani
2015-12-17 17:46 ` [Qemu-devel] [PULL 09/45] vmw_pvscsi: coding: Introduce PVSCSIClass Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 10/45] vmw_pvscsi: The pvscsi device is a PCIE endpoint Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 11/45] vmw_pvscsi: Introduce 'x-disable-pcie' backword compatability property Paolo Bonzini
2015-12-17 18:09 ` Eric Blake
2015-12-17 17:46 ` [Qemu-devel] [PULL 12/45] linux-headers: update from kvm/next Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 13/45] target-i386/kvm: Hyper-V SynIC MSR's support Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 14/45] kvm: Hyper-V SynIC irq routing support Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 15/45] target-i386/hyperv: Hyper-V SynIC SINT routing and vcpu exit Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 16/45] hw/misc: Hyper-V test device 'hyperv-testdev' Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 17/45] target-i386/kvm: Hyper-V SynIC timers MSR's support Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 18/45] kvm: add support for -machine kernel_irqchip=split Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 19/45] kvm: x86: add support for KVM_CAP_SPLIT_IRQCHIP Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 20/45] qemu-char: append opt to stop truncation of serial file Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 21/45] qemu-log: introduce qemu_log_separate Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 22/45] alpha: convert "naked" qemu_log to tracepoint Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 23/45] cris: avoid "naked" qemu_log Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 24/45] microblaze: " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 25/45] s390x: " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 26/45] ppc: cleanup logging Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 27/45] tricore: avoid "naked" qemu_log Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 28/45] xtensa: " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 29/45] user: introduce "-d page" Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 30/45] linux-user: avoid "naked" qemu_log Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 31/45] linux-user: convert DEBUG_SIGNAL logging to tracepoints Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 32/45] exec: always call qemu_get_ram_ptr within rcu_read_lock Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 33/45] exec: make qemu_ram_ptr_length more similar to qemu_get_ram_ptr Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 34/45] memory: reorder MemoryRegion fields Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 35/45] memory: avoid unnecessary object_ref/unref Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 36/45] memory: split address_space_read and address_space_write Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 37/45] memory: extract first iteration of " Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 38/45] memory: inline a few small accessors Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 39/45] memory: try to inline constant-length reads Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 40/45] rcu: optimize rcu_read_lock Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 41/45] target-i386: kvm: clear unusable segments' flags in migration Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 42/45] scsi: use scsi_req_cancel_async when purging requests Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 43/45] scsi: always call notifier on async cancellation Paolo Bonzini
2015-12-18 0:57 ` Fam Zheng
2015-12-18 6:05 ` Paolo Bonzini
2015-12-18 7:51 ` Fam Zheng
2015-12-17 17:46 ` [Qemu-devel] [PULL 44/45] coverity: Model g_poll() Paolo Bonzini
2015-12-17 17:46 ` [Qemu-devel] [PULL 45/45] coverity: Model g_memdup() Paolo Bonzini
2015-12-17 19:55 ` [Qemu-devel] [PULL 00/45] KVM, memory, SCSI, qemu_log, Coverity patches for 2015-12-17 Peter Maydell
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=1450374401-31352-6-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=p.fedin@samsung.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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).