From nobody Sun Feb 8 21:28:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@gnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@gnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506631334154384.61298161373463; Thu, 28 Sep 2017 13:42:14 -0700 (PDT) Received: from localhost ([::1]:60789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxfdE-0007FO-8t for importer@patchew.org; Thu, 28 Sep 2017 16:42:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxfZ5-0003wk-2I for qemu-devel@nongnu.org; Thu, 28 Sep 2017 16:37:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxfZ1-0003BY-3L for qemu-devel@nongnu.org; Thu, 28 Sep 2017 16:37:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52078) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxfZ0-0003BB-Qp for qemu-devel@nongnu.org; Thu, 28 Sep 2017 16:37:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DAEF037E68; Thu, 28 Sep 2017 20:37:41 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-18.ams2.redhat.com [10.36.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 158E118C57; Thu, 28 Sep 2017 20:37:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DAEF037E68 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 28 Sep 2017 22:36:50 +0200 Message-Id: <20170928203708.9376-13-david@redhat.com> In-Reply-To: <20170928203708.9376-1-david@redhat.com> References: <20170928203708.9376-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 28 Sep 2017 20:37:42 +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 v2 12/30] s390x/kvm: generalize SIGP stop and restart interrupt injection X-BeenThere: qemu-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, David Hildenbrand , cohuck@redhat.com, Richard Henderson , Alexander Graf , Christian Borntraeger Errors-To: qemu-devel-bounces+importer=patchew.org@gnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Preparation for factoring it out into !kvm code. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/internal.h | 2 ++ target/s390x/interrupt.c | 20 ++++++++++++++++++++ target/s390x/kvm-stub.c | 8 ++++++++ target/s390x/kvm.c | 33 +++++++++++++++++++++------------ target/s390x/kvm_s390x.h | 2 ++ 5 files changed, 53 insertions(+), 12 deletions(-) diff --git a/target/s390x/internal.h b/target/s390x/internal.h index 6e500d6bb7..0ac026d30f 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -369,6 +369,8 @@ bool s390_cpu_has_io_int(S390CPU *cpu); bool s390_cpu_has_ext_int(S390CPU *cpu); bool s390_cpu_has_mcck_int(S390CPU *cpu); bool s390_cpu_has_int(S390CPU *cpu); +void cpu_inject_restart(S390CPU *cpu); +void cpu_inject_stop(S390CPU *cpu); =20 =20 /* ioinst.c */ diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index c1eaaea98b..64b3f519ef 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -107,6 +107,26 @@ int cpu_inject_external_call(S390CPU *cpu, uint16_t sr= c_cpu_addr) return 0; } =20 +void cpu_inject_restart(S390CPU *cpu) +{ + if (kvm_enabled()) { + kvm_s390_restart_interrupt(cpu); + return; + } + /* FIXME TCG */ + g_assert_not_reached(); +} + +void cpu_inject_stop(S390CPU *cpu) +{ + if (kvm_enabled()) { + kvm_s390_stop_interrupt(cpu); + return; + } + /* FIXME TCG */ + g_assert_not_reached(); +} + static void cpu_inject_io(S390CPU *cpu, uint16_t subchannel_id, uint16_t subchannel_number, uint32_t io_int_parm, uint32_t io_int_word) diff --git a/target/s390x/kvm-stub.c b/target/s390x/kvm-stub.c index 261e1cdc44..18b53b2ad6 100644 --- a/target/s390x/kvm-stub.c +++ b/target/s390x/kvm-stub.c @@ -109,3 +109,11 @@ int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_= t *hw_limit) void kvm_s390_crypto_reset(void) { } + +void kvm_s390_stop_interrupt(S390CPU *cpu) +{ +} + +void kvm_s390_restart_interrupt(S390CPU *cpu) +{ +} diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 43f8f7331a..7f2623f679 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -1502,9 +1502,6 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data a= rg) { S390CPU *cpu =3D S390_CPU(cs); SigpInfo *si =3D arg.host_ptr; - struct kvm_s390_irq irq =3D { - .type =3D KVM_S390_SIGP_STOP, - }; =20 if (s390_cpu_get_state(cpu) !=3D CPU_STATE_OPERATING) { si->cc =3D SIGP_CC_ORDER_CODE_ACCEPTED; @@ -1517,7 +1514,7 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data a= rg) } else { /* execute the stop function */ cpu->env.sigp_order =3D SIGP_STOP; - kvm_s390_vcpu_interrupt(cpu, &irq); + cpu_inject_stop(cpu); } si->cc =3D SIGP_CC_ORDER_CODE_ACCEPTED; } @@ -1616,9 +1613,6 @@ static void sigp_stop_and_store_status(CPUState *cs, = run_on_cpu_data arg) { S390CPU *cpu =3D S390_CPU(cs); SigpInfo *si =3D arg.host_ptr; - struct kvm_s390_irq irq =3D { - .type =3D KVM_S390_SIGP_STOP, - }; =20 /* disabled wait - sleeping in user space */ if (s390_cpu_get_state(cpu) =3D=3D CPU_STATE_OPERATING && cs->halted) { @@ -1628,7 +1622,7 @@ static void sigp_stop_and_store_status(CPUState *cs, = run_on_cpu_data arg) switch (s390_cpu_get_state(cpu)) { case CPU_STATE_OPERATING: cpu->env.sigp_order =3D SIGP_STOP_STORE_STATUS; - kvm_s390_vcpu_interrupt(cpu, &irq); + cpu_inject_stop(cpu); /* store will be performed when handling the stop intercept */ break; case CPU_STATE_STOPPED: @@ -1718,9 +1712,6 @@ static void sigp_restart(CPUState *cs, run_on_cpu_dat= a arg) { S390CPU *cpu =3D S390_CPU(cs); SigpInfo *si =3D arg.host_ptr; - struct kvm_s390_irq irq =3D { - .type =3D KVM_S390_RESTART, - }; =20 switch (s390_cpu_get_state(cpu)) { case CPU_STATE_STOPPED: @@ -1730,7 +1721,7 @@ static void sigp_restart(CPUState *cs, run_on_cpu_dat= a arg) s390_cpu_set_state(CPU_STATE_OPERATING, cpu); break; case CPU_STATE_OPERATING: - kvm_s390_vcpu_interrupt(cpu, &irq); + cpu_inject_restart(cpu); break; } si->cc =3D SIGP_CC_ORDER_CODE_ACCEPTED; @@ -2781,3 +2772,21 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *mo= del, Error **errp) kvm_s390_enable_cmma(); } } + +void kvm_s390_restart_interrupt(S390CPU *cpu) +{ + struct kvm_s390_irq irq =3D { + .type =3D KVM_S390_RESTART, + }; + + kvm_s390_vcpu_interrupt(cpu, &irq); +} + +void kvm_s390_stop_interrupt(S390CPU *cpu) +{ + struct kvm_s390_irq irq =3D { + .type =3D KVM_S390_SIGP_STOP, + }; + + kvm_s390_vcpu_interrupt(cpu, &irq); +} diff --git a/target/s390x/kvm_s390x.h b/target/s390x/kvm_s390x.h index 2d594bd4ee..fd03cd662a 100644 --- a/target/s390x/kvm_s390x.h +++ b/target/s390x/kvm_s390x.h @@ -40,6 +40,8 @@ void kvm_s390_cmma_reset(void); void kvm_s390_reset_vcpu(S390CPU *cpu); int kvm_s390_set_mem_limit(uint64_t new_limit, uint64_t *hw_limit); void kvm_s390_crypto_reset(void); +void kvm_s390_restart_interrupt(S390CPU *cpu); +void kvm_s390_stop_interrupt(S390CPU *cpu); =20 /* implemented outside of target/s390x/ */ int kvm_s390_inject_flic(struct kvm_s390_irq *irq); --=20 2.13.5