From: Steven Sistare <steven.sistare@oracle.com>
To: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: "Daniel P. Berrange" <berrange@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Juan Quintela" <quintela@redhat.com>,
qemu-devel@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: Re: [PATCH V1 22/32] char: qio_channel_socket_accept reuse fd
Date: Thu, 24 Sep 2020 17:54:27 -0400 [thread overview]
Message-ID: <1fe5d582-52a0-dad1-583f-8b11ffb56ec7@oracle.com> (raw)
In-Reply-To: <20200915173334.GD2922@work-vm>
On 9/15/2020 1:33 PM, Dr. David Alan Gilbert wrote:
> * Steve Sistare (steven.sistare@oracle.com) wrote:
>> From: Mark Kanda <mark.kanda@oracle.com>
>>
>> Add an fd argument to qio_channel_socket_accept. If not -1, the channel
>> uses that fd instead of accepting a new socket connection. All callers
>> pass -1 in this patch, so no functional change.
>
> Doesn't some of this just come from the fact you're insisting on reusing
> the command line? We should be able to open a chardev on an fd
> shouldn't we?
If the management layer originally added the char device via hot plug, then
we expect it to do so again after restart, following the typical practice for
live migration. The device has no presence on the command line.
- Steve
>> Signed-off-by: Mark Kanda <mark.kanda@oracle.com>
>> Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
>> ---
>> include/io/channel-socket.h | 3 ++-
>> io/channel-socket.c | 12 +++++++++---
>> io/net-listener.c | 4 ++--
>> scsi/qemu-pr-helper.c | 2 +-
>> tests/qtest/tpm-emu.c | 2 +-
>> tests/test-char.c | 2 +-
>> tests/test-io-channel-socket.c | 4 ++--
>> 7 files changed, 18 insertions(+), 11 deletions(-)
>>
>> diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h
>> index 777ff59..0ffc560 100644
>> --- a/include/io/channel-socket.h
>> +++ b/include/io/channel-socket.h
>> @@ -248,6 +248,7 @@ qio_channel_socket_get_remote_address(QIOChannelSocket *ioc,
>> /**
>> * qio_channel_socket_accept:
>> * @ioc: the socket channel object
>> + * @reuse_fd: fd to reuse; -1 otherwise
>> * @errp: pointer to a NULL-initialized error object
>> *
>> * If the socket represents a server, then this accepts
>> @@ -258,7 +259,7 @@ qio_channel_socket_get_remote_address(QIOChannelSocket *ioc,
>> */
>> QIOChannelSocket *
>> qio_channel_socket_accept(QIOChannelSocket *ioc,
>> - Error **errp);
>> + int reuse_fd, Error **errp);
>>
>>
>> #endif /* QIO_CHANNEL_SOCKET_H */
>> diff --git a/io/channel-socket.c b/io/channel-socket.c
>> index e1b4667..dde12bf 100644
>> --- a/io/channel-socket.c
>> +++ b/io/channel-socket.c
>> @@ -352,7 +352,7 @@ void qio_channel_socket_dgram_async(QIOChannelSocket *ioc,
>>
>> QIOChannelSocket *
>> qio_channel_socket_accept(QIOChannelSocket *ioc,
>> - Error **errp)
>> + int reuse_fd, Error **errp)
>> {
>> QIOChannelSocket *cioc;
>>
>> @@ -362,8 +362,14 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
>>
>> retry:
>> trace_qio_channel_socket_accept(ioc);
>> - cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr,
>> - &cioc->remoteAddrLen);
>> +
>> + if (reuse_fd != -1) {
>> + cioc->fd = reuse_fd;
>> + } else {
>> + cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr,
>> + &cioc->remoteAddrLen);
>> + }
>> +
>> if (cioc->fd < 0) {
>> if (errno == EINTR) {
>> goto retry;
>> diff --git a/io/net-listener.c b/io/net-listener.c
>> index 5d8a226..bbdea1e 100644
>> --- a/io/net-listener.c
>> +++ b/io/net-listener.c
>> @@ -45,7 +45,7 @@ static gboolean qio_net_listener_channel_func(QIOChannel *ioc,
>> QIOChannelSocket *sioc;
>>
>> sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
>> - NULL);
>> + -1, NULL);
>> if (!sioc) {
>> return TRUE;
>> }
>> @@ -194,7 +194,7 @@ static gboolean qio_net_listener_wait_client_func(QIOChannel *ioc,
>> QIOChannelSocket *sioc;
>>
>> sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
>> - NULL);
>> + -1, NULL);
>> if (!sioc) {
>> return TRUE;
>> }
>> diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
>> index 57ad830..0e6d683 100644
>> --- a/scsi/qemu-pr-helper.c
>> +++ b/scsi/qemu-pr-helper.c
>> @@ -800,7 +800,7 @@ static gboolean accept_client(QIOChannel *ioc, GIOCondition cond, gpointer opaqu
>> PRHelperClient *prh;
>>
>> cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
>> - NULL);
>> + -1, NULL);
>> if (!cioc) {
>> return TRUE;
>> }
>> diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
>> index 2e8eb7b..19e5dab 100644
>> --- a/tests/qtest/tpm-emu.c
>> +++ b/tests/qtest/tpm-emu.c
>> @@ -83,7 +83,7 @@ void *tpm_emu_ctrl_thread(void *data)
>> g_cond_signal(&s->data_cond);
>>
>> qio_channel_wait(QIO_CHANNEL(lioc), G_IO_IN);
>> - ioc = QIO_CHANNEL(qio_channel_socket_accept(lioc, &error_abort));
>> + ioc = QIO_CHANNEL(qio_channel_socket_accept(lioc, -1, &error_abort));
>> g_assert(ioc);
>>
>> {
>> diff --git a/tests/test-char.c b/tests/test-char.c
>> index 614bdac..1bb6ae0 100644
>> --- a/tests/test-char.c
>> +++ b/tests/test-char.c
>> @@ -884,7 +884,7 @@ char_socket_client_server_thread(gpointer data)
>> QIOChannelSocket *cioc;
>>
>> retry:
>> - cioc = qio_channel_socket_accept(ioc, &error_abort);
>> + cioc = qio_channel_socket_accept(ioc, -1, &error_abort);
>> g_assert_nonnull(cioc);
>>
>> if (char_socket_ping_pong(QIO_CHANNEL(cioc), NULL) != 0) {
>> diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
>> index d43083a..0d410cf 100644
>> --- a/tests/test-io-channel-socket.c
>> +++ b/tests/test-io-channel-socket.c
>> @@ -75,7 +75,7 @@ static void test_io_channel_setup_sync(SocketAddress *listen_addr,
>> qio_channel_set_delay(*src, false);
>>
>> qio_channel_wait(QIO_CHANNEL(lioc), G_IO_IN);
>> - *dst = QIO_CHANNEL(qio_channel_socket_accept(lioc, &error_abort));
>> + *dst = QIO_CHANNEL(qio_channel_socket_accept(lioc, -1, &error_abort));
>> g_assert(*dst);
>>
>> test_io_channel_set_socket_bufs(*src, *dst);
>> @@ -143,7 +143,7 @@ static void test_io_channel_setup_async(SocketAddress *listen_addr,
>> g_assert(!data.err);
>>
>> qio_channel_wait(QIO_CHANNEL(lioc), G_IO_IN);
>> - *dst = QIO_CHANNEL(qio_channel_socket_accept(lioc, &error_abort));
>> + *dst = QIO_CHANNEL(qio_channel_socket_accept(lioc, -1, &error_abort));
>> g_assert(*dst);
>>
>> qio_channel_set_delay(*src, false);
>> --
>> 1.8.3.1
>>
next prev parent reply other threads:[~2020-09-24 21:58 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 15:14 [PATCH V1 00/32] Live Update Steve Sistare
2020-07-30 15:14 ` [PATCH V1 01/32] savevm: add vmstate handler iterators Steve Sistare
2020-09-11 16:24 ` Dr. David Alan Gilbert
2020-09-24 21:43 ` Steven Sistare
2020-09-25 9:07 ` Dr. David Alan Gilbert
2020-07-30 15:14 ` [PATCH V1 02/32] savevm: VM handlers mode mask Steve Sistare
2020-07-30 15:14 ` [PATCH V1 03/32] savevm: QMP command for cprsave Steve Sistare
2020-07-30 16:12 ` Eric Blake
2020-07-30 17:52 ` Steven Sistare
2020-09-11 16:43 ` Dr. David Alan Gilbert
2020-09-25 18:43 ` Steven Sistare
2020-09-25 22:22 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 04/32] savevm: HMP Command " Steve Sistare
2020-09-11 16:57 ` Dr. David Alan Gilbert
2020-09-24 21:44 ` Steven Sistare
2020-09-25 9:26 ` Dr. David Alan Gilbert
2020-07-30 15:14 ` [PATCH V1 05/32] savevm: QMP command for cprload Steve Sistare
2020-07-30 16:14 ` Eric Blake
2020-07-30 18:00 ` Steven Sistare
2020-09-11 17:18 ` Dr. David Alan Gilbert
2020-09-24 21:49 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 06/32] savevm: HMP Command " Steve Sistare
2020-07-30 15:14 ` [PATCH V1 07/32] savevm: QMP command for cprinfo Steve Sistare
2020-07-30 16:17 ` Eric Blake
2020-07-30 18:02 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 08/32] savevm: HMP " Steve Sistare
2020-09-11 17:27 ` Dr. David Alan Gilbert
2020-09-24 21:50 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 09/32] savevm: prevent cprsave if memory is volatile Steve Sistare
2020-09-11 17:35 ` Dr. David Alan Gilbert
2020-09-24 21:51 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 10/32] kvmclock: restore paused KVM clock Steve Sistare
2020-09-11 17:50 ` Dr. David Alan Gilbert
2020-09-25 18:07 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 11/32] cpu: disable ticks when suspended Steve Sistare
2020-09-11 17:53 ` Dr. David Alan Gilbert
2020-09-24 20:42 ` Steven Sistare
2020-09-25 9:03 ` Dr. David Alan Gilbert
2020-07-30 15:14 ` [PATCH V1 12/32] vl: pause option Steve Sistare
2020-07-30 16:20 ` Eric Blake
2020-07-30 18:11 ` Steven Sistare
2020-07-31 10:07 ` Daniel P. Berrangé
2020-07-31 15:18 ` Steven Sistare
2020-07-30 17:03 ` Alex Bennée
2020-07-30 18:14 ` Steven Sistare
2020-07-31 9:44 ` Alex Bennée
2020-09-11 17:59 ` Dr. David Alan Gilbert
2020-09-24 21:51 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 13/32] gdbstub: gdb support for suspended state Steve Sistare
2020-09-11 18:41 ` Dr. David Alan Gilbert
2020-09-24 21:51 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 14/32] savevm: VMS_RESTART and cprsave restart Steve Sistare
2020-07-30 16:22 ` Eric Blake
2020-07-30 18:14 ` Steven Sistare
2020-09-11 18:44 ` Dr. David Alan Gilbert
2020-09-24 21:44 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 15/32] vl: QEMU_START_FREEZE env var Steve Sistare
2020-09-11 18:49 ` Dr. David Alan Gilbert
2020-09-24 21:47 ` Steven Sistare
2020-09-25 15:52 ` Dr. David Alan Gilbert
2020-07-30 15:14 ` [PATCH V1 16/32] oslib: add qemu_clr_cloexec Steve Sistare
2020-09-11 18:52 ` Dr. David Alan Gilbert
2020-07-30 15:14 ` [PATCH V1 17/32] util: env var helpers Steve Sistare
2020-09-11 19:00 ` Dr. David Alan Gilbert
2020-09-24 21:52 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 18/32] osdep: import MADV_DOEXEC Steve Sistare
2020-08-17 18:30 ` Steven Sistare
2020-08-17 20:48 ` Alex Williamson
2020-08-17 21:20 ` Steven Sistare
2020-08-17 21:44 ` Alex Williamson
2020-08-18 2:42 ` Alex Williamson
2020-08-19 21:52 ` Steven Sistare
2020-08-24 22:30 ` Alex Williamson
2020-10-08 16:32 ` Steven Sistare
2020-10-15 20:36 ` Alex Williamson
2020-10-19 16:33 ` Steven Sistare
2020-10-26 18:28 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 19/32] memory: ram_block_add cosmetic changes Steve Sistare
2020-07-30 15:14 ` [PATCH V1 20/32] vl: add helper to request re-exec Steve Sistare
2020-07-30 15:14 ` [PATCH V1 21/32] exec, memory: exec(3) to restart Steve Sistare
2020-07-30 15:14 ` [PATCH V1 22/32] char: qio_channel_socket_accept reuse fd Steve Sistare
2020-09-15 17:33 ` Dr. David Alan Gilbert
2020-09-15 17:53 ` Daniel P. Berrangé
2020-09-24 21:54 ` Steven Sistare [this message]
2020-07-30 15:14 ` [PATCH V1 23/32] char: save/restore chardev socket fds Steve Sistare
2020-07-30 15:14 ` [PATCH V1 24/32] ui: save/restore vnc " Steve Sistare
2020-07-31 9:06 ` Daniel P. Berrangé
2020-07-31 16:51 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 25/32] char: save/restore chardev pty fds Steve Sistare
2020-07-30 15:14 ` [PATCH V1 26/32] monitor: save/restore QMP negotiation status Steve Sistare
2020-07-30 15:14 ` [PATCH V1 27/32] vhost: reset vhost devices upon cprsave Steve Sistare
2020-07-30 15:14 ` [PATCH V1 28/32] char: restore terminal on restart Steve Sistare
2020-07-30 15:14 ` [PATCH V1 29/32] pci: export pci_update_mappings Steve Sistare
2020-07-30 15:14 ` [PATCH V1 30/32] vfio-pci: save and restore Steve Sistare
2020-08-06 10:22 ` Jason Zeng
2020-08-07 20:38 ` Steven Sistare
2020-08-10 3:50 ` Jason Zeng
2020-08-19 21:15 ` Steven Sistare
2020-08-20 10:33 ` Jason Zeng
2020-10-07 21:25 ` Steven Sistare
2020-07-30 15:14 ` [PATCH V1 31/32] vfio-pci: trace pci config Steve Sistare
2020-07-30 15:14 ` [PATCH V1 32/32] vfio-pci: improved tracing Steve Sistare
2020-09-15 18:49 ` Dr. David Alan Gilbert
2020-09-24 21:52 ` Steven Sistare
2020-07-30 16:52 ` [PATCH V1 00/32] Live Update Daniel P. Berrangé
2020-07-30 18:48 ` Steven Sistare
2020-07-31 8:53 ` Daniel P. Berrangé
2020-07-31 15:27 ` Steven Sistare
2020-07-31 15:52 ` Daniel P. Berrangé
2020-07-31 17:20 ` Steven Sistare
2020-08-11 19:08 ` Dr. David Alan Gilbert
2020-07-30 17:15 ` Paolo Bonzini
2020-07-30 19:09 ` Steven Sistare
2020-07-30 21:39 ` Paolo Bonzini
2020-07-31 19:22 ` Steven Sistare
2020-07-30 17:49 ` Dr. David Alan Gilbert
2020-07-30 19:31 ` Steven Sistare
2020-08-04 18:18 ` Steven 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=1fe5d582-52a0-dad1-583f-8b11ffb56ec7@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=dgilbert@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--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).