1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] qapi: InitSocketAddress: add keepalive option

Vladimir Sementsov-Ogievskiy posted 1 patch 4 years, 10 months ago
Test s390x passed
Test checkpatch passed
Test asan passed
Test docker-mingw@fedora passed
Test docker-clang@ubuntu passed
Test FreeBSD passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190606101533.20228-1-vsementsov@virtuozzo.com
Maintainers: "Daniel P. Berrangé" <berrange@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Markus Armbruster <armbru@redhat.com>, Eric Blake <eblake@redhat.com>
There is a newer version of this series
qapi/sockets.json   |  5 ++++-
util/qemu-sockets.c | 13 +++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
[Qemu-devel] [PATCH] qapi: InitSocketAddress: add keepalive option
Posted by Vladimir Sementsov-Ogievskiy 4 years, 10 months ago 
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---

Hi all!

This is a continuation of "[PATCH v2 0/2] nbd: enable keepalive", but
it's a try from another side, so almost nothing common with v2.


 qapi/sockets.json   |  5 ++++-
 util/qemu-sockets.c | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/qapi/sockets.json b/qapi/sockets.json
index fc81d8d5e8..aefa024051 100644
--- a/qapi/sockets.json
+++ b/qapi/sockets.json
@@ -53,6 +53,8 @@
 #
 # @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6
 #
+# @keepalive: enable keepalive when connecting to this socket (Since 4.1)
+#
 # Since: 1.3
 ##
 { 'struct': 'InetSocketAddress',
@@ -61,7 +63,8 @@
     '*numeric':  'bool',
     '*to': 'uint16',
     '*ipv4': 'bool',
-    '*ipv6': 'bool' } }
+    '*ipv6': 'bool',
+    '*keepalive': 'bool' } }
 
 ##
 # @UnixSocketAddress:
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 8850a280a8..d2cd2a9d4f 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -457,6 +457,19 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)
     }
 
     freeaddrinfo(res);
+
+    if (saddr->keepalive) {
+        int val = 1;
+        int ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
+                                  &val, sizeof(val));
+
+        if (ret < 0) {
+            error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
+            close(sock);
+            return -1;
+        }
+    }
+
     return sock;
 }
 
-- 
2.18.0
Re: [Qemu-devel] [PATCH] qapi: InitSocketAddress: add keepalive option
Posted by Daniel P. Berrangé 4 years, 10 months ago 
On Thu, Jun 06, 2019 at 01:15:33PM +0300, Vladimir Sementsov-Ogievskiy wrote:
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> 
> Hi all!
> 
> This is a continuation of "[PATCH v2 0/2] nbd: enable keepalive", but
> it's a try from another side, so almost nothing common with v2.
> 
> 
>  qapi/sockets.json   |  5 ++++-
>  util/qemu-sockets.c | 13 +++++++++++++
>  2 files changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/qapi/sockets.json b/qapi/sockets.json
> index fc81d8d5e8..aefa024051 100644
> --- a/qapi/sockets.json
> +++ b/qapi/sockets.json
> @@ -53,6 +53,8 @@
>  #
>  # @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6
>  #
> +# @keepalive: enable keepalive when connecting to this socket (Since 4.1)
> +#
>  # Since: 1.3
>  ##
>  { 'struct': 'InetSocketAddress',
> @@ -61,7 +63,8 @@
>      '*numeric':  'bool',
>      '*to': 'uint16',
>      '*ipv4': 'bool',
> -    '*ipv6': 'bool' } }
> +    '*ipv6': 'bool',
> +    '*keepalive': 'bool' } }
>  
>  ##
>  # @UnixSocketAddress:
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index 8850a280a8..d2cd2a9d4f 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -457,6 +457,19 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)
>      }
>  
>      freeaddrinfo(res);
> +
> +    if (saddr->keepalive) {

IIUC, best practice is to use 'saddr->has_keepalive && saddr->keepalive'

> +        int val = 1;
> +        int ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
> +                                  &val, sizeof(val));
> +
> +        if (ret < 0) {
> +            error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
> +            close(sock);
> +            return -1;
> +        }
> +    }
> +
>      return sock;
>  }

