All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3 0/3] qemu-sockets: add abstract UNIX domain socket support
@ 2020-05-10  6:14 xiaoqiang zhao
  2020-05-10  6:14 ` [PATCH v3 1/3] " xiaoqiang zhao
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: xiaoqiang zhao @ 2020-05-10  6:14 UTC (permalink / raw)
  To: berrange, marcandre.lureau, eblake, kwolf, armbru
  Cc: qemu-devel, peter.maydell, xiaoqiang zhao, kraxel, pbonzini

By default qemu does not support abstract UNIX domain
socket address. Add this ability to make qemu handy
when abstract address is needed.

Changes since v2: 
* reorganize code to cover both connect and listen
* qapi related changes
* add test cases and update qemu-options documents

Xiaoqiang Zhao (3):
  qemu-sockets: add abstract UNIX domain socket support
  tests/util-sockets: add abstract unix socket cases
  qemu-options: updates for abstract unix sockets

 chardev/char-socket.c     |  4 ++
 chardev/char.c            |  7 ++++
 qapi/sockets.json         |  9 ++++-
 qemu-options.hx           |  9 ++++-
 tests/test-util-sockets.c | 83 +++++++++++++++++++++++++++++++++++++++
 util/qemu-sockets.c       | 39 ++++++++++++++----
 6 files changed, 141 insertions(+), 10 deletions(-)

-- 
2.17.1




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v3 1/3] qemu-sockets: add abstract UNIX domain socket support
  2020-05-10  6:14 [PATCH v3 0/3] qemu-sockets: add abstract UNIX domain socket support xiaoqiang zhao
@ 2020-05-10  6:14 ` xiaoqiang zhao
  2020-05-11 18:01   ` Eric Blake
  2020-05-13 15:52   ` Daniel P. Berrangé
  2020-05-10  6:14 ` [PATCH v3 2/3] tests/util-sockets: add abstract unix socket cases xiaoqiang zhao
  2020-05-10  6:14 ` [PATCH v3 3/3] qemu-options: updates for abstract unix sockets xiaoqiang zhao
  2 siblings, 2 replies; 10+ messages in thread
From: xiaoqiang zhao @ 2020-05-10  6:14 UTC (permalink / raw)
  To: berrange, marcandre.lureau, eblake, kwolf, armbru
  Cc: qemu-devel, peter.maydell, xiaoqiang zhao, kraxel, pbonzini

unix_listen/connect_saddr now support abstract address types

two aditional BOOL switches are introduced:
tight: whether to set @addrlen to the minimal string length,
       or the maximum sun_path length. default is TRUE
abstract: whether we use abstract address. default is FALSE

cli example:
-monitor unix:/tmp/unix.socket,abstract,tight=off
OR
-chardev socket,path=/tmp/unix.socket,id=unix1,abstract,tight=on

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 chardev/char-socket.c |  4 ++++
 chardev/char.c        |  7 +++++++
 qapi/sockets.json     |  9 ++++++++-
 util/qemu-sockets.c   | 39 ++++++++++++++++++++++++++++++++-------
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 185fe38dda..16f2211091 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1380,6 +1380,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
     const char *host = qemu_opt_get(opts, "host");
     const char *port = qemu_opt_get(opts, "port");
     const char *fd = qemu_opt_get(opts, "fd");
+    bool tight = qemu_opt_get_bool(opts, "tight", true);
+    bool abstract = qemu_opt_get_bool(opts, "abstract", false);
     SocketAddressLegacy *addr;
     ChardevSocket *sock;
 
@@ -1431,6 +1433,8 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
         addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX;
         q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1);
         q_unix->path = g_strdup(path);
+        q_unix->tight = tight;
+        q_unix->abstract = abstract;
     } else if (host) {
         addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;
         addr->u.inet.data = g_new(InetSocketAddress, 1);
diff --git a/chardev/char.c b/chardev/char.c
index e77564060d..f44fda3a92 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -939,6 +939,13 @@ QemuOptsList qemu_chardev_opts = {
         },{
             .name = "logappend",
             .type = QEMU_OPT_BOOL,
+        },{
+            .name = "tight",
+            .type = QEMU_OPT_BOOL,
+            .def_value_str = "on",
+        },{
+            .name = "abstract",
+            .type = QEMU_OPT_BOOL,
         },
         { /* end of list */ }
     },
