[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V7 28/29] chardev: cpr for sockets
From: |
Steve Sistare |
Subject: |
[PATCH V7 28/29] chardev: cpr for sockets |
Date: |
Wed, 22 Dec 2021 11:05:33 -0800 |
Save accepted socket fds before cpr-save, and look for them after cpr-load.
in the environment after cpr-load. Reject cpr-exec if a socket enables
the TLS or websocket option. Allow a monitor socket by closing it on exec.
Signed-off-by: Mark Kanda <mark.kanda@oracle.com>
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
chardev/char-socket.c | 35 +++++++++++++++++++++++++++++++++++
monitor/hmp.c | 3 +++
monitor/qmp.c | 3 +++
3 files changed, 41 insertions(+)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index d619088..c111e17 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -26,6 +26,7 @@
#include "chardev/char.h"
#include "io/channel-socket.h"
#include "io/channel-websock.h"
+#include "migration/cpr.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/option.h"
@@ -358,6 +359,10 @@ static void tcp_chr_free_connection(Chardev *chr)
SocketChardev *s = SOCKET_CHARDEV(chr);
int i;
+ if (!chr->reopen_on_cpr) {
+ cpr_delete_fd(chr->label, 0);
+ }
+
if (s->read_msgfds_num) {
for (i = 0; i < s->read_msgfds_num; i++) {
close(s->read_msgfds[i]);
@@ -920,6 +925,10 @@ static void tcp_chr_accept(QIONetListener *listener,
QIO_CHANNEL(cioc));
}
tcp_chr_new_client(chr, cioc);
+
+ if (s->sioc && !chr->reopen_on_cpr) {
+ cpr_save_fd(chr->label, 0, s->sioc->fd);
+ }
}
@@ -1175,6 +1184,26 @@ static gboolean socket_reconnect_timeout(gpointer opaque)
return false;
}
+static int load_char_socket_fd(Chardev *chr, Error **errp)
+{
+ SocketChardev *sockchar = SOCKET_CHARDEV(chr);
+ QIOChannelSocket *sioc;
+ const char *label = chr->label;
+ int fd = cpr_find_fd(label, 0);
+
+ if (fd != -1) {
+ sockchar = SOCKET_CHARDEV(chr);
+ sioc = qio_channel_socket_new_fd(fd, errp);
+ if (sioc) {
+ tcp_chr_accept(sockchar->listener, sioc, chr);
+ object_unref(OBJECT(sioc));
+ } else {
+ error_setg(errp, "could not restore socket for %s", label);
+ return -1;
+ }
+ }
+ return 0;
+}
static int qmp_chardev_open_socket_server(Chardev *chr,
bool is_telnet,
@@ -1385,6 +1414,10 @@ static void qmp_chardev_open_socket(Chardev *chr,
}
s->registered_yank = true;
+ if (!s->tls_creds && !s->is_websock) {
+ qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_CPR);
+ }
+
/* be isn't opened until we get a connection */
*be_opened = false;
@@ -1400,6 +1433,8 @@ static void qmp_chardev_open_socket(Chardev *chr,
return;
}
}
+
+ load_char_socket_fd(chr, errp);
}
static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
diff --git a/monitor/hmp.c b/monitor/hmp.c
index b20737e..a425894 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -1484,4 +1484,7 @@ void monitor_init_hmp(Chardev *chr, bool use_readline,
Error **errp)
qemu_chr_fe_set_handlers(&mon->common.chr, monitor_can_read, monitor_read,
monitor_event, NULL, &mon->common, NULL, true);
monitor_list_append(&mon->common);
+
+ /* monitor cannot yet be preserved across cpr */
+ chr->reopen_on_cpr = true;
}
diff --git a/monitor/qmp.c b/monitor/qmp.c
index 092c527..0043459 100644
--- a/monitor/qmp.c
+++ b/monitor/qmp.c
@@ -535,4 +535,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error
**errp)
NULL, &mon->common, NULL, true);
monitor_list_append(&mon->common);
}
+
+ /* Monitor cannot yet be preserved across cpr */
+ chr->reopen_on_cpr = true;
}
--
1.8.3.1
- [PATCH V7 25/29] chardev: cpr framework, (continued)
- [PATCH V7 25/29] chardev: cpr framework, Steve Sistare, 2021/12/22
- [PATCH V7 26/29] chardev: cpr for simple devices, Steve Sistare, 2021/12/22
- [PATCH V7 29/29] cpr: only-cpr-capable option, Steve Sistare, 2021/12/22
- [PATCH V7 21/29] vfio-pci: cpr part 3 (intx), Steve Sistare, 2021/12/22
- [PATCH V7 22/29] vfio-pci: recover from unmap-all-vaddr failure, Steve Sistare, 2021/12/22
- [PATCH V7 24/29] loader: suppress rom_reset during cpr, Steve Sistare, 2021/12/22
- [PATCH V7 23/29] vhost: reset vhost devices for cpr, Steve Sistare, 2021/12/22
- [PATCH V7 27/29] chardev: cpr for pty, Steve Sistare, 2021/12/22
- [PATCH V7 10/29] machine: memfd-alloc option, Steve Sistare, 2021/12/22
- [PATCH V7 08/29] memory: flat section iterator, Steve Sistare, 2021/12/22
- [PATCH V7 28/29] chardev: cpr for sockets,
Steve Sistare <=