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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,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 B80CAC433E0 for ; Tue, 26 Jan 2021 22:32:51 +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 600FF2065E for ; Tue, 26 Jan 2021 22:32:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 600FF2065E 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]:54622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4WtE-0003zp-8G for qemu-devel@archiver.kernel.org; Tue, 26 Jan 2021 17:32:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4WqU-0002wh-H6 for qemu-devel@nongnu.org; Tue, 26 Jan 2021 17:29:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l4WqP-0005Pe-LV for qemu-devel@nongnu.org; Tue, 26 Jan 2021 17:29:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611700191; 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: in-reply-to:in-reply-to:references:references; bh=1OHnnppItEHa7Ul9xTQcaH0lLol0YTC2DtfRl89I/0k=; b=gyq/6BCW5HeVgPhPMkSZI8wBqkZR8pFja3/kSsYNr6hm/deviEqFxbQhUANrr8g/trVMNX nrguR5jY1y3+xc//WzZRfAL3Te3oTcv5g/i9J/v1fxeH/paC6EN6k2eninzt0PcBDy8N0X jnzBlOTULXON9EN8Hl8F391Dnb0g4qo= 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-371-mfIRZBBQMfCRlW_i-HMvOg-1; Tue, 26 Jan 2021 17:29:49 -0500 X-MC-Unique: mfIRZBBQMfCRlW_i-HMvOg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CB7F591220; Tue, 26 Jan 2021 22:29:47 +0000 (UTC) Received: from omen.home.shazbot.org (ovpn-112-255.phx2.redhat.com [10.3.112.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12EC46F927; Tue, 26 Jan 2021 22:29:40 +0000 (UTC) Date: Tue, 26 Jan 2021 15:29:39 -0700 From: Alex Williamson To: Keqian Zhu Subject: Re: [PATCH] vfio/migrate: Move switch of dirty tracking into vfio_memory_listener Message-ID: <20210126152940.17a4cf7e@omen.home.shazbot.org> In-Reply-To: <20210111073439.20236-1-zhukeqian1@huawei.com> References: <20210111073439.20236-1-zhukeqian1@huawei.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=alex.williamson@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=alex.williamson@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Peter Maydell , Andrew Jones , Eduardo Habkost , wanghaibin.wang@huawei.com, jiangkunkun@huawei.com, qemu-devel@nongnu.org, Peter Xu , "Dr . David Alan Gilbert" , Kirti Wankhede , qemu-arm@nongnu.org, Stefan Hajnoczi , Igor Mammedov , Zenghui Yu , Paolo Bonzini , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Kirti? Migration experts? Thanks, Alex On Mon, 11 Jan 2021 15:34:39 +0800 Keqian Zhu wrote: > For now the switch of vfio dirty page tracking is integrated into > the vfio_save_handler, it causes some problems [1]. > > The object of dirty tracking is guest memory, but the object of > the vfio_save_handler is device state. This mixed logic produces > unnecessary coupling and conflicts: > > 1. Coupling: Their saving granule is different (perVM vs perDevice). > vfio will enable dirty_page_tracking for each devices, actually > once is enough. > 2. Conflicts: The ram_save_setup() traverses all memory_listeners > to execute their log_start() and log_sync() hooks to get the > first round dirty bitmap, which is used by the bulk stage of > ram saving. However, it can't get dirty bitmap from vfio, as > @savevm_ram_handlers is registered before @vfio_save_handler. > > Move the switch of vfio dirty_page_tracking into vfio_memory_listener > can solve above problems. Besides, Do not require devices in SAVING > state for vfio_sync_dirty_bitmap(). > > [1] https://www.spinics.net/lists/kvm/msg229967.html > > Reported-by: Zenghui Yu > Signed-off-by: Keqian Zhu > --- > hw/vfio/common.c | 53 +++++++++++++++++++++++++++++++++++++-------- > hw/vfio/migration.c | 35 ------------------------------ > 2 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 6ff1daa763..9128cd7ee1 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -311,7 +311,7 @@ bool vfio_mig_active(void) > return true; > } > > -static bool vfio_devices_all_saving(VFIOContainer *container) > +static bool vfio_devices_all_dirty_tracking(VFIOContainer *container) > { > VFIOGroup *group; > VFIODevice *vbasedev; > @@ -329,13 +329,8 @@ static bool vfio_devices_all_saving(VFIOContainer *container) > return false; > } > > - if (migration->device_state & VFIO_DEVICE_STATE_SAVING) { > - if ((vbasedev->pre_copy_dirty_page_tracking == ON_OFF_AUTO_OFF) > - && (migration->device_state & VFIO_DEVICE_STATE_RUNNING)) { > - return false; > - } > - continue; > - } else { > + if ((vbasedev->pre_copy_dirty_page_tracking == ON_OFF_AUTO_OFF) > + && (migration->device_state & VFIO_DEVICE_STATE_RUNNING)) { > return false; > } > } > @@ -987,6 +982,44 @@ static void vfio_listener_region_del(MemoryListener *listener, > } > } > > +static void vfio_set_dirty_page_tracking(VFIOContainer *container, bool start) > +{ > + int ret; > + struct vfio_iommu_type1_dirty_bitmap dirty = { > + .argsz = sizeof(dirty), > + }; > + > + if (start) { > + dirty.flags = VFIO_IOMMU_DIRTY_PAGES_FLAG_START; > + } else { > + dirty.flags = VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP; > + } > + > + ret = ioctl(container->fd, VFIO_IOMMU_DIRTY_PAGES, &dirty); > + if (ret) { > + error_report("Failed to set dirty tracking flag 0x%x errno: %d", > + dirty.flags, errno); > + } > +} > + > +static void vfio_listener_log_start(MemoryListener *listener, > + MemoryRegionSection *section, > + int old, int new) > +{ > + VFIOContainer *container = container_of(listener, VFIOContainer, listener); > + > + vfio_set_dirty_page_tracking(container, true); > +} > + > +static void vfio_listener_log_stop(MemoryListener *listener, > + MemoryRegionSection *section, > + int old, int new) > +{ > + VFIOContainer *container = container_of(listener, VFIOContainer, listener); > + > + vfio_set_dirty_page_tracking(container, false); > +} > + > static int vfio_get_dirty_bitmap(VFIOContainer *container, uint64_t iova, > uint64_t size, ram_addr_t ram_addr) > { > @@ -1128,7 +1161,7 @@ static void vfio_listerner_log_sync(MemoryListener *listener, > return; > } > > - if (vfio_devices_all_saving(container)) { > + if (vfio_devices_all_dirty_tracking(container)) { > vfio_sync_dirty_bitmap(container, section); > } > } > @@ -1136,6 +1169,8 @@ static void vfio_listerner_log_sync(MemoryListener *listener, > static const MemoryListener vfio_memory_listener = { > .region_add = vfio_listener_region_add, > .region_del = vfio_listener_region_del, > + .log_start = vfio_listener_log_start, > + .log_stop = vfio_listener_log_stop, > .log_sync = vfio_listerner_log_sync, > }; > > diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c > index 00daa50ed8..c0f646823a 100644 > --- a/hw/vfio/migration.c > +++ b/hw/vfio/migration.c > @@ -395,40 +395,10 @@ static int vfio_load_device_config_state(QEMUFile *f, void *opaque) > return qemu_file_get_error(f); > } > > -static int vfio_set_dirty_page_tracking(VFIODevice *vbasedev, bool start) > -{ > - int ret; > - VFIOMigration *migration = vbasedev->migration; > - VFIOContainer *container = vbasedev->group->container; > - struct vfio_iommu_type1_dirty_bitmap dirty = { > - .argsz = sizeof(dirty), > - }; > - > - if (start) { > - if (migration->device_state & VFIO_DEVICE_STATE_SAVING) { > - dirty.flags = VFIO_IOMMU_DIRTY_PAGES_FLAG_START; > - } else { > - return -EINVAL; > - } > - } else { > - dirty.flags = VFIO_IOMMU_DIRTY_PAGES_FLAG_STOP; > - } > - > - ret = ioctl(container->fd, VFIO_IOMMU_DIRTY_PAGES, &dirty); > - if (ret) { > - error_report("Failed to set dirty tracking flag 0x%x errno: %d", > - dirty.flags, errno); > - return -errno; > - } > - return ret; > -} > - > static void vfio_migration_cleanup(VFIODevice *vbasedev) > { > VFIOMigration *migration = vbasedev->migration; > > - vfio_set_dirty_page_tracking(vbasedev, false); > - > if (migration->region.mmaps) { > vfio_region_unmap(&migration->region); > } > @@ -469,11 +439,6 @@ static int vfio_save_setup(QEMUFile *f, void *opaque) > return ret; > } > > - ret = vfio_set_dirty_page_tracking(vbasedev, true); > - if (ret) { > - return ret; > - } > - > qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); > > ret = qemu_file_get_error(f);