qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, mst@redhat.com,
	maxime.coquelin@redhat.com, marcandre.lureau@redhat.com,
	peterx@redhat.com, quintela@redhat.com
Cc: aarcange@redhat.com
Subject: [Qemu-devel] [PATCH v5 04/29] postcopy: Add notifier chain
Date: Mon, 12 Mar 2018 17:20:59 +0000	[thread overview]
Message-ID: <20180312172124.56461-5-dgilbert@redhat.com> (raw)
In-Reply-To: <20180312172124.56461-1-dgilbert@redhat.com>

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Add a notifier chain for postcopy with a 'reason' flag
and an opportunity for a notifier member to return an error.

Call it when enabling postcopy.

This will initially used to enable devices to declare they're unable
to postcopy and later to notify of devices of stages within postcopy.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
 migration/postcopy-ram.c | 36 ++++++++++++++++++++++++++++++++++++
 migration/postcopy-ram.h | 26 ++++++++++++++++++++++++++
 vl.c                     |  2 ++
 3 files changed, 64 insertions(+)

diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index a75b5d393f..1089814d54 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -23,6 +23,8 @@
 #include "savevm.h"
 #include "postcopy-ram.h"
 #include "ram.h"
+#include "qapi/error.h"
+#include "qemu/notify.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/balloon.h"
 #include "qemu/error-report.h"
@@ -45,6 +47,33 @@ struct PostcopyDiscardState {
     unsigned int nsentcmds;
 };
 
