From nobody Sat Feb 7 16:00:15 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D9DC38735A for ; Mon, 19 Jan 2026 14:33:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768833233; cv=none; b=nKhsh+QR7e5aktsncpskidkr78WSbkcYQ4AFo6ZEesgEJ4y1zUw9To2j/J76s3G6vLwTKQG9B47nb7QvyoU/4lw9RwuDvKegah/jxgmzse1Q032actxMhEU8nIOrPWkdgzixb8WQIs/mMUXIMp0wXlO9Q7kqbGyW/emAK5VCQIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768833233; c=relaxed/simple; bh=76EIoIOaG6/VJajsr8Jtx+vVzMJQ7SRBLU3Sfot2koE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rQ4s/ZyedDldTPxitiR1mbVX9cQWA0Nz1VogXSc03uzhlJrtSryKsjxIOHjig7eNPRuIEQFIfRmdlgzr/+huXFE63lKnu8a1/spO1KAIiXJDbz2+NbYLj62TowOH2/Wy5WKoqUFufyInKEm7ocpu/P3uJTDpI083bpvTyMFUQYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LPWTrChv; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LPWTrChv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768833231; 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=s81dUgqwYas7OncME6/Tc3HamdjySXE8XHF7PknnqC0=; b=LPWTrChvV1QipuiYdlo09l8pBKz54V2oriHztys82CihfEyXE5VVZuHK0RVATnP1tspU4Z 8paWdZqD1x7H4nQ/tRZ4nqQuatTAtQneZlNUJZ0lB8ygwKa6X0KvSp+amJL9r8SSu/lu4h JM6phVR12mW58n4MMSn7hYoLdAmTtqM= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-338-o7isd5N-NeCu3b31O0AOcA-1; Mon, 19 Jan 2026 09:33:49 -0500 X-MC-Unique: o7isd5N-NeCu3b31O0AOcA-1 X-Mimecast-MFC-AGG-ID: o7isd5N-NeCu3b31O0AOcA_1768833228 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C7AD41956046; Mon, 19 Jan 2026 14:33:48 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.33.172]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F29411800577; Mon, 19 Jan 2026 14:33:44 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: "Michael S . Tsirkin " Cc: virtualization@lists.linux.dev, Yongji Xie , Xuan Zhuo , Maxime Coquelin , Stefano Garzarella , jasowang@redhat.com, =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Laurent Vivier , Cindy Lu , linux-kernel@vger.kernel.org Subject: [PATCH v15 09/13] vduse: take out allocations from vduse_dev_alloc_coherent Date: Mon, 19 Jan 2026 15:33:02 +0100 Message-ID: <20260119143306.1818855-10-eperezma@redhat.com> In-Reply-To: <20260119143306.1818855-1-eperezma@redhat.com> References: <20260119143306.1818855-1-eperezma@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 The function vduse_dev_alloc_coherent will be called under rwlock in next patches. Make it out of the lock to avoid increasing its fail rate. Acked-by: Jason Wang Signed-off-by: Eugenio P=C3=A9rez --- v12: * Avoid free_pages_exact(NULL, size) in case vduse_domain_alloc_coherent fails (MST). v11: Remove duplicated call to free_pages_exact (Jason). --- drivers/vdpa/vdpa_user/iova_domain.c | 24 +++++++----------------- drivers/vdpa/vdpa_user/iova_domain.h | 5 ++--- drivers/vdpa/vdpa_user/vduse_dev.c | 17 +++++++++++------ 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/drivers/vdpa/vdpa_user/iova_domain.c b/drivers/vdpa/vdpa_user/= iova_domain.c index 309cd5a039d1..0a9f668467a8 100644 --- a/drivers/vdpa/vdpa_user/iova_domain.c +++ b/drivers/vdpa/vdpa_user/iova_domain.c @@ -493,17 +493,15 @@ void vduse_domain_unmap_page(struct vduse_iova_domain= *domain, vduse_domain_free_iova(iovad, dma_addr, size); } =20 -void *vduse_domain_alloc_coherent(struct vduse_iova_domain *domain, - size_t size, dma_addr_t *dma_addr, - gfp_t flag) +dma_addr_t vduse_domain_alloc_coherent(struct vduse_iova_domain *domain, + size_t size, void *orig) { struct iova_domain *iovad =3D &domain->consistent_iovad; unsigned long limit =3D domain->iova_limit; dma_addr_t iova =3D vduse_domain_alloc_iova(iovad, size, limit); - void *orig =3D alloc_pages_exact(size, flag); =20 - if (!iova || !orig) - goto err; + if (!iova) + return DMA_MAPPING_ERROR; =20 spin_lock(&domain->iotlb_lock); if (vduse_iotlb_add_range(domain, (u64)iova, (u64)iova + size - 1, @@ -514,17 +512,12 @@ void *vduse_domain_alloc_coherent(struct vduse_iova_d= omain *domain, } spin_unlock(&domain->iotlb_lock); =20 - *dma_addr =3D iova; + return iova; =20 - return orig; err: - *dma_addr =3D DMA_MAPPING_ERROR; - if (orig) - free_pages_exact(orig, size); - if (iova) - vduse_domain_free_iova(iovad, iova, size); + vduse_domain_free_iova(iovad, iova, size); =20 - return NULL; + return DMA_MAPPING_ERROR; } =20 void vduse_domain_free_coherent(struct vduse_iova_domain *domain, size_t s= ize, @@ -533,7 +526,6 @@ void vduse_domain_free_coherent(struct vduse_iova_domai= n *domain, size_t size, struct iova_domain *iovad =3D &domain->consistent_iovad; struct vhost_iotlb_map *map; struct vdpa_map_file *map_file; - phys_addr_t pa; =20 spin_lock(&domain->iotlb_lock); map =3D vhost_iotlb_itree_first(domain->iotlb, (u64)dma_addr, @@ -545,12 +537,10 @@ void vduse_domain_free_coherent(struct vduse_iova_dom= ain *domain, size_t size, map_file =3D (struct vdpa_map_file *)map->opaque; fput(map_file->file); kfree(map_file); - pa =3D map->addr; vhost_iotlb_map_free(domain->iotlb, map); spin_unlock(&domain->iotlb_lock); =20 vduse_domain_free_iova(iovad, dma_addr, size); - free_pages_exact(phys_to_virt(pa), size); } =20 static vm_fault_t vduse_domain_mmap_fault(struct vm_fault *vmf) diff --git a/drivers/vdpa/vdpa_user/iova_domain.h b/drivers/vdpa/vdpa_user/= iova_domain.h index 081f06c52cdc..e50e55d1396f 100644 --- a/drivers/vdpa/vdpa_user/iova_domain.h +++ b/drivers/vdpa/vdpa_user/iova_domain.h @@ -65,9 +65,8 @@ void vduse_domain_unmap_page(struct vduse_iova_domain *do= main, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir, unsigned long attrs); =20 -void *vduse_domain_alloc_coherent(struct vduse_iova_domain *domain, - size_t size, dma_addr_t *dma_addr, - gfp_t flag); +dma_addr_t vduse_domain_alloc_coherent(struct vduse_iova_domain *domain, + size_t size, void *orig); =20 void vduse_domain_free_coherent(struct vduse_iova_domain *domain, size_t s= ize, dma_addr_t dma_addr, unsigned long attrs); diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 0e3cf5128ad0..6dba1f3224d9 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -916,23 +916,27 @@ static void *vduse_dev_alloc_coherent(union virtio_ma= p token, size_t size, { struct vduse_dev *vdev; struct vduse_iova_domain *domain; - unsigned long iova; void *addr; =20 *dma_addr =3D DMA_MAPPING_ERROR; if (!token.group) return NULL; =20 - vdev =3D token.group->dev; - domain =3D vdev->domain; - addr =3D vduse_domain_alloc_coherent(domain, size, - (dma_addr_t *)&iova, flag); + addr =3D alloc_pages_exact(size, flag); if (!addr) return NULL; =20 - *dma_addr =3D (dma_addr_t)iova; + vdev =3D token.group->dev; + domain =3D vdev->domain; + *dma_addr =3D vduse_domain_alloc_coherent(domain, size, addr); + if (*dma_addr =3D=3D DMA_MAPPING_ERROR) + goto err; =20 return addr; + +err: + free_pages_exact(addr, size); + return NULL; } =20 static void vduse_dev_free_coherent(union virtio_map token, size_t size, @@ -949,6 +953,7 @@ static void vduse_dev_free_coherent(union virtio_map to= ken, size_t size, domain =3D vdev->domain; =20 vduse_domain_free_coherent(domain, size, dma_addr, attrs); + free_pages_exact(vaddr, size); } =20 static bool vduse_dev_need_sync(union virtio_map token, dma_addr_t dma_add= r) --=20 2.52.0