{"id":817389,"url":"http://patchwork.ozlabs.org/api/patches/817389/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922083855.102341-4-borntraeger@de.ibm.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":"<20170922083855.102341-4-borntraeger@de.ibm.com>","list_archive_url":null,"date":"2017-09-22T08:38:55","name":"[PATCH/RFC,3/3] s390x/ais: disable ais for compat machines","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"81c04d1d51aa17f71364ef551ba2c327064c659d","submitter":{"id":590,"url":"http://patchwork.ozlabs.org/api/people/590/?format=json","name":"Christian Borntraeger","email":"borntraeger@de.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922083855.102341-4-borntraeger@de.ibm.com/mbox/","series":[{"id":4570,"url":"http://patchwork.ozlabs.org/api/series/4570/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4570","date":"2017-09-22T08:38:54","name":"ais fixups for 2.11","version":1,"mbox":"http://patchwork.ozlabs.org/series/4570/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817389/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817389/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=)","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 3xz6SK3vBnz9sBd\n\tfor ;\n\tFri, 22 Sep 2017 18:42:57 +1000 (AEST)","from localhost ([::1]:57366 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dvJXz-0008Fs-IS\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 04:42:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51360)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dvJUN-0005Tl-Ay\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 04:39:12 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dvJUK-0003v8-85\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 04:39:11 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43902)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dvJUJ-0003uP-Ud\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 04:39:08 -0400","from pps.filterd (m0098409.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8M8cwJk090484\n\tfor ; Fri, 22 Sep 2017 04:39:02 -0400","from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d4pnhhpkw-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 22 Sep 2017 04:39:02 -0400","from localhost\n\tby e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tFri, 22 Sep 2017 09:38:59 +0100","from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)\n\tby e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tFri, 22 Sep 2017 09:38:57 +0100","from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com\n\t[9.149.105.232])\n\tby b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v8M8cujJ21757970; Fri, 22 Sep 2017 08:38:56 GMT","from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 980BF52041;\n\tFri, 22 Sep 2017 08:33:52 +0100 (BST)","from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 776F75203F; \n\tFri, 22 Sep 2017 08:33:52 +0100 (BST)","by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651)\n\tid 7909020F62D; Fri, 22 Sep 2017 10:38:56 +0200 (CEST)"],"From":"Christian Borntraeger ","To":"Cornelia Huck ","Date":"Fri, 22 Sep 2017 10:38:55 +0200","X-Mailer":"git-send-email 2.9.4","In-Reply-To":"<20170922083855.102341-1-borntraeger@de.ibm.com>","References":"<20170922083855.102341-1-borntraeger@de.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17092208-0020-0000-0000-000003BA3E26","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17092208-0021-0000-0000-0000424C02A6","Message-Id":"<20170922083855.102341-4-borntraeger@de.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-22_02:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709220120","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"[Qemu-devel] [PATCH/RFC 3/3] s390x/ais: disable ais for compat\n\tmachines","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":"Halil Pasic ,\n\tYi Min Zhao ,\n\tDavid Hildenbrand ,\n\tqemu-devel , Alexander Graf ,\n\tChristian Borntraeger ,\n\t\"Jason J . Herne\" ,\n\t\"Dr. David Alan Gilbert\" ,\n\tRichard Henderson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"With newer kernels that do support the ais feature (4.13) a qemu 2.11\nwill not only enable the ais feature for the 2.11 machine, but also\nfor a <=2.10 compat machine. As this feature is not available in\nQEMU <=2.9 (and QEMU 2.10.1), this guest will fail to migrate\nback to an older qemu like 2.9 with:\n\n_snip_\nerror while loading state for instance 0x0 of device 's390-flic'\n_snip_\n\nmaking the whole compat machine dis-functional. As a permanent fix, we\nneed to fence the ais feature for machines <= 2.10\n\nDue to ais being enabled on 2.10.0 (fixed in 2.10.1) this will prevent\nmigration of ais-enabled guests from 2.10.0 with\n\n_snip_\nqemu-system-s390x: Failed to load s390-flic/ais:tmp\nqemu-system-s390x: error while loading state for instance 0x0 of device 's390-flic'\nqemu-system-s390x: load of migration failed: Function not implemented\n_snip_\n\nSigned-off-by: Christian Borntraeger \nCc: Yi Min Zhao \nCc: Dr. David Alan Gilbert \n---\n hw/intc/s390_flic_kvm.c | 4 +++-\n hw/s390x/s390-virtio-ccw.c | 10 ++++++++++\n include/hw/s390x/s390-virtio-ccw.h | 3 +++\n 3 files changed, 16 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c\nindex a655567..2a94bfc 100644\n--- a/hw/intc/s390_flic_kvm.c\n+++ b/hw/intc/s390_flic_kvm.c\n@@ -22,6 +22,7 @@\n #include \"hw/s390x/s390_flic.h\"\n #include \"hw/s390x/adapter.h\"\n #include \"hw/s390x/css.h\"\n+#include \"hw/s390x/s390-virtio-ccw.h\"\n #include \"trace.h\"\n \n #define FLIC_SAVE_INITIAL_SIZE getpagesize()\n@@ -559,7 +560,8 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp)\n KVM_HAS_DEVICE_ATTR, test_attr);\n /* try enable the AIS facility */\n test_attr.group = KVM_DEV_FLIC_AISM_ALL;\n- if (!ioctl(flic_state->fd, KVM_HAS_DEVICE_ATTR, test_attr)) {\n+ if (ais_allowed() &&\n+ !ioctl(flic_state->fd, KVM_HAS_DEVICE_ATTR, test_attr)) {\n kvm_vm_enable_cap(kvm_state, KVM_CAP_S390_AIS, 0);\n }\n \ndiff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex 11d4dc4..ce8391b 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -435,6 +435,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)\n s390mc->cpu_model_allowed = true;\n s390mc->css_migration_enabled = true;\n s390mc->gs_allowed = true;\n+ s390mc->ais_allowed = true;\n mc->init = ccw_init;\n mc->reset = s390_machine_reset;\n mc->hot_add_cpu = s390_hot_add_cpu;\n@@ -519,6 +520,11 @@ bool gs_allowed(void)\n return get_machine_class()->gs_allowed;\n }\n \n+bool ais_allowed(void)\n+{\n+ return get_machine_class()->ais_allowed;\n+}\n+\n static char *machine_get_loadparm(Object *obj, Error **errp)\n {\n S390CcwMachineState *ms = S390_CCW_MACHINE(obj);\n@@ -742,6 +748,10 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)\n \n static void ccw_machine_2_10_class_options(MachineClass *mc)\n {\n+ S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);\n+\n+ s390mc->ais_allowed = false;\n+\n ccw_machine_2_11_class_options(mc);\n SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10);\n }\ndiff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h\nindex a9a90c2..d25a98f 100644\n--- a/include/hw/s390x/s390-virtio-ccw.h\n+++ b/include/hw/s390x/s390-virtio-ccw.h\n@@ -41,6 +41,7 @@ typedef struct S390CcwMachineClass {\n bool cpu_model_allowed;\n bool css_migration_enabled;\n bool gs_allowed;\n+ bool ais_allowed;\n } S390CcwMachineClass;\n \n /* runtime-instrumentation allowed by the machine */\n@@ -49,6 +50,8 @@ bool ri_allowed(void);\n bool cpu_model_allowed(void);\n /* guarded-storage allowed by the machine */\n bool gs_allowed(void);\n+/* ais allowed by the machine */\n+bool ais_allowed(void);\n \n /**\n * Returns true if (vmstate based) migration of the channel subsystem\n","prefixes":["PATCH/RFC","3/3"]}