diff --git a/qapi/sockets.json b/qapi/sockets.json
index ea933ed4b2..e7aa096cde 100644
--- a/qapi/sockets.json
+++ b/qapi/sockets.json
@@ -73,12 +73,19 @@
 # Captures a socket address in the local ("Unix socket") namespace.
 #
 # @path: filesystem path to use
+# @tight: pass a socket address length that does not include the whole
+#         struct sockaddr_un record but (besides other components) only
+#         the relevant part of the filename or abstract string.
+#         default value is 'true'
+# @abstract: whether this is a abstract address, default is 'false'
 #
 # Since: 1.3
 ##
 { 'struct': 'UnixSocketAddress',
   'data': {
-    'path': 'str' } }
+    'path': 'str',
+    '*tight': 'bool',
+    '*abstract': 'bool' } }
 
 ##
 # @VsockSocketAddress:
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 86c48b9fa5..b37d288866 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -863,6 +863,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
     char *pathbuf = NULL;
     const char *path;
     size_t pathlen;
+    size_t addrlen;
 
     sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
     if (sock < 0) {
@@ -879,9 +880,11 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
     }
 
     pathlen = strlen(path);
-    if (pathlen > sizeof(un.sun_path)) {
+    if (pathlen > sizeof(un.sun_path) ||
+        (saddr->abstract && pathlen > (sizeof(un.sun_path) - 1))) {
         error_setg(errp, "UNIX socket path '%s' is too long", path);
         error_append_hint(errp, "Path must be less than %zu bytes\n",
+                          saddr->abstract ? sizeof(un.sun_path) - 1 :
                           sizeof(un.sun_path));
         goto err;
     }
@@ -903,7 +906,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
         close(fd);
     }
 
-    if (unlink(path) < 0 && errno != ENOENT) {
+    if (!saddr->abstract && unlink(path) < 0 && errno != ENOENT) {
         error_setg_errno(errp, errno,
                          "Failed to unlink socket %s", path);
         goto err;
@@ -911,9 +914,19 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
 
     memset(&un, 0, sizeof(un));
     un.sun_family = AF_UNIX;
-    memcpy(un.sun_path, path, pathlen);
+    addrlen = sizeof(un);
 
-    if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) {
+    if (saddr->abstract) {
+        un.sun_path[0] = '\0';
+        memcpy(&un.sun_path[1], path, pathlen);
+        if (saddr->tight) {
+            addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + pathlen;
+        }
+    } else {
+        memcpy(un.sun_path, path, pathlen);
+    }
+
+    if (bind(sock, (struct sockaddr *) &un, addrlen) < 0) {
         error_setg_errno(errp, errno, "Failed to bind socket to %s", path);
         goto err;
     }
@@ -936,6 +949,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp)
     struct sockaddr_un un;
     int sock, rc;
     size_t pathlen;
+    size_t addrlen;
 
     if (saddr->path == NULL) {
         error_setg(errp, "unix connect: no path specified");
@@ -949,21 +963,32 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp)
     }
 
     pathlen = strlen(saddr->path);
