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 AF7ACC54E90 for ; Thu, 22 May 2025 17:21:20 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uI9ay-0001Pq-Uc; Thu, 22 May 2025 13:20:40 -0400 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 1uI9au-0001PW-Ia for qemu-devel@nongnu.org; Thu, 22 May 2025 13:20:36 -0400 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 1uI9ao-0003UA-Uq for qemu-devel@nongnu.org; Thu, 22 May 2025 13:20:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747934427; 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:autocrypt:autocrypt; bh=2mKT7noWfkfYoFAXHF9DQQ47OP8RkZZGr1d8C9pNNiE=; b=eqULS4yRafzOI/NdnnYPaileDmYhBiRJPVflxYIDSKTj4dtTY1NLEqar9llRsT+SUlpAOr WTgh+3xxpGNI1j1hpNO+ScozCkBtmIryvWgvlzm20AkTNljGqB9tNaJn75/ZAyaFVTcdnf vAZKU7T20w0WhtjBy7hkVolHmFdyzp0= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-257-A8Cu1w5DOPGoypCsFHyHgw-1; Thu, 22 May 2025 13:20:24 -0400 X-MC-Unique: A8Cu1w5DOPGoypCsFHyHgw-1 X-Mimecast-MFC-AGG-ID: A8Cu1w5DOPGoypCsFHyHgw_1747934423 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a36416aef2so2869970f8f.1 for ; Thu, 22 May 2025 10:20:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747934423; x=1748539223; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2mKT7noWfkfYoFAXHF9DQQ47OP8RkZZGr1d8C9pNNiE=; b=V6rUOG1qdRajmurQ8/tZhQmHxSPgEvhmjd6SqZ3sX/+ovJZ0EINYTg2c656CjH90qO 6RvBJgm1FPLIsQotKlvsqb21tTu5upTQGZNpGm9ip+mA7RHLjnBFXCIqJo0EzVmQvR1l y4iIjWUyRYY+/7kScXp7oeKZC07+soLg/esIeKbMkkJZ0AgM265KE/52rObuzgUTWbpn tWWJdrqVdcU1kGwXuHQBwGRGhKplcKyR6hnMwG67WhdEwM+djc+Bzy71it5onluh8x9K DkCesDfGZ34+uCzSOBq06qq/R1E/mVO1thtE3ka/UzcHz41Uhvb9PAN2pV1WqI45IoUJ RD7w== X-Forwarded-Encrypted: i=1; AJvYcCWrJQbSC8CEHB47IfiXYBlnIrSyDZJ/EeoXYOnTHC/GgIyBnEwwPlNz/Cbh0JNG/bBZL7mHhk9Lroky@nongnu.org X-Gm-Message-State: AOJu0YxOFrTCxRuyiw73kIHqEajyOGvGupEkDoFAcmPqqdtmrk/aDS6E NbBc9OTUsHSI3pehYXfAxNlyNJGX925+hLb1/ETU/fuR4QOi65W/GZKENorJ35LsBx7mzh1OjYz N+H5Ng39yM8TEaEjIbMwubgLcwazrJpaDqC74qMbwsdVFgDjc31hiaWvi X-Gm-Gg: ASbGncsLDwkWT2cdEgAS6Kjiqaz+/0nSIJvc1pLZGyKKzuQXrlkU4upbp0ThcjJytK3 nBd9OzaJFPk9sUVwC3eX9aTjRfPlcBsvA+bk6Vnx6Gbsx5wt5UuUAnhmk+yOl4+3WOykuMI7O0v ctGa8onJZz7wOLb1e0RaqTacG3F9cT/2/XrKxVFbJlV5UzAGWfsSv5MQFGAOWYtIsrjnuCdZsuH u9LHck6xJloXMdoAW6PPQMdlXv5MFscjtlvZQihvbKQfuVSb+p7FWUcq8W3KKOGNW5w/3QibeFZ CVZ6w6FvD4aasNcpytCg+ySDPRpZbgmIXf6SbxidovpvFSdQ9g== X-Received: by 2002:a05:6000:144a:b0:3a3:7314:f85b with SMTP id ffacd0b85a97d-3a37314f94dmr15805992f8f.45.1747934422880; Thu, 22 May 2025 10:20:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8WvEwaPHENtSnnLhk5eztKQdthu+vp2A3arTtvEsL3CtYpRZw2V0uIqVpG1u6Buxpuu87Lw== X-Received: by 2002:a05:6000:144a:b0:3a3:7314:f85b with SMTP id ffacd0b85a97d-3a37314f94dmr15805966f8f.45.1747934422507; Thu, 22 May 2025 10:20:22 -0700 (PDT) Received: from ?IPV6:2a01:e0a:280:24f0:3f78:514a:4f03:fdc0? ([2a01:e0a:280:24f0:3f78:514a:4f03:fdc0]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a35fa8c6d6sm22963975f8f.26.2025.05.22.10.20.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 May 2025 10:20:22 -0700 (PDT) Message-ID: <9c08a275-79ed-4192-bc6c-53c3c9f60916@redhat.com> Date: Thu, 22 May 2025 19:20:21 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] vfio/container: pass MemoryRegion to DMA operations To: John Levon , qemu-devel@nongnu.org Cc: Alex Williamson , steven.sistare@oracle.com, John Johnson , Jagannathan Raman , Elena Ufimtseva References: <20250521215534.2688540-1-john.levon@nutanix.com> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= Autocrypt: addr=clg@redhat.com; keydata= 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 uVKe8BVz4atMOoktmt0GWTOC8P4= In-Reply-To: <20250521215534.2688540-1-john.levon@nutanix.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.275, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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 5/21/25 23:55, John Levon wrote: > Pass through the MemoryRegion to DMA operation handlers of vfio > containers. The vfio-user container will need this later, to translate > the vaddr into an offset for the dma map vfio-user message; CPR will > also will need this. > > Originally-by: John Johnson > Signed-off-by: Jagannathan Raman > Signed-off-by: Elena Ufimtseva > Signed-off-by: John Levon > --- > include/hw/vfio/vfio-container-base.h | 9 +++++---- > hw/vfio/container-base.c | 4 ++-- > hw/vfio/container.c | 3 ++- > hw/vfio/iommufd.c | 3 ++- > hw/vfio/listener.c | 6 +++--- > 5 files changed, 14 insertions(+), 11 deletions(-) Steven, Can you base the live update series on this patch ? Reviewed-by: Cédric Le Goater Thanks, C. > > diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h > index f9e561cb08..3feb773e5f 100644 > --- a/include/hw/vfio/vfio-container-base.h > +++ b/include/hw/vfio/vfio-container-base.h > @@ -78,7 +78,7 @@ void vfio_address_space_insert(VFIOAddressSpace *space, > > int vfio_container_dma_map(VFIOContainerBase *bcontainer, > hwaddr iova, ram_addr_t size, > - void *vaddr, bool readonly); > + void *vaddr, bool readonly, MemoryRegion *mr); > int vfio_container_dma_unmap(VFIOContainerBase *bcontainer, > hwaddr iova, ram_addr_t size, > IOMMUTLBEntry *iotlb, bool unmap_all); > @@ -151,20 +151,21 @@ struct VFIOIOMMUClass { > /** > * @dma_map > * > - * Map an address range into the container. > + * Map an address range into the container. Note that the memory region is > + * referenced within an RCU read lock region across this call. > * > * @bcontainer: #VFIOContainerBase to use > * @iova: start address to map > * @size: size of the range to map > * @vaddr: process virtual address of mapping > * @readonly: true if mapping should be readonly > + * @mr: the memory region for this mapping > * > * Returns 0 to indicate success and -errno otherwise. > */ > int (*dma_map)(const VFIOContainerBase *bcontainer, > hwaddr iova, ram_addr_t size, > - void *vaddr, bool readonly); > - > + void *vaddr, bool readonly, MemoryRegion *mr); > /** > * @dma_unmap > * > diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c > index 1c6ca94b60..d834bd4822 100644 > --- a/hw/vfio/container-base.c > +++ b/hw/vfio/container-base.c > @@ -75,12 +75,12 @@ void vfio_address_space_insert(VFIOAddressSpace *space, > > int vfio_container_dma_map(VFIOContainerBase *bcontainer, > hwaddr iova, ram_addr_t size, > - void *vaddr, bool readonly) > + void *vaddr, bool readonly, MemoryRegion *mr) > { > VFIOIOMMUClass *vioc = VFIO_IOMMU_GET_CLASS(bcontainer); > > g_assert(vioc->dma_map); > - return vioc->dma_map(bcontainer, iova, size, vaddr, readonly); > + return vioc->dma_map(bcontainer, iova, size, vaddr, readonly, mr); > } > > int vfio_container_dma_unmap(VFIOContainerBase *bcontainer, > diff --git a/hw/vfio/container.c b/hw/vfio/container.c > index a9f0dbaec4..a8c76eb481 100644 > --- a/hw/vfio/container.c > +++ b/hw/vfio/container.c > @@ -207,7 +207,8 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer, > } > > static int vfio_legacy_dma_map(const VFIOContainerBase *bcontainer, hwaddr iova, > - ram_addr_t size, void *vaddr, bool readonly) > + ram_addr_t size, void *vaddr, bool readonly, > + MemoryRegion *mr) > { > const VFIOContainer *container = container_of(bcontainer, VFIOContainer, > bcontainer); > diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c > index 6b2696793f..46a3b36301 100644 > --- a/hw/vfio/iommufd.c > +++ b/hw/vfio/iommufd.c > @@ -34,7 +34,8 @@ > TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio" > > static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova, > - ram_addr_t size, void *vaddr, bool readonly) > + ram_addr_t size, void *vaddr, bool readonly, > + MemoryRegion *mr) > { > const VFIOIOMMUFDContainer *container = > container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer); > diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c > index 38e3dc82cf..7495866123 100644 > --- a/hw/vfio/listener.c > +++ b/hw/vfio/listener.c > @@ -170,7 +170,7 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) > */ > ret = vfio_container_dma_map(bcontainer, iova, > iotlb->addr_mask + 1, vaddr, > - read_only); > + read_only, mr); > if (ret) { > error_report("vfio_container_dma_map(%p, 0x%"HWADDR_PRIx", " > "0x%"HWADDR_PRIx", %p) = %d (%s)", > @@ -240,7 +240,7 @@ static int vfio_ram_discard_notify_populate(RamDiscardListener *rdl, > vaddr = memory_region_get_ram_ptr(section->mr) + start; > > ret = vfio_container_dma_map(bcontainer, iova, next - start, > - vaddr, section->readonly); > + vaddr, section->readonly, section->mr); > if (ret) { > /* Rollback */ > vfio_ram_discard_notify_discard(rdl, section); > @@ -564,7 +564,7 @@ static void vfio_listener_region_add(MemoryListener *listener, > } > > ret = vfio_container_dma_map(bcontainer, iova, int128_get64(llsize), > - vaddr, section->readonly); > + vaddr, section->readonly, section->mr); > if (ret) { > error_setg(&err, "vfio_container_dma_map(%p, 0x%"HWADDR_PRIx", " > "0x%"HWADDR_PRIx", %p) = %d (%s)",