From patchwork Mon Sep 8 10:51:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 36960 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D91A82054D for ; Mon, 8 Sep 2014 10:55:08 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id i57sf5195099yha.10 for ; Mon, 08 Sep 2014 03:55:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=C4z1BTzpdZB0WYJDMGiOcCzzbIUHV3/wYz0kTNdbzF8=; b=UowrHqC135wBgDziqILy9mH0C7He9ahGKu74WSfaoDZejcpJGr/1ZkFwaSPJT6trRh RZJ2tpqvYvtMtSk0WPINKKQM3InrNO/cvAE+zZEaIB8LoEUtA3BQl50UATg2xhrfa/1J BTtKRL8xYTKhhHXDQ+1S9oCQU1UjG/3bW6iN3Uj0HEe0lKYZMEjegjU8hpUArm1FdAzX 8CbX0lN6H4jI+0rlgLqNYV2rsDzX3C/+vCucBUmhtL+5Pg1jOmqMC2nQqPWczmats2n9 SBBAKqKknNjuHV7HUSM6V9xpZLCJYO9t+rnX3B5KdiPAOS9/ED1+/OsHBeoi9hKxDZgQ 0VdA== X-Gm-Message-State: ALoCoQnP4rq21rD5BSWEedNomTuXxVmD4rnsu5eMDsPgNAEflSYZPNzQ65DMiJr+xcm2AOOV2BQh X-Received: by 10.236.19.52 with SMTP id m40mr16923349yhm.35.1410173708671; Mon, 08 Sep 2014 03:55:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.75 with SMTP id g69ls1152511qgd.53.gmail; Mon, 08 Sep 2014 03:55:08 -0700 (PDT) X-Received: by 10.52.33.1 with SMTP id n1mr14079336vdi.28.1410173708580; Mon, 08 Sep 2014 03:55:08 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id cm10si3755348vcb.24.2014.09.08.03.55.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Sep 2014 03:55:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hy4so574050vcb.15 for ; Mon, 08 Sep 2014 03:55:08 -0700 (PDT) X-Received: by 10.220.186.196 with SMTP id ct4mr65753vcb.51.1410173708478; Mon, 08 Sep 2014 03:55:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp114208vcb; Mon, 8 Sep 2014 03:55:08 -0700 (PDT) X-Received: by 10.140.30.74 with SMTP id c68mr37627452qgc.63.1410173707995; Mon, 08 Sep 2014 03:55:07 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u10si10630809qae.23.2014.09.08.03.55.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 08 Sep 2014 03:55:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XQwbD-0007hs-Jx for patch@linaro.org; Mon, 08 Sep 2014 06:55:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XQwYM-00038B-0t for qemu-devel@nongnu.org; Mon, 08 Sep 2014 06:52:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XQwYF-0007gN-Iz for qemu-devel@nongnu.org; Mon, 08 Sep 2014 06:52:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XQwYF-0007gI-Be for qemu-devel@nongnu.org; Mon, 08 Sep 2014 06:52:03 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s88Aq13T007158 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 8 Sep 2014 06:52:01 -0400 Received: from localhost (ovpn-112-62.ams2.redhat.com [10.36.112.62]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s88Aq08F020145; Mon, 8 Sep 2014 06:52:00 -0400 From: Stefan Hajnoczi To: Date: Mon, 8 Sep 2014 11:51:28 +0100 Message-Id: <1410173509-26667-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1410173509-26667-1-git-send-email-stefanha@redhat.com> References: <1410173509-26667-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Laszlo Ersek , Stefan Hajnoczi Subject: [Qemu-devel] [PULL 03/24] pflash_cfi01: write flash contents to bdrv on incoming migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Laszlo Ersek A drive that backs a pflash device is special: - it is very small, - its entire contents are kept in a RAMBlock at all times, covering the guest-phys address range that provides the guest's view of the emulated flash chip. The pflash device model keeps the drive (the host-side file) and the guest-visible flash contents in sync. When migrating the guest, the guest-visible flash contents (the RAMBlock) is migrated by default, but on the target host, the drive (the host-side file) remains in full sync with the RAMBlock only if: - the source and target hosts share the storage underlying the pflash drive, - or the migration requests full or incremental block migration too, which then covers all drives. Due to the special nature of pflash drives, the following scenario makes sense as well: - no full nor incremental block migration, covering all drives, alongside the base migration (justified eg. by shared storage for "normal" (big) drives), - non-shared storage for pflash drives. In this case, currently only those portions of the flash drive are updated on the target disk that the guest reprograms while running on the target host. In order to restore accord, dump the entire flash contents to the bdrv in a post_load() callback. - The read-only check follows the other call-sites of pflash_update(); - both "pfl->ro" and pflash_update() reflect / consider the case when "pfl->bs" is NULL; - the total size of the flash device is calculated as in pflash_cfi01_realize(). When using shared storage, or requesting full or incremental block migration along with the normal migration, the patch should incur a harmless rewrite from the target side. It is assumed that, on the target host, RAM is loaded ahead of the call to pflash_post_load(). Suggested-by: Paolo Bonzini Signed-off-by: Laszlo Ersek Signed-off-by: Stefan Hajnoczi --- hw/block/pflash_cfi01.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index fddef39..593fbc5 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -94,10 +94,13 @@ struct pflash_t { void *storage; }; +static int pflash_post_load(void *opaque, int version_id); + static const VMStateDescription vmstate_pflash = { .name = "pflash_cfi01", .version_id = 1, .minimum_version_id = 1, + .post_load = pflash_post_load, .fields = (VMStateField[]) { VMSTATE_UINT8(wcycle, pflash_t), VMSTATE_UINT8(cmd, pflash_t), @@ -982,3 +985,14 @@ MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl) { return &fl->mem; } + +static int pflash_post_load(void *opaque, int version_id) +{ + pflash_t *pfl = opaque; + + if (!pfl->ro) { + DPRINTF("%s: updating bdrv for %s\n", __func__, pfl->name); + pflash_update(pfl, 0, pfl->sector_len * pfl->nb_blocs); + } + return 0; +}