From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKigL-0007Y4-Qn for qemu-devel@nongnu.org; Wed, 06 Jul 2016 04:59:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKigH-00055K-MH for qemu-devel@nongnu.org; Wed, 06 Jul 2016 04:59:44 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:5664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKigH-000555-Dn for qemu-devel@nongnu.org; Wed, 06 Jul 2016 04:59:41 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u668wxpb008955 for ; Wed, 6 Jul 2016 04:59:40 -0400 Received: from e28smtp09.in.ibm.com (e28smtp09.in.ibm.com [125.16.236.9]) by mx0a-001b2d01.pphosted.com with ESMTP id 240nk9f1vh-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 06 Jul 2016 04:59:40 -0400 Received: from localhost by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Jul 2016 14:29:36 +0530 From: Bharata B Rao Date: Wed, 6 Jul 2016 14:29:18 +0530 In-Reply-To: <1467795561-1007-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1467795561-1007-1-git-send-email-bharata@linux.vnet.ibm.com> Message-Id: <1467795561-1007-3-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v1 2/5] cpu: Introduce CPUState::migration_id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, imammedo@redhat.com, groug@kaod.org, nikunj@linux.vnet.ibm.com, pbonzini@redhat.com, Bharata B Rao Add CPUState::migration_id and use that as instance_id in vmstate_register() call. Introduce use-migration-id property that allows target machines to optionally switch to using migration_id instead of cpu_index. This will help allow successful migration in cases where holes are introduced in cpu_index range after CPU hot removals. The default implementation of CPUClass:get_migration_id() continues to return cpu_index. Suggested-by: Igor Mammedov Signed-off-by: Bharata B Rao --- exec.c | 5 +++-- include/qom/cpu.h | 6 ++++++ qom/cpu.c | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index fb73910..a8afeda 100644 --- a/exec.c +++ b/exec.c @@ -619,12 +619,13 @@ static void cpu_release_index(CPUState *cpu) void cpu_vmstate_register(CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); + int instance_id = cc->get_migration_id(cpu); if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { - vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu); + vmstate_register(NULL, instance_id, &vmstate_cpu_common, cpu); } if (cc->vmsd != NULL) { - vmstate_register(NULL, cpu->cpu_index, cc->vmsd, cpu); + vmstate_register(NULL, instance_id, cc->vmsd, cpu); } } diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 29ccf5c..6d00143 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -187,6 +187,7 @@ typedef struct CPUClass { bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); void (*disas_set_info)(CPUState *cpu, disassemble_info *info); + int (*get_migration_id)(CPUState *cpu); } CPUClass; #ifdef HOST_WORDS_BIGENDIAN @@ -273,6 +274,9 @@ struct qemu_work_item { * @kvm_fd: vCPU file descriptor for KVM. * @work_mutex: Lock to prevent multiple access to queued_work_*. * @queued_work_first: First asynchronous work pending. + * @migration_id: Use as instance_id argument in cpu vmstate_register calls + * @use_migration_id: Set to enforce the use of CPUClass.get_migration_id() + * over cpu_index during vmstate registration. * * State of one CPU core or thread. */ @@ -360,6 +364,8 @@ struct CPUState { (absolute value) offset as small as possible. This reduces code size, especially for hosts without large memory offsets. */ uint32_t tcg_exit_req; + int migration_id; + bool use_migration_id; }; QTAILQ_HEAD(CPUTailQ, CPUState); diff --git a/qom/cpu.c b/qom/cpu.c index 488ecc6..01cf136 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -326,6 +326,17 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp) } } +static bool cpu_common_get_use_migration_id(Object *obj, Error **errp) +{ + return CPU(obj)->use_migration_id; +} + +static void cpu_common_set_use_migration_id(Object *obj, bool value, + Error **err) +{ + CPU(obj)->use_migration_id = value; +} + static void cpu_common_initfn(Object *obj) { CPUState *cpu = CPU(obj); @@ -336,6 +347,10 @@ static void cpu_common_initfn(Object *obj) qemu_mutex_init(&cpu->work_mutex); QTAILQ_INIT(&cpu->breakpoints); QTAILQ_INIT(&cpu->watchpoints); + + object_property_add_bool(obj, "use-migration-id", + cpu_common_get_use_migration_id, + cpu_common_set_use_migration_id, NULL); } static void cpu_common_finalize(Object *obj) @@ -348,6 +363,11 @@ static int64_t cpu_common_get_arch_id(CPUState *cpu) return cpu->cpu_index; } +static int cpu_common_get_migration_id(CPUState *cpu) +{ + return cpu->cpu_index; +} + static void cpu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -372,6 +392,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->cpu_exec_enter = cpu_common_noop; k->cpu_exec_exit = cpu_common_noop; k->cpu_exec_interrupt = cpu_common_exec_interrupt; + k->get_migration_id = cpu_common_get_migration_id; dc->realize = cpu_common_realizefn; dc->unrealize = cpu_common_unrealizefn; /* -- 2.7.4