From patchwork Thu Jul 7 14:50:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 9219083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B37D06048B for ; Thu, 7 Jul 2016 14:53:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3BD827E33 for ; Thu, 7 Jul 2016 14:53:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9862627E63; Thu, 7 Jul 2016 14:53:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4746127E33 for ; Thu, 7 Jul 2016 14:53:09 +0000 (UTC) Received: from localhost ([::1]:40411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAfs-00048J-57 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Jul 2016 10:53:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAdb-00012Q-IM for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:50:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLAdY-0007NZ-V7 for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:50:47 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:36999 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAdY-0007NS-QA for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:50:44 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u67En7eP015773 for ; Thu, 7 Jul 2016 10:50:44 -0400 Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) by mx0b-001b2d01.pphosted.com with ESMTP id 2415xmq197-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 07 Jul 2016 10:50:43 -0400 Received: from localhost by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 8 Jul 2016 00:50:40 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp08.au.ibm.com (202.81.31.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 8 Jul 2016 00:50:37 +1000 X-IBM-Helo: d23dlp03.au.ibm.com X-IBM-MailFrom: bharata@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from d23relay08.au.ibm.com (d23relay08.au.ibm.com [9.185.71.33]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 28FE03578053; Fri, 8 Jul 2016 00:50:37 +1000 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay08.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u67Eob6j15204366; Fri, 8 Jul 2016 00:50:37 +1000 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u67Eoaxc019100; Fri, 8 Jul 2016 00:50:36 +1000 Received: from bharata.in.ibm.com ([9.77.202.64]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u67EoRp3018946; Fri, 8 Jul 2016 00:50:34 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2016 20:20:22 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467903025-13383-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1467903025-13383-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16070714-0048-0000-0000-0000019D9CC3 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16070714-0049-0000-0000-00004617EF48 Message-Id: <1467903025-13383-3-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-07_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607070136 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v2 2/5] cpu: Introduce CPUState::stable_cpu_id X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nikunj@linux.vnet.ibm.com, Bharata B Rao , groug@kaod.org, qemu-ppc@nongnu.org, pbonzini@redhat.com, imammedo@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add CPUState::stable_cpu_id and use that as instance_id in vmstate_register() call. Introduce has-stable_cpu_id property that allows target machines to optionally switch to using stable_cpu_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. Suggested-by: Igor Mammedov Signed-off-by: Bharata B Rao --- exec.c | 6 ++++-- include/qom/cpu.h | 5 +++++ qom/cpu.c | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index fb73910..3b36fe5 100644 --- a/exec.c +++ b/exec.c @@ -619,12 +619,14 @@ static void cpu_release_index(CPUState *cpu) void cpu_vmstate_register(CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); + int instance_id = cpu->has_stable_cpu_id ? cpu->stable_cpu_id : + cpu->cpu_index; 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 331386f..527c021 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -273,6 +273,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. + * @stable_cpu_id: Use as instance_id argument in cpu vmstate_register calls + * @has_stable_cpu_id: Set to enforce the use of @stable_cpu_id + * over cpu_index during vmstate registration. * * State of one CPU core or thread. */ @@ -360,6 +363,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 stable_cpu_id; + bool has_stable_cpu_id; }; QTAILQ_HEAD(CPUTailQ, CPUState); diff --git a/qom/cpu.c b/qom/cpu.c index 1095ea1..bae1bf7 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -363,6 +363,11 @@ static int64_t cpu_common_get_arch_id(CPUState *cpu) return cpu->cpu_index; } +static Property cpu_common_properties[] = { + DEFINE_PROP_BOOL("has-stable-cpu-id", CPUState, has_stable_cpu_id, false), + DEFINE_PROP_END_OF_LIST() +}; + static void cpu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -394,6 +399,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) * IRQs, adding reset handlers, halting non-first CPUs, ... */ dc->cannot_instantiate_with_device_add_yet = true; + dc->props = cpu_common_properties; } static const TypeInfo cpu_type_info = {