From nobody Sun Feb 8 17:47:40 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=1652196038; cv=none; d=zohomail.com; s=zohoarc; b=OhHlxTFOgj8gSK9FL81dceZMqCQTJ/lUYwu3xOIrsq4i73HGtdDZO5a71hL1hkZBSxAoqFnV48zEAWcJZbQZf/AKmuJfRCGfJh/Tt4VfN+VpcagWs6eRTshby0WGQNHqgylTKjAlPihOWH9LoOW5avpGwo9IT8h0zz3rkkXvpgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652196038; 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=60coCetVw1mUulpFxrkzCi0wZFZmd0j7vrpN+SDbXnk=; b=ST7WTXqLdb3J5oveyTPCjxYlwIsx8aT/+QtHrPvBS8xcK9jhS88/tKFsi9D6ZB9Stou7qbF2W+XSgdiJysmUPkzsxLLfcGXSaPTkscAJFYXIyNpsj+prMZbO7nGnd6iwuTDbSMy1ezSo6XfycmJ8YK9hub7RpLHc5LHStQPTwQc= 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 1652196038533115.27586807363036; Tue, 10 May 2022 08:20:38 -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-625-U4RnqqSPNCewcSfMXZy-0g-1; Tue, 10 May 2022 11:20:35 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D2722919EA3; Tue, 10 May 2022 15:20:26 +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 8ADB0C26E9C; Tue, 10 May 2022 15:20:26 +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 641961947055; Tue, 10 May 2022 15:20:26 +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 9B2501947055 for ; Tue, 10 May 2022 15:20:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8A605200C0DD; Tue, 10 May 2022 15:20:24 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2AD52024CCA for ; Tue, 10 May 2022 15:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652196037; 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=60coCetVw1mUulpFxrkzCi0wZFZmd0j7vrpN+SDbXnk=; b=Z2z/xohxuAQXO/9+vCmTXmY1jXMhSYegzJ4n5493o1ECkz3Hz///IDBIX3V5QfuIWJpSUU suWVEeikQSgOFrno+CMET4CTsQ4PAGkfQXf3gQJ8Yh+ND4f3iPNhppBGC3VubvlpP5yZ9/ ID17Rnf/7wnfpgfBKv+dvSMvm0yFhc8= X-MC-Unique: U4RnqqSPNCewcSfMXZy-0g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/37] qemu_fd: Don't rely on fdset id allocation by qemu Date: Tue, 10 May 2022 17:19:44 +0200 Message-Id: <59fd8a8591916ac2edee5a7fb168e9a42e5a6fcf.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.8 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: 1652196040093100013 Content-Type: text/plain; charset="utf-8" If we use our own fdset ID when hot-adding a fdset we can vastly simplify our internals. As a stop-gap when a fdset would be added behind libvirt's back we'll validated that the fdset to be added is not yet used. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_fd.c | 61 +++++++++++++++---------------------- src/qemu/qemu_fd.h | 3 -- tests/qemuhotplugtest.c | 1 + tests/qemumonitorjsontest.c | 7 ----- 4 files changed, 25 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_fd.c b/src/qemu/qemu_fd.c index 84e9d2bfdf..fe81cc650f 100644 --- a/src/qemu/qemu_fd.c +++ b/src/qemu/qemu_fd.c @@ -111,8 +111,12 @@ qemuFDPassNew(const char *prefix, fdpass->prefix =3D g_strdup(prefix); fdpass->useFDSet =3D true; - if (priv) + if (priv) { fdpass->fdSetID =3D qemuDomainFDSetIDNew(priv); + fdpass->path =3D g_strdup_printf("/dev/fdset/%u", fdpass->fdSetID); + } else { + fdpass->path =3D g_strdup_printf("/dev/fdset/monitor-fake"); + } return fdpass; } @@ -171,6 +175,9 @@ qemuFDPassAddFD(qemuFDPass *fdpass, newfd.opaque =3D g_strdup_printf("%s%s", fdpass->prefix, NULLSTR_EMPTY= (suffix)); + if (!fdpass->useFDSet) + fdpass->path =3D g_strdup(newfd.opaque); + VIR_APPEND_ELEMENT(fdpass->fds, fdpass->nfds, newfd); } @@ -232,7 +239,6 @@ int qemuFDPassTransferMonitor(qemuFDPass *fdpass, qemuMonitor *mon) { - int fdsetid =3D -1; size_t i; if (!fdpass) @@ -240,6 +246,21 @@ qemuFDPassTransferMonitor(qemuFDPass *fdpass, if (qemuFDPassValidate(fdpass) < 0) return -1; + if (fdpass->useFDSet) { + g_autoptr(qemuMonitorFdsets) fdsets =3D NULL; + + if (qemuMonitorQueryFdsets(mon, &fdsets) < 0) + return -1; + + for (i =3D 0; i < fdsets->nfdsets; i++) { + if (fdsets->fdsets[i].id =3D=3D fdpass->fdSetID) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("fdset '%u' is already in use by qemu"), + fdpass->fdSetID); + return -1; + } + } + } for (i =3D 0; i < fdpass->nfds; i++) { if (fdpass->useFDSet) { @@ -247,22 +268,15 @@ qemuFDPassTransferMonitor(qemuFDPass *fdpass, if (qemuMonitorAddFileHandleToSet(mon, fdpass->fds[i].fd, - fdsetid, + fdpass->fdSetID, fdpass->fds[i].opaque, &fdsetinfo) < 0) return -1; - - if (fdsetid =3D=3D -1) { - fdpass->fdSetID =3D fdsetid =3D fdsetinfo.fdset; - fdpass->path =3D g_strdup_printf("/dev/fdset/%u", fdsetid); - } } else { if (qemuMonitorSendFileHandle(mon, fdpass->fds[i].opaque, fdpass->fds[i].fd) < 0) return -1; - - fdpass->path =3D g_strdup(fdpass->fds[i].opaque); } fdpass->passed =3D true; @@ -272,33 +286,6 @@ qemuFDPassTransferMonitor(qemuFDPass *fdpass, } -/** - * qemuFDPassTransferMonitorFake: - * @fdpass: The fd passing helper struct - * - * Simulate as if @fdpass was passed via monitor for callers which don't - * actually wish to test that code path. - */ -int -qemuFDPassTransferMonitorFake(qemuFDPass *fdpass) -{ - - if (!fdpass) - return 0; - - if (qemuFDPassValidate(fdpass) < 0) - return -1; - - if (fdpass->useFDSet) { - fdpass->path =3D g_strdup_printf("/dev/fdset/monitor-fake"); - } else { - fdpass->path =3D g_strdup(fdpass->fds[0].opaque); - } - - return 0; -} - - /** * qemuFDPassTransferMonitorRollback: * @fdpass: The fd passing helper struct diff --git a/src/qemu/qemu_fd.h b/src/qemu/qemu_fd.h index ef35daba8c..d078d4ce5d 100644 --- a/src/qemu/qemu_fd.h +++ b/src/qemu/qemu_fd.h @@ -47,9 +47,6 @@ int qemuFDPassTransferMonitor(qemuFDPass *fdpass, qemuMonitor *mon); -int -qemuFDPassTransferMonitorFake(qemuFDPass *fdpass); - void qemuFDPassTransferMonitorRollback(qemuFDPass *fdpass, qemuMonitor *mon); diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 21302e0fce..fe8f0b58db 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -834,6 +834,7 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("hostdev0") QMP_OK); DO_TEST_ATTACH("base-live", "interface-vdpa", false, true, + "query-fdsets", "{\"return\":[{\"fdset-id\":99999}]}", "add-fd", "{ \"return\": { \"fdset-id\": 1, \"fd\": 95 = }}", "netdev_add", QMP_OK, "device_add", QMP_OK); DO_TEST_DETACH("base-live", "interface-vdpa", false, false, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index e15c8533f6..c3ee771cbb 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -725,7 +725,6 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOption *xm= lopt, { g_autoptr(virDomainChrSourceDef) chr =3D virDomainChrSourceDefNew(= xmlopt); - qemuDomainChrSourcePrivate *charpriv =3D QEMU_DOMAIN_CHR_SOURCE_PR= IVATE(chr); chr->data.file.path =3D g_strdup("/test/path"); @@ -743,12 +742,6 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOption *x= mlopt, chrdev.source =3D chr; ignore_value(testQemuPrepareHostBackendChardevOne(&dev, chr, NULL)= ); - if (qemuFDPassTransferMonitorFake(charpriv->sourcefd) < 0) - ret =3D -1; - - if (qemuFDPassTransferMonitorFake(charpriv->logfd) < 0) - ret =3D -1; - CHECK("file", false, "{'id':'alias','backend':{'type':'file','data':{'out':'/dev/= fdset/monitor-fake'," "'append':tru= e," --=20 2.35.1