Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/818969/?format=api
{ "id": 818969, "url": "http://patchwork.ozlabs.org/api/patches/818969/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170927072030.35737-4-borntraeger@de.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<20170927072030.35737-4-borntraeger@de.ibm.com>", "list_archive_url": null, "date": "2017-09-27T07:20:30", "name": "[v3,3/3] s390x/ais: disable ais for compat machines", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f5d5e7decf6d241c3f620ee19dea25da7680c2c2", "submitter": { "id": 590, "url": "http://patchwork.ozlabs.org/api/people/590/?format=api", "name": "Christian Borntraeger", "email": "borntraeger@de.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170927072030.35737-4-borntraeger@de.ibm.com/mbox/", "series": [ { "id": 5298, "url": "http://patchwork.ozlabs.org/api/series/5298/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5298", "date": "2017-09-27T07:20:27", "name": "more ais fixups", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/5298/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/818969/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/818969/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3y28Q52Q7Nz9t33\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 27 Sep 2017 17:21:33 +1000 (AEST)", "from localhost ([::1]:52574 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dx6ex-0001It-A5\n\tfor incoming@patchwork.ozlabs.org; Wed, 27 Sep 2017 03:21:31 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:43917)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <borntraeger@de.ibm.com>) id 1dx6eE-0001Gg-7u\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 03:20:47 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <borntraeger@de.ibm.com>) id 1dx6eB-0007cp-2U\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 03:20:46 -0400", "from mx0a-001b2d01.pphosted.com ([148.163.156.1]:40204)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <borntraeger@de.ibm.com>)\n\tid 1dx6eA-0007cO-PO\n\tfor qemu-devel@nongnu.org; Wed, 27 Sep 2017 03:20:42 -0400", "from pps.filterd (m0098410.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv8R7KYvB140994\n\tfor <qemu-devel@nongnu.org>; Wed, 27 Sep 2017 03:20:38 -0400", "from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2d806h3acp-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Wed, 27 Sep 2017 03:20:37 -0400", "from localhost\n\tby e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <borntraeger@de.ibm.com>;\n\tWed, 27 Sep 2017 08:20:35 +0100", "from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)\n\tby e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP\n\tGateway: Authorized Use Only! Violators will be prosecuted; \n\tWed, 27 Sep 2017 08:20:32 +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 v8R7KWnF19136616; Wed, 27 Sep 2017 07:20:32 GMT", "from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 4557E52043;\n\tWed, 27 Sep 2017 07:15:21 +0100 (BST)", "from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9])\n\tby d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 269675203F; \n\tWed, 27 Sep 2017 07:15:21 +0100 (BST)", "by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651)\n\tid E321C20F62D; Wed, 27 Sep 2017 09:20:31 +0200 (CEST)" ], "From": "Christian Borntraeger <borntraeger@de.ibm.com>", "To": "Cornelia Huck <cohuck@redhat.com>", "Date": "Wed, 27 Sep 2017 09:20:30 +0200", "X-Mailer": "git-send-email 2.9.4", "In-Reply-To": "<20170927072030.35737-1-borntraeger@de.ibm.com>", "References": "<20170927072030.35737-1-borntraeger@de.ibm.com>", "X-TM-AS-GCONF": "00", "x-cbid": "17092707-0040-0000-0000-000003FD732D", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17092707-0041-0000-0000-0000209EBFF0", "Message-Id": "<20170927072030.35737-4-borntraeger@de.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-27_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-1709270108", "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 v3 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": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Alexander Graf <agraf@suse.de>, Thomas Huth <thuth@redhat.com>,\n\tYi Min Zhao <zyimin@linux.vnet.ibm.com>,\n\tDavid Hildenbrand <david@redhat.com>,\n\tMichael Roth <mdroth@linux.vnet.ibm.com>,\n\tqemu-devel <qemu-devel@nongnu.org>,\n\tChristian Borntraeger <borntraeger@de.ibm.com>,\n\tHalil Pasic <pasic@linux.vnet.ibm.com>,\n\t\"Dr. David Alan Gilbert\" <dgilbert@redhat.com>,\n\tRichard Henderson <rth@twiddle.net>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "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 for\na <=2.10 compat machine. As this feature is not available in QEMU <=2.9\n(and QEMU 2.10.1), this guest will fail to migrate back to an older qemu\nlike 2.9 with:\n\nerror while loading state for instance 0x0 of device 's390-flic'\n\nmaking the whole compat machine dis-functional. As a permanent fix, we\nneed to fence the ais feature for machines <= 2.10 similar to what we do\nfor guarded storage, runtime instrumentation and css migration.\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\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\nSigned-off-by: Christian Borntraeger <borntraeger@de.ibm.com>\nCc: Yi Min Zhao <zyimin@linux.vnet.ibm.com>\nCc: Dr. David Alan Gilbert <dgilbert@redhat.com>\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 0a370a9..fddda2b 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 98c82c2..41b770a 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": [ "v3", "3/3" ] }