From patchwork Wed Jun 20 13:07:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 932246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 419lrG0bsZz9s8J for ; Wed, 20 Jun 2018 23:22:53 +1000 (AEST) Received: from localhost ([::1]:49632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVd4U-0000lA-RX for incoming@patchwork.ozlabs.org; Wed, 20 Jun 2018 09:22:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVcqB-0004aH-7Y for qemu-devel@nongnu.org; Wed, 20 Jun 2018 09:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVcqA-0005lM-9a for qemu-devel@nongnu.org; Wed, 20 Jun 2018 09:08:03 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53768 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fVcq4-0005jB-VK; Wed, 20 Jun 2018 09:07:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 90C074023827; Wed, 20 Jun 2018 13:07:56 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-106.ams2.redhat.com [10.36.117.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0C812026D6B; Wed, 20 Jun 2018 13:07:54 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Date: Wed, 20 Jun 2018 15:07:33 +0200 Message-Id: <1529500053-21704-7-git-send-email-eric.auger@redhat.com> In-Reply-To: <1529500053-21704-1-git-send-email-eric.auger@redhat.com> References: <1529500053-21704-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 20 Jun 2018 13:07:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 20 Jun 2018 13:07:56 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'eric.auger@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC 6/6] hw/arm/virt: handle max_vm_phys_shift conflicts on migration 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: wei@redhat.com, drjones@redhat.com, suzuki.poulose@arm.com, dgilbert@redhat.com, agraf@suse.de, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When migrating a VM, we must make sure the destination host supports as many IPA bits as the source. Otherwise the migration must fail. We add a VMState infrastructure to machvirt. On pre_save(), the current source max_vm_phys_shift is saved. On destination, we cannot use this information when creating the VM. The VM is created using the max value reported by the destination host - or the kvm_type inherited value -. However on post_load() we can check that this value is compatible with the source saved value. Signed-off-by: Eric Auger --- hw/arm/virt.c | 37 +++++++++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 2 ++ 2 files changed, 39 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1700556..667f754 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1258,6 +1258,40 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) return arm_cpu_mp_affinity(idx, clustersz); } +static int virt_post_load(void *opaque, int version_id) +{ + VirtMachineState *vms = (VirtMachineState *)opaque; + + if (vms->max_vm_phys_shift < vms->source_max_vm_phys_shift) { + error_report("This host kernel only supports %d IPA bits whereas " + "the guest requires %d GPA bits", vms->max_vm_phys_shift, + vms->source_max_vm_phys_shift); + return -1; + } + return 0; +} + +static int virt_pre_save(void *opaque) +{ + VirtMachineState *vms = (VirtMachineState *)opaque; + + vms->source_max_vm_phys_shift = vms->max_vm_phys_shift; + return 0; +} + +static const VMStateDescription vmstate_virt = { + .name = "virt", + .version_id = 1, + .minimum_version_id = 1, + .post_load = virt_post_load, + .pre_save = virt_pre_save, + .fields = (VMStateField[]) { + VMSTATE_INT32(source_max_vm_phys_shift, VirtMachineState), + VMSTATE_END_OF_LIST() + }, +}; + + static void machvirt_init(MachineState *machine) { VirtMachineState *vms = VIRT_MACHINE(machine); @@ -1473,6 +1507,7 @@ static void machvirt_init(MachineState *machine) vms->machine_done.notify = virt_machine_done; qemu_add_machine_init_done_notifier(&vms->machine_done); + vmstate_register(NULL, 0, &vmstate_virt, vms); } static bool virt_get_secure(Object *obj, Error **errp) @@ -1663,6 +1698,7 @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, static int virt_kvm_type(MachineState *ms, const char *type_str) { + VirtMachineState *vms = VIRT_MACHINE(ms); int max_vm_phys_shift, ret = 0; uint64_t type; @@ -1683,6 +1719,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str) } ret = max_vm_phys_shift; out: + vms->max_vm_phys_shift = (max_vm_phys_shift > 0) ? ret : 40; return ret; } diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 2674ce7..600d96d 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -119,6 +119,8 @@ typedef struct { uint32_t iommu_phandle; int psci_conduit; char *kvm_type; + int32_t max_vm_phys_shift; + int32_t source_max_vm_phys_shift; } VirtMachineState; #define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt")