From nobody Wed May 15 13:05:44 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 1497245675081249.49128795516128; Sun, 11 Jun 2017 22:34:35 -0700 (PDT) Received: from localhost ([::1]:36160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKHzk-0004n8-KM for importer@patchew.org; Mon, 12 Jun 2017 01:34:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKHyE-00040y-9P for qemu-devel@nongnu.org; Mon, 12 Jun 2017 01:32:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKHy9-0008Ct-DV for qemu-devel@nongnu.org; Mon, 12 Jun 2017 01:32:58 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:47569 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 1dKHy9-0008CY-7u for qemu-devel@nongnu.org; Mon, 12 Jun 2017 01:32:53 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5C5TU1X137464 for ; Mon, 12 Jun 2017 01:32:52 -0400 Received: from e23smtp06.au.ibm.com (e23smtp06.au.ibm.com [202.81.31.148]) by mx0b-001b2d01.pphosted.com with ESMTP id 2b19fkdame-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 12 Jun 2017 01:32:51 -0400 Received: from localhost by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 12 Jun 2017 15:32:49 +1000 Received: from d23relay07.au.ibm.com (202.81.31.226) by e23smtp06.au.ibm.com (202.81.31.212) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 12 Jun 2017 15:32:47 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v5C5WkBE6357278; Mon, 12 Jun 2017 15:32:46 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v5C5WjJr011803; Mon, 12 Jun 2017 15:32:46 +1000 Received: from bharata.in.ibm.com ([9.124.35.226]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v5C5Wf9U011597; Mon, 12 Jun 2017 15:32:44 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 11:02:34 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497245555-32472-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1497245555-32472-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17061205-0040-0000-0000-0000032C16B6 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17061205-0041-0000-0000-00000CA62FEA Message-Id: <1497245555-32472-2-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-06-12_03:, , 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-1706120096 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH v6 1/2] spapr: Add a "no HPT" encoding to HTAB migration stream 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, sjitindarsingh@gmail.com, 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" Add a "no HPT" encoding (using value -1) to the HTAB migration stream (in the place of HPT size) when the guest doesn't allocate HPT. This will help the target side to match target HPT with the source HPT and thus enable successful migration. Suggested-by: David Gibson Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 8b541d9..c425499 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1558,13 +1558,19 @@ static int htab_save_setup(QEMUFile *f, void *opaqu= e) sPAPRMachineState *spapr =3D opaque; =20 /* "Iteration" header */ - qemu_put_be32(f, spapr->htab_shift); + if (!spapr->htab_shift) { + qemu_put_be32(f, -1); + } else { + qemu_put_be32(f, spapr->htab_shift); + } =20 if (spapr->htab) { spapr->htab_save_index =3D 0; spapr->htab_first_pass =3D true; } else { - assert(kvm_enabled()); + if (spapr->htab_shift) { + assert(kvm_enabled()); + } } =20 =20 @@ -1710,7 +1716,12 @@ static int htab_save_iterate(QEMUFile *f, void *opaq= ue) int rc =3D 0; =20 /* Iteration header */ - qemu_put_be32(f, 0); + if (!spapr->htab_shift) { + qemu_put_be32(f, -1); + return 0; + } else { + qemu_put_be32(f, 0); + } =20 if (!spapr->htab) { assert(kvm_enabled()); @@ -1744,7 +1755,12 @@ static int htab_save_complete(QEMUFile *f, void *opa= que) int fd; =20 /* Iteration header */ - qemu_put_be32(f, 0); + if (!spapr->htab_shift) { + qemu_put_be32(f, -1); + return 0; + } else { + qemu_put_be32(f, 0); + } =20 if (!spapr->htab) { int rc; @@ -1788,6 +1804,11 @@ static int htab_load(QEMUFile *f, void *opaque, int = version_id) =20 section_hdr =3D qemu_get_be32(f); =20 + if (section_hdr =3D=3D -1) { + spapr_free_hpt(spapr); + return 0; + } + if (section_hdr) { Error *local_err =3D NULL; =20 --=20 2.7.4 From nobody Wed May 15 13:05:44 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 1497245675093557.8377755933151; Sun, 11 Jun 2017 22:34:35 -0700 (PDT) Received: from localhost ([::1]:36159 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKHzk-0004mQ-S5 for importer@patchew.org; Mon, 12 Jun 2017 01:34:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKHyH-000427-1g for qemu-devel@nongnu.org; Mon, 12 Jun 2017 01:33:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKHyC-0008Da-Fs for qemu-devel@nongnu.org; Mon, 12 Jun 2017 01:33:01 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:35068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dKHyC-0008DS-6f for qemu-devel@nongnu.org; Mon, 12 Jun 2017 01:32:56 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v5C5TOZ0094800 for ; Mon, 12 Jun 2017 01:32:54 -0400 Received: from e23smtp04.au.ibm.com (e23smtp04.au.ibm.com [202.81.31.146]) by mx0a-001b2d01.pphosted.com with ESMTP id 2b1m60hmff-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 12 Jun 2017 01:32:54 -0400 Received: from localhost by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 12 Jun 2017 15:32:52 +1000 Received: from d23relay09.au.ibm.com (202.81.31.228) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 12 Jun 2017 15:32:49 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v5C5Wm7e4915496; Mon, 12 Jun 2017 15:32:48 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v5C5Wlrl011903; Mon, 12 Jun 2017 15:32:48 +1000 Received: from bharata.in.ibm.com ([9.124.35.226]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v5C5Wf9V011597; Mon, 12 Jun 2017 15:32:46 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Mon, 12 Jun 2017 11:02:35 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497245555-32472-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1497245555-32472-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17061205-0012-0000-0000-00000245765C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17061205-0013-0000-0000-0000075D8D62 Message-Id: <1497245555-32472-3-git-send-email-bharata@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-06-12_03:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706120096 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 v6 2/2] 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, sjitindarsingh@gmail.com, 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 Reviewed-by: Suraj Jitindar Singh --- hw/ppc/spapr.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c425499..b2217f3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1443,6 +1443,18 @@ 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) { + PowerPCCPU *cpu =3D POWERPC_CPU(first_cpu); + bool radix =3D !!(spapr->patb_entry & PATBE1_GR); + bool gtse =3D !!(cpu->env.spr[SPR_LPCR] & LPCR_GTSE); + + err =3D kvmppc_configure_v3_mmu(cpu, radix, gtse, spapr->patb_entr= y); + if (err) { + error_report("Process table config unsupported by the host"); + return -EINVAL; + } + } + return err; } =20 --=20 2.7.4