Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2197889/?format=api
{ "id": 2197889, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2197889/?format=api", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.0/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260218202829.1322088-9-vsementsov@yandex-team.ru>", "date": "2026-02-18T20:28:24", "name": "[v3,08/12] net: introduce net_parse_fds()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "21f80933212f0cbf69002c830f981626a95d5c37", "submitter": { "id": 84116, "url": "http://patchwork.ozlabs.org/api/1.0/people/84116/?format=api", "name": "Vladimir Sementsov-Ogievskiy", "email": "vsementsov@yandex-team.ru" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260218202829.1322088-9-vsementsov@yandex-team.ru/mbox/", "series": [ { "id": 492602, "url": "http://patchwork.ozlabs.org/api/1.0/series/492602/?format=api", "date": "2026-02-18T20:28:20", "name": "net: refactoring and fixes", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/492602/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2197889/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru\n header.a=rsa-sha256 header.s=default header.b=A/S2jqPr;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)", "mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net;\n dkim=pass header.i=@yandex-team.ru" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fGSmz11Yzz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 19 Feb 2026 07:30:11 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vsoAT-0007Ce-Lc; Wed, 18 Feb 2026 15:29:05 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <vsementsov@yandex-team.ru>)\n id 1vsoA6-00075a-GX\n for qemu-devel@nongnu.org; Wed, 18 Feb 2026 15:28:42 -0500", "from forwardcorp1a.mail.yandex.net\n ([2a02:6b8:c0e:500:1:45:d181:df01])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <vsementsov@yandex-team.ru>)\n id 1vsoA4-0007sW-Dm\n for qemu-devel@nongnu.org; Wed, 18 Feb 2026 15:28:42 -0500", "from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net\n (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net\n [IPv6:2a02:6b8:c2d:3530:0:640:eca4:0])\n by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id 34C00C0392;\n Wed, 18 Feb 2026 23:28:39 +0300 (MSK)", "from vsementsov-lin (unknown [2a02:6bf:8080:53d::1:1b])\n by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with\n ESMTPSA id VShB144A8iE0-DH4i0Afb; Wed, 18 Feb 2026 23:28:38 +0300" ], "Precedence": "bulk", "X-Yandex-Fwd": "1", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru;\n s=default; t=1771446518;\n bh=dhvf7c3k/uO9jHIwPOa/zbw14qpoj7QwL07+jRiyYfw=;\n h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From;\n b=A/S2jqPrfAI1xZjnTaiQEAdpO/I/JdmXKWZ5ewbnbHJQEgu5bclzoghkNyJiPuELQ\n tzWM+DNhmhCTBnKcDiEYtbw72mQVSxkVD4PQrOk8sCG9eNV5/rUwROtX79UCURxfQg\n vlxIGkWW0BzIl/HTgn951+xKECtxPvxIcU8XRIuE=", "From": "Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>", "To": "jasowang@redhat.com", "Cc": "qemu-devel@nongnu.org, bchaney@akamai.com, yc-core@yandex-team.ru,\n d-tatianin@yandex-team.ru, davydov-max@yandex-team.ru,\n vsementsov@yandex-team.ru, Ilya Maximets <i.maximets@ovn.org>", "Subject": "[PATCH v3 08/12] net: introduce net_parse_fds()", "Date": "Wed, 18 Feb 2026 23:28:24 +0300", "Message-ID": "<20260218202829.1322088-9-vsementsov@yandex-team.ru>", "X-Mailer": "git-send-email 2.52.0", "In-Reply-To": "<20260218202829.1322088-1-vsementsov@yandex-team.ru>", "References": "<20260218202829.1322088-1-vsementsov@yandex-team.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2a02:6b8:c0e:500:1:45:d181:df01;\n envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net", "X-Spam_score_int": "-27", "X-Spam_score": "-2.8", "X-Spam_bar": "--", "X-Spam_report": "(-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Add common net_parse_fds() and net_free_fds() helpers and use them\nin tap.c and af-xdp.c.\n\nChoose returning queues instead of fds, because we'll have derived\nhelper in net/tap, which will be able to return fds=NULL and non-zero\nqueues on success. That's also why we move to INT_MAX for queues, to\nsupport negative return value for net_parse_fds() (for failure paths).\n\nNote that redundant restriction of MAX_TAP_QUEUES is dropped for tap.c\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>\n---\n net/af-xdp.c | 33 ++-----------------\n net/tap.c | 92 +++++++++++-----------------------------------------\n net/util.c | 50 ++++++++++++++++++++++++++++\n net/util.h | 14 ++++++++\n 4 files changed, 85 insertions(+), 104 deletions(-)", "diff": "diff --git a/net/af-xdp.c b/net/af-xdp.c\nindex ff1cb30a98..1ffd6363a8 100644\n--- a/net/af-xdp.c\n+++ b/net/af-xdp.c\n@@ -21,6 +21,7 @@\n #include \"clients.h\"\n #include \"monitor/monitor.h\"\n #include \"net/net.h\"\n+#include \"net/util.h\"\n #include \"qapi/error.h\"\n #include \"qemu/cutils.h\"\n #include \"qemu/error-report.h\"\n@@ -441,35 +442,6 @@ static NetClientInfo net_af_xdp_info = {\n .cleanup = af_xdp_cleanup,\n };\n \n-static int *parse_socket_fds(const char *sock_fds_str,\n- int n_expected, Error **errp)\n-{\n- gchar **substrings = g_strsplit(sock_fds_str, \":\", -1);\n- int i, n_sock_fds = g_strv_length(substrings);\n- int *sock_fds = NULL;\n-\n- if (n_sock_fds != n_expected) {\n- error_setg(errp, \"expected %d socket fds, got %d\",\n- n_expected, n_sock_fds);\n- goto exit;\n- }\n-\n- sock_fds = g_new(int, n_sock_fds);\n-\n- for (i = 0; i < n_sock_fds; i++) {\n- sock_fds[i] = monitor_fd_param(monitor_cur(), substrings[i], errp);\n- if (sock_fds[i] < 0) {\n- g_free(sock_fds);\n- sock_fds = NULL;\n- goto exit;\n- }\n- }\n-\n-exit:\n- g_strfreev(substrings);\n- return sock_fds;\n-}\n-\n /*\n * The exported init function.\n *\n@@ -530,8 +502,7 @@ int net_init_af_xdp(const Netdev *netdev,\n }\n \n if (opts->sock_fds) {\n- sock_fds = parse_socket_fds(opts->sock_fds, queues, errp);\n- if (!sock_fds) {\n+ if (net_parse_fds(opts->sock_fds, &sock_fds, queues, errp) < 0) {\n return -1;\n }\n }\ndiff --git a/net/tap.c b/net/tap.c\nindex db3fe380a4..2d4630c350 100644\n--- a/net/tap.c\n+++ b/net/tap.c\n@@ -45,6 +45,7 @@\n #include \"hw/virtio/vhost.h\"\n \n #include \"net/tap.h\"\n+#include \"net/util.h\"\n \n #include \"net/vhost_net.h\"\n \n@@ -701,8 +702,6 @@ static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr,\n return fd;\n }\n \n-#define MAX_TAP_QUEUES 1024\n-\n static bool net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,\n const char *name,\n const char *ifname, const char *script,\n@@ -782,32 +781,6 @@ failed:\n return false;\n }\n \n-static int get_fds(char *str, char *fds[], int max)\n-{\n- char *ptr = str, *this;\n- size_t len = strlen(str);\n- int i = 0;\n-\n- while (i < max && ptr < str + len) {\n- this = strchr(ptr, ':');\n-\n- if (this == NULL) {\n- fds[i] = g_strdup(ptr);\n- } else {\n- fds[i] = g_strndup(ptr, this - ptr);\n- }\n-\n- i++;\n- if (this == NULL) {\n- break;\n- } else {\n- ptr = this + 1;\n- }\n- }\n-\n- return i;\n-}\n-\n int net_init_tap(const Netdev *netdev, const char *name,\n NetClientState *peer, Error **errp)\n {\n@@ -815,9 +788,7 @@ int net_init_tap(const Netdev *netdev, const char *name,\n int fd = -1, vhostfd = -1, vnet_hdr = 0, i = 0, queues;\n /* for the no-fd, no-helper case */\n char ifname[128];\n- char **fds = NULL, **vhost_fds = NULL;\n- int nfds = 0, nvhosts = 0;\n-\n+ int *fds = NULL, *vhost_fds = NULL;\n \n assert(netdev->type == NET_CLIENT_DRIVER_TAP);\n tap = &netdev->u.tap;\n@@ -890,46 +861,31 @@ int net_init_tap(const Netdev *netdev, const char *name,\n goto fail;\n }\n } else if (tap->fds) {\n- fds = g_new0(char *, MAX_TAP_QUEUES);\n- vhost_fds = g_new0(char *, MAX_TAP_QUEUES);\n-\n- nfds = get_fds(tap->fds, fds, MAX_TAP_QUEUES);\n- if (tap->vhostfds) {\n- nvhosts = get_fds(tap->vhostfds, vhost_fds, MAX_TAP_QUEUES);\n- if (nfds != nvhosts) {\n- error_setg(errp, \"The number of fds passed does not match \"\n- \"the number of vhostfds passed\");\n- goto fail;\n- }\n+ queues = net_parse_fds(tap->fds, &fds, 0, errp);\n+ if (queues < 0) {\n+ goto fail;\n }\n \n- for (i = 0; i < nfds; i++) {\n- fd = monitor_fd_param(monitor_cur(), fds[i], errp);\n- if (fd == -1) {\n- goto fail;\n- }\n+ if (tap->vhostfds && net_parse_fds(tap->vhostfds, &vhost_fds,\n+ queues, errp) < 0) {\n+ goto fail;\n+ }\n \n- if (!qemu_set_blocking(fd, false, errp)) {\n+ for (i = 0; i < queues; i++) {\n+ if (!qemu_set_blocking(fds[i], false, errp)) {\n goto fail;\n }\n \n- if (tap->vhostfds) {\n- vhostfd = monitor_fd_param(monitor_cur(), vhost_fds[i], errp);\n- if (vhostfd == -1) {\n- goto fail;\n- }\n-\n- if (!qemu_set_blocking(vhostfd, false, errp)) {\n- goto fail;\n- }\n+ if (vhost_fds && !qemu_set_blocking(vhost_fds[i], false, errp)) {\n+ goto fail;\n }\n \n if (i == 0) {\n- vnet_hdr = tap_probe_vnet_hdr(fd, errp);\n+ vnet_hdr = tap_probe_vnet_hdr(fds[i], errp);\n if (vnet_hdr < 0) {\n goto fail;\n }\n- } else if (vnet_hdr != tap_probe_vnet_hdr(fd, NULL)) {\n+ } else if (vnet_hdr != tap_probe_vnet_hdr(fds[i], NULL)) {\n error_setg(errp,\n \"vnet_hdr not consistent across given tap fds\");\n goto fail;\n@@ -937,8 +893,8 @@ int net_init_tap(const Netdev *netdev, const char *name,\n \n if (!net_init_tap_one(tap, peer, name, ifname,\n NULL, NULL,\n- vhostfd,\n- vnet_hdr, fd, errp)) {\n+ vhost_fds ? vhost_fds[i] : -1,\n+ vnet_hdr, fds[i], errp)) {\n goto fail;\n }\n }\n@@ -1003,18 +959,8 @@ int net_init_tap(const Netdev *netdev, const char *name,\n fail:\n close(fd);\n close(vhostfd);\n- if (vhost_fds) {\n- for (i = 0; i < nvhosts; i++) {\n- g_free(vhost_fds[i]);\n- }\n- g_free(vhost_fds);\n- }\n- if (fds) {\n- for (i = 0; i < nfds; i++) {\n- g_free(fds[i]);\n- }\n- g_free(fds);\n- }\n+ net_free_fds(fds, queues);\n+ net_free_fds(vhost_fds, queues);\n return -1;\n }\n \ndiff --git a/net/util.c b/net/util.c\nindex 0b3dbfe5d3..1998a6554e 100644\n--- a/net/util.c\n+++ b/net/util.c\n@@ -23,6 +23,8 @@\n */\n \n #include \"qemu/osdep.h\"\n+#include \"monitor/monitor.h\"\n+#include \"qapi/error.h\"\n #include \"util.h\"\n \n int net_parse_macaddr(uint8_t *macaddr, const char *p)\n@@ -57,3 +59,51 @@ int net_parse_macaddr(uint8_t *macaddr, const char *p)\n \n return 0;\n }\n+\n+void net_free_fds(int *fds, int nfds)\n+{\n+ int i;\n+\n+ if (!fds || nfds <= 0) {\n+ return;\n+ }\n+\n+ for (i = 0; i < nfds; i++) {\n+ if (fds[i] != -1) {\n+ close(fds[i]);\n+ }\n+ }\n+\n+ g_free(fds);\n+}\n+\n+int net_parse_fds(const char *fds_param, int **fds, int expected_nfds,\n+ Error **errp)\n+{\n+ g_auto(GStrv) fdnames = g_strsplit(fds_param, \":\", -1);\n+ unsigned nfds = g_strv_length(fdnames);\n+ int i;\n+\n+ if (nfds > INT_MAX) {\n+ error_setg(errp, \"fds parameter exceeds maximum of %d\", INT_MAX);\n+ return -1;\n+ }\n+\n+ if (expected_nfds && nfds != expected_nfds) {\n+ error_setg(errp, \"expected %u socket fds, got %u\", expected_nfds, nfds);\n+ return -1;\n+ }\n+\n+ *fds = g_new(int, nfds);\n+\n+ for (i = 0; i < nfds; i++) {\n+ (*fds)[i] = monitor_fd_param(monitor_cur(), fdnames[i], errp);\n+ if ((*fds)[i] == -1) {\n+ net_free_fds(*fds, i);\n+ *fds = NULL;\n+ return -1;\n+ }\n+ }\n+\n+ return nfds;\n+}\ndiff --git a/net/util.h b/net/util.h\nindex 288312979f..4dbc5d416d 100644\n--- a/net/util.h\n+++ b/net/util.h\n@@ -83,4 +83,18 @@ static inline bool in6_equal_net(const struct in6_addr *a,\n \n int net_parse_macaddr(uint8_t *macaddr, const char *p);\n \n+/*\n+ * Close all @fds and free @fds itself\n+ */\n+void net_free_fds(int *fds, int nfds);\n+\n+/*\n+ * Parse @fds_param, where monitor fds are separated by a colon.\n+ * @nfds must be non-NULL. If *@nfds is zero - set it accordingly.\n+ * If *@nfds is non-zero - check that we have exactly *@nfds fds\n+ * and fail otherwise.\n+ */\n+int net_parse_fds(const char *fds_param, int **fds, int expected_nfds,\n+ Error **errp);\n+\n #endif /* QEMU_NET_UTIL_H */\n", "prefixes": [ "v3", "08/12" ] }