Skip to contentSkip to conversation

nbd: enable keepalive

PATCH In review Vladimir Sementsov-Ogievskiy 4 participants 8 messages Jun 5, 2019 – Jun 26, 2019 Block layer

lore
Share & tools
lore
#0 lore raw

v2 cover nbd: enable keepalive

Hi all!

Here is a suggestion to enable keepalive option to track server availablity. We suggest to enable it by default. If we need, we'll be able to add option to specify timeout by hand later.

v2: 01 - Fix io channel returned errors to be -1 [Daniel]
02 - Fix typo in commit message [Eric]

Vladimir Sementsov-Ogievskiy (2):
io/channel: add qio_channel_set_keepalive
nbd-client: enable TCP keepalive

 include/io/channel.h | 15 +++++++++++++++
 block/nbd-client.c   |  1 +
 io/channel-socket.c  | 20 ++++++++++++++++++++
 io/channel.c         | 14 ++++++++++++++
 4 files changed, 50 insertions(+)
Signature · 1 line
2.18.0
#1 lore raw

PATCH v2 1/2 io/channel: add qio_channel_set_keepalive

---
 include/io/channel.h | 15 +++++++++++++++
 io/channel-socket.c  | 20 ++++++++++++++++++++
 io/channel.c         | 14 ++++++++++++++
 3 files changed, 49 insertions(+)
