From nobody Tue Nov 18 22:49:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612808587; cv=none; d=zohomail.com; s=zohoarc; b=JLLMQfQCpsQ0F3xlgea48SCNQ4Ynhf+PZI4HR4X2z7viGcwbObXKxJAEGNHwzR4dcMrZrUmqvOBY4z8+p2oTuxguD0Dajq9DHae9zON/Zezi+TyBrLCFHp/6cwlJcGVyeV5lAGt9FWWVE31IbmtgsUPnzn9HLbETg1+HReZC4c8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612808587; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7YabO/CEY+7XD5lg6JCMp9Vam8xUVPB2mzdlOxK1GAQ=; b=Yeju2RNbXivmTxQZipE80EAmYLGUaVvGJMbyJG8p2el6ZPEk7XzsWjqQY+Jz3nU9g1K9l+NpCU8Mg0zdhSXZqEvACFmuBschVB5ADVwsjU61zxlK2i7rqOgMW5M0VhAjthR6GsCpB3ikerN3/J6PuuigudvOJsxBBhxqGbGRulA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161280858791022.093262104001496; Mon, 8 Feb 2021 10:23:07 -0800 (PST) Received: from localhost ([::1]:40688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BBi-0001Ss-KU for importer@patchew.org; Mon, 08 Feb 2021 13:23:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l94lH-00028g-9f for qemu-devel@nongnu.org; Mon, 08 Feb 2021 06:31:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l94lD-0002cq-8W for qemu-devel@nongnu.org; Mon, 08 Feb 2021 06:31:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-tbwrQwjeOnGTGVckTGlDSg-1; Mon, 08 Feb 2021 06:31:16 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE7081020C20; Mon, 8 Feb 2021 11:31:14 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-22.ams2.redhat.com [10.36.115.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id E47341002388; Mon, 8 Feb 2021 11:31:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612783878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7YabO/CEY+7XD5lg6JCMp9Vam8xUVPB2mzdlOxK1GAQ=; b=Un/4VM4dAPvLn+ro1O2rbsCsNmBeQfAI/RTQyUteXTqEgqYqzzjkRtQxbduKElKiUFI2pS gnE5gt+cDsF5tiZHdLw4sKoMgOnO4+GVxbMtTFbvYXSQh1KBiIdUfntNcxbJp761hErY5E ZlrWIKE+9EfJWBVE2gC+I6kj/GrRvN4= X-MC-Unique: tbwrQwjeOnGTGVckTGlDSg-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, berrange@redhat.com, gaojinhao@huawei.com, armbru@redhat.com, mst@redhat.com, philmd@redhat.com, wainersm@redhat.com, s.reiter@proxmox.com Subject: [PULL 27/27] migration: only check page size match if RAM postcopy is enabled Date: Mon, 8 Feb 2021 11:29:18 +0000 Message-Id: <20210208112918.185058-28-dgilbert@redhat.com> In-Reply-To: <20210208112918.185058-1-dgilbert@redhat.com> References: <20210208112918.185058-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Stefan Reiter Postcopy may also be advised for dirty-bitmap migration only, in which case the remote page size will not be available and we'll instead read bogus data, blocking migration with a mismatch error if the VM uses hugepages. Fixes: 58110f0acb ("migration: split common postcopy out of ram postcopy") Signed-off-by: Stefan Reiter Message-Id: <20210204163522.13291-1-s.reiter@proxmox.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 46e9d4d145..72143da0ac 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3808,7 +3808,7 @@ static int ram_load_precopy(QEMUFile *f) } } /* For postcopy we need to check hugepage sizes match = */ - if (postcopy_advised && + if (postcopy_advised && migrate_postcopy_ram() && block->page_size !=3D qemu_host_page_size) { uint64_t remote_page_size =3D qemu_get_be64(f); if (remote_page_size !=3D block->page_size) { --=20 2.29.2