+static NotifierWithReturnList postcopy_notifier_list;
+
+void postcopy_infrastructure_init(void)
+{
+    notifier_with_return_list_init(&postcopy_notifier_list);
+}
+
+void postcopy_add_notifier(NotifierWithReturn *nn)
+{
+    notifier_with_return_list_add(&postcopy_notifier_list, nn);
+}
+
+void postcopy_remove_notifier(NotifierWithReturn *n)
+{
+    notifier_with_return_remove(n);
+}
+
+int postcopy_notify(enum PostcopyNotifyReason reason, Error **errp)
+{
+    struct PostcopyNotifyData pnd;
+    pnd.reason = reason;
+    pnd.errp = errp;
+
+    return notifier_with_return_list_notify(&postcopy_notifier_list,
+                                            &pnd);
+}
+
 /* Postcopy needs to detect accesses to pages that haven't yet been copied
  * across, and efficiently map new pages in, the techniques for doing this
  * are target OS specific.
@@ -215,6 +244,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
     struct uffdio_register reg_struct;
     struct uffdio_range range_struct;
     uint64_t feature_mask;
+    Error *local_err = NULL;
 
     if (qemu_target_page_size() > pagesize) {
         error_report("Target page size bigger than host page size");
@@ -228,6 +258,12 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
         goto out;
     }
 
+    /* Give devices a chance to object */
+    if (postcopy_notify(POSTCOPY_NOTIFY_PROBE, &local_err)) {
+        error_report_err(local_err);
+        goto out;
+    }
+
     /* Version and features check */
     if (!ufd_check_and_apply(ufd, mis)) {
         goto out;
diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h
index 14f6cadcbd..2e879bbacb 100644
--- a/migration/postcopy-ram.h
+++ b/migration/postcopy-ram.h
@@ -116,4 +116,30 @@ PostcopyState postcopy_state_set(PostcopyState new_state);
 
 void postcopy_fault_thread_notify(MigrationIncomingState *mis);
 
+/*
+ * To be called once at the start before any device initialisation
+ */
+void postcopy_infrastructure_init(void);
+
+/* Add a notifier to a list to be called when checking whether the devices
+ * can support postcopy.
+ * It's data is a *PostcopyNotifyData
+ * It should return 0 if OK, or a negative value on failure.
+ * On failure it must set the data->errp to an error.
+ *
+ */
+enum PostcopyNotifyReason {
+    POSTCOPY_NOTIFY_PROBE = 0,
+};
+
+struct PostcopyNotifyData {
+    enum PostcopyNotifyReason reason;
+    Error **errp;
+};
+
+void postcopy_add_notifier(NotifierWithReturn *nn);
+void postcopy_remove_notifier(NotifierWithReturn *n);
+/* Call the notifier list set by postcopy_add_start_notifier */
+int postcopy_notify(enum PostcopyNotifyReason reason, Error **errp);
+
 #endif
diff --git a/vl.c b/vl.c
index 3ef04ce991..0b1581107f 100644
--- a/vl.c
+++ b/vl.c
@@ -94,6 +94,7 @@ int main(int argc, char **argv)
 #include "audio/audio.h"
 #include "sysemu/cpus.h"
 #include "migration/colo.h"
+#include "migration/postcopy-ram.h"
 #include "sysemu/kvm.h"
 #include "sysemu/hax.h"
 #include "qapi/qobject-input-visitor.h"
@@ -3101,6 +3102,7 @@ int main(int argc, char **argv, char **envp)
     module_call_init(MODULE_INIT_OPTS);
 
     runstate_init();
+    postcopy_infrastructure_init();
 
     if (qcrypto_init(&err) < 0) {
         error_reportf_err(err, "cannot initialize crypto: ");
-- 
2.14.3

  parent reply	other threads:[~2018-03-12 17:21 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-12 17:20 [Qemu-devel] [PATCH v5 00/29] postcopy+vhost-user/shared ram Dr. David Alan Gilbert (git)
2018-03-12 17:20 ` [Qemu-devel] [PATCH v5 01/29] migrate: Update ram_block_discard_range for shared Dr. David Alan Gilbert (git)
2018-03-12 17:20 ` [Qemu-devel] [PATCH v5 02/29] qemu_ram_block_host_offset Dr. David Alan Gilbert (git)
2018-03-12 17:20 ` [Qemu-devel] [PATCH v5 03/29] postcopy: use UFFDIO_ZEROPAGE only when available Dr. David Alan Gilbert (git)
2018-03-12 17:20 ` Dr. David Alan Gilbert (git) [this message]
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 05/29] postcopy: Add vhost-user flag for postcopy and check it Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 06/29] vhost-user: Add 'VHOST_USER_POSTCOPY_ADVISE' message Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 07/29] libvhost-user: Support sending fds back to qemu Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 08/29] libvhost-user: Open userfaultfd Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 09/29] postcopy: Allow registering of fd handler Dr. David Alan Gilbert (git)
2018-03-13 20:34   ` Michael S. Tsirkin
2018-03-14 10:05     ` Dr. David Alan Gilbert
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 10/29] vhost+postcopy: Register shared ufd with postcopy Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 11/29] vhost+postcopy: Transmit 'listen' to slave Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 12/29] postcopy+vhost-user: Split set_mem_table for postcopy Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 13/29] migration/ram: ramblock_recv_bitmap_test_byte_offset Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 14/29] libvhost-user+postcopy: Register new regions with the ufd Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 15/29] vhost+postcopy: Send address back to qemu Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 16/29] vhost+postcopy: Stash RAMBlock and offset Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 17/29] vhost+postcopy: Helper to send requests to source for shared pages Dr. David Alan Gilbert (git)
2018-03-20 14:54   ` Michael S. Tsirkin
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 18/29] vhost+postcopy: Resolve client address Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 19/29] postcopy: helper for waking shared Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 20/29] postcopy: postcopy_notify_shared_wake Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 21/29] vhost+postcopy: Add vhost waker Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 22/29] vhost+postcopy: Call wakeups Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 23/29] libvhost-user: mprotect & madvises for postcopy Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 24/29] vhost-user: Add VHOST_USER_POSTCOPY_END message Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 25/29] vhost+postcopy: Wire up POSTCOPY_END notify Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 26/29] vhost: Huge page align and merge Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 27/29] postcopy: Allow shared memory Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 28/29] libvhost-user: Claim support for postcopy Dr. David Alan Gilbert (git)
2018-03-12 17:21 ` [Qemu-devel] [PATCH v5 29/29] postcopy shared docs Dr. David Alan Gilbert (git)
2018-03-13 21:14 ` [Qemu-devel] [PATCH v5 00/29] postcopy+vhost-user/shared ram Michael S. Tsirkin
2018-03-14 11:49   ` Dr. David Alan Gilbert

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=20180312172124.56461-5-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=aarcange@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=mst@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@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).