From nobody Tue May 14 01:07:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=openvz.org Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1649839463035270.84384704805007; Wed, 13 Apr 2022 01:44:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-482-B4EHIMwGNRel6HZPX6kPig-1; Wed, 13 Apr 2022 04:44:18 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 65FA885A5BC; Wed, 13 Apr 2022 08:44:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DC5E40D1D3; Wed, 13 Apr 2022 08:44:16 +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 05B16194036A; Wed, 13 Apr 2022 08:44:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 76A4A1949763 for ; Wed, 13 Apr 2022 08:44:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 60AE9111D3CB; Wed, 13 Apr 2022 08:44:15 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BC7F1121339 for ; Wed, 13 Apr 2022 08:43:58 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73FE71014A61 for ; Wed, 13 Apr 2022 08:43:58 +0000 (UTC) Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-672-l-IcOHcjMDOwKZoYNS4Wow-1; Wed, 13 Apr 2022 04:43:56 -0400 Received: by mail-lf1-f47.google.com with SMTP id bq30so2268167lfb.3 for ; Wed, 13 Apr 2022 01:43:52 -0700 (PDT) Received: from vzbook.. (broadband-90-154-71-96.ip.moscow.rt.ru. [90.154.71.96]) by smtp.gmail.com with ESMTPSA id n16-20020a056512311000b0046baec3a1fasm854465lfb.217.2022.04.13.01.43.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 01:43:50 -0700 (PDT) X-MC-Unique: B4EHIMwGNRel6HZPX6kPig-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: l-IcOHcjMDOwKZoYNS4Wow-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IfXLGd0PRBHKJ2KyMYH2PYXJHg6QAJt8HMf47Wg7bbU=; b=NKDEa7gHBba4nf8AtRLbIKcEG1ffvtMCG08b/ikQOOGwG3EJt+TxX0j5Hq1raRL5tJ dXhvZDMymx0ukZ/Jmuonl6YEDeUYdvkvC81ro0IdtEOj29gUW4Cmx1kHvphxIdsacLsL EAHIOUe3T1ey5VYzLWhQdIyA0EinM36tm+pMbbRr7gbeC+yLB+m6KJ2uiBZz694DVP/j YbX6/KkH9z3Nnkd348XSSsFwfzxB4c5ntHz70P8Cn/B4RUyY1JS5lUBBNjT3w09gvrAd dAw0gU7rZAepxJs80LKXrgF3mI8B/mIlszsdIwTqohsv4m1Lp3B4PkKMVjmJzMRiMhmD Znew== X-Gm-Message-State: AOAM53276T7EJ07k4M0ibm/K2g/Y2ORZSQF+NRnTHJw9KbRsWW66ZVZP efjMDuTCeZH5mmniWBkIVmNIypg1hDWD6w== X-Google-Smtp-Source: ABdhPJygnUK7dspl01YMNiupsg34Vz/CvKLykF56xc711d7LQL+KVm0hdi8uJUlSPEX8cl1oVgiGrw== X-Received: by 2002:a05:6512:12c3:b0:44a:27ac:c7a4 with SMTP id p3-20020a05651212c300b0044a27acc7a4mr27929758lfg.150.1649839430557; Wed, 13 Apr 2022 01:43:50 -0700 (PDT) From: Nikolay Shirokovskiy X-Google-Original-From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 1/2] qemu: drop needless acquiring job on removing domain Date: Wed, 13 Apr 2022 11:43:31 +0300 Message-Id: <20220413084332.26948-2-nshirokovskiy@openvz.org> In-Reply-To: <20220413084332.26948-1-nshirokovskiy@openvz.org> References: <20220413084332.26948-1-nshirokovskiy@openvz.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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.10 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-ZM-MESSAGEID: 1649839464339100001 Content-Type: text/plain; charset="utf-8" Acquiring job introduced in commit [1] to fix a race described in the commit. Actually it does not help because we get domain in create API before acuiring job. Then [2] fix the race but [1] was not reverted even is does not required by [2] to work properly. [1] commit b629c64e5e0a32ef439b8eeb3a697e2cd76f3248 Author: Martin Kletzander Date: Thu Oct 30 14:38:35 2014 +0100 qemu: avoid rare race when undefining domain [2] commit c7d1c139ca3402e875002753952e80ce8054374e Author: Martin Kletzander Date: Thu Dec 11 11:14:08 2014 +0100 qemu: avoid rare race when undefining domain Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Martin Kletzander --- src/qemu/qemu_domain.c | 45 +-------------------------------------- src/qemu/qemu_domain.h | 10 ++++----- src/qemu/qemu_driver.c | 12 +++++------ src/qemu/qemu_migration.c | 10 ++++----- src/qemu/qemu_process.c | 12 ++++------- 5 files changed, 20 insertions(+), 69 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a4334de158..95134a3570 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7343,7 +7343,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver, * lock on driver->domains in order to call the remove obj * from locked list method. */ -static void +void qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, virDomainObj *vm) { @@ -7357,49 +7357,6 @@ qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, virDomainObjListRemoveLocked(driver->domains, vm); } =20 -/** - * qemuDomainRemoveInactiveJob: - * - * Just like qemuDomainRemoveInactive but it tries to grab a - * VIR_JOB_MODIFY first. Even though it doesn't succeed in - * grabbing the job the control carries with - * qemuDomainRemoveInactive call. - */ -void -qemuDomainRemoveInactiveJob(virQEMUDriver *driver, - virDomainObj *vm) -{ - bool haveJob; - - haveJob =3D qemuDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) >=3D 0; - - qemuDomainRemoveInactive(driver, vm); - - if (haveJob) - qemuDomainObjEndJob(vm); -} - - -/** - * qemuDomainRemoveInactiveJobLocked: - * - * Similar to qemuDomainRemoveInactiveJob, except that the caller must - * also hold the lock @driver->domains - */ -void -qemuDomainRemoveInactiveJobLocked(virQEMUDriver *driver, - virDomainObj *vm) -{ - bool haveJob; - - haveJob =3D qemuDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) >=3D 0; - - qemuDomainRemoveInactiveLocked(driver, vm); - - if (haveJob) - qemuDomainObjEndJob(vm); -} - =20 void qemuDomainSetFakeReboot(virDomainObj *vm, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f4d84ca43a..0415a34908 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -672,6 +672,10 @@ int qemuDomainSnapshotDiscardAllMetadata(virQEMUDriver= *driver, void qemuDomainRemoveInactive(virQEMUDriver *driver, virDomainObj *vm); =20 +void +qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, + virDomainObj *vm); + void qemuDomainSetFakeReboot(virDomainObj *vm, bool value); =20 @@ -1036,12 +1040,6 @@ int qemuDomainDefNumaCPUsRectify(virDomainDef *def, virQEMUCaps *qemuCaps); =20 -void qemuDomainRemoveInactiveJob(virQEMUDriver *driver, - virDomainObj *vm); - -void qemuDomainRemoveInactiveJobLocked(virQEMUDriver *driver, - virDomainObj *vm); - int virQEMUFileOpenAs(uid_t fallback_uid, gid_t fallback_gid, bool dynamicOwnership, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c0e36e9b2..ee0963c30d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1625,7 +1625,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, =20 if (qemuProcessBeginJob(driver, vm, VIR_DOMAIN_JOB_OPERATION_START, flags) < 0) { - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); goto cleanup; } =20 @@ -2751,7 +2751,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, } qemuDomainObjEndAsyncJob(vm); if (ret =3D=3D 0) - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); =20 cleanup: virQEMUSaveDataFree(data); @@ -3228,7 +3228,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, =20 qemuDomainObjEndAsyncJob(vm); if (ret =3D=3D 0 && flags & VIR_DUMP_CRASH) - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -3536,7 +3536,7 @@ processGuestPanicEvent(virQEMUDriver *driver, endjob: qemuDomainObjEndAsyncJob(vm); if (removeInactive) - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); } =20 =20 @@ -5851,7 +5851,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, virFileWrapperFdFree(wrapperFd); virQEMUSaveDataFree(data); if (vm && ret < 0) - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); virDomainObjEndAPI(&vm); return ret; } @@ -6510,7 +6510,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, } else { /* Brand new domain. Remove it */ VIR_INFO("Deleting domain '%s'", vm->def->name); - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); } } =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 30a6202d85..b735bdb391 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3100,7 +3100,7 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver, virPortAllocatorRelease(priv->nbdPort); priv->nbdPort =3D 0; virDomainObjRemoveTransientDef(vm); - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); } virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); @@ -3517,7 +3517,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent =3D 0; } - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); } =20 cleanup: @@ -5342,7 +5342,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent =3D 0; } - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); } =20 virErrorRestore(&orig_err); @@ -5416,7 +5416,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, } =20 if (!virDomainObjIsActive(vm)) - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); =20 return ret; } @@ -5877,7 +5877,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, =20 qemuMigrationJobFinish(vm); if (!virDomainObjIsActive(vm)) - qemuDomainRemoveInactiveJob(driver, vm); + qemuDomainRemoveInactive(driver, vm); =20 cleanup: g_clear_pointer(&jobData, virDomainJobDataFree); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2e11d24be2..8f0d1ae7e4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8979,14 +8979,10 @@ qemuProcessReconnect(void *opaque) driver->inhibitCallback(true, driver->inhibitOpaque); =20 cleanup: - if (jobStarted) { - if (!virDomainObjIsActive(obj)) - qemuDomainRemoveInactive(driver, obj); + if (jobStarted) qemuDomainObjEndJob(obj); - } else { - if (!virDomainObjIsActive(obj)) - qemuDomainRemoveInactiveJob(driver, obj); - } + if (!virDomainObjIsActive(obj)) + qemuDomainRemoveInactive(driver, obj); virDomainObjEndAPI(&obj); virIdentitySetCurrent(NULL); return; @@ -9058,7 +9054,7 @@ qemuProcessReconnectHelper(virDomainObj *obj, */ qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, VIR_ASYNC_JOB_NONE, 0); - qemuDomainRemoveInactiveJobLocked(src->driver, obj); + qemuDomainRemoveInactiveLocked(src->driver, obj); =20 virDomainObjEndAPI(&obj); g_clear_object(&data->identity); --=20 2.35.1 From nobody Tue May 14 01:07:18 2024 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; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=openvz.org 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 1649839503226371.0161580340149; Wed, 13 Apr 2022 01:45:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-HNSv-j_1Na-UnmQ2EOQ50w-1; Wed, 13 Apr 2022 04:44:04 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB57485A5BC; Wed, 13 Apr 2022 08:44:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B663348FB05; Wed, 13 Apr 2022 08:44:02 +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 B4B06193F506; Wed, 13 Apr 2022 08:43:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4A1CF193F6EC for ; Wed, 13 Apr 2022 08:43:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 02C9FC44B1D; Wed, 13 Apr 2022 08:43:58 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F20C0C27E8A for ; Wed, 13 Apr 2022 08:43:57 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D23EE3C23FA8 for ; Wed, 13 Apr 2022 08:43:57 +0000 (UTC) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-150-9Akj3p4XNtOVD3TXRxsKXQ-1; Wed, 13 Apr 2022 04:43:55 -0400 Received: by mail-lj1-f181.google.com with SMTP id 17so1337274lji.1 for ; Wed, 13 Apr 2022 01:43:52 -0700 (PDT) Received: from vzbook.. (broadband-90-154-71-96.ip.moscow.rt.ru. [90.154.71.96]) by smtp.gmail.com with ESMTPSA id n16-20020a056512311000b0046baec3a1fasm854465lfb.217.2022.04.13.01.43.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 01:43:51 -0700 (PDT) X-MC-Unique: HNSv-j_1Na-UnmQ2EOQ50w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 9Akj3p4XNtOVD3TXRxsKXQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pKbA/qUpT/1fpcJ4FcO8p+5Exvue3yh4wbrtuEGgJYk=; b=fktosQx7qO9E7QZIOvszh6xT3aS/QmRSTy1YN9dJqhHnUAd9f2FVHc3M4HIjApqg1k AjUurQBV602TrEXQN28RdqRZPkH03GkqEd8vk+98jccVIxy+rWTG3B1a/wR9MDOGh/p1 hQXdoIQY+LVojd1z0YH4DPXQgKtbx1B/yFisOyxTXm7kaxDd88mhz1/cQMXEtTwC4sim 3oI7HGhD/ZSGXuPRXOeoAVfedEljWJH7C6dOdfgR5HogydR+fp1gpJ7AhcpTPoOuM7LL JipKiFdKD3li7UUKIuNh4HB62c73wwwTDme36rCHk9zfzYFvshdWnGi03dPFBnnyX7qE 3Kxg== X-Gm-Message-State: AOAM5318NObsWkuAkdFMUSQ5cB0vWLnn4wRTe5p7wv6+WoEsW+1Julht 0Ea0e00l2lirOtUqZZoZs0PqWIvEqSNlwA== X-Google-Smtp-Source: ABdhPJxmxzS0EL0ODC/cPCMN8EQGWUjW2nQCQB2DySWqDQ4C1YFXdZ8v0xbA+CP50ek/xhpHCbh6tg== X-Received: by 2002:a2e:1542:0:b0:249:a4dd:8ca5 with SMTP id 2-20020a2e1542000000b00249a4dd8ca5mr25513552ljv.303.1649839431323; Wed, 13 Apr 2022 01:43:51 -0700 (PDT) From: Nikolay Shirokovskiy X-Google-Original-From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 2/2] qemu: fix one more race on undefining and create Date: Wed, 13 Apr 2022 11:43:32 +0300 Message-Id: <20220413084332.26948-3-nshirokovskiy@openvz.org> In-Reply-To: <20220413084332.26948-1-nshirokovskiy@openvz.org> References: <20220413084332.26948-1-nshirokovskiy@openvz.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.9 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-ZM-MESSAGEID: 1649839504112100001 Content-Type: text/plain; charset="utf-8" [1] closes gap in virDomainObjListRemove so that concurrent thread can not step in and obtain the domain while domain is temporary unlocked. But there is another gap exist: thread B - executes create API thread C - executes undefine API - thread A executes some job on domain - threads B and C obtains domain from list and wait for job condition - thread A finishes its job and C grabs job condition, removes domain from list and finishes - thread B grabs job condition and start the domain, unfortunately is not in the list already [1] commit c7d1c139ca3402e875002753952e80ce8054374e Author: Martin Kletzander Date: Thu Dec 11 11:14:08 2014 +0100 qemu: avoid rare race when undefining domain Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Martin Kletzander --- src/qemu/qemu_domainjob.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 1cddc7f2f0..cb20b798f7 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -849,6 +849,16 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, if (!nested && !qemuDomainNestedJobAllowed(&priv->job, job)) goto retry; =20 + if (obj->removing) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(obj->def->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, obj->def->name); + goto cleanup; + } + ignore_value(virTimeMillisNow(&now)); =20 if (job) { --=20 2.35.1