Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 023D2C54EBE for ; Thu, 12 Jan 2023 22:15:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG5ql-0004IP-BY; Thu, 12 Jan 2023 17:15:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG5qi-0004Hh-Ug for qemu-devel@nongnu.org; Thu, 12 Jan 2023 17:15:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG5qg-0004fS-S2 for qemu-devel@nongnu.org; Thu, 12 Jan 2023 17:15:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673561702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=X8t8cwicP8d4s0TkVJX3id/YZoXclnRJqaJfgDWqkOY=; b=DBZLOaCuL/44nzWDVPsmmgROpg4IABaXWviaRaDU/QPMb4ylh8yKpAQiw/wp8TQuO4S+3B pkul76k97nqrraaQ16lt5BV8QsFUHVi9GH39vXvzeZARWSHoNic+bK4ScEyin8dRpkDi1Q CRkMv703cUzc+xcLjEmte2zkMxCYluw= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-512-o2MUkccIPyGa8x44vHJncw-1; Thu, 12 Jan 2023 17:14:59 -0500 X-MC-Unique: o2MUkccIPyGa8x44vHJncw-1 Received: by mail-qt1-f200.google.com with SMTP id k7-20020ac84747000000b003a87ca26200so9409770qtp.6 for ; Thu, 12 Jan 2023 14:14:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=X8t8cwicP8d4s0TkVJX3id/YZoXclnRJqaJfgDWqkOY=; b=14piRpuNMbbxupnXiemcNfJAsOH17WMFfytXwGK5TkHb03VXFKfb/FAYWFcSOzbELL S++aP7HGBrYoJCBMH4znlU/yERkvF9n87OhDjhIMEfLajK/M00nhVPByYt/4S8p9OLUH FKR+hYWOiWpb7DsqV/7PRfS3iNEkXIl9OX8h3OFWyl2BJOFsSq2XRUdI7f2KbR036i3J kO+ozRnv7jqmlaHbTvhnfQbxtv1F87r84iEcOrfGR1OYP8Mvid15Csx+i4r7I1pw4tGW gWgwI+VLB05QNLizmaRMYC040BO/1daHm9cuCW22oxhGGLx47edQlWB6YxwIN+MsC0wc 8dHw== X-Gm-Message-State: AFqh2kqVLTqtTZblOqJmqqTUU9i4HBrrd2QggIO+fXabfA30yzYhebk5 q3UGiPjG6gqzZ/WEycmhDxDGMhUZvU1LTLKmzR6tMpW2+1PHjtbli7NWBBh4jcxaGsYQhu5OzEj 8MqW1u4snTb7SDIY= X-Received: by 2002:a05:622a:229f:b0:3a9:861d:a6a6 with SMTP id ay31-20020a05622a229f00b003a9861da6a6mr108301082qtb.36.1673561699225; Thu, 12 Jan 2023 14:14:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXtDsa3nMyn04GrtKlvBzqi4BcH8sHbl+/9cJL7u4Cof6WRMrou0wESPOMa1r2VMPn1SCx1F/Q== X-Received: by 2002:a05:622a:229f:b0:3a9:861d:a6a6 with SMTP id ay31-20020a05622a229f00b003a9861da6a6mr108301060qtb.36.1673561698945; Thu, 12 Jan 2023 14:14:58 -0800 (PST) Received: from x1n (bras-base-aurron9127w-grc-56-70-30-145-63.dsl.bell.ca. [70.30.145.63]) by smtp.gmail.com with ESMTPSA id u24-20020ac87518000000b003b2365c9aa6sm807669qtq.14.2023.01.12.14.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 14:14:58 -0800 (PST) Date: Thu, 12 Jan 2023 17:14:57 -0500 From: Peter Xu To: "Dr. David Alan Gilbert" Cc: David Hildenbrand , qemu-devel@nongnu.org, Juan Quintela , "Michael S . Tsirkin" , Michal Privoznik Subject: Re: [PATCH v3 3/8] migration/savevm: Allow immutable device state to be migrated early (i.e., before RAM) Message-ID: References: <20230112164403.105085-1-david@redhat.com> <20230112164403.105085-4-david@redhat.com> <11b7237a-000a-5ad7-3747-246825188d83@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=170.10.133.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, Jan 12, 2023 at 07:52:41PM +0000, Dr. David Alan Gilbert wrote: > * David Hildenbrand (david@redhat.com) wrote: > > On 12.01.23 18:56, Dr. David Alan Gilbert wrote: > > > * David Hildenbrand (david@redhat.com) wrote: > > > > For virtio-mem, we want to have the plugged/unplugged state of memory > > > > blocks available before migrating any actual RAM content, and perform > > > > sanity checks before touching anything on the destination. This > > > > information is immutable on the migration source while migration is active, > > > > > > > > We want to use this information for proper preallocation support with > > > > migration: currently, we don't preallocate memory on the migration target, > > > > and especially with hugetlb, we can easily run out of hugetlb pages during > > > > RAM migration and will crash (SIGBUS) instead of catching this gracefully > > > > via preallocation. > > > > > > > > Migrating device state via a vmsd before we start iterating is currently > > > > impossible: the only approach that would be possible is avoiding a vmsd > > > > and migrating state manually during save_setup(), to be restored during > > > > load_state(). > > > > > > > > Let's allow for migrating device state via a vmsd early, during the > > > > setup phase in qemu_savevm_state_setup(). To keep it simple, we > > > > indicate applicable vmds's using an "immutable" flag. > > > > > > > > Note that only very selected devices (i.e., ones seriously messing with > > > > RAM setup) are supposed to make use of such early state migration. > > > > > > > > Signed-off-by: David Hildenbrand > > > > --- > > > > include/migration/vmstate.h | 5 +++++ > > > > migration/savevm.c | 14 ++++++++++++++ > > > > 2 files changed, 19 insertions(+) > > > > > > > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > > > > index ad24aa1934..dd06c3abad 100644 > > > > --- a/include/migration/vmstate.h > > > > +++ b/include/migration/vmstate.h > > > > @@ -179,6 +179,11 @@ struct VMStateField { > > > > struct VMStateDescription { > > > > const char *name; > > > > int unmigratable; > > > > + /* > > > > + * The state is immutable while migration is active and is saved > > > > + * during the setup phase, to be restored early on the destination. > > > > + */ > > > > + int immutable; > > > > > > A bool would be nicer (as it would for unmigratable above) > > > > Yes, I chose an int for consistency with "unmigratable". I can turn that > > into a bool. > > > > I'd even include a cleanup patch for unmigratable if it wouldn't be ... > > > > $ git grep "unmigratable \=" | wc -l > > 29 > > It might be OK if you just change the declaration; I mean '1' is pretty > close to true? (I think...) > Anyway, at least make the new one a bool. Agreed bool is better. Can we rename it to something like "early_setup"? "immutable" isn't clear on its most important attribute (on when it'll be migrated). Meanwhile I'd hope we can comment that explicitly. I'd go with: /* * This VMSD describes something that should be sent during setup phase * of migration. It plays similar role as save_setup() for explicitly * registered vmstate entries, the only difference is the vmsd will be * sent right at the start of migration. */ bool early_setup; > > > > > int version_id; > > > > int minimum_version_id; > > > > MigrationPriority priority; > > > > diff --git a/migration/savevm.c b/migration/savevm.c > > > > index ff2b8d0064..536d6f662b 100644 > > > > --- a/migration/savevm.c > > > > +++ b/migration/savevm.c > > > > @@ -1200,6 +1200,15 @@ void qemu_savevm_state_setup(QEMUFile *f) > > > > trace_savevm_state_setup(); > > > > QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { > > > > + if (se->vmsd && se->vmsd->immutable) { > > > > + ret = vmstate_save(f, se, ms->vmdesc); > > > > + if (ret) { > > > > + qemu_file_set_error(f, ret); > > > > + break; > > > > + } > > > > + continue; > > > > + } > > > > + > > > > > > Does this give you the ordering you want? i.e. there's no guarantee here > > > that immutables come first? > > > > Yes, for virtio-mem at least this is fine. There are no real ordering > > requirements in regard to save_setup(). > > > > I guess one could use vmstate priorities to affect the ordering, if > > required. > > > > So for my use case this is good enough, any suggestions? Thanks. > > OK, but consider whether it might be better just to have a separate > QTAILQ_FOREACH look in savevm_state_setup that first does all the > immutables, and then all the setups. After patch 1 the order may not matter iiuc, because each call to the immutable vmsds calls the new vmstate_save() which will always send QEMU_VM_SECTION_FULL and footers along the vmsd. Thanks, -- Peter Xu