| Message ID | 20170821091614.28251-9-cohuck@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/21/2017 11:16 AM, Cornelia Huck wrote: > If a guest running on a machine without zpci issues a pci instruction, > throw them an exception. > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > target/s390x/kvm.c | 54 +++++++++++++++++++++++++++++++++++++++++------------- > 1 file changed, 41 insertions(+), 13 deletions(-) > > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index bc62bba5b7..9de165d8b1 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -1191,7 +1191,11 @@ static int kvm_clp_service_call(S390CPU *cpu, struct kvm_run *run) > { > uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; > > - return clp_service_call(cpu, r2); > + if (s390_has_feat(S390_FEAT_ZPCI)) { > + return clp_service_call(cpu, r2); > + } else { > + return -1; > + } According to the AR the clp instruction ain't zPCI only. OTOH if I read the AR correctly it might be the only relevant one at the moment. To be more precise, the CLP instruction is installed if one or more of certain tree conditions are met. One of the conditions is zPCI facility installed, and the other two I don't really understand based on what I've looked into. > } > > static int kvm_pcilg_service_call(S390CPU *cpu, struct kvm_run *run) > @@ -1199,7 +1203,11 @@ static int kvm_pcilg_service_call(S390CPU *cpu, struct kvm_run *run) > uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20; > uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; > > - return pcilg_service_call(cpu, r1, r2); > + if (s390_has_feat(S390_FEAT_ZPCI)) { > + return pcilg_service_call(cpu, r1, r2); > + } else { > + return -1; > + } > } > > static int kvm_pcistg_service_call(S390CPU *cpu, struct kvm_run *run) > @@ -1207,7 +1215,11 @@ static int kvm_pcistg_service_call(S390CPU *cpu, struct kvm_run *run) > uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20; > uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; > > - return pcistg_service_call(cpu, r1, r2); > + if (s390_has_feat(S390_FEAT_ZPCI)) { > + return pcistg_service_call(cpu, r1, r2); > + } else { > + return -1; > + } > } > > static int kvm_stpcifc_service_call(S390CPU *cpu, struct kvm_run *run) > @@ -1216,10 +1228,14 @@ static int kvm_stpcifc_service_call(S390CPU *cpu, struct kvm_run *run) > uint64_t fiba; > uint8_t ar; > > - cpu_synchronize_state(CPU(cpu)); > - fiba = get_base_disp_rxy(cpu, run, &ar); > + if (s390_has_feat(S390_FEAT_ZPCI)) { > + cpu_synchronize_state(CPU(cpu)); > + fiba = get_base_disp_rxy(cpu, run, &ar); > > - return stpcifc_service_call(cpu, r1, fiba, ar); > + return stpcifc_service_call(cpu, r1, fiba, ar); > + } else { > + return -1; > + } > } > > static int kvm_sic_service_call(S390CPU *cpu, struct kvm_run *run) > @@ -1247,7 +1263,11 @@ static int kvm_rpcit_service_call(S390CPU *cpu, struct kvm_run *run) > uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20; > uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; > > - return rpcit_service_call(cpu, r1, r2); > + if (s390_has_feat(S390_FEAT_ZPCI)) { > + return rpcit_service_call(cpu, r1, r2); > + } else { > + return -1; > + } > } > > static int kvm_pcistb_service_call(S390CPU *cpu, struct kvm_run *run) > @@ -1257,10 +1277,14 @@ static int kvm_pcistb_service_call(S390CPU *cpu, struct kvm_run *run) > uint64_t gaddr; > uint8_t ar; > > - cpu_synchronize_state(CPU(cpu)); > - gaddr = get_base_disp_rsy(cpu, run, &ar); > + if (s390_has_feat(S390_FEAT_ZPCI)) { > + cpu_synchronize_state(CPU(cpu)); > + gaddr = get_base_disp_rsy(cpu, run, &ar); > > - return pcistb_service_call(cpu, r1, r3, gaddr, ar); > + return pcistb_service_call(cpu, r1, r3, gaddr, ar); > + } else { > + return -1; > + } > } > > static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run) > @@ -1269,10 +1293,14 @@ static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run) > uint64_t fiba; > uint8_t ar; > > - cpu_synchronize_state(CPU(cpu)); > - fiba = get_base_disp_rxy(cpu, run, &ar); > + if (s390_has_feat(S390_FEAT_ZPCI)) { > + cpu_synchronize_state(CPU(cpu)); > + fiba = get_base_disp_rxy(cpu, run, &ar); > > - return mpcifc_service_call(cpu, r1, fiba, ar); > + return mpcifc_service_call(cpu, r1, fiba, ar); > + } else { > + return -1; > + } The rest is directly tied to the zPCI facility. Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com> > } > > static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1) >
On Wed, 23 Aug 2017 16:10:55 +0200 Halil Pasic <pasic@linux.vnet.ibm.com> wrote: > On 08/21/2017 11:16 AM, Cornelia Huck wrote: > > If a guest running on a machine without zpci issues a pci instruction, > > throw them an exception. > > > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > --- > > target/s390x/kvm.c | 54 +++++++++++++++++++++++++++++++++++++++++------------- > > 1 file changed, 41 insertions(+), 13 deletions(-) > > > > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > > index bc62bba5b7..9de165d8b1 100644 > > --- a/target/s390x/kvm.c > > +++ b/target/s390x/kvm.c > > @@ -1191,7 +1191,11 @@ static int kvm_clp_service_call(S390CPU *cpu, struct kvm_run *run) > > { > > uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; > > > > - return clp_service_call(cpu, r2); > > + if (s390_has_feat(S390_FEAT_ZPCI)) { > > + return clp_service_call(cpu, r2); > > + } else { > > + return -1; > > + } > > According to the AR the clp instruction ain't zPCI > only. OTOH if I read the AR correctly it might be > the only relevant one at the moment. To be more > precise, the CLP instruction is installed if one or > more of certain tree conditions are met. One of the > conditions is zPCI facility installed, and the other > two I don't really understand based on what I've > looked into. Thx for the info. This sounds like it's ok to leave the check as-is. > > > } (...) > The rest is directly tied to the zPCI facility. > > Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com> Thanks!
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index bc62bba5b7..9de165d8b1 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -1191,7 +1191,11 @@ static int kvm_clp_service_call(S390CPU *cpu, struct kvm_run *run) { uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; - return clp_service_call(cpu, r2); + if (s390_has_feat(S390_FEAT_ZPCI)) { + return clp_service_call(cpu, r2); + } else { + return -1; + } } static int kvm_pcilg_service_call(S390CPU *cpu, struct kvm_run *run) @@ -1199,7 +1203,11 @@ static int kvm_pcilg_service_call(S390CPU *cpu, struct kvm_run *run) uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20; uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; - return pcilg_service_call(cpu, r1, r2); + if (s390_has_feat(S390_FEAT_ZPCI)) { + return pcilg_service_call(cpu, r1, r2); + } else { + return -1; + } } static int kvm_pcistg_service_call(S390CPU *cpu, struct kvm_run *run) @@ -1207,7 +1215,11 @@ static int kvm_pcistg_service_call(S390CPU *cpu, struct kvm_run *run) uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20; uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; - return pcistg_service_call(cpu, r1, r2); + if (s390_has_feat(S390_FEAT_ZPCI)) { + return pcistg_service_call(cpu, r1, r2); + } else { + return -1; + } } static int kvm_stpcifc_service_call(S390CPU *cpu, struct kvm_run *run) @@ -1216,10 +1228,14 @@ static int kvm_stpcifc_service_call(S390CPU *cpu, struct kvm_run *run) uint64_t fiba; uint8_t ar; - cpu_synchronize_state(CPU(cpu)); - fiba = get_base_disp_rxy(cpu, run, &ar); + if (s390_has_feat(S390_FEAT_ZPCI)) { + cpu_synchronize_state(CPU(cpu)); + fiba = get_base_disp_rxy(cpu, run, &ar); - return stpcifc_service_call(cpu, r1, fiba, ar); + return stpcifc_service_call(cpu, r1, fiba, ar); + } else { + return -1; + } } static int kvm_sic_service_call(S390CPU *cpu, struct kvm_run *run) @@ -1247,7 +1263,11 @@ static int kvm_rpcit_service_call(S390CPU *cpu, struct kvm_run *run) uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20; uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16; - return rpcit_service_call(cpu, r1, r2); + if (s390_has_feat(S390_FEAT_ZPCI)) { + return rpcit_service_call(cpu, r1, r2); + } else { + return -1; + } } static int kvm_pcistb_service_call(S390CPU *cpu, struct kvm_run *run) @@ -1257,10 +1277,14 @@ static int kvm_pcistb_service_call(S390CPU *cpu, struct kvm_run *run) uint64_t gaddr; uint8_t ar; - cpu_synchronize_state(CPU(cpu)); - gaddr = get_base_disp_rsy(cpu, run, &ar); + if (s390_has_feat(S390_FEAT_ZPCI)) { + cpu_synchronize_state(CPU(cpu)); + gaddr = get_base_disp_rsy(cpu, run, &ar); - return pcistb_service_call(cpu, r1, r3, gaddr, ar); + return pcistb_service_call(cpu, r1, r3, gaddr, ar); + } else { + return -1; + } } static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run) @@ -1269,10 +1293,14 @@ static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run) uint64_t fiba; uint8_t ar; - cpu_synchronize_state(CPU(cpu)); - fiba = get_base_disp_rxy(cpu, run, &ar); + if (s390_has_feat(S390_FEAT_ZPCI)) { + cpu_synchronize_state(CPU(cpu)); + fiba = get_base_disp_rxy(cpu, run, &ar); - return mpcifc_service_call(cpu, r1, fiba, ar); + return mpcifc_service_call(cpu, r1, fiba, ar); + } else { + return -1; + } } static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)