-    if (pathlen > sizeof(un.sun_path)) {
+    if (pathlen > sizeof(un.sun_path) ||
+        (saddr->abstract && pathlen > (sizeof(un.sun_path) - 1))) {
         error_setg(errp, "UNIX socket path '%s' is too long", saddr->path);
         error_append_hint(errp, "Path must be less than %zu bytes\n",
+                          saddr->abstract ? sizeof(un.sun_path) - 1 :
                           sizeof(un.sun_path));
         goto err;
     }
 
     memset(&un, 0, sizeof(un));
     un.sun_family = AF_UNIX;
-    memcpy(un.sun_path, saddr->path, pathlen);
+    addrlen = sizeof(un);
 
+    if (saddr->abstract) {
+        un.sun_path[0] = '\0';
+        memcpy(&un.sun_path[1], saddr->path, pathlen);
+        if (saddr->tight) {
+            addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + pathlen;
+        }
+    } else {
+        memcpy(un.sun_path, saddr->path, pathlen);
+    }
     /* connect to peer */
     do {
         rc = 0;
-        if (connect(sock, (struct sockaddr *) &un, sizeof(un)) < 0) {
+        if (connect(sock, (struct sockaddr *) &un, addrlen) < 0) {
             rc = -errno;
         }
     } while (rc == -EINTR);
-- 
2.17.1




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v3 2/3] tests/util-sockets: add abstract unix socket cases
  2020-05-10  6:14 [PATCH v3 0/3] qemu-sockets: add abstract UNIX domain socket support xiaoqiang zhao
  2020-05-10  6:14 ` [PATCH v3 1/3] " xiaoqiang zhao
@ 2020-05-10  6:14 ` xiaoqiang zhao
  2020-05-13 15:49   ` Daniel P. Berrangé
  2020-05-10  6:14 ` [PATCH v3 3/3] qemu-options: updates for abstract unix sockets xiaoqiang zhao
  2 siblings, 1 reply; 10+ messages in thread
From: xiaoqiang zhao @ 2020-05-10  6:14 UTC (permalink / raw)
  To: berrange, marcandre.lureau, eblake, kwolf, armbru
  Cc: qemu-devel, peter.maydell, xiaoqiang zhao, kraxel, pbonzini

add cases to test tight and non-tight for abstract address type

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 tests/test-util-sockets.c | 83 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
index 5fd947c7bf..8042fb9276 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -227,6 +227,84 @@ static void test_socket_fd_pass_num_nocli(void)
     g_free(addr.u.fd.str);
 }
 
+static gpointer unix_server_thread_func(gpointer user_data)
+{
+    SocketAddress addr;
+    Error *err = NULL;
+    int fd = -1;
+    int connfd = -1;
+    struct sockaddr_un un;
+    socklen_t len = sizeof(un);
+    char name[] = "/tmp/unix-test.sock";
+
+    addr.type = SOCKET_ADDRESS_TYPE_UNIX;
+    addr.u.q_unix.path = name;
+    addr.u.q_unix.tight = user_data != NULL;
+    addr.u.q_unix.abstract = true;
+
+    fd = socket_listen(&addr, 1, &err);
+    g_assert_cmpint(fd, >=, 0);
+    g_assert(fd_is_socket(fd));
+
+    connfd = accept(fd, (struct sockaddr *)&un, &len);
+    g_assert_cmpint(connfd, !=, -1);
+
+    close(fd);
+
+    return NULL;
+}
+
+static gpointer unix_client_thread_func(gpointer user_data)
+{
+    SocketAddress addr;
+    Error *err = NULL;
+    int fd = -1;
+    char name[] = "/tmp/unix-test.sock";
+
+    addr.type = SOCKET_ADDRESS_TYPE_UNIX;
+    addr.u.q_unix.path = name;
+    addr.u.q_unix.tight = user_data != NULL;
+    addr.u.q_unix.abstract = true;
+
+    fd = socket_connect(&addr, &err);
+
+    g_assert_cmpint(fd, >=, 0);
+
+    close(fd);
+
+    return NULL;
+}
+
+static void test_socket_unix_abstract_good(void)
+{
+    /* non tight socklen serv and cli */
+    GThread *serv = g_thread_new("abstract_unix_server",
+                                 unix_server_thread_func,
+                                 NULL);
+
+    sleep(1);
+
+    GThread *cli = g_thread_new("abstruct_unix_client",
+                                unix_client_thread_func,
+                                NULL);
+
+    g_thread_join(cli);
+    g_thread_join(serv);
+
+    /* tight socklen serv and cli */
+    serv = g_thread_new("abstract_unix_server",
+                        unix_server_thread_func,
+                        (gpointer)1);
+
+    sleep(1);
+
+    cli = g_thread_new("abstruct_unix_client",
+                       unix_client_thread_func,
+                       (gpointer)1);
+
+    g_thread_join(cli);
+    g_thread_join(serv);
+}
 
 int main(int argc, char **argv)
 {
@@ -265,6 +343,11 @@ int main(int argc, char **argv)
                         test_socket_fd_pass_num_nocli);
     }
 
