From nobody Fri Mar 27 06:36:37 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=1773833573; cv=none; d=zohomail.com; s=zohoarc; b=A117SkiG9ntACyrb7eFVT2ilmkR0zk8XxtrQ5v4rLB0HyTMABG3drsO4JFGR0xY1F2+oN5s8A6ZeRjmyj5fhXN2fUbkPTAZR44iugRxXm+7zrC8OhkPfBHqlT8w6Jzn4z422jY1jhnu5TgUMIVH0BOxQ0ErWRCcnQB+FTN4TQ2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773833573; 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=fDRiWx7StjplPNhAZ4Pj//bPZgbSiCKeduwVS+rEc4o=; b=B0C90QAhN0q08k7gJMaV1lu3Z4TY1QMPeIW6MzHqzd9jeBeuomdLPtqKp8RNauU9xAsezdp0g1DkF1H2DA1s0pJQdtmuT8ODO/DfpstJbComcQSBVHrTQOPGJV1PLzpVZeG/0aebsRdkcuwJhp97w121HlZ6vpzNv15KLKLhDmM= 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 1773833572767688.4304057340806; Wed, 18 Mar 2026 04:32:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2p8b-0006l5-Ho; Wed, 18 Mar 2026 07:32:34 -0400 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 1w2p8D-0006hu-2V for qemu-devel@nongnu.org; Wed, 18 Mar 2026 07:32:10 -0400 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2p8A-0001yF-Uv for qemu-devel@nongnu.org; Wed, 18 Mar 2026 07:32:08 -0400 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c24:fa2:0:640:41ee:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 4D56C808B6; Wed, 18 Mar 2026 14:32:05 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:431::1:10]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id kVLGYB2A1mI0-9qRFtQHy; Wed, 18 Mar 2026 14:32:04 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1773833524; bh=fDRiWx7StjplPNhAZ4Pj//bPZgbSiCKeduwVS+rEc4o=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=1VGvg+s8YcN69O11foGq3N7Di1VdPAtQebReRzIz2LuoQe4RFZZ6LRvaRfkz+71wd 8blRjPukjeCUtoXajcnC2elxZ34qiw+gMnyEgFMIWwQznOqTR6xoymC4O0k9ZUGyMa u6qQU5BJaZAoPMdmFPz1r6VZRwLZccGQ4xswFbCA= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.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 v4 10/13] net/tap: fix vhostfds/vhostfd parameters API Date: Wed, 18 Mar 2026 14:31:40 +0300 Message-ID: <20260318113144.15697-11-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260318113144.15697-1-vsementsov@yandex-team.ru> References: <20260318113144.15697-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=2a02:6b8:c02:900:1:45:d181:df01; 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, 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: 1773833577932158500 Content-Type: text/plain; charset="utf-8" There is a bug in the interface: we don't allow vhostfds argument together with queues. But we allow vhostfd, and try use it for all queues of multiqueue TAP. Let's relax the restriction. We already check that number of vhost fds match queues (or number of fds). So, no matter do vhost fds come from vhostfds or vhostfd argument. Let's use correct vhost fds for multiqueue TAP. To achieve this we move vhost fds parsing to separate function and call it earlier in net_init_tap(). Then we have vhost fds available (and already checked) for all further cases. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Ben Chaney --- net/tap.c | 63 ++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/net/tap.c b/net/tap.c index b794f80e34d..d5a719150b4 100644 --- a/net/tap.c +++ b/net/tap.c @@ -836,11 +836,32 @@ static int tap_parse_fds_and_queues(const NetdevTapOp= tions *tap, int **fds, return queues; } =20 +static bool tap_parse_vhost_fds(const NetdevTapOptions *tap, int **vhost_f= ds, + int queues, Error **errp) +{ + if (!(tap->vhostfd || tap->vhostfds)) { + *vhost_fds =3D NULL; + return true; + } + + if (net_parse_fds(tap->vhostfd ?: tap->vhostfds, + vhost_fds, queues, errp) < 0) { + return false; + } + + if (!unblock_fds(*vhost_fds, queues, errp)) { + net_free_fds(*vhost_fds, queues); + return false; + } + + return true; +} + int net_init_tap(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { const NetdevTapOptions *tap; - int fd =3D -1, vhostfd =3D -1, vnet_hdr =3D 0, i =3D 0, queues; + int fd =3D -1, vnet_hdr =3D 0, i =3D 0, queues; /* for the no-fd, no-helper case */ char ifname[128]; int *fds =3D NULL, *vhost_fds =3D NULL; @@ -873,30 +894,13 @@ int net_init_tap(const Netdev *netdev, const char *na= me, return -1; } =20 - if (tap->vhostfds && !tap->fds) { - error_setg(errp, "vhostfds=3D is invalid if fds=3D wasn't specifie= d"); - return -1; - } - - if (tap->vhostfd && tap->fds) { - error_setg(errp, "vhostfd=3D is invalid with fds=3D"); - return -1; - } - queues =3D tap_parse_fds_and_queues(tap, &fds, errp); if (queues < 0) { return -1; } =20 - if (tap->vhostfd) { - vhostfd =3D monitor_fd_param(monitor_cur(), tap->vhostfd, errp); - if (vhostfd =3D=3D -1) { - goto fail; - } - - if (!qemu_set_blocking(vhostfd, false, errp)) { - goto fail; - } + if (!tap_parse_vhost_fds(tap, &vhost_fds, queues, errp)) { + goto fail; } =20 if (tap->fd) { @@ -907,20 +911,12 @@ int net_init_tap(const Netdev *netdev, const char *na= me, =20 if (!net_init_tap_one(tap, peer, name, NULL, NULL, NULL, - vhostfd, vnet_hdr, fds[0], errp)) { + vhost_fds ? vhost_fds[0] : -1, + vnet_hdr, fds[0], errp)) { goto fail; } } else if (tap->fds) { - if (tap->vhostfds && net_parse_fds(tap->vhostfds, &vhost_fds, - queues, errp) < 0) { - goto fail; - } - for (i =3D 0; i < queues; i++) { - if (vhost_fds && !qemu_set_blocking(vhost_fds[i], false, errp)= ) { - goto fail; - } - if (i =3D=3D 0) { vnet_hdr =3D tap_probe_vnet_hdr(fds[i], errp); if (vnet_hdr < 0) { @@ -946,7 +942,8 @@ int net_init_tap(const Netdev *netdev, const char *name, } =20 if (!net_init_tap_one(tap, peer, name, ifname, - NULL, NULL, vhostfd, + NULL, NULL, + vhost_fds ? vhost_fds[0] : -1, vnet_hdr, fds[0], errp)) { goto fail; } @@ -979,7 +976,8 @@ int net_init_tap(const Netdev *netdev, const char *name, if (!net_init_tap_one(tap, peer, name, ifname, i >=3D 1 ? NULL : script, i >=3D 1 ? NULL : downscript, - vhostfd, vnet_hdr, fd, errp)) { + vhost_fds ? vhost_fds[i] : -1, + vnet_hdr, fd, errp)) { goto fail; } } @@ -989,7 +987,6 @@ int net_init_tap(const Netdev *netdev, const char *name, =20 fail: close(fd); - close(vhostfd); net_free_fds(fds, queues); net_free_fds(vhost_fds, queues); return -1; --=20 2.52.0