{"id":815015,"url":"http://patchwork.ozlabs.org/api/patches/815015/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-13-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","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":"<20170918160012.4317-13-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T15:59:57","name":"[v1,12/27] s390x/kvm: factor out storing of CPU status","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"db4d8f629c8f44640ee385d3dbe4c73736abcd46","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-13-david@redhat.com/mbox/","series":[{"id":3672,"url":"http://patchwork.ozlabs.org/api/series/3672/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3672","date":"2017-09-18T15:59:45","name":"s390x: SMP for TCG (+ cleanups)","version":1,"mbox":"http://patchwork.ozlabs.org/series/3672/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815015/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815015/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\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 3xwrjZ3pz8z9s7F\n\tfor ;\n\tTue, 19 Sep 2017 02:16:34 +1000 (AEST)","from localhost ([::1]:37646 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtyil-00033N-3C\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:16:31 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37590)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyUF-0007IC-1T\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyU9-00081H-48\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:31 -0400","from mx1.redhat.com ([209.132.183.28]:3239)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyU8-00080y-SV\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:25 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 A44132D0FBE;\n\tMon, 18 Sep 2017 16:01:23 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8320A5D6A8;\n\tMon, 18 Sep 2017 16:01:20 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A44132D0FBE","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 17:59:57 +0200","Message-Id":"<20170918160012.4317-13-david@redhat.com>","In-Reply-To":"<20170918160012.4317-1-david@redhat.com>","References":"<20170918160012.4317-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\n\t(mx1.redhat.com [10.5.110.29]);\n\tMon, 18 Sep 2017 16:01:23 +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 v1 12/27] s390x/kvm: factor out storing of CPU\n\tstatus","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tdavid@redhat.com, cohuck@redhat.com, Richard Henderson\n\t, Alexander Graf ,\n\tborntraeger@de.ibm.com, \tIgor Mammedov ,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Factor it out into s390_store_status(), to be used also by TCG later on.\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/helper.c | 38 ++++++++++++++++++++++++++++++++++++++\n target/s390x/internal.h | 2 ++\n target/s390x/kvm.c | 47 +++--------------------------------------------\n 3 files changed, 43 insertions(+), 44 deletions(-)","diff":"diff --git a/target/s390x/helper.c b/target/s390x/helper.c\nindex 75ceb0bf2b..09468f85fa 100644\n--- a/target/s390x/helper.c\n+++ b/target/s390x/helper.c\n@@ -245,6 +245,44 @@ void s390_cpu_recompute_watchpoints(CPUState *cs)\n }\n }\n \n+#define SAVE_AREA_SIZE 512\n+int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)\n+{\n+ static const uint8_t ar_id = 1;\n+ uint64_t ckc = cpu->env.ckc >> 8;\n+ void *mem;\n+ int i;\n+ hwaddr len = SAVE_AREA_SIZE;\n+\n+ mem = cpu_physical_memory_map(addr, &len, 1);\n+ if (!mem) {\n+ return -EFAULT;\n+ }\n+ if (len != SAVE_AREA_SIZE) {\n+ cpu_physical_memory_unmap(mem, len, 1, 0);\n+ return -EFAULT;\n+ }\n+\n+ if (store_arch) {\n+ cpu_physical_memory_write(offsetof(LowCore, ar_access_id), &ar_id, 1);\n+ }\n+ for (i = 0; i < 16; ++i) {\n+ *((uint64_t *)mem + i) = get_freg(&cpu->env, i)->ll;\n+ }\n+ memcpy(mem + 128, &cpu->env.regs, 128);\n+ memcpy(mem + 256, &cpu->env.psw, 16);\n+ memcpy(mem + 280, &cpu->env.psa, 4);\n+ memcpy(mem + 284, &cpu->env.fpc, 4);\n+ memcpy(mem + 292, &cpu->env.todpr, 4);\n+ memcpy(mem + 296, &cpu->env.cputm, 8);\n+ memcpy(mem + 304, &ckc, 8);\n+ memcpy(mem + 320, &cpu->env.aregs, 64);\n+ memcpy(mem + 384, &cpu->env.cregs, 128);\n+\n+ cpu_physical_memory_unmap(mem, len, 1, len);\n+\n+ return 0;\n+}\n #endif /* CONFIG_USER_ONLY */\n \n void s390_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,\ndiff --git a/target/s390x/internal.h b/target/s390x/internal.h\nindex 8fdeb867e1..30bcd7b662 100644\n--- a/target/s390x/internal.h\n+++ b/target/s390x/internal.h\n@@ -339,6 +339,8 @@ void s390_cpu_recompute_watchpoints(CPUState *cs);\n void s390x_tod_timer(void *opaque);\n void s390x_cpu_timer(void *opaque);\n void do_restart_interrupt(CPUS390XState *env);\n+#define S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area)\n+int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch);\n #ifndef CONFIG_USER_ONLY\n LowCore *cpu_map_lowcore(CPUS390XState *env);\n void cpu_unmap_lowcore(LowCore *lowcore);\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex 66a56db175..a6bc27eb28 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -1545,46 +1545,6 @@ static int do_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)\n return 0;\n }\n \n-#define KVM_S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area)\n-#define SAVE_AREA_SIZE 512\n-static int kvm_s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)\n-{\n- static const uint8_t ar_id = 1;\n- uint64_t ckc = cpu->env.ckc >> 8;\n- void *mem;\n- int i;\n- hwaddr len = SAVE_AREA_SIZE;\n-\n- mem = cpu_physical_memory_map(addr, &len, 1);\n- if (!mem) {\n- return -EFAULT;\n- }\n- if (len != SAVE_AREA_SIZE) {\n- cpu_physical_memory_unmap(mem, len, 1, 0);\n- return -EFAULT;\n- }\n-\n- if (store_arch) {\n- cpu_physical_memory_write(offsetof(LowCore, ar_access_id), &ar_id, 1);\n- }\n- for (i = 0; i < 16; ++i) {\n- *((uint64_t *)mem + i) = get_freg(&cpu->env, i)->ll;\n- }\n- memcpy(mem + 128, &cpu->env.regs, 128);\n- memcpy(mem + 256, &cpu->env.psw, 16);\n- memcpy(mem + 280, &cpu->env.psa, 4);\n- memcpy(mem + 284, &cpu->env.fpc, 4);\n- memcpy(mem + 292, &cpu->env.todpr, 4);\n- memcpy(mem + 296, &cpu->env.cputm, 8);\n- memcpy(mem + 304, &ckc, 8);\n- memcpy(mem + 320, &cpu->env.aregs, 64);\n- memcpy(mem + 384, &cpu->env.cregs, 128);\n-\n- cpu_physical_memory_unmap(mem, len, 1, len);\n-\n- return 0;\n-}\n-\n static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)\n {\n S390CPU *cpu = S390_CPU(cs);\n@@ -1604,7 +1564,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)\n case CPU_STATE_STOPPED:\n /* already stopped, just store the status */\n cpu_synchronize_state(cs);\n- kvm_s390_store_status(cpu, KVM_S390_STORE_STATUS_DEF_ADDR, true);\n+ s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true);\n break;\n }\n si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;\n@@ -1624,7 +1584,7 @@ static void sigp_store_status_at_address(CPUState *cs, run_on_cpu_data arg)\n \n cpu_synchronize_state(cs);\n \n- if (kvm_s390_store_status(cpu, address, false)) {\n+ if (s390_store_status(cpu, address, false)) {\n set_sigp_status(si, SIGP_STAT_INVALID_PARAMETER);\n return;\n }\n@@ -2005,8 +1965,7 @@ static int handle_intercept(S390CPU *cpu)\n qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);\n }\n if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) {\n- kvm_s390_store_status(cpu, KVM_S390_STORE_STATUS_DEF_ADDR,\n- true);\n+ s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true);\n }\n cpu->env.sigp_order = 0;\n r = EXCP_HALTED;\n","prefixes":["v1","12/27"]}