From nobody Sat Nov 15 05:18:17 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=1755965173; cv=none; d=zohomail.com; s=zohoarc; b=Lb8no53vZzr5C9xW5QlNEiDknXt3QCHazKDd4XLrUeVCsQHgX4Omc40avDZnxsGF2wn0Wj3KKsl8hc54jXM4y+Wk+ev50fZeWXsA/PX85aM7VZ0dMlA4QKc7jS8FyUFkwdUlUUM59uTZKFqJUeTYgpduFIU4klvv2lw/8glh4Lc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755965173; 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=iCMpe6H9zgD4Oe3l2qTjpaIzp666FTTnH4nSF1tKuI8=; b=Pbqe95RRGwX0TtN9MRb1GhpZdmaWfzyw324velcHF4b3NVGYB3sMPcCkyw35NUKPoc5Vrh5zd2AF5MjtyEcGKL9G6i/S1ru+Saeeu5C7jCRsBMNEnJvq7QqLoWfGQ9KtSym+4aF5fOlu8tB6pzJIk3UYrGrvRnv9bC1wPsa9ND0= 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 1755965173734958.4242920334267; Sat, 23 Aug 2025 09:06:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upqil-0005Qa-Vz; Sat, 23 Aug 2025 12:04:00 -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 1upqiT-0005LI-7s for qemu-devel@nongnu.org; Sat, 23 Aug 2025 12:03:42 -0400 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 1upqiQ-0000JN-SM for qemu-devel@nongnu.org; Sat, 23 Aug 2025 12:03:41 -0400 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:c23:36c1:0:640:5f85:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 987068074D; Sat, 23 Aug 2025 19:03:35 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:c91::1:b]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Q3YUrj0Gl8c0-UiUUpzB1; Sat, 23 Aug 2025 19:03:35 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1755965015; bh=iCMpe6H9zgD4Oe3l2qTjpaIzp666FTTnH4nSF1tKuI8=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=Dfy8Ro8fFonlrbDeOD1yxB6LO+I7ZwnefpXGussxsMgWJdPIGKeldUbizB0nDT4uB 017Az0q7uP5dfCYtYauokTgPNm20pthE0s1UbblbKSqUf76AhbZuQEbKdOHlUEDqsO jKVLJ/Rs/i4UHQZljHsfhM2bzqCXw+pGpyNidsXk= 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, vsementsov@yandex-team.ru, leiyang@redhat.com, steven.sistare@oracle.com Subject: [PATCH v2 16/20] net/tap: introduce net_tap_fd_init_external() Date: Sat, 23 Aug 2025 19:03:19 +0300 Message-ID: <20250823160323.20811-17-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250823160323.20811-1-vsementsov@yandex-team.ru> References: <20250823160323.20811-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 Precedence: list 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: 1755965175343124100 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 --- net/tap.c | 90 ++++++++++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/net/tap.c b/net/tap.c index 27642c45a9..8cea6ed87b 100644 --- a/net/tap.c +++ b/net/tap.c @@ -627,13 +627,40 @@ static bool set_fd_nonblocking(int fd, const char *no= te, Error **errp) return ok; } =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 (!set_fd_nonblocking(fd, name, 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; @@ -652,26 +679,8 @@ int net_init_bridge(const Netdev *netdev, const char *= name, return -1; } =20 - if (!set_fd_nonblocking(fd, name, 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, @@ -902,20 +911,8 @@ int net_init_tap(const Netdev *netdev, const char *nam= e, return -1; } =20 - if (!set_fd_nonblocking(fd, tap->fd, 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; @@ -938,31 +935,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 (!set_fd_nonblocking(fd, fds[i], 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