* [PATCH v9 01/16] net: introduce convert_host_port()
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-28 4:55 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 02/16] net: remove the @errp argument of net_client_inits() Laurent Vivier
` (14 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
---
include/qemu/sockets.h | 2 ++
net/net.c | 62 ++++++++++++++++++++++--------------------
2 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 038faa157f59..47194b9732f8 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -47,6 +47,8 @@ void socket_listen_cleanup(int fd, Error **errp);
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
/* Old, ipv4 only bits. Don't use for new code. */
+int convert_host_port(struct sockaddr_in *saddr, const char *host,
+ const char *port, Error **errp);
int parse_host_port(struct sockaddr_in *saddr, const char *str,
Error **errp);
int socket_init(void);
diff --git a/net/net.c b/net/net.c
index 2db160e0634d..d2288bd3a929 100644
--- a/net/net.c
+++ b/net/net.c
@@ -66,55 +66,57 @@ static QTAILQ_HEAD(, NetClientState) net_clients;
/***********************************************************/
/* network device redirectors */
-int parse_host_port(struct sockaddr_in *saddr, const char *str,
- Error **errp)
+int convert_host_port(struct sockaddr_in *saddr, const char *host,
+ const char *port, Error **errp)
{
- gchar **substrings;
struct hostent *he;
- const char *addr, *p, *r;
- int port, ret = 0;
+ const char *r;
+ long p;
memset(saddr, 0, sizeof(*saddr));
- substrings = g_strsplit(str, ":", 2);
- if (!substrings || !substrings[0] || !substrings[1]) {
- error_setg(errp, "host address '%s' doesn't contain ':' "
- "separating host from port", str);
- ret = -1;
- goto out;
- }
-
- addr = substrings[0];
- p = substrings[1];
-
saddr->sin_family = AF_INET;
- if (addr[0] == '\0') {
+ if (host[0] == '\0') {
saddr->sin_addr.s_addr = 0;
} else {
- if (qemu_isdigit(addr[0])) {
- if (!inet_aton(addr, &saddr->sin_addr)) {
+ if (qemu_isdigit(host[0])) {
+ if (!inet_aton(host, &saddr->sin_addr)) {
error_setg(errp, "host address '%s' is not a valid "
- "IPv4 address", addr);
- ret = -1;
- goto out;
+ "IPv4 address", host);
+ return -1;
}
} else {
- he = gethostbyname(addr);
+ he = gethostbyname(host);
if (he == NULL) {
- error_setg(errp, "can't resolve host address '%s'", addr);
- ret = -1;
- goto out;
+ error_setg(errp, "can't resolve host address '%s'", host);
+ return -1;
}
saddr->sin_addr = *(struct in_addr *)he->h_addr;
}
}
- port = strtol(p, (char **)&r, 0);
- if (r == p) {
- error_setg(errp, "port number '%s' is invalid", p);
+ if (qemu_strtol(port, &r, 0, &p) != 0) {
+ error_setg(errp, "port number '%s' is invalid", port);
+ return -1;
+ }
+ saddr->sin_port = htons(p);
+ return 0;
+}
+
+int parse_host_port(struct sockaddr_in *saddr, const char *str,
+ Error **errp)
+{
+ gchar **substrings;
+ int ret;
+
+ substrings = g_strsplit(str, ":", 2);
+ if (!substrings || !substrings[0] || !substrings[1]) {
+ error_setg(errp, "host address '%s' doesn't contain ':' "
+ "separating host from port", str);
ret = -1;
goto out;
}
- saddr->sin_port = htons(port);
+
+ ret = convert_host_port(saddr, substrings[0], substrings[1], errp);
out:
g_strfreev(substrings);
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 01/16] net: introduce convert_host_port()
2022-09-26 19:50 ` [PATCH v9 01/16] net: introduce convert_host_port() Laurent Vivier
@ 2022-09-28 4:55 ` David Gibson
0 siblings, 0 replies; 30+ messages in thread
From: David Gibson @ 2022-09-28 4:55 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
[-- Attachment #1: Type: text/plain, Size: 4459 bytes --]
On Mon, Sep 26, 2022 at 09:50:33PM +0200, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> include/qemu/sockets.h | 2 ++
> net/net.c | 62 ++++++++++++++++++++++--------------------
> 2 files changed, 34 insertions(+), 30 deletions(-)
>
> diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
> index 038faa157f59..47194b9732f8 100644
> --- a/include/qemu/sockets.h
> +++ b/include/qemu/sockets.h
> @@ -47,6 +47,8 @@ void socket_listen_cleanup(int fd, Error **errp);
> int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
>
> /* Old, ipv4 only bits. Don't use for new code. */
> +int convert_host_port(struct sockaddr_in *saddr, const char *host,
> + const char *port, Error **errp);
> int parse_host_port(struct sockaddr_in *saddr, const char *str,
> Error **errp);
> int socket_init(void);
> diff --git a/net/net.c b/net/net.c
> index 2db160e0634d..d2288bd3a929 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -66,55 +66,57 @@ static QTAILQ_HEAD(, NetClientState) net_clients;
> /***********************************************************/
> /* network device redirectors */
>
> -int parse_host_port(struct sockaddr_in *saddr, const char *str,
> - Error **errp)
> +int convert_host_port(struct sockaddr_in *saddr, const char *host,
> + const char *port, Error **errp)
> {
> - gchar **substrings;
> struct hostent *he;
> - const char *addr, *p, *r;
> - int port, ret = 0;
> + const char *r;
> + long p;
>
> memset(saddr, 0, sizeof(*saddr));
>
> - substrings = g_strsplit(str, ":", 2);
> - if (!substrings || !substrings[0] || !substrings[1]) {
> - error_setg(errp, "host address '%s' doesn't contain ':' "
> - "separating host from port", str);
> - ret = -1;
> - goto out;
> - }
> -
> - addr = substrings[0];
> - p = substrings[1];
> -
> saddr->sin_family = AF_INET;
> - if (addr[0] == '\0') {
> + if (host[0] == '\0') {
> saddr->sin_addr.s_addr = 0;
> } else {
> - if (qemu_isdigit(addr[0])) {
> - if (!inet_aton(addr, &saddr->sin_addr)) {
> + if (qemu_isdigit(host[0])) {
> + if (!inet_aton(host, &saddr->sin_addr)) {
> error_setg(errp, "host address '%s' is not a valid "
> - "IPv4 address", addr);
> - ret = -1;
> - goto out;
> + "IPv4 address", host);
> + return -1;
> }
> } else {
> - he = gethostbyname(addr);
> + he = gethostbyname(host);
> if (he == NULL) {
> - error_setg(errp, "can't resolve host address '%s'", addr);
> - ret = -1;
> - goto out;
> + error_setg(errp, "can't resolve host address '%s'", host);
> + return -1;
> }
> saddr->sin_addr = *(struct in_addr *)he->h_addr;
> }
> }
> - port = strtol(p, (char **)&r, 0);
> - if (r == p) {
> - error_setg(errp, "port number '%s' is invalid", p);
> + if (qemu_strtol(port, &r, 0, &p) != 0) {
> + error_setg(errp, "port number '%s' is invalid", port);
> + return -1;
> + }
> + saddr->sin_port = htons(p);
> + return 0;
> +}
> +
> +int parse_host_port(struct sockaddr_in *saddr, const char *str,
> + Error **errp)
> +{
> + gchar **substrings;
> + int ret;
> +
> + substrings = g_strsplit(str, ":", 2);
> + if (!substrings || !substrings[0] || !substrings[1]) {
> + error_setg(errp, "host address '%s' doesn't contain ':' "
> + "separating host from port", str);
> ret = -1;
> goto out;
> }
> - saddr->sin_port = htons(port);
> +
> + ret = convert_host_port(saddr, substrings[0], substrings[1], errp);
>
> out:
> g_strfreev(substrings);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 02/16] net: remove the @errp argument of net_client_inits()
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 01/16] net: introduce convert_host_port() Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 03/16] net: simplify net_client_parse() error management Laurent Vivier
` (13 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
The only caller passes &error_fatal, so use this directly in the function.
It's what we do for -blockdev, -device, and -object.
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
---
include/net/net.h | 2 +-
net/net.c | 20 +++++++-------------
softmmu/vl.c | 2 +-
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index 81d0b21defce..c1c34a58f849 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -222,7 +222,7 @@ extern const char *host_net_devices[];
/* from net.c */
int net_client_parse(QemuOptsList *opts_list, const char *str);
void show_netdevs(void);
-int net_init_clients(Error **errp);
+void net_init_clients(void);
void net_check_clients(void);
void net_cleanup(void);
void hmp_host_net_add(Monitor *mon, const QDict *qdict);
diff --git a/net/net.c b/net/net.c
index d2288bd3a929..15958f881776 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1562,27 +1562,21 @@ out:
return ret;
}
-int net_init_clients(Error **errp)
+void net_init_clients(void)
{
net_change_state_entry =
qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);
QTAILQ_INIT(&net_clients);
- if (qemu_opts_foreach(qemu_find_opts("netdev"),
- net_init_netdev, NULL, errp)) {
- return -1;
- }
-
- if (qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL, errp)) {
- return -1;
- }
+ qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL,
+ &error_fatal);
- if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, errp)) {
- return -1;
- }
+ qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL,
+ &error_fatal);
- return 0;
+ qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL,
+ &error_fatal);
}
int net_client_parse(QemuOptsList *opts_list, const char *optarg)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index e62b9cc35d75..b172134a62cb 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1906,7 +1906,7 @@ static void qemu_create_late_backends(void)
qtest_server_init(qtest_chrdev, qtest_log, &error_fatal);
}
- net_init_clients(&error_fatal);
+ net_init_clients();
object_option_foreach_add(object_create_late);
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v9 03/16] net: simplify net_client_parse() error management
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 01/16] net: introduce convert_host_port() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 02/16] net: remove the @errp argument of net_client_inits() Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-28 4:56 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 04/16] qapi: net: introduce a way to bypass qemu_opts_parse_noisily() Laurent Vivier
` (12 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
All net_client_parse() callers exit in case of error.
Move exit(1) to net_client_parse() and remove error checking from
the callers.
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
include/net/net.h | 2 +-
net/net.c | 6 ++----
softmmu/vl.c | 12 +++---------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/include/net/net.h b/include/net/net.h
index c1c34a58f849..55023e7e9fa9 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -220,7 +220,7 @@ extern NICInfo nd_table[MAX_NICS];
extern const char *host_net_devices[];
/* from net.c */
-int net_client_parse(QemuOptsList *opts_list, const char *str);
+void net_client_parse(QemuOptsList *opts_list, const char *str);
void show_netdevs(void);
void net_init_clients(void);
void net_check_clients(void);
diff --git a/net/net.c b/net/net.c
index 15958f881776..f056e8aebfb2 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1579,13 +1579,11 @@ void net_init_clients(void)
&error_fatal);
}
-int net_client_parse(QemuOptsList *opts_list, const char *optarg)
+void net_client_parse(QemuOptsList *opts_list, const char *optarg)
{
if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {
- return -1;
+ exit(1);
}
-
- return 0;
}
/* From FreeBSD */
diff --git a/softmmu/vl.c b/softmmu/vl.c
index b172134a62cb..f71fca2a9f73 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2809,21 +2809,15 @@ void qemu_init(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_netdev:
default_net = 0;
- if (net_client_parse(qemu_find_opts("netdev"), optarg) == -1) {
- exit(1);
- }
+ net_client_parse(qemu_find_opts("netdev"), optarg);
break;
case QEMU_OPTION_nic:
default_net = 0;
- if (net_client_parse(qemu_find_opts("nic"), optarg) == -1) {
- exit(1);
- }
+ net_client_parse(qemu_find_opts("nic"), optarg);
break;
case QEMU_OPTION_net:
default_net = 0;
- if (net_client_parse(qemu_find_opts("net"), optarg) == -1) {
- exit(1);
- }
+ net_client_parse(qemu_find_opts("net"), optarg);
break;
#ifdef CONFIG_LIBISCSI
case QEMU_OPTION_iscsi:
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 03/16] net: simplify net_client_parse() error management
2022-09-26 19:50 ` [PATCH v9 03/16] net: simplify net_client_parse() error management Laurent Vivier
@ 2022-09-28 4:56 ` David Gibson
0 siblings, 0 replies; 30+ messages in thread
From: David Gibson @ 2022-09-28 4:56 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster
[-- Attachment #1: Type: text/plain, Size: 3097 bytes --]
On Mon, Sep 26, 2022 at 09:50:35PM +0200, Laurent Vivier wrote:
> All net_client_parse() callers exit in case of error.
>
> Move exit(1) to net_client_parse() and remove error checking from
> the callers.
>
> Suggested-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> include/net/net.h | 2 +-
> net/net.c | 6 ++----
> softmmu/vl.c | 12 +++---------
> 3 files changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/include/net/net.h b/include/net/net.h
> index c1c34a58f849..55023e7e9fa9 100644
> --- a/include/net/net.h
> +++ b/include/net/net.h
> @@ -220,7 +220,7 @@ extern NICInfo nd_table[MAX_NICS];
> extern const char *host_net_devices[];
>
> /* from net.c */
> -int net_client_parse(QemuOptsList *opts_list, const char *str);
> +void net_client_parse(QemuOptsList *opts_list, const char *str);
> void show_netdevs(void);
> void net_init_clients(void);
> void net_check_clients(void);
> diff --git a/net/net.c b/net/net.c
> index 15958f881776..f056e8aebfb2 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -1579,13 +1579,11 @@ void net_init_clients(void)
> &error_fatal);
> }
>
> -int net_client_parse(QemuOptsList *opts_list, const char *optarg)
> +void net_client_parse(QemuOptsList *opts_list, const char *optarg)
> {
> if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {
> - return -1;
> + exit(1);
> }
> -
> - return 0;
> }
>
> /* From FreeBSD */
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index b172134a62cb..f71fca2a9f73 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -2809,21 +2809,15 @@ void qemu_init(int argc, char **argv, char **envp)
> break;
> case QEMU_OPTION_netdev:
> default_net = 0;
> - if (net_client_parse(qemu_find_opts("netdev"), optarg) == -1) {
> - exit(1);
> - }
> + net_client_parse(qemu_find_opts("netdev"), optarg);
> break;
> case QEMU_OPTION_nic:
> default_net = 0;
> - if (net_client_parse(qemu_find_opts("nic"), optarg) == -1) {
> - exit(1);
> - }
> + net_client_parse(qemu_find_opts("nic"), optarg);
> break;
> case QEMU_OPTION_net:
> default_net = 0;
> - if (net_client_parse(qemu_find_opts("net"), optarg) == -1) {
> - exit(1);
> - }
> + net_client_parse(qemu_find_opts("net"), optarg);
> break;
> #ifdef CONFIG_LIBISCSI
> case QEMU_OPTION_iscsi:
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 04/16] qapi: net: introduce a way to bypass qemu_opts_parse_noisily()
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (2 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 03/16] net: simplify net_client_parse() error management Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 05/16] qapi: net: add stream and dgram netdevs Laurent Vivier
` (11 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
As qemu_opts_parse_noisily() flattens the QAPI structures ("type" field
of Netdev structure can collides with "type" field of SocketAddress),
we introduce a way to bypass qemu_opts_parse_noisily() and use directly
visit_type_Netdev() to parse the backend parameters.
More details from Markus:
qemu_init() passes the argument of -netdev, -nic, and -net to
net_client_parse().
net_client_parse() parses with qemu_opts_parse_noisily(), passing
QemuOptsList qemu_netdev_opts for -netdev, qemu_nic_opts for -nic, and
qemu_net_opts for -net. Their desc[] are all empty, which means any
keys are accepted. The result of the parse (a QemuOpts) is stored in
the QemuOptsList.
Note that QemuOpts is flat by design. In some places, we layer non-flat
on top using dotted keys convention, but not here.
net_init_clients() iterates over the stored QemuOpts, and passes them to
net_init_netdev(), net_param_nic(), or net_init_client(), respectively.
These functions pass the QemuOpts to net_client_init(). They also do
other things with the QemuOpts, which we can ignore here.
net_client_init() uses the opts visitor to convert the (flat) QemOpts to
a (non-flat) QAPI object Netdev. Netdev is also the argument of QMP
command netdev_add.
The opts visitor was an early attempt to support QAPI in
(QemuOpts-based) CLI. It restricts QAPI types to a certain shape; see
commit eb7ee2cbeb "qapi: introduce OptsVisitor".
A more modern way to support QAPI is qobject_input_visitor_new_str().
It uses keyval_parse() instead of QemuOpts for KEY=VALUE,... syntax, and
it also supports JSON syntax. The former isn't quite as expressive as
JSON, but it's a lot closer than QemuOpts + opts visitor.
This commit paves the way to use of the modern way instead.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
include/net/net.h | 2 ++
net/net.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
softmmu/vl.c | 6 ++++-
3 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/include/net/net.h b/include/net/net.h
index 55023e7e9fa9..025dbf1e143b 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -220,6 +220,8 @@ extern NICInfo nd_table[MAX_NICS];
extern const char *host_net_devices[];
/* from net.c */
+bool netdev_is_modern(const char *optarg);
+void netdev_parse_modern(const char *optarg);
void net_client_parse(QemuOptsList *opts_list, const char *str);
void show_netdevs(void);
void net_init_clients(void);
diff --git a/net/net.c b/net/net.c
index f056e8aebfb2..ffe3e5a2cf1d 100644
--- a/net/net.c
+++ b/net/net.c
@@ -54,6 +54,7 @@
#include "net/colo-compare.h"
#include "net/filter.h"
#include "qapi/string-output-visitor.h"
+#include "qapi/qobject-input-visitor.h"
/* Net bridge is currently not supported for W32. */
#if !defined(_WIN32)
@@ -63,6 +64,16 @@
static VMChangeStateEntry *net_change_state_entry;
static QTAILQ_HEAD(, NetClientState) net_clients;
+typedef struct NetdevQueueEntry {
+ Netdev *nd;
+ Location loc;
+ QSIMPLEQ_ENTRY(NetdevQueueEntry) entry;
+} NetdevQueueEntry;
+
+typedef QSIMPLEQ_HEAD(, NetdevQueueEntry) NetdevQueue;
+
+static NetdevQueue nd_queue = QSIMPLEQ_HEAD_INITIALIZER(nd_queue);
+
/***********************************************************/
/* network device redirectors */
@@ -1562,6 +1573,20 @@ out:
return ret;
}
+static void netdev_init_modern(void)
+{
+ while (!QSIMPLEQ_EMPTY(&nd_queue)) {
+ NetdevQueueEntry *nd = QSIMPLEQ_FIRST(&nd_queue);
+
+ QSIMPLEQ_REMOVE_HEAD(&nd_queue, entry);
+ loc_push_restore(&nd->loc);
+ net_client_init1(nd->nd, true, &error_fatal);
+ loc_pop(&nd->loc);
+ qapi_free_Netdev(nd->nd);
+ g_free(nd);
+ }
+}
+
void net_init_clients(void)
{
net_change_state_entry =
@@ -1569,6 +1594,8 @@ void net_init_clients(void)
QTAILQ_INIT(&net_clients);
+ netdev_init_modern();
+
qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL,
&error_fatal);
@@ -1579,6 +1606,36 @@ void net_init_clients(void)
&error_fatal);
}
+/*
+ * Does this -netdev argument use modern rather than traditional syntax?
+ * Modern syntax is to be parsed with netdev_parse_modern().
+ * Traditional syntax is to be parsed with net_client_parse().
+ */
+bool netdev_is_modern(const char *optarg)
+{
+ return false;
+}
+
+/*
+ * netdev_parse_modern() uses modern, more expressive syntax than
+ * net_client_parse(), but supports only the -netdev option.
+ * netdev_parse_modern() appends to @nd_queue, whereas net_client_parse()
+ * appends to @qemu_netdev_opts.
+ */
+void netdev_parse_modern(const char *optarg)
+{
+ Visitor *v;
+ NetdevQueueEntry *nd;
+
+ v = qobject_input_visitor_new_str(optarg, "type", &error_fatal);
+ nd = g_new(NetdevQueueEntry, 1);
+ visit_type_Netdev(v, NULL, &nd->nd, &error_fatal);
+ visit_free(v);
+ loc_save(&nd->loc);
+
+ QSIMPLEQ_INSERT_TAIL(&nd_queue, nd, entry);
+}
+
void net_client_parse(QemuOptsList *opts_list, const char *optarg)
{
if (!qemu_opts_parse_noisily(opts_list, optarg, true)) {
diff --git a/softmmu/vl.c b/softmmu/vl.c
index f71fca2a9f73..d4da3e879f61 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2809,7 +2809,11 @@ void qemu_init(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_netdev:
default_net = 0;
- net_client_parse(qemu_find_opts("netdev"), optarg);
+ if (netdev_is_modern(optarg)) {
+ netdev_parse_modern(optarg);
+ } else {
+ net_client_parse(qemu_find_opts("netdev"), optarg);
+ }
break;
case QEMU_OPTION_nic:
default_net = 0;
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v9 05/16] qapi: net: add stream and dgram netdevs
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (3 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 04/16] qapi: net: introduce a way to bypass qemu_opts_parse_noisily() Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-27 9:18 ` Markus Armbruster
2022-09-28 5:55 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 06/16] net: socket: Don't ignore EINVAL on netdev socket connection Laurent Vivier
` (10 subsequent siblings)
15 siblings, 2 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
Copied from socket netdev file and modified to use SocketAddress
to be able to introduce new features like unix socket.
"udp" and "mcast" are squashed into dgram netdev, multicast is detected
according to the IP address type.
"listen" and "connect" modes are managed by stream netdev. An optional
parameter "server" defines the mode (server by default)
The two new types need to be parsed the modern way with -netdev, because
with the traditional way, the "type" field of netdev structure collides with
the "type" field of SocketAddress and prevents the correct evaluation of the
command line option. Moreover the traditional way doesn't allow to use
the same type (SocketAddress) several times with the -netdev option
(needed to specify "local" and "remote" addresses).
The previous commit paved the way for parsing the modern way, but
omitted one detail: how to pick modern vs. traditional, in
netdev_is_modern().
We want to pick based on the value of parameter "type". But how to
extract it from the option argument?
Parsing the option argument, either the modern or the traditional way,
extracts it for us, but only if parsing succeeds.
If parsing fails, there is no good option. No matter which parser we
pick, it'll be the wrong one for some arguments, and the error
reporting will be confusing.
Fortunately, the traditional parser accepts *anything* when called in
a certain way. This maximizes our chance to extract the value of
"type", and in turn minimizes the risk of confusing error reporting.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
---
hmp-commands.hx | 2 +-
net/clients.h | 6 +
net/dgram.c | 542 ++++++++++++++++++++++++++++++++++++++++++++++++
net/hub.c | 2 +
net/meson.build | 2 +
net/net.c | 30 ++-
net/stream.c | 423 +++++++++++++++++++++++++++++++++++++
qapi/net.json | 63 +++++-
qemu-options.hx | 12 ++
9 files changed, 1078 insertions(+), 4 deletions(-)
create mode 100644 net/dgram.c
create mode 100644 net/stream.c
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 8ab8000acd9e..da40a7eb04ed 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1276,7 +1276,7 @@ ERST
{
.name = "netdev_add",
.args_type = "netdev:O",
- .params = "[user|tap|socket|vde|bridge|hubport|netmap|vhost-user"
+ .params = "[user|tap|socket|stream|dgram|vde|bridge|hubport|netmap|vhost-user"
#ifdef CONFIG_VMNET
"|vmnet-host|vmnet-shared|vmnet-bridged"
#endif
diff --git a/net/clients.h b/net/clients.h
index c9157789f2ce..ed8bdfff1e7c 100644
--- a/net/clients.h
+++ b/net/clients.h
@@ -40,6 +40,12 @@ int net_init_hubport(const Netdev *netdev, const char *name,
int net_init_socket(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp);
+int net_init_stream(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp);
+
+int net_init_dgram(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp);
+
int net_init_tap(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp);
diff --git a/net/dgram.c b/net/dgram.c
new file mode 100644
index 000000000000..45d869efc844
--- /dev/null
+++ b/net/dgram.c
@@ -0,0 +1,542 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+
+#include "net/net.h"
+#include "clients.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qemu/option.h"
+#include "qemu/sockets.h"
+#include "qemu/iov.h"
+#include "qemu/main-loop.h"
+#include "qemu/cutils.h"
+
+typedef struct NetDgramState {
+ NetClientState nc;
+ int fd;
+ SocketReadState rs;
+ struct sockaddr_in dgram_dst; /* contains destination iff connectionless */
+ bool read_poll; /* waiting to receive data? */
+ bool write_poll; /* waiting to transmit data? */
+} NetDgramState;
+
+static void net_dgram_send_dgram(void *opaque);
+static void net_dgram_writable(void *opaque);
+
+static void net_dgram_update_fd_handler(NetDgramState *s)
+{
+ qemu_set_fd_handler(s->fd,
+ s->read_poll ? net_dgram_send_dgram : NULL,
+ s->write_poll ? net_dgram_writable : NULL,
+ s);
+}
+
+static void net_dgram_read_poll(NetDgramState *s, bool enable)
+{
+ s->read_poll = enable;
+ net_dgram_update_fd_handler(s);
+}
+
+static void net_dgram_write_poll(NetDgramState *s, bool enable)
+{
+ s->write_poll = enable;
+ net_dgram_update_fd_handler(s);
+}
+
+static void net_dgram_writable(void *opaque)
+{
+ NetDgramState *s = opaque;
+
+ net_dgram_write_poll(s, false);
+
+ qemu_flush_queued_packets(&s->nc);
+}
+
+static ssize_t net_dgram_receive_dgram(NetClientState *nc,
+ const uint8_t *buf, size_t size)
+{
+ NetDgramState *s = DO_UPCAST(NetDgramState, nc, nc);
+ ssize_t ret;
+
+ do {
+ if (s->dgram_dst.sin_family != AF_UNIX) {
+ ret = sendto(s->fd, buf, size, 0,
+ (struct sockaddr *)&s->dgram_dst,
+ sizeof(s->dgram_dst));
+ } else {
+ ret = send(s->fd, buf, size, 0);
+ }
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1 && errno == EAGAIN) {
+ net_dgram_write_poll(s, true);
+ return 0;
+ }
+ return ret;
+}
+
+static void net_dgram_send_completed(NetClientState *nc, ssize_t len)
+{
+ NetDgramState *s = DO_UPCAST(NetDgramState, nc, nc);
+
+ if (!s->read_poll) {
+ net_dgram_read_poll(s, true);
+ }
+}
+
+static void net_dgram_rs_finalize(SocketReadState *rs)
+{
+ NetDgramState *s = container_of(rs, NetDgramState, rs);
+
+ if (qemu_send_packet_async(&s->nc, rs->buf,
+ rs->packet_len,
+ net_dgram_send_completed) == 0) {
+ net_dgram_read_poll(s, false);
+ }
+}
+
+static void net_dgram_send_dgram(void *opaque)
+{
+ NetDgramState *s = opaque;
+ int size;
+
+ size = recv(s->fd, s->rs.buf, sizeof(s->rs.buf), 0);
+ if (size < 0) {
+ return;
+ }
+ if (size == 0) {
+ /* end of connection */
+ net_dgram_read_poll(s, false);
+ net_dgram_write_poll(s, false);
+ return;
+ }
+ if (qemu_send_packet_async(&s->nc, s->rs.buf, size,
+ net_dgram_send_completed) == 0) {
+ net_dgram_read_poll(s, false);
+ }
+}
+
+static int net_dgram_mcast_create(struct sockaddr_in *mcastaddr,
+ struct in_addr *localaddr,
+ Error **errp)
+{
+ struct ip_mreq imr;
+ int fd;
+ int val, ret;
+#ifdef __OpenBSD__
+ unsigned char loop;
+#else
+ int loop;
+#endif
+
+ if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
+ error_setg(errp, "specified mcastaddr %s (0x%08x) "
+ "does not contain a multicast address",
+ inet_ntoa(mcastaddr->sin_addr),
+ (int)ntohl(mcastaddr->sin_addr.s_addr));
+ return -1;
+ }
+
+ fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create datagram socket");
+ return -1;
+ }
+
+ /*
+ * Allow multiple sockets to bind the same multicast ip and port by setting
+ * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set
+ * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR
+ * only on posix systems.
+ */
+ val = 1;
+ ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't set socket option SO_REUSEADDR");
+ goto fail;
+ }
+
+ ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't bind ip=%s to socket",
+ inet_ntoa(mcastaddr->sin_addr));
+ goto fail;
+ }
+
+ /* Add host to multicast group */
+ imr.imr_multiaddr = mcastaddr->sin_addr;
+ if (localaddr) {
+ imr.imr_interface = *localaddr;
+ } else {
+ imr.imr_interface.s_addr = htonl(INADDR_ANY);
+ }
+
+ ret = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+ &imr, sizeof(struct ip_mreq));
+ if (ret < 0) {
+ error_setg_errno(errp, errno,
+ "can't add socket to multicast group %s",
+ inet_ntoa(imr.imr_multiaddr));
+ goto fail;
+ }
+
+ /* Force mcast msgs to loopback (eg. several QEMUs in same host */
+ loop = 1;
+ ret = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
+ &loop, sizeof(loop));
+ if (ret < 0) {
+ error_setg_errno(errp, errno,
+ "can't force multicast message to loopback");
+ goto fail;
+ }
+
+ /* If a bind address is given, only send packets from that address */
+ if (localaddr != NULL) {
+ ret = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
+ localaddr, sizeof(*localaddr));
+ if (ret < 0) {
+ error_setg_errno(errp, errno,
+ "can't set the default network send interface");
+ goto fail;
+ }
+ }
+
+ qemu_socket_set_nonblock(fd);
+ return fd;
+fail:
+ if (fd >= 0) {
+ closesocket(fd);
+ }
+ return -1;
+}
+
+static void net_dgram_cleanup(NetClientState *nc)
+{
+ NetDgramState *s = DO_UPCAST(NetDgramState, nc, nc);
+ if (s->fd != -1) {
+ net_dgram_read_poll(s, false);
+ net_dgram_write_poll(s, false);
+ close(s->fd);
+ s->fd = -1;
+ }
+}
+
+static NetClientInfo net_dgram_socket_info = {
+ .type = NET_CLIENT_DRIVER_DGRAM,
+ .size = sizeof(NetDgramState),
+ .receive = net_dgram_receive_dgram,
+ .cleanup = net_dgram_cleanup,
+};
+
+static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
+ const char *model,
+ const char *name,
+ int fd, int is_fd,
+ SocketAddress *mcast,
+ Error **errp)
+{
+ struct sockaddr_in saddr;
+ int newfd;
+ NetClientState *nc;
+ NetDgramState *s;
+ SocketAddress *sa;
+ SocketAddressType sa_type;
+
+ sa = socket_local_address(fd, errp);
+ if (!sa) {
+ return NULL;
+ }
+ sa_type = sa->type;
+ qapi_free_SocketAddress(sa);
+
+ /*
+ * fd passed: multicast: "learn" dgram_dst address from bound address and
+ * save it. Because this may be "shared" socket from a "master" process,
+ * datagrams would be recv() by ONLY ONE process: we must "clone" this
+ * dgram socket --jjo
+ */
+
+ if (is_fd && mcast != NULL) {
+ if (convert_host_port(&saddr, mcast->u.inet.host,
+ mcast->u.inet.port, errp) < 0) {
+ goto err;
+ }
+ /* must be bound */
+ if (saddr.sin_addr.s_addr == 0) {
+ error_setg(errp, "can't setup multicast destination address");
+ goto err;
+ }
+ /* clone dgram socket */
+ newfd = net_dgram_mcast_create(&saddr, NULL, errp);
+ if (newfd < 0) {
+ goto err;
+ }
+ /* clone newfd to fd, close newfd */
+ dup2(newfd, fd);
+ close(newfd);
+
+ }
+
+ nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name);
+
+ s = DO_UPCAST(NetDgramState, nc, nc);
+
+ s->fd = fd;
+ net_socket_rs_init(&s->rs, net_dgram_rs_finalize, false);
+ net_dgram_read_poll(s, true);
+
+ /* mcast: save bound address as dst */
+ if (is_fd && mcast != NULL) {
+ s->dgram_dst = saddr;
+ snprintf(nc->info_str, sizeof(nc->info_str),
+ "fd=%d (cloned mcast=%s:%d)",
+ fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+ } else {
+ if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
+ s->dgram_dst.sin_family = AF_UNIX;
+ }
+
+ snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d %s", fd,
+ SocketAddressType_str(sa_type));
+ }
+
+ return s;
+
+err:
+ closesocket(fd);
+ return NULL;
+}
+
+static int net_dgram_mcast_init(NetClientState *peer,
+ const char *model,
+ const char *name,
+ SocketAddress *remote,
+ SocketAddress *local,
+ Error **errp)
+{
+ NetDgramState *s;
+ int fd, ret;
+ struct sockaddr_in saddr;
+
+ if (remote->type != SOCKET_ADDRESS_TYPE_INET) {
+ error_setg(errp, "multicast only support inet type");
+ return -1;
+ }
+
+ if (convert_host_port(&saddr, remote->u.inet.host, remote->u.inet.port,
+ errp) < 0) {
+ return -1;
+ }
+
+ if (!local) {
+ fd = net_dgram_mcast_create(&saddr, NULL, errp);
+ if (fd < 0) {
+ return -1;
+ }
+ } else {
+ switch (local->type) {
+ case SOCKET_ADDRESS_TYPE_INET: {
+ struct in_addr localaddr;
+
+ if (inet_aton(local->u.inet.host, &localaddr) == 0) {
+ error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
+ local->u.inet.host);
+ return -1;
+ }
+
+ fd = net_dgram_mcast_create(&saddr, &localaddr, errp);
+ if (fd < 0) {
+ return -1;
+ }
+ break;
+ }
+ case SOCKET_ADDRESS_TYPE_FD:
+ fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
+ if (fd == -1) {
+ return -1;
+ }
+ ret = qemu_socket_try_set_nonblock(fd);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
+ name, fd);
+ return -1;
+ }
+ break;
+ default:
+ error_setg(errp, "only support inet or fd type for local");
+ return -1;
+ }
+ }
+
+ s = net_dgram_fd_init_dgram(peer, model, name, fd,
+ local->type == SOCKET_ADDRESS_TYPE_FD,
+ remote, errp);
+ if (!s) {
+ return -1;
+ }
+
+ s->dgram_dst = saddr;
+
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "mcast=%s:%d",
+ inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+ return 0;
+
+}
+
+static int net_dgram_init(NetClientState *peer,
+ const char *model,
+ const char *name,
+ SocketAddress *remote,
+ SocketAddress *local,
+ Error **errp)
+{
+ NetDgramState *s;
+ int fd, ret;
+ struct sockaddr_in raddr_in;
+ gchar *info_str;
+
+ /* detect multicast address */
+ if (remote && remote->type == SOCKET_ADDRESS_TYPE_INET) {
+ struct sockaddr_in mcastaddr;
+
+ if (convert_host_port(&mcastaddr, remote->u.inet.host,
+ remote->u.inet.port, errp) < 0) {
+ return -1;
+ }
+
+ if (IN_MULTICAST(ntohl(mcastaddr.sin_addr.s_addr))) {
+ return net_dgram_mcast_init(peer, model, name, remote, local,
+ errp);
+ }
+ }
+
+ /* unicast address */
+ if (!local) {
+ error_setg(errp, "dgram requires local= parameter");
+ return -1;
+ }
+
+ if (remote) {
+ if (local->type == SOCKET_ADDRESS_TYPE_FD) {
+ error_setg(errp, "don't set remote with local.fd");
+ return -1;
+ }
+ if (remote->type != local->type) {
+ error_setg(errp, "remote and local types must be the same");
+ return -1;
+ }
+ } else {
+ if (local->type != SOCKET_ADDRESS_TYPE_FD) {
+ error_setg(errp, "type=inet requires remote parameter");
+ return -1;
+ }
+ }
+
+ switch (local->type) {
+ case SOCKET_ADDRESS_TYPE_INET: {
+ struct sockaddr_in laddr_in;
+
+ if (convert_host_port(&laddr_in, local->u.inet.host, local->u.inet.port,
+ errp) < 0) {
+ return -1;
+ }
+
+ if (convert_host_port(&raddr_in, remote->u.inet.host,
+ remote->u.inet.port, errp) < 0) {
+ return -1;
+ }
+
+ fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create datagram socket");
+ return -1;
+ }
+
+ ret = socket_set_fast_reuse(fd);
+ if (ret < 0) {
+ error_setg_errno(errp, errno,
+ "can't set socket option SO_REUSEADDR");
+ closesocket(fd);
+ return -1;
+ }
+ ret = bind(fd, (struct sockaddr *)&laddr_in, sizeof(laddr_in));
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't bind ip=%s to socket",
+ inet_ntoa(laddr_in.sin_addr));
+ closesocket(fd);
+ return -1;
+ }
+ qemu_socket_set_nonblock(fd);
+
+ info_str = g_strdup_printf("udp=%s:%d/%s:%d",
+ inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
+ inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
+
+ break;
+ }
+ case SOCKET_ADDRESS_TYPE_FD:
+ fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
+ if (fd == -1) {
+ return -1;
+ }
+ ret = qemu_socket_try_set_nonblock(fd);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
+ name, fd);
+ return -1;
+ }
+ break;
+ default:
+ error_setg(errp, "only support inet or fd type for local");
+ return -1;
+ }
+
+ s = net_dgram_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
+ if (!s) {
+ return -1;
+ }
+
+ if (remote) {
+ s->dgram_dst = raddr_in;
+
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
+ g_free(info_str);
+ }
+ return 0;
+}
+
+int net_init_dgram(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp)
+{
+ const NetdevDgramOptions *sock;
+
+ assert(netdev->type == NET_CLIENT_DRIVER_DGRAM);
+ sock = &netdev->u.dgram;
+
+ return net_dgram_init(peer, "dgram", name, sock->remote, sock->local,
+ errp);
+}
diff --git a/net/hub.c b/net/hub.c
index 1375738bf121..67ca53485638 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -313,6 +313,8 @@ void net_hub_check_clients(void)
case NET_CLIENT_DRIVER_USER:
case NET_CLIENT_DRIVER_TAP:
case NET_CLIENT_DRIVER_SOCKET:
+ case NET_CLIENT_DRIVER_STREAM:
+ case NET_CLIENT_DRIVER_DGRAM:
case NET_CLIENT_DRIVER_VDE:
case NET_CLIENT_DRIVER_VHOST_USER:
has_host_dev = 1;
diff --git a/net/meson.build b/net/meson.build
index d1be76daf361..6cd1e3dab3a6 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -13,6 +13,8 @@ softmmu_ss.add(files(
'net.c',
'queue.c',
'socket.c',
+ 'stream.c',
+ 'dgram.c',
'util.c',
))
diff --git a/net/net.c b/net/net.c
index ffe3e5a2cf1d..79e54e6228e8 100644
--- a/net/net.c
+++ b/net/net.c
@@ -48,6 +48,7 @@
#include "qemu/qemu-print.h"
#include "qemu/main-loop.h"
#include "qemu/option.h"
+#include "qemu/keyval.h"
#include "qapi/error.h"
#include "qapi/opts-visitor.h"
#include "sysemu/runstate.h"
@@ -1014,6 +1015,8 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
#endif
[NET_CLIENT_DRIVER_TAP] = net_init_tap,
[NET_CLIENT_DRIVER_SOCKET] = net_init_socket,
+ [NET_CLIENT_DRIVER_STREAM] = net_init_stream,
+ [NET_CLIENT_DRIVER_DGRAM] = net_init_dgram,
#ifdef CONFIG_VDE
[NET_CLIENT_DRIVER_VDE] = net_init_vde,
#endif
@@ -1101,6 +1104,8 @@ void show_netdevs(void)
int idx;
const char *available_netdevs[] = {
"socket",
+ "stream",
+ "dgram",
"hubport",
"tap",
#ifdef CONFIG_SLIRP
@@ -1613,7 +1618,30 @@ void net_init_clients(void)
*/
bool netdev_is_modern(const char *optarg)
{
- return false;
+ QemuOpts *opts;
+ bool is_modern;
+ const char *type;
+ static QemuOptsList dummy_opts = {
+ .name = "netdev",
+ .implied_opt_name = "type",
+ .head = QTAILQ_HEAD_INITIALIZER(dummy_opts.head),
+ .desc = { { } },
+ };
+
+ if (optarg[0] == '{') {
+ /* This is JSON, which means it's modern syntax */
+ return true;
+ }
+
+ opts = qemu_opts_create(&dummy_opts, NULL, false, &error_abort);
+ qemu_opts_do_parse(opts, optarg, dummy_opts.implied_opt_name,
+ &error_abort);
+ type = qemu_opt_get(opts, "type");
+ is_modern = !g_strcmp0(type, "stream") || !g_strcmp0(type, "dgram");
+
+ qemu_opts_reset(&dummy_opts);
+
+ return is_modern;
}
/*
diff --git a/net/stream.c b/net/stream.c
new file mode 100644
index 000000000000..e71c120ac379
--- /dev/null
+++ b/net/stream.c
@@ -0,0 +1,423 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ * Copyright (c) 2022 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+
+#include "net/net.h"
+#include "clients.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
+#include "qemu/error-report.h"
+#include "qemu/option.h"
+#include "qemu/sockets.h"
+#include "qemu/iov.h"
+#include "qemu/main-loop.h"
+#include "qemu/cutils.h"
+
+typedef struct NetStreamState {
+ NetClientState nc;
+ int listen_fd;
+ int fd;
+ SocketReadState rs;
+ unsigned int send_index; /* number of bytes sent*/
+ bool read_poll; /* waiting to receive data? */
+ bool write_poll; /* waiting to transmit data? */
+} NetStreamState;
+
+static void net_stream_send(void *opaque);
+static void net_stream_accept(void *opaque);
+static void net_stream_writable(void *opaque);
+
+static void net_stream_update_fd_handler(NetStreamState *s)
+{
+ qemu_set_fd_handler(s->fd,
+ s->read_poll ? net_stream_send : NULL,
+ s->write_poll ? net_stream_writable : NULL,
+ s);
+}
+
+static void net_stream_read_poll(NetStreamState *s, bool enable)
+{
+ s->read_poll = enable;
+ net_stream_update_fd_handler(s);
+}
+
+static void net_stream_write_poll(NetStreamState *s, bool enable)
+{
+ s->write_poll = enable;
+ net_stream_update_fd_handler(s);
+}
+
+static void net_stream_writable(void *opaque)
+{
+ NetStreamState *s = opaque;
+
+ net_stream_write_poll(s, false);
+
+ qemu_flush_queued_packets(&s->nc);
+}
+
+static ssize_t net_stream_receive(NetClientState *nc, const uint8_t *buf,
+ size_t size)
+{
+ NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
+ uint32_t len = htonl(size);
+ struct iovec iov[] = {
+ {
+ .iov_base = &len,
+ .iov_len = sizeof(len),
+ }, {
+ .iov_base = (void *)buf,
+ .iov_len = size,
+ },
+ };
+ size_t remaining;
+ ssize_t ret;
+
+ remaining = iov_size(iov, 2) - s->send_index;
+ ret = iov_send(s->fd, iov, 2, s->send_index, remaining);
+
+ if (ret == -1 && errno == EAGAIN) {
+ ret = 0; /* handled further down */
+ }
+ if (ret == -1) {
+ s->send_index = 0;
+ return -errno;
+ }
+ if (ret < (ssize_t)remaining) {
+ s->send_index += ret;
+ net_stream_write_poll(s, true);
+ return 0;
+ }
+ s->send_index = 0;
+ return size;
+}
+
+static void net_stream_send_completed(NetClientState *nc, ssize_t len)
+{
+ NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
+
+ if (!s->read_poll) {
+ net_stream_read_poll(s, true);
+ }
+}
+
+static void net_stream_rs_finalize(SocketReadState *rs)
+{
+ NetStreamState *s = container_of(rs, NetStreamState, rs);
+
+ if (qemu_send_packet_async(&s->nc, rs->buf,
+ rs->packet_len,
+ net_stream_send_completed) == 0) {
+ net_stream_read_poll(s, false);
+ }
+}
+
+static void net_stream_send(void *opaque)
+{
+ NetStreamState *s = opaque;
+ int size;
+ int ret;
+ uint8_t buf1[NET_BUFSIZE];
+ const uint8_t *buf;
+
+ size = recv(s->fd, buf1, sizeof(buf1), 0);
+ if (size < 0) {
+ if (errno != EWOULDBLOCK) {
+ goto eoc;
+ }
+ } else if (size == 0) {
+ /* end of connection */
+ eoc:
+ net_stream_read_poll(s, false);
+ net_stream_write_poll(s, false);
+ if (s->listen_fd != -1) {
+ qemu_set_fd_handler(s->listen_fd, net_stream_accept, NULL, s);
+ }
+ closesocket(s->fd);
+
+ s->fd = -1;
+ net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
+ s->nc.link_down = true;
+ memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
+
+ return;
+ }
+ buf = buf1;
+
+ ret = net_fill_rstate(&s->rs, buf, size);
+
+ if (ret == -1) {
+ goto eoc;
+ }
+}
+
+static void net_stream_cleanup(NetClientState *nc)
+{
+ NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
+ if (s->fd != -1) {
+ net_stream_read_poll(s, false);
+ net_stream_write_poll(s, false);
+ close(s->fd);
+ s->fd = -1;
+ }
+ if (s->listen_fd != -1) {
+ qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
+ closesocket(s->listen_fd);
+ s->listen_fd = -1;
+ }
+}
+
+static void net_stream_connect(void *opaque)
+{
+ NetStreamState *s = opaque;
+ net_stream_read_poll(s, true);
+}
+
+static NetClientInfo net_stream_info = {
+ .type = NET_CLIENT_DRIVER_STREAM,
+ .size = sizeof(NetStreamState),
+ .receive = net_stream_receive,
+ .cleanup = net_stream_cleanup,
+};
+
+static NetStreamState *net_stream_fd_init_stream(NetClientState *peer,
+ const char *model,
+ const char *name,
+ int fd, int is_connected)
+{
+ NetClientState *nc;
+ NetStreamState *s;
+
+ nc = qemu_new_net_client(&net_stream_info, peer, model, name);
+
+ snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d", fd);
+
+ s = DO_UPCAST(NetStreamState, nc, nc);
+
+ s->fd = fd;
+ s->listen_fd = -1;
+ net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
+
+ /* Disable Nagle algorithm on TCP sockets to reduce latency */
+ socket_set_nodelay(fd);
+
+ if (is_connected) {
+ net_stream_connect(s);
+ } else {
+ qemu_set_fd_handler(s->fd, NULL, net_stream_connect, s);
+ }
+ return s;
+}
+
+static void net_stream_accept(void *opaque)
+{
+ NetStreamState *s = opaque;
+ struct sockaddr_in saddr;
+ socklen_t len;
+ int fd;
+
+ for (;;) {
+ len = sizeof(saddr);
+ fd = qemu_accept(s->listen_fd, (struct sockaddr *)&saddr, &len);
+ if (fd < 0 && errno != EINTR) {
+ return;
+ } else if (fd >= 0) {
+ qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
+ break;
+ }
+ }
+
+ s->fd = fd;
+ s->nc.link_down = false;
+ net_stream_connect(s);
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+ "connection from %s:%d",
+ inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+}
+
+static int net_stream_server_init(NetClientState *peer,
+ const char *model,
+ const char *name,
+ SocketAddress *addr,
+ Error **errp)
+{
+ NetClientState *nc;
+ NetStreamState *s;
+ int fd, ret;
+
+ switch (addr->type) {
+ case SOCKET_ADDRESS_TYPE_INET: {
+ struct sockaddr_in saddr_in;
+
+ if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
+ errp) < 0) {
+ return -1;
+ }
+
+ fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create stream socket");
+ return -1;
+ }
+ qemu_socket_set_nonblock(fd);
+
+ socket_set_fast_reuse(fd);
+
+ ret = bind(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't bind ip=%s to socket",
+ inet_ntoa(saddr_in.sin_addr));
+ closesocket(fd);
+ return -1;
+ }
+ break;
+ }
+ case SOCKET_ADDRESS_TYPE_FD:
+ fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
+ if (fd == -1) {
+ return -1;
+ }
+ ret = qemu_socket_try_set_nonblock(fd);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
+ name, fd);
+ return -1;
+ }
+ break;
+ default:
+ error_setg(errp, "only support inet or fd type");
+ return -1;
+ }
+
+ ret = listen(fd, 0);
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't listen on socket");
+ closesocket(fd);
+ return -1;
+ }
+
+ nc = qemu_new_net_client(&net_stream_info, peer, model, name);
+ s = DO_UPCAST(NetStreamState, nc, nc);
+ s->fd = -1;
+ s->listen_fd = fd;
+ s->nc.link_down = true;
+ net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
+
+ qemu_set_fd_handler(s->listen_fd, net_stream_accept, NULL, s);
+ return 0;
+}
+
+static int net_stream_client_init(NetClientState *peer,
+ const char *model,
+ const char *name,
+ SocketAddress *addr,
+ Error **errp)
+{
+ NetStreamState *s;
+ int fd, connected, ret;
+ gchar *info_str;
+
+ switch (addr->type) {
+ case SOCKET_ADDRESS_TYPE_INET: {
+ struct sockaddr_in saddr_in;
+
+ if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
+ errp) < 0) {
+ return -1;
+ }
+
+ fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create stream socket");
+ return -1;
+ }
+ qemu_socket_set_nonblock(fd);
+
+ connected = 0;
+ for (;;) {
+ ret = connect(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
+ if (ret < 0) {
+ if (errno == EINTR || errno == EWOULDBLOCK) {
+ /* continue */
+ } else if (errno == EINPROGRESS ||
+ errno == EALREADY ||
+ errno == EINVAL) {
+ break;
+ } else {
+ error_setg_errno(errp, errno, "can't connect socket");
+ closesocket(fd);
+ return -1;
+ }
+ } else {
+ connected = 1;
+ break;
+ }
+ }
+ info_str = g_strdup_printf("connect to %s:%d",
+ inet_ntoa(saddr_in.sin_addr),
+ ntohs(saddr_in.sin_port));
+ break;
+ }
+ case SOCKET_ADDRESS_TYPE_FD:
+ fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
+ if (fd == -1) {
+ return -1;
+ }
+ ret = qemu_socket_try_set_nonblock(fd);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
+ name, fd);
+ return -1;
+ }
+ connected = 1;
+ info_str = g_strdup_printf("connect to fd %d", fd);
+ break;
+ default:
+ error_setg(errp, "only support inet or fd type");
+ return -1;
+ }
+
+ s = net_stream_fd_init_stream(peer, model, name, fd, connected);
+
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
+ g_free(info_str);
+
+ return 0;
+}
+
+int net_init_stream(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp)
+{
+ const NetdevStreamOptions *sock;
+
+ assert(netdev->type == NET_CLIENT_DRIVER_STREAM);
+ sock = &netdev->u.stream;
+
+ if (!sock->has_server || sock->server) {
+ return net_stream_server_init(peer, "stream", name, sock->addr, errp);
+ }
+ return net_stream_client_init(peer, "stream", name, sock->addr, errp);
+}
diff --git a/qapi/net.json b/qapi/net.json
index dd088c09c509..e02e8001a000 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -7,6 +7,7 @@
##
{ 'include': 'common.json' }
+{ 'include': 'sockets.json' }
##
# @set_link:
@@ -573,6 +574,61 @@
'*isolated': 'bool' },
'if': 'CONFIG_VMNET' }
+##
+# @NetdevStreamOptions:
+#
+# Configuration info for stream socket netdev
+#
+# @addr: socket address to listen on (server=true)
+# or connect to (server=false)
+# @server: create server socket (default: true)
+#
+# Only SocketAddress types 'inet' and 'fd' are supported.
+#
+# Since: 7.1
+##
+{ 'struct': 'NetdevStreamOptions',
+ 'data': {
+ 'addr': 'SocketAddress',
+ '*server': 'bool' } }
+
+##
+# @NetdevDgramOptions:
+#
+# Configuration info for datagram socket netdev.
+#
+# @remote: remote address
+# @local: local address
+#
+# Only SocketAddress types 'inet' and 'fd' are supported.
+#
+# The code checks there is at least one of these options and reports an error
+# if not. If remote address is present and it's a multicast address, local
+# address is optional. Otherwise local address is required and remote address
+# is optional.
+#
+# .. table:: Valid parameters combination table
+# :widths: auto
+#
+# ============= ======== =====
+# remote local okay?
+# ============= ======== =====
+# absent absent no
+# absent not fd no
+# absent fd yes
+# multicast absent yes
+# multicast present yes
+# not multicast absent no
+# not multicast present yes
+# ============= ======== =====
+#
+# Since: 7.1
+##
+{ 'struct': 'NetdevDgramOptions',
+ 'data': {
+ '*local': 'SocketAddress',
+ '*remote': 'SocketAddress' } }
+
##
# @NetClientDriver:
#
@@ -586,8 +642,9 @@
# @vmnet-bridged since 7.1
##
{ 'enum': 'NetClientDriver',
- 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde',
- 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa',
+ 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'stream',
+ 'dgram', 'vde', 'bridge', 'hubport', 'netmap', 'vhost-user',
+ 'vhost-vdpa',
{ 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' },
{ 'name': 'vmnet-shared', 'if': 'CONFIG_VMNET' },
{ 'name': 'vmnet-bridged', 'if': 'CONFIG_VMNET' }] }
@@ -617,6 +674,8 @@
'tap': 'NetdevTapOptions',
'l2tpv3': 'NetdevL2TPv3Options',
'socket': 'NetdevSocketOptions',
+ 'stream': 'NetdevStreamOptions',
+ 'dgram': 'NetdevDgramOptions',
'vde': 'NetdevVdeOptions',
'bridge': 'NetdevBridgeOptions',
'hubport': 'NetdevHubPortOptions',
diff --git a/qemu-options.hx b/qemu-options.hx
index d8b5ce5b4354..8c765f345da8 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2734,6 +2734,18 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
"-netdev socket,id=str[,fd=h][,udp=host:port][,localaddr=host:port]\n"
" configure a network backend to connect to another network\n"
" using an UDP tunnel\n"
+ "-netdev stream,id=str[,server=on|off],addr.type=inet,addr.host=host,addr.port=port\n"
+ "-netdev stream,id=str[,server=on|off],addr.type=fd,addr.str=h\n"
+ " configure a network backend to connect to another network\n"
+ " using a socket connection in stream mode.\n"
+ "-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=inet,local.host=addr]\n"
+ "-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=fd,local.str=h]\n"
+ " configure a network backend to connect to a multicast maddr and port\n"
+ " use ``local.host=addr`` to specify the host address to send packets from\n"
+ "-netdev dgram,id=str,local.type=inet,local.host=addr,local.port=port[,remote.type=inet,remote.host=addr,remote.port=port]\n"
+ "-netdev dgram,id=str,local.type=fd,local.str=h\n"
+ " configure a network backend to connect to another network\n"
+ " using an UDP tunnel\n"
#ifdef CONFIG_VDE
"-netdev vde,id=str[,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
" configure a network backend to connect to port 'n' of a vde switch\n"
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 05/16] qapi: net: add stream and dgram netdevs
2022-09-26 19:50 ` [PATCH v9 05/16] qapi: net: add stream and dgram netdevs Laurent Vivier
@ 2022-09-27 9:18 ` Markus Armbruster
2022-09-28 5:55 ` David Gibson
1 sibling, 0 replies; 30+ messages in thread
From: Markus Armbruster @ 2022-09-27 9:18 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, David Gibson, Thomas Huth,
Eric Blake, Dr. David Alan Gilbert, Paolo Bonzini,
Daniel P. Berrangé,
Stefano Brivio
Laurent Vivier <lvivier@redhat.com> writes:
> Copied from socket netdev file and modified to use SocketAddress
> to be able to introduce new features like unix socket.
>
> "udp" and "mcast" are squashed into dgram netdev, multicast is detected
> according to the IP address type.
> "listen" and "connect" modes are managed by stream netdev. An optional
> parameter "server" defines the mode (server by default)
>
> The two new types need to be parsed the modern way with -netdev, because
> with the traditional way, the "type" field of netdev structure collides with
> the "type" field of SocketAddress and prevents the correct evaluation of the
> command line option. Moreover the traditional way doesn't allow to use
> the same type (SocketAddress) several times with the -netdev option
> (needed to specify "local" and "remote" addresses).
>
> The previous commit paved the way for parsing the modern way, but
> omitted one detail: how to pick modern vs. traditional, in
> netdev_is_modern().
>
> We want to pick based on the value of parameter "type". But how to
> extract it from the option argument?
>
> Parsing the option argument, either the modern or the traditional way,
> extracts it for us, but only if parsing succeeds.
>
> If parsing fails, there is no good option. No matter which parser we
> pick, it'll be the wrong one for some arguments, and the error
> reporting will be confusing.
>
> Fortunately, the traditional parser accepts *anything* when called in
> a certain way. This maximizes our chance to extract the value of
> "type", and in turn minimizes the risk of confusing error reporting.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
> ---
> hmp-commands.hx | 2 +-
> net/clients.h | 6 +
> net/dgram.c | 542 ++++++++++++++++++++++++++++++++++++++++++++++++
> net/hub.c | 2 +
> net/meson.build | 2 +
> net/net.c | 30 ++-
> net/stream.c | 423 +++++++++++++++++++++++++++++++++++++
> qapi/net.json | 63 +++++-
> qemu-options.hx | 12 ++
> 9 files changed, 1078 insertions(+), 4 deletions(-)
> create mode 100644 net/dgram.c
> create mode 100644 net/stream.c
>
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index 8ab8000acd9e..da40a7eb04ed 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1276,7 +1276,7 @@ ERST
> {
> .name = "netdev_add",
> .args_type = "netdev:O",
> - .params = "[user|tap|socket|vde|bridge|hubport|netmap|vhost-user"
> + .params = "[user|tap|socket|stream|dgram|vde|bridge|hubport|netmap|vhost-user"
> #ifdef CONFIG_VMNET
> "|vmnet-host|vmnet-shared|vmnet-bridged"
> #endif
> diff --git a/net/clients.h b/net/clients.h
[...]
> diff --git a/qapi/net.json b/qapi/net.json
> index dd088c09c509..e02e8001a000 100644
> --- a/qapi/net.json
> +++ b/qapi/net.json
> @@ -7,6 +7,7 @@
> ##
>
> { 'include': 'common.json' }
> +{ 'include': 'sockets.json' }
>
> ##
> # @set_link:
> @@ -573,6 +574,61 @@
> '*isolated': 'bool' },
> 'if': 'CONFIG_VMNET' }
>
> +##
> +# @NetdevStreamOptions:
> +#
> +# Configuration info for stream socket netdev
> +#
> +# @addr: socket address to listen on (server=true)
> +# or connect to (server=false)
> +# @server: create server socket (default: true)
> +#
> +# Only SocketAddress types 'inet' and 'fd' are supported.
> +#
> +# Since: 7.1
> +##
> +{ 'struct': 'NetdevStreamOptions',
> + 'data': {
> + 'addr': 'SocketAddress',
> + '*server': 'bool' } }
> +
> +##
> +# @NetdevDgramOptions:
> +#
> +# Configuration info for datagram socket netdev.
> +#
> +# @remote: remote address
> +# @local: local address
> +#
> +# Only SocketAddress types 'inet' and 'fd' are supported.
> +#
> +# The code checks there is at least one of these options and reports an error
> +# if not.
Can we drop this sentence?
> If remote address is present and it's a multicast address, local
> +# address is optional. Otherwise local address is required and remote address
> +# is optional.
> +#
> +# .. table:: Valid parameters combination table
> +# :widths: auto
> +#
> +# ============= ======== =====
> +# remote local okay?
> +# ============= ======== =====
> +# absent absent no
> +# absent not fd no
> +# absent fd yes
> +# multicast absent yes
> +# multicast present yes
> +# not multicast absent no
> +# not multicast present yes
> +# ============= ======== =====
> +#
> +# Since: 7.1
> +##
My networking fu is not strong enough to suggest further improvements.
So let's go with what we have here.
> +{ 'struct': 'NetdevDgramOptions',
> + 'data': {
> + '*local': 'SocketAddress',
> + '*remote': 'SocketAddress' } }
> +
> ##
> # @NetClientDriver:
> #
> @@ -586,8 +642,9 @@
> # @vmnet-bridged since 7.1
> ##
> { 'enum': 'NetClientDriver',
> - 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde',
> - 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa',
> + 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'stream',
> + 'dgram', 'vde', 'bridge', 'hubport', 'netmap', 'vhost-user',
> + 'vhost-vdpa',
> { 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' },
> { 'name': 'vmnet-shared', 'if': 'CONFIG_VMNET' },
> { 'name': 'vmnet-bridged', 'if': 'CONFIG_VMNET' }] }
> @@ -617,6 +674,8 @@
> 'tap': 'NetdevTapOptions',
> 'l2tpv3': 'NetdevL2TPv3Options',
> 'socket': 'NetdevSocketOptions',
> + 'stream': 'NetdevStreamOptions',
> + 'dgram': 'NetdevDgramOptions',
> 'vde': 'NetdevVdeOptions',
> 'bridge': 'NetdevBridgeOptions',
> 'hubport': 'NetdevHubPortOptions',
> diff --git a/qemu-options.hx b/qemu-options.hx
> index d8b5ce5b4354..8c765f345da8 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -2734,6 +2734,18 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
> "-netdev socket,id=str[,fd=h][,udp=host:port][,localaddr=host:port]\n"
> " configure a network backend to connect to another network\n"
> " using an UDP tunnel\n"
> + "-netdev stream,id=str[,server=on|off],addr.type=inet,addr.host=host,addr.port=port\n"
> + "-netdev stream,id=str[,server=on|off],addr.type=fd,addr.str=h\n"
Not this patch's fault: using String for SocketAddress member @fd was a
mistake, because the resulting UI is bad: addr.str tells me nothing.
str.name would have been better. Commit 5be8c759f0 "qapi: add socket
address types" (v1.3.0).
Commit 1723d6b1cf "sockets: allow SocketAddress 'fd' to reference
numeric file descriptors" (v2.12.0) made it worse: it overloaded the
name so that decimal means numeric file descriptor. It should be an
alternate of string file descriptor name and int file descriptor number.
Except keyval_parse() killed that use of alternates (commit c0644771eb
"qapi: Reject alternates that can't work with keyval_parse()",
v2.10.0-rc0). Sigh, too complicated to have nice things.
Back to this patch. "addr.str=h" could perhaps be improved to
"=fd-name-or-number" or "=file-descriptor". Even "=fd" would be better,
I think.
> + " configure a network backend to connect to another network\n"
> + " using a socket connection in stream mode.\n"
> + "-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=inet,local.host=addr]\n"
> + "-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=fd,local.str=h]\n"
> + " configure a network backend to connect to a multicast maddr and port\n"
> + " use ``local.host=addr`` to specify the host address to send packets from\n"
> + "-netdev dgram,id=str,local.type=inet,local.host=addr,local.port=port[,remote.type=inet,remote.host=addr,remote.port=port]\n"
> + "-netdev dgram,id=str,local.type=fd,local.str=h\n"
> + " configure a network backend to connect to another network\n"
> + " using an UDP tunnel\n"
I should probably try to match these cases to the table in the QAPI
schema doc comment. But that would be like, uh, work.
> #ifdef CONFIG_VDE
> "-netdev vde,id=str[,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
> " configure a network backend to connect to port 'n' of a vde switch\n"
QAPI schema
Acked-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v9 05/16] qapi: net: add stream and dgram netdevs
2022-09-26 19:50 ` [PATCH v9 05/16] qapi: net: add stream and dgram netdevs Laurent Vivier
2022-09-27 9:18 ` Markus Armbruster
@ 2022-09-28 5:55 ` David Gibson
2022-10-05 10:08 ` Laurent Vivier
1 sibling, 1 reply; 30+ messages in thread
From: David Gibson @ 2022-09-28 5:55 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
[-- Attachment #1: Type: text/plain, Size: 44971 bytes --]
On Mon, Sep 26, 2022 at 09:50:37PM +0200, Laurent Vivier wrote:
> Copied from socket netdev file and modified to use SocketAddress
> to be able to introduce new features like unix socket.
>
> "udp" and "mcast" are squashed into dgram netdev, multicast is detected
> according to the IP address type.
> "listen" and "connect" modes are managed by stream netdev. An optional
> parameter "server" defines the mode (server by default)
>
> The two new types need to be parsed the modern way with -netdev, because
> with the traditional way, the "type" field of netdev structure collides with
> the "type" field of SocketAddress and prevents the correct evaluation of the
> command line option. Moreover the traditional way doesn't allow to use
> the same type (SocketAddress) several times with the -netdev option
> (needed to specify "local" and "remote" addresses).
>
> The previous commit paved the way for parsing the modern way, but
> omitted one detail: how to pick modern vs. traditional, in
> netdev_is_modern().
>
> We want to pick based on the value of parameter "type". But how to
> extract it from the option argument?
>
> Parsing the option argument, either the modern or the traditional way,
> extracts it for us, but only if parsing succeeds.
>
> If parsing fails, there is no good option. No matter which parser we
> pick, it'll be the wrong one for some arguments, and the error
> reporting will be confusing.
>
> Fortunately, the traditional parser accepts *anything* when called in
> a certain way. This maximizes our chance to extract the value of
> "type", and in turn minimizes the risk of confusing error reporting.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Mostly LGTM, but a few minor points noted below.
> ---
> hmp-commands.hx | 2 +-
> net/clients.h | 6 +
> net/dgram.c | 542 ++++++++++++++++++++++++++++++++++++++++++++++++
> net/hub.c | 2 +
> net/meson.build | 2 +
> net/net.c | 30 ++-
> net/stream.c | 423 +++++++++++++++++++++++++++++++++++++
> qapi/net.json | 63 +++++-
> qemu-options.hx | 12 ++
> 9 files changed, 1078 insertions(+), 4 deletions(-)
> create mode 100644 net/dgram.c
> create mode 100644 net/stream.c
>
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index 8ab8000acd9e..da40a7eb04ed 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -1276,7 +1276,7 @@ ERST
> {
> .name = "netdev_add",
> .args_type = "netdev:O",
> - .params = "[user|tap|socket|vde|bridge|hubport|netmap|vhost-user"
> + .params = "[user|tap|socket|stream|dgram|vde|bridge|hubport|netmap|vhost-user"
> #ifdef CONFIG_VMNET
> "|vmnet-host|vmnet-shared|vmnet-bridged"
> #endif
> diff --git a/net/clients.h b/net/clients.h
> index c9157789f2ce..ed8bdfff1e7c 100644
> --- a/net/clients.h
> +++ b/net/clients.h
> @@ -40,6 +40,12 @@ int net_init_hubport(const Netdev *netdev, const char *name,
> int net_init_socket(const Netdev *netdev, const char *name,
> NetClientState *peer, Error **errp);
>
> +int net_init_stream(const Netdev *netdev, const char *name,
> + NetClientState *peer, Error **errp);
> +
> +int net_init_dgram(const Netdev *netdev, const char *name,
> + NetClientState *peer, Error **errp);
> +
> int net_init_tap(const Netdev *netdev, const char *name,
> NetClientState *peer, Error **errp);
>
> diff --git a/net/dgram.c b/net/dgram.c
> new file mode 100644
> index 000000000000..45d869efc844
> --- /dev/null
> +++ b/net/dgram.c
> @@ -0,0 +1,542 @@
> +/*
> + * QEMU System Emulator
> + *
> + * Copyright (c) 2003-2008 Fabrice Bellard
I see in this spin you added your (well, Red Hat's) copyright to
stream.c, but not to this one.
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#include "qemu/osdep.h"
> +
> +#include "net/net.h"
> +#include "clients.h"
> +#include "monitor/monitor.h"
> +#include "qapi/error.h"
> +#include "qemu/error-report.h"
> +#include "qemu/option.h"
> +#include "qemu/sockets.h"
> +#include "qemu/iov.h"
> +#include "qemu/main-loop.h"
> +#include "qemu/cutils.h"
> +
> +typedef struct NetDgramState {
> + NetClientState nc;
> + int fd;
> + SocketReadState rs;
> + struct sockaddr_in dgram_dst; /* contains destination iff connectionless */
> + bool read_poll; /* waiting to receive data? */
> + bool write_poll; /* waiting to transmit data? */
> +} NetDgramState;
> +
> +static void net_dgram_send_dgram(void *opaque);
> +static void net_dgram_writable(void *opaque);
> +
> +static void net_dgram_update_fd_handler(NetDgramState *s)
> +{
> + qemu_set_fd_handler(s->fd,
> + s->read_poll ? net_dgram_send_dgram : NULL,
> + s->write_poll ? net_dgram_writable : NULL,
> + s);
> +}
> +
> +static void net_dgram_read_poll(NetDgramState *s, bool enable)
> +{
> + s->read_poll = enable;
> + net_dgram_update_fd_handler(s);
> +}
> +
> +static void net_dgram_write_poll(NetDgramState *s, bool enable)
> +{
> + s->write_poll = enable;
> + net_dgram_update_fd_handler(s);
> +}
> +
> +static void net_dgram_writable(void *opaque)
> +{
> + NetDgramState *s = opaque;
> +
> + net_dgram_write_poll(s, false);
> +
> + qemu_flush_queued_packets(&s->nc);
> +}
> +
> +static ssize_t net_dgram_receive_dgram(NetClientState *nc,
> + const uint8_t *buf, size_t size)
Nit: "dgram_receive_dgram" is kind of redundant in the revised version.
> +{
> + NetDgramState *s = DO_UPCAST(NetDgramState, nc, nc);
> + ssize_t ret;
> +
> + do {
> + if (s->dgram_dst.sin_family != AF_UNIX) {
> + ret = sendto(s->fd, buf, size, 0,
> + (struct sockaddr *)&s->dgram_dst,
> + sizeof(s->dgram_dst));
> + } else {
> + ret = send(s->fd, buf, size, 0);
> + }
> + } while (ret == -1 && errno == EINTR);
> +
> + if (ret == -1 && errno == EAGAIN) {
> + net_dgram_write_poll(s, true);
> + return 0;
> + }
> + return ret;
> +}
> +
> +static void net_dgram_send_completed(NetClientState *nc, ssize_t len)
> +{
> + NetDgramState *s = DO_UPCAST(NetDgramState, nc, nc);
> +
> + if (!s->read_poll) {
> + net_dgram_read_poll(s, true);
> + }
> +}
> +
> +static void net_dgram_rs_finalize(SocketReadState *rs)
> +{
> + NetDgramState *s = container_of(rs, NetDgramState, rs);
> +
> + if (qemu_send_packet_async(&s->nc, rs->buf,
> + rs->packet_len,
> + net_dgram_send_completed) == 0) {
> + net_dgram_read_poll(s, false);
> + }
> +}
> +
> +static void net_dgram_send_dgram(void *opaque)
Nit: again "dgram_send_dgram" is a bit redundant.
> +{
> + NetDgramState *s = opaque;
> + int size;
> +
> + size = recv(s->fd, s->rs.buf, sizeof(s->rs.buf), 0);
> + if (size < 0) {
> + return;
> + }
> + if (size == 0) {
> + /* end of connection */
> + net_dgram_read_poll(s, false);
> + net_dgram_write_poll(s, false);
> + return;
> + }
> + if (qemu_send_packet_async(&s->nc, s->rs.buf, size,
> + net_dgram_send_completed) == 0) {
> + net_dgram_read_poll(s, false);
> + }
> +}
> +
> +static int net_dgram_mcast_create(struct sockaddr_in *mcastaddr,
> + struct in_addr *localaddr,
> + Error **errp)
> +{
> + struct ip_mreq imr;
> + int fd;
> + int val, ret;
> +#ifdef __OpenBSD__
> + unsigned char loop;
> +#else
> + int loop;
> +#endif
> +
> + if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
> + error_setg(errp, "specified mcastaddr %s (0x%08x) "
> + "does not contain a multicast address",
> + inet_ntoa(mcastaddr->sin_addr),
> + (int)ntohl(mcastaddr->sin_addr.s_addr));
> + return -1;
> + }
> +
> + fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
> + if (fd < 0) {
> + error_setg_errno(errp, errno, "can't create datagram socket");
> + return -1;
> + }
> +
> + /*
> + * Allow multiple sockets to bind the same multicast ip and port by setting
> + * SO_REUSEADDR. This is the only situation where SO_REUSEADDR should be set
> + * on windows. Use socket_set_fast_reuse otherwise as it sets SO_REUSEADDR
> + * only on posix systems.
> + */
> + val = 1;
> + ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
> + if (ret < 0) {
> + error_setg_errno(errp, errno, "can't set socket option SO_REUSEADDR");
> + goto fail;
> + }
> +
> + ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
> + if (ret < 0) {
> + error_setg_errno(errp, errno, "can't bind ip=%s to socket",
> + inet_ntoa(mcastaddr->sin_addr));
> + goto fail;
> + }
> +
> + /* Add host to multicast group */
> + imr.imr_multiaddr = mcastaddr->sin_addr;
> + if (localaddr) {
> + imr.imr_interface = *localaddr;
> + } else {
> + imr.imr_interface.s_addr = htonl(INADDR_ANY);
> + }
> +
> + ret = setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
> + &imr, sizeof(struct ip_mreq));
> + if (ret < 0) {
> + error_setg_errno(errp, errno,
> + "can't add socket to multicast group %s",
> + inet_ntoa(imr.imr_multiaddr));
> + goto fail;
> + }
> +
> + /* Force mcast msgs to loopback (eg. several QEMUs in same host */
> + loop = 1;
> + ret = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
> + &loop, sizeof(loop));
> + if (ret < 0) {
> + error_setg_errno(errp, errno,
> + "can't force multicast message to loopback");
> + goto fail;
> + }
> +
> + /* If a bind address is given, only send packets from that address */
> + if (localaddr != NULL) {
> + ret = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
> + localaddr, sizeof(*localaddr));
> + if (ret < 0) {
> + error_setg_errno(errp, errno,
> + "can't set the default network send interface");
> + goto fail;
> + }
> + }
> +
> + qemu_socket_set_nonblock(fd);
> + return fd;
> +fail:
> + if (fd >= 0) {
> + closesocket(fd);
> + }
> + return -1;
> +}
> +
> +static void net_dgram_cleanup(NetClientState *nc)
> +{
> + NetDgramState *s = DO_UPCAST(NetDgramState, nc, nc);
> + if (s->fd != -1) {
> + net_dgram_read_poll(s, false);
> + net_dgram_write_poll(s, false);
> + close(s->fd);
> + s->fd = -1;
> + }
> +}
> +
> +static NetClientInfo net_dgram_socket_info = {
> + .type = NET_CLIENT_DRIVER_DGRAM,
> + .size = sizeof(NetDgramState),
> + .receive = net_dgram_receive_dgram,
> + .cleanup = net_dgram_cleanup,
> +};
> +
> +static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
> + const char *model,
> + const char *name,
> + int fd, int is_fd,
> + SocketAddress *mcast,
> + Error **errp)
Nit: the second "dgram" in the name seems a bit redundant.
> +{
> + struct sockaddr_in saddr;
> + int newfd;
> + NetClientState *nc;
> + NetDgramState *s;
> + SocketAddress *sa;
> + SocketAddressType sa_type;
> +
> + sa = socket_local_address(fd, errp);
> + if (!sa) {
> + return NULL;
> + }
> + sa_type = sa->type;
> + qapi_free_SocketAddress(sa);
> +
> + /*
> + * fd passed: multicast: "learn" dgram_dst address from bound address and
> + * save it. Because this may be "shared" socket from a "master" process,
> + * datagrams would be recv() by ONLY ONE process: we must "clone" this
> + * dgram socket --jjo
> + */
> +
> + if (is_fd && mcast != NULL) {
> + if (convert_host_port(&saddr, mcast->u.inet.host,
> + mcast->u.inet.port, errp) < 0) {
> + goto err;
> + }
> + /* must be bound */
> + if (saddr.sin_addr.s_addr == 0) {
> + error_setg(errp, "can't setup multicast destination address");
> + goto err;
> + }
> + /* clone dgram socket */
> + newfd = net_dgram_mcast_create(&saddr, NULL, errp);
> + if (newfd < 0) {
> + goto err;
> + }
> + /* clone newfd to fd, close newfd */
> + dup2(newfd, fd);
> + close(newfd);
> +
> + }
> +
> + nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name);
> +
> + s = DO_UPCAST(NetDgramState, nc, nc);
> +
> + s->fd = fd;
> + net_socket_rs_init(&s->rs, net_dgram_rs_finalize, false);
> + net_dgram_read_poll(s, true);
> +
> + /* mcast: save bound address as dst */
> + if (is_fd && mcast != NULL) {
> + s->dgram_dst = saddr;
> + snprintf(nc->info_str, sizeof(nc->info_str),
> + "fd=%d (cloned mcast=%s:%d)",
> + fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> + } else {
> + if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
> + s->dgram_dst.sin_family = AF_UNIX;
> + }
> +
> + snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d %s", fd,
> + SocketAddressType_str(sa_type));
> + }
> +
> + return s;
> +
> +err:
> + closesocket(fd);
> + return NULL;
> +}
> +
> +static int net_dgram_mcast_init(NetClientState *peer,
> + const char *model,
> + const char *name,
> + SocketAddress *remote,
> + SocketAddress *local,
> + Error **errp)
> +{
> + NetDgramState *s;
> + int fd, ret;
> + struct sockaddr_in saddr;
> +
> + if (remote->type != SOCKET_ADDRESS_TYPE_INET) {
> + error_setg(errp, "multicast only support inet type");
> + return -1;
> + }
> +
> + if (convert_host_port(&saddr, remote->u.inet.host, remote->u.inet.port,
> + errp) < 0) {
> + return -1;
> + }
> +
> + if (!local) {
> + fd = net_dgram_mcast_create(&saddr, NULL, errp);
> + if (fd < 0) {
> + return -1;
> + }
> + } else {
> + switch (local->type) {
> + case SOCKET_ADDRESS_TYPE_INET: {
> + struct in_addr localaddr;
> +
> + if (inet_aton(local->u.inet.host, &localaddr) == 0) {
> + error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
> + local->u.inet.host);
> + return -1;
> + }
> +
> + fd = net_dgram_mcast_create(&saddr, &localaddr, errp);
> + if (fd < 0) {
> + return -1;
> + }
> + break;
> + }
> + case SOCKET_ADDRESS_TYPE_FD:
> + fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
> + if (fd == -1) {
> + return -1;
> + }
> + ret = qemu_socket_try_set_nonblock(fd);
> + if (ret < 0) {
> + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
> + name, fd);
> + return -1;
> + }
> + break;
> + default:
> + error_setg(errp, "only support inet or fd type for local");
> + return -1;
> + }
> + }
> +
> + s = net_dgram_fd_init_dgram(peer, model, name, fd,
> + local->type == SOCKET_ADDRESS_TYPE_FD,
> + remote, errp);
> + if (!s) {
> + return -1;
> + }
> +
> + s->dgram_dst = saddr;
> +
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str), "mcast=%s:%d",
> + inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> + return 0;
> +
> +}
> +
> +static int net_dgram_init(NetClientState *peer,
> + const char *model,
> + const char *name,
> + SocketAddress *remote,
> + SocketAddress *local,
> + Error **errp)
> +{
> + NetDgramState *s;
> + int fd, ret;
> + struct sockaddr_in raddr_in;
> + gchar *info_str;
> +
> + /* detect multicast address */
> + if (remote && remote->type == SOCKET_ADDRESS_TYPE_INET) {
> + struct sockaddr_in mcastaddr;
> +
> + if (convert_host_port(&mcastaddr, remote->u.inet.host,
> + remote->u.inet.port, errp) < 0) {
> + return -1;
> + }
> +
> + if (IN_MULTICAST(ntohl(mcastaddr.sin_addr.s_addr))) {
> + return net_dgram_mcast_init(peer, model, name, remote, local,
> + errp);
> + }
> + }
> +
> + /* unicast address */
> + if (!local) {
> + error_setg(errp, "dgram requires local= parameter");
> + return -1;
> + }
> +
> + if (remote) {
> + if (local->type == SOCKET_ADDRESS_TYPE_FD) {
> + error_setg(errp, "don't set remote with local.fd");
> + return -1;
> + }
> + if (remote->type != local->type) {
> + error_setg(errp, "remote and local types must be the same");
> + return -1;
> + }
> + } else {
> + if (local->type != SOCKET_ADDRESS_TYPE_FD) {
> + error_setg(errp, "type=inet requires remote parameter");
> + return -1;
> + }
> + }
> +
> + switch (local->type) {
> + case SOCKET_ADDRESS_TYPE_INET: {
> + struct sockaddr_in laddr_in;
> +
> + if (convert_host_port(&laddr_in, local->u.inet.host, local->u.inet.port,
> + errp) < 0) {
> + return -1;
> + }
> +
> + if (convert_host_port(&raddr_in, remote->u.inet.host,
> + remote->u.inet.port, errp) < 0) {
> + return -1;
> + }
> +
> + fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
> + if (fd < 0) {
> + error_setg_errno(errp, errno, "can't create datagram socket");
> + return -1;
> + }
> +
> + ret = socket_set_fast_reuse(fd);
> + if (ret < 0) {
> + error_setg_errno(errp, errno,
> + "can't set socket option SO_REUSEADDR");
> + closesocket(fd);
> + return -1;
> + }
> + ret = bind(fd, (struct sockaddr *)&laddr_in, sizeof(laddr_in));
> + if (ret < 0) {
> + error_setg_errno(errp, errno, "can't bind ip=%s to socket",
> + inet_ntoa(laddr_in.sin_addr));
> + closesocket(fd);
> + return -1;
> + }
> + qemu_socket_set_nonblock(fd);
> +
> + info_str = g_strdup_printf("udp=%s:%d/%s:%d",
> + inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
> + inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
> +
> + break;
> + }
> + case SOCKET_ADDRESS_TYPE_FD:
> + fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
> + if (fd == -1) {
> + return -1;
> + }
> + ret = qemu_socket_try_set_nonblock(fd);
> + if (ret < 0) {
> + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
> + name, fd);
> + return -1;
> + }
> + break;
> + default:
> + error_setg(errp, "only support inet or fd type for local");
> + return -1;
> + }
> +
> + s = net_dgram_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
> + if (!s) {
> + return -1;
> + }
> +
> + if (remote) {
> + s->dgram_dst = raddr_in;
> +
> + pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
> + g_free(info_str);
> + }
> + return 0;
> +}
> +
> +int net_init_dgram(const Netdev *netdev, const char *name,
> + NetClientState *peer, Error **errp)
The distinction between "net_dgram_init" and "net_init_dgram" is not
obvious. This wrapper is now so small, can you just fold them
together?
> +{
> + const NetdevDgramOptions *sock;
> +
> + assert(netdev->type == NET_CLIENT_DRIVER_DGRAM);
> + sock = &netdev->u.dgram;
> +
> + return net_dgram_init(peer, "dgram", name, sock->remote, sock->local,
> + errp);
> +}
> diff --git a/net/hub.c b/net/hub.c
> index 1375738bf121..67ca53485638 100644
> --- a/net/hub.c
> +++ b/net/hub.c
> @@ -313,6 +313,8 @@ void net_hub_check_clients(void)
> case NET_CLIENT_DRIVER_USER:
> case NET_CLIENT_DRIVER_TAP:
> case NET_CLIENT_DRIVER_SOCKET:
> + case NET_CLIENT_DRIVER_STREAM:
> + case NET_CLIENT_DRIVER_DGRAM:
> case NET_CLIENT_DRIVER_VDE:
> case NET_CLIENT_DRIVER_VHOST_USER:
> has_host_dev = 1;
> diff --git a/net/meson.build b/net/meson.build
> index d1be76daf361..6cd1e3dab3a6 100644
> --- a/net/meson.build
> +++ b/net/meson.build
> @@ -13,6 +13,8 @@ softmmu_ss.add(files(
> 'net.c',
> 'queue.c',
> 'socket.c',
> + 'stream.c',
> + 'dgram.c',
> 'util.c',
> ))
>
> diff --git a/net/net.c b/net/net.c
> index ffe3e5a2cf1d..79e54e6228e8 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -48,6 +48,7 @@
> #include "qemu/qemu-print.h"
> #include "qemu/main-loop.h"
> #include "qemu/option.h"
> +#include "qemu/keyval.h"
> #include "qapi/error.h"
> #include "qapi/opts-visitor.h"
> #include "sysemu/runstate.h"
> @@ -1014,6 +1015,8 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
> #endif
> [NET_CLIENT_DRIVER_TAP] = net_init_tap,
> [NET_CLIENT_DRIVER_SOCKET] = net_init_socket,
> + [NET_CLIENT_DRIVER_STREAM] = net_init_stream,
> + [NET_CLIENT_DRIVER_DGRAM] = net_init_dgram,
> #ifdef CONFIG_VDE
> [NET_CLIENT_DRIVER_VDE] = net_init_vde,
> #endif
> @@ -1101,6 +1104,8 @@ void show_netdevs(void)
> int idx;
> const char *available_netdevs[] = {
> "socket",
> + "stream",
> + "dgram",
> "hubport",
> "tap",
> #ifdef CONFIG_SLIRP
> @@ -1613,7 +1618,30 @@ void net_init_clients(void)
> */
> bool netdev_is_modern(const char *optarg)
> {
> - return false;
> + QemuOpts *opts;
> + bool is_modern;
> + const char *type;
> + static QemuOptsList dummy_opts = {
> + .name = "netdev",
> + .implied_opt_name = "type",
> + .head = QTAILQ_HEAD_INITIALIZER(dummy_opts.head),
> + .desc = { { } },
> + };
> +
> + if (optarg[0] == '{') {
> + /* This is JSON, which means it's modern syntax */
> + return true;
> + }
> +
> + opts = qemu_opts_create(&dummy_opts, NULL, false, &error_abort);
> + qemu_opts_do_parse(opts, optarg, dummy_opts.implied_opt_name,
> + &error_abort);
> + type = qemu_opt_get(opts, "type");
> + is_modern = !g_strcmp0(type, "stream") || !g_strcmp0(type, "dgram");
> +
> + qemu_opts_reset(&dummy_opts);
> +
> + return is_modern;
> }
>
> /*
> diff --git a/net/stream.c b/net/stream.c
> new file mode 100644
> index 000000000000..e71c120ac379
> --- /dev/null
> +++ b/net/stream.c
> @@ -0,0 +1,423 @@
> +/*
> + * QEMU System Emulator
> + *
> + * Copyright (c) 2003-2008 Fabrice Bellard
> + * Copyright (c) 2022 Red Hat, Inc.
Fwiw, I believe our legal people recommend simply "Copyright Red Hat"
without years, these days.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#include "qemu/osdep.h"
> +
> +#include "net/net.h"
> +#include "clients.h"
> +#include "monitor/monitor.h"
> +#include "qapi/error.h"
> +#include "qemu/error-report.h"
> +#include "qemu/option.h"
> +#include "qemu/sockets.h"
> +#include "qemu/iov.h"
> +#include "qemu/main-loop.h"
> +#include "qemu/cutils.h"
> +
> +typedef struct NetStreamState {
> + NetClientState nc;
> + int listen_fd;
> + int fd;
> + SocketReadState rs;
> + unsigned int send_index; /* number of bytes sent*/
> + bool read_poll; /* waiting to receive data? */
> + bool write_poll; /* waiting to transmit data? */
> +} NetStreamState;
> +
> +static void net_stream_send(void *opaque);
> +static void net_stream_accept(void *opaque);
> +static void net_stream_writable(void *opaque);
> +
> +static void net_stream_update_fd_handler(NetStreamState *s)
> +{
> + qemu_set_fd_handler(s->fd,
> + s->read_poll ? net_stream_send : NULL,
> + s->write_poll ? net_stream_writable : NULL,
> + s);
> +}
> +
> +static void net_stream_read_poll(NetStreamState *s, bool enable)
> +{
> + s->read_poll = enable;
> + net_stream_update_fd_handler(s);
> +}
> +
> +static void net_stream_write_poll(NetStreamState *s, bool enable)
> +{
> + s->write_poll = enable;
> + net_stream_update_fd_handler(s);
> +}
> +
> +static void net_stream_writable(void *opaque)
> +{
> + NetStreamState *s = opaque;
> +
> + net_stream_write_poll(s, false);
> +
> + qemu_flush_queued_packets(&s->nc);
> +}
> +
> +static ssize_t net_stream_receive(NetClientState *nc, const uint8_t *buf,
> + size_t size)
> +{
> + NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
> + uint32_t len = htonl(size);
> + struct iovec iov[] = {
> + {
> + .iov_base = &len,
> + .iov_len = sizeof(len),
> + }, {
> + .iov_base = (void *)buf,
> + .iov_len = size,
> + },
> + };
> + size_t remaining;
> + ssize_t ret;
> +
> + remaining = iov_size(iov, 2) - s->send_index;
> + ret = iov_send(s->fd, iov, 2, s->send_index, remaining);
> +
> + if (ret == -1 && errno == EAGAIN) {
> + ret = 0; /* handled further down */
> + }
> + if (ret == -1) {
> + s->send_index = 0;
> + return -errno;
> + }
> + if (ret < (ssize_t)remaining) {
> + s->send_index += ret;
> + net_stream_write_poll(s, true);
> + return 0;
> + }
> + s->send_index = 0;
> + return size;
> +}
> +
> +static void net_stream_send_completed(NetClientState *nc, ssize_t len)
> +{
> + NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
> +
> + if (!s->read_poll) {
> + net_stream_read_poll(s, true);
> + }
> +}
> +
> +static void net_stream_rs_finalize(SocketReadState *rs)
> +{
> + NetStreamState *s = container_of(rs, NetStreamState, rs);
> +
> + if (qemu_send_packet_async(&s->nc, rs->buf,
> + rs->packet_len,
> + net_stream_send_completed) == 0) {
> + net_stream_read_poll(s, false);
> + }
> +}
> +
> +static void net_stream_send(void *opaque)
> +{
> + NetStreamState *s = opaque;
> + int size;
> + int ret;
> + uint8_t buf1[NET_BUFSIZE];
> + const uint8_t *buf;
> +
> + size = recv(s->fd, buf1, sizeof(buf1), 0);
> + if (size < 0) {
> + if (errno != EWOULDBLOCK) {
> + goto eoc;
> + }
> + } else if (size == 0) {
> + /* end of connection */
> + eoc:
> + net_stream_read_poll(s, false);
> + net_stream_write_poll(s, false);
> + if (s->listen_fd != -1) {
> + qemu_set_fd_handler(s->listen_fd, net_stream_accept, NULL, s);
> + }
> + closesocket(s->fd);
> +
> + s->fd = -1;
> + net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
> + s->nc.link_down = true;
> + memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
> +
> + return;
> + }
> + buf = buf1;
> +
> + ret = net_fill_rstate(&s->rs, buf, size);
> +
> + if (ret == -1) {
> + goto eoc;
> + }
> +}
> +
> +static void net_stream_cleanup(NetClientState *nc)
> +{
> + NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
> + if (s->fd != -1) {
> + net_stream_read_poll(s, false);
> + net_stream_write_poll(s, false);
> + close(s->fd);
> + s->fd = -1;
> + }
> + if (s->listen_fd != -1) {
> + qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
> + closesocket(s->listen_fd);
> + s->listen_fd = -1;
> + }
> +}
> +
> +static void net_stream_connect(void *opaque)
> +{
> + NetStreamState *s = opaque;
> + net_stream_read_poll(s, true);
> +}
> +
> +static NetClientInfo net_stream_info = {
> + .type = NET_CLIENT_DRIVER_STREAM,
> + .size = sizeof(NetStreamState),
> + .receive = net_stream_receive,
> + .cleanup = net_stream_cleanup,
> +};
> +
> +static NetStreamState *net_stream_fd_init_stream(NetClientState *peer,
> + const char *model,
> + const char *name,
> + int fd, int is_connected)
Nit "stream_fd_init_stream" is a bit redundant.
> +{
> + NetClientState *nc;
> + NetStreamState *s;
> +
> + nc = qemu_new_net_client(&net_stream_info, peer, model, name);
> +
> + snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d", fd);
> +
> + s = DO_UPCAST(NetStreamState, nc, nc);
> +
> + s->fd = fd;
> + s->listen_fd = -1;
> + net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
> +
> + /* Disable Nagle algorithm on TCP sockets to reduce latency */
> + socket_set_nodelay(fd);
> +
> + if (is_connected) {
> + net_stream_connect(s);
> + } else {
> + qemu_set_fd_handler(s->fd, NULL, net_stream_connect, s);
> + }
> + return s;
> +}
> +
> +static void net_stream_accept(void *opaque)
> +{
> + NetStreamState *s = opaque;
> + struct sockaddr_in saddr;
> + socklen_t len;
> + int fd;
> +
> + for (;;) {
> + len = sizeof(saddr);
> + fd = qemu_accept(s->listen_fd, (struct sockaddr *)&saddr, &len);
> + if (fd < 0 && errno != EINTR) {
> + return;
> + } else if (fd >= 0) {
> + qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
> + break;
> + }
> + }
> +
> + s->fd = fd;
> + s->nc.link_down = false;
> + net_stream_connect(s);
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "connection from %s:%d",
> + inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> +}
> +
> +static int net_stream_server_init(NetClientState *peer,
> + const char *model,
> + const char *name,
> + SocketAddress *addr,
> + Error **errp)
> +{
> + NetClientState *nc;
> + NetStreamState *s;
> + int fd, ret;
> +
> + switch (addr->type) {
> + case SOCKET_ADDRESS_TYPE_INET: {
> + struct sockaddr_in saddr_in;
> +
> + if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
> + errp) < 0) {
> + return -1;
> + }
> +
> + fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
> + if (fd < 0) {
> + error_setg_errno(errp, errno, "can't create stream socket");
> + return -1;
> + }
> + qemu_socket_set_nonblock(fd);
> +
> + socket_set_fast_reuse(fd);
> +
> + ret = bind(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
> + if (ret < 0) {
> + error_setg_errno(errp, errno, "can't bind ip=%s to socket",
> + inet_ntoa(saddr_in.sin_addr));
> + closesocket(fd);
> + return -1;
> + }
> + break;
> + }
> + case SOCKET_ADDRESS_TYPE_FD:
> + fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
> + if (fd == -1) {
> + return -1;
> + }
> + ret = qemu_socket_try_set_nonblock(fd);
> + if (ret < 0) {
> + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
> + name, fd);
> + return -1;
> + }
> + break;
> + default:
> + error_setg(errp, "only support inet or fd type");
> + return -1;
> + }
> +
> + ret = listen(fd, 0);
Does this make sense for a passed in fd? If someone passes a "server"
fd, are they likely to be passing a socket on which bind() but not
listen() has been called? Or one on which both bind() and listen()
have been called?
> + if (ret < 0) {
> + error_setg_errno(errp, errno, "can't listen on socket");
> + closesocket(fd);
> + return -1;
> + }
> +
> + nc = qemu_new_net_client(&net_stream_info, peer, model, name);
> + s = DO_UPCAST(NetStreamState, nc, nc);
> + s->fd = -1;
> + s->listen_fd = fd;
> + s->nc.link_down = true;
> + net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
> +
> + qemu_set_fd_handler(s->listen_fd, net_stream_accept, NULL, s);
> + return 0;
> +}
> +
> +static int net_stream_client_init(NetClientState *peer,
> + const char *model,
> + const char *name,
> + SocketAddress *addr,
> + Error **errp)
> +{
> + NetStreamState *s;
> + int fd, connected, ret;
> + gchar *info_str;
> +
> + switch (addr->type) {
> + case SOCKET_ADDRESS_TYPE_INET: {
> + struct sockaddr_in saddr_in;
> +
> + if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
> + errp) < 0) {
> + return -1;
> + }
> +
> + fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
> + if (fd < 0) {
> + error_setg_errno(errp, errno, "can't create stream socket");
> + return -1;
> + }
> + qemu_socket_set_nonblock(fd);
> +
> + connected = 0;
> + for (;;) {
> + ret = connect(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
> + if (ret < 0) {
> + if (errno == EINTR || errno == EWOULDBLOCK) {
> + /* continue */
> + } else if (errno == EINPROGRESS ||
> + errno == EALREADY ||
> + errno == EINVAL) {
> + break;
> + } else {
> + error_setg_errno(errp, errno, "can't connect socket");
> + closesocket(fd);
> + return -1;
> + }
> + } else {
> + connected = 1;
> + break;
> + }
> + }
> + info_str = g_strdup_printf("connect to %s:%d",
> + inet_ntoa(saddr_in.sin_addr),
> + ntohs(saddr_in.sin_port));
> + break;
> + }
> + case SOCKET_ADDRESS_TYPE_FD:
> + fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
> + if (fd == -1) {
> + return -1;
> + }
> + ret = qemu_socket_try_set_nonblock(fd);
> + if (ret < 0) {
> + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
> + name, fd);
> + return -1;
> + }
> + connected = 1;
> + info_str = g_strdup_printf("connect to fd %d", fd);
> + break;
> + default:
> + error_setg(errp, "only support inet or fd type");
> + return -1;
> + }
> +
> + s = net_stream_fd_init_stream(peer, model, name, fd, connected);
> +
> + pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
> + g_free(info_str);
> +
> + return 0;
> +}
> +
> +int net_init_stream(const Netdev *netdev, const char *name,
> + NetClientState *peer, Error **errp)
> +{
> + const NetdevStreamOptions *sock;
> +
> + assert(netdev->type == NET_CLIENT_DRIVER_STREAM);
> + sock = &netdev->u.stream;
> +
> + if (!sock->has_server || sock->server) {
> + return net_stream_server_init(peer, "stream", name, sock->addr, errp);
> + }
> + return net_stream_client_init(peer, "stream", name, sock->addr, errp);
> +}
> diff --git a/qapi/net.json b/qapi/net.json
> index dd088c09c509..e02e8001a000 100644
> --- a/qapi/net.json
> +++ b/qapi/net.json
> @@ -7,6 +7,7 @@
> ##
>
> { 'include': 'common.json' }
> +{ 'include': 'sockets.json' }
>
> ##
> # @set_link:
> @@ -573,6 +574,61 @@
> '*isolated': 'bool' },
> 'if': 'CONFIG_VMNET' }
>
> +##
> +# @NetdevStreamOptions:
> +#
> +# Configuration info for stream socket netdev
> +#
> +# @addr: socket address to listen on (server=true)
> +# or connect to (server=false)
> +# @server: create server socket (default: true)
> +#
> +# Only SocketAddress types 'inet' and 'fd' are supported.
> +#
> +# Since: 7.1
> +##
> +{ 'struct': 'NetdevStreamOptions',
> + 'data': {
> + 'addr': 'SocketAddress',
> + '*server': 'bool' } }
> +
> +##
> +# @NetdevDgramOptions:
> +#
> +# Configuration info for datagram socket netdev.
> +#
> +# @remote: remote address
> +# @local: local address
> +#
> +# Only SocketAddress types 'inet' and 'fd' are supported.
> +#
> +# The code checks there is at least one of these options and reports an error
> +# if not. If remote address is present and it's a multicast address, local
> +# address is optional. Otherwise local address is required and remote address
> +# is optional.
> +#
> +# .. table:: Valid parameters combination table
> +# :widths: auto
> +#
> +# ============= ======== =====
> +# remote local okay?
> +# ============= ======== =====
> +# absent absent no
> +# absent not fd no
> +# absent fd yes
> +# multicast absent yes
> +# multicast present yes
> +# not multicast absent no
> +# not multicast present yes
> +# ============= ======== =====
> +#
> +# Since: 7.1
> +##
> +{ 'struct': 'NetdevDgramOptions',
> + 'data': {
> + '*local': 'SocketAddress',
> + '*remote': 'SocketAddress' } }
> +
> ##
> # @NetClientDriver:
> #
> @@ -586,8 +642,9 @@
> # @vmnet-bridged since 7.1
> ##
> { 'enum': 'NetClientDriver',
> - 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde',
> - 'bridge', 'hubport', 'netmap', 'vhost-user', 'vhost-vdpa',
> + 'data': [ 'none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'stream',
> + 'dgram', 'vde', 'bridge', 'hubport', 'netmap', 'vhost-user',
> + 'vhost-vdpa',
> { 'name': 'vmnet-host', 'if': 'CONFIG_VMNET' },
> { 'name': 'vmnet-shared', 'if': 'CONFIG_VMNET' },
> { 'name': 'vmnet-bridged', 'if': 'CONFIG_VMNET' }] }
> @@ -617,6 +674,8 @@
> 'tap': 'NetdevTapOptions',
> 'l2tpv3': 'NetdevL2TPv3Options',
> 'socket': 'NetdevSocketOptions',
> + 'stream': 'NetdevStreamOptions',
> + 'dgram': 'NetdevDgramOptions',
> 'vde': 'NetdevVdeOptions',
> 'bridge': 'NetdevBridgeOptions',
> 'hubport': 'NetdevHubPortOptions',
> diff --git a/qemu-options.hx b/qemu-options.hx
> index d8b5ce5b4354..8c765f345da8 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -2734,6 +2734,18 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
> "-netdev socket,id=str[,fd=h][,udp=host:port][,localaddr=host:port]\n"
> " configure a network backend to connect to another network\n"
> " using an UDP tunnel\n"
> + "-netdev stream,id=str[,server=on|off],addr.type=inet,addr.host=host,addr.port=port\n"
> + "-netdev stream,id=str[,server=on|off],addr.type=fd,addr.str=h\n"
> + " configure a network backend to connect to another network\n"
> + " using a socket connection in stream mode.\n"
> + "-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=inet,local.host=addr]\n"
> + "-netdev dgram,id=str,remote.type=inet,remote.host=maddr,remote.port=port[,local.type=fd,local.str=h]\n"
> + " configure a network backend to connect to a multicast maddr and port\n"
> + " use ``local.host=addr`` to specify the host address to send packets from\n"
> + "-netdev dgram,id=str,local.type=inet,local.host=addr,local.port=port[,remote.type=inet,remote.host=addr,remote.port=port]\n"
> + "-netdev dgram,id=str,local.type=fd,local.str=h\n"
> + " configure a network backend to connect to another network\n"
> + " using an UDP tunnel\n"
> #ifdef CONFIG_VDE
> "-netdev vde,id=str[,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
> " configure a network backend to connect to port 'n' of a vde switch\n"
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v9 05/16] qapi: net: add stream and dgram netdevs
2022-09-28 5:55 ` David Gibson
@ 2022-10-05 10:08 ` Laurent Vivier
2022-10-06 0:37 ` David Gibson
0 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-10-05 10:08 UTC (permalink / raw)
To: David Gibson
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
On 9/28/22 07:55, David Gibson wrote:
>> +static int net_stream_server_init(NetClientState *peer,
>> + const char *model,
>> + const char *name,
>> + SocketAddress *addr,
>> + Error **errp)
>> +{
>> + NetClientState *nc;
>> + NetStreamState *s;
>> + int fd, ret;
>> +
>> + switch (addr->type) {
>> + case SOCKET_ADDRESS_TYPE_INET: {
>> + struct sockaddr_in saddr_in;
>> +
>> + if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
>> + errp) < 0) {
>> + return -1;
>> + }
>> +
>> + fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
>> + if (fd < 0) {
>> + error_setg_errno(errp, errno, "can't create stream socket");
>> + return -1;
>> + }
>> + qemu_socket_set_nonblock(fd);
>> +
>> + socket_set_fast_reuse(fd);
>> +
>> + ret = bind(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
>> + if (ret < 0) {
>> + error_setg_errno(errp, errno, "can't bind ip=%s to socket",
>> + inet_ntoa(saddr_in.sin_addr));
>> + closesocket(fd);
>> + return -1;
>> + }
>> + break;
>> + }
>> + case SOCKET_ADDRESS_TYPE_FD:
>> + fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
>> + if (fd == -1) {
>> + return -1;
>> + }
>> + ret = qemu_socket_try_set_nonblock(fd);
>> + if (ret < 0) {
>> + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
>> + name, fd);
>> + return -1;
>> + }
>> + break;
>> + default:
>> + error_setg(errp, "only support inet or fd type");
>> + return -1;
>> + }
>> +
>> + ret = listen(fd, 0);
> Does this make sense for a passed in fd? If someone passes a "server"
> fd, are they likely to be passing a socket on which bind() but not
> listen() has been called? Or one on which both bind() and listen()
> have been called?
>
Original code in net/socket.c doesn't manage server case with fd.
So I have checked what is done for QIO (all this code is overwritten by patch introducing
QIO anyway):
At the end of the series, we use qio_channel_socket_listen_async() in
net_stream_server_init(), that in the end calls socket_listen().
With SOCKET_ADDRESS_TYPE_FD we does the listen() (without bind()) with the following comment:
case SOCKET_ADDRESS_TYPE_FD:
fd = socket_get_fd(addr->u.fd.str, errp);
if (fd < 0) {
return -1;
}
/*
* If the socket is not yet in the listen state, then transition it to
* the listen state now.
*
* If it's already listening then this updates the backlog value as
* requested.
*
* If this socket cannot listen because it's already in another state
* (e.g. unbound or connected) then we'll catch the error here.
*/
if (listen(fd, num) != 0) {
error_setg_errno(errp, errno, "Failed to listen on fd socket");
closesocket(fd);
return -1;
}
break;
So I think we should keep the listen() in our case too.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v9 05/16] qapi: net: add stream and dgram netdevs
2022-10-05 10:08 ` Laurent Vivier
@ 2022-10-06 0:37 ` David Gibson
0 siblings, 0 replies; 30+ messages in thread
From: David Gibson @ 2022-10-06 0:37 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
[-- Attachment #1: Type: text/plain, Size: 4101 bytes --]
On Wed, Oct 05, 2022 at 12:08:27PM +0200, Laurent Vivier wrote:
> On 9/28/22 07:55, David Gibson wrote:
> > > +static int net_stream_server_init(NetClientState *peer,
> > > + const char *model,
> > > + const char *name,
> > > + SocketAddress *addr,
> > > + Error **errp)
> > > +{
> > > + NetClientState *nc;
> > > + NetStreamState *s;
> > > + int fd, ret;
> > > +
> > > + switch (addr->type) {
> > > + case SOCKET_ADDRESS_TYPE_INET: {
> > > + struct sockaddr_in saddr_in;
> > > +
> > > + if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
> > > + errp) < 0) {
> > > + return -1;
> > > + }
> > > +
> > > + fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
> > > + if (fd < 0) {
> > > + error_setg_errno(errp, errno, "can't create stream socket");
> > > + return -1;
> > > + }
> > > + qemu_socket_set_nonblock(fd);
> > > +
> > > + socket_set_fast_reuse(fd);
> > > +
> > > + ret = bind(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
> > > + if (ret < 0) {
> > > + error_setg_errno(errp, errno, "can't bind ip=%s to socket",
> > > + inet_ntoa(saddr_in.sin_addr));
> > > + closesocket(fd);
> > > + return -1;
> > > + }
> > > + break;
> > > + }
> > > + case SOCKET_ADDRESS_TYPE_FD:
> > > + fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
> > > + if (fd == -1) {
> > > + return -1;
> > > + }
> > > + ret = qemu_socket_try_set_nonblock(fd);
> > > + if (ret < 0) {
> > > + error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
> > > + name, fd);
> > > + return -1;
> > > + }
> > > + break;
> > > + default:
> > > + error_setg(errp, "only support inet or fd type");
> > > + return -1;
> > > + }
> > > +
> > > + ret = listen(fd, 0);
> > Does this make sense for a passed in fd? If someone passes a "server"
> > fd, are they likely to be passing a socket on which bind() but not
> > listen() has been called? Or one on which both bind() and listen()
> > have been called?
> >
>
> Original code in net/socket.c doesn't manage server case with fd.
>
> So I have checked what is done for QIO (all this code is overwritten by
> patch introducing QIO anyway):
>
> At the end of the series, we use qio_channel_socket_listen_async() in
> net_stream_server_init(), that in the end calls socket_listen().
>
> With SOCKET_ADDRESS_TYPE_FD we does the listen() (without bind()) with the following comment:
>
> case SOCKET_ADDRESS_TYPE_FD:
> fd = socket_get_fd(addr->u.fd.str, errp);
> if (fd < 0) {
> return -1;
> }
>
> /*
> * If the socket is not yet in the listen state, then transition it to
> * the listen state now.
> *
> * If it's already listening then this updates the backlog value as
> * requested.
> *
> * If this socket cannot listen because it's already in another state
> * (e.g. unbound or connected) then we'll catch the error here.
> */
> if (listen(fd, num) != 0) {
> error_setg_errno(errp, errno, "Failed to listen on fd socket");
> closesocket(fd);
> return -1;
> }
> break;
>
> So I think we should keep the listen() in our case too.
Ok, that makes sense to me. Or at least, if it's not correct we
should fix it later for all the places at the same time in the qio
code.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 06/16] net: socket: Don't ignore EINVAL on netdev socket connection
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (4 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 05/16] qapi: net: add stream and dgram netdevs Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 07/16] net: stream: " Laurent Vivier
` (9 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
From: Stefano Brivio <sbrivio@redhat.com>
Other errors are treated as failure by net_socket_connect_init(),
but if connect() returns EINVAL, we'll fail silently. Remove the
related exception.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
net/socket.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index bfd8596250c4..ce6f80f4445f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -579,8 +579,7 @@ static int net_socket_connect_init(NetClientState *peer,
if (errno == EINTR || errno == EWOULDBLOCK) {
/* continue */
} else if (errno == EINPROGRESS ||
- errno == EALREADY ||
- errno == EINVAL) {
+ errno == EALREADY) {
break;
} else {
error_setg_errno(errp, errno, "can't connect socket");
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v9 07/16] net: stream: Don't ignore EINVAL on netdev socket connection
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (5 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 06/16] net: socket: Don't ignore EINVAL on netdev socket connection Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 08/16] net: stream: add unix socket Laurent Vivier
` (8 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
From: Stefano Brivio <sbrivio@redhat.com>
Other errors are treated as failure by net_stream_client_init(),
but if connect() returns EINVAL, we'll fail silently. Remove the
related exception.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
[lvivier: applied to net/stream.c]
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
net/stream.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/stream.c b/net/stream.c
index e71c120ac379..3fb899df5d2d 100644
--- a/net/stream.c
+++ b/net/stream.c
@@ -363,8 +363,7 @@ static int net_stream_client_init(NetClientState *peer,
if (errno == EINTR || errno == EWOULDBLOCK) {
/* continue */
} else if (errno == EINPROGRESS ||
- errno == EALREADY ||
- errno == EINVAL) {
+ errno == EALREADY) {
break;
} else {
error_setg_errno(errp, errno, "can't connect socket");
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v9 08/16] net: stream: add unix socket
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (6 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 07/16] net: stream: " Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-28 6:12 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 09/16] net: dgram: make dgram_dst generic Laurent Vivier
` (7 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
---
net/stream.c | 108 +++++++++++++++++++++++++++++++++++++++++++++---
qapi/net.json | 2 +-
qemu-options.hx | 1 +
3 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/net/stream.c b/net/stream.c
index 3fb899df5d2d..02967c284efc 100644
--- a/net/stream.c
+++ b/net/stream.c
@@ -235,7 +235,7 @@ static NetStreamState *net_stream_fd_init_stream(NetClientState *peer,
static void net_stream_accept(void *opaque)
{
NetStreamState *s = opaque;
- struct sockaddr_in saddr;
+ struct sockaddr_storage saddr;
socklen_t len;
int fd;
@@ -253,9 +253,27 @@ static void net_stream_accept(void *opaque)
s->fd = fd;
s->nc.link_down = false;
net_stream_connect(s);
- snprintf(s->nc.info_str, sizeof(s->nc.info_str),
- "connection from %s:%d",
- inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+ switch (saddr.ss_family) {
+ case AF_INET: {
+ struct sockaddr_in *saddr_in = (struct sockaddr_in *)&saddr;
+
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+ "connection from %s:%d",
+ inet_ntoa(saddr_in->sin_addr), ntohs(saddr_in->sin_port));
+ break;
+ }
+ case AF_UNIX: {
+ struct sockaddr_un saddr_un;
+
+ len = sizeof(saddr_un);
+ getsockname(s->listen_fd, (struct sockaddr *)&saddr_un, &len);
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+ "connect from %s", saddr_un.sun_path);
+ break;
+ }
+ default:
+ g_assert_not_reached();
+ }
}
static int net_stream_server_init(NetClientState *peer,
@@ -295,6 +313,43 @@ static int net_stream_server_init(NetClientState *peer,
}
break;
}
+ case SOCKET_ADDRESS_TYPE_UNIX: {
+ struct sockaddr_un saddr_un;
+
+ ret = unlink(addr->u.q_unix.path);
+ if (ret < 0 && errno != ENOENT) {
+ error_setg_errno(errp, errno, "failed to unlink socket %s",
+ addr->u.q_unix.path);
+ return -1;
+ }
+
+ saddr_un.sun_family = PF_UNIX;
+ ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
+ addr->u.q_unix.path);
+ if (ret < 0 || ret >= sizeof(saddr_un.sun_path)) {
+ error_setg(errp, "UNIX socket path '%s' is too long",
+ addr->u.q_unix.path);
+ error_append_hint(errp, "Path must be less than %zu bytes\n",
+ sizeof(saddr_un.sun_path));
+ return -1;
+ }
+
+ fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create stream socket");
+ return -1;
+ }
+ qemu_socket_set_nonblock(fd);
+
+ ret = bind(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un));
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't create socket with path: %s",
+ saddr_un.sun_path);
+ closesocket(fd);
+ return -1;
+ }
+ break;
+ }
case SOCKET_ADDRESS_TYPE_FD:
fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
if (fd == -1) {
@@ -380,6 +435,49 @@ static int net_stream_client_init(NetClientState *peer,
ntohs(saddr_in.sin_port));
break;
}
+ case SOCKET_ADDRESS_TYPE_UNIX: {
+ struct sockaddr_un saddr_un;
+
+ saddr_un.sun_family = PF_UNIX;
+ ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
+ addr->u.q_unix.path);
+ if (ret < 0 || ret >= sizeof(saddr_un.sun_path)) {
+ error_setg(errp, "UNIX socket path '%s' is too long",
+ addr->u.q_unix.path);
+ error_append_hint(errp, "Path must be less than %zu bytes\n",
+ sizeof(saddr_un.sun_path));
+ return -1;
+ }
+
+ fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create stream socket");
+ return -1;
+ }
+ qemu_socket_set_nonblock(fd);
+
+ connected = 0;
+ for (;;) {
+ ret = connect(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un));
+ if (ret < 0) {
+ if (errno == EINTR || errno == EWOULDBLOCK) {
+ /* continue */
+ } else if (errno == EAGAIN ||
+ errno == EALREADY) {
+ break;
+ } else {
+ error_setg_errno(errp, errno, "can't connect socket");
+ closesocket(fd);
+ return -1;
+ }
+ } else {
+ connected = 1;
+ break;
+ }
+ }
+ info_str = g_strdup_printf(" connect to %s", saddr_un.sun_path);
+ break;
+ }
case SOCKET_ADDRESS_TYPE_FD:
fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
if (fd == -1) {
@@ -395,7 +493,7 @@ static int net_stream_client_init(NetClientState *peer,
info_str = g_strdup_printf("connect to fd %d", fd);
break;
default:
- error_setg(errp, "only support inet or fd type");
+ error_setg(errp, "only support inet, unix or fd type");
return -1;
}
diff --git a/qapi/net.json b/qapi/net.json
index e02e8001a000..bb96701a49a7 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -583,7 +583,7 @@
# or connect to (server=false)
# @server: create server socket (default: true)
#
-# Only SocketAddress types 'inet' and 'fd' are supported.
+# Only SocketAddress types 'unix', 'inet' and 'fd' are supported.
#
# Since: 7.1
##
diff --git a/qemu-options.hx b/qemu-options.hx
index 8c765f345da8..7a34022ac651 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2735,6 +2735,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
" configure a network backend to connect to another network\n"
" using an UDP tunnel\n"
"-netdev stream,id=str[,server=on|off],addr.type=inet,addr.host=host,addr.port=port\n"
+ "-netdev stream,id=str[,server=on|off],addr.type=unix,addr.path=path\n"
"-netdev stream,id=str[,server=on|off],addr.type=fd,addr.str=h\n"
" configure a network backend to connect to another network\n"
" using a socket connection in stream mode.\n"
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 08/16] net: stream: add unix socket
2022-09-26 19:50 ` [PATCH v9 08/16] net: stream: add unix socket Laurent Vivier
@ 2022-09-28 6:12 ` David Gibson
2022-10-05 13:38 ` Laurent Vivier
0 siblings, 1 reply; 30+ messages in thread
From: David Gibson @ 2022-09-28 6:12 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
[-- Attachment #1: Type: text/plain, Size: 8073 bytes --]
On Mon, Sep 26, 2022 at 09:50:40PM +0200, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
> ---
> net/stream.c | 108 +++++++++++++++++++++++++++++++++++++++++++++---
> qapi/net.json | 2 +-
> qemu-options.hx | 1 +
> 3 files changed, 105 insertions(+), 6 deletions(-)
>
> diff --git a/net/stream.c b/net/stream.c
> index 3fb899df5d2d..02967c284efc 100644
> --- a/net/stream.c
> +++ b/net/stream.c
> @@ -235,7 +235,7 @@ static NetStreamState *net_stream_fd_init_stream(NetClientState *peer,
> static void net_stream_accept(void *opaque)
> {
> NetStreamState *s = opaque;
> - struct sockaddr_in saddr;
> + struct sockaddr_storage saddr;
> socklen_t len;
> int fd;
>
> @@ -253,9 +253,27 @@ static void net_stream_accept(void *opaque)
> s->fd = fd;
> s->nc.link_down = false;
> net_stream_connect(s);
> - snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> - "connection from %s:%d",
> - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> + switch (saddr.ss_family) {
> + case AF_INET: {
> + struct sockaddr_in *saddr_in = (struct sockaddr_in *)&saddr;
> +
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "connection from %s:%d",
> + inet_ntoa(saddr_in->sin_addr), ntohs(saddr_in->sin_port));
So, here you print the address from which the connection has come -
the remote address.
> + break;
> + }
> + case AF_UNIX: {
> + struct sockaddr_un saddr_un;
> +
> + len = sizeof(saddr_un);
> + getsockname(s->listen_fd, (struct sockaddr *)&saddr_un, &len);
> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> + "connect from %s", saddr_un.sun_path);
Here you print the bound address - the local address. Does that make
sense? I mean, in almost every occasion the remote Unix socket will
be anonymous, so it probably doesn't make sense to display that, but
is the bound address actually a useful substitute?
Maybe it should just be "connect from Unix socket".
> + break;
> + }
> + default:
> + g_assert_not_reached();
> + }
> }
>
> static int net_stream_server_init(NetClientState *peer,
> @@ -295,6 +313,43 @@ static int net_stream_server_init(NetClientState *peer,
> }
> break;
> }
> + case SOCKET_ADDRESS_TYPE_UNIX: {
> + struct sockaddr_un saddr_un;
> +
> + ret = unlink(addr->u.q_unix.path);
> + if (ret < 0 && errno != ENOENT) {
> + error_setg_errno(errp, errno, "failed to unlink socket %s",
> + addr->u.q_unix.path);
> + return -1;
> + }
> +
> + saddr_un.sun_family = PF_UNIX;
> + ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
> + addr->u.q_unix.path);
> + if (ret < 0 || ret >= sizeof(saddr_un.sun_path)) {
> + error_setg(errp, "UNIX socket path '%s' is too long",
> + addr->u.q_unix.path);
> + error_append_hint(errp, "Path must be less than %zu bytes\n",
> + sizeof(saddr_un.sun_path));
> + return -1;
> + }
Not necessarily in scope here, but I do wonder if we want a common
helper to convert the QAPI SocketAddress to a struct sockaddr, which
supports both inet and Unix - and one day IPv6, one hopes - with all
the appropriate error handling.
> +
> + fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
> + if (fd < 0) {
> + error_setg_errno(errp, errno, "can't create stream socket");
> + return -1;
> + }
> + qemu_socket_set_nonblock(fd);
> +
> + ret = bind(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un));
> + if (ret < 0) {
> + error_setg_errno(errp, errno, "can't create socket with path: %s",
> + saddr_un.sun_path);
> + closesocket(fd);
> + return -1;
> + }
> + break;
> + }
> case SOCKET_ADDRESS_TYPE_FD:
> fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
> if (fd == -1) {
> @@ -380,6 +435,49 @@ static int net_stream_client_init(NetClientState *peer,
> ntohs(saddr_in.sin_port));
> break;
> }
> + case SOCKET_ADDRESS_TYPE_UNIX: {
> + struct sockaddr_un saddr_un;
> +
> + saddr_un.sun_family = PF_UNIX;
> + ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
> + addr->u.q_unix.path);
> + if (ret < 0 || ret >= sizeof(saddr_un.sun_path)) {
> + error_setg(errp, "UNIX socket path '%s' is too long",
> + addr->u.q_unix.path);
> + error_append_hint(errp, "Path must be less than %zu bytes\n",
> + sizeof(saddr_un.sun_path));
> + return -1;
> + }
> +
> + fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
> + if (fd < 0) {
> + error_setg_errno(errp, errno, "can't create stream socket");
> + return -1;
> + }
> + qemu_socket_set_nonblock(fd);
> +
> + connected = 0;
> + for (;;) {
> + ret = connect(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un));
> + if (ret < 0) {
> + if (errno == EINTR || errno == EWOULDBLOCK) {
> + /* continue */
> + } else if (errno == EAGAIN ||
> + errno == EALREADY) {
> + break;
> + } else {
> + error_setg_errno(errp, errno, "can't connect socket");
> + closesocket(fd);
> + return -1;
> + }
> + } else {
> + connected = 1;
> + break;
> + }
> + }
> + info_str = g_strdup_printf(" connect to %s", saddr_un.sun_path);
> + break;
> + }
> case SOCKET_ADDRESS_TYPE_FD:
> fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
> if (fd == -1) {
> @@ -395,7 +493,7 @@ static int net_stream_client_init(NetClientState *peer,
> info_str = g_strdup_printf("connect to fd %d", fd);
> break;
> default:
> - error_setg(errp, "only support inet or fd type");
> + error_setg(errp, "only support inet, unix or fd type");
> return -1;
> }
>
> diff --git a/qapi/net.json b/qapi/net.json
> index e02e8001a000..bb96701a49a7 100644
> --- a/qapi/net.json
> +++ b/qapi/net.json
> @@ -583,7 +583,7 @@
> # or connect to (server=false)
> # @server: create server socket (default: true)
> #
> -# Only SocketAddress types 'inet' and 'fd' are supported.
> +# Only SocketAddress types 'unix', 'inet' and 'fd' are supported.
> #
> # Since: 7.1
> ##
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 8c765f345da8..7a34022ac651 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -2735,6 +2735,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
> " configure a network backend to connect to another network\n"
> " using an UDP tunnel\n"
> "-netdev stream,id=str[,server=on|off],addr.type=inet,addr.host=host,addr.port=port\n"
> + "-netdev stream,id=str[,server=on|off],addr.type=unix,addr.path=path\n"
> "-netdev stream,id=str[,server=on|off],addr.type=fd,addr.str=h\n"
> " configure a network backend to connect to another network\n"
> " using a socket connection in stream mode.\n"
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v9 08/16] net: stream: add unix socket
2022-09-28 6:12 ` David Gibson
@ 2022-10-05 13:38 ` Laurent Vivier
2022-10-06 0:39 ` David Gibson
0 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-10-05 13:38 UTC (permalink / raw)
To: David Gibson
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
On 9/28/22 08:12, David Gibson wrote:
>> @@ -253,9 +253,27 @@ static void net_stream_accept(void *opaque)
>> s->fd = fd;
>> s->nc.link_down = false;
>> net_stream_connect(s);
>> - snprintf(s->nc.info_str, sizeof(s->nc.info_str),
>> - "connection from %s:%d",
>> - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
>> + switch (saddr.ss_family) {
>> + case AF_INET: {
>> + struct sockaddr_in *saddr_in = (struct sockaddr_in *)&saddr;
>> +
>> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
>> + "connection from %s:%d",
>> + inet_ntoa(saddr_in->sin_addr), ntohs(saddr_in->sin_port));
> So, here you print the address from which the connection has come -
> the remote address.
>
>> + break;
>> + }
>> + case AF_UNIX: {
>> + struct sockaddr_un saddr_un;
>> +
>> + len = sizeof(saddr_un);
>> + getsockname(s->listen_fd, (struct sockaddr *)&saddr_un, &len);
>> + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
>> + "connect from %s", saddr_un.sun_path);
> Here you print the bound address - the local address. Does that make
> sense? I mean, in almost every occasion the remote Unix socket will
> be anonymous, so it probably doesn't make sense to display that, but
> is the bound address actually a useful substitute?
>
> Maybe it should just be "connect from Unix socket".
>
I agree the needed information is "connected" and type "unix".
But I think more information we can put here can be useful for a debugging purpose.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 30+ messages in thread* Re: [PATCH v9 08/16] net: stream: add unix socket
2022-10-05 13:38 ` Laurent Vivier
@ 2022-10-06 0:39 ` David Gibson
0 siblings, 0 replies; 30+ messages in thread
From: David Gibson @ 2022-10-06 0:39 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
[-- Attachment #1: Type: text/plain, Size: 2122 bytes --]
On Wed, Oct 05, 2022 at 03:38:09PM +0200, Laurent Vivier wrote:
> On 9/28/22 08:12, David Gibson wrote:
> > > @@ -253,9 +253,27 @@ static void net_stream_accept(void *opaque)
> > > s->fd = fd;
> > > s->nc.link_down = false;
> > > net_stream_connect(s);
> > > - snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> > > - "connection from %s:%d",
> > > - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> > > + switch (saddr.ss_family) {
> > > + case AF_INET: {
> > > + struct sockaddr_in *saddr_in = (struct sockaddr_in *)&saddr;
> > > +
> > > + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> > > + "connection from %s:%d",
> > > + inet_ntoa(saddr_in->sin_addr), ntohs(saddr_in->sin_port));
> > So, here you print the address from which the connection has come -
> > the remote address.
> >
> > > + break;
> > > + }
> > > + case AF_UNIX: {
> > > + struct sockaddr_un saddr_un;
> > > +
> > > + len = sizeof(saddr_un);
> > > + getsockname(s->listen_fd, (struct sockaddr *)&saddr_un, &len);
> > > + snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> > > + "connect from %s", saddr_un.sun_path);
> > Here you print the bound address - the local address. Does that make
> > sense? I mean, in almost every occasion the remote Unix socket will
> > be anonymous, so it probably doesn't make sense to display that, but
> > is the bound address actually a useful substitute?
> >
> > Maybe it should just be "connect from Unix socket".
> >
>
> I agree the needed information is "connected" and type "unix".
>
> But I think more information we can put here can be useful for a debugging purpose.
Fair enough. I feel like "connect from" is still possible
misleading. Maybe "connect via"? Or even "connection to Unix socket %s"?
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 09/16] net: dgram: make dgram_dst generic
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (7 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 08/16] net: stream: add unix socket Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-28 6:17 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 10/16] net: dgram: move mcast specific code from net_socket_fd_init_dgram() Laurent Vivier
` (6 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
dgram_dst is a sockaddr_in structure. To be able to use it with
unix socket, use a pointer to a generic sockaddr structure.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
---
net/dgram.c | 73 ++++++++++++++++++++++++++++++++---------------------
1 file changed, 44 insertions(+), 29 deletions(-)
diff --git a/net/dgram.c b/net/dgram.c
index 45d869efc844..57933bfbd1c1 100644
--- a/net/dgram.c
+++ b/net/dgram.c
@@ -39,7 +39,7 @@ typedef struct NetDgramState {
NetClientState nc;
int fd;
SocketReadState rs;
- struct sockaddr_in dgram_dst; /* contains destination iff connectionless */
+ struct sockaddr *dgram_dst; /* contains destination iff connectionless */
bool read_poll; /* waiting to receive data? */
bool write_poll; /* waiting to transmit data? */
} NetDgramState;
@@ -83,10 +83,9 @@ static ssize_t net_dgram_receive_dgram(NetClientState *nc,
ssize_t ret;
do {
- if (s->dgram_dst.sin_family != AF_UNIX) {
- ret = sendto(s->fd, buf, size, 0,
- (struct sockaddr *)&s->dgram_dst,
- sizeof(s->dgram_dst));
+ if (s->dgram_dst) {
+ ret = sendto(s->fd, buf, size, 0, s->dgram_dst,
+ sizeof(struct sockaddr_in));
} else {
ret = send(s->fd, buf, size, 0);
}
@@ -243,6 +242,8 @@ static void net_dgram_cleanup(NetClientState *nc)
close(s->fd);
s->fd = -1;
}
+ g_free(s->dgram_dst);
+ s->dgram_dst = NULL;
}
static NetClientInfo net_dgram_socket_info = {
@@ -259,7 +260,7 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
SocketAddress *mcast,
Error **errp)
{
- struct sockaddr_in saddr;
+ struct sockaddr_in *saddr = NULL;
int newfd;
NetClientState *nc;
NetDgramState *s;
@@ -281,24 +282,25 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
*/
if (is_fd && mcast != NULL) {
- if (convert_host_port(&saddr, mcast->u.inet.host,
- mcast->u.inet.port, errp) < 0) {
+ saddr = g_new(struct sockaddr_in, 1);
+
+ if (convert_host_port(saddr, mcast->u.inet.host, mcast->u.inet.port,
+ errp) < 0) {
goto err;
}
/* must be bound */
- if (saddr.sin_addr.s_addr == 0) {
+ if (saddr->sin_addr.s_addr == 0) {
error_setg(errp, "can't setup multicast destination address");
goto err;
}
/* clone dgram socket */
- newfd = net_dgram_mcast_create(&saddr, NULL, errp);
+ newfd = net_dgram_mcast_create(saddr, NULL, errp);
if (newfd < 0) {
goto err;
}
/* clone newfd to fd, close newfd */
dup2(newfd, fd);
close(newfd);
-
}
nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name);
@@ -310,16 +312,13 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
net_dgram_read_poll(s, true);
/* mcast: save bound address as dst */
- if (is_fd && mcast != NULL) {
- s->dgram_dst = saddr;
+ if (saddr) {
+ g_assert(s->dgram_dst == NULL);
+ s->dgram_dst = (struct sockaddr *)saddr;
snprintf(nc->info_str, sizeof(nc->info_str),
"fd=%d (cloned mcast=%s:%d)",
- fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+ fd, inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
} else {
- if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
- s->dgram_dst.sin_family = AF_UNIX;
- }
-
snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d %s", fd,
SocketAddressType_str(sa_type));
}
@@ -327,6 +326,7 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
return s;
err:
+ g_free(saddr);
closesocket(fd);
return NULL;
}
@@ -340,21 +340,24 @@ static int net_dgram_mcast_init(NetClientState *peer,
{
NetDgramState *s;
int fd, ret;
- struct sockaddr_in saddr;
+ struct sockaddr_in *saddr;
if (remote->type != SOCKET_ADDRESS_TYPE_INET) {
error_setg(errp, "multicast only support inet type");
return -1;
}
- if (convert_host_port(&saddr, remote->u.inet.host, remote->u.inet.port,
+ saddr = g_new(struct sockaddr_in, 1);
+ if (convert_host_port(saddr, remote->u.inet.host, remote->u.inet.port,
errp) < 0) {
+ g_free(saddr);
return -1;
}
if (!local) {
- fd = net_dgram_mcast_create(&saddr, NULL, errp);
+ fd = net_dgram_mcast_create(saddr, NULL, errp);
if (fd < 0) {
+ g_free(saddr);
return -1;
}
} else {
@@ -363,13 +366,15 @@ static int net_dgram_mcast_init(NetClientState *peer,
struct in_addr localaddr;
if (inet_aton(local->u.inet.host, &localaddr) == 0) {
+ g_free(saddr);
error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
local->u.inet.host);
return -1;
}
- fd = net_dgram_mcast_create(&saddr, &localaddr, errp);
+ fd = net_dgram_mcast_create(saddr, &localaddr, errp);
if (fd < 0) {
+ g_free(saddr);
return -1;
}
break;
@@ -377,16 +382,19 @@ static int net_dgram_mcast_init(NetClientState *peer,
case SOCKET_ADDRESS_TYPE_FD:
fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
if (fd == -1) {
+ g_free(saddr);
return -1;
}
ret = qemu_socket_try_set_nonblock(fd);
if (ret < 0) {
+ g_free(saddr);
error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
name, fd);
return -1;
}
break;
default:
+ g_free(saddr);
error_setg(errp, "only support inet or fd type for local");
return -1;
}
@@ -396,13 +404,16 @@ static int net_dgram_mcast_init(NetClientState *peer,
local->type == SOCKET_ADDRESS_TYPE_FD,
remote, errp);
if (!s) {
+ g_free(saddr);
return -1;
}
- s->dgram_dst = saddr;
+ g_assert(s->dgram_dst == NULL);
+ s->dgram_dst = (struct sockaddr *)saddr;
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "mcast=%s:%d",
- inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
+ inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
+
return 0;
}
@@ -416,8 +427,8 @@ static int net_dgram_init(NetClientState *peer,
{
NetDgramState *s;
int fd, ret;
- struct sockaddr_in raddr_in;
gchar *info_str;
+ struct sockaddr *dgram_dst;
/* detect multicast address */
if (remote && remote->type == SOCKET_ADDRESS_TYPE_INET) {
@@ -458,7 +469,7 @@ static int net_dgram_init(NetClientState *peer,
switch (local->type) {
case SOCKET_ADDRESS_TYPE_INET: {
- struct sockaddr_in laddr_in;
+ struct sockaddr_in laddr_in, raddr_in;
if (convert_host_port(&laddr_in, local->u.inet.host, local->u.inet.port,
errp) < 0) {
@@ -492,9 +503,12 @@ static int net_dgram_init(NetClientState *peer,
}
qemu_socket_set_nonblock(fd);
+ dgram_dst = g_malloc(sizeof(raddr_in));
+ memcpy(dgram_dst, &raddr_in, sizeof(raddr_in));
+
info_str = g_strdup_printf("udp=%s:%d/%s:%d",
- inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
- inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
+ inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
+ inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
break;
}
@@ -521,7 +535,8 @@ static int net_dgram_init(NetClientState *peer,
}
if (remote) {
- s->dgram_dst = raddr_in;
+ g_assert(s->dgram_dst == NULL);
+ s->dgram_dst = dgram_dst;
pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
g_free(info_str);
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 09/16] net: dgram: make dgram_dst generic
2022-09-26 19:50 ` [PATCH v9 09/16] net: dgram: make dgram_dst generic Laurent Vivier
@ 2022-09-28 6:17 ` David Gibson
0 siblings, 0 replies; 30+ messages in thread
From: David Gibson @ 2022-09-28 6:17 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
[-- Attachment #1: Type: text/plain, Size: 9758 bytes --]
On Mon, Sep 26, 2022 at 09:50:41PM +0200, Laurent Vivier wrote:
> dgram_dst is a sockaddr_in structure. To be able to use it with
> unix socket, use a pointer to a generic sockaddr structure.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
LGTM as far as it goes, but.. how can one actually use this pointer as
a generic sockaddr without also storing a socklen_t somewhere?
> ---
> net/dgram.c | 73 ++++++++++++++++++++++++++++++++---------------------
> 1 file changed, 44 insertions(+), 29 deletions(-)
>
> diff --git a/net/dgram.c b/net/dgram.c
> index 45d869efc844..57933bfbd1c1 100644
> --- a/net/dgram.c
> +++ b/net/dgram.c
> @@ -39,7 +39,7 @@ typedef struct NetDgramState {
> NetClientState nc;
> int fd;
> SocketReadState rs;
> - struct sockaddr_in dgram_dst; /* contains destination iff connectionless */
> + struct sockaddr *dgram_dst; /* contains destination iff connectionless */
> bool read_poll; /* waiting to receive data? */
> bool write_poll; /* waiting to transmit data? */
> } NetDgramState;
> @@ -83,10 +83,9 @@ static ssize_t net_dgram_receive_dgram(NetClientState *nc,
> ssize_t ret;
>
> do {
> - if (s->dgram_dst.sin_family != AF_UNIX) {
> - ret = sendto(s->fd, buf, size, 0,
> - (struct sockaddr *)&s->dgram_dst,
> - sizeof(s->dgram_dst));
> + if (s->dgram_dst) {
> + ret = sendto(s->fd, buf, size, 0, s->dgram_dst,
> + sizeof(struct sockaddr_in));
> } else {
> ret = send(s->fd, buf, size, 0);
> }
> @@ -243,6 +242,8 @@ static void net_dgram_cleanup(NetClientState *nc)
> close(s->fd);
> s->fd = -1;
> }
> + g_free(s->dgram_dst);
> + s->dgram_dst = NULL;
> }
>
> static NetClientInfo net_dgram_socket_info = {
> @@ -259,7 +260,7 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
> SocketAddress *mcast,
> Error **errp)
> {
> - struct sockaddr_in saddr;
> + struct sockaddr_in *saddr = NULL;
> int newfd;
> NetClientState *nc;
> NetDgramState *s;
> @@ -281,24 +282,25 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
> */
>
> if (is_fd && mcast != NULL) {
> - if (convert_host_port(&saddr, mcast->u.inet.host,
> - mcast->u.inet.port, errp) < 0) {
> + saddr = g_new(struct sockaddr_in, 1);
> +
> + if (convert_host_port(saddr, mcast->u.inet.host, mcast->u.inet.port,
> + errp) < 0) {
> goto err;
> }
> /* must be bound */
> - if (saddr.sin_addr.s_addr == 0) {
> + if (saddr->sin_addr.s_addr == 0) {
> error_setg(errp, "can't setup multicast destination address");
> goto err;
> }
> /* clone dgram socket */
> - newfd = net_dgram_mcast_create(&saddr, NULL, errp);
> + newfd = net_dgram_mcast_create(saddr, NULL, errp);
> if (newfd < 0) {
> goto err;
> }
> /* clone newfd to fd, close newfd */
> dup2(newfd, fd);
> close(newfd);
> -
> }
>
> nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name);
> @@ -310,16 +312,13 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
> net_dgram_read_poll(s, true);
>
> /* mcast: save bound address as dst */
> - if (is_fd && mcast != NULL) {
> - s->dgram_dst = saddr;
> + if (saddr) {
> + g_assert(s->dgram_dst == NULL);
> + s->dgram_dst = (struct sockaddr *)saddr;
> snprintf(nc->info_str, sizeof(nc->info_str),
> "fd=%d (cloned mcast=%s:%d)",
> - fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> + fd, inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
> } else {
> - if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
> - s->dgram_dst.sin_family = AF_UNIX;
> - }
> -
> snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d %s", fd,
> SocketAddressType_str(sa_type));
> }
> @@ -327,6 +326,7 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
> return s;
>
> err:
> + g_free(saddr);
> closesocket(fd);
> return NULL;
> }
> @@ -340,21 +340,24 @@ static int net_dgram_mcast_init(NetClientState *peer,
> {
> NetDgramState *s;
> int fd, ret;
> - struct sockaddr_in saddr;
> + struct sockaddr_in *saddr;
>
> if (remote->type != SOCKET_ADDRESS_TYPE_INET) {
> error_setg(errp, "multicast only support inet type");
> return -1;
> }
>
> - if (convert_host_port(&saddr, remote->u.inet.host, remote->u.inet.port,
> + saddr = g_new(struct sockaddr_in, 1);
> + if (convert_host_port(saddr, remote->u.inet.host, remote->u.inet.port,
> errp) < 0) {
> + g_free(saddr);
> return -1;
> }
>
> if (!local) {
> - fd = net_dgram_mcast_create(&saddr, NULL, errp);
> + fd = net_dgram_mcast_create(saddr, NULL, errp);
> if (fd < 0) {
> + g_free(saddr);
> return -1;
> }
> } else {
> @@ -363,13 +366,15 @@ static int net_dgram_mcast_init(NetClientState *peer,
> struct in_addr localaddr;
>
> if (inet_aton(local->u.inet.host, &localaddr) == 0) {
> + g_free(saddr);
> error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
> local->u.inet.host);
> return -1;
> }
>
> - fd = net_dgram_mcast_create(&saddr, &localaddr, errp);
> + fd = net_dgram_mcast_create(saddr, &localaddr, errp);
> if (fd < 0) {
> + g_free(saddr);
> return -1;
> }
> break;
> @@ -377,16 +382,19 @@ static int net_dgram_mcast_init(NetClientState *peer,
> case SOCKET_ADDRESS_TYPE_FD:
> fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
> if (fd == -1) {
> + g_free(saddr);
> return -1;
> }
> ret = qemu_socket_try_set_nonblock(fd);
> if (ret < 0) {
> + g_free(saddr);
> error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
> name, fd);
> return -1;
> }
> break;
> default:
> + g_free(saddr);
> error_setg(errp, "only support inet or fd type for local");
> return -1;
> }
> @@ -396,13 +404,16 @@ static int net_dgram_mcast_init(NetClientState *peer,
> local->type == SOCKET_ADDRESS_TYPE_FD,
> remote, errp);
> if (!s) {
> + g_free(saddr);
> return -1;
> }
>
> - s->dgram_dst = saddr;
> + g_assert(s->dgram_dst == NULL);
> + s->dgram_dst = (struct sockaddr *)saddr;
>
> snprintf(s->nc.info_str, sizeof(s->nc.info_str), "mcast=%s:%d",
> - inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> + inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
> +
> return 0;
>
> }
> @@ -416,8 +427,8 @@ static int net_dgram_init(NetClientState *peer,
> {
> NetDgramState *s;
> int fd, ret;
> - struct sockaddr_in raddr_in;
> gchar *info_str;
> + struct sockaddr *dgram_dst;
>
> /* detect multicast address */
> if (remote && remote->type == SOCKET_ADDRESS_TYPE_INET) {
> @@ -458,7 +469,7 @@ static int net_dgram_init(NetClientState *peer,
>
> switch (local->type) {
> case SOCKET_ADDRESS_TYPE_INET: {
> - struct sockaddr_in laddr_in;
> + struct sockaddr_in laddr_in, raddr_in;
>
> if (convert_host_port(&laddr_in, local->u.inet.host, local->u.inet.port,
> errp) < 0) {
> @@ -492,9 +503,12 @@ static int net_dgram_init(NetClientState *peer,
> }
> qemu_socket_set_nonblock(fd);
>
> + dgram_dst = g_malloc(sizeof(raddr_in));
> + memcpy(dgram_dst, &raddr_in, sizeof(raddr_in));
> +
> info_str = g_strdup_printf("udp=%s:%d/%s:%d",
> - inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
> - inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
> + inet_ntoa(laddr_in.sin_addr), ntohs(laddr_in.sin_port),
> + inet_ntoa(raddr_in.sin_addr), ntohs(raddr_in.sin_port));
>
> break;
> }
> @@ -521,7 +535,8 @@ static int net_dgram_init(NetClientState *peer,
> }
>
> if (remote) {
> - s->dgram_dst = raddr_in;
> + g_assert(s->dgram_dst == NULL);
> + s->dgram_dst = dgram_dst;
>
> pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
> g_free(info_str);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 10/16] net: dgram: move mcast specific code from net_socket_fd_init_dgram()
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (8 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 09/16] net: dgram: make dgram_dst generic Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 11/16] net: dgram: add unix socket Laurent Vivier
` (5 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
It is less complex to manage special cases directly in
net_dgram_mcast_init() and net_dgram_udp_init().
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
---
net/dgram.c | 143 +++++++++++++++++++++++++++-------------------------
1 file changed, 73 insertions(+), 70 deletions(-)
diff --git a/net/dgram.c b/net/dgram.c
index 57933bfbd1c1..9fb01410304e 100644
--- a/net/dgram.c
+++ b/net/dgram.c
@@ -256,52 +256,11 @@ static NetClientInfo net_dgram_socket_info = {
static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
const char *model,
const char *name,
- int fd, int is_fd,
- SocketAddress *mcast,
+ int fd,
Error **errp)
{
- struct sockaddr_in *saddr = NULL;
- int newfd;
NetClientState *nc;
NetDgramState *s;
- SocketAddress *sa;
- SocketAddressType sa_type;
-
- sa = socket_local_address(fd, errp);
- if (!sa) {
- return NULL;
- }
- sa_type = sa->type;
- qapi_free_SocketAddress(sa);
-
- /*
- * fd passed: multicast: "learn" dgram_dst address from bound address and
- * save it. Because this may be "shared" socket from a "master" process,
- * datagrams would be recv() by ONLY ONE process: we must "clone" this
- * dgram socket --jjo
- */
-
- if (is_fd && mcast != NULL) {
- saddr = g_new(struct sockaddr_in, 1);
-
- if (convert_host_port(saddr, mcast->u.inet.host, mcast->u.inet.port,
- errp) < 0) {
- goto err;
- }
- /* must be bound */
- if (saddr->sin_addr.s_addr == 0) {
- error_setg(errp, "can't setup multicast destination address");
- goto err;
- }
- /* clone dgram socket */
- newfd = net_dgram_mcast_create(saddr, NULL, errp);
- if (newfd < 0) {
- goto err;
- }
- /* clone newfd to fd, close newfd */
- dup2(newfd, fd);
- close(newfd);
- }
nc = qemu_new_net_client(&net_dgram_socket_info, peer, model, name);
@@ -311,24 +270,7 @@ static NetDgramState *net_dgram_fd_init_dgram(NetClientState *peer,
net_socket_rs_init(&s->rs, net_dgram_rs_finalize, false);
net_dgram_read_poll(s, true);
- /* mcast: save bound address as dst */
- if (saddr) {
- g_assert(s->dgram_dst == NULL);
- s->dgram_dst = (struct sockaddr *)saddr;
- snprintf(nc->info_str, sizeof(nc->info_str),
- "fd=%d (cloned mcast=%s:%d)",
- fd, inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
- } else {
- snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d %s", fd,
- SocketAddressType_str(sa_type));
- }
-
return s;
-
-err:
- g_free(saddr);
- closesocket(fd);
- return NULL;
}
static int net_dgram_mcast_init(NetClientState *peer,
@@ -341,6 +283,7 @@ static int net_dgram_mcast_init(NetClientState *peer,
NetDgramState *s;
int fd, ret;
struct sockaddr_in *saddr;
+ gchar *info_str;
if (remote->type != SOCKET_ADDRESS_TYPE_INET) {
error_setg(errp, "multicast only support inet type");
@@ -360,6 +303,9 @@ static int net_dgram_mcast_init(NetClientState *peer,
g_free(saddr);
return -1;
}
+ info_str = g_strdup_printf("mcast=%s:%d",
+ inet_ntoa(saddr->sin_addr),
+ ntohs(saddr->sin_port));
} else {
switch (local->type) {
case SOCKET_ADDRESS_TYPE_INET: {
@@ -377,9 +323,14 @@ static int net_dgram_mcast_init(NetClientState *peer,
g_free(saddr);
return -1;
}
+ info_str = g_strdup_printf("mcast=%s:%d",
+ inet_ntoa(saddr->sin_addr),
+ ntohs(saddr->sin_port));
break;
}
- case SOCKET_ADDRESS_TYPE_FD:
+ case SOCKET_ADDRESS_TYPE_FD: {
+ int newfd;
+
fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
if (fd == -1) {
g_free(saddr);
@@ -392,7 +343,46 @@ static int net_dgram_mcast_init(NetClientState *peer,
name, fd);
return -1;
}
+
+ /*
+ * fd passed: multicast: "learn" dgram_dst address from bound
+ * address and save it. Because this may be "shared" socket from a
+ * "master" process, datagrams would be recv() by ONLY ONE process:
+ * we must "clone" this dgram socket --jjo
+ */
+
+ saddr = g_new(struct sockaddr_in, 1);
+
+ if (convert_host_port(saddr, local->u.inet.host, local->u.inet.port,
+ errp) < 0) {
+ g_free(saddr);
+ closesocket(fd);
+ return -1;
+ }
+
+ /* must be bound */
+ if (saddr->sin_addr.s_addr == 0) {
+ error_setg(errp, "can't setup multicast destination address");
+ g_free(saddr);
+ closesocket(fd);
+ return -1;
+ }
+ /* clone dgram socket */
+ newfd = net_dgram_mcast_create(saddr, NULL, errp);
+ if (newfd < 0) {
+ g_free(saddr);
+ closesocket(fd);
+ return -1;
+ }
+ /* clone newfd to fd, close newfd */
+ dup2(newfd, fd);
+ close(newfd);
+
+ info_str = g_strdup_printf("fd=%d (cloned mcast=%s:%d)",
+ fd, inet_ntoa(saddr->sin_addr),
+ ntohs(saddr->sin_port));
break;
+ }
default:
g_free(saddr);
error_setg(errp, "only support inet or fd type for local");
@@ -400,9 +390,7 @@ static int net_dgram_mcast_init(NetClientState *peer,
}
}
- s = net_dgram_fd_init_dgram(peer, model, name, fd,
- local->type == SOCKET_ADDRESS_TYPE_FD,
- remote, errp);
+ s = net_dgram_fd_init_dgram(peer, model, name, fd, errp);
if (!s) {
g_free(saddr);
return -1;
@@ -411,8 +399,8 @@ static int net_dgram_mcast_init(NetClientState *peer,
g_assert(s->dgram_dst == NULL);
s->dgram_dst = (struct sockaddr *)saddr;
- snprintf(s->nc.info_str, sizeof(s->nc.info_str), "mcast=%s:%d",
- inet_ntoa(saddr->sin_addr), ntohs(saddr->sin_port));
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
+ g_free(info_str);
return 0;
@@ -512,7 +500,10 @@ static int net_dgram_init(NetClientState *peer,
break;
}
- case SOCKET_ADDRESS_TYPE_FD:
+ case SOCKET_ADDRESS_TYPE_FD: {
+ SocketAddress *sa;
+ SocketAddressType sa_type;
+
fd = monitor_fd_param(monitor_cur(), local->u.fd.str, errp);
if (fd == -1) {
return -1;
@@ -523,23 +514,35 @@ static int net_dgram_init(NetClientState *peer,
name, fd);
return -1;
}
+
+ sa = socket_local_address(fd, errp);
+ if (sa) {
+ sa_type = sa->type;
+ qapi_free_SocketAddress(sa);
+
+ info_str = g_strdup_printf("fd=%d %s", fd,
+ SocketAddressType_str(sa_type));
+ } else {
+ info_str = g_strdup_printf("fd=%d", fd);
+ }
break;
+ }
default:
error_setg(errp, "only support inet or fd type for local");
return -1;
}
- s = net_dgram_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
+ s = net_dgram_fd_init_dgram(peer, model, name, fd, errp);
if (!s) {
return -1;
}
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
+ g_free(info_str);
+
if (remote) {
g_assert(s->dgram_dst == NULL);
s->dgram_dst = dgram_dst;
-
- pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
- g_free(info_str);
}
return 0;
}
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v9 11/16] net: dgram: add unix socket
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (9 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 10/16] net: dgram: move mcast specific code from net_socket_fd_init_dgram() Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-28 6:22 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 12/16] qemu-sockets: move and rename SocketAddress_to_str() Laurent Vivier
` (4 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
---
net/dgram.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++---
qapi/net.json | 2 +-
qemu-options.hx | 1 +
3 files changed, 64 insertions(+), 4 deletions(-)
diff --git a/net/dgram.c b/net/dgram.c
index 9fb01410304e..db631f6e2270 100644
--- a/net/dgram.c
+++ b/net/dgram.c
@@ -84,8 +84,15 @@ static ssize_t net_dgram_receive_dgram(NetClientState *nc,
do {
if (s->dgram_dst) {
- ret = sendto(s->fd, buf, size, 0, s->dgram_dst,
- sizeof(struct sockaddr_in));
+ socklen_t len;
+
+ if (s->dgram_dst->sa_family == AF_INET) {
+ len = sizeof(struct sockaddr_in);
+ } else {
+ len = sizeof(struct sockaddr_un);
+ }
+
+ ret = sendto(s->fd, buf, size, 0, s->dgram_dst, len);
} else {
ret = send(s->fd, buf, size, 0);
}
@@ -450,7 +457,7 @@ static int net_dgram_init(NetClientState *peer,
}
} else {
if (local->type != SOCKET_ADDRESS_TYPE_FD) {
- error_setg(errp, "type=inet requires remote parameter");
+ error_setg(errp, "type=inet or unix require remote parameter");
return -1;
}
}
@@ -500,6 +507,58 @@ static int net_dgram_init(NetClientState *peer,
break;
}
+ case SOCKET_ADDRESS_TYPE_UNIX: {
+ struct sockaddr_un laddr_un, raddr_un;
+
+ ret = unlink(local->u.q_unix.path);
+ if (ret < 0 && errno != ENOENT) {
+ error_setg_errno(errp, errno, "failed to unlink socket %s",
+ local->u.q_unix.path);
+ return -1;
+ }
+
+ laddr_un.sun_family = PF_UNIX;
+ ret = snprintf(laddr_un.sun_path, sizeof(laddr_un.sun_path), "%s",
+ local->u.q_unix.path);
+ if (ret < 0 || ret >= sizeof(laddr_un.sun_path)) {
+ error_setg(errp, "UNIX socket path '%s' is too long",
+ local->u.q_unix.path);
+ error_append_hint(errp, "Path must be less than %zu bytes\n",
+ sizeof(laddr_un.sun_path));
+ }
+
+ raddr_un.sun_family = PF_UNIX;
+ ret = snprintf(raddr_un.sun_path, sizeof(raddr_un.sun_path), "%s",
+ remote->u.q_unix.path);
+ if (ret < 0 || ret >= sizeof(raddr_un.sun_path)) {
+ error_setg(errp, "UNIX socket path '%s' is too long",
+ remote->u.q_unix.path);
+ error_append_hint(errp, "Path must be less than %zu bytes\n",
+ sizeof(raddr_un.sun_path));
+ }
+
+ fd = qemu_socket(PF_UNIX, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "can't create datagram socket");
+ return -1;
+ }
+
+ ret = bind(fd, (struct sockaddr *)&laddr_un, sizeof(laddr_un));
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "can't bind unix=%s to socket",
+ laddr_un.sun_path);
+ closesocket(fd);
+ return -1;
+ }
+ qemu_socket_set_nonblock(fd);
+
+ dgram_dst = g_malloc(sizeof(raddr_un));
+ memcpy(dgram_dst, &raddr_un, sizeof(raddr_un));
+
+ info_str = g_strdup_printf("udp=%s:%s",
+ laddr_un.sun_path, raddr_un.sun_path);
+ break;
+ }
case SOCKET_ADDRESS_TYPE_FD: {
SocketAddress *sa;
SocketAddressType sa_type;
diff --git a/qapi/net.json b/qapi/net.json
index bb96701a49a7..9cc4be7535bb 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -600,7 +600,7 @@
# @remote: remote address
# @local: local address
#
-# Only SocketAddress types 'inet' and 'fd' are supported.
+# Only SocketAddress types 'unix', 'inet' and 'fd' are supported.
#
# The code checks there is at least one of these options and reports an error
# if not. If remote address is present and it's a multicast address, local
diff --git a/qemu-options.hx b/qemu-options.hx
index 7a34022ac651..5adb2e688c73 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2744,6 +2744,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
" configure a network backend to connect to a multicast maddr and port\n"
" use ``local.host=addr`` to specify the host address to send packets from\n"
"-netdev dgram,id=str,local.type=inet,local.host=addr,local.port=port[,remote.type=inet,remote.host=addr,remote.port=port]\n"
+ "-netdev dgram,id=str,local.type=unix,local.path=path[,remote.type=unix,remote.path=path]\n"
"-netdev dgram,id=str,local.type=fd,local.str=h\n"
" configure a network backend to connect to another network\n"
" using an UDP tunnel\n"
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 11/16] net: dgram: add unix socket
2022-09-26 19:50 ` [PATCH v9 11/16] net: dgram: add unix socket Laurent Vivier
@ 2022-09-28 6:22 ` David Gibson
0 siblings, 0 replies; 30+ messages in thread
From: David Gibson @ 2022-09-28 6:22 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster, Stefano Brivio
[-- Attachment #1: Type: text/plain, Size: 5720 bytes --]
On Mon, Sep 26, 2022 at 09:50:43PM +0200, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Although one note below.
> ---
> net/dgram.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++---
> qapi/net.json | 2 +-
> qemu-options.hx | 1 +
> 3 files changed, 64 insertions(+), 4 deletions(-)
>
> diff --git a/net/dgram.c b/net/dgram.c
> index 9fb01410304e..db631f6e2270 100644
> --- a/net/dgram.c
> +++ b/net/dgram.c
> @@ -84,8 +84,15 @@ static ssize_t net_dgram_receive_dgram(NetClientState *nc,
>
> do {
> if (s->dgram_dst) {
> - ret = sendto(s->fd, buf, size, 0, s->dgram_dst,
> - sizeof(struct sockaddr_in));
> + socklen_t len;
> +
> + if (s->dgram_dst->sa_family == AF_INET) {
> + len = sizeof(struct sockaddr_in);
> + } else {
> + len = sizeof(struct sockaddr_un);
> + }
It really seems like you're going to want a common helper for getting
the socklet, if not now, then pretty soon.
> + ret = sendto(s->fd, buf, size, 0, s->dgram_dst, len);
> } else {
> ret = send(s->fd, buf, size, 0);
> }
> @@ -450,7 +457,7 @@ static int net_dgram_init(NetClientState *peer,
> }
> } else {
> if (local->type != SOCKET_ADDRESS_TYPE_FD) {
> - error_setg(errp, "type=inet requires remote parameter");
> + error_setg(errp, "type=inet or unix require remote parameter");
> return -1;
> }
> }
> @@ -500,6 +507,58 @@ static int net_dgram_init(NetClientState *peer,
>
> break;
> }
> + case SOCKET_ADDRESS_TYPE_UNIX: {
> + struct sockaddr_un laddr_un, raddr_un;
> +
> + ret = unlink(local->u.q_unix.path);
> + if (ret < 0 && errno != ENOENT) {
> + error_setg_errno(errp, errno, "failed to unlink socket %s",
> + local->u.q_unix.path);
> + return -1;
> + }
> +
> + laddr_un.sun_family = PF_UNIX;
> + ret = snprintf(laddr_un.sun_path, sizeof(laddr_un.sun_path), "%s",
> + local->u.q_unix.path);
> + if (ret < 0 || ret >= sizeof(laddr_un.sun_path)) {
> + error_setg(errp, "UNIX socket path '%s' is too long",
> + local->u.q_unix.path);
> + error_append_hint(errp, "Path must be less than %zu bytes\n",
> + sizeof(laddr_un.sun_path));
> + }
> +
> + raddr_un.sun_family = PF_UNIX;
> + ret = snprintf(raddr_un.sun_path, sizeof(raddr_un.sun_path), "%s",
> + remote->u.q_unix.path);
> + if (ret < 0 || ret >= sizeof(raddr_un.sun_path)) {
> + error_setg(errp, "UNIX socket path '%s' is too long",
> + remote->u.q_unix.path);
> + error_append_hint(errp, "Path must be less than %zu bytes\n",
> + sizeof(raddr_un.sun_path));
> + }
> +
> + fd = qemu_socket(PF_UNIX, SOCK_DGRAM, 0);
> + if (fd < 0) {
> + error_setg_errno(errp, errno, "can't create datagram socket");
> + return -1;
> + }
> +
> + ret = bind(fd, (struct sockaddr *)&laddr_un, sizeof(laddr_un));
> + if (ret < 0) {
> + error_setg_errno(errp, errno, "can't bind unix=%s to socket",
> + laddr_un.sun_path);
> + closesocket(fd);
> + return -1;
> + }
> + qemu_socket_set_nonblock(fd);
> +
> + dgram_dst = g_malloc(sizeof(raddr_un));
> + memcpy(dgram_dst, &raddr_un, sizeof(raddr_un));
> +
> + info_str = g_strdup_printf("udp=%s:%s",
> + laddr_un.sun_path, raddr_un.sun_path);
> + break;
> + }
> case SOCKET_ADDRESS_TYPE_FD: {
> SocketAddress *sa;
> SocketAddressType sa_type;
> diff --git a/qapi/net.json b/qapi/net.json
> index bb96701a49a7..9cc4be7535bb 100644
> --- a/qapi/net.json
> +++ b/qapi/net.json
> @@ -600,7 +600,7 @@
> # @remote: remote address
> # @local: local address
> #
> -# Only SocketAddress types 'inet' and 'fd' are supported.
> +# Only SocketAddress types 'unix', 'inet' and 'fd' are supported.
> #
> # The code checks there is at least one of these options and reports an error
> # if not. If remote address is present and it's a multicast address, local
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 7a34022ac651..5adb2e688c73 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -2744,6 +2744,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
> " configure a network backend to connect to a multicast maddr and port\n"
> " use ``local.host=addr`` to specify the host address to send packets from\n"
> "-netdev dgram,id=str,local.type=inet,local.host=addr,local.port=port[,remote.type=inet,remote.host=addr,remote.port=port]\n"
> + "-netdev dgram,id=str,local.type=unix,local.path=path[,remote.type=unix,remote.path=path]\n"
> "-netdev dgram,id=str,local.type=fd,local.str=h\n"
> " configure a network backend to connect to another network\n"
> " using an UDP tunnel\n"
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 12/16] qemu-sockets: move and rename SocketAddress_to_str()
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (10 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 11/16] net: dgram: add unix socket Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent Laurent Vivier
` (3 subsequent siblings)
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
Rename SocketAddress_to_str() to socket_uri() and move it to
util/qemu-sockets.c close to socket_parse().
socket_uri() generates a string from a SocketAddress while
socket_parse() generates a SocketAddress from a string.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
include/qemu/sockets.h | 2 +-
monitor/hmp-cmds.c | 23 +----------------------
util/qemu-sockets.c | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 47194b9732f8..e5a06d2e3729 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -40,6 +40,7 @@ NetworkAddressFamily inet_netfamily(int family);
int unix_listen(const char *path, Error **errp);
int unix_connect(const char *path, Error **errp);
+char *socket_uri(SocketAddress *addr);
SocketAddress *socket_parse(const char *str, Error **errp);
int socket_connect(SocketAddress *addr, Error **errp);
int socket_listen(SocketAddress *addr, int num, Error **errp);
@@ -123,5 +124,4 @@ SocketAddress *socket_address_flatten(SocketAddressLegacy *addr);
* Return 0 on success.
*/
int socket_address_parse_named_fd(SocketAddress *addr, Error **errp);
-
#endif /* QEMU_SOCKETS_H */
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index c6cd6f91dde6..cb35059c2d45 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -197,27 +197,6 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
qapi_free_MouseInfoList(mice_list);
}
-static char *SocketAddress_to_str(SocketAddress *addr)
-{
- switch (addr->type) {
- case SOCKET_ADDRESS_TYPE_INET:
- return g_strdup_printf("tcp:%s:%s",
- addr->u.inet.host,
- addr->u.inet.port);
- case SOCKET_ADDRESS_TYPE_UNIX:
- return g_strdup_printf("unix:%s",
- addr->u.q_unix.path);
- case SOCKET_ADDRESS_TYPE_FD:
- return g_strdup_printf("fd:%s", addr->u.fd.str);
- case SOCKET_ADDRESS_TYPE_VSOCK:
- return g_strdup_printf("tcp:%s:%s",
- addr->u.vsock.cid,
- addr->u.vsock.port);
- default:
- return g_strdup("unknown address type");
- }
-}
-
void hmp_info_migrate(Monitor *mon, const QDict *qdict)
{
MigrationInfo *info;
@@ -380,7 +359,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "socket address: [\n");
for (addr = info->socket_address; addr; addr = addr->next) {
- char *s = SocketAddress_to_str(addr->value);
+ char *s = socket_uri(addr->value);
monitor_printf(mon, "\t%s\n", s);
g_free(s);
}
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 83f4bd6fd211..9f6f655fd526 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -1077,6 +1077,26 @@ int unix_connect(const char *path, Error **errp)
return sock;
}
+char *socket_uri(SocketAddress *addr)
+{
+ switch (addr->type) {
+ case SOCKET_ADDRESS_TYPE_INET:
+ return g_strdup_printf("tcp:%s:%s",
+ addr->u.inet.host,
+ addr->u.inet.port);
+ case SOCKET_ADDRESS_TYPE_UNIX:
+ return g_strdup_printf("unix:%s",
+ addr->u.q_unix.path);
+ case SOCKET_ADDRESS_TYPE_FD:
+ return g_strdup_printf("fd:%s", addr->u.fd.str);
+ case SOCKET_ADDRESS_TYPE_VSOCK:
+ return g_strdup_printf("tcp:%s:%s",
+ addr->u.vsock.cid,
+ addr->u.vsock.port);
+ default:
+ return g_strdup("unknown address type");
+ }
+}
SocketAddress *socket_parse(const char *str, Error **errp)
{
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (11 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 12/16] qemu-sockets: move and rename SocketAddress_to_str() Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-28 6:23 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 14/16] net: stream: move to QIO to enable additional parameters Laurent Vivier
` (2 subsequent siblings)
15 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
To be consistent with socket_uri(), add 'tcp:' prefix for inet type in
socket_parse(), by default socket_parse() use tcp when no prefix is
provided (format is host:port).
In socket_uri(), use 'vsock:' prefix for vsock type rather than 'tcp:'
because it makes a vsock address look like an inet address with CID
misinterpreted as host.
Goes back to commit 9aca82ba31 "migration: Create socket-address parameter"
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
util/qemu-sockets.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 9f6f655fd526..a9926af714c4 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -1090,7 +1090,7 @@ char *socket_uri(SocketAddress *addr)
case SOCKET_ADDRESS_TYPE_FD:
return g_strdup_printf("fd:%s", addr->u.fd.str);
case SOCKET_ADDRESS_TYPE_VSOCK:
- return g_strdup_printf("tcp:%s:%s",
+ return g_strdup_printf("vsock:%s:%s",
addr->u.vsock.cid,
addr->u.vsock.port);
default:
@@ -1124,6 +1124,11 @@ SocketAddress *socket_parse(const char *str, Error **errp)
if (vsock_parse(&addr->u.vsock, str + strlen("vsock:"), errp)) {
goto fail;
}
+ } else if (strstart(str, "tcp:", NULL)) {
+ addr->type = SOCKET_ADDRESS_TYPE_INET;
+ if (inet_parse(&addr->u.inet, str + strlen("tcp:"), errp)) {
+ goto fail;
+ }
} else {
addr->type = SOCKET_ADDRESS_TYPE_INET;
if (inet_parse(&addr->u.inet, str, errp)) {
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent
2022-09-26 19:50 ` [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent Laurent Vivier
@ 2022-09-28 6:23 ` David Gibson
0 siblings, 0 replies; 30+ messages in thread
From: David Gibson @ 2022-09-28 6:23 UTC (permalink / raw)
To: Laurent Vivier
Cc: qemu-devel, Jason Wang, Greg Kurz, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster
[-- Attachment #1: Type: text/plain, Size: 2155 bytes --]
On Mon, Sep 26, 2022 at 09:50:45PM +0200, Laurent Vivier wrote:
> To be consistent with socket_uri(), add 'tcp:' prefix for inet type in
> socket_parse(), by default socket_parse() use tcp when no prefix is
> provided (format is host:port).
>
> In socket_uri(), use 'vsock:' prefix for vsock type rather than 'tcp:'
> because it makes a vsock address look like an inet address with CID
> misinterpreted as host.
> Goes back to commit 9aca82ba31 "migration: Create socket-address parameter"
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> util/qemu-sockets.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index 9f6f655fd526..a9926af714c4 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -1090,7 +1090,7 @@ char *socket_uri(SocketAddress *addr)
> case SOCKET_ADDRESS_TYPE_FD:
> return g_strdup_printf("fd:%s", addr->u.fd.str);
> case SOCKET_ADDRESS_TYPE_VSOCK:
> - return g_strdup_printf("tcp:%s:%s",
> + return g_strdup_printf("vsock:%s:%s",
> addr->u.vsock.cid,
> addr->u.vsock.port);
> default:
> @@ -1124,6 +1124,11 @@ SocketAddress *socket_parse(const char *str, Error **errp)
> if (vsock_parse(&addr->u.vsock, str + strlen("vsock:"), errp)) {
> goto fail;
> }
> + } else if (strstart(str, "tcp:", NULL)) {
> + addr->type = SOCKET_ADDRESS_TYPE_INET;
> + if (inet_parse(&addr->u.inet, str + strlen("tcp:"), errp)) {
> + goto fail;
> + }
> } else {
> addr->type = SOCKET_ADDRESS_TYPE_INET;
> if (inet_parse(&addr->u.inet, str, errp)) {
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 14/16] net: stream: move to QIO to enable additional parameters
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (12 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 16/16] net: stream: add QAPI events to report connection state Laurent Vivier
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
Use QIOChannel, QIOChannelSocket and QIONetListener.
This allows net/stream to use all the available parameters provided by
SocketAddress.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
net/stream.c | 481 +++++++++++++++++-------------------------------
qemu-options.hx | 4 +-
2 files changed, 171 insertions(+), 314 deletions(-)
diff --git a/net/stream.c b/net/stream.c
index 02967c284efc..9b50a32531a9 100644
--- a/net/stream.c
+++ b/net/stream.c
@@ -35,48 +35,36 @@
#include "qemu/iov.h"
#include "qemu/main-loop.h"
#include "qemu/cutils.h"
+#include "io/channel.h"
+#include "io/channel-socket.h"
+#include "io/net-listener.h"
typedef struct NetStreamState {
NetClientState nc;
- int listen_fd;
- int fd;
+ QIOChannel *listen_ioc;
+ QIONetListener *listener;
+ QIOChannel *ioc;
+ guint ioc_read_tag;
+ guint ioc_write_tag;
SocketReadState rs;
unsigned int send_index; /* number of bytes sent*/
- bool read_poll; /* waiting to receive data? */
- bool write_poll; /* waiting to transmit data? */
} NetStreamState;
-static void net_stream_send(void *opaque);
-static void net_stream_accept(void *opaque);
-static void net_stream_writable(void *opaque);
+static void net_stream_listen(QIONetListener *listener,
+ QIOChannelSocket *cioc,
+ void *opaque);
-static void net_stream_update_fd_handler(NetStreamState *s)
+static gboolean net_stream_writable(QIOChannel *ioc,
+ GIOCondition condition,
+ gpointer data)
{
- qemu_set_fd_handler(s->fd,
- s->read_poll ? net_stream_send : NULL,
- s->write_poll ? net_stream_writable : NULL,
- s);
-}
+ NetStreamState *s = data;
-static void net_stream_read_poll(NetStreamState *s, bool enable)
-{
- s->read_poll = enable;
- net_stream_update_fd_handler(s);
-}
-
-static void net_stream_write_poll(NetStreamState *s, bool enable)
-{
- s->write_poll = enable;
- net_stream_update_fd_handler(s);
-}
-
-static void net_stream_writable(void *opaque)
-{
- NetStreamState *s = opaque;
-
- net_stream_write_poll(s, false);
+ s->ioc_write_tag = 0;
qemu_flush_queued_packets(&s->nc);
+
+ return G_SOURCE_REMOVE;
}
static ssize_t net_stream_receive(NetClientState *nc, const uint8_t *buf,
@@ -93,13 +81,16 @@ static ssize_t net_stream_receive(NetClientState *nc, const uint8_t *buf,
.iov_len = size,
},
};
+ struct iovec local_iov[2];
+ unsigned int nlocal_iov;
size_t remaining;
ssize_t ret;
- remaining = iov_size(iov, 2) - s->send_index;
- ret = iov_send(s->fd, iov, 2, s->send_index, remaining);
- if (ret == -1 && errno == EAGAIN) {
+ remaining = iov_size(iov, 2) - s->send_index;
+ nlocal_iov = iov_copy(local_iov, 2, iov, 2, s->send_index, remaining);
+ ret = qio_channel_writev(s->ioc, local_iov, nlocal_iov, NULL);
+ if (ret == QIO_CHANNEL_ERR_BLOCK) {
ret = 0; /* handled further down */
}
if (ret == -1) {
@@ -108,19 +99,25 @@ static ssize_t net_stream_receive(NetClientState *nc, const uint8_t *buf,
}
if (ret < (ssize_t)remaining) {
s->send_index += ret;
- net_stream_write_poll(s, true);
+ s->ioc_write_tag = qio_channel_add_watch(s->ioc, G_IO_OUT,
+ net_stream_writable, s, NULL);
return 0;
}
s->send_index = 0;
return size;
}
+static gboolean net_stream_send(QIOChannel *ioc,
+ GIOCondition condition,
+ gpointer data);
+
static void net_stream_send_completed(NetClientState *nc, ssize_t len)
{
NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
- if (!s->read_poll) {
- net_stream_read_poll(s, true);
+ if (!s->ioc_read_tag) {
+ s->ioc_read_tag = qio_channel_add_watch(s->ioc, G_IO_IN,
+ net_stream_send, s, NULL);
}
}
@@ -131,19 +128,24 @@ static void net_stream_rs_finalize(SocketReadState *rs)
if (qemu_send_packet_async(&s->nc, rs->buf,
rs->packet_len,
net_stream_send_completed) == 0) {
- net_stream_read_poll(s, false);
+ if (s->ioc_read_tag) {
+ g_source_remove(s->ioc_read_tag);
+ s->ioc_read_tag = 0;
+ }
}
}
-static void net_stream_send(void *opaque)
+static gboolean net_stream_send(QIOChannel *ioc,
+ GIOCondition condition,
+ gpointer data)
{
- NetStreamState *s = opaque;
+ NetStreamState *s = data;
int size;
int ret;
- uint8_t buf1[NET_BUFSIZE];
- const uint8_t *buf;
+ char buf1[NET_BUFSIZE];
+ const char *buf;
- size = recv(s->fd, buf1, sizeof(buf1), 0);
+ size = qio_channel_read(s->ioc, buf1, sizeof(buf1), NULL);
if (size < 0) {
if (errno != EWOULDBLOCK) {
goto eoc;
@@ -151,51 +153,63 @@ static void net_stream_send(void *opaque)
} else if (size == 0) {
/* end of connection */
eoc:
- net_stream_read_poll(s, false);
- net_stream_write_poll(s, false);
- if (s->listen_fd != -1) {
- qemu_set_fd_handler(s->listen_fd, net_stream_accept, NULL, s);
+ s->ioc_read_tag = 0;
+ if (s->ioc_write_tag) {
+ g_source_remove(s->ioc_write_tag);
+ s->ioc_write_tag = 0;
}
- closesocket(s->fd);
+ if (s->listener) {
+ qio_net_listener_set_client_func(s->listener, net_stream_listen,
+ s, NULL);
+ }
+ object_unref(OBJECT(s->ioc));
+ s->ioc = NULL;
- s->fd = -1;
net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
s->nc.link_down = true;
memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
- return;
+ return G_SOURCE_REMOVE;
}
buf = buf1;
- ret = net_fill_rstate(&s->rs, buf, size);
+ ret = net_fill_rstate(&s->rs, (const uint8_t *)buf, size);
if (ret == -1) {
goto eoc;
}
+
+ return G_SOURCE_CONTINUE;
}
static void net_stream_cleanup(NetClientState *nc)
{
NetStreamState *s = DO_UPCAST(NetStreamState, nc, nc);
- if (s->fd != -1) {
- net_stream_read_poll(s, false);
- net_stream_write_poll(s, false);
- close(s->fd);
- s->fd = -1;
+ if (s->ioc) {
+ if (QIO_CHANNEL_SOCKET(s->ioc)->fd != -1) {
+ if (s->ioc_read_tag) {
+ g_source_remove(s->ioc_read_tag);
+ s->ioc_read_tag = 0;
+ }
+ if (s->ioc_write_tag) {
+ g_source_remove(s->ioc_write_tag);
+ s->ioc_write_tag = 0;
+ }
+ }
+ object_unref(OBJECT(s->ioc));
+ s->ioc = NULL;
}
- if (s->listen_fd != -1) {
- qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
- closesocket(s->listen_fd);
- s->listen_fd = -1;
+ if (s->listen_ioc) {
+ if (s->listener) {
+ qio_net_listener_disconnect(s->listener);
+ object_unref(OBJECT(s->listener));
+ s->listener = NULL;
+ }
+ object_unref(OBJECT(s->listen_ioc));
+ s->listen_ioc = NULL;
}
}
-static void net_stream_connect(void *opaque)
-{
- NetStreamState *s = opaque;
- net_stream_read_poll(s, true);
-}
-
static NetClientInfo net_stream_info = {
.type = NET_CLIENT_DRIVER_STREAM,
.size = sizeof(NetStreamState),
@@ -203,77 +217,68 @@ static NetClientInfo net_stream_info = {
.cleanup = net_stream_cleanup,
};
-static NetStreamState *net_stream_fd_init_stream(NetClientState *peer,
- const char *model,
- const char *name,
- int fd, int is_connected)
+static void net_stream_listen(QIONetListener *listener,
+ QIOChannelSocket *cioc,
+ void *opaque)
{
- NetClientState *nc;
- NetStreamState *s;
-
- nc = qemu_new_net_client(&net_stream_info, peer, model, name);
+ NetStreamState *s = opaque;
+ SocketAddress *addr;
+ char *uri;
- snprintf(nc->info_str, sizeof(nc->info_str), "fd=%d", fd);
+ object_ref(OBJECT(cioc));
- s = DO_UPCAST(NetStreamState, nc, nc);
+ qio_net_listener_set_client_func(s->listener, NULL, s, NULL);
- s->fd = fd;
- s->listen_fd = -1;
- net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
+ s->ioc = QIO_CHANNEL(cioc);
+ qio_channel_set_name(s->ioc, "stream-server");
+ s->nc.link_down = false;
- /* Disable Nagle algorithm on TCP sockets to reduce latency */
- socket_set_nodelay(fd);
+ s->ioc_read_tag = qio_channel_add_watch(s->ioc, G_IO_IN, net_stream_send,
+ s, NULL);
- if (is_connected) {
- net_stream_connect(s);
+ if (cioc->localAddr.ss_family == AF_UNIX) {
+ addr = qio_channel_socket_get_local_address(cioc, NULL);
} else {
- qemu_set_fd_handler(s->fd, NULL, net_stream_connect, s);
+ addr = qio_channel_socket_get_remote_address(cioc, NULL);
}
- return s;
+ g_assert(addr != NULL);
+ uri = socket_uri(addr);
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), uri);
+ g_free(uri);
+ qapi_free_SocketAddress(addr);
+
}
-static void net_stream_accept(void *opaque)
+static void net_stream_server_listening(QIOTask *task, gpointer opaque)
{
NetStreamState *s = opaque;
- struct sockaddr_storage saddr;
- socklen_t len;
- int fd;
-
- for (;;) {
- len = sizeof(saddr);
- fd = qemu_accept(s->listen_fd, (struct sockaddr *)&saddr, &len);
- if (fd < 0 && errno != EINTR) {
- return;
- } else if (fd >= 0) {
- qemu_set_fd_handler(s->listen_fd, NULL, NULL, NULL);
- break;
- }
- }
-
- s->fd = fd;
- s->nc.link_down = false;
- net_stream_connect(s);
- switch (saddr.ss_family) {
- case AF_INET: {
- struct sockaddr_in *saddr_in = (struct sockaddr_in *)&saddr;
+ QIOChannelSocket *listen_sioc = QIO_CHANNEL_SOCKET(s->listen_ioc);
+ SocketAddress *addr;
+ int ret;
- snprintf(s->nc.info_str, sizeof(s->nc.info_str),
- "connection from %s:%d",
- inet_ntoa(saddr_in->sin_addr), ntohs(saddr_in->sin_port));
- break;
+ if (listen_sioc->fd < 0) {
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "connection error");
+ return;
}
- case AF_UNIX: {
- struct sockaddr_un saddr_un;
- len = sizeof(saddr_un);
- getsockname(s->listen_fd, (struct sockaddr *)&saddr_un, &len);
+ addr = qio_channel_socket_get_local_address(listen_sioc, NULL);
+ g_assert(addr != NULL);
+ ret = qemu_socket_try_set_nonblock(listen_sioc->fd);
+ if (addr->type == SOCKET_ADDRESS_TYPE_FD && ret < 0) {
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
- "connect from %s", saddr_un.sun_path);
- break;
- }
- default:
- g_assert_not_reached();
+ "can't use file descriptor %s (errno %d)",
+ addr->u.fd.str, -ret);
+ return;
}
+ g_assert(ret == 0);
+ qapi_free_SocketAddress(addr);
+
+ s->nc.link_down = true;
+ s->listener = qio_net_listener_new();
+
+ net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
+ qio_net_listener_set_client_func(s->listener, net_stream_listen, s, NULL);
+ qio_net_listener_add(s->listener, listen_sioc);
}
static int net_stream_server_init(NetClientState *peer,
@@ -284,105 +289,55 @@ static int net_stream_server_init(NetClientState *peer,
{
NetClientState *nc;
NetStreamState *s;
- int fd, ret;
+ QIOChannelSocket *listen_sioc = qio_channel_socket_new();
- switch (addr->type) {
- case SOCKET_ADDRESS_TYPE_INET: {
- struct sockaddr_in saddr_in;
+ nc = qemu_new_net_client(&net_stream_info, peer, model, name);
+ s = DO_UPCAST(NetStreamState, nc, nc);
- if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
- errp) < 0) {
- return -1;
- }
+ s->listen_ioc = QIO_CHANNEL(listen_sioc);
+ qio_channel_socket_listen_async(listen_sioc, addr, 0,
+ net_stream_server_listening, s,
+ NULL, NULL);
- fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (fd < 0) {
- error_setg_errno(errp, errno, "can't create stream socket");
- return -1;
- }
- qemu_socket_set_nonblock(fd);
+ return 0;
+}
- socket_set_fast_reuse(fd);
+static void net_stream_client_connected(QIOTask *task, gpointer opaque)
+{
+ NetStreamState *s = opaque;
+ QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(s->ioc);
+ SocketAddress *addr;
+ gchar *uri;
+ int ret;
- ret = bind(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
- if (ret < 0) {
- error_setg_errno(errp, errno, "can't bind ip=%s to socket",
- inet_ntoa(saddr_in.sin_addr));
- closesocket(fd);
- return -1;
- }
- break;
+ if (sioc->fd < 0) {
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "connection error");
+ return;
}
- case SOCKET_ADDRESS_TYPE_UNIX: {
- struct sockaddr_un saddr_un;
-
- ret = unlink(addr->u.q_unix.path);
- if (ret < 0 && errno != ENOENT) {
- error_setg_errno(errp, errno, "failed to unlink socket %s",
- addr->u.q_unix.path);
- return -1;
- }
-
- saddr_un.sun_family = PF_UNIX;
- ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
- addr->u.q_unix.path);
- if (ret < 0 || ret >= sizeof(saddr_un.sun_path)) {
- error_setg(errp, "UNIX socket path '%s' is too long",
- addr->u.q_unix.path);
- error_append_hint(errp, "Path must be less than %zu bytes\n",
- sizeof(saddr_un.sun_path));
- return -1;
- }
- fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
- if (fd < 0) {
- error_setg_errno(errp, errno, "can't create stream socket");
- return -1;
- }
- qemu_socket_set_nonblock(fd);
-
- ret = bind(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un));
- if (ret < 0) {
- error_setg_errno(errp, errno, "can't create socket with path: %s",
- saddr_un.sun_path);
- closesocket(fd);
- return -1;
- }
- break;
- }
- case SOCKET_ADDRESS_TYPE_FD:
- fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
- if (fd == -1) {
- return -1;
- }
- ret = qemu_socket_try_set_nonblock(fd);
- if (ret < 0) {
- error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
- name, fd);
- return -1;
- }
- break;
- default:
- error_setg(errp, "only support inet or fd type");
- return -1;
- }
+ addr = qio_channel_socket_get_remote_address(sioc, NULL);
+ g_assert(addr != NULL);
+ uri = socket_uri(addr);
+ pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), uri);
+ g_free(uri);
- ret = listen(fd, 0);
- if (ret < 0) {
- error_setg_errno(errp, errno, "can't listen on socket");
- closesocket(fd);
- return -1;
+ ret = qemu_socket_try_set_nonblock(sioc->fd);
+ if (addr->type == SOCKET_ADDRESS_TYPE_FD && ret < 0) {
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+ "can't use file descriptor %s (errno %d)",
+ addr->u.fd.str, -ret);
+ return;
}
+ g_assert(ret == 0);
+ qapi_free_SocketAddress(addr);
- nc = qemu_new_net_client(&net_stream_info, peer, model, name);
- s = DO_UPCAST(NetStreamState, nc, nc);
- s->fd = -1;
- s->listen_fd = fd;
- s->nc.link_down = true;
net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
- qemu_set_fd_handler(s->listen_fd, net_stream_accept, NULL, s);
- return 0;
+ /* Disable Nagle algorithm on TCP sockets to reduce latency */
+ qio_channel_set_delay(s->ioc, false);
+
+ s->ioc_read_tag = qio_channel_add_watch(s->ioc, G_IO_IN, net_stream_send,
+ s, NULL);
}
static int net_stream_client_init(NetClientState *peer,
@@ -392,115 +347,17 @@ static int net_stream_client_init(NetClientState *peer,
Error **errp)
{
NetStreamState *s;
- int fd, connected, ret;
- gchar *info_str;
-
- switch (addr->type) {
- case SOCKET_ADDRESS_TYPE_INET: {
- struct sockaddr_in saddr_in;
-
- if (convert_host_port(&saddr_in, addr->u.inet.host, addr->u.inet.port,
- errp) < 0) {
- return -1;
- }
-
- fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
- if (fd < 0) {
- error_setg_errno(errp, errno, "can't create stream socket");
- return -1;
- }
- qemu_socket_set_nonblock(fd);
-
- connected = 0;
- for (;;) {
- ret = connect(fd, (struct sockaddr *)&saddr_in, sizeof(saddr_in));
- if (ret < 0) {
- if (errno == EINTR || errno == EWOULDBLOCK) {
- /* continue */
- } else if (errno == EINPROGRESS ||
- errno == EALREADY) {
- break;
- } else {
- error_setg_errno(errp, errno, "can't connect socket");
- closesocket(fd);
- return -1;
- }
- } else {
- connected = 1;
- break;
- }
- }
- info_str = g_strdup_printf("connect to %s:%d",
- inet_ntoa(saddr_in.sin_addr),
- ntohs(saddr_in.sin_port));
- break;
- }
- case SOCKET_ADDRESS_TYPE_UNIX: {
- struct sockaddr_un saddr_un;
-
- saddr_un.sun_family = PF_UNIX;
- ret = snprintf(saddr_un.sun_path, sizeof(saddr_un.sun_path), "%s",
- addr->u.q_unix.path);
- if (ret < 0 || ret >= sizeof(saddr_un.sun_path)) {
- error_setg(errp, "UNIX socket path '%s' is too long",
- addr->u.q_unix.path);
- error_append_hint(errp, "Path must be less than %zu bytes\n",
- sizeof(saddr_un.sun_path));
- return -1;
- }
+ NetClientState *nc;
+ QIOChannelSocket *sioc = qio_channel_socket_new();
- fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
- if (fd < 0) {
- error_setg_errno(errp, errno, "can't create stream socket");
- return -1;
- }
- qemu_socket_set_nonblock(fd);
-
- connected = 0;
- for (;;) {
- ret = connect(fd, (struct sockaddr *)&saddr_un, sizeof(saddr_un));
- if (ret < 0) {
- if (errno == EINTR || errno == EWOULDBLOCK) {
- /* continue */
- } else if (errno == EAGAIN ||
- errno == EALREADY) {
- break;
- } else {
- error_setg_errno(errp, errno, "can't connect socket");
- closesocket(fd);
- return -1;
- }
- } else {
- connected = 1;
- break;
- }
- }
- info_str = g_strdup_printf(" connect to %s", saddr_un.sun_path);
- break;
- }
- case SOCKET_ADDRESS_TYPE_FD:
- fd = monitor_fd_param(monitor_cur(), addr->u.fd.str, errp);
- if (fd == -1) {
- return -1;
- }
- ret = qemu_socket_try_set_nonblock(fd);
- if (ret < 0) {
- error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
- name, fd);
- return -1;
- }
- connected = 1;
- info_str = g_strdup_printf("connect to fd %d", fd);
- break;
- default:
- error_setg(errp, "only support inet, unix or fd type");
- return -1;
- }
+ nc = qemu_new_net_client(&net_stream_info, peer, model, name);
+ s = DO_UPCAST(NetStreamState, nc, nc);
- s = net_stream_fd_init_stream(peer, model, name, fd, connected);
+ s->ioc = QIO_CHANNEL(sioc);
- pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), info_str);
- g_free(info_str);
+ qio_channel_socket_connect_async(sioc, addr,
+ net_stream_client_connected, s,
+ NULL, NULL);
return 0;
}
diff --git a/qemu-options.hx b/qemu-options.hx
index 5adb2e688c73..1b3a053b5df8 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2734,8 +2734,8 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
"-netdev socket,id=str[,fd=h][,udp=host:port][,localaddr=host:port]\n"
" configure a network backend to connect to another network\n"
" using an UDP tunnel\n"
- "-netdev stream,id=str[,server=on|off],addr.type=inet,addr.host=host,addr.port=port\n"
- "-netdev stream,id=str[,server=on|off],addr.type=unix,addr.path=path\n"
+ "-netdev stream,id=str[,server=on|off],addr.type=inet,addr.host=host,addr.port=port[,to=maxport][,numeric=on|off][,keep-alive=on|off][,mptcp=on|off][,addr.ipv4=on|off][,addr.ipv6=on|off]\n"
+ "-netdev stream,id=str[,server=on|off],addr.type=unix,addr.path=path[,abstract=on|off][,tight=on|off]\n"
"-netdev stream,id=str[,server=on|off],addr.type=fd,addr.str=h\n"
" configure a network backend to connect to another network\n"
" using a socket connection in stream mode.\n"
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (13 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 14/16] net: stream: move to QIO to enable additional parameters Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
2022-09-27 10:01 ` Thomas Huth
2022-09-26 19:50 ` [PATCH v9 16/16] net: stream: add QAPI events to report connection state Laurent Vivier
15 siblings, 1 reply; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
tests/qtest/meson.build | 1 +
tests/qtest/netdev-socket.c | 391 ++++++++++++++++++++++++++++++++++++
2 files changed, 392 insertions(+)
create mode 100644 tests/qtest/netdev-socket.c
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index e910cb32ca15..38ee8b7a2d56 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -27,6 +27,7 @@ qtests_generic = [
'test-hmp',
'qos-test',
'readconfig-test',
+ 'netdev-socket',
]
if config_host.has_key('CONFIG_MODULES')
qtests_generic += [ 'modules-test' ]
diff --git a/tests/qtest/netdev-socket.c b/tests/qtest/netdev-socket.c
new file mode 100644
index 000000000000..55e0c07f18ec
--- /dev/null
+++ b/tests/qtest/netdev-socket.c
@@ -0,0 +1,391 @@
+/*
+ * QTest testcase for netdev stream and dgram
+ *
+ * Copyright (c) 2022 Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include <glib.h>
+#include "libqtest.h"
+
+#define CONNECTION_TIMEOUT 5
+
+#define EXPECT_STATE(q, e, t) \
+do { \
+ char *resp = qtest_hmp(q, "info network"); \
+ if (t) { \
+ strrchr(resp, t)[0] = 0; \
+ } \
+ g_test_timer_start(); \
+ while (g_test_timer_elapsed() < CONNECTION_TIMEOUT) { \
+ if (strcmp(resp, e) == 0) { \
+ break; \
+ } \
+ g_free(resp); \
+ resp = qtest_hmp(q, "info network"); \
+ if (t) { \
+ strrchr(resp, t)[0] = 0; \
+ } \
+ } \
+ g_assert_cmpstr(resp, ==, e); \
+ g_free(resp); \
+} while (0)
+
+static int inet_get_free_port(void)
+{
+ int sock;
+ struct sockaddr_in addr;
+ socklen_t len;
+ int port;
+
+ sock = socket(AF_INET, SOCK_STREAM, 0);
+ if (sock < 0) {
+ return -1;
+ }
+
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = INADDR_ANY;
+ addr.sin_port = 0;
+ if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ return -1;
+ }
+
+ len = sizeof(addr);
+ if (getsockname(sock, (struct sockaddr *)&addr, &len) < 0) {
+ return -1;
+ }
+
+ port = ntohs(addr.sin_port);
+
+ close(sock);
+
+ return port;
+}
+
+static void test_stream_inet_ipv4(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ int port;
+
+ port = inet_get_free_port();
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,addr.type=inet,"
+ "addr.ipv4=on,addr.ipv6=off,"
+ "addr.host=localhost,addr.port=%d", port);
+
+ EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev stream,server=false,id=st0,addr.type=inet,"
+ "addr.ipv4=on,addr.ipv6=off,"
+ "addr.host=localhost,addr.port=%d", port);
+
+ expect = g_strdup_printf("st0: index=0,type=stream,tcp:127.0.0.1:%d\r\n",
+ port);
+ EXPECT_STATE(qts1, expect, 0);
+ g_free(expect);
+
+ /* the port is unknown, check only the address */
+ EXPECT_STATE(qts0, "st0: index=0,type=stream,tcp:127.0.0.1", ':');
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+}
+
+static void test_stream_inet_ipv6(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ int port;
+
+ port = inet_get_free_port();
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,addr.type=inet,"
+ "addr.ipv4=off,addr.ipv6=on,"
+ "addr.host=localhost,addr.port=%d", port);
+
+ EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev stream,server=false,id=st0,addr.type=inet,"
+ "addr.ipv4=off,addr.ipv6=on,"
+ "addr.host=localhost,addr.port=%d", port);
+
+ expect = g_strdup_printf("st0: index=0,type=stream,tcp:::1:%d\r\n",
+ port);
+ EXPECT_STATE(qts1, expect, 0);
+ g_free(expect);
+
+ /* the port is unknown, check only the address */
+ EXPECT_STATE(qts0, "st0: index=0,type=stream,tcp:::1", ':');
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+}
+
+static void test_stream_unix(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ gchar *path;
+ int ret;
+
+ ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
+ g_assert_true(ret >= 0);
+ close(ret);
+
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,addr.type=unix,addr.path=%s,",
+ path);
+
+ EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,server=false,"
+ "addr.type=unix,addr.path=%s",
+ path);
+
+ expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
+ EXPECT_STATE(qts1, expect, 0);
+ EXPECT_STATE(qts0, expect, 0);
+ g_free(expect);
+ g_free(path);
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+}
+
+static void test_stream_unix_abstract(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ gchar *path;
+ int ret;
+
+ ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
+ g_assert_true(ret >= 0);
+ close(ret);
+
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,addr.type=unix,addr.path=%s,"
+ "addr.abstract=on",
+ path);
+
+ EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,server=false,"
+ "addr.type=unix,addr.path=%s,addr.abstract=on",
+ path);
+
+ expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
+ EXPECT_STATE(qts1, expect, 0);
+ EXPECT_STATE(qts0, expect, 0);
+ g_free(expect);
+ g_free(path);
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+}
+
+static void test_stream_fd(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ int ret, sock0, sock1;
+ struct sockaddr_un addr;
+ gchar *path;
+
+ ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
+ g_assert_true(ret >= 0);
+ close(ret);
+ addr.sun_family = AF_UNIX;
+ strcpy(addr.sun_path, path);
+
+ unlink(addr.sun_path);
+ sock0 = socket(AF_LOCAL, SOCK_STREAM, 0);
+ g_assert_cmpint(sock0, !=, -1);
+
+ ret = bind(sock0, (struct sockaddr *)&addr, sizeof(addr));
+ g_assert_cmpint(ret, !=, -1);
+
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,addr.type=fd,addr.str=%d",
+ sock0);
+
+ EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
+
+ sock1 = socket(AF_LOCAL, SOCK_STREAM, 0);
+ g_assert_cmpint(sock1, !=, -1);
+
+ ret = connect(sock1, (struct sockaddr *)&addr, sizeof(addr));
+ g_assert_cmpint(ret, !=, -1);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev stream,id=st0,server=off,addr.type=fd,addr.str=%d",
+ sock1);
+
+
+ expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
+ EXPECT_STATE(qts1, expect, 0);
+ EXPECT_STATE(qts0, expect, 0);
+ g_free(expect);
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+
+ closesocket(sock0);
+ closesocket(sock1);
+
+ g_free(path);
+}
+
+static void test_dgram_inet(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ int port0, port1;
+
+ port0 = inet_get_free_port();
+ port1 = inet_get_free_port();
+
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev dgram,id=st0,"
+ "local.type=inet,local.host=localhost,local.port=%d,"
+ "remote.type=inet,remote.host=localhost,remote.port=%d",
+ port0, port1);
+
+ expect = g_strdup_printf("st0: index=0,type=dgram,"
+ "udp=127.0.0.1:%d/127.0.0.1:%d\r\n", port0, port1);
+ EXPECT_STATE(qts0, expect, 0);
+ g_free(expect);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev dgram,id=st0,"
+ "local.type=inet,local.host=localhost,local.port=%d,"
+ "remote.type=inet,remote.host=localhost,remote.port=%d",
+ port1, port0);
+
+ expect = g_strdup_printf("st0: index=0,type=dgram,"
+ "udp=127.0.0.1:%d/127.0.0.1:%d\r\n", port1, port0);
+ EXPECT_STATE(qts1, expect, 0);
+ g_free(expect);
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+}
+
+static void test_dgram_mcast(void)
+{
+ QTestState *qts;
+
+ qts = qtest_initf("-nodefaults "
+ "-netdev dgram,id=st0,"
+ "remote.type=inet,remote.host=230.0.0.1,remote.port=1234");
+
+ EXPECT_STATE(qts, "st0: index=0,type=dgram,mcast=230.0.0.1:1234\r\n", 0);
+
+ qtest_quit(qts);
+}
+
+static void test_dgram_unix(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ gchar *path0, *path1;
+ int ret;
+
+ ret = g_file_open_tmp("netdev-XXXXXX", &path0, NULL);
+ g_assert_true(ret >= 0);
+ close(ret);
+
+ ret = g_file_open_tmp("netdev-XXXXXX", &path1, NULL);
+ g_assert_true(ret >= 0);
+ close(ret);
+
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev dgram,id=st0,local.type=unix,local.path=%s,"
+ "remote.type=unix,remote.path=%s",
+ path0, path1);
+
+ expect = g_strdup_printf("st0: index=0,type=dgram,udp=%s:%s\r\n",
+ path0, path1);
+ EXPECT_STATE(qts0, expect, 0);
+ g_free(expect);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev dgram,id=st0,local.type=unix,local.path=%s,"
+ "remote.type=unix,remote.path=%s",
+ path1, path0);
+
+
+ expect = g_strdup_printf("st0: index=0,type=dgram,udp=%s:%s\r\n",
+ path1, path0);
+ EXPECT_STATE(qts1, expect, 0);
+ g_free(expect);
+
+ g_free(path0);
+ g_free(path1);
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+}
+
+static void test_dgram_fd(void)
+{
+ QTestState *qts0, *qts1;
+ char *expect;
+ int ret;
+ int sv[2];
+
+ ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, sv);
+ g_assert_cmpint(ret, !=, -1);
+
+ qts0 = qtest_initf("-nodefaults "
+ "-netdev dgram,id=st0,local.type=fd,local.str=%d",
+ sv[0]);
+
+ expect = g_strdup_printf("st0: index=0,type=dgram,fd=%d unix\r\n", sv[0]);
+ EXPECT_STATE(qts0, expect, 0);
+ g_free(expect);
+
+ qts1 = qtest_initf("-nodefaults "
+ "-netdev dgram,id=st0,local.type=fd,local.str=%d",
+ sv[1]);
+
+
+ expect = g_strdup_printf("st0: index=0,type=dgram,fd=%d unix\r\n", sv[1]);
+ EXPECT_STATE(qts1, expect, 0);
+ g_free(expect);
+
+ qtest_quit(qts1);
+ qtest_quit(qts0);
+
+ close(sv[0]);
+ close(sv[1]);
+}
+
+int main(int argc, char **argv)
+{
+ int ret;
+
+ g_test_init(&argc, &argv, NULL);
+
+ qtest_add_func("/netdev/stream/inet/ipv4", test_stream_inet_ipv4);
+ qtest_add_func("/netdev/stream/inet/ipv6", test_stream_inet_ipv6);
+ qtest_add_func("/netdev/stream/unix", test_stream_unix);
+ qtest_add_func("/netdev/stream/unix/abstract", test_stream_unix_abstract);
+ qtest_add_func("/netdev/stream/fd", test_stream_fd);
+ qtest_add_func("/netdev/dgram/inet", test_dgram_inet);
+ qtest_add_func("/netdev/dgram/mcast", test_dgram_mcast);
+ qtest_add_func("/netdev/dgram/unix", test_dgram_unix);
+ qtest_add_func("/netdev/dgram/fd", test_dgram_fd);
+
+ ret = g_test_run();
+
+ return ret;
+}
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread* Re: [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends
2022-09-26 19:50 ` [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends Laurent Vivier
@ 2022-09-27 10:01 ` Thomas Huth
0 siblings, 0 replies; 30+ messages in thread
From: Thomas Huth @ 2022-09-27 10:01 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Eric Blake,
Dr. David Alan Gilbert, Paolo Bonzini, Daniel P. Berrangé,
Markus Armbruster
On 26/09/2022 21.50, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> tests/qtest/meson.build | 1 +
> tests/qtest/netdev-socket.c | 391 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 392 insertions(+)
> create mode 100644 tests/qtest/netdev-socket.c
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index e910cb32ca15..38ee8b7a2d56 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -27,6 +27,7 @@ qtests_generic = [
> 'test-hmp',
> 'qos-test',
> 'readconfig-test',
> + 'netdev-socket',
> ]
> if config_host.has_key('CONFIG_MODULES')
> qtests_generic += [ 'modules-test' ]
> diff --git a/tests/qtest/netdev-socket.c b/tests/qtest/netdev-socket.c
> new file mode 100644
> index 000000000000..55e0c07f18ec
> --- /dev/null
> +++ b/tests/qtest/netdev-socket.c
> @@ -0,0 +1,391 @@
> +/*
> + * QTest testcase for netdev stream and dgram
> + *
> + * Copyright (c) 2022 Red Hat, Inc.
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include <glib.h>
glib.h is already included via osdep.h, so you don't need to include it here
again.
> +#include "libqtest.h"
> +
> +#define CONNECTION_TIMEOUT 5
> +
> +#define EXPECT_STATE(q, e, t) \
> +do { \
> + char *resp = qtest_hmp(q, "info network"); \
> + if (t) { \
> + strrchr(resp, t)[0] = 0; \
> + } \
> + g_test_timer_start(); \
> + while (g_test_timer_elapsed() < CONNECTION_TIMEOUT) { \
> + if (strcmp(resp, e) == 0) { \
> + break; \
> + } \
> + g_free(resp); \
> + resp = qtest_hmp(q, "info network"); \
> + if (t) { \
> + strrchr(resp, t)[0] = 0; \
> + } \
> + } \
> + g_assert_cmpstr(resp, ==, e); \
> + g_free(resp); \
> +} while (0)
> +
> +static int inet_get_free_port(void)
> +{
> + int sock;
> + struct sockaddr_in addr;
> + socklen_t len;
> + int port;
> +
> + sock = socket(AF_INET, SOCK_STREAM, 0);
> + if (sock < 0) {
> + return -1;
> + }
> +
> + memset(&addr, 0, sizeof(addr));
> + addr.sin_family = AF_INET;
> + addr.sin_addr.s_addr = INADDR_ANY;
> + addr.sin_port = 0;
> + if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
close(sock) ?
> + return -1;
> + }
> +
> + len = sizeof(addr);
> + if (getsockname(sock, (struct sockaddr *)&addr, &len) < 0) {
> + return -1;
> + }
> +
> + port = ntohs(addr.sin_port);
> +
> + close(sock);
> +
> + return port;
> +}
> +
> +static void test_stream_inet_ipv4(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int port;
> +
> + port = inet_get_free_port();
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=inet,"
> + "addr.ipv4=on,addr.ipv6=off,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,server=false,id=st0,addr.type=inet,"
> + "addr.ipv4=on,addr.ipv6=off,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,tcp:127.0.0.1:%d\r\n",
> + port);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
> +
> + /* the port is unknown, check only the address */
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,tcp:127.0.0.1", ':');
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_inet_ipv6(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int port;
> +
> + port = inet_get_free_port();
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=inet,"
> + "addr.ipv4=off,addr.ipv6=on,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,server=false,id=st0,addr.type=inet,"
> + "addr.ipv4=off,addr.ipv6=on,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,tcp:::1:%d\r\n",
> + port);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
> +
> + /* the port is unknown, check only the address */
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,tcp:::1", ':');
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_unix(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + gchar *path;
> + int ret;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=unix,addr.path=%s,",
> + path);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,server=false,"
> + "addr.type=unix,addr.path=%s",
> + path);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
> + EXPECT_STATE(qts1, expect, 0);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
Do you have to unlink(path) here?
> + g_free(path);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_unix_abstract(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + gchar *path;
> + int ret;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=unix,addr.path=%s,"
> + "addr.abstract=on",
> + path);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,server=false,"
> + "addr.type=unix,addr.path=%s,addr.abstract=on",
> + path);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
> + EXPECT_STATE(qts1, expect, 0);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
unlink(path) ?
> + g_free(path);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_fd(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int ret, sock0, sock1;
> + struct sockaddr_un addr;
> + gchar *path;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> + addr.sun_family = AF_UNIX;
> + strcpy(addr.sun_path, path);
> +
> + unlink(addr.sun_path);
> + sock0 = socket(AF_LOCAL, SOCK_STREAM, 0);
> + g_assert_cmpint(sock0, !=, -1);
> +
> + ret = bind(sock0, (struct sockaddr *)&addr, sizeof(addr));
> + g_assert_cmpint(ret, !=, -1);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=fd,addr.str=%d",
> + sock0);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + sock1 = socket(AF_LOCAL, SOCK_STREAM, 0);
> + g_assert_cmpint(sock1, !=, -1);
> +
> + ret = connect(sock1, (struct sockaddr *)&addr, sizeof(addr));
> + g_assert_cmpint(ret, !=, -1);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,server=off,addr.type=fd,addr.str=%d",
> + sock1);
> +
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
> + EXPECT_STATE(qts1, expect, 0);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +
> + closesocket(sock0);
> + closesocket(sock1);
> +
> + g_free(path);
> +}
> +
> +static void test_dgram_inet(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int port0, port1;
> +
> + port0 = inet_get_free_port();
> + port1 = inet_get_free_port();
Could it happen that port0 is the same as port1 ? Would it be a problem?
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,"
> + "local.type=inet,local.host=localhost,local.port=%d,"
> + "remote.type=inet,remote.host=localhost,remote.port=%d",
> + port0, port1);
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,"
> + "udp=127.0.0.1:%d/127.0.0.1:%d\r\n", port0, port1);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,"
> + "local.type=inet,local.host=localhost,local.port=%d,"
> + "remote.type=inet,remote.host=localhost,remote.port=%d",
> + port1, port0);
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,"
> + "udp=127.0.0.1:%d/127.0.0.1:%d\r\n", port1, port0);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_dgram_mcast(void)
> +{
> + QTestState *qts;
> +
> + qts = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,"
> + "remote.type=inet,remote.host=230.0.0.1,remote.port=1234");
> +
> + EXPECT_STATE(qts, "st0: index=0,type=dgram,mcast=230.0.0.1:1234\r\n", 0);
> +
> + qtest_quit(qts);
> +}
> +
> +static void test_dgram_unix(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + gchar *path0, *path1;
> + int ret;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path0, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path1, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,local.type=unix,local.path=%s,"
> + "remote.type=unix,remote.path=%s",
> + path0, path1);
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,udp=%s:%s\r\n",
> + path0, path1);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,local.type=unix,local.path=%s,"
> + "remote.type=unix,remote.path=%s",
> + path1, path0);
> +
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,udp=%s:%s\r\n",
> + path1, path0);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
unlink ?
> + g_free(path0);
> + g_free(path1);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
Thomas
^ permalink raw reply [flat|nested] 30+ messages in thread
* [PATCH v9 16/16] net: stream: add QAPI events to report connection state
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
` (14 preceding siblings ...)
2022-09-26 19:50 ` [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends Laurent Vivier
@ 2022-09-26 19:50 ` Laurent Vivier
15 siblings, 0 replies; 30+ messages in thread
From: Laurent Vivier @ 2022-09-26 19:50 UTC (permalink / raw)
To: qemu-devel
Cc: Jason Wang, Greg Kurz, David Gibson, Thomas Huth, Eric Blake,
Dr. David Alan Gilbert, Laurent Vivier, Paolo Bonzini,
Daniel P. Berrangé,
Markus Armbruster
The netdev reports NETDEV_STREAM_CONNECTED event when the backend
is connected, and NETDEV_STREAM_EOC when it is disconnected.
The NETDEV_STREAM_CONNECTED event includes the URI of the destination
address.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
net/stream.c | 11 +++++++++--
qapi/net.json | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/net/stream.c b/net/stream.c
index 9b50a32531a9..745967c3608d 100644
--- a/net/stream.c
+++ b/net/stream.c
@@ -38,6 +38,7 @@
#include "io/channel.h"
#include "io/channel-socket.h"
#include "io/net-listener.h"
+#include "qapi/qapi-events-net.h"
typedef struct NetStreamState {
NetClientState nc;
@@ -169,6 +170,8 @@ static gboolean net_stream_send(QIOChannel *ioc,
s->nc.link_down = true;
memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
+ qapi_event_send_netdev_stream_eoc(s->nc.name);
+
return G_SOURCE_REMOVE;
}
buf = buf1;
@@ -244,9 +247,10 @@ static void net_stream_listen(QIONetListener *listener,
g_assert(addr != NULL);
uri = socket_uri(addr);
pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), uri);
- g_free(uri);
qapi_free_SocketAddress(addr);
+ qapi_event_send_netdev_stream_connected(s->nc.name, uri);
+ g_free(uri);
}
static void net_stream_server_listening(QIOTask *task, gpointer opaque)
@@ -319,13 +323,13 @@ static void net_stream_client_connected(QIOTask *task, gpointer opaque)
g_assert(addr != NULL);
uri = socket_uri(addr);
pstrcpy(s->nc.info_str, sizeof(s->nc.info_str), uri);
- g_free(uri);
ret = qemu_socket_try_set_nonblock(sioc->fd);
if (addr->type == SOCKET_ADDRESS_TYPE_FD && ret < 0) {
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"can't use file descriptor %s (errno %d)",
addr->u.fd.str, -ret);
+ g_free(uri);
return;
}
g_assert(ret == 0);
@@ -338,6 +342,9 @@ static void net_stream_client_connected(QIOTask *task, gpointer opaque)
s->ioc_read_tag = qio_channel_add_watch(s->ioc, G_IO_IN, net_stream_send,
s, NULL);
+
+ qapi_event_send_netdev_stream_connected(s->nc.name, uri);
+ g_free(uri);
}
static int net_stream_client_init(NetClientState *peer,
diff --git a/qapi/net.json b/qapi/net.json
index 9cc4be7535bb..6bf919afc26a 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -892,3 +892,49 @@
##
{ 'event': 'FAILOVER_NEGOTIATED',
'data': {'device-id': 'str'} }
+
+##
+# @NETDEV_STREAM_CONNECTED:
+#
+# Emitted when the netdev stream backend is connected
+#
+# @netdev-id: QEMU netdev id that is connected
+# @uri: The Uniform Resource Identifier identifying the destination address
+#
+# Since: 7.2
+#
+# Example:
+#
+# <- { 'event': 'NETDEV_STREAM_CONNECTED',
+# 'data': {'uri': 'tcp:::1:1234', 'netdev-id': 'netdev0'},
+# 'timestamp': {'seconds': 1663330564, 'microseconds': 804317} }
+#
+# or
+#
+# <- { 'event': 'NETDEV_STREAM_CONNECTED',
+# 'data': {'uri': ''unix:/tmp/qemu0', 'netdev-id': 'netdev0'},
+# 'timestamp': {'seconds': 1663330564, 'microseconds': 804317} }
+#
+##
+{ 'event': 'NETDEV_STREAM_CONNECTED',
+ 'data': { 'netdev-id': 'str',
+ 'uri': 'str' } }
+
+##
+# @NETDEV_STREAM_EOC:
+#
+# Emitted when the netdev stream backend is disconnected
+#
+# @netdev-id: QEMU netdev id that is disconnected
+#
+# Since: 7.2
+#
+# Example:
+#
+# <- { 'event': 'NETDEV_STREAM_EOC',
+# 'data': {'netdev-id': 'netdev0'},
+# 'timestamp': {'seconds': 1663330937, 'microseconds': 526695} }
+#
+##
+{ 'event': 'NETDEV_STREAM_EOC',
+ 'data': { 'netdev-id': 'str' } }
--
2.37.3
^ permalink raw reply related [flat|nested] 30+ messages in thread