{"id":807766,"url":"http://patchwork.ozlabs.org/api/patches/807766/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-21-cohuck@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":"<20170830165252.13421-21-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:28","name":"[PULL,20/44] s390x/pci: fence off instructions for non-pci","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0ba36f5ca866a01024104d7b5748408570901d83","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-21-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807766/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807766/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=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","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=cohuck@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 3xjC0R3Q2Hz9s8P\n\tfor ;\n\tThu, 31 Aug 2017 03:19:03 +1000 (AEST)","from localhost ([::1]:51731 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6dp-0007m9-4F\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:19:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57127)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6G8-0002UI-Hr\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:33 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6G7-0005SI-ID\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:32 -0400","from mx1.redhat.com ([209.132.183.28]:37720)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6G7-0005Rt-9A\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:31 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 299F45D687;\n\tWed, 30 Aug 2017 16:54:30 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id E02AD70911;\n\tWed, 30 Aug 2017 16:54:25 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 299F45D687","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:28 +0200","Message-Id":"<20170830165252.13421-21-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@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\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 30 Aug 2017 16:54:30 +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] [PULL 20/44] s390x/pci: fence off instructions for\n\tnon-pci","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":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"If a guest running on a machine without zpci issues a pci instruction,\nthrow them an exception.\n\nReviewed-by: Thomas Huth \nReviewed-by: Halil Pasic \nAcked-by: Christian Borntraeger \nSigned-off-by: Cornelia Huck \n---\n target/s390x/kvm.c | 54 +++++++++++++++++++++++++++++++++++++++++-------------\n 1 file changed, 41 insertions(+), 13 deletions(-)","diff":"diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex bc62bba5b7..9de165d8b1 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -1191,7 +1191,11 @@ static int kvm_clp_service_call(S390CPU *cpu, struct kvm_run *run)\n {\n uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16;\n \n- return clp_service_call(cpu, r2);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ return clp_service_call(cpu, r2);\n+ } else {\n+ return -1;\n+ }\n }\n \n static int kvm_pcilg_service_call(S390CPU *cpu, struct kvm_run *run)\n@@ -1199,7 +1203,11 @@ static int kvm_pcilg_service_call(S390CPU *cpu, struct kvm_run *run)\n uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20;\n uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16;\n \n- return pcilg_service_call(cpu, r1, r2);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ return pcilg_service_call(cpu, r1, r2);\n+ } else {\n+ return -1;\n+ }\n }\n \n static int kvm_pcistg_service_call(S390CPU *cpu, struct kvm_run *run)\n@@ -1207,7 +1215,11 @@ static int kvm_pcistg_service_call(S390CPU *cpu, struct kvm_run *run)\n uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20;\n uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16;\n \n- return pcistg_service_call(cpu, r1, r2);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ return pcistg_service_call(cpu, r1, r2);\n+ } else {\n+ return -1;\n+ }\n }\n \n static int kvm_stpcifc_service_call(S390CPU *cpu, struct kvm_run *run)\n@@ -1216,10 +1228,14 @@ static int kvm_stpcifc_service_call(S390CPU *cpu, struct kvm_run *run)\n uint64_t fiba;\n uint8_t ar;\n \n- cpu_synchronize_state(CPU(cpu));\n- fiba = get_base_disp_rxy(cpu, run, &ar);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ cpu_synchronize_state(CPU(cpu));\n+ fiba = get_base_disp_rxy(cpu, run, &ar);\n \n- return stpcifc_service_call(cpu, r1, fiba, ar);\n+ return stpcifc_service_call(cpu, r1, fiba, ar);\n+ } else {\n+ return -1;\n+ }\n }\n \n static int kvm_sic_service_call(S390CPU *cpu, struct kvm_run *run)\n@@ -1247,7 +1263,11 @@ static int kvm_rpcit_service_call(S390CPU *cpu, struct kvm_run *run)\n uint8_t r1 = (run->s390_sieic.ipb & 0x00f00000) >> 20;\n uint8_t r2 = (run->s390_sieic.ipb & 0x000f0000) >> 16;\n \n- return rpcit_service_call(cpu, r1, r2);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ return rpcit_service_call(cpu, r1, r2);\n+ } else {\n+ return -1;\n+ }\n }\n \n static int kvm_pcistb_service_call(S390CPU *cpu, struct kvm_run *run)\n@@ -1257,10 +1277,14 @@ static int kvm_pcistb_service_call(S390CPU *cpu, struct kvm_run *run)\n uint64_t gaddr;\n uint8_t ar;\n \n- cpu_synchronize_state(CPU(cpu));\n- gaddr = get_base_disp_rsy(cpu, run, &ar);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ cpu_synchronize_state(CPU(cpu));\n+ gaddr = get_base_disp_rsy(cpu, run, &ar);\n \n- return pcistb_service_call(cpu, r1, r3, gaddr, ar);\n+ return pcistb_service_call(cpu, r1, r3, gaddr, ar);\n+ } else {\n+ return -1;\n+ }\n }\n \n static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run)\n@@ -1269,10 +1293,14 @@ static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run)\n uint64_t fiba;\n uint8_t ar;\n \n- cpu_synchronize_state(CPU(cpu));\n- fiba = get_base_disp_rxy(cpu, run, &ar);\n+ if (s390_has_feat(S390_FEAT_ZPCI)) {\n+ cpu_synchronize_state(CPU(cpu));\n+ fiba = get_base_disp_rxy(cpu, run, &ar);\n \n- return mpcifc_service_call(cpu, r1, fiba, ar);\n+ return mpcifc_service_call(cpu, r1, fiba, ar);\n+ } else {\n+ return -1;\n+ }\n }\n \n static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)\n","prefixes":["PULL","20/44"]}