From nobody Sat Sep 6 17:22:35 2025 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=1756904023; cv=none; d=zohomail.com; s=zohoarc; b=MNC/BT7Jg0cuyJnt5P63IG/J72IsD++nnRLtKdSwJ4orbtEKpAEVZ9mltBHWtkC4xQ4eckYytfRBVrNWafehJfTgUn6w7E/K1OgvG1Kxf2CgKjnzBx+Krqz2NlvO3aasP6oHR7aQ9eYw415Jkj2wYT6cC6yaZEa7BkMMJliyhFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756904023; 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=5tatC7ljYxtyqmoxHP3w6VyCrJ5BNS7hYtJhdLBq7P4=; b=V9wiC/1xa4hAJkbGj16wzU2ENEG4JPku+gncXe3sorTHfCNRd57UGa76FrJu+cIyuiUa8bwdODVEtsk7bHTixswZRyk/8oRgusEdWpEKw8Efq+WnnKYC4mM1H+HzeNTdyA49biuLplBmsXATESrS8eMA/0NmRuk4IAe1zWbWy2Y= 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 17569040226831012.817191702927; Wed, 3 Sep 2025 05:53:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utmwA-000656-Mc; Wed, 03 Sep 2025 08:50:06 -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 1utmvz-0005xT-3m for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:55 -0400 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500: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 1utmvv-0000nq-0A for qemu-devel@nongnu.org; Wed, 03 Sep 2025 08:49:53 -0400 Received: from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net [IPv6:2a02:6b8:c2d:7394:0:640:5a8a:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id 8631FC01BB; Wed, 03 Sep 2025 15:49:45 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b8f::1:11]) by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id anf8gZ3GnW20-0zA2hjBK; Wed, 03 Sep 2025 15:49:45 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1756903785; bh=5tatC7ljYxtyqmoxHP3w6VyCrJ5BNS7hYtJhdLBq7P4=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=oH1YGUEiv67JxeU9VC9ECVETe0gpIjVz/SAkRX/Ht8Msubq5y91pCp38hSiOF9hZz Vl0icL/IZheLG/7WPWnHQjspkhIGfr+BZe1oqHxFtNvrsDHl8jqQyZNxTMVV8fuSQZ rExDbE+XPJ2kxDqXYk33MMEegLo23XEo8EAjsoUY= Authentication-Results: mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: jasowang@redhat.com Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru, leiyang@redhat.com, steven.sistare@oracle.com, yc-core@yandex-team.ru Subject: [PATCH v3 15/19] net/tap: introduce net_tap_fd_init_external() Date: Wed, 3 Sep 2025 15:49:29 +0300 Message-ID: <20250903124934.1169899-16-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250903124934.1169899-1-vsementsov@yandex-team.ru> References: <20250903124934.1169899-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:c0e:500:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.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_DNSWL_NONE=-0.0001, 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: 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: 1756904023798116600 Content-Type: text/plain; charset="utf-8" Add helper that covers logic for initializing fds, given from monitor or helper. Signed-off-by: Vladimir Sementsov-Ogievskiy Tested-by: Lei Yang --- net/tap.c | 89 ++++++++++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 53 deletions(-) diff --git a/net/tap.c b/net/tap.c index faee5cbeb3..4da3f36b31 100644 --- a/net/tap.c +++ b/net/tap.c @@ -615,13 +615,40 @@ static int net_bridge_run_helper(const char *helper, = const char *bridge, } } =20 +static int net_tap_fd_init_external(const Netdev *netdev, NetClientState *= peer, + const char *model, const char *name, + const char *vhostfdname, + int *pvnet_hdr, int fd, Error **errp) +{ + int vnet_hdr; + + if (!qemu_set_blocking(fd, false, errp)) { + return -1; + } + + vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); + if (pvnet_hdr) { + if (*pvnet_hdr < 0) { + *pvnet_hdr =3D vnet_hdr; + } else if (vnet_hdr !=3D *pvnet_hdr) { + error_setg(errp, + "vnet_hdr not consistent across given tap fds"); + return -1; + } + } + + return net_init_tap_one(netdev, peer, model, name, + NULL, NULL, NULL, + vhostfdname, vnet_hdr, fd, errp); +} + int net_init_bridge(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { const NetdevTapOptions *tap =3D NULL; const NetdevBridgeOptions *bridge =3D NULL; const char *helper, *br; - int fd, vnet_hdr, ret; + int fd; =20 if (netdev->type =3D=3D NET_CLIENT_DRIVER_BRIDGE) { bridge =3D &netdev->u.bridge; @@ -640,25 +667,8 @@ int net_init_bridge(const Netdev *netdev, const char *= name, return -1; } =20 - if (!qemu_set_blocking(fd, false, errp)) { - return -1; - } - vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); - if (vnet_hdr < 0) { - close(fd); - return -1; - } - - ret =3D net_init_tap_one(netdev, peer, "bridge", name, - NULL, NULL, NULL, - tap ? tap->vhostfd : NULL, - vnet_hdr, fd, errp); - if (ret < 0) { - close(fd); - return -1; - } - - return 0; + return net_tap_fd_init_external(netdev, peer, "bridge", name, + tap ? tap->vhostfd : NULL, NULL, fd, e= rrp); } =20 static int net_tap_open_one(const Netdev *netdev, @@ -889,20 +899,8 @@ int net_init_tap(const Netdev *netdev, const char *nam= e, return -1; } =20 - if (!qemu_set_blocking(fd, false, errp)) { - close(fd); - return -1; - } - - vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); - if (vnet_hdr < 0) { - close(fd); - return -1; - } - - return net_init_tap_one(netdev, peer, "tap", name, NULL, - NULL, NULL, - tap->vhostfd, vnet_hdr, fd, errp); + return net_tap_fd_init_external(netdev, peer, "tap", name, + tap->vhostfd, NULL, fd, errp); } else if (tap->fds) { g_auto(GStrv) fds =3D NULL; g_auto(GStrv) vhost_fds =3D NULL; @@ -925,31 +923,16 @@ int net_init_tap(const Netdev *netdev, const char *na= me, } } =20 + vnet_hdr =3D -1; for (i =3D 0; i < nfds; i++) { fd =3D monitor_fd_param(monitor_cur(), fds[i], errp); if (fd =3D=3D -1) { return -1; } =20 - if (!qemu_set_blocking(fd, false, errp)) { - return -1; - } - - if (i =3D=3D 0) { - vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); - if (vnet_hdr < 0) { - return -1; - } - } else if (vnet_hdr !=3D tap_probe_vnet_hdr(fd, NULL)) { - error_setg(errp, - "vnet_hdr not consistent across given tap fds"); - return -1; - } - - ret =3D net_init_tap_one(netdev, peer, "tap", name, NULL, - NULL, NULL, - vhost_fds ? vhost_fds[i] : NULL, - vnet_hdr, fd, errp); + ret =3D net_tap_fd_init_external(netdev, peer, "tap", name, + vhost_fds ? vhost_fds[i] : NULL, + &vnet_hdr, fd, errp); if (ret < 0) { return -1; } --=20 2.48.1