include/io/channel.h +15 -0
index 59460cb1ec..b8789ea08a 100644
@@ -124,6 +124,9 @@ struct QIOChannelClass {
     int (*io_set_blocking)(QIOChannel *ioc,
                            bool enabled,
                            Error **errp);
+    int (*io_set_keepalive)(QIOChannel *ioc,
+                            bool enabled,
+                            Error **errp);
 
     /* Optional callbacks */
     int (*io_shutdown)(QIOChannel *ioc,
@@ -490,6 +493,18 @@ int qio_channel_set_blocking(QIOChannel *ioc,
                              bool enabled,
                              Error **errp);
 
+/*
+ * qio_channel_set_keepalive:
+ * @ioc: the channel object
+ * @enabled: the keepalive flag state
+ * @errp: pointer to a NULL-initialized error object
+ *
+ * Returns 0 on success, -1 on error.
+ */
+int qio_channel_set_keepalive(QIOChannel *ioc,
+                              bool enabled,
+                              Error **errp);
+
 /**
  * qio_channel_close:
  * @ioc: the channel object
io/channel-socket.c +20 -0
index bc5f80e780..84b474851b 100644
@@ -656,6 +656,25 @@ qio_channel_socket_set_blocking(QIOChannel *ioc,
 }
 
 
+static int
+qio_channel_socket_set_keepalive(QIOChannel *ioc,
+                                 bool enabled,
+                                 Error **errp)
+{
+    QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(ioc);
+    int val = enabled;
+    int ret = qemu_setsockopt(sioc->fd, SOL_SOCKET, SO_KEEPALIVE,
+                              &val, sizeof(val));
+
+    if (ret < 0) {
+        error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
+        return -1;
+    }
+
+    return 0;
+}
+
+
 static void
 qio_channel_socket_set_delay(QIOChannel *ioc,
                              bool enabled)
@@ -762,6 +781,7 @@ static void qio_channel_socket_class_init(ObjectClass *klass,
     ioc_klass->io_writev = qio_channel_socket_writev;
     ioc_klass->io_readv = qio_channel_socket_readv;
     ioc_klass->io_set_blocking = qio_channel_socket_set_blocking;
+    ioc_klass->io_set_keepalive = qio_channel_socket_set_keepalive;
     ioc_klass->io_close = qio_channel_socket_close;
     ioc_klass->io_shutdown = qio_channel_socket_shutdown;
     ioc_klass->io_set_cork = qio_channel_socket_set_cork;
io/channel.c +14 -0
index 2a26c2a2c0..a9e62fdbdc 100644
@@ -265,6 +265,20 @@ int qio_channel_set_blocking(QIOChannel *ioc,
     return klass->io_set_blocking(ioc, enabled, errp);
 }
 
+int qio_channel_set_keepalive(QIOChannel *ioc,
+                              bool enabled,
+                              Error **errp)
+{
+    QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc);
+
+    if (!klass->io_set_keepalive) {
+        error_setg(errp, "KEEPALIVE is not supported by IO channel");
+        return -1;
+    }
+
+    return klass->io_set_keepalive(ioc, enabled, errp);
+}
+
 
 int qio_channel_close(QIOChannel *ioc,
                       Error **errp)
Signature · 1 line
2.18.0
Acked-by on v2 1/2
#2 lore raw

Re: [Qemu-devel] [PATCH v2 1/2] io/channel: add qio_channel_set_keepalive

Quoted 6 lines · Vladimir Sementsov-Ogievskiy
---
 include/io/channel.h | 15 +++++++++++++++
 io/channel-socket.c  | 20 ++++++++++++++++++++
 io/channel.c         | 14 ++++++++++++++
 3 files changed, 49 insertions(+)

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#3 lore raw

PATCH v2 2/2 nbd-client: enable TCP keepalive

In reply to Vladimir Sementsov-Ogievskiy

Enable keepalive option to track server availability.

---
 block/nbd-client.c | 1 +
 1 file changed, 1 insertion(+)
block/nbd-client.c +1 -0
index 790ecc1ee1..b57cea8482 100644
@@ -1137,6 +1137,7 @@ static int nbd_client_connect(BlockDriverState *bs,
 
     /* NBD handshake */
     logout("session init %s\n", export);
+    qio_channel_set_keepalive(QIO_CHANNEL(sioc), true, NULL);
     qio_channel_set_blocking(QIO_CHANNEL(sioc), true, NULL);
 
     client->info.request_sizes = true;
Signature · 1 line
2.18.0
#4 lore raw
In reply to Vladimir Sementsov-Ogievskiy
Quoted 13 lines · Vladimir Sementsov-Ogievskiy

Hi all!

Here is a suggestion to enable keepalive option to track server availablity. We suggest to enable it by default. If we need, we'll be able to add option to specify timeout by hand later.

v2: 01 - Fix io channel returned errors to be -1 [Daniel]
02 - Fix typo in commit message [Eric]

Vladimir Sementsov-Ogievskiy (2):
io/channel: add qio_channel_set_keepalive
nbd-client: enable TCP keepalive

Quoted 6 lines
 include/io/channel.h | 15 +++++++++++++++
 block/nbd-client.c   |  1 +
 io/channel-socket.c  | 20 ++++++++++++++++++++
 io/channel.c         | 14 ++++++++++++++
 4 files changed, 50 insertions(+)

Ping -- I think this was good to go with Dan's ACK, based on the discussion from v1.

#5 lore raw
Quoted 23 lines · John Snow
Quoted 13 lines · Vladimir Sementsov-Ogievskiy

Hi all!

Here is a suggestion to enable keepalive option to track server availablity. We suggest to enable it by default. If we need, we'll be able to add option to specify timeout by hand later.

v2: 01 - Fix io channel returned errors to be -1 [Daniel]
02 - Fix typo in commit message [Eric]

Vladimir Sementsov-Ogievskiy (2):
io/channel: add qio_channel_set_keepalive
nbd-client: enable TCP keepalive

Quoted 6 lines
 include/io/channel.h | 15 +++++++++++++++
 block/nbd-client.c   |  1 +
 io/channel-socket.c  | 20 ++++++++++++++++++++
 io/channel.c         | 14 ++++++++++++++
 4 files changed, 50 insertions(+)
Quoted 2 lines

Ping -- I think this was good to go with Dan's ACK, based on the discussion from v1.

Actually, I thought that we changed tactics, and that the latest version is:

https://lists.gnu.org/archive/html/qemu-devel/2019-06/msg01989.html

[PATCH v2] qapi: InitSocketAddress: add keepalive option

to make the setting conditional based on blockdev parameters rather than unconditional.

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#6 lore raw
Quoted 27 lines · Eric Blake
Quoted 23 lines · John Snow
Quoted 13 lines · Vladimir Sementsov-Ogievskiy

Hi all!

Here is a suggestion to enable keepalive option to track server availablity. We suggest to enable it by default. If we need, we'll be able to add option to specify timeout by hand later.

v2: 01 - Fix io channel returned errors to be -1 [Daniel]
02 - Fix typo in commit message [Eric]

Vladimir Sementsov-Ogievskiy (2):
io/channel: add qio_channel_set_keepalive
nbd-client: enable TCP keepalive

Quoted 6 lines
 include/io/channel.h | 15 +++++++++++++++
 block/nbd-client.c   |  1 +
 io/channel-socket.c  | 20 ++++++++++++++++++++
 io/channel.c         | 14 ++++++++++++++
 4 files changed, 50 insertions(+)
Quoted 2 lines

Ping -- I think this was good to go with Dan's ACK, based on the discussion from v1.

Quoted 9 lines

Actually, I thought that we changed tactics, and that the latest version is:

https://lists.gnu.org/archive/html/qemu-devel/2019-06/msg01989.html

[PATCH v2] qapi: InitSocketAddress: add keepalive option

to make the setting conditional based on blockdev parameters rather than unconditional.

OK, thanks for the pointer! I had my head buried for a little bit and I am playing catchup with discussions, and it looked like this one needed attention, but I missed this.

Thank you!

--js

#7 lore raw
In reply to Eric Blake
Quoted 27 lines · Eric Blake
Quoted 23 lines · John Snow
Quoted 13 lines · Vladimir Sementsov-Ogievskiy

Hi all!

Here is a suggestion to enable keepalive option to track server availablity. We suggest to enable it by default. If we need, we'll be able to add option to specify timeout by hand later.

v2: 01 - Fix io channel returned errors to be -1 [Daniel]
02 - Fix typo in commit message [Eric]

Vladimir Sementsov-Ogievskiy (2):
io/channel: add qio_channel_set_keepalive
nbd-client: enable TCP keepalive

Quoted 6 lines
 include/io/channel.h | 15 +++++++++++++++
 block/nbd-client.c   |  1 +
 io/channel-socket.c  | 20 ++++++++++++++++++++
 io/channel.c         | 14 ++++++++++++++
 4 files changed, 50 insertions(+)
Quoted 2 lines

Ping -- I think this was good to go with Dan's ACK, based on the discussion from v1.

Quoted 8 lines

Actually, I thought that we changed tactics, and that the latest version is:

https://lists.gnu.org/archive/html/qemu-devel/2019-06/msg01989.html

[PATCH v2] qapi: InitSocketAddress: add keepalive option

to make the setting conditional based on blockdev parameters rather than unconditional.

Or even v3, which still had review comments pending:

https://lists.gnu.org/archive/html/qemu-devel/2019-06/msg05508.html

[PATCH v3] qapi: Add InetSocketAddress member keep-alive

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org