Add common net_parse_fds() and net_free_fds() helpers and use them
in tap.c and af-xdp.c.
Choose returning queues instead of fds, because we'll have derived
helper in net/tap, which will be able to return fds=NULL and non-zero
queues on success. That's also why we move to INT_MAX for queues, to
support negative return value for net_parse_fds() (for failure paths).
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
net/af-xdp.c | 35 ++------------------
net/tap.c | 90 +++++++++++-----------------------------------------
net/util.c | 50 +++++++++++++++++++++++++++++
net/util.h | 14 ++++++++
4 files changed, 86 insertions(+), 103 deletions(-)
diff --git a/net/af-xdp.c b/net/af-xdp.c
index bb7a7d8e33..80cda89b0e 100644
--- a/net/af-xdp.c
+++ b/net/af-xdp.c
@@ -21,6 +21,7 @@
#include "clients.h"
#include "monitor/monitor.h"
#include "net/net.h"
+#include "net/util.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
@@ -441,35 +442,6 @@ static NetClientInfo net_af_xdp_info = {
.cleanup = af_xdp_cleanup,
};
-static int *parse_socket_fds(const char *sock_fds_str,
- unsigned n_expected, Error **errp)
-{
- gchar **substrings = g_strsplit(sock_fds_str, ":", -1);
- unsigned i, n_sock_fds = g_strv_length(substrings);
- int *sock_fds = NULL;
-
- if (n_sock_fds != n_expected) {
- error_setg(errp, "expected %u socket fds, got %u",
- n_expected, n_sock_fds);
- goto exit;
- }
-
- sock_fds = g_new(int, n_sock_fds);
-
- for (i = 0; i < n_sock_fds; i++) {
- sock_fds[i] = monitor_fd_param(monitor_cur(), substrings[i], errp);
- if (sock_fds[i] < 0) {
- g_free(sock_fds);
- sock_fds = NULL;
- goto exit;
- }
- }
-
-exit:
- g_strfreev(substrings);
- return sock_fds;
-}
-
/*
* The exported init function.
*
@@ -496,7 +468,7 @@ int net_init_af_xdp(const Netdev *netdev,
return -1;
}
- if (opts->has_queues && (opts->queues < 0 || opts->queues > UINT_MAX)) {
+ if (opts->has_queues && (opts->queues < 0 || opts->queues > INT_MAX)) {
error_setg(errp, "invalid number of queues (%" PRIi64 ") for '%s'",
opts->queues, opts->ifname);
return -1;
@@ -530,8 +502,7 @@ int net_init_af_xdp(const Netdev *netdev,
}
if (opts->sock_fds) {
- sock_fds = parse_socket_fds(opts->sock_fds, queues, errp);
- if (!sock_fds) {
+ if (net_parse_fds(opts->sock_fds, &sock_fds, queues, errp) < 0) {
return -1;
}
}
diff --git a/net/tap.c b/net/tap.c
index db3fe380a4..883572cdda 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -45,6 +45,7 @@
#include "hw/virtio/vhost.h"
#include "net/tap.h"
+#include "net/util.h"
#include "net/vhost_net.h"
@@ -782,32 +783,6 @@ failed:
return false;
}
-static int get_fds(char *str, char *fds[], int max)
-{
- char *ptr = str, *this;
- size_t len = strlen(str);
- int i = 0;
-
- while (i < max && ptr < str + len) {
- this = strchr(ptr, ':');
-
- if (this == NULL) {
- fds[i] = g_strdup(ptr);
- } else {
- fds[i] = g_strndup(ptr, this - ptr);
- }
-
- i++;
- if (this == NULL) {
- break;
- } else {
- ptr = this + 1;
- }
- }
-
- return i;
-}
-
int net_init_tap(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp)
{
@@ -815,9 +790,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
int fd = -1, vhostfd = -1, vnet_hdr = 0, i = 0, queues;
/* for the no-fd, no-helper case */
char ifname[128];
- char **fds = NULL, **vhost_fds = NULL;
- int nfds = 0, nvhosts = 0;
-
+ int *fds = NULL, *vhost_fds = NULL;
assert(netdev->type == NET_CLIENT_DRIVER_TAP);
tap = &netdev->u.tap;
@@ -890,46 +863,31 @@ int net_init_tap(const Netdev *netdev, const char *name,
goto fail;
}
} else if (tap->fds) {
- fds = g_new0(char *, MAX_TAP_QUEUES);
- vhost_fds = g_new0(char *, MAX_TAP_QUEUES);
-
- nfds = get_fds(tap->fds, fds, MAX_TAP_QUEUES);
- if (tap->vhostfds) {
- nvhosts = get_fds(tap->vhostfds, vhost_fds, MAX_TAP_QUEUES);
- if (nfds != nvhosts) {
- error_setg(errp, "The number of fds passed does not match "
- "the number of vhostfds passed");
- goto fail;
- }
+ queues = net_parse_fds(tap->fds, &fds, 0, errp);
+ if (queues < 0) {
+ goto fail;
}
- for (i = 0; i < nfds; i++) {
- fd = monitor_fd_param(monitor_cur(), fds[i], errp);
- if (fd == -1) {
- goto fail;
- }
+ if (tap->vhostfds && net_parse_fds(tap->vhostfds, &vhost_fds,
+ queues, errp) < 0) {
+ goto fail;
+ }
- if (!qemu_set_blocking(fd, false, errp)) {
+ for (i = 0; i < queues; i++) {
+ if (!qemu_set_blocking(fds[i], false, errp)) {
goto fail;
}
- if (tap->vhostfds) {
- vhostfd = monitor_fd_param(monitor_cur(), vhost_fds[i], errp);
- if (vhostfd == -1) {
- goto fail;
- }
-
- if (!qemu_set_blocking(vhostfd, false, errp)) {
- goto fail;
- }
+ if (vhost_fds && !qemu_set_blocking(vhost_fds[i], false, errp)) {
+ goto fail;
}
if (i == 0) {
- vnet_hdr = tap_probe_vnet_hdr(fd, errp);
+ vnet_hdr = tap_probe_vnet_hdr(fds[i], errp);
if (vnet_hdr < 0) {
goto fail;
}
- } else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {
+ } else if (vnet_hdr != tap_probe_vnet_hdr(fds[i], NULL)) {
error_setg(errp,
"vnet_hdr not consistent across given tap fds");
goto fail;
@@ -937,8 +895,8 @@ int net_init_tap(const Netdev *netdev, const char *name,
if (!net_init_tap_one(tap, peer, name, ifname,
NULL, NULL,
- vhostfd,
- vnet_hdr, fd, errp)) {
+ vhost_fds ? vhost_fds[i] : -1,
+ vnet_hdr, fds[i], errp)) {
goto fail;
}
}
@@ -1003,18 +961,8 @@ int net_init_tap(const Netdev *netdev, const char *name,
fail:
close(fd);
close(vhostfd);
- if (vhost_fds) {
- for (i = 0; i < nvhosts; i++) {
- g_free(vhost_fds[i]);
- }
- g_free(vhost_fds);
- }
- if (fds) {
- for (i = 0; i < nfds; i++) {
- g_free(fds[i]);
- }
- g_free(fds);
- }
+ net_free_fds(fds, queues);
+ net_free_fds(vhost_fds, queues);
return -1;
}
diff --git a/net/util.c b/net/util.c
index 0b3dbfe5d3..1998a6554e 100644
--- a/net/util.c
+++ b/net/util.c
@@ -23,6 +23,8 @@
*/
#include "qemu/osdep.h"
+#include "monitor/monitor.h"
+#include "qapi/error.h"
#include "util.h"
int net_parse_macaddr(uint8_t *macaddr, const char *p)
@@ -57,3 +59,51 @@ int net_parse_macaddr(uint8_t *macaddr, const char *p)
return 0;
}
+
+void net_free_fds(int *fds, int nfds)
+{
+ int i;
+
+ if (!fds || nfds <= 0) {
+ return;
+ }
+
+ for (i = 0; i < nfds; i++) {
+ if (fds[i] != -1) {
+ close(fds[i]);
+ }
+ }
+
+ g_free(fds);
+}
+
+int net_parse_fds(const char *fds_param, int **fds, int expected_nfds,
+ Error **errp)
+{
+ g_auto(GStrv) fdnames = g_strsplit(fds_param, ":", -1);
+ unsigned nfds = g_strv_length(fdnames);
+ int i;
+
+ if (nfds > INT_MAX) {
+ error_setg(errp, "fds parameter exceeds maximum of %d", INT_MAX);
+ return -1;
+ }
+
+ if (expected_nfds && nfds != expected_nfds) {
+ error_setg(errp, "expected %u socket fds, got %u", expected_nfds, nfds);
+ return -1;
+ }
+
+ *fds = g_new(int, nfds);
+
+ for (i = 0; i < nfds; i++) {
+ (*fds)[i] = monitor_fd_param(monitor_cur(), fdnames[i], errp);
+ if ((*fds)[i] == -1) {
+ net_free_fds(*fds, i);
+ *fds = NULL;
+ return -1;
+ }
+ }
+
+ return nfds;
+}
diff --git a/net/util.h b/net/util.h
index 288312979f..4dbc5d416d 100644
--- a/net/util.h
+++ b/net/util.h
@@ -83,4 +83,18 @@ static inline bool in6_equal_net(const struct in6_addr *a,
int net_parse_macaddr(uint8_t *macaddr, const char *p);
+/*
+ * Close all @fds and free @fds itself
+ */
+void net_free_fds(int *fds, int nfds);
+
+/*
+ * Parse @fds_param, where monitor fds are separated by a colon.
+ * @nfds must be non-NULL. If *@nfds is zero - set it accordingly.
+ * If *@nfds is non-zero - check that we have exactly *@nfds fds
+ * and fail otherwise.
+ */
+int net_parse_fds(const char *fds_param, int **fds, int expected_nfds,
+ Error **errp);
+
#endif /* QEMU_NET_UTIL_H */
--
2.52.0© 2016 - 2026 Red Hat, Inc.