From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:4301:0:0:0:0:0 with SMTP id h1-v6csp701502wrq; Tue, 3 Jul 2018 00:34:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeV+S3mYiV9FBGJF0OKPPbv1Q/MuZLEPlXKwz11PchrjqQ37p2wyOK54jNCFpLPx5zBjchd X-Received: by 2002:a0c:be15:: with SMTP id k21-v6mr19800287qvg.1.1530603243989; Tue, 03 Jul 2018 00:34:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530603243; cv=none; d=google.com; s=arc-20160816; b=PYl/DoA7KrEYMABt+b525sxzpWk2bblhWOEy1e0bzCptP7bGqCkskBgsYsoNm3fJR3 nHU8+KxLnkfwV75q9XdQdjR/pIVMy8ayzU9eR0HQ2zbxlpAJC9iutCEwjj3kHCkwFl9y VFy0kL03bnQX1Rt/sIla8LcQ8ddpVXSWYglDBCLbz7oB6lXSswWCUR6Fuk5UVjbykfTT 9Ds/cR903F0UjaEurpmvMaJX3ZVAdnJEIzJV3UEbycFF3Z7orcM+Y1yPrXIdPHpu3jZe WyOLx6AGou2inQ9dvLYtFHAsqsuQ6x462YAPmneiyM0dovhBW0B1Bmfm9Z1N9Wg3vn7G LkLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=xNxBANOb0bvJTa3yqtT2Jv6j5tmqtdhshJG5FN2TL+g=; b=ztbynxh7GI/AaNA8u24GyTvkttprv7Ovc2tYVpI0/uhtyXsELYKd5B24BxRM+Wf7YY XX94pET+VoED1diPCUCHHLzK7rrR88RtvanOqfYRVxASUMnYpM41Twai/LEgJaQ08U2X j9bVDwVSOjqtLnwLK+uwBBznmGMVi+QaJsK1MNyUZ1cmfoKL3RibI0/1BewU6+LXBH3h DTxKgciUcgoU/u4LxjweLfx2WPAWbABCDLondMozC3tZWBwxSahupwt7Bw9Gu26TZc3R t82zn0vqs5oshW/Xx4Lfwnvg/tF5Seqbk54gdaNk5respiu0nzD5uFG26FZnBaHs787g jXjQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 20-v6si484634qtn.376.2018.07.03.00.34.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 03 Jul 2018 00:34:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:38541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFp5-00007k-ES for alex.bennee@linaro.org; Tue, 03 Jul 2018 03:34:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faFkh-0004VA-On for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:31:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faFgp-0001cI-He for qemu-devel@nongnu.org; Tue, 03 Jul 2018 03:29:31 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46786 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 1faFby-00057b-Vm; Tue, 03 Jul 2018 03:20:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 633AA857AB; Tue, 3 Jul 2018 07:20:30 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-71.ams2.redhat.com [10.36.116.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7130E1C5A3; Tue, 3 Jul 2018 07:20:28 +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, shameerali.kolothum.thodi@huawei.com, imammedo@redhat.com, david@redhat.com Date: Tue, 3 Jul 2018 09:19:48 +0200 Message-Id: <1530602398-16127-6-git-send-email-eric.auger@redhat.com> In-Reply-To: <1530602398-16127-1-git-send-email-eric.auger@redhat.com> References: <1530602398-16127-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 03 Jul 2018 07:20:30 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 03 Jul 2018 07:20:30 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.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 v3 05/15] 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, david@gibson.dropbear.id.au, dgilbert@redhat.com, agraf@suse.de Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: Y2sFq90KTFka 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 04a32de..5a4d0bf 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1316,6 +1316,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); @@ -1537,6 +1571,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) @@ -1727,6 +1762,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; @@ -1747,6 +1783,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 1a90ffc..91f6de2 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -125,6 +125,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 VIRT_ECAM_ID(high) (high ? VIRT_PCIE_ECAM_HIGH : VIRT_PCIE_ECAM) -- 2.5.5