* [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server
@ 2017-12-18 10:16 Daniel P. Berrange
2017-12-18 10:16 ` [Qemu-devel] [PATCH v2 1/2] blockdev: convert internal NBD server to QIONetListener Daniel P. Berrange
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Daniel P. Berrange @ 2017-12-18 10:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Eric Blake, Paolo Bonzini, qemu-block, Daniel P. Berrange
These patches were previously posted as part of a larger series:
https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02064.html
These patches port the NBD server to use QIONetListener, which allows for
easy setup of multiple listening sockets. This enables full support for
IPv4/IPv6 dual stack, by fully honouring all addresses returned from a
DNS lookup.
There has been no change since v1, except for trivial rebase.
Daniel P. Berrange (2):
blockdev: convert internal NBD server to QIONetListener
blockdev: convert qemu-nbd server to QIONetListener
blockdev-nbd.c | 50 +++++++++++++++--------------------------------
qemu-nbd.c | 61 +++++++++++++++++++++++-----------------------------------
2 files changed, 40 insertions(+), 71 deletions(-)
--
2.14.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 1/2] blockdev: convert internal NBD server to QIONetListener
2017-12-18 10:16 [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Daniel P. Berrange
@ 2017-12-18 10:16 ` Daniel P. Berrange
2017-12-18 10:16 ` [Qemu-devel] [PATCH v2 2/2] blockdev: convert qemu-nbd " Daniel P. Berrange
2017-12-18 11:48 ` [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Paolo Bonzini
2 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Berrange @ 2017-12-18 10:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Eric Blake, Paolo Bonzini, qemu-block, Daniel P. Berrange
Instead of creating a QIOChannelSocket directly for the NBD
server socket, use a QIONetListener. This provides the ability
to listen on multiple sockets at the same time, so enables
full support for IPv4/IPv6 dual stack.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
blockdev-nbd.c | 50 ++++++++++++++++----------------------------------
1 file changed, 16 insertions(+), 34 deletions(-)
diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 28f551a7b0..9e3c22109c 100644
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -18,10 +18,10 @@
#include "qmp-commands.h"
#include "block/nbd.h"
#include "io/channel-socket.h"
+#include "io/net-listener.h"
typedef struct NBDServerData {
- QIOChannelSocket *listen_ioc;
- int watch;
+ QIONetListener *listener;
QCryptoTLSCreds *tlscreds;
} NBDServerData;
@@ -32,27 +32,13 @@ static void nbd_blockdev_client_closed(NBDClient *client, bool ignored)
nbd_client_put(client);
}
-static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition,
- gpointer opaque)
+static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,
+ gpointer opaque)
{
- QIOChannelSocket *cioc;
-
- if (!nbd_server) {
- return FALSE;
- }
-
- cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
- NULL);
- if (!cioc) {
- return TRUE;
- }
-
qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server");
nbd_client_new(NULL, cioc,
nbd_server->tlscreds, NULL,
nbd_blockdev_client_closed);
- object_unref(OBJECT(cioc));
- return TRUE;
}
@@ -62,10 +48,8 @@ static void nbd_server_free(NBDServerData *server)
return;
}
- if (server->watch != -1) {
- g_source_remove(server->watch);
- }
- object_unref(OBJECT(server->listen_ioc));
+ qio_net_listener_disconnect(server->listener);
+ object_unref(OBJECT(server->listener));
if (server->tlscreds) {
object_unref(OBJECT(server->tlscreds));
}
@@ -112,12 +96,12 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds,
}
nbd_server = g_new0(NBDServerData, 1);
- nbd_server->watch = -1;
- nbd_server->listen_ioc = qio_channel_socket_new();
- qio_channel_set_name(QIO_CHANNEL(nbd_server->listen_ioc),
- "nbd-listener");
- if (qio_channel_socket_listen_sync(
- nbd_server->listen_ioc, addr, errp) < 0) {
+ nbd_server->listener = qio_net_listener_new();
+
+ qio_net_listener_set_name(nbd_server->listener,
+ "nbd-listener");
+
+ if (qio_net_listener_open_sync(nbd_server->listener, addr, errp) < 0) {
goto error;
}
@@ -134,12 +118,10 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds,
}
}
- nbd_server->watch = qio_channel_add_watch(
- QIO_CHANNEL(nbd_server->listen_ioc),
- G_IO_IN,
- nbd_accept,
- NULL,
- NULL);
+ qio_net_listener_set_client_func(nbd_server->listener,
+ nbd_accept,
+ NULL,
+ NULL);
return;
--
2.14.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] blockdev: convert qemu-nbd server to QIONetListener
2017-12-18 10:16 [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Daniel P. Berrange
2017-12-18 10:16 ` [Qemu-devel] [PATCH v2 1/2] blockdev: convert internal NBD server to QIONetListener Daniel P. Berrange
@ 2017-12-18 10:16 ` Daniel P. Berrange
2017-12-18 11:48 ` [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Paolo Bonzini
2 siblings, 0 replies; 6+ messages in thread
From: Daniel P. Berrange @ 2017-12-18 10:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Eric Blake, Paolo Bonzini, qemu-block, Daniel P. Berrange
Instead of creating a QIOChannelSocket directly for the NBD
server socket, use a QIONetListener. This provides the ability
to listen on multiple sockets at the same time, so enables
full support for IPv4/IPv6 dual stack. This also means we can
honour multiple FDs received during socket activation.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
qemu-nbd.c | 61 ++++++++++++++++++++++++-------------------------------------
1 file changed, 24 insertions(+), 37 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index d75ca51482..3723493be1 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -37,6 +37,7 @@
#include "qapi/qmp/qstring.h"
#include "qom/object_interfaces.h"
#include "io/channel-socket.h"
+#include "io/net-listener.h"
#include "crypto/init.h"
#include "trace/control.h"
#include "qemu-version.h"
@@ -62,8 +63,7 @@ static int persistent = 0;
static enum { RUNNING, TERMINATE, TERMINATING, TERMINATED } state;
static int shared = 1;
static int nb_fds;
-static QIOChannelSocket *server_ioc;
-static int server_watch = -1;
+static QIONetListener *server;
static QCryptoTLSCreds *tlscreds;
static void usage(const char *name)
@@ -344,44 +344,25 @@ static void nbd_client_closed(NBDClient *client, bool negotiated)
nbd_client_put(client);
}
-static gboolean nbd_accept(QIOChannel *ioc, GIOCondition cond, gpointer opaque)
+static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,
+ gpointer opaque)
{
- QIOChannelSocket *cioc;
-
- cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
- NULL);
- if (!cioc) {
- return TRUE;
- }
-
if (state >= TERMINATE) {
- object_unref(OBJECT(cioc));
- return TRUE;
+ return;
}
nb_fds++;
nbd_update_server_watch();
nbd_client_new(newproto ? NULL : exp, cioc,
tlscreds, NULL, nbd_client_closed);
- object_unref(OBJECT(cioc));
-
- return TRUE;
}
static void nbd_update_server_watch(void)
{
if (nbd_can_accept()) {
- if (server_watch == -1) {
- server_watch = qio_channel_add_watch(QIO_CHANNEL(server_ioc),
- G_IO_IN,
- nbd_accept,
- NULL, NULL);
- }
+ qio_net_listener_set_client_func(server, nbd_accept, NULL, NULL);
} else {
- if (server_watch != -1) {
- g_source_remove(server_watch);
- server_watch = -1;
- }
+ qio_net_listener_set_client_func(server, NULL, NULL, NULL);
}
}
@@ -915,23 +896,29 @@ int main(int argc, char **argv)
snprintf(sockpath, 128, SOCKET_PATH, basename(device));
}
+ server = qio_net_listener_new();
if (socket_activation == 0) {
- server_ioc = qio_channel_socket_new();
saddr = nbd_build_socket_address(sockpath, bindto, port);
- if (qio_channel_socket_listen_sync(server_ioc, saddr, &local_err) < 0) {
- object_unref(OBJECT(server_ioc));
+ if (qio_net_listener_open_sync(server, saddr, &local_err) < 0) {
+ object_unref(OBJECT(server));
error_report_err(local_err);
- return 1;
+ exit(EXIT_FAILURE);
}
} else {
+ size_t i;
/* See comment in check_socket_activation above. */
- assert(socket_activation == 1);
- server_ioc = qio_channel_socket_new_fd(FIRST_SOCKET_ACTIVATION_FD,
- &local_err);
- if (server_ioc == NULL) {
- error_report("Failed to use socket activation: %s",
- error_get_pretty(local_err));
- exit(EXIT_FAILURE);
+ for (i = 0; i < socket_activation; i++) {
+ QIOChannelSocket *sioc;
+ sioc = qio_channel_socket_new_fd(FIRST_SOCKET_ACTIVATION_FD + i,
+ &local_err);
+ if (sioc == NULL) {
+ object_unref(OBJECT(server));
+ error_report("Failed to use socket activation: %s",
+ error_get_pretty(local_err));
+ exit(EXIT_FAILURE);
+ }
+ qio_net_listener_add(server, sioc);
+ object_unref(OBJECT(sioc));
}
}
--
2.14.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server
2017-12-18 10:16 [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Daniel P. Berrange
2017-12-18 10:16 ` [Qemu-devel] [PATCH v2 1/2] blockdev: convert internal NBD server to QIONetListener Daniel P. Berrange
2017-12-18 10:16 ` [Qemu-devel] [PATCH v2 2/2] blockdev: convert qemu-nbd " Daniel P. Berrange
@ 2017-12-18 11:48 ` Paolo Bonzini
2017-12-20 23:16 ` Eric Blake
2 siblings, 1 reply; 6+ messages in thread
From: Paolo Bonzini @ 2017-12-18 11:48 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Eric Blake, qemu-block
On 18/12/2017 11:16, Daniel P. Berrange wrote:
> These patches were previously posted as part of a larger series:
>
> https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02064.html
>
> These patches port the NBD server to use QIONetListener, which allows for
> easy setup of multiple listening sockets. This enables full support for
> IPv4/IPv6 dual stack, by fully honouring all addresses returned from a
> DNS lookup.
>
> There has been no change since v1, except for trivial rebase.
>
> Daniel P. Berrange (2):
> blockdev: convert internal NBD server to QIONetListener
> blockdev: convert qemu-nbd server to QIONetListener
>
> blockdev-nbd.c | 50 +++++++++++++++--------------------------------
> qemu-nbd.c | 61 +++++++++++++++++++++++-----------------------------------
> 2 files changed, 40 insertions(+), 71 deletions(-)
>
Looks good, thanks!
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server
2017-12-18 11:48 ` [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Paolo Bonzini
@ 2017-12-20 23:16 ` Eric Blake
2017-12-20 23:20 ` Paolo Bonzini
0 siblings, 1 reply; 6+ messages in thread
From: Eric Blake @ 2017-12-20 23:16 UTC (permalink / raw)
To: Paolo Bonzini, Daniel P. Berrange, qemu-devel; +Cc: qemu-block
On 12/18/2017 05:48 AM, Paolo Bonzini wrote:
> On 18/12/2017 11:16, Daniel P. Berrange wrote:
>> These patches were previously posted as part of a larger series:
>>
>> https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02064.html
>>
>> These patches port the NBD server to use QIONetListener, which allows for
>> easy setup of multiple listening sockets. This enables full support for
>> IPv4/IPv6 dual stack, by fully honouring all addresses returned from a
>> DNS lookup.
>>
>> There has been no change since v1, except for trivial rebase.
>>
>> Daniel P. Berrange (2):
>> blockdev: convert internal NBD server to QIONetListener
>> blockdev: convert qemu-nbd server to QIONetListener
>>
>> blockdev-nbd.c | 50 +++++++++++++++--------------------------------
>> qemu-nbd.c | 61 +++++++++++++++++++++++-----------------------------------
>> 2 files changed, 40 insertions(+), 71 deletions(-)
>>
>
> Looks good, thanks!
I see these were included in Paolo's pull request, but that it failed
for other reasons. If needed, I can take it through the NBD tree.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server
2017-12-20 23:16 ` Eric Blake
@ 2017-12-20 23:20 ` Paolo Bonzini
0 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2017-12-20 23:20 UTC (permalink / raw)
To: Eric Blake, Daniel P. Berrange, qemu-devel; +Cc: qemu-block
On 21/12/2017 00:16, Eric Blake wrote:
> On 12/18/2017 05:48 AM, Paolo Bonzini wrote:
>> On 18/12/2017 11:16, Daniel P. Berrange wrote:
>>> These patches were previously posted as part of a larger series:
>>>
>>> https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg02064.html
>>>
>>> These patches port the NBD server to use QIONetListener, which allows
>>> for
>>> easy setup of multiple listening sockets. This enables full support for
>>> IPv4/IPv6 dual stack, by fully honouring all addresses returned from a
>>> DNS lookup.
>>>
>>> There has been no change since v1, except for trivial rebase.
>>>
>>> Daniel P. Berrange (2):
>>> blockdev: convert internal NBD server to QIONetListener
>>> blockdev: convert qemu-nbd server to QIONetListener
>>>
>>> blockdev-nbd.c | 50 +++++++++++++++--------------------------------
>>> qemu-nbd.c | 61
>>> +++++++++++++++++++++++-----------------------------------
>>> 2 files changed, 40 insertions(+), 71 deletions(-)
>>>
>>
>> Looks good, thanks!
>
> I see these were included in Paolo's pull request, but that it failed
> for other reasons. If needed, I can take it through the NBD tree.
I'll respin tomorrow.
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-12-20 23:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-18 10:16 [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Daniel P. Berrange
2017-12-18 10:16 ` [Qemu-devel] [PATCH v2 1/2] blockdev: convert internal NBD server to QIONetListener Daniel P. Berrange
2017-12-18 10:16 ` [Qemu-devel] [PATCH v2 2/2] blockdev: convert qemu-nbd " Daniel P. Berrange
2017-12-18 11:48 ` [Qemu-devel] [PATCH v2 0/2] Enable full IPv4/IPv6 dual stack for NBD server Paolo Bonzini
2017-12-20 23:16 ` Eric Blake
2017-12-20 23:20 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.