Regards,
Daniel
-- 
|: 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 :|
Re: [Qemu-devel] [PATCH] qapi: InitSocketAddress: add keepalive option
Posted by Vladimir Sementsov-Ogievskiy 4 years, 10 months ago 
06.06.2019 14:17, Daniel P. Berrangé wrote:
> On Thu, Jun 06, 2019 at 01:15:33PM +0300, Vladimir Sementsov-Ogievskiy wrote:
>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>> ---
>>
>> Hi all!
>>
>> This is a continuation of "[PATCH v2 0/2] nbd: enable keepalive", but
>> it's a try from another side, so almost nothing common with v2.
>>
>>
>>   qapi/sockets.json   |  5 ++++-
>>   util/qemu-sockets.c | 13 +++++++++++++
>>   2 files changed, 17 insertions(+), 1 deletion(-)
>>
>> diff --git a/qapi/sockets.json b/qapi/sockets.json
>> index fc81d8d5e8..aefa024051 100644
>> --- a/qapi/sockets.json
>> +++ b/qapi/sockets.json
>> @@ -53,6 +53,8 @@
>>   #
>>   # @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6
>>   #
>> +# @keepalive: enable keepalive when connecting to this socket (Since 4.1)
>> +#
>>   # Since: 1.3
>>   ##
>>   { 'struct': 'InetSocketAddress',
>> @@ -61,7 +63,8 @@
>>       '*numeric':  'bool',
>>       '*to': 'uint16',
>>       '*ipv4': 'bool',
>> -    '*ipv6': 'bool' } }
>> +    '*ipv6': 'bool',
>> +    '*keepalive': 'bool' } }
>>   
>>   ##
>>   # @UnixSocketAddress:
>> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
>> index 8850a280a8..d2cd2a9d4f 100644
>> --- a/util/qemu-sockets.c
>> +++ b/util/qemu-sockets.c
>> @@ -457,6 +457,19 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)
>>       }
>>   
>>       freeaddrinfo(res);
>> +
>> +    if (saddr->keepalive) {
> 
> IIUC, best practice is to use 'saddr->has_keepalive && saddr->keepalive'

As I remember, now all optional fields are zeroed. But I'm not against stricter condition.

> 
>> +        int val = 1;
>> +        int ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
>> +                                  &val, sizeof(val));
>> +
>> +        if (ret < 0) {
>> +            error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
>> +            close(sock);
>> +            return -1;
>> +        }
>> +    }
>> +
>>       return sock;
>>   }
> 
> Regards,
> Daniel
> 


-- 
Best regards,
Vladimir
Re: [Qemu-devel] [PATCH] qapi: InitSocketAddress: add keepalive option
Posted by Markus Armbruster 4 years, 10 months ago 
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes:

> 06.06.2019 14:17, Daniel P. Berrangé wrote:
>> On Thu, Jun 06, 2019 at 01:15:33PM +0300, Vladimir Sementsov-Ogievskiy wrote:
>>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>>> ---
>>>
>>> Hi all!
>>>
>>> This is a continuation of "[PATCH v2 0/2] nbd: enable keepalive", but
>>> it's a try from another side, so almost nothing common with v2.

Please explain intended use of your new option in your commit message.

>>>   qapi/sockets.json   |  5 ++++-
>>>   util/qemu-sockets.c | 13 +++++++++++++
>>>   2 files changed, 17 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/qapi/sockets.json b/qapi/sockets.json
>>> index fc81d8d5e8..aefa024051 100644
>>> --- a/qapi/sockets.json
>>> +++ b/qapi/sockets.json
>>> @@ -53,6 +53,8 @@
>>>   #
>>>   # @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6
>>>   #
>>> +# @keepalive: enable keepalive when connecting to this socket (Since 4.1)
>>> +#
>>>   # Since: 1.3
>>>   ##
>>>   { 'struct': 'InetSocketAddress',
>>> @@ -61,7 +63,8 @@
>>>       '*numeric':  'bool',
>>>       '*to': 'uint16',
>>>       '*ipv4': 'bool',
>>> -    '*ipv6': 'bool' } }
>>> +    '*ipv6': 'bool',
>>> +    '*keepalive': 'bool' } }

I know the C identifier is SO_KEEPALIVE, but let's stick to proper
English words in QMP: keep-alive.