+#ifdef __linux__
+        g_test_add_func("/util/socket/unix-abstract/good",
+                        test_socket_unix_abstract_good);
+#endif
+
 end:
     return g_test_run();
 }
-- 
2.17.1




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v3 3/3] qemu-options: updates for abstract unix sockets
  2020-05-10  6:14 [PATCH v3 0/3] qemu-sockets: add abstract UNIX domain socket support xiaoqiang zhao
  2020-05-10  6:14 ` [PATCH v3 1/3] " xiaoqiang zhao
  2020-05-10  6:14 ` [PATCH v3 2/3] tests/util-sockets: add abstract unix socket cases xiaoqiang zhao
@ 2020-05-10  6:14 ` xiaoqiang zhao
  2020-05-13 15:50   ` Daniel P. Berrangé
  2 siblings, 1 reply; 10+ messages in thread
From: xiaoqiang zhao @ 2020-05-10  6:14 UTC (permalink / raw)
  To: berrange, marcandre.lureau, eblake, kwolf, armbru
  Cc: qemu-devel, peter.maydell, xiaoqiang zhao, kraxel, pbonzini

add options documents changes for -chardev

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
---
 qemu-options.hx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 292d4e7c0c..ce73014f8e 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2930,7 +2930,7 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
     "         [,server][,nowait][,telnet][,websocket][,reconnect=seconds][,mux=on|off]\n"
     "         [,logfile=PATH][,logappend=on|off][,tls-creds=ID][,tls-authz=ID] (tcp)\n"
     "-chardev socket,id=id,path=path[,server][,nowait][,telnet][,websocket][,reconnect=seconds]\n"
-    "         [,mux=on|off][,logfile=PATH][,logappend=on|off] (unix)\n"
+    "         [,mux=on|off][,logfile=PATH][,logappend=on|off][,tight=on|off][,abstract=on|off] (unix)\n"
     "-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr]\n"
     "         [,localport=localport][,ipv4][,ipv6][,mux=on|off]\n"
     "         [,logfile=PATH][,logappend=on|off]\n"
@@ -3097,9 +3097,14 @@ The available backends are:
 
         ``nodelay`` disables the Nagle algorithm.
 
-    ``unix options: path=path``
+    ``unix options: path=path[,tight=on|off][,abstract=on|off]``
         ``path`` specifies the local path of the unix socket. ``path``
         is required.
+	``tight`` whether to set @addrlen to the minimal string length,
+        or the maximum sun_path length. defaults to true. ``tight`` is
+        optional.
+	``abstract`` whether use abstract address. defaults to false.
+	``abstract`` is optional.
 
 ``-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr][,localport=localport][,ipv4][,ipv6]``
     Sends all traffic from the guest to a remote host over UDP.
-- 
2.17.1




^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 1/3] qemu-sockets: add abstract UNIX domain socket support
  2020-05-10  6:14 ` [PATCH v3 1/3] " xiaoqiang zhao
@ 2020-05-11 18:01   ` Eric Blake
  2020-05-12  6:52     ` xiaoqiang.zhao
  2020-05-13 15:52   ` Daniel P. Berrangé
  1 sibling, 1 reply; 10+ messages in thread
From: Eric Blake @ 2020-05-11 18:01 UTC (permalink / raw)
  To: xiaoqiang zhao, berrange, marcandre.lureau, kwolf, armbru
  Cc: qemu-devel, peter.maydell, kraxel, pbonzini

On 5/10/20 1:14 AM, xiaoqiang zhao wrote:
> unix_listen/connect_saddr now support abstract address types
> 
> two aditional BOOL switches are introduced:
> tight: whether to set @addrlen to the minimal string length,
>         or the maximum sun_path length. default is TRUE
> abstract: whether we use abstract address. default is FALSE
> 
> cli example:
> -monitor unix:/tmp/unix.socket,abstract,tight=off
> OR
> -chardev socket,path=/tmp/unix.socket,id=unix1,abstract,tight=on
> 
> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
> ---

