qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Daniel P. Berrange" <berrange@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Eric Blake" <eblake@redhat.com>,
	"Jason Zeng" <jason.zeng@linux.intel.com>,
	"Zheng Chuan" <zhengchuan@huawei.com>,
	"Steve Sistare" <steven.sistare@oracle.com>,
	"Mark Kanda" <mark.kanda@oracle.com>,
	"Guoyi Tu" <tugy@chinatelecom.cn>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"John Snow" <jsnow@redhat.com>
Subject: [PATCH V8 08/39] cpr: blockers
Date: Wed, 15 Jun 2022 07:51:55 -0700	[thread overview]
Message-ID: <1655304746-102776-9-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1655304746-102776-1-git-send-email-steven.sistare@oracle.com>

Add an interface to register a blocker for cpr-save for one or more modes.
Devices and options that do not support a cpr mode can register a blocker,
and cpr-save will fail with a descriptive error message.  Conversely, if
such a device is deleted and un-registers its blocker, cpr will be allowed
again.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
 MAINTAINERS             |  1 +
 include/migration/cpr.h |  6 ++++
 migration/cpr.c         | 79 +++++++++++++++++++++++++++++++++++++++++++++++++
 stubs/cpr.c             | 23 ++++++++++++++
 stubs/meson.build       |  1 +
 5 files changed, 110 insertions(+)
 create mode 100644 stubs/cpr.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 9273891..1e4e72f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3159,6 +3159,7 @@ S: Maintained
 F: include/migration/cpr.h
 F: migration/cpr.c
 F: qapi/cpr.json
+F: stubs/cpr.c
 
 Record/replay
 M: Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
diff --git a/include/migration/cpr.h b/include/migration/cpr.h
index 1b6c82f..dfe5a1d 100644
--- a/include/migration/cpr.h
+++ b/include/migration/cpr.h
@@ -13,4 +13,10 @@
 void cpr_set_mode(CprMode mode);
 CprMode cpr_get_mode(void);
 
+#define CPR_MODE_ALL CPR_MODE__MAX
+
+int cpr_add_blocker(Error **reasonp, Error **errp, CprMode mode, ...);
+int cpr_add_blocker_str(const char *reason, Error **errp, CprMode mode, ...);
+void cpr_del_blocker(Error **reasonp);
+
 #endif
diff --git a/migration/cpr.c b/migration/cpr.c
index 24b0bcc..c1da784 100644
--- a/migration/cpr.c
+++ b/migration/cpr.c
@@ -29,12 +29,91 @@ void cpr_set_mode(CprMode mode)
     cpr_mode = mode;
 }
 
