From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1025DC35DF5 for ; Tue, 25 Feb 2020 11:22:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3FAC2176D for ; Tue, 25 Feb 2020 11:22:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3FAC2176D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6YIi-0004R0-4O for qemu-devel@archiver.kernel.org; Tue, 25 Feb 2020 06:22:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41741) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6YHv-0003q0-27 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:22:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6YHt-0002u0-Kj for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:22:06 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:46356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6YHt-0002to-Cc for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:22:05 -0500 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01PBLgJQ104702 for ; Tue, 25 Feb 2020 06:22:04 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2yax38s2bw-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Feb 2020 06:22:04 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Feb 2020 11:22:01 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 25 Feb 2020 11:21:58 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01PBLv5854591686 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 Feb 2020 11:21:57 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AF1B442041; Tue, 25 Feb 2020 11:21:57 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6689B42049; Tue, 25 Feb 2020 11:21:57 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.153.129]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 25 Feb 2020 11:21:57 +0000 (GMT) Subject: Re: [PATCH v4 04/16] s390x: protvirt: Add migration blocker To: David Hildenbrand , qemu-devel@nongnu.org References: <20200220125638.7241-1-frankja@linux.ibm.com> <20200220125638.7241-5-frankja@linux.ibm.com> <52fd13cf-3de6-5a4f-d675-cb1961433dc6@redhat.com> From: Janosch Frank Autocrypt: addr=frankja@linux.ibm.com; prefer-encrypt=mutual; keydata= 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 Date: Tue, 25 Feb 2020 12:21:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <52fd13cf-3de6-5a4f-d675-cb1961433dc6@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="VUusQjml9uZ1dNGvBXZxxAy6qDUxukImk" X-TM-AS-GCONF: 00 x-cbid: 20022511-0020-0000-0000-000003AD670B X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20022511-0021-0000-0000-000022057D09 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-02-25_03:2020-02-21, 2020-02-25 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 impostorscore=0 bulkscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 lowpriorityscore=0 clxscore=1015 phishscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002250093 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, mihajlov@linux.ibm.com, cohuck@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --VUusQjml9uZ1dNGvBXZxxAy6qDUxukImk Content-Type: multipart/mixed; boundary="oQhDhCKrGtKPyaXtBvjRFeMIwlVPO6nKM" --oQhDhCKrGtKPyaXtBvjRFeMIwlVPO6nKM Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 2/25/20 10:50 AM, David Hildenbrand wrote: > On 20.02.20 13:56, Janosch Frank wrote: >> Migration is not yet supported. >> >> Signed-off-by: Janosch Frank >> --- >> hw/s390x/s390-virtio-ccw.c | 17 ++++++++++++++--- >> 1 file changed, 14 insertions(+), 3 deletions(-) >> >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >> index aa974d294e..6fba8d9331 100644 >> --- a/hw/s390x/s390-virtio-ccw.c >> +++ b/hw/s390x/s390-virtio-ccw.c >> @@ -42,6 +42,9 @@ >> #include "hw/s390x/tod.h" >> #include "sysemu/sysemu.h" >> #include "hw/s390x/pv.h" >> +#include "migration/blocker.h" >> + >> +static Error *pv_mig_blocker; >> =20 >> S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) >> { >> @@ -387,6 +390,7 @@ static void s390_machine_reset(MachineState *machi= ne) >> CPUState *cs, *t; >> S390CPU *cpu; >> S390CcwMachineState *ms =3D S390_CCW_MACHINE(machine); >> + static Error *local_err; >> =20 >> /* get the reset parameters, reset them once done */ >> s390_ipl_get_reset_request(&cs, &reset_type); >> @@ -436,13 +440,20 @@ static void s390_machine_reset(MachineState *mac= hine) >> } >> run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); >> =20 >> - if (s390_machine_protect(ms)) { >> + if (!pv_mig_blocker) { >> + error_setg(&pv_mig_blocker, >> + "protected VMs are currently not migrateable."= ); >> + } >> + migrate_add_blocker(pv_mig_blocker, &local_err); >> + if (!local_err && s390_machine_protect(ms)) { >> s390_machine_inject_pv_error(cs); >> - s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); >> - return; >> + migrate_del_blocker(pv_mig_blocker); >> + goto pv_err; >> } >=20 > I'm sorry, but that looks ... a little to interesting to me. Why can't > you register/unregister the blocker where you actually perform the > switch to/from PV? The sprinkled over PV lines annoyed me anyway, so I added a unprotect() function yesterday and now also moved the migration blocker into protect() and unprotect() >=20 >> =20 >> run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); >> +pv_err: >> + s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); >> break; >> default: >> g_assert_not_reached(); >> >=20 >=20 --oQhDhCKrGtKPyaXtBvjRFeMIwlVPO6nKM-- --VUusQjml9uZ1dNGvBXZxxAy6qDUxukImk Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAl5VA1UACgkQ41TmuOI4 ufhINg//ac3utq1iyQsCxWXwSk+UTEfUEePs0ybfe0MuhMoyBt6dWmKWE4PIhI3g /pjmiFrxwW6HKnxpV5wLehx+qXxDQnCu8sUKnUe0PzBKkGKOHtkdCJ/pHGbuZyna h1ZZ/Lovk1uxLhwUZweSbxh0wLGGLoW80RuhZotsprhwU6uSDbxAWtP+FI6XrgzS xMu8FwL4s3lKq5KVv1dUQHNDWpD4lgQGJ+u+0+tVW220GJs04FjoXkD7xoDAuVsY D+slbpbFnrFVrWIUXu7m0AoZzjtXw5lWTX333FP21BP9FCn2ryW9glREZGhC2IlD NK/5JkXpuP6zpoyDWz7tRdiRkun6u7cnp8IswLCmv15rb2rTZFNdWwm3pVN5704P lpV3mGIs3N6H9y+/euL2O5Fn3sOfTzEVdbWhrtDoBLeFqTg/Jp9Hb7exFVaxGxuH G7hZhRf8jdPv4A195YYv5GoBj8nAyLk2IOwGNA59gPSSVMP0ENH1a3zIyPerxB3a DgUuxiqKT//gXmG2KOV/QxFQQICqKjKP58Vzldj9izP8z70cZNLUY0EqqjMSKmGv kdAiwIPs1X0HDaF9n5e9RX4Zzn0dYSNmDstNv9x2y63Mnw5SKUQmPbklBcIyf2DR AMeUXT450EXqJrEFvdPge6lyLjBdccocpZHs/a6N17I+ik7cgYM= =KVxX -----END PGP SIGNATURE----- --VUusQjml9uZ1dNGvBXZxxAy6qDUxukImk--