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 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 2FF15C678D5 for ; Tue, 7 Mar 2023 14:49:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZYdK-00020Y-Qo; Tue, 07 Mar 2023 09:49:42 -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 1pZYd3-0001jv-VI for qemu-devel@nongnu.org; Tue, 07 Mar 2023 09:49:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZYd0-0002jf-9S for qemu-devel@nongnu.org; Tue, 07 Mar 2023 09:49:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678200561; 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=hErew4xCQ0oFbGFLB+n8FzaWNApBiUo2CwGM/EXYvvI=; b=LMI4h6zBc22oTMITNRula3IQjrDpqo2D5pN355bhNCS43O6vIt/E+b5+aUvAY/S7kYfF8h TgjpODqYWlRPT20sABdoszmzq8U0Lt1nFfT45BupojIUwPASecxljCmYxMEC7Cfhk+G/Ua n1DHFoGUqNAeWX055233blHXCu5buzA= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-463-o25E5vHaN56A9Ojz_GcJHg-1; Tue, 07 Mar 2023 09:49:19 -0500 X-MC-Unique: o25E5vHaN56A9Ojz_GcJHg-1 Received: by mail-wr1-f71.google.com with SMTP id m10-20020adfe94a000000b002cdc5eac0d0so2261135wrn.2 for ; Tue, 07 Mar 2023 06:49:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678200559; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hErew4xCQ0oFbGFLB+n8FzaWNApBiUo2CwGM/EXYvvI=; b=ePFtV/PTMMnc2Y7PRorS6Am/unFd+4EvLAK37/lhYI0r5w1vHCSrkEis8b4HK9+RYf zuMe6EUCixcC+RIJMs+FCn0s8RpL4nWXbHfBqMQ2Nz5PhCb+EMnDUg29tCI0x/+6JDlb IXL5kmyYHgsGdrecNSEOOGPLyoP5coRLSXDZVlz8s6LGARUROf91j9mwpmFKePASgOR+ DGM0erVbo35Jj1vGYH83hV0P8EYVz8MJXZOEaeJeFBscvGWY8jJwK5+KlUTxNHjQcFMm D2uv9pSSMfAaC16Tp3d49h8mplPP7IXKw7a4rpCrDIHDmZmZXgLb/4F8AzJ8WHCo+6bt aVjA== X-Gm-Message-State: AO0yUKUnlbvU78XHPY/ZtG68/jtxDBcFyu6GN/n8w24GUjsJtC/dBjt+ h0obghfDreK20S5mDOYHz4iX09LL5r7B1zGxV8LULKeyCBX6w6NkXTqHnMU/3O9NmOsWdMdq8PM JeOS+a9J780OB19g= X-Received: by 2002:a5d:480c:0:b0:2c5:512c:f499 with SMTP id l12-20020a5d480c000000b002c5512cf499mr9974412wrq.27.1678200558806; Tue, 07 Mar 2023 06:49:18 -0800 (PST) X-Google-Smtp-Source: AK7set/TLPMpZFjonr/cwL28FxyHuWb+yG7BLXt3i2xtnsf3AqSuy9hqxJqyprEy059AJtWGc5sjbA== X-Received: by 2002:a5d:480c:0:b0:2c5:512c:f499 with SMTP id l12-20020a5d480c000000b002c5512cf499mr9974399wrq.27.1678200558528; Tue, 07 Mar 2023 06:49:18 -0800 (PST) Received: from ?IPV6:2a01:e0a:280:24f0:576b:abc6:6396:ed4a? ([2a01:e0a:280:24f0:576b:abc6:6396:ed4a]) by smtp.gmail.com with ESMTPSA id n1-20020adffe01000000b002c4084d3472sm12976678wrr.58.2023.03.07.06.49.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Mar 2023 06:49:18 -0800 (PST) Message-ID: Date: Tue, 7 Mar 2023 15:49:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v5 10/15] vfio/common: Add device dirty page tracking start/stop Content-Language: en-US To: Joao Martins , qemu-devel@nongnu.org Cc: Alex Williamson , Yishai Hadas , Jason Gunthorpe , Maor Gottlieb , Kirti Wankhede , Tarun Gupta , Avihai Horon References: <20230307125450.62409-1-joao.m.martins@oracle.com> <20230307125450.62409-11-joao.m.martins@oracle.com> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: <20230307125450.62409-11-joao.m.martins@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@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, NICE_REPLY_A=-0.001, 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 3/7/23 13:54, Joao Martins wrote: > Add device dirty page tracking start/stop functionality. This uses the > device DMA logging uAPI to start and stop dirty page tracking by device. > > Device dirty page tracking is used only if all devices within a > container support device dirty page tracking. > > Signed-off-by: Avihai Horon > Signed-off-by: Joao Martins > --- > hw/vfio/common.c | 173 +++++++++++++++++++++++++++++++++- > hw/vfio/trace-events | 1 + > include/hw/vfio/vfio-common.h | 2 + > 3 files changed, 171 insertions(+), 5 deletions(-) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 811502dbc97c..80f2d287bab5 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -450,6 +450,22 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container) > return true; > } > > +static bool vfio_devices_all_device_dirty_tracking(VFIOContainer *container) > +{ > + VFIOGroup *group; > + VFIODevice *vbasedev; > + > + QLIST_FOREACH(group, &container->group_list, container_next) { > + QLIST_FOREACH(vbasedev, &group->device_list, next) { > + if (!vbasedev->dirty_pages_supported) { > + return false; > + } > + } > + } > + > + return true; > +} > + > /* > * Check if all VFIO devices are running and migration is active, which is > * essentially equivalent to the migration being in pre-copy phase. > @@ -1407,16 +1423,156 @@ static void vfio_dirty_tracking_init(VFIOContainer *container, > memory_listener_unregister(&dirty.listener); > } > > +static void vfio_devices_dma_logging_stop(VFIOContainer *container) > +{ > + uint64_t buf[DIV_ROUND_UP(sizeof(struct vfio_device_feature), > + sizeof(uint64_t))] = {}; > + struct vfio_device_feature *feature = (struct vfio_device_feature *)buf; > + VFIODevice *vbasedev; > + VFIOGroup *group; > + > + feature->argsz = sizeof(buf); > + feature->flags = VFIO_DEVICE_FEATURE_SET | > + VFIO_DEVICE_FEATURE_DMA_LOGGING_STOP; > + > + QLIST_FOREACH(group, &container->group_list, container_next) { > + QLIST_FOREACH(vbasedev, &group->device_list, next) { > + if (!vbasedev->dirty_tracking) { > + continue; > + } > + > + if (ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature)) { > + warn_report("%s: Failed to stop DMA logging, err %d (%s)", > + vbasedev->name, -errno, strerror(errno)); > + } > + vbasedev->dirty_tracking = false; > + } > + } > +} > + > +static struct vfio_device_feature * > +vfio_device_feature_dma_logging_start_create(VFIOContainer *container, > + VFIODirtyRanges *tracking) > +{ > + struct vfio_device_feature *feature; > + size_t feature_size; > + struct vfio_device_feature_dma_logging_control *control; > + struct vfio_device_feature_dma_logging_range *ranges; > + > + feature_size = sizeof(struct vfio_device_feature) + > + sizeof(struct vfio_device_feature_dma_logging_control); > + feature = g_try_malloc0(feature_size); > + if (!feature) { > + errno = ENOMEM; > + return NULL; > + } > + feature->argsz = feature_size; > + feature->flags = VFIO_DEVICE_FEATURE_SET | > + VFIO_DEVICE_FEATURE_DMA_LOGGING_START; > + > + control = (struct vfio_device_feature_dma_logging_control *)feature->data; > + control->page_size = qemu_real_host_page_size(); > + > + /* > + * DMA logging uAPI guarantees to support at least a number of ranges that > + * fits into a single host kernel base page. > + */ > + control->num_ranges = !!tracking->max32 + !!tracking->max64; > + ranges = g_try_new0(struct vfio_device_feature_dma_logging_range, > + control->num_ranges); > + if (!ranges) { > + g_free(feature); > + errno = ENOMEM; > + > + return NULL; > + } > + > + control->ranges = (__u64)(uintptr_t)ranges; > + if (tracking->max32) { > + ranges->iova = tracking->min32; > + ranges->length = (tracking->max32 - tracking->min32) + 1; May be using REAL_HOST_PAGE_ALIGN would be cleaner. Same below. That can be fixed inline if so. Thanks, C. > + ranges++; > + } > + if (tracking->max64) { > + ranges->iova = tracking->min64; > + ranges->length = (tracking->max64 - tracking->min64) + 1; > + } > + > + trace_vfio_device_dirty_tracking_start(control->num_ranges, > + tracking->min32, tracking->max32, > + tracking->min64, tracking->max64); > + > + return feature; > +} > + > +static void vfio_device_feature_dma_logging_start_destroy( > + struct vfio_device_feature *feature) > +{ > + struct vfio_device_feature_dma_logging_control *control = > + (struct vfio_device_feature_dma_logging_control *)feature->data; > + struct vfio_device_feature_dma_logging_range *ranges = > + (struct vfio_device_feature_dma_logging_range *)(uintptr_t) control->ranges; > + > + g_free(ranges); > + g_free(feature); > +} > + > +static int vfio_devices_dma_logging_start(VFIOContainer *container) > +{ > + struct vfio_device_feature *feature; > + VFIODirtyRanges ranges; > + VFIODevice *vbasedev; > + VFIOGroup *group; > + int ret = 0; > + > + vfio_dirty_tracking_init(container, &ranges); > + feature = vfio_device_feature_dma_logging_start_create(container, > + &ranges); > + if (!feature) { > + return -errno; > + } > + > + QLIST_FOREACH(group, &container->group_list, container_next) { > + QLIST_FOREACH(vbasedev, &group->device_list, next) { > + if (vbasedev->dirty_tracking) { > + continue; > + } > + > + ret = ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature); > + if (ret) { > + ret = -errno; > + error_report("%s: Failed to start DMA logging, err %d (%s)", > + vbasedev->name, ret, strerror(errno)); > + goto out; > + } > + vbasedev->dirty_tracking = true; > + } > + } > + > +out: > + if (ret) { > + vfio_devices_dma_logging_stop(container); > + } > + > + vfio_device_feature_dma_logging_start_destroy(feature); > + > + return ret; > +} > + > static void vfio_listener_log_global_start(MemoryListener *listener) > { > VFIOContainer *container = container_of(listener, VFIOContainer, listener); > - VFIODirtyRanges ranges; > int ret; > > - vfio_dirty_tracking_init(container, &ranges); > + if (vfio_devices_all_device_dirty_tracking(container)) { > + ret = vfio_devices_dma_logging_start(container); > + } else { > + ret = vfio_set_dirty_page_tracking(container, true); > + } > > - ret = vfio_set_dirty_page_tracking(container, true); > if (ret) { > + error_report("vfio: Could not start dirty page tracking, err: %d (%s)", > + ret, strerror(-ret)); > vfio_set_migration_error(ret); > } > } > @@ -1424,10 +1580,17 @@ static void vfio_listener_log_global_start(MemoryListener *listener) > static void vfio_listener_log_global_stop(MemoryListener *listener) > { > VFIOContainer *container = container_of(listener, VFIOContainer, listener); > - int ret; > + int ret = 0; > + > + if (vfio_devices_all_device_dirty_tracking(container)) { > + vfio_devices_dma_logging_stop(container); > + } else { > + ret = vfio_set_dirty_page_tracking(container, false); > + } > > - ret = vfio_set_dirty_page_tracking(container, false); > if (ret) { > + error_report("vfio: Could not stop dirty page tracking, err: %d (%s)", > + ret, strerror(-ret)); > vfio_set_migration_error(ret); > } > } > diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events > index dd9fd7b9bddb..bee95dbd977a 100644 > --- a/hw/vfio/trace-events > +++ b/hw/vfio/trace-events > @@ -104,6 +104,7 @@ vfio_known_safe_misalignment(const char *name, uint64_t iova, uint64_t offset_wi > vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t size, uint64_t page_size) "Region \"%s\" 0x%"PRIx64" size=0x%"PRIx64" is not aligned to 0x%"PRIx64" and cannot be mapped for DMA" > vfio_listener_region_del(uint64_t start, uint64_t end) "region_del 0x%"PRIx64" - 0x%"PRIx64 > vfio_device_dirty_tracking_update(uint64_t start, uint64_t end, uint64_t min, uint64_t max) "section 0x%"PRIx64" - 0x%"PRIx64" -> update [0x%"PRIx64" - 0x%"PRIx64"]" > +vfio_device_dirty_tracking_start(int nr_ranges, uint64_t min32, uint64_t max32, uint64_t min64, uint64_t max64) "nr_ranges %d 32:[0x%"PRIx64" - 0x%"PRIx64"], 64:[0x%"PRIx64" - 0x%"PRIx64"]" > vfio_disconnect_container(int fd) "close container->fd=%d" > vfio_put_group(int fd) "close group->fd=%d" > vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs: %u" > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 87524c64a443..9551d2d43025 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -143,6 +143,8 @@ typedef struct VFIODevice { > VFIOMigration *migration; > Error *migration_blocker; > OnOffAuto pre_copy_dirty_page_tracking; > + bool dirty_pages_supported; > + bool dirty_tracking; > } VFIODevice; > > struct VFIODeviceOps {