+static GSList *cpr_blockers[CPR_MODE__MAX];
+
+/*
+ * Add blocker for each mode in varargs list, or for all modes if CPR_MODE_ALL
+ * is specified.  Caller terminates the list with 0 or CPR_MODE_ALL.  This
+ * function takes ownership of *reasonp, and frees it on error, or in
+ * cpr_del_blocker.  errp is set in a later patch.
+ */
+int cpr_add_blocker(Error **reasonp, Error **errp, CprMode mode, ...)
+{
+    int modes = 0;
+    va_list ap;
+    ERRP_GUARD();
+
+    va_start(ap, mode);
+    while (mode != CPR_MODE_NONE && mode != CPR_MODE_ALL) {
+        assert(mode > CPR_MODE_NONE && mode < CPR_MODE__MAX);
+        modes |= BIT(mode);
+        mode = va_arg(ap, CprMode);
+    }
+    va_end(ap);
+    if (mode == CPR_MODE_ALL) {
+        modes = BIT(CPR_MODE__MAX) - 1;
+    }
+
+    for (mode = 0; mode < CPR_MODE__MAX; mode++) {
+        if (modes & BIT(mode)) {
+            cpr_blockers[mode] = g_slist_prepend(cpr_blockers[mode], *reasonp);
+        }
+    }
+    return 0;
+}
+
+/*
+ * Delete the blocker from all modes it is associated with.
+ */
+void cpr_del_blocker(Error **reasonp)
+{
+    CprMode mode;
+
+    if (*reasonp) {
+        for (mode = 0; mode < CPR_MODE__MAX; mode++) {
+            cpr_blockers[mode] = g_slist_remove(cpr_blockers[mode], *reasonp);
+        }
+        error_free(*reasonp);
+        *reasonp = NULL;
+    }
+}
+
+/*
+ * Add a blocker which will not be deleted.  Simpler for some callers.
+ */
+int cpr_add_blocker_str(const char *msg, Error **errp, CprMode mode, ...)
+{
+    int ret;
+    va_list ap;
+    Error *reason = NULL;
+
+    error_setg(&reason, "%s", msg);
+    va_start(ap, mode);
+    ret = cpr_add_blocker(&reason, errp, mode, ap);
+    va_end(ap);
+    return ret;
+}
+
+static bool cpr_is_blocked(Error **errp, CprMode mode)
+{
+    if (cpr_blockers[mode]) {
+        error_propagate(errp, error_copy(cpr_blockers[mode]->data));
+        return true;
+    }
+
+    return false;
+}
+
 void qmp_cpr_save(const char *filename, CprMode mode, Error **errp)
 {
     int ret;
     QEMUFile *f;
     int saved_vm_running = runstate_is_running();
 
+    if (cpr_is_blocked(errp, mode)) {
+        return;
+    }
+
     if (global_state_store()) {
         error_setg(errp, "Error saving global state");
         return;
diff --git a/stubs/cpr.c b/stubs/cpr.c
new file mode 100644
index 0000000..06a9a1c
--- /dev/null
+++ b/stubs/cpr.c
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2022 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "migration/cpr.h"
+
+int cpr_add_blocker(Error **reasonp, Error **errp, CprMode mode, ...)
+{
+    return 0;
+}
+
+int cpr_add_blocker_str(const char *reason, Error **errp, CprMode mode, ...)
+{
+    return 0;
+}
+
+void cpr_del_blocker(Error **reasonp)
+{
+}
diff --git a/stubs/meson.build b/stubs/meson.build
index 6f80fec..0d7565b 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -4,6 +4,7 @@ stub_ss.add(files('blk-exp-close-all.c'))
 stub_ss.add(files('blockdev-close-all-bdrv-states.c'))
 stub_ss.add(files('change-state-handler.c'))
 stub_ss.add(files('cmos.c'))
+stub_ss.add(files('cpr.c'))
 stub_ss.add(files('cpu-get-clock.c'))
 stub_ss.add(files('cpus-get-virtual-clock.c'))
 stub_ss.add(files('qemu-timer-notify-cb.c'))
-- 
1.8.3.1



  parent reply	other threads:[~2022-06-15 14:54 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-15 14:51 [PATCH V8 00/39] Live Update Steve Sistare
2022-06-15 14:51 ` [PATCH V8 01/39] migration: fix populate_vfio_info Steve Sistare
2022-06-16 14:41   ` Marc-André Lureau
2022-06-15 14:51 ` [PATCH V8 02/39] migration: qemu file wrappers Steve Sistare
2022-06-16  2:18   ` Guoyi Tu
2022-07-05 18:24     ` Steven Sistare
2022-06-16 14:55   ` Marc-André Lureau
2022-07-05 18:25     ` Steven Sistare
2022-06-16 15:29   ` Daniel P. Berrangé
2022-07-05 18:25     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 03/39] migration: simplify savevm Steve Sistare
2022-06-16 14:59   ` Marc-André Lureau
2022-06-15 14:51 ` [PATCH V8 04/39] memory: RAM_ANON flag Steve Sistare
2022-06-15 20:25   ` David Hildenbrand
2022-07-05 18:23     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 05/39] vl: start on wakeup request Steve Sistare
2022-06-16 15:55   ` Marc-André Lureau
2022-07-05 18:26     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 06/39] cpr: reboot mode Steve Sistare
2022-06-16 11:10   ` Daniel P. Berrangé
2022-07-05 18:26     ` Steven Sistare
2022-06-15 14:51 ` [PATCH V8 07/39] cpr: reboot HMP interfaces Steve Sistare
2022-06-15 14:51 ` Steve Sistare [this message]
2022-06-15 14:51 ` [PATCH V8 09/39] cpr: register blockers Steve Sistare
2022-06-15 14:51 ` [PATCH V8 10/39] cpr: cpr-enable option Steve Sistare
2022-06-15 14:51 ` [PATCH V8 11/39] cpr: save ram blocks Steve Sistare
2022-06-15 14:51 ` [PATCH V8 12/39] memory: flat section iterator Steve Sistare
2022-07-03  7:52   ` Peng Liang
2022-07-05 18:26     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 13/39] oslib: qemu_clear_cloexec Steve Sistare
2022-06-16 16:01   ` Marc-André Lureau
2022-06-16 16:07   ` Daniel P. Berrangé
2022-07-05 18:27     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 14/39] qapi: strList_from_string Steve Sistare
2022-06-16 16:04   ` Marc-André Lureau
2022-07-05 18:28     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 15/39] qapi: QAPI_LIST_LENGTH Steve Sistare
2022-06-16 16:06   ` Marc-André Lureau
2022-06-15 14:52 ` [PATCH V8 16/39] qapi: strv_from_strList Steve Sistare
2022-06-16 16:08   ` Marc-André Lureau
2022-07-05 18:28     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 17/39] qapi: strList unit tests Steve Sistare
2022-06-16 16:10   ` Marc-André Lureau
2022-06-15 14:52 ` [PATCH V8 18/39] vl: helper to request re-exec Steve Sistare
2022-06-15 14:52 ` [PATCH V8 19/39] cpr: preserve extra state Steve Sistare
2022-06-15 14:52 ` [PATCH V8 20/39] cpr: restart mode Steve Sistare
2022-07-03  8:15   ` Peng Liang
2022-07-05 18:29     ` Steven Sistare
2022-07-06  0:15       ` Peng Liang
2022-06-15 14:52 ` [PATCH V8 21/39] cpr: restart HMP interfaces Steve Sistare
2022-06-15 14:52 ` [PATCH V8 22/39] cpr: ram block blockers Steve Sistare
2022-06-15 14:52 ` [PATCH V8 23/39] hostmem-memfd: cpr for memory-backend-memfd Steve Sistare
2022-06-15 14:52 ` [PATCH V8 24/39] pci: export export msix_is_pending Steve Sistare
2022-06-27 22:44   ` Michael S. Tsirkin
2022-07-05 18:29     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 25/39] cpr: notifiers Steve Sistare
2022-06-15 14:52 ` [PATCH V8 26/39] vfio-pci: refactor for cpr Steve Sistare
2022-06-15 14:52 ` [PATCH V8 27/39] vfio-pci: cpr part 1 (fd and dma) Steve Sistare
2022-06-29 19:14   ` Alex Williamson
2022-07-06 17:45     ` Steven Sistare
2022-07-03  8:32   ` Peng Liang
2022-07-05 18:29     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 28/39] vfio-pci: cpr part 2 (msi) Steve Sistare
2022-06-29 20:19   ` Alex Williamson
2022-07-06 17:46     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 29/39] vfio-pci: cpr part 3 (intx) Steve Sistare
2022-06-29 20:43   ` Alex Williamson
2022-07-06 17:46     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 30/39] vfio-pci: recover from unmap-all-vaddr failure Steve Sistare
2022-06-29 22:58   ` Alex Williamson
2022-07-06 17:46     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 31/39] vhost: reset vhost devices for cpr Steve Sistare
2022-06-15 14:52 ` [PATCH V8 32/39] loader: suppress rom_reset during cpr Steve Sistare
2022-06-15 14:52 ` [PATCH V8 33/39] chardev: cpr framework Steve Sistare
2022-06-15 14:52 ` [PATCH V8 34/39] chardev: cpr for simple devices Steve Sistare
2022-06-15 14:52 ` [PATCH V8 35/39] chardev: cpr for pty Steve Sistare
2022-06-15 14:52 ` [PATCH V8 36/39] chardev: cpr for sockets Steve Sistare
2022-07-03  8:19   ` Peng Liang
2022-07-05 18:29     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 37/39] cpr: only-cpr-capable option Steve Sistare
2022-06-15 14:52 ` [PATCH V8 38/39] python/machine: add QEMUMachine accessors Steve Sistare
2022-06-17 14:16   ` John Snow
2022-07-05 18:30     ` Steven Sistare
2022-06-15 14:52 ` [PATCH V8 39/39] tests/avocado: add cpr regression test Steve Sistare

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=1655304746-102776-9-git-send-email-steven.sistare@oracle.com \
    --to=steven.sistare@oracle.com \
    --cc=alex.bennee@linaro.org \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=david@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=jason.zeng@linux.intel.com \
    --cc=jsnow@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mark.kanda@oracle.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philippe.mathieu.daude@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=tugy@chinatelecom.cn \
    --cc=zhengchuan@huawei.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).