> +++ b/qapi/sockets.json
> @@ -73,12 +73,19 @@
>   # Captures a socket address in the local ("Unix socket") namespace.
>   #
>   # @path: filesystem path to use
> +# @tight: pass a socket address length that does not include the whole
> +#         struct sockaddr_un record but (besides other components) only
> +#         the relevant part of the filename or abstract string.
> +#         default value is 'true'

Perhaps:

pass a socket address length confined to the minimum length of the 
abstract string, rather than the full sockaddr_un record length (only 
matters for abstract sockets, default true)

> +# @abstract: whether this is a abstract address, default is 'false'

Both new fields should have a '(since 5.1)' tag, to make it obvious that 
they did not exist in earlier releases with the rest of the struct.

s/a abstract/an abstract/

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



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 1/3] qemu-sockets: add abstract UNIX domain socket support
  2020-05-11 18:01   ` Eric Blake
@ 2020-05-12  6:52     ` xiaoqiang.zhao
  0 siblings, 0 replies; 10+ messages in thread
From: xiaoqiang.zhao @ 2020-05-12  6:52 UTC (permalink / raw)
  To: Eric Blake, berrange, marcandre.lureau, kwolf, armbru
  Cc: qemu-devel, peter.maydell, kraxel, pbonzini

在 2020/5/12 上午2:01, Eric Blake 写道:
> On 5/10/20 1:14 AM, xiaoqiang zhao wrote:
>> unix_listen/connect_saddr now support abstract address types
>>
>> two aditional BOOL switches are introduced:
>> tight: whether to set @addrlen to the minimal string length,
>>         or the maximum sun_path length. default is TRUE
>> abstract: whether we use abstract address. default is FALSE
>>
>> cli example:
>> -monitor unix:/tmp/unix.socket,abstract,tight=off
>> OR
>> -chardev socket,path=/tmp/unix.socket,id=unix1,abstract,tight=on
>>
>> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
>> ---
>
>> +++ b/qapi/sockets.json
>> @@ -73,12 +73,19 @@
>>   # Captures a socket address in the local ("Unix socket") namespace.
>>   #
>>   # @path: filesystem path to use
>> +# @tight: pass a socket address length that does not include the whole
>> +#         struct sockaddr_un record but (besides other components) only
>> +#         the relevant part of the filename or abstract string.
>> +#         default value is 'true'
>
> Perhaps:
>
> pass a socket address length confined to the minimum length of the 
> abstract string, rather than the full sockaddr_un record length (only 
> matters for abstract sockets, default true)
>
Sounds better
>> +# @abstract: whether this is a abstract address, default is 'false'
>
> Both new fields should have a '(since 5.1)' tag, to make it obvious 
> that they did not exist in earlier releases with the rest of the struct.
>
> s/a abstract/an abstract/
>
Will fix in the next version,  thanks Eric.



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 2/3] tests/util-sockets: add abstract unix socket cases
  2020-05-10  6:14 ` [PATCH v3 2/3] tests/util-sockets: add abstract unix socket cases xiaoqiang zhao
@ 2020-05-13 15:49   ` Daniel P. Berrangé
  2020-05-14  0:26     ` xiaoqiang zhao
  0 siblings, 1 reply; 10+ messages in thread
From: Daniel P. Berrangé @ 2020-05-13 15:49 UTC (permalink / raw)
  To: xiaoqiang zhao
  Cc: kwolf, peter.maydell, armbru, qemu-devel, kraxel, pbonzini,
	marcandre.lureau

On Sun, May 10, 2020 at 02:14:21PM +0800, xiaoqiang zhao wrote:
> add cases to test tight and non-tight for abstract address type
> 
> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
> ---
>  tests/test-util-sockets.c | 83 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 83 insertions(+)
> 
> diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
> index 5fd947c7bf..8042fb9276 100644
> --- a/tests/test-util-sockets.c
> +++ b/tests/test-util-sockets.c
> @@ -227,6 +227,84 @@ static void test_socket_fd_pass_num_nocli(void)
>      g_free(addr.u.fd.str);
>  }
>  
> +static gpointer unix_server_thread_func(gpointer user_data)
> +{
> +    SocketAddress addr;
> +    Error *err = NULL;
> +    int fd = -1;
> +    int connfd = -1;
> +    struct sockaddr_un un;
> +    socklen_t len = sizeof(un);
> +    char name[] = "/tmp/unix-test.sock";

Fixed filenames are bad, as even though this is the abstract
namespace and thus safe from on-disk clashes, the abstract
namespace is still OS global. We should append both the PID
and a sequence of random bytes to get something which doesnt
clash if two copies of the unit test run concurrently.

> +
> +    addr.type = SOCKET_ADDRESS_TYPE_UNIX;
> +    addr.u.q_unix.path = name;
> +    addr.u.q_unix.tight = user_data != NULL;
> +    addr.u.q_unix.abstract = true;
> +
> +    fd = socket_listen(&addr, 1, &err);
> +    g_assert_cmpint(fd, >=, 0);
> +    g_assert(fd_is_socket(fd));
> +
> +    connfd = accept(fd, (struct sockaddr *)&un, &len);
> +    g_assert_cmpint(connfd, !=, -1);
> +
> +    close(fd);
> +
> +    return NULL;
> +}
> +
> +static gpointer unix_client_thread_func(gpointer user_data)
> +{
> +    SocketAddress addr;
> +    Error *err = NULL;
> +    int fd = -1;
> +    char name[] = "/tmp/unix-test.sock";
> +
> +    addr.type = SOCKET_ADDRESS_TYPE_UNIX;
> +    addr.u.q_unix.path = name;
> +    addr.u.q_unix.tight = user_data != NULL;
> +    addr.u.q_unix.abstract = true;
> +
> +    fd = socket_connect(&addr, &err);
> +
> +    g_assert_cmpint(fd, >=, 0);
> +
> +    close(fd);
> +
> +    return NULL;
> +}
> +
> +static void test_socket_unix_abstract_good(void)
> +{
> +    /* non tight socklen serv and cli */
> +    GThread *serv = g_thread_new("abstract_unix_server",
> +                                 unix_server_thread_func,
> +                                 NULL);
> +
> +    sleep(1);
> +
> +    GThread *cli = g_thread_new("abstruct_unix_client",
> +                                unix_client_thread_func,
> +                                NULL);
> +
> +    g_thread_join(cli);
> +    g_thread_join(serv);
> +
> +    /* tight socklen serv and cli */
> +    serv = g_thread_new("abstract_unix_server",
> +                        unix_server_thread_func,
> +                        (gpointer)1);
> +
> +    sleep(1);
> +
> +    cli = g_thread_new("abstruct_unix_client",
> +                       unix_client_thread_func,
> +                       (gpointer)1);
> +
> +    g_thread_join(cli);
> +    g_thread_join(serv);
> +}
>  
>  int main(int argc, char **argv)
>  {
> @@ -265,6 +343,11 @@ int main(int argc, char **argv)
>                          test_socket_fd_pass_num_nocli);
>      }
>  
> +#ifdef __linux__
> +        g_test_add_func("/util/socket/unix-abstract/good",
> +                        test_socket_unix_abstract_good);
> +#endif
> +
>  end:
>      return g_test_run();
>  }
> -- 
> 2.17.1
> 
> 
> 

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 :|



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 3/3] qemu-options: updates for abstract unix sockets
  2020-05-10  6:14 ` [PATCH v3 3/3] qemu-options: updates for abstract unix sockets xiaoqiang zhao