>>>   
>>>   ##
>>>   # @UnixSocketAddress:
>>> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
>>> index 8850a280a8..d2cd2a9d4f 100644
>>> --- a/util/qemu-sockets.c
>>> +++ b/util/qemu-sockets.c
>>> @@ -457,6 +457,19 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)
>>>       }
>>>   
>>>       freeaddrinfo(res);
>>> +
>>> +    if (saddr->keepalive) {
>> 
>> IIUC, best practice is to use 'saddr->has_keepalive && saddr->keepalive'
>
> As I remember, now all optional fields are zeroed. But I'm not against stricter condition.

As far as I'm concerned, relying on zero-initialization of optional
members is fine.

>
>> 
>>> +        int val = 1;
>>> +        int ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
>>> +                                  &val, sizeof(val));
>>> +
>>> +        if (ret < 0) {
>>> +            error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
>>> +            close(sock);
>>> +            return -1;
>>> +        }
>>> +    }
>>> +
>>>       return sock;
>>>   }

Possibly ignorant question: why obey the keep-alive option for active
connections (made with inet_connect_saddr()), but not passive ones (made
with inet_listen_saddr() + accept())?

Do you need to update inet_parse()?
Re: [Qemu-devel] [PATCH] qapi: InitSocketAddress: add keepalive option
Posted by Vladimir Sementsov-Ogievskiy 4 years, 10 months ago 
07.06.2019 20:22, Markus Armbruster wrote:
> Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes:
> 
>> 06.06.2019 14:17, Daniel P. Berrangé wrote:
>>> On Thu, Jun 06, 2019 at 01:15:33PM +0300, Vladimir Sementsov-Ogievskiy wrote:
>>>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>>>> ---
>>>>
>>>> Hi all!
>>>>
>>>> This is a continuation of "[PATCH v2 0/2] nbd: enable keepalive", but
>>>> it's a try from another side, so almost nothing common with v2.
> 
> Please explain intended use of your new option in your commit message.

Will do. Actual reason is keepalive for nbd-client.

> 
>>>>    qapi/sockets.json   |  5 ++++-
>>>>    util/qemu-sockets.c | 13 +++++++++++++
>>>>    2 files changed, 17 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/qapi/sockets.json b/qapi/sockets.json
>>>> index fc81d8d5e8..aefa024051 100644
>>>> --- a/qapi/sockets.json
>>>> +++ b/qapi/sockets.json
>>>> @@ -53,6 +53,8 @@
>>>>    #
>>>>    # @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6
>>>>    #
>>>> +# @keepalive: enable keepalive when connecting to this socket (Since 4.1)
>>>> +#
>>>>    # Since: 1.3
>>>>    ##
>>>>    { 'struct': 'InetSocketAddress',
>>>> @@ -61,7 +63,8 @@
>>>>        '*numeric':  'bool',
>>>>        '*to': 'uint16',
>>>>        '*ipv4': 'bool',
>>>> -    '*ipv6': 'bool' } }
>>>> +    '*ipv6': 'bool',
>>>> +    '*keepalive': 'bool' } }
> 
> I know the C identifier is SO_KEEPALIVE, but let's stick to proper
> English words in QMP: keep-alive.

Ok

> 
>>>>    
>>>>    ##
>>>>    # @UnixSocketAddress:
>>>> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
>>>> index 8850a280a8..d2cd2a9d4f 100644
>>>> --- a/util/qemu-sockets.c
>>>> +++ b/util/qemu-sockets.c
>>>> @@ -457,6 +457,19 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)
>>>>        }
>>>>    
>>>>        freeaddrinfo(res);
>>>> +
>>>> +    if (saddr->keepalive) {
>>>
>>> IIUC, best practice is to use 'saddr->has_keepalive && saddr->keepalive'
>>
>> As I remember, now all optional fields are zeroed. But I'm not against stricter condition.
> 
> As far as I'm concerned, relying on zero-initialization of optional
> members is fine.
> 
>>
>>>
>>>> +        int val = 1;
>>>> +        int ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
>>>> +                                  &val, sizeof(val));
>>>> +
>>>> +        if (ret < 0) {
>>>> +            error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
>>>> +            close(sock);
>>>> +            return -1;
>>>> +        }
>>>> +    }
>>>> +
>>>>        return sock;
>>>>    }
> 
> Possibly ignorant question: why obey the keep-alive option for active
> connections (made with inet_connect_saddr()), but not passive ones (made
> with inet_listen_saddr() + accept())?

Hmm. It's a bit trickier, as seems I can't do it on socket level, as parameter keep-alive I
get for listen part, but keep-alive should be enabled on socket from accept. So this should
be implemented on qio_channel level.. I'd prefer not implement it now. We now only interested
in keep-alive for client, and seems generally keep-alive is more usable for client part.

> 
> Do you need to update inet_parse()?

will do, thank you for reviewing!



-- 
Best regards,
Vladimir

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.