From nobody Mon Feb 9 07:39:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652196392; cv=none; d=zohomail.com; s=zohoarc; b=e0sqtBg/AL0dEUNHuknrBQ8J1r6KvF/YSbB+hHtDSZ0jgJorHvUZL+oL6+oXXwpKmcXd04EjvQQMWs/RSuXmBpsBpnju/ryjbce9nQ/gDunZwwBc76LqhtdJvvqafm1lemk4EGbJhFgH8qRZBo+EZtVl7CzD7wBJ0FbW91IN94M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652196392; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PL7TEpCW/gV2p9FmdnzRObt8hh35ahCfIhVaS4DE+rI=; b=b6ed6JFBJt/LpG3ZlURAoiE7Ov+sFu93hnX6VfURdTGHIH9AaCsnLDjxpwuVYQ7c+qTZ9az5Rht0Jail2BDeKqo1+GCgLe7Lzz2qbrf9fSZj1rgdXiWG6W3VMNFWux0xwAgOIlINa/YTl/HC5GkeeSFVKQA5E5IjchjN02JszBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1652196392866844.9884457692169; Tue, 10 May 2022 08:26:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-hf1xdgVlOL2mH_qknycS9A-1; Tue, 10 May 2022 11:23:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C93523831C74; Tue, 10 May 2022 15:23:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B35941460E5C; Tue, 10 May 2022 15:23:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 744EE1947064; Tue, 10 May 2022 15:23:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5AA84194706D for ; Tue, 10 May 2022 15:23:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3943B202699A; Tue, 10 May 2022 15:23:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A80F22024CBD for ; Tue, 10 May 2022 15:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652196391; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=PL7TEpCW/gV2p9FmdnzRObt8hh35ahCfIhVaS4DE+rI=; b=eKqMNwmB+OXEpBRM/2haW+69IpWDGNaZCsng/oM+7rtAbPz7kKX1QAGgnf+h1HZKHhUNX3 z6sOZ6zZWZrGUVKg+cvA7zjQM7v+tClxmCEYB4GUlRBKwCFlzCYsvFH2fh5ux56zivVGYN 8KpVrBAn8/B5sga5MJKo6TZnFgmXbws= X-MC-Unique: hf1xdgVlOL2mH_qknycS9A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 26/37] qemu: Move opening of tap file descriptors for net devices into qemuBuildInterfaceConnect Date: Tue, 10 May 2022 17:20:02 +0200 Message-Id: <503934a4404dbcbee9e3a47b22169e6f71d953cc.1652195735.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652196394885100005 Content-Type: text/plain; charset="utf-8" Use the new infrastructure which stores the fds inside 'qemuFDPass' objects in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 82 ++++++++++++++++++++--------------------- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 36 ++---------------- 3 files changed, 44 insertions(+), 75 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d23baa54a2..78baa840a8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8661,6 +8661,7 @@ qemuInterfaceVhostuserConnect(virCommand *cmd, int qemuBuildInterfaceConnect(virDomainObj *vm, virDomainNetDef *net, + virNetDevVPortProfileOp vmop, bool standalone) { @@ -8668,19 +8669,33 @@ qemuBuildInterfaceConnect(virDomainObj *vm, virDomainNetType actualType =3D virDomainNetGetActualType(net); qemuDomainNetworkPrivate *netpriv =3D QEMU_DOMAIN_NETWORK_PRIVATE(net); VIR_AUTOCLOSE vdpafd =3D -1; - bool vhostfd =3D false; + bool vhostfd =3D false; /* also used to signal processing of tapfds */ + size_t tapfdSize =3D net->driver.virtio.queues; + g_autofree int *tapfd =3D g_new0(int, tapfdSize + 1); + + if (tapfdSize =3D=3D 0) + tapfdSize =3D 1; switch (actualType) { case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: vhostfd =3D true; + if (qemuInterfaceBridgeConnect(vm->def, priv->driver, net, + tapfd, &tapfdSize) < 0) + return -1; break; case VIR_DOMAIN_NET_TYPE_DIRECT: vhostfd =3D true; + if (qemuInterfaceDirectConnect(vm->def, priv->driver, net, + tapfd, tapfdSize, vmop) < 0) + return -1; break; case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (qemuInterfaceEthernetConnect(vm->def, priv->driver, net, + tapfd, tapfdSize) < 0) + return -1; vhostfd =3D true; break; @@ -8706,6 +8721,29 @@ qemuBuildInterfaceConnect(virDomainObj *vm, break; } + /* 'vhostfd' is set to true in all cases when we need to process tapfd= s */ + if (vhostfd) { + g_autofree char *prefix =3D g_strdup_printf("tapfd-%s", net->info.= alias); + size_t i; + + for (i =3D 0; i < tapfdSize; i++) { + g_autoptr(qemuFDPass) pass =3D qemuFDPassNewDirect(prefix, pri= v); + g_autofree char *suffix =3D g_strdup_printf("%zu", i); + int fd =3D tapfd[i]; /* we want to keep the array intact for s= ecurity labeling*/ + + qemuFDPassAddFD(pass, &fd, suffix); + netpriv->tapfds =3D g_slist_prepend(netpriv->tapfds, g_steal_p= ointer(&pass)); + } + + netpriv->tapfds =3D g_slist_reverse(netpriv->tapfds); + + for (i =3D 0; i < tapfdSize; i++) { + if (qemuSecuritySetTapFDLabel(priv->driver->securityManager, + vm->def, tapfd[i]) < 0) + return -1; + } + } + if (vhostfd && !standalone) { if (qemuInterfaceOpenVhostNet(vm, net) < 0) return -1; @@ -8746,54 +8784,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, if (qemuDomainValidateActualNetDef(net, qemuCaps) < 0) return -1; - if (qemuBuildInterfaceConnect(vm, net, standalone) < 0) + if (qemuBuildInterfaceConnect(vm, net, vmop, standalone) < 0) return -1; switch (actualType) { case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: - tapfdSize =3D net->driver.virtio.queues; - if (!tapfdSize) - tapfdSize =3D 1; - - tapfd =3D g_new0(int, tapfdSize); - tapfdName =3D g_new0(char *, tapfdSize); - - memset(tapfd, -1, tapfdSize * sizeof(tapfd[0])); - - if (qemuInterfaceBridgeConnect(def, driver, net, - tapfd, &tapfdSize) < 0) - goto cleanup; - break; - case VIR_DOMAIN_NET_TYPE_DIRECT: - tapfdSize =3D net->driver.virtio.queues; - if (!tapfdSize) - tapfdSize =3D 1; - - tapfd =3D g_new0(int, tapfdSize); - tapfdName =3D g_new0(char *, tapfdSize); - - memset(tapfd, -1, tapfdSize * sizeof(tapfd[0])); - - if (qemuInterfaceDirectConnect(def, driver, net, - tapfd, tapfdSize, vmop) < 0) - goto cleanup; - break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: - tapfdSize =3D net->driver.virtio.queues; - if (!tapfdSize) - tapfdSize =3D 1; - - tapfd =3D g_new0(int, tapfdSize); - tapfdName =3D g_new0(char *, tapfdSize); - - memset(tapfd, -1, tapfdSize * sizeof(tapfd[0])); - - if (qemuInterfaceEthernetConnect(def, driver, net, - tapfd, tapfdSize) < 0) - goto cleanup; break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index c26305927e..5a65d94d6f 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -94,6 +94,7 @@ qemuBuildHostNetProps(virDomainNetDef *net, int qemuBuildInterfaceConnect(virDomainObj *vm, virDomainNetDef *net, + virNetDevVPortProfileOp vmop, bool standalone); /* Current, best practice */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f7d3b38a6a..9c6f9e673c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1274,46 +1274,16 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, */ VIR_APPEND_ELEMENT_COPY(vm->def->nets, vm->def->nnets, net); - if (qemuBuildInterfaceConnect(vm, net, false) < 0) + if (qemuBuildInterfaceConnect(vm, net, VIR_NETDEV_VPORT_PROFILE_OP_CRE= ATE, false) < 0) return -1; + iface_connected =3D true; + switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: - tapfdSize =3D net->driver.virtio.queues; - if (!tapfdSize) - tapfdSize =3D 1; - tapfd =3D g_new0(int, tapfdSize); - memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); - if (qemuInterfaceBridgeConnect(vm->def, driver, net, - tapfd, &tapfdSize) < 0) - goto cleanup; - iface_connected =3D true; - break; - case VIR_DOMAIN_NET_TYPE_DIRECT: - tapfdSize =3D net->driver.virtio.queues; - if (!tapfdSize) - tapfdSize =3D 1; - tapfd =3D g_new0(int, tapfdSize); - memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); - if (qemuInterfaceDirectConnect(vm->def, driver, net, - tapfd, tapfdSize, - VIR_NETDEV_VPORT_PROFILE_OP_CREATE)= < 0) - goto cleanup; - iface_connected =3D true; - break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: - tapfdSize =3D net->driver.virtio.queues; - if (!tapfdSize) - tapfdSize =3D 1; - tapfd =3D g_new0(int, tapfdSize); - memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); - if (qemuInterfaceEthernetConnect(vm->def, driver, net, - tapfd, tapfdSize) < 0) - goto cleanup; - iface_connected =3D true; break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: --=20 2.35.1