From nobody Tue Feb 10 18:55:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1769722416; cv=none; d=zohomail.com; s=zohoarc; b=JzSq1jDG0nfVrQ5IZHlDk2bMiSaJ42MqpJCQBrnOFc3br4bCziC5VdwezHNKS7yVcaH6YUs8eDGU7Jl2RfXzSr+l1PGwtD8iRejQnXPD8JeECPOXTpspsnGXCa2iKMx3I2uXskNeMzq3sqwYa5h3W8Vnr/T3GxxBXMJtRkI7Tck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769722416; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4Sk0u0b1f0O4jSKRi8ub6puWTSawxmhIEilzYfRNx14=; b=Hp8bhWVLt30pCNlzkxWYa3Gv38tQZCm9qNX19lLZWgSVRhDjb041uJtFBsRlJRknKVtnLWlGMMKp13m0U66dY71fSiaE7gNzTeLOHgoK8FthyHkgOxLfUukok6+7MdNy+lnAsQJKWcsu0dCDZoLk+kfzhDQBuvBfDwolIwkOoLo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769722416152215.76705147275777; Thu, 29 Jan 2026 13:33:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vlZcu-0001aX-Tw; Thu, 29 Jan 2026 16:32:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vlZcr-0001WF-Po for qemu-devel@nongnu.org; Thu, 29 Jan 2026 16:32:29 -0500 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vlZcp-00019N-8R for qemu-devel@nongnu.org; Thu, 29 Jan 2026 16:32:29 -0500 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id EF0F980808; Fri, 30 Jan 2026 00:32:25 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:b74::1:d]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id IWrbZO5AAOs0-mv83y6pd; Fri, 30 Jan 2026 00:32:25 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1769722345; bh=4Sk0u0b1f0O4jSKRi8ub6puWTSawxmhIEilzYfRNx14=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=m2ngTxQEwLAxUox6L14SgGG3eDz3kM/wen+JhjESqahJ/0VjRj0mTBSZvZqtpi092 qHr9zOXgmk72cw4S7+M1k4WhJFNw7Xg+s7HMuZHiAr0M4ey60nctuBtw/mWW+9c/U5 8j3DaH76gGDbUNbMU+SE+y7Aaxi9wSzzqCKj2vGo= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: jasowang@redhat.com Cc: qemu-devel@nongnu.org, bchaney@akamai.com, yc-core@yandex-team.ru, d-tatianin@yandex-team.ru, davydov-max@yandex-team.ru, vsementsov@yandex-team.ru Subject: [PATCH v2 09/12] net/tap: move fds parameters handling to separate functions Date: Fri, 30 Jan 2026 00:32:11 +0300 Message-ID: <20260129213215.1405459-10-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129213215.1405459-1-vsementsov@yandex-team.ru> References: <20260129213215.1405459-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1769722418417158500 Content-Type: text/plain; charset="utf-8" This significantly simplify the code in net_init_tap(). Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 99 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 34 deletions(-) diff --git a/net/tap.c b/net/tap.c index 883572cdda..dbbbe3c500 100644 --- a/net/tap.c +++ b/net/tap.c @@ -783,6 +783,61 @@ failed: return false; } =20 +static bool unblock_fds(int *fds, unsigned nfds, Error **errp) +{ + for (unsigned i =3D 0; i < nfds; i++) { + if (!qemu_set_blocking(fds[i], false, errp)) { + return false; + } + } + + return true; +} + +static int tap_parse_fds_and_queues(const NetdevTapOptions *tap, int **fds, + Error **errp) +{ + unsigned queues; + + if (tap->has_queues + !!tap->helper + !!tap->fds + !!tap->fd > 1) { + error_setg(errp, "queues=3D, helper=3D, fds=3D and fd=3D are mutua= l exclusive"); + return -1; + } + + if (tap->has_queues) { + if (tap->queues > INT_MAX) { + error_setg(errp, "queues exceeds maximum %d", INT_MAX); + return -1; + } + queues =3D tap->queues; + *fds =3D NULL; + } else if (tap->fd || tap->fds) { + queues =3D net_parse_fds(tap->fd ?: tap->fds, fds, + tap->fd ? 1 : 0, errp); + if (!*fds) { + return -1; + } + } else if (tap->helper) { + int fd =3D net_bridge_run_helper(tap->helper, + tap->br ?: DEFAULT_BRIDGE_INTERFACE, + errp); + if (fd < 0) { + return -1; + } + + queues =3D 1; + *fds =3D g_new(int, 1); + **fds =3D fd; + } + + if (*fds && !unblock_fds(*fds, queues, errp)) { + net_free_fds(*fds, queues); + return -1; + } + + return queues; +} + int net_init_tap(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { @@ -794,7 +849,6 @@ int net_init_tap(const Netdev *netdev, const char *name, =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_TAP); tap =3D &netdev->u.tap; - queues =3D tap->has_queues ? tap->queues : 1; =20 /* QEMU hubs do not support multiqueue tap, in this case peer is set. * For -netdev, peer is always NULL. */ @@ -831,10 +885,15 @@ int net_init_tap(const Netdev *netdev, const char *na= me, return -1; } =20 + queues =3D tap_parse_fds_and_queues(tap, &fds, errp); + if (queues < 0) { + return -1; + } + if (tap->vhostfd) { vhostfd =3D monitor_fd_param(monitor_cur(), tap->vhostfd, errp); if (vhostfd =3D=3D -1) { - return -1; + goto fail; } =20 if (!qemu_set_blocking(vhostfd, false, errp)) { @@ -843,41 +902,23 @@ int net_init_tap(const Netdev *netdev, const char *na= me, } =20 if (tap->fd) { - fd =3D monitor_fd_param(monitor_cur(), tap->fd, errp); - if (fd =3D=3D -1) { - goto fail; - } - - if (!qemu_set_blocking(fd, false, errp)) { - goto fail; - } - - vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); + vnet_hdr =3D tap_probe_vnet_hdr(fds[0], errp); if (vnet_hdr < 0) { goto fail; } =20 if (!net_init_tap_one(tap, peer, name, NULL, NULL, NULL, - vhostfd, vnet_hdr, fd, errp)) { + vhostfd, vnet_hdr, fds[0], errp)) { goto fail; } } else if (tap->fds) { - queues =3D net_parse_fds(tap->fds, &fds, 0, errp); - if (queues < 0) { - goto fail; - } - if (tap->vhostfds && net_parse_fds(tap->vhostfds, &vhost_fds, queues, errp) < 0) { goto fail; } =20 for (i =3D 0; i < queues; i++) { - if (!qemu_set_blocking(fds[i], false, errp)) { - goto fail; - } - if (vhost_fds && !qemu_set_blocking(vhost_fds[i], false, errp)= ) { goto fail; } @@ -901,24 +942,14 @@ int net_init_tap(const Netdev *netdev, const char *na= me, } } } else if (tap->helper) { - fd =3D net_bridge_run_helper(tap->helper, - tap->br ?: DEFAULT_BRIDGE_INTERFACE, - errp); - if (fd =3D=3D -1) { - goto fail; - } - - if (!qemu_set_blocking(fd, false, errp)) { - goto fail; - } - vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); + vnet_hdr =3D tap_probe_vnet_hdr(fds[0], errp); if (vnet_hdr < 0) { goto fail; } =20 if (!net_init_tap_one(tap, peer, name, ifname, NULL, NULL, vhostfd, - vnet_hdr, fd, errp)) { + vnet_hdr, fds[0], errp)) { goto fail; } } else { --=20 2.52.0