From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32608C433B4 for ; Thu, 29 Apr 2021 11:28:27 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6DD1461445 for ; Thu, 29 Apr 2021 11:28:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DD1461445 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lc4qH-0008Qy-E6 for qemu-devel@archiver.kernel.org; Thu, 29 Apr 2021 07:28:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lc4pT-0007g0-VY for qemu-devel@nongnu.org; Thu, 29 Apr 2021 07:27:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lc4pQ-0003IF-Df for qemu-devel@nongnu.org; Thu, 29 Apr 2021 07:27:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619695650; 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: content-transfer-encoding:content-transfer-encoding; bh=W7Tg5Rcl3Vf0tLHuRTKvC2Ri7hx5TCdxtz9oPekZn5o=; b=MCyYdh58ve6Pkeufc11LyB63Q69k2nM5Im65FXOXhgXhycD+F4cdGrcbqwDxy11CdQopkq n0WABQ/jSIPWzx4yn4GKYR+kskSKyG5kMICEe59cpzM/SoBbJVZQQRt6JPwesD8FqPdxP+ XOuBn5sPHPzSjHlXoFe0etXGHcrLaJc= 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-257-ZtqxuvWNOLOYH1Q6yqnaDQ-1; Thu, 29 Apr 2021 07:27:28 -0400 X-MC-Unique: ZtqxuvWNOLOYH1Q6yqnaDQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 552BA1006C96; Thu, 29 Apr 2021 11:27:27 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-50.ams2.redhat.com [10.36.114.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 317E9679E7; Thu, 29 Apr 2021 11:27:08 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v5 00/10] numa/exec/migration: Fix resizing RAM blocks while migrating Date: Thu, 29 Apr 2021 13:26:58 +0200 Message-Id: <20210429112708.12291-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , David Hildenbrand , Richard Henderson , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela , Alex Williamson , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" v4 has been floating around for a while. Let's see if we can find someone to merge this; or at least give some more feedback ... all patches have at least one RB. I realized that resizing RAM blocks while the guest is being migrated (precopy: resize while still running on the source, postcopy: resize while already running on the target) is buggy. In case of precopy, we can simply cancel migration. Postcopy handling is more involved. Resizing can currently happen during a guest reboot, triggered by ACPI rebuilds. Along with the fixes, some cleanups. -------------------------------------------------------------------------- Example to highlight one part of the problem: 1. Start a paused VM (where a ramblock resize will trigger when booting): sudo build/qemu-system-x86_64 \ --enable-kvm \ -S \ -machine q35,nvdimm=on \ -smp 1 \ -cpu host \ -m size=20G,slots=8,maxmem=22G \ -object memory-backend-file,id=mem0,mem-path=/tmp/nvdimm,size=256M \ -device nvdimm,label-size=131072,memdev=mem0,id=nvdimm0,slot=1 \ -nodefaults \ -chardev stdio,nosignal,id=serial \ -device isa-serial,chardev=serial \ -chardev socket,id=monitor,path=/var/tmp/monitor,server,nowait \ -mon chardev=monitor,mode=readline \ -device vmgenid \ -device intel-iommu \ -nographic 2. Starting precopy and then starting the VM to trigger resizing during precopy: QEMU 5.2.95 monitor - type 'help' for more information (qemu) migrate -d "exec:gzip -c > STATEFILE.gz" QEMU 5.2.95 monitor - type 'help' for more information (qemu) cont 3a. Before this series, migration never completes: QEMU 5.2.95 monitor - type 'help' for more information (qemu) info migrate globals: store-global-state: on only-migratable: off send-configuration: on send-section-footer: on decompress-error-check: on clear-bitmap-shift: 18 Migration status: active total time: 43826 ms expected downtime: 300 ms setup: 5 ms transferred ram: 65981 kbytes throughput: 8.27 mbps remaining ram: 18446744073709551612 kbytes total ram: 21234188 kbytes duplicate: 5308454 pages skipped: 0 pages normal: 93 pages normal bytes: 372 kbytes dirty sync count: 1 page size: 4 kbytes multifd bytes: 0 kbytes pages-per-second: 0 4. With this change, migration is properly aborted: (qemu) info migrate globals: store-global-state: on only-migratable: off send-configuration: on send-section-footer: on decompress-error-check: on clear-bitmap-shift: 18 Migration status: cancelled total time: 0 ms -------------------------------------------------------------------------- Cc: Eduardo Habkost Cc: Marcel Apfelbaum Cc: "Michael S. Tsirkin" Cc: Paolo Bonzini Cc: Richard Henderson Cc: Juan Quintela Cc: "Dr. David Alan Gilbert" Cc: Peter Xu Cc: Alex Williamson v4 -> v5: - Rephrased some patch descriptions - Dropped some patches to reduce the footprint -- "stubs/ram-block: Remove stubs that are no longer needed" -- "migration/ram: Tolerate partially changed mappings in postcopy code" - Removed as already upstream now -- "migration/ram: Consolidate variable reset after placement in ram_load_postcopy()" v3 -> v4: - Rebased and retested - Added RBs v2 -> v3: - Rebased on current master - Added RBs - "migration/ram: Tolerate partially changed mappings in postcopy code" -- Extended the comment for the uffdio unregister part. v1 -> v2: - "util: vfio-helpers: Factor out and fix processing of existing ram blocks" -- Stringify error - "migraton/ram: Handle RAM block resizes during precopy" -- Simplified check if we're migrating on the source - "exec: Relax range check in ram_block_discard_range()" -- Added to make discard during resizes actually work - "migration/ram: Discard new RAM when growing RAM blocks after ram_postcopy_incoming_init()" -- Better checks if in the right postcopy mode. -- Better patch subject/description/comments - "migration/ram: Handle RAM block resizes during postcopy" -- Better comments -- Adapt to changed postcopy checks - "migrate/ram: Get rid of "place_source" in ram_load_postcopy()" -- Dropped, as broken - "migration/ram: Tolerate partially changed mappings in postcopy code" -- Better comment / description. Clarify that no implicit wakeup will happen -- Warn on EINVAL (older kernels) -- Wake up any waiter explicitly David Hildenbrand (10): util: vfio-helpers: Factor out and fix processing of existing ram blocks numa: Teach ram block notifiers about resizeable ram blocks numa: Make all callbacks of ram block notifiers optional migration/ram: Handle RAM block resizes during precopy exec: Relax range check in ram_block_discard_range() migration/ram: Discard RAM when growing RAM blocks after ram_postcopy_incoming_init() migration/ram: Simplify host page handling in ram_load_postcopy() migration/ram: Handle RAM block resizes during postcopy migration/multifd: Print used_length of memory block migration/ram: Use offset_in_ramblock() in range checks hw/core/numa.c | 41 +++++++++-- hw/i386/xen/xen-mapcache.c | 7 +- include/exec/cpu-common.h | 1 + include/exec/memory.h | 10 +-- include/exec/ramblock.h | 10 +++ include/exec/ramlist.h | 13 ++-- migration/migration.c | 9 ++- migration/migration.h | 1 + migration/multifd.c | 2 +- migration/postcopy-ram.c | 15 ++++- migration/ram.c | 135 +++++++++++++++++++++++++++++-------- softmmu/physmem.c | 26 +++++-- target/i386/hax/hax-mem.c | 5 +- target/i386/sev.c | 18 ++--- util/vfio-helpers.c | 41 ++++------- 15 files changed, 241 insertions(+), 93 deletions(-) -- 2.30.2