@ 2020-05-13 15:50   ` Daniel P. Berrangé
  0 siblings, 0 replies; 10+ messages in thread
From: Daniel P. Berrangé @ 2020-05-13 15:50 UTC (permalink / raw)
  To: xiaoqiang zhao
  Cc: kwolf, peter.maydell, armbru, qemu-devel, kraxel, pbonzini,
	marcandre.lureau

On Sun, May 10, 2020 at 02:14:22PM +0800, xiaoqiang zhao wrote:
> add options documents changes for -chardev
> 
> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
> ---
>  qemu-options.hx | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


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 :|



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 1/3] qemu-sockets: add abstract UNIX domain socket support
  2020-05-10  6:14 ` [PATCH v3 1/3] " xiaoqiang zhao
  2020-05-11 18:01   ` Eric Blake
@ 2020-05-13 15:52   ` Daniel P. Berrangé
  1 sibling, 0 replies; 10+ messages in thread
From: Daniel P. Berrangé @ 2020-05-13 15:52 UTC (permalink / raw)
  To: xiaoqiang zhao
  Cc: kwolf, peter.maydell, armbru, qemu-devel, kraxel, pbonzini,
	marcandre.lureau

On Sun, May 10, 2020 at 02:14:20PM +0800, xiaoqiang zhao wrote:
> unix_listen/connect_saddr now support abstract address types
> 
> two aditional BOOL switches are introduced:
> tight: whether to set @addrlen to the minimal string length,
>        or the maximum sun_path length. default is TRUE
> abstract: whether we use abstract address. default is FALSE
> 
> cli example:
> -monitor unix:/tmp/unix.socket,abstract,tight=off
> OR
> -chardev socket,path=/tmp/unix.socket,id=unix1,abstract,tight=on
> 
> Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
> ---
>  chardev/char-socket.c |  4 ++++
>  chardev/char.c        |  7 +++++++
>  qapi/sockets.json     |  9 ++++++++-
>  util/qemu-sockets.c   | 39 ++++++++++++++++++++++++++++++++-------
>  4 files changed, 51 insertions(+), 8 deletions(-)

