{"id":815009,"url":"http://patchwork.ozlabs.org/api/patches/815009/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-12-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-12-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T15:59:56","name":"[v1,11/27] s390x/kvm: generalize SIGP stop and restart interrupt injection","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"036cf731edace9478996a860575c32b8c34592e4","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-12-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/815009/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815009/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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xwrbj6hqWz9s78\n\tfor ;\n\tTue, 19 Sep 2017 02:11:29 +1000 (AEST)","from localhost ([::1]:37625 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtydr-0006yU-Sn\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:11:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37566)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyUB-0007FH-No\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:34 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyU5-0007zp-GK\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:27 -0400","from mx1.redhat.com ([209.132.183.28]:44338)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyU5-0007zZ-7D\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:21 -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 3222F3DBC2;\n\tMon, 18 Sep 2017 16:01:20 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 2748A5D6A8;\n\tMon, 18 Sep 2017 16:01:16 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3222F3DBC2","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 17:59:56 +0200","Message-Id":"<20170918160012.4317-12-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.30]);\n\tMon, 18 Sep 2017 16:01:20 +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 11/27] s390x/kvm: generalize SIGP stop and\n\trestart interrupt injection","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":"Preparation for factoring it out into !kvm code.\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/internal.h | 2 ++\n target/s390x/interrupt.c | 20 ++++++++++++++++++++\n target/s390x/kvm-stub.c | 8 ++++++++\n target/s390x/kvm.c | 33 +++++++++++++++++++++------------\n target/s390x/kvm_s390x.h | 2 ++\n 5 files changed, 53 insertions(+), 12 deletions(-)","diff":"diff --git a/target/s390x/internal.h b/target/s390x/internal.h\nindex cb331f35ea..8fdeb867e1 100644\n--- a/target/s390x/internal.h\n+++ b/target/s390x/internal.h\n@@ -353,6 +353,8 @@ void cpu_inject_clock_comparator(S390CPU *cpu);\n void cpu_inject_cpu_timer(S390CPU *cpu);\n void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr);\n int cpu_inject_external_call(S390CPU *cpu, uint16_t src_cpu_addr);\n+void cpu_inject_restart(S390CPU *cpu);\n+void cpu_inject_stop(S390CPU *cpu);\n \n \n /* ioinst.c */\ndiff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c\nindex 462316be8e..b1dc28c8dd 100644\n--- a/target/s390x/interrupt.c\n+++ b/target/s390x/interrupt.c\n@@ -117,6 +117,26 @@ int cpu_inject_external_call(S390CPU *cpu, uint16_t src_cpu_addr)\n return 0;\n }\n \n+void cpu_inject_restart(S390CPU *cpu)\n+{\n+ if (kvm_enabled()) {\n+ kvm_s390_restart_interrupt(cpu);\n+ return;\n+ }\n+ /* FIXME TCG */\n+ g_assert_not_reached();\n+}\n+\n+void cpu_inject_stop(S390CPU *cpu)\n+{\n+ if (kvm_enabled()) {\n+ kvm_s390_stop_interrupt(cpu);\n+ return;\n+ }\n+ /* FIXME TCG */\n+ g_assert_not_reached();\n+}\n+\n static void cpu_inject_io(S390CPU *cpu, uint16_t subchannel_id,\n uint16_t subchannel_number,\n uint32_t io_int_parm, uint32_t io_int_word)\ndiff --git a/target/s390x/kvm-stub.c b/target/s390x/kvm-stub.c\nindex 261e1cdc44..18b53b2ad6 100644\n--- a/target/s390x/kvm-stub.c\n+++ b/target/s390x/kvm-stub.c\n@@ -109,3 +109,11 @@ int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit)\n void kvm_s390_crypto_reset(void)\n {\n }\n+\n+void kvm_s390_stop_interrupt(S390CPU *cpu)\n+{\n+}\n+\n+void kvm_s390_restart_interrupt(S390CPU *cpu)\n+{\n+}\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex da3f7e9895..66a56db175 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -1500,9 +1500,6 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data arg)\n {\n S390CPU *cpu = S390_CPU(cs);\n SigpInfo *si = arg.host_ptr;\n- struct kvm_s390_irq irq = {\n- .type = KVM_S390_SIGP_STOP,\n- };\n \n if (s390_cpu_get_state(cpu) != CPU_STATE_OPERATING) {\n si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;\n@@ -1515,7 +1512,7 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data arg)\n } else {\n /* execute the stop function */\n cpu->env.sigp_order = SIGP_STOP;\n- kvm_s390_vcpu_interrupt(cpu, &irq);\n+ cpu_inject_stop(cpu);\n }\n si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;\n }\n@@ -1592,9 +1589,6 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)\n {\n S390CPU *cpu = S390_CPU(cs);\n SigpInfo *si = arg.host_ptr;\n- struct kvm_s390_irq irq = {\n- .type = KVM_S390_SIGP_STOP,\n- };\n \n /* disabled wait - sleeping in user space */\n if (s390_cpu_get_state(cpu) == CPU_STATE_OPERATING && cs->halted) {\n@@ -1604,7 +1598,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)\n switch (s390_cpu_get_state(cpu)) {\n case CPU_STATE_OPERATING:\n cpu->env.sigp_order = SIGP_STOP_STORE_STATUS;\n- kvm_s390_vcpu_interrupt(cpu, &irq);\n+ cpu_inject_stop(cpu);\n /* store will be performed when handling the stop intercept */\n break;\n case CPU_STATE_STOPPED:\n@@ -1694,9 +1688,6 @@ static void sigp_restart(CPUState *cs, run_on_cpu_data arg)\n {\n S390CPU *cpu = S390_CPU(cs);\n SigpInfo *si = arg.host_ptr;\n- struct kvm_s390_irq irq = {\n- .type = KVM_S390_RESTART,\n- };\n \n switch (s390_cpu_get_state(cpu)) {\n case CPU_STATE_STOPPED:\n@@ -1706,7 +1697,7 @@ static void sigp_restart(CPUState *cs, run_on_cpu_data arg)\n s390_cpu_set_state(CPU_STATE_OPERATING, cpu);\n break;\n case CPU_STATE_OPERATING:\n- kvm_s390_vcpu_interrupt(cpu, &irq);\n+ cpu_inject_restart(cpu);\n break;\n }\n si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;\n@@ -2756,3 +2747,21 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)\n kvm_s390_enable_cmma();\n }\n }\n+\n+void kvm_s390_restart_interrupt(S390CPU *cpu)\n+{\n+ struct kvm_s390_irq irq = {\n+ .type = KVM_S390_RESTART,\n+ };\n+\n+ kvm_s390_vcpu_interrupt(cpu, &irq);\n+}\n+\n+void kvm_s390_stop_interrupt(S390CPU *cpu)\n+{\n+ struct kvm_s390_irq irq = {\n+ .type = KVM_S390_SIGP_STOP,\n+ };\n+\n+ kvm_s390_vcpu_interrupt(cpu, &irq);\n+}\ndiff --git a/target/s390x/kvm_s390x.h b/target/s390x/kvm_s390x.h\nindex 2d594bd4ee..fd03cd662a 100644\n--- a/target/s390x/kvm_s390x.h\n+++ b/target/s390x/kvm_s390x.h\n@@ -40,6 +40,8 @@ void kvm_s390_cmma_reset(void);\n void kvm_s390_reset_vcpu(S390CPU *cpu);\n int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit);\n void kvm_s390_crypto_reset(void);\n+void kvm_s390_restart_interrupt(S390CPU *cpu);\n+void kvm_s390_stop_interrupt(S390CPU *cpu);\n \n /* implemented outside of target/s390x/ */\n int kvm_s390_inject_flic(struct kvm_s390_irq *irq);\n","prefixes":["v1","11/27"]}