From nobody Tue Apr 30 05:41:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494993158347901.4548724266544; Tue, 16 May 2017 20:52:38 -0700 (PDT) Received: from localhost ([::1]:45331 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAq0q-0005Qj-DB for importer@patchew.org; Tue, 16 May 2017 23:52:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dApyv-0004Dz-QB for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dApyr-0000mQ-DN for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:37 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34802 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dApyr-0000m3-6f for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:33 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4H3hi2t172539 for ; Tue, 16 May 2017 23:50:32 -0400 Received: from e23smtp06.au.ibm.com (e23smtp06.au.ibm.com [202.81.31.148]) by mx0b-001b2d01.pphosted.com with ESMTP id 2agemcrpmv-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 16 May 2017 23:50:32 -0400 Received: from localhost by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 May 2017 13:50:29 +1000 Received: from d23relay06.au.ibm.com (202.81.31.225) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 17 May 2017 13:50:27 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v4H3oI4M6029788; Wed, 17 May 2017 13:50:26 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v4H3nr9d030289; Wed, 17 May 2017 13:49:54 +1000 Received: from bharata.in.ibm.com ([9.124.35.166]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v4H3noZD029911; Wed, 17 May 2017 13:49:52 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Wed, 17 May 2017 09:19:17 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17051703-0040-0000-0000-000003188EA5 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051703-0041-0000-0000-00000C91368A Message-Id: <1494992962-6929-2-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-17_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705170029 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v1 1/6] migration: Fix unregister_savevm() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rnsastry@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , sam.bobroff@au1.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In unregister_savevm(), free se->compat only if it was allocated earlier. Signed-off-by: Bharata B Rao --- migration/savevm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 352a8f2..7a268ec 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -648,7 +648,9 @@ void unregister_savevm(DeviceState *dev, const char *id= str, void *opaque) QTAILQ_FOREACH_SAFE(se, &savevm_state.handlers, entry, new_se) { if (strcmp(se->idstr, id) =3D=3D 0 && se->opaque =3D=3D opaque) { QTAILQ_REMOVE(&savevm_state.handlers, se, entry); - g_free(se->compat); + if (dev) { + g_free(se->compat); + } g_free(se->ops); g_free(se); } --=20 2.7.4 From nobody Tue Apr 30 05:41:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494993292187192.03896159165083; Tue, 16 May 2017 20:54:52 -0700 (PDT) Received: from localhost ([::1]:45339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAq30-0007Ve-Oy for importer@patchew.org; Tue, 16 May 2017 23:54:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dApyw-0004E9-Kr for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dApys-0000n8-3h for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:38 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35854 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dApyr-0000me-UB for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:34 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4H3hjAj108890 for ; Tue, 16 May 2017 23:50:33 -0400 Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) by mx0a-001b2d01.pphosted.com with ESMTP id 2agcwb4qsa-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 16 May 2017 23:50:33 -0400 Received: from localhost by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 May 2017 13:50:30 +1000 Received: from d23relay06.au.ibm.com (202.81.31.225) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 17 May 2017 13:50:28 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v4H3oKRc60948666; Wed, 17 May 2017 13:50:28 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v4H3nt1j030362; Wed, 17 May 2017 13:49:56 +1000 Received: from bharata.in.ibm.com ([9.124.35.166]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v4H3noZE029911; Wed, 17 May 2017 13:49:54 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Wed, 17 May 2017 09:19:18 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17051703-0004-0000-0000-00000202F5D5 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051703-0005-0000-0000-000009F868C7 Message-Id: <1494992962-6929-3-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-17_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705170029 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v1 2/6] migration: Introduce unregister_savevm_live() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rnsastry@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , sam.bobroff@au1.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Introduce a new function unregister_savevm_live() to unregister the vmstate handlers registered via register_savevm_live(). register_savevm() allocates SaveVMHandlers while register_savevm_live() gets passed with SaveVMHandlers. During unregistration, we want to free SaveVMHandlers in the former case but not free in the latter case. Hence this new API is needed to differentiate this. This new API will be needed by PowerPC to unregister the HTAB savevm handlers. Signed-off-by: Bharata B Rao --- hw/net/vmxnet3.c | 2 +- hw/s390x/s390-skeys.c | 2 +- include/migration/vmstate.h | 4 +++- migration/savevm.c | 12 ++++++++++-- slirp/slirp.c | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 8b1fab2..2b923be 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2350,7 +2350,7 @@ static void vmxnet3_pci_uninit(PCIDevice *pci_dev) =20 VMW_CBPRN("Starting uninit..."); =20 - unregister_savevm(dev, "vmxnet3-msix", s); + unregister_savevm(dev, "vmxnet3-msix", s, false); =20 vmxnet3_net_uninit(s); =20 diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index e2d4e1a..32b6435 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -379,7 +379,7 @@ static inline void s390_skeys_set_migration_enabled(Obj= ect *obj, bool value, register_savevm(NULL, TYPE_S390_SKEYS, 0, 1, s390_storage_keys_sav= e, s390_storage_keys_load, ss); } else { - unregister_savevm(DEVICE(ss), TYPE_S390_SKEYS, ss); + unregister_savevm(DEVICE(ss), TYPE_S390_SKEYS, ss, false); } } =20 diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f4bf3f1..ba81b3e 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -78,7 +78,9 @@ int register_savevm_live(DeviceState *dev, SaveVMHandlers *ops, void *opaque); =20 -void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque); +void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque, + bool live); +void unregister_savevm_live(DeviceState *dev, const char *idstr, void *opa= que); =20 typedef struct VMStateInfo VMStateInfo; typedef struct VMStateDescription VMStateDescription; diff --git a/migration/savevm.c b/migration/savevm.c index 7a268ec..fa7c3db 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -630,7 +630,8 @@ int register_savevm(DeviceState *dev, ops, opaque); } =20 -void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque) +void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque, + bool live) { SaveStateEntry *se, *new_se; char id[256] =3D ""; @@ -651,12 +652,19 @@ void unregister_savevm(DeviceState *dev, const char *= idstr, void *opaque) if (dev) { g_free(se->compat); } - g_free(se->ops); + if (!live) { + g_free(se->ops); + } g_free(se); } } } =20 +void unregister_savevm_live(DeviceState *dev, const char *idstr, void *opa= que) +{ + unregister_savevm(dev, idstr, opaque, true); +} + int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, const VMStateDescription *vmsd, void *opaque, int alias_id, diff --git a/slirp/slirp.c b/slirp/slirp.c index 2f2ec2c..108e669 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -333,7 +333,7 @@ void slirp_cleanup(Slirp *slirp) { QTAILQ_REMOVE(&slirp_instances, slirp, entry); =20 - unregister_savevm(NULL, "slirp", slirp); + unregister_savevm(NULL, "slirp", slirp, false); =20 ip_cleanup(slirp); ip6_cleanup(slirp); --=20 2.7.4 From nobody Tue Apr 30 05:41:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14949931774618.060595051926043; Tue, 16 May 2017 20:52:57 -0700 (PDT) Received: from localhost ([::1]:45332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAq1A-0005lW-3M for importer@patchew.org; Tue, 16 May 2017 23:52:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dApz0-0004I2-56 for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dApyv-0000pb-9Y for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:42 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53759) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dApyu-0000nz-Vo for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:37 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4H3hiaq120686 for ; Tue, 16 May 2017 23:50:35 -0400 Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com [202.81.31.140]) by mx0a-001b2d01.pphosted.com with ESMTP id 2agenjgkj9-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 16 May 2017 23:50:35 -0400 Received: from localhost by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 May 2017 13:50:33 +1000 Received: from d23relay07.au.ibm.com (202.81.31.226) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 17 May 2017 13:50:30 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v4H3oMII57016428; Wed, 17 May 2017 13:50:30 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v4H3nvrO030394; Wed, 17 May 2017 13:49:57 +1000 Received: from bharata.in.ibm.com ([9.124.35.166]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v4H3noZF029911; Wed, 17 May 2017 13:49:56 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Wed, 17 May 2017 09:19:19 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17051703-0044-0000-0000-00000257D45D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051703-0045-0000-0000-000006E636B6 Message-Id: <1494992962-6929-4-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-17_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705170029 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [RFC PATCH v1 3/6] spapr: Make h_register_process_table hcall flags global X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rnsastry@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , sam.bobroff@au1.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The flags used in h_register_process_table hcall are needed in spapr.c and hence move them to a header file. While doing so, give them slightly specific names. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson --- hw/ppc/spapr_hcall.c | 31 ++++++++++++++----------------- include/hw/ppc/spapr.h | 10 ++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0d608d6..3600b0e 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -924,13 +924,6 @@ static void spapr_check_setup_free_hpt(sPAPRMachineSta= te *spapr, return; } =20 -#define FLAGS_MASK 0x01FULL -#define FLAG_MODIFY 0x10 -#define FLAG_REGISTER 0x08 -#define FLAG_RADIX 0x04 -#define FLAG_HASH_PROC_TBL 0x02 -#define FLAG_GTSE 0x01 - static target_ulong h_register_process_table(PowerPCCPU *cpu, sPAPRMachineState *spapr, target_ulong opcode, @@ -943,12 +936,13 @@ static target_ulong h_register_process_table(PowerPCC= PU *cpu, target_ulong table_size =3D args[3]; uint64_t cproc; =20 - if (flags & ~FLAGS_MASK) { /* Check no reserved bits are set */ + if (flags & ~SPAPR_PROC_TABLE_MASK) { /* Check no reserved bits are se= t */ return H_PARAMETER; } - if (flags & FLAG_MODIFY) { - if (flags & FLAG_REGISTER) { - if (flags & FLAG_RADIX) { /* Register new RADIX process table = */ + if (flags & SPAPR_PROC_TABLE_MODIFY) { + if (flags & SPAPR_PROC_TABLE_REGISTER) { + if (flags & SPAPR_PROC_TABLE_RADIX) { + /* Register new RADIX process table */ if (proc_tbl & 0xfff || proc_tbl >> 60) { return H_P2; } else if (page_size) { @@ -958,7 +952,8 @@ static target_ulong h_register_process_table(PowerPCCPU= *cpu, } cproc =3D PATBE1_GR | proc_tbl | table_size; } else { /* Register new HPT process table */ - if (flags & FLAG_HASH_PROC_TBL) { /* Hash with Segment Tab= les */ + if (flags & SPAPR_PROC_TABLE_HPT_PT) { + /* Hash with Segment Tables */ /* TODO - Not Supported */ /* Technically caused by flag bits =3D> H_PARAMETER */ return H_PARAMETER; @@ -981,7 +976,8 @@ static target_ulong h_register_process_table(PowerPCCPU= *cpu, cproc =3D spapr->patb_entry & PATBE1_GR; } } else { /* Maintain current registration */ - if (!(flags & FLAG_RADIX) !=3D !(spapr->patb_entry & PATBE1_GR)) { + if (!(flags & SPAPR_PROC_TABLE_RADIX) !=3D + !(spapr->patb_entry & PATBE1_GR)) { /* Technically caused by flag bits =3D> H_PARAMETER */ return H_PARAMETER; /* Existing Process Table Mismatch */ } @@ -996,13 +992,14 @@ static target_ulong h_register_process_table(PowerPCC= PU *cpu, /* Update the UPRT and GTSE bits in the LPCR for all cpus */ CPU_FOREACH(cs) { set_spr(cs, SPR_LPCR, LPCR_UPRT | LPCR_GTSE, - ((flags & (FLAG_RADIX | FLAG_HASH_PROC_TBL)) ? LPCR_UPRT := 0) | - ((flags & FLAG_GTSE) ? LPCR_GTSE : 0)); + ((flags & (SPAPR_PROC_TABLE_RADIX | SPAPR_PROC_TABLE_HPT_P= T)) ? + LPCR_UPRT : 0) | ((flags & SPAPR_PROC_TABLE_GTSE) ? + SPAPR_PROC_TABLE_GTSE : 0)); } =20 if (kvm_enabled()) { - return kvmppc_configure_v3_mmu(cpu, flags & FLAG_RADIX, - flags & FLAG_GTSE, cproc); + return kvmppc_configure_v3_mmu(cpu, flags & SPAPR_PROC_TABLE_RADIX, + flags & SPAPR_PROC_TABLE_GTSE, cpro= c); } return H_SUCCESS; } diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5802f88..a692e63 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -681,4 +681,14 @@ int spapr_rng_populate_dt(void *fdt); =20 void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg); =20 +/* + * Defines for flag value used in H_REGISTER_PROC_TBL hcall. + */ +#define SPAPR_PROC_TABLE_MASK 0x01FULL +#define SPAPR_PROC_TABLE_MODIFY 0x10 +#define SPAPR_PROC_TABLE_REGISTER 0x08 +#define SPAPR_PROC_TABLE_RADIX 0x04 +#define SPAPR_PROC_TABLE_HPT_PT 0x02 +#define SPAPR_PROC_TABLE_GTSE 0x01 + #endif /* HW_SPAPR_H */ --=20 2.7.4 From nobody Tue Apr 30 05:41:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494993180144675.9061134565687; Tue, 16 May 2017 20:53:00 -0700 (PDT) Received: from localhost ([::1]:45333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAq1C-0005oJ-Rj for importer@patchew.org; Tue, 16 May 2017 23:52:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dApz0-0004Im-TL for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dApyv-0000qQ-Sz for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:42 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:48970 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dApyv-0000po-Nq for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:37 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4H3hhv5142499 for ; Tue, 16 May 2017 23:50:37 -0400 Received: from e23smtp05.au.ibm.com (e23smtp05.au.ibm.com [202.81.31.147]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ag58n0mwc-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 16 May 2017 23:50:36 -0400 Received: from localhost by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 May 2017 13:50:34 +1000 Received: from d23relay09.au.ibm.com (202.81.31.228) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 17 May 2017 13:50:32 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v4H3oNtM52953112; Wed, 17 May 2017 13:50:31 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v4H3nxjg030436; Wed, 17 May 2017 13:49:59 +1000 Received: from bharata.in.ibm.com ([9.124.35.166]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v4H3noZG029911; Wed, 17 May 2017 13:49:57 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Wed, 17 May 2017 09:19:20 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17051703-0016-0000-0000-0000023C84A6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051703-0017-0000-0000-000006B9CDFC Message-Id: <1494992962-6929-5-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-17_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705170029 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v1 4/6] spapr: Consolidate HPT freeing code into a routine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rnsastry@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , sam.bobroff@au1.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Consolidate the code that frees HPT into a separate routine spapr_free_hpt() as the same chunk of code is called from two places. Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 13 +++++++++---- hw/ppc/spapr_hcall.c | 5 +---- include/hw/ppc/spapr.h | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 1b7cada..521eef1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1222,16 +1222,21 @@ static int spapr_hpt_shift_for_ramsize(uint64_t ram= size) return shift; } =20 +void spapr_free_hpt(sPAPRMachineState *spapr) +{ + g_free(spapr->htab); + spapr->htab =3D NULL; + spapr->htab_shift =3D 0; + close_htab_fd(spapr); +} + static void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift, Error **errp) { long rc; =20 /* Clean up any HPT info from a previous boot */ - g_free(spapr->htab); - spapr->htab =3D NULL; - spapr->htab_shift =3D 0; - close_htab_fd(spapr); + spapr_free_hpt(spapr); =20 rc =3D kvmppc_reset_htab(shift); if (rc < 0) { diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 3600b0e..be79e3d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -913,10 +913,7 @@ static void spapr_check_setup_free_hpt(sPAPRMachineSta= te *spapr, /* We assume RADIX, so this catches all the "Do Nothing" cases */ } else if (!(patbe_old & PATBE1_GR)) { /* HASH->RADIX : Free HPT */ - g_free(spapr->htab); - spapr->htab =3D NULL; - spapr->htab_shift =3D 0; - close_htab_fd(spapr); + spapr_free_hpt(spapr); } else if (!(patbe_new & PATBE1_GR)) { /* RADIX->HASH || NOTHING->HASH : Allocate HPT */ spapr_setup_hpt_and_vrma(spapr); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index a692e63..6f9cb85 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -610,6 +610,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *sm, sPAPROptionVector *ov5_updates); void close_htab_fd(sPAPRMachineState *spapr); void spapr_setup_hpt_and_vrma(sPAPRMachineState *spapr); +void spapr_free_hpt(sPAPRMachineState *spapr); sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn); void spapr_tce_table_enable(sPAPRTCETable *tcet, uint32_t page_shift, uint64_t bus_offset, --=20 2.7.4 From nobody Tue Apr 30 05:41:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494993310496542.8014863106386; Tue, 16 May 2017 20:55:10 -0700 (PDT) Received: from localhost ([::1]:45340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAq3I-0007l7-TT for importer@patchew.org; Tue, 16 May 2017 23:55:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dApyy-0004GE-Om for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dApyx-0000sX-RE for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:40 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:49090 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dApyx-0000rl-MV for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:39 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4H3hiNa142551 for ; Tue, 16 May 2017 23:50:39 -0400 Received: from e23smtp08.au.ibm.com (e23smtp08.au.ibm.com [202.81.31.141]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ag58n0mx6-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 16 May 2017 23:50:38 -0400 Received: from localhost by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 May 2017 13:50:35 +1000 Received: from d23relay06.au.ibm.com (202.81.31.225) by e23smtp08.au.ibm.com (202.81.31.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 17 May 2017 13:50:33 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay06.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v4H3oPQs35848318; Wed, 17 May 2017 13:50:33 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v4H3o0Oj030520; Wed, 17 May 2017 13:50:01 +1000 Received: from bharata.in.ibm.com ([9.124.35.166]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v4H3noZH029911; Wed, 17 May 2017 13:49:59 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Wed, 17 May 2017 09:19:21 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17051703-0048-0000-0000-0000022DBEE1 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051703-0049-0000-0000-000047DC49D9 Message-Id: <1494992962-6929-6-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-17_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705170029 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v1 5/6] spapr: Unregister HPT savevm handlers for radix guests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rnsastry@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , sam.bobroff@au1.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" HPT gets created by default and later when the guest turns out to be a radix guest, the HPT is destroyed when guest does H_REGISTER_PROC_TBL hcall. Let HTAB savevm handlers registration and unregistration follow the same model so that we don't end up having unrequired HTAB savevm handlers for radix guests. This also ensures that HTAB savevm handlers seemlessly get destroyed and recreated like HTAB itself when hash guest reboots. Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 15 +++++++++++++-- hw/ppc/spapr_hcall.c | 1 + include/hw/ppc/spapr.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 521eef1..05abfc1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1237,6 +1237,7 @@ static void spapr_reallocate_hpt(sPAPRMachineState *s= papr, int shift, =20 /* Clean up any HPT info from a previous boot */ spapr_free_hpt(spapr); + spapr_htab_savevm_unregister(spapr); =20 rc =3D kvmppc_reset_htab(shift); if (rc < 0) { @@ -1275,6 +1276,7 @@ static void spapr_reallocate_hpt(sPAPRMachineState *s= papr, int shift, DIRTY_HPTE(HPTE(spapr->htab, i)); } } + spapr_htab_savevm_register(spapr); } =20 void spapr_setup_hpt_and_vrma(sPAPRMachineState *spapr) @@ -1874,6 +1876,17 @@ static SaveVMHandlers savevm_htab_handlers =3D { .load_state =3D htab_load, }; =20 +void spapr_htab_savevm_register(sPAPRMachineState *spapr) +{ + register_savevm_live(NULL, "spapr/htab", -1, 1, + &savevm_htab_handlers, spapr); +} + +void spapr_htab_savevm_unregister(sPAPRMachineState *spapr) +{ + unregister_savevm_live(NULL, "spapr/htab", spapr); +} + static void spapr_boot_set(void *opaque, const char *boot_device, Error **errp) { @@ -2336,8 +2349,6 @@ static void ppc_spapr_init(MachineState *machine) * interface, this is a legacy from the sPAPREnvironment structure * which predated MachineState but had a similar function */ vmstate_register(NULL, 0, &vmstate_spapr, spapr); - register_savevm_live(NULL, "spapr/htab", -1, 1, - &savevm_htab_handlers, spapr); =20 /* used by RTAS */ QTAILQ_INIT(&spapr->ccs_list); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index be79e3d..768aa57 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -914,6 +914,7 @@ static void spapr_check_setup_free_hpt(sPAPRMachineStat= e *spapr, } else if (!(patbe_old & PATBE1_GR)) { /* HASH->RADIX : Free HPT */ spapr_free_hpt(spapr); + spapr_htab_savevm_unregister(spapr); } else if (!(patbe_new & PATBE1_GR)) { /* RADIX->HASH || NOTHING->HASH : Allocate HPT */ spapr_setup_hpt_and_vrma(spapr); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 6f9cb85..5b39a26 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -636,6 +636,8 @@ void spapr_hotplug_req_remove_by_count_indexed(sPAPRDRC= onnectorType drc_type, uint32_t count, uint32_t in= dex); void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, sPAPRMachineState *spapr); +void spapr_htab_savevm_register(sPAPRMachineState *spapr); +void spapr_htab_savevm_unregister(sPAPRMachineState *spapr); =20 /* rtas-configure-connector state */ struct sPAPRConfigureConnectorState { --=20 2.7.4 From nobody Tue Apr 30 05:41:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494993323409268.2843999114749; Tue, 16 May 2017 20:55:23 -0700 (PDT) Received: from localhost ([::1]:45342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAq3W-0007vB-22 for importer@patchew.org; Tue, 16 May 2017 23:55:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dApz4-0004LQ-Rv for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dApz0-0000vo-5y for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:46 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35173 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dApz0-0000vN-1N for qemu-devel@nongnu.org; Tue, 16 May 2017 23:50:42 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4H3hjmm172608 for ; Tue, 16 May 2017 23:50:41 -0400 Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) by mx0b-001b2d01.pphosted.com with ESMTP id 2agemcrpsj-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 16 May 2017 23:50:40 -0400 Received: from localhost by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 17 May 2017 13:50:38 +1000 Received: from d23relay09.au.ibm.com (202.81.31.228) by e23smtp02.au.ibm.com (202.81.31.208) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 17 May 2017 13:50:35 +1000 Received: from d23av05.au.ibm.com (d23av05.au.ibm.com [9.190.234.119]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v4H3oRr91376532; Wed, 17 May 2017 13:50:35 +1000 Received: from d23av05.au.ibm.com (localhost [127.0.0.1]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v4H3o2IS030594; Wed, 17 May 2017 13:50:03 +1000 Received: from bharata.in.ibm.com ([9.124.35.166]) by d23av05.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v4H3noZI029911; Wed, 17 May 2017 13:50:01 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Wed, 17 May 2017 09:19:22 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1494992962-6929-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17051703-0004-0000-0000-00000202F5D9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051703-0005-0000-0000-000009F868CB Message-Id: <1494992962-6929-7-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-17_01:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705170029 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [RFC PATCH v1 6/6] spapr: Fix migration of Radix guests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rnsastry@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , sam.bobroff@au1.ibm.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fix migration of radix guests by ensuring that we issue KVM_PPC_CONFIGURE_V3_MMU for radix case post migration. Reported-by: Nageswara R Sastry Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 15 +++++++++++++++ hw/ppc/spapr_hcall.c | 1 + include/hw/ppc/spapr.h | 1 + 3 files changed, 17 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 05abfc1..dd1d687 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1443,6 +1443,20 @@ static int spapr_post_load(void *opaque, int version= _id) err =3D spapr_rtc_import_offset(&spapr->rtc, spapr->rtc_offset); } =20 + if (spapr->patb_entry) { + if (kvmppc_has_cap_mmu_radix() && kvm_enabled()) { + err =3D kvmppc_configure_v3_mmu(POWERPC_CPU(first_cpu), + spapr->patb_flags & + SPAPR_PROC_TABLE_RADIX, + spapr->patb_flags & + SPAPR_PROC_TABLE_GTSE, + spapr->patb_entry); + } else { + error_report("Radix guest is unsupported by the host"); + return -EINVAL; + } + } + return err; } =20 @@ -1527,6 +1541,7 @@ static const VMStateDescription vmstate_spapr_patb_en= try =3D { .needed =3D spapr_patb_entry_needed, .fields =3D (VMStateField[]) { VMSTATE_UINT64(patb_entry, sPAPRMachineState), + VMSTATE_UINT64(patb_flags, sPAPRMachineState), VMSTATE_END_OF_LIST() }, }; diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 768aa57..b002fae 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -986,6 +986,7 @@ static target_ulong h_register_process_table(PowerPCCPU= *cpu, spapr_check_setup_free_hpt(spapr, spapr->patb_entry, cproc); =20 spapr->patb_entry =3D cproc; /* Save new process table */ + spapr->patb_flags =3D flags; /* Save the flags */ =20 /* Update the UPRT and GTSE bits in the LPCR for all cpus */ CPU_FOREACH(cs) { diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5b39a26..c25a32e 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -75,6 +75,7 @@ struct sPAPRMachineState { void *htab; uint32_t htab_shift; uint64_t patb_entry; /* Process tbl registed in H_REGISTER_PROCESS_TAB= LE */ + uint64_t patb_flags; hwaddr rma_size; int vrma_adjust; ssize_t rtas_size; --=20 2.7.4