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 49AE4C6FA99 for ; Tue, 7 Mar 2023 02:58:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZNWP-0008Br-R3; Mon, 06 Mar 2023 21:57:49 -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 1pZNWJ-0008Ba-FU for qemu-devel@nongnu.org; Mon, 06 Mar 2023 21:57:46 -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 1pZNWH-0005j6-Hw for qemu-devel@nongnu.org; Mon, 06 Mar 2023 21:57:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678157860; 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=jPnsCq3xkJ2EC4RMXyv2umenfxfRQRu8/QvIs4eCuD8=; b=gvUfkib3hk66eJ8p65/nQeXayZxZN82XhzV4zHl0N+YuwbLy7PfdwtReNCgmkLDnM1RICp fnx+XeBjpVA1uT+nS+hxZQiq1wZ8bIyLB61jV61NH9ACvgnvbKJodJNxFLq/MxJ9/kq0BM eFrorLFXdK6W8YBBvUbikhKKnk6RssA= Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-jqtXQ_ipOvucpzg9fzWnMA-1; Mon, 06 Mar 2023 21:57:38 -0500 X-MC-Unique: jqtXQ_ipOvucpzg9fzWnMA-1 Received: by mail-il1-f198.google.com with SMTP id k13-20020a056e021a8d00b0031bae68b383so5232851ilv.18 for ; Mon, 06 Mar 2023 18:57:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678157858; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jPnsCq3xkJ2EC4RMXyv2umenfxfRQRu8/QvIs4eCuD8=; b=gp9I2RDISPB8eh703Dt2BP5RT4fcoUSfIQXoNkwi35drZeRr3DLJ552wL+G6R1n4Td +dt5hmG1z83V5HQsBM0PokwuTUqn1rQiNaJbBhi/uX/Ytq/M0cKRqIvJ7uqWmLskYw1x hPFThctFTkP845zF4fgVgPom5lNswE/5qP9eGaYiM7gLxCcctriAlPmJCuT2Q4XjjKnN dNBXJOM/OYhUjtCvlEUcwAeTn8e4nrx8Gxbqg3TJ5/p/4IpIo3/AE++aUMKkivXrXuft h0gMhmzFsXLVbOfwSzaorplgAckXPzshY4G4FY6jwbFoHjKvJU4ZbzL9E73zjQhfx2P1 ZWOA== X-Gm-Message-State: AO0yUKXGqYZ4tn3Ui6OZkdSpN/+2G18ETBtMgwWwJW2khW7iiX8vrLNe uMdF7pEECLnY6m6ZfRF2aK9g00OoIfWNr7b4tVc8j7MOIva/6qxXgjQu9mmIybG01oHwFPjN+Dj E/yc8P/Vv5YyzUOA= X-Received: by 2002:a05:6e02:1b0b:b0:314:20e6:133c with SMTP id i11-20020a056e021b0b00b0031420e6133cmr10220260ilv.3.1678157858159; Mon, 06 Mar 2023 18:57:38 -0800 (PST) X-Google-Smtp-Source: AK7set91OX/9rTH9TbTuoXuW3kzP2emYk2U9qfKEjN5MQJozUU28+mil2bNXNgrXiWup8SVb37Erug== X-Received: by 2002:a05:6e02:1b0b:b0:314:20e6:133c with SMTP id i11-20020a056e021b0b00b0031420e6133cmr10220245ilv.3.1678157857789; Mon, 06 Mar 2023 18:57:37 -0800 (PST) Received: from redhat.com ([38.15.36.239]) by smtp.gmail.com with ESMTPSA id i12-20020a02b68c000000b003a951542b10sm3821146jam.60.2023.03.06.18.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 18:57:37 -0800 (PST) Date: Mon, 6 Mar 2023 19:57:36 -0700 From: Alex Williamson To: Joao Martins Cc: qemu-devel@nongnu.org, Cedric Le Goater , Yishai Hadas , Jason Gunthorpe , Maor Gottlieb , Kirti Wankhede , Tarun Gupta , Avihai Horon Subject: Re: [PATCH v4 08/14] vfio/common: Record DMA mapped IOVA ranges Message-ID: <20230306195736.3efc6980.alex.williamson@redhat.com> In-Reply-To: <20230307020258.58215-9-joao.m.martins@oracle.com> References: <20230307020258.58215-1-joao.m.martins@oracle.com> <20230307020258.58215-9-joao.m.martins@oracle.com> Organization: Red Hat MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=alex.williamson@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 Tue, 7 Mar 2023 02:02:52 +0000 Joao Martins wrote: > According to the device DMA logging uAPI, IOVA ranges to be logged by > the device must be provided all at once upon DMA logging start. > > As preparation for the following patches which will add device dirty > page tracking, keep a record of all DMA mapped IOVA ranges so later they > can be used for DMA logging start. > > Signed-off-by: Avihai Horon > Signed-off-by: Joao Martins > --- > hw/vfio/common.c | 76 +++++++++++++++++++++++++++++++++++ > hw/vfio/trace-events | 1 + > include/hw/vfio/vfio-common.h | 13 ++++++ > 3 files changed, 90 insertions(+) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 3a6491dbc523..a9b1fc999121 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -1334,11 +1334,87 @@ static int vfio_set_dirty_page_tracking(VFIOContainer *container, bool start) > return ret; > } > > +static void vfio_dirty_tracking_update(MemoryListener *listener, > + MemoryRegionSection *section) > +{ > + VFIODirtyRanges *dirty = container_of(listener, VFIODirtyRanges, listener); > + VFIODirtyTrackingRange *range = &dirty->ranges; > + hwaddr max32 = UINT32_MAX - 1ULL; The -1 is wrong here, UINT32_MAX is (2^32 - 1) > + hwaddr iova, end; > + > + if (!vfio_listener_valid_section(section) || > + !vfio_get_section_iova_range(dirty->container, section, > + &iova, &end, NULL)) { > + return; > + } > + > + /* > + * The address space passed to the dirty tracker is reduced to two ranges: > + * one for 32-bit DMA ranges, and another one for 64-bit DMA ranges. > + * The underlying reports of dirty will query a sub-interval of each of > + * these ranges. > + * > + * The purpose of the dual range handling is to handle known cases of big > + * holes in the address space, like the x86 AMD 1T hole. The alternative > + * would be an IOVATree but that has a much bigger runtime overhead and > + * unnecessary complexity. > + */ > + if (iova < max32 && end <= max32) { Nit, the first test is redundant, iova is necessarily less than end. > + if (range->min32 > iova) { > + range->min32 = iova; > + } > + if (range->max32 < end) { > + range->max32 = end; > + } > + trace_vfio_device_dirty_tracking_update(iova, end, > + range->min32, range->max32); > + } else { > + if (!range->min64 || range->min64 > iova) { The first test should be removed, we're initializing min64 to a non-zero value now, so if it's zero it's been set and we can't de-prioritize that set value. > + range->min64 = iova; > + } > + if (range->max64 < end) { > + range->max64 = end; > + } > + trace_vfio_device_dirty_tracking_update(iova, end, > + range->min64, range->max64); > + } > + > + return; > +} > + > +static const MemoryListener vfio_dirty_tracking_listener = { > + .name = "vfio-tracking", > + .region_add = vfio_dirty_tracking_update, > +}; > + > +static void vfio_dirty_tracking_init(VFIOContainer *container, > + VFIODirtyRanges *dirty) > +{ > + memset(dirty, 0, sizeof(*dirty)); > + dirty->ranges.min32 = UINT32_MAX; > + dirty->ranges.min64 = UINT64_MAX; > + dirty->listener = vfio_dirty_tracking_listener; > + dirty->container = container; > + I was actually thinking the caller would just pass VFIODirtyTrackingRange and VFIODirtyRanges would be allocated on the stack here, perhaps both are defined private to this file, but this works and we can refine later if we so decide. Thanks, Alex > + memory_listener_register(&dirty->listener, > + container->space->as); > + > + /* > + * The memory listener is synchronous, and used to calculate the range > + * to dirty tracking. Unregister it after we are done as we are not > + * interested in any follow-up updates. > + */ > + memory_listener_unregister(&dirty->listener); > +} > + > static void vfio_listener_log_global_start(MemoryListener *listener) > { > VFIOContainer *container = container_of(listener, VFIOContainer, listener); > + VFIODirtyRanges dirty; > int ret; > > + vfio_dirty_tracking_init(container, &dirty); > + > ret = vfio_set_dirty_page_tracking(container, true); > if (ret) { > vfio_set_migration_error(ret); > diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events > index 669d9fe07cd9..d97a6de17921 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_skip(uint64_t start, uint64_t end) "SKIPPING region_del 0x%"PRIx64" - 0x%"PRIx64 > 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_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..0f84136cceb5 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -96,6 +96,19 @@ typedef struct VFIOContainer { > QLIST_ENTRY(VFIOContainer) next; > } VFIOContainer; > > +typedef struct VFIODirtyTrackingRange { > + hwaddr min32; > + hwaddr max32; > + hwaddr min64; > + hwaddr max64; > +} VFIODirtyTrackingRange; > + > +typedef struct VFIODirtyRanges { > + VFIOContainer *container; > + VFIODirtyTrackingRange ranges; > + MemoryListener listener; > +} VFIODirtyRanges; > + > typedef struct VFIOGuestIOMMU { > VFIOContainer *container; > IOMMUMemoryRegion *iommu_mr;