From nobody Tue Feb 10 06:25:34 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=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1672751700; cv=none; d=zohomail.com; s=zohoarc; b=BZDY9ApJ+GG5JN49yDtG8VrjddkGm1Ay9jCduBXwVrZfOG1lf4KWNfYtaM0fDhFgxFZbCJzGuYyZotfOP8fJkV53TJR3qnEjZVKcpLVA3/uAjbhpHefhqVFX4eJ+CrckdpSxWvuweSjl2kZzOvYCf97oiqITRJqmU0a+Czbcsz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672751700; h=Content-Type:Content-Transfer-Encoding:Cc: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=Vg3ulsUWqu9kWBZH4RTY+wnsDTQ/ndEbiM+p/y8yPZs=; b=FLTHo5Ul7phTgc5/7tq82kcUP4jAs/MRjiGTFLfPJojqwtkuwC0ZApd3mH4YaCAI2bfkp/BYwicqs0y38BKzs8smWGwwfUq+K4NoM5dSq2NpPnpgqL2MIt3k+DTtMoDG0ENbjK+npCaxdegWVJHRcUFf3zeR3AmJ378pX1F40UY= 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=fail header.from= (p=quarantine dis=quarantine) 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 1672751700627386.34563901059585; Tue, 3 Jan 2023 05:15:00 -0800 (PST) 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-653-7gyXZvdNMU6or7_XiYeeSg-1; Tue, 03 Jan 2023 08:14:54 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3357F1881291; Tue, 3 Jan 2023 13:14:42 +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 209392026D68; Tue, 3 Jan 2023 13:14:42 +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 159771946588; Tue, 3 Jan 2023 13:14:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 436B81946A78 for ; Tue, 3 Jan 2023 13:14:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 18FB139D3E; Tue, 3 Jan 2023 13:14:41 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1065B35455 for ; Tue, 3 Jan 2023 13:14:41 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (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 E72D53811F39 for ; Tue, 3 Jan 2023 13:14:40 +0000 (UTC) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-43-RuKfhu-LM4WxxAB-D2agWQ-1; Tue, 03 Jan 2023 08:14:38 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NmY7q0GHDz16M2c for ; Tue, 3 Jan 2023 21:13:11 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 21:14:35 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672751699; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=Vg3ulsUWqu9kWBZH4RTY+wnsDTQ/ndEbiM+p/y8yPZs=; b=YYqKIf0BWheqnsaAGEkM5U11Ar45dovSmOB9FAzQP611orWQy9P+8vPNJULwZOPoqxQigK rp1n6CA+rCO7KDe+gu/631shGS0KVoTflMSPaKtenL6nzvQqVvzb0Nu0O+PgchE12Y3Lb7 02ZQQLK0o/l9nsdGcV8Dm5d2tmq8gRw= X-MC-Unique: 7gyXZvdNMU6or7_XiYeeSg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: RuKfhu-LM4WxxAB-D2agWQ-1 From: Jiang Jiacheng To: Subject: [PATCH 11/12] migration/multifd-pin: support migration multifd thread pin Date: Tue, 3 Jan 2023 21:08:30 +0800 Message-ID: <20230103130831.1828670-12-jiangjiacheng@huawei.com> In-Reply-To: <20230103130831.1828670-1-jiangjiacheng@huawei.com> References: <20230103130831.1828670-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected 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 3.1 on 10.11.54.5 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: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1672751702396100007 Content-Type: text/plain; charset="utf-8" From: zhengchuan support migration multifd thread pin by configuration. Signed-off-by:zhengchuan --- src/qemu/qemu_migration.c | 2 ++ src/qemu/qemu_process.c | 61 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_process.h | 4 +++ 3 files changed, 67 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7e2894eb76..fe7e2a0737 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3336,6 +3336,8 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver, priv =3D vm->privateData; priv->origname =3D g_strdup(origname); g_free(priv->migrationPids); + g_free(priv->migrationMultiFdPids); + priv->migrationMultiFdCount =3D 0; =20 if (taint_hook) { /* Domain XML has been altered by a hook script. */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 361daee081..1914aaa992 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1792,6 +1792,7 @@ static qemuMonitorCallbacks monitorCallbacks =3D { .domainMemoryDeviceSizeChange =3D qemuProcessHandleMemoryDeviceSizeCha= nge, .domainDeviceUnplugError =3D qemuProcessHandleDeviceUnplugErr, .domainMigrationPid =3D qemuProcessHandleMigrationPid, + .domainMigrationMultiFdPids =3D qemuProcessHandleMigrationMultiFdPids, }; =20 static void @@ -3862,6 +3863,66 @@ qemuProcessHandleMigrationPid(qemuMonitor *mon ATTRI= BUTE_UNUSED, return 0; } =20 +int +qemuProcessHandleMigrationMultiFdPids(qemuMonitor *mon ATTRIBUTE_UNUSED, + virDomainObj *vm, + int mpid) +{ + qemuDomainObjPrivate *priv =3D NULL; + char *mpidOldStr =3D NULL; + char *mpidStr =3D NULL; + virDomainMigrationIDDef *migration =3D NULL; + virBitmap *pcpumap =3D NULL; + virObjectLock(vm); + + VIR_INFO("Migrating domain %p %s, migration-multifd pid %d", + vm, vm->def->name, mpid); + + priv =3D vm->privateData; + if (vm->job->asyncJob =3D=3D VIR_ASYNC_JOB_NONE) { + VIR_DEBUG("got MIGRATION_MULTIFD_PID event without a migration job= "); + goto cleanup; + } + + migration =3D g_new0(virDomainMigrationIDDef, 1); + migration->thread_id =3D mpid; + + if (qemuProcessSetupMigration(vm, migration) < 0) { + VIR_ERROR(_("fail to setup migration multiFd cgroup")); + goto cleanup; + } + + mpidOldStr =3D priv->migrationMultiFdPids; + if (!mpidOldStr) { + mpidStr =3D g_strdup_printf("%d", mpid); + } else { + mpidStr =3D g_strdup_printf("%s/%d", mpidOldStr, mpid); + } + + g_free(priv->migrationMultiFdPids); + priv->migrationMultiFdPids =3D mpidStr; + priv->migrationMultiFdCount++; + + pcpumap =3D qemuProcessGetPcpumap(priv); + + if (!pcpumap) + goto cleanup; + + qemuProcessSetMigthreadAffinity(priv, pcpumap, mpid); + + cleanup: + /* + * If the value of pcpumap is setted by priv->migrationThreadPinList, + * we need to free pcpumap. + */ + if (pcpumap !=3D priv->pcpumap) + virBitmapFree(pcpumap); + virDomainMigrationIDDefFree(migration); + virObjectUnlock(vm); + + return 0; +} + =20 static int qemuProcessRecoverJob(virQEMUDriver *driver, diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 12e2cc1f48..d41959bc97 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -253,3 +253,7 @@ int qemuProcessSetupMigration(virDomainObj *vm, int qemuProcessHandleMigrationPid(qemuMonitor *mon ATTRIBUTE_UNUSED, virDomainObj *vm, int mpid); + +int qemuProcessHandleMigrationMultiFdPids(qemuMonitor *mon ATTRIBUTE_UNUSE= D, + virDomainObj *vm, + int mpid); --=20 2.33.0