From patchwork Mon Sep 11 15:21:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 812408 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3xrWrZ6ZtQz9s7B for ; Tue, 12 Sep 2017 01:22:38 +1000 (AEST) Received: from localhost ([::1]:58389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drQXk-0003yE-V0 for incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 11:22:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drQXE-0003sm-VM for qemu-devel@nongnu.org; Mon, 11 Sep 2017 11:22:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drQX9-0007fx-U8 for qemu-devel@nongnu.org; Mon, 11 Sep 2017 11:22:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25019) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drQX9-0007eB-KY for qemu-devel@nongnu.org; Mon, 11 Sep 2017 11:21:59 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4EF1C0D8D63; Mon, 11 Sep 2017 15:21:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D4EF1C0D8D63 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com Received: from t460s.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3288E6B27C; Mon, 11 Sep 2017 15:21:51 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 11 Sep 2017 17:21:29 +0200 Message-Id: <20170911152150.12535-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 11 Sep 2017 15:21:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 00/21] s390x cleanups and CPU hotplug via device_add 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: Matthew Rosato , thuth@redhat.com, Eduardo Habkost , david@redhat.com, cohuck@redhat.com, Richard Henderson , Alexander Graf , Markus Armbruster , borntraeger@de.ibm.com, Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The first patches are a bunch of cleanups. I decided to go the extra mile and implement CPU hotplug via "device_add", as well as "query-hotpluggable-cpus". On s390x, only complete cores can be plugged. CPU hot unplug is currently not supported by the architecture. Support for hotplugging CPUs in random core-id order (last two patches) is added. We once hat a KVM bug preventing this, but the stable patch should now be included in relevant places - 152e9f65d66f ("KVM: s390: fix wrong lookup of VCPUs by array index"). Current tooling will plug them in sequential order anyway, so it should not hurt. v3 -> v4: * Dropped "target/s390x: move typedef of S390CPU to its definition" * Added "target/s390x: move some s390x typedefs to cpu-qom.h" - this moves some typedefs and makes cpu-qom.h independent from cpu_models.h. This is necessary to cleanly use cpu-qom.h in sclp.c later. * "s390x: move sclp_service_call() to sclp.h" - Use cpu-qom.h now as a s390x replacement for typedefs.h * "target/s390x: use "core-id" for cpu number/address/id handling" - Indicate also in error messages the property name "core-id". So just the error messages were touched. David Hildenbrand (21): exec,dump,i386,ppc,s390x: don't include exec/cpu-all.h explicitly cpu: drop old comments describing members s390x: get rid of s390-virtio.c s390x: rename s390-virtio.h to s390-virtio-hcall.h s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h s390x: move subsystem_reset() to s390-virtio-ccw.h target/s390x: move some s390x typedefs to cpu-qom.h s390x: move sclp_service_call() to sclp.h target/s390x: use trigger_pgm_exception() in s390_cpu_handle_mmu_fault() target/s390x: use program_interrupt() in per_check_exception() s390x: allow only 1 CPU with TCG target/s390x: set cpu->id for linux user when realizing target/s390x: use "core-id" for cpu number/address/id handling target/s390x: rename next_cpu_id to next_core_id s390x: print CPU definitions in sorted order s390x: allow cpu hotplug via device_add s390x: CPU hot unplug via device_del cannot work for now s390x: implement query-hotpluggable-cpus s390x: get rid of cpu_s390x_create() s390x: generate sclp cpu information from possible_cpus s390x: allow CPU hotplug in random core-id order dump.c | 1 - exec.c | 1 - hw/s390x/Makefile.objs | 1 - hw/s390x/s390-virtio-ccw.c | 245 +++++++++++++++++++++++++++++++++++-- hw/s390x/s390-virtio-hcall.c | 2 +- hw/s390x/s390-virtio-hcall.h | 21 ++++ hw/s390x/s390-virtio.c | 37 ------ hw/s390x/s390-virtio.h | 35 ------ hw/s390x/sclp.c | 34 +++-- include/hw/s390x/s390-virtio-ccw.h | 2 + include/hw/s390x/sclp.h | 2 + include/qom/cpu.h | 6 +- qapi-schema.json | 16 +++ target/i386/arch_dump.c | 1 - target/i386/arch_memory_mapping.c | 1 - target/i386/svm_helper.c | 1 - target/ppc/arch_dump.c | 1 - target/s390x/arch_dump.c | 1 - target/s390x/cpu-qom.h | 7 +- target/s390x/cpu.c | 102 ++++++--------- target/s390x/cpu.h | 18 +-- target/s390x/cpu_models.c | 58 ++++++--- target/s390x/cpu_models.h | 8 +- target/s390x/diag.c | 1 + target/s390x/excp_helper.c | 5 +- target/s390x/helper.c | 47 +------ target/s390x/internal.h | 1 - target/s390x/kvm.c | 1 + target/s390x/misc_helper.c | 21 ++-- target/s390x/translate.c | 5 +- 30 files changed, 410 insertions(+), 272 deletions(-) create mode 100644 hw/s390x/s390-virtio-hcall.h delete mode 100644 hw/s390x/s390-virtio.h