From patchwork Fri Nov 20 12:54:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 546900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3BEE6140307 for ; Fri, 20 Nov 2015 23:56:03 +1100 (AEDT) Received: from localhost ([::1]:46944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlEP-0001pn-1h for incoming@patchwork.ozlabs.org; Fri, 20 Nov 2015 07:56:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlDc-0000WF-CS for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzlDY-00007N-6W for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:12 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:42109) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlDX-0008Vv-Fe for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:08 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Nov 2015 18:25:04 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 20 Nov 2015 18:25:01 +0530 X-Helo: d28dlp03.in.ibm.com X-MailFrom: bharata@linux.vnet.ibm.com X-RcptTo: qemu-ppc@nongnu.org Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id EF1C31258064; Fri, 20 Nov 2015 18:25:11 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tAKCt0Zl51445898; Fri, 20 Nov 2015 18:25:00 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tAKCsxAr022037; Fri, 20 Nov 2015 18:25:00 +0530 Received: from bharata.in.ibm.com ([9.79.193.217]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id tAKCsn1p021357; Fri, 20 Nov 2015 18:24:58 +0530 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Fri, 20 Nov 2015 18:24:34 +0530 Message-Id: <1448024079-20808-6-git-send-email-bharata@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1448024079-20808-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1448024079-20808-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15112012-0009-0000-0000-000008F5A2C5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 122.248.162.3 Cc: aik@ozlabs.ru, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de, pbonzini@redhat.com, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v5 05/10] cpu: Add a sync version of cpu_remove() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This sync API will be used by the CPU hotplug code to wait for the CPU to completely get removed before flagging the failure to the device_add command. Sync version of this call is needed to correctly recover from CPU realization failures when ->plug() handler fails. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson --- cpus.c | 12 ++++++++++++ include/qom/cpu.h | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/cpus.c b/cpus.c index af2b274..c2444ba 100644 --- a/cpus.c +++ b/cpus.c @@ -1070,6 +1070,8 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) qemu_kvm_wait_io_event(cpu); if (cpu->exit && !cpu_can_run(cpu)) { qemu_kvm_destroy_vcpu(cpu); + cpu->created = false; + qemu_cond_signal(&qemu_cpu_cond); qemu_mutex_unlock(&qemu_global_mutex); return NULL; } @@ -1174,6 +1176,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } if (remove_cpu) { qemu_tcg_destroy_vcpu(remove_cpu); + cpu->created = false; + qemu_cond_signal(&qemu_cpu_cond); remove_cpu = NULL; } } @@ -1339,6 +1343,14 @@ void cpu_remove(CPUState *cpu) qemu_cpu_kick(cpu); } +void cpu_remove_sync(CPUState *cpu) +{ + cpu_remove(cpu); + while (cpu->created) { + qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex); + } +} + /* For temporary buffers for forming a name */ #define VCPU_THREAD_NAME_SIZE 16 diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 67e05b0..7fc6696 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -705,6 +705,14 @@ void cpu_resume(CPUState *cpu); */ void cpu_remove(CPUState *cpu); + /** + * cpu_remove_sync: + * @cpu: The CPU to remove. + * + * Requests the CPU to be removed and waits till it is removed. + */ +void cpu_remove_sync(CPUState *cpu); + /** * qemu_init_vcpu: * @cpu: The vCPU to initialize.