With the changes Eric suggests, then

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


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 :|



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 2/3] tests/util-sockets: add abstract unix socket cases
  2020-05-13 15:49   ` Daniel P. Berrangé
@ 2020-05-14  0:26     ` xiaoqiang zhao
  0 siblings, 0 replies; 10+ messages in thread
From: xiaoqiang zhao @ 2020-05-14  0:26 UTC (permalink / raw)
  To: Daniel P. Berrangé
  Cc: kwolf, peter.maydell, armbru, qemu-devel, kraxel, pbonzini,
	marcandre.lureau

在 2020/5/13 下午11:49, Daniel P. Berrangé 写道:
> On Sun, May 10, 2020 at 02:14:21PM +0800, xiaoqiang zhao wrote:
>> add cases to test tight and non-tight for abstract address type
>>
>> Signed-off-by: xiaoqiang zhao<zxq_yx_007@163.com>
>> ---
>>   tests/test-util-sockets.c | 83 +++++++++++++++++++++++++++++++++++++++
>>   1 file changed, 83 insertions(+)
>>
>> diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
>> index 5fd947c7bf..8042fb9276 100644
>> --- a/tests/test-util-sockets.c
>> +++ b/tests/test-util-sockets.c
>> @@ -227,6 +227,84 @@ static void test_socket_fd_pass_num_nocli(void)
>>       g_free(addr.u.fd.str);
>>   }
>>   
>> +static gpointer unix_server_thread_func(gpointer user_data)
>> +{
>> +    SocketAddress addr;
>> +    Error *err = NULL;
>> +    int fd = -1;
>> +    int connfd = -1;
>> +    struct sockaddr_un un;
>> +    socklen_t len = sizeof(un);
>> +    char name[] = "/tmp/unix-test.sock";
> Fixed filenames are bad, as even though this is the abstract
> namespace and thus safe from on-disk clashes, the abstract
> namespace is still OS global. We should append both the PID
> and a sequence of random bytes to get something which doesnt
> clash if two copies of the unit test run concurrently.
>
agree.



^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-05-14  0:27 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-10  6:14 [PATCH v3 0/3] qemu-sockets: add abstract UNIX domain socket support xiaoqiang zhao
2020-05-10  6:14 ` [PATCH v3 1/3] " xiaoqiang zhao
2020-05-11 18:01   ` Eric Blake
2020-05-12  6:52     ` xiaoqiang.zhao
2020-05-13 15:52   ` Daniel P. Berrangé
2020-05-10  6:14 ` [PATCH v3 2/3] tests/util-sockets: add abstract unix socket cases xiaoqiang zhao
2020-05-13 15:49   ` Daniel P. Berrangé
2020-05-14  0:26     ` xiaoqiang zhao
2020-05-10  6:14 ` [PATCH v3 3/3] qemu-options: updates for abstract unix sockets xiaoqiang zhao
2020-05-13 15:50   ` Daniel P. Berrangé

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.