{"id":806858,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806858/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<1503965694-10794-37-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:11","name":"[36/79] s390x/css: catch section mismatch on load","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7d193484ed770266010789d02eaf0503bcf5e4ff","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-37-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806858/checks/","tags":{},"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 3xh96k17gSz9s7M\n\tfor ;\n\tTue, 29 Aug 2017 10:50:54 +1000 (AEST)","from localhost ([::1]:42081 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmUjz-0006mk-CJ\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:50:51 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47983)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCR-0001F9-A3\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCO-0005Qa-26\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:11 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44213)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCN-0005PX-Pm\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:07 -0400","from pps.filterd (m0098399.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0FlUN045002\n\tfor ; Mon, 28 Aug 2017 20:16:07 -0400","from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cmur4vpmu-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:06 -0400","from localhost\n\tby e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 18:16:06 -0600","from b03cxnp07028.gho.boulder.ibm.com (9.17.130.15)\n\tby e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:03 -0600","from b03ledav003.gho.boulder.ibm.com\n\t(b03ledav003.gho.boulder.ibm.com [9.17.130.234])\n\tby b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0G3oU2687396; Mon, 28 Aug 2017 17:16:03 -0700","from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 2454D6A03C;\n\tMon, 28 Aug 2017 18:16:03 -0600 (MDT)","from localhost (unknown [9.80.85.217])\n\tby b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id EF6E46A03D;\n\tMon, 28 Aug 2017 18:16:02 -0600 (MDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:11 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0008-0000-0000-0000087D385D","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:05","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0009-0000-0000-000043C046CF","Message-Id":"<1503965694-10794-37-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\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-1708290001","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 36/79] s390x/css: catch section mismatch on load","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":"Christian Borntraeger ,\n\tHalil Pasic , qemu-stable@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Halil Pasic \n\nPrior to the virtio-ccw-2.7 machine (and commit 2a79eb1a), our virtio\ndevices residing under the virtual-css bus do not have qdev_path based\nmigration stream identifiers (because their qdev_path is NULL). The ids\nare instead generated when the device is registered as a composition of\nthe so called idstr, which takes the vmsd name as its value, and an\ninstance_id, which is which is calculated as a maximal instance_id\nregistered with the same idstr plus one, or zero (if none was registered\npreviously).\n\nThat means, under certain circumstances, one device might try, and even\nsucceed, to load the state of a different device. This can lead to\ntrouble.\n\nLet us fail the migration if the above problem is detected during load.\n\nHow to reproduce the problem:\n1) start qemu-system-s390x making sure you have the following devices\n defined on your command line:\n -device virtio-rng-ccw,id=rng1,devno=fe.0.0001\n -device virtio-rng-ccw,id=rng2,devno=fe.0.0002\n2) detach the devices and reattach in reverse order using the monitor:\n (qemu) device_del rng1\n (qemu) device_del rng2\n (qemu) device_add virtio-rng-ccw,id=rng2,devno=fe.0.0002\n (qemu) device_add virtio-rng-ccw,id=rng1,devno=fe.0.0001\n3) save the state of the vm into a temporary file and quit QEMU:\n (qemu) migrate \"exec:gzip -c > /tmp/tmp_vmstate.gz\"\n (qemu) q\n4) use your command line from step 1 with\n -incoming \"exec:gzip -c -d /tmp/tmp_vmstate.gz\"\n appended to reproduce the problem (while trying to to load the saved vm)\n\nCC: qemu-stable@nongnu.org\nSigned-off-by: Halil Pasic \nReviewed-by: Dong Jia Shi \nReviewed-by: Cornelia Huck \nMessage-Id: <20170518111405.56947-1-pasic@linux.vnet.ibm.com>\nSigned-off-by: Christian Borntraeger \n(cherry picked from commit 8ed179c937830143dc0e03daac30a55272ed89e3)\n* removed context dep on d8d98db5\nSigned-off-by: Michael Roth \n---\n hw/s390x/css.c | 14 ++++++++++++++\n hw/s390x/virtio-ccw.c | 6 +++++-\n 2 files changed, 19 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/s390x/css.c b/hw/s390x/css.c\nindex 37caa98..b24e8b7 100644\n--- a/hw/s390x/css.c\n+++ b/hw/s390x/css.c\n@@ -14,6 +14,7 @@\n #include \"qapi/visitor.h\"\n #include \"hw/qdev.h\"\n #include \"qemu/bitops.h\"\n+#include \"qemu/error-report.h\"\n #include \"exec/address-spaces.h\"\n #include \"cpu.h\"\n #include \"hw/s390x/ioinst.h\"\n@@ -1676,13 +1677,26 @@ void subch_device_save(SubchDev *s, QEMUFile *f)\n int subch_device_load(SubchDev *s, QEMUFile *f)\n {\n SubchDev *old_s;\n+ Error *err = NULL;\n uint16_t old_schid = s->schid;\n+ uint16_t old_devno = s->devno;\n int i;\n \n s->cssid = qemu_get_byte(f);\n s->ssid = qemu_get_byte(f);\n s->schid = qemu_get_be16(f);\n s->devno = qemu_get_be16(f);\n+ if (s->devno != old_devno) {\n+ /* Only possible if machine < 2.7 (no css_dev_path) */\n+\n+ error_setg(&err, \"%x != %x\", old_devno, s->devno);\n+ error_append_hint(&err, \"Devno mismatch, tried to load wrong section!\"\n+ \" Likely reason: some sequences of plug and unplug\"\n+ \" can break migration for machine versions prior to\"\n+ \" 2.7 (known design flaw).\\n\");\n+ error_report_err(err);\n+ return -EINVAL;\n+ }\n /* Re-assign subch. */\n if (old_schid != s->schid) {\n old_s = channel_subsys.css[s->cssid]->sch_set[s->ssid]->sch[old_schid];\ndiff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c\nindex 00b3bde..c0c1db8 100644\n--- a/hw/s390x/virtio-ccw.c\n+++ b/hw/s390x/virtio-ccw.c\n@@ -1264,9 +1264,13 @@ static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f)\n SubchDev *s = ccw_dev->sch;\n VirtIODevice *vdev = virtio_ccw_get_vdev(s);\n int len;\n+ int ret;\n \n s->driver_data = dev;\n- subch_device_load(s, f);\n+ ret = subch_device_load(s, f);\n+ if (ret) {\n+ return ret;\n+ }\n len = qemu_get_be32(f);\n if (len != 0) {\n dev->indicators = get_indicator(qemu_get_be64(f), len);\n","prefixes":["36/79"]}