Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/811161/?format=api
{ "id": 811161, "url": "http://patchwork.ozlabs.org/api/patches/811161/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170907201335.13956-19-david@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170907201335.13956-19-david@redhat.com>", "list_archive_url": null, "date": "2017-09-07T20:13:32", "name": "[v3,18/21] s390x: implement query-hotpluggable-cpus", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "6d24dc9479259ece054b90746f5b7b033da04dba", "submitter": { "id": 70402, "url": "http://patchwork.ozlabs.org/api/people/70402/?format=api", "name": "David Hildenbrand", "email": "david@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170907201335.13956-19-david@redhat.com/mbox/", "series": [ { "id": 2053, "url": "http://patchwork.ozlabs.org/api/series/2053/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2053", "date": "2017-09-07T20:13:14", "name": "s390x cleanups and CPU hotplug via device_add", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/2053/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/811161/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/811161/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpBrl4tzHz9sBW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 8 Sep 2017 06:29:43 +1000 (AEST)", "from localhost ([::1]:42167 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dq3Qj-0000oR-P0\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 16:29:41 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:39203)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dq3CI-0004fx-AX\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:14:51 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dq3CD-0002UL-6F\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:14:46 -0400", "from mx1.redhat.com ([209.132.183.28]:44232)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <david@redhat.com>) id 1dq3CC-0002Tg-Tz\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:14:41 -0400", "from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0F9765F7B2;\n\tThu, 7 Sep 2017 20:14:40 +0000 (UTC)", "from t460s.redhat.com (ovpn-116-60.ams2.redhat.com [10.36.116.60])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C870C5C88F;\n\tThu, 7 Sep 2017 20:14:33 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 0F9765F7B2", "From": "David Hildenbrand <david@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Thu, 7 Sep 2017 22:13:32 +0200", "Message-Id": "<20170907201335.13956-19-david@redhat.com>", "In-Reply-To": "<20170907201335.13956-1-david@redhat.com>", "References": "<20170907201335.13956-1-david@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.16", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tThu, 07 Sep 2017 20:14:40 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v3 18/21] s390x: implement\n\tquery-hotpluggable-cpus", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Matthew Rosato <mjrosato@linux.vnet.ibm.com>, thuth@redhat.com,\n\tEduardo Habkost <ehabkost@redhat.com>, david@redhat.com,\n\tcohuck@redhat.com, Richard Henderson <richard.henderson@linaro.org>,\n\tAlexander Graf <agraf@suse.de>, borntraeger@de.ibm.com", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "CPU hotplug is only possible on a per core basis on s390x.\n\nAs we now have ms->possible_cpus, we can get rid of the global variable\ncpu_states.\n\nWhile rewriting s390_cpu_addr2state() completely to be based on\npossible_cpus, move it to cpu.c, as it is independent of the virtio-ccw\nmachine.\n\nSigned-off-by: David Hildenbrand <david@redhat.com>\n---\n hw/s390x/s390-virtio-ccw.c | 87 +++++++++++++++++++++++++++++-----------------\n qapi-schema.json | 16 +++++++++\n target/s390x/cpu.c | 17 +++++++++\n target/s390x/cpu.h | 5 +--\n 4 files changed, 89 insertions(+), 36 deletions(-)", "diff": "diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 120f82e339..0e10a4c73a 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -36,24 +36,12 @@\n #include \"qapi/qmp/qerror.h\"\n #include \"hw/nmi.h\"\n \n-static S390CPU **cpu_states;\n-\n-S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)\n-{\n- if (cpu_addr >= max_cpus) {\n- return NULL;\n- }\n-\n- /* Fast lookup via CPU ID */\n- return cpu_states[cpu_addr];\n-}\n-\n /* #define S390_TCG_SMP_SUPPORT */\n \n static void s390_init_cpus(MachineState *machine)\n {\n+ MachineClass *mc = MACHINE_GET_CLASS(machine);\n int i;\n- gchar *name;\n \n if (machine->cpu_model == NULL) {\n machine->cpu_model = s390_default_cpu_model_name();\n@@ -66,17 +54,8 @@ static void s390_init_cpus(MachineState *machine)\n }\n #endif\n \n- cpu_states = g_new0(S390CPU *, max_cpus);\n-\n- for (i = 0; i < max_cpus; i++) {\n- name = g_strdup_printf(\"cpu[%i]\", i);\n- object_property_add_link(OBJECT(machine), name, TYPE_S390_CPU,\n- (Object **) &cpu_states[i],\n- object_property_allow_set_link,\n- OBJ_PROP_LINK_UNREF_ON_RELEASE,\n- &error_abort);\n- g_free(name);\n- }\n+ /* initialize possible_cpus */\n+ mc->possible_cpu_arch_ids(machine);\n \n for (i = 0; i < smp_cpus; i++) {\n s390x_new_cpu(machine->cpu_model, i, &error_fatal);\n@@ -307,17 +286,14 @@ static void ccw_init(MachineState *machine)\n register_savevm_live(NULL, \"todclock\", 0, 1, &savevm_gtod, NULL);\n }\n \n-static void s390_cpu_plug(HotplugHandler *hotplug_dev,\n- DeviceState *dev, Error **errp)\n+static void s390_cpu_plug(HotplugHandler *hotplug_dev, DeviceState *dev,\n+ Error **errp)\n {\n- gchar *name;\n+ MachineState *ms = MACHINE(hotplug_dev);\n S390CPU *cpu = S390_CPU(dev);\n- CPUState *cs = CPU(dev);\n \n- name = g_strdup_printf(\"cpu[%i]\", cpu->env.core_id);\n- object_property_set_link(OBJECT(hotplug_dev), OBJECT(cs), name,\n- errp);\n- g_free(name);\n+ g_assert(!ms->possible_cpus->cpus[cpu->env.core_id].cpu);\n+ ms->possible_cpus->cpus[cpu->env.core_id].cpu = OBJECT(dev);\n }\n \n static void s390_machine_reset(void)\n@@ -350,6 +326,50 @@ static void s390_machine_device_unplug_request(HotplugHandler *hotplug_dev,\n }\n }\n \n+static CPUArchId *s390_find_cpu_slot(MachineState *ms, uint32_t core_id,\n+ int *idx)\n+{\n+ if (core_id >= ms->possible_cpus->len) {\n+ return NULL;\n+ }\n+ /* core_id corresponds to the index */\n+ if (idx) {\n+ *idx = core_id;\n+ }\n+ return &ms->possible_cpus->cpus[core_id];\n+}\n+\n+static CpuInstanceProperties s390_cpu_index_to_props(MachineState *machine,\n+ unsigned cpu_index)\n+{\n+ CPUArchId *slot = s390_find_cpu_slot(machine, cpu_index, NULL);\n+\n+ assert(slot);\n+ return slot->props;\n+}\n+\n+static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms)\n+{\n+ int i;\n+\n+ if (ms->possible_cpus) {\n+ g_assert(ms->possible_cpus && ms->possible_cpus->len == max_cpus);\n+ return ms->possible_cpus;\n+ }\n+\n+ ms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) +\n+ sizeof(CPUArchId) * max_cpus);\n+ ms->possible_cpus->len = max_cpus;\n+ for (i = 0; i < ms->possible_cpus->len; i++) {\n+ ms->possible_cpus->cpus[i].vcpus_count = 1;\n+ ms->possible_cpus->cpus[i].arch_id = i;\n+ ms->possible_cpus->cpus[i].props.has_core_id = true;\n+ ms->possible_cpus->cpus[i].props.core_id = i;\n+ }\n+\n+ return ms->possible_cpus;\n+}\n+\n static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,\n DeviceState *dev)\n {\n@@ -397,7 +417,10 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)\n mc->no_sdcard = 1;\n mc->use_sclp = 1;\n mc->max_cpus = 248;\n+ mc->has_hotpluggable_cpus = true;\n mc->get_hotplug_handler = s390_get_hotplug_handler;\n+ mc->cpu_index_to_instance_props = s390_cpu_index_to_props;\n+ mc->possible_cpu_arch_ids = s390_possible_cpu_arch_ids;\n hc->plug = s390_machine_device_plug;\n hc->unplug_request = s390_machine_device_unplug_request;\n nc->nmi_monitor_handler = s390_nmi;\ndiff --git a/qapi-schema.json b/qapi-schema.json\nindex f3af2cb851..79e9f85404 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -3121,6 +3121,22 @@\n # }\n # ]}\n #\n+# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu\n+# (Since: 2.11):\n+#\n+# -> { \"execute\": \"query-hotpluggable-cpus\" }\n+# <- {\"return\": [\n+# {\n+# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n+# \"props\": { \"core-id\": 1 }\n+# },\n+# {\n+# \"qom-path\": \"/machine/unattached/device[0]\",\n+# \"type\": \"qemu-s390-cpu\", \"vcpus-count\": 1,\n+# \"props\": { \"core-id\": 0 }\n+# }\n+# ]}\n+#\n ##\n { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] }\n \ndiff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex be20c2fb0f..ad9dcdaaf1 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -38,6 +38,7 @@\n #include \"exec/exec-all.h\"\n #include \"hw/qdev-properties.h\"\n #ifndef CONFIG_USER_ONLY\n+#include \"hw/boards.h\"\n #include \"hw/hw.h\"\n #include \"sysemu/arch_init.h\"\n #include \"sysemu/sysemu.h\"\n@@ -445,6 +446,22 @@ void s390_enable_css_support(S390CPU *cpu)\n kvm_s390_enable_css_support(cpu);\n }\n }\n+\n+S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)\n+{\n+ static MachineState *ms;\n+\n+ if (!ms) {\n+ ms = MACHINE(qdev_get_machine());\n+ g_assert(ms->possible_cpus);\n+ }\n+\n+ /* CPU address corresponds to the core_id and the index */\n+ if (cpu_addr >= ms->possible_cpus->len) {\n+ return NULL;\n+ }\n+ return S390_CPU(ms->possible_cpus->cpus[cpu_addr].cpu);\n+}\n #endif\n \n static gchar *s390_gdb_arch_name(CPUState *cs)\ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex ad88cbf368..5707268e43 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -670,6 +670,7 @@ int s390_cpu_restart(S390CPU *cpu);\n void s390_enable_css_support(S390CPU *cpu);\n int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id,\n int vq, bool assign);\n+S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);\n #ifndef CONFIG_USER_ONLY\n unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu);\n #else\n@@ -717,8 +718,4 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,\n #define s390_cpu_virt_mem_check_write(cpu, laddr, ar, len) \\\n s390_cpu_virt_mem_rw(cpu, laddr, ar, NULL, len, true)\n \n-\n-/* outside of target/s390x/ */\n-S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);\n-\n #endif\n", "prefixes": [ "v3", "18/21" ] }