From nobody Wed Oct 8 09:05:59 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 137831A3161 for ; Tue, 1 Jul 2025 01:14:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751332482; cv=none; b=KpZGcPsVxqklK85TVU6sc7WEZn9AAawvJ1tv0YWDS1To6Jqa+LLF12DqoUAENFLW8f2YF3YJ2sx9726XJhYnoKaPQR/MAfatRRAlNWq/4SVDS6B1X0Ngr6CbAXNkjooslfBNCGtRHaGB+RXeaCSGJ3/NPCLxw7IEjKm/kn5ITkY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751332482; c=relaxed/simple; bh=T0ai9cn5CT3is2Nf5c3Dp0OeH6S0W9l+9WFC+WPyVAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JhSBRvKUBCiQS7asCVmlbKxXB4m+9K6wGpjDGp01+K3XmLqGM0VJjR+7IBs6sd9HY2B7VCC5bFR0ORgxIHfwihaRBPqPgqFrZxm35qzHQiQCWZMd9D/GSxq8WAU0tW3qN2Mjur4o7QNfqkPVJE4Hmh+D2sEgPvseTqQnIhEz2ik= 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=YhxURyBN; arc=none smtp.client-ip=170.10.129.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="YhxURyBN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751332479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IAHHsMWCNQsLyebIszuF+Xbmat525vL7K5J/FgE589E=; b=YhxURyBNYFckm2Q5lEgGDYG5mcVkYQHXbgdOu+AHqVKQxV/HLmRAM/5ad+vL3N6LS0lBMp heEm2GPTgiNOabhTXJcez/vDv/S4zY3wWninhabiLiBx59dvi32O6IyZaqGGTlQ/BLeEb6 hZor7SkYJ497EKyLU88depx38RIfcJg= Received: from mx-prod-mc-05.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-551-s_tJMqd_OyqhjpME8QLF5g-1; Mon, 30 Jun 2025 21:14:36 -0400 X-MC-Unique: s_tJMqd_OyqhjpME8QLF5g-1 X-Mimecast-MFC-AGG-ID: s_tJMqd_OyqhjpME8QLF5g_1751332475 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5D63C1944AAB; Tue, 1 Jul 2025 01:14:35 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.134]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 48C0430001B5; Tue, 1 Jul 2025 01:14:29 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, hch@infradead.org, xieyongji@bytedance.com Subject: [PATCH 4/9] virtio: rename dma_dev to map_token Date: Tue, 1 Jul 2025 09:13:56 +0800 Message-ID: <20250701011401.74851-5-jasowang@redhat.com> In-Reply-To: <20250701011401.74851-1-jasowang@redhat.com> References: <20250701011401.74851-1-jasowang@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" Following patch will introduce the mapping operations for virtio device. So this patch rename dma_dev to map_token to match the rework. The idea is the allow the transport layer to pass device specific mapping token which will be used as a parameter for the virtio mapping operations. Signed-off-by: Jason Wang --- drivers/net/virtio_net.c | 4 +- drivers/virtio/virtio_ring.c | 130 +++++++++++++++++------------------ drivers/virtio/virtio_vdpa.c | 2 +- include/linux/virtio.h | 2 +- include/linux/virtio_ring.h | 6 +- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 39bcb85335d5..43711e4cc381 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -5879,10 +5879,10 @@ static int virtnet_xsk_pool_enable(struct net_devic= e *dev, * But vq->dma_dev allows every vq has the respective dma dev. So I * check the dma dev of vq and sq is the same dev. */ - if (virtqueue_dma_dev(rq->vq) !=3D virtqueue_dma_dev(sq->vq)) + if (virtqueue_map_token(rq->vq) !=3D virtqueue_map_token(sq->vq)) return -EINVAL; =20 - dma_dev =3D virtqueue_dma_dev(rq->vq); + dma_dev =3D virtqueue_map_token(rq->vq); if (!dma_dev) return -EINVAL; =20 diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 5961e77db6dc..5f17f8d91f1a 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -210,8 +210,8 @@ struct vring_virtqueue { /* DMA, allocation, and size information */ bool we_own_ring; =20 - /* Device used for doing DMA */ - struct device *dma_dev; + /* Transport specific token used for doing map */ + void *map_token; =20 #ifdef DEBUG /* They're supposed to lock for us. */ @@ -307,10 +307,10 @@ EXPORT_SYMBOL_GPL(virtio_max_dma_size); =20 static void *vring_alloc_queue(struct virtio_device *vdev, size_t size, dma_addr_t *dma_handle, gfp_t flag, - struct device *dma_dev) + void *map_token) { if (vring_use_map_api(vdev)) { - return dma_alloc_coherent(dma_dev, size, + return dma_alloc_coherent(map_token, size, dma_handle, flag); } else { void *queue =3D alloc_pages_exact(PAGE_ALIGN(size), flag); @@ -341,22 +341,22 @@ static void *vring_alloc_queue(struct virtio_device *= vdev, size_t size, =20 static void vring_free_queue(struct virtio_device *vdev, size_t size, void *queue, dma_addr_t dma_handle, - struct device *dma_dev) + void *map_token) { if (vring_use_map_api(vdev)) - dma_free_coherent(dma_dev, size, queue, dma_handle); + dma_free_coherent(map_token, size, queue, dma_handle); else free_pages_exact(queue, PAGE_ALIGN(size)); } =20 /* - * The DMA ops on various arches are rather gnarly right now, and - * making all of the arch DMA ops work on the vring device itself + * The map ops on various arches are rather gnarly right now, and + * making all of the arch map ops work on the vring device itself * is a mess. */ -static struct device *vring_dma_dev(const struct vring_virtqueue *vq) +static void *vring_map_token(const struct vring_virtqueue *vq) { - return vq->dma_dev; + return vq->map_token; } =20 /* Map one sg entry. */ @@ -388,11 +388,11 @@ static int vring_map_one_sg(const struct vring_virtqu= eue *vq, struct scatterlist * the way it expects (we don't guarantee that the scatterlist * will exist for the lifetime of the mapping). */ - *addr =3D dma_map_page(vring_dma_dev(vq), + *addr =3D dma_map_page(vring_map_token(vq), sg_page(sg), sg->offset, sg->length, direction); =20 - if (dma_mapping_error(vring_dma_dev(vq), *addr)) + if (dma_mapping_error(vring_map_token(vq), *addr)) return -ENOMEM; =20 return 0; @@ -415,7 +415,7 @@ static int vring_mapping_error(const struct vring_virtq= ueue *vq, if (!vq->use_map_api) return 0; =20 - return dma_mapping_error(vring_dma_dev(vq), addr); + return dma_mapping_error(vring_map_token(vq), addr); } =20 static void virtqueue_init(struct vring_virtqueue *vq, u32 num) @@ -454,7 +454,7 @@ static unsigned int vring_unmap_one_split(const struct = vring_virtqueue *vq, } else if (!vring_need_unmap_buffer(vq, extra)) goto out; =20 - dma_unmap_page(vring_dma_dev(vq), + dma_unmap_page(vring_map_token(vq), extra->addr, extra->len, (flags & VRING_DESC_F_WRITE) ? @@ -1056,12 +1056,12 @@ static int vring_alloc_state_extra_split(struct vri= ng_virtqueue_split *vring_spl } =20 static void vring_free_split(struct vring_virtqueue_split *vring_split, - struct virtio_device *vdev, struct device *dma_dev) + struct virtio_device *vdev, void *map_token) { vring_free_queue(vdev, vring_split->queue_size_in_bytes, vring_split->vring.desc, vring_split->queue_dma_addr, - dma_dev); + map_token); =20 kfree(vring_split->desc_state); kfree(vring_split->desc_extra); @@ -1072,7 +1072,7 @@ static int vring_alloc_queue_split(struct vring_virtq= ueue_split *vring_split, u32 num, unsigned int vring_align, bool may_reduce_num, - struct device *dma_dev) + void *map_token) { void *queue =3D NULL; dma_addr_t dma_addr; @@ -1088,7 +1088,7 @@ static int vring_alloc_queue_split(struct vring_virtq= ueue_split *vring_split, queue =3D vring_alloc_queue(vdev, vring_size(num, vring_align), &dma_addr, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, - dma_dev); + map_token); if (queue) break; if (!may_reduce_num) @@ -1102,7 +1102,7 @@ static int vring_alloc_queue_split(struct vring_virtq= ueue_split *vring_split, /* Try to get a single page. You are my only hope! */ queue =3D vring_alloc_queue(vdev, vring_size(num, vring_align), &dma_addr, GFP_KERNEL | __GFP_ZERO, - dma_dev); + map_token); } if (!queue) return -ENOMEM; @@ -1126,7 +1126,7 @@ static struct virtqueue *__vring_new_virtqueue_split(= unsigned int index, bool (*notify)(struct virtqueue *), void (*callback)(struct virtqueue *), const char *name, - struct device *dma_dev) + void *map_token) { struct vring_virtqueue *vq; int err; @@ -1149,7 +1149,7 @@ static struct virtqueue *__vring_new_virtqueue_split(= unsigned int index, #else vq->broken =3D false; #endif - vq->dma_dev =3D dma_dev; + vq->map_token =3D map_token; vq->use_map_api =3D vring_use_map_api(vdev); =20 vq->indirect =3D virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) && @@ -1187,21 +1187,21 @@ static struct virtqueue *vring_create_virtqueue_spl= it( bool (*notify)(struct virtqueue *), void (*callback)(struct virtqueue *), const char *name, - struct device *dma_dev) + void *map_token) { struct vring_virtqueue_split vring_split =3D {}; struct virtqueue *vq; int err; =20 err =3D vring_alloc_queue_split(&vring_split, vdev, num, vring_align, - may_reduce_num, dma_dev); + may_reduce_num, map_token); if (err) return NULL; =20 vq =3D __vring_new_virtqueue_split(index, &vring_split, vdev, weak_barrie= rs, - context, notify, callback, name, dma_dev); + context, notify, callback, name, map_token); if (!vq) { - vring_free_split(&vring_split, vdev, dma_dev); + vring_free_split(&vring_split, vdev, map_token); return NULL; } =20 @@ -1220,7 +1220,7 @@ static int virtqueue_resize_split(struct virtqueue *_= vq, u32 num) err =3D vring_alloc_queue_split(&vring_split, vdev, num, vq->split.vring_align, vq->split.may_reduce_num, - vring_dma_dev(vq)); + vring_map_token(vq)); if (err) goto err; =20 @@ -1238,7 +1238,7 @@ static int virtqueue_resize_split(struct virtqueue *_= vq, u32 num) return 0; =20 err_state_extra: - vring_free_split(&vring_split, vdev, vring_dma_dev(vq)); + vring_free_split(&vring_split, vdev, vring_map_token(vq)); err: virtqueue_reinit_split(vq); return -ENOMEM; @@ -1271,7 +1271,7 @@ static void vring_unmap_extra_packed(const struct vri= ng_virtqueue *vq, } else if (!vring_need_unmap_buffer(vq, extra)) return; =20 - dma_unmap_page(vring_dma_dev(vq), + dma_unmap_page(vring_map_token(vq), extra->addr, extra->len, (flags & VRING_DESC_F_WRITE) ? DMA_FROM_DEVICE : DMA_TO_DEVICE); @@ -1947,25 +1947,25 @@ static struct vring_desc_extra *vring_alloc_desc_ex= tra(unsigned int num) =20 static void vring_free_packed(struct vring_virtqueue_packed *vring_packed, struct virtio_device *vdev, - struct device *dma_dev) + void *map_token) { if (vring_packed->vring.desc) vring_free_queue(vdev, vring_packed->ring_size_in_bytes, vring_packed->vring.desc, vring_packed->ring_dma_addr, - dma_dev); + map_token); =20 if (vring_packed->vring.driver) vring_free_queue(vdev, vring_packed->event_size_in_bytes, vring_packed->vring.driver, vring_packed->driver_event_dma_addr, - dma_dev); + map_token); =20 if (vring_packed->vring.device) vring_free_queue(vdev, vring_packed->event_size_in_bytes, vring_packed->vring.device, vring_packed->device_event_dma_addr, - dma_dev); + map_token); =20 kfree(vring_packed->desc_state); kfree(vring_packed->desc_extra); @@ -1973,7 +1973,7 @@ static void vring_free_packed(struct vring_virtqueue_= packed *vring_packed, =20 static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_p= acked, struct virtio_device *vdev, - u32 num, struct device *dma_dev) + u32 num, void *map_token) { struct vring_packed_desc *ring; struct vring_packed_desc_event *driver, *device; @@ -1985,7 +1985,7 @@ static int vring_alloc_queue_packed(struct vring_virt= queue_packed *vring_packed, ring =3D vring_alloc_queue(vdev, ring_size_in_bytes, &ring_dma_addr, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, - dma_dev); + map_token); if (!ring) goto err; =20 @@ -1998,7 +1998,7 @@ static int vring_alloc_queue_packed(struct vring_virt= queue_packed *vring_packed, driver =3D vring_alloc_queue(vdev, event_size_in_bytes, &driver_event_dma_addr, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, - dma_dev); + map_token); if (!driver) goto err; =20 @@ -2009,7 +2009,7 @@ static int vring_alloc_queue_packed(struct vring_virt= queue_packed *vring_packed, device =3D vring_alloc_queue(vdev, event_size_in_bytes, &device_event_dma_addr, GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO, - dma_dev); + map_token); if (!device) goto err; =20 @@ -2021,7 +2021,7 @@ static int vring_alloc_queue_packed(struct vring_virt= queue_packed *vring_packed, return 0; =20 err: - vring_free_packed(vring_packed, vdev, dma_dev); + vring_free_packed(vring_packed, vdev, map_token); return -ENOMEM; } =20 @@ -2097,7 +2097,7 @@ static struct virtqueue *__vring_new_virtqueue_packed= (unsigned int index, bool (*notify)(struct virtqueue *), void (*callback)(struct virtqueue *), const char *name, - struct device *dma_dev) + void *map_token) { struct vring_virtqueue *vq; int err; @@ -2120,7 +2120,7 @@ static struct virtqueue *__vring_new_virtqueue_packed= (unsigned int index, vq->broken =3D false; #endif vq->packed_ring =3D true; - vq->dma_dev =3D dma_dev; + vq->map_token =3D map_token; vq->use_map_api =3D vring_use_map_api(vdev); =20 vq->indirect =3D virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) && @@ -2158,18 +2158,18 @@ static struct virtqueue *vring_create_virtqueue_pac= ked( bool (*notify)(struct virtqueue *), void (*callback)(struct virtqueue *), const char *name, - struct device *dma_dev) + void *map_token) { struct vring_virtqueue_packed vring_packed =3D {}; struct virtqueue *vq; =20 - if (vring_alloc_queue_packed(&vring_packed, vdev, num, dma_dev)) + if (vring_alloc_queue_packed(&vring_packed, vdev, num, map_token)) return NULL; =20 vq =3D __vring_new_virtqueue_packed(index, &vring_packed, vdev, weak_barr= iers, - context, notify, callback, name, dma_dev); + context, notify, callback, name, map_token); if (!vq) { - vring_free_packed(&vring_packed, vdev, dma_dev); + vring_free_packed(&vring_packed, vdev, map_token); return NULL; } =20 @@ -2185,7 +2185,7 @@ static int virtqueue_resize_packed(struct virtqueue *= _vq, u32 num) struct virtio_device *vdev =3D _vq->vdev; int err; =20 - if (vring_alloc_queue_packed(&vring_packed, vdev, num, vring_dma_dev(vq))) + if (vring_alloc_queue_packed(&vring_packed, vdev, num, vring_map_token(vq= ))) goto err_ring; =20 err =3D vring_alloc_state_extra_packed(&vring_packed); @@ -2202,7 +2202,7 @@ static int virtqueue_resize_packed(struct virtqueue *= _vq, u32 num) return 0; =20 err_state_extra: - vring_free_packed(&vring_packed, vdev, vring_dma_dev(vq)); + vring_free_packed(&vring_packed, vdev, vring_map_token(vq)); err_ring: virtqueue_reinit_packed(vq); return -ENOMEM; @@ -2420,21 +2420,21 @@ int virtqueue_add_inbuf_premapped(struct virtqueue = *vq, EXPORT_SYMBOL_GPL(virtqueue_add_inbuf_premapped); =20 /** - * virtqueue_dma_dev - get the dma dev + * virtqueue_map_token - get the transport specific map token * @_vq: the struct virtqueue we're talking about. * - * Returns the dma dev. That can been used for dma api. + * Returns the map token. That can been used for map api. */ -struct device *virtqueue_dma_dev(struct virtqueue *_vq) +void *virtqueue_map_token(struct virtqueue *_vq) { struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (vq->use_map_api) - return vring_dma_dev(vq); + return vring_map_token(vq); else return NULL; } -EXPORT_SYMBOL_GPL(virtqueue_dma_dev); +EXPORT_SYMBOL_GPL(virtqueue_map_token); =20 /** * virtqueue_kick_prepare - first half of split virtqueue_kick call. @@ -2727,7 +2727,7 @@ struct virtqueue *vring_create_virtqueue( } EXPORT_SYMBOL_GPL(vring_create_virtqueue); =20 -struct virtqueue *vring_create_virtqueue_dma( +struct virtqueue *vring_create_virtqueue_map( unsigned int index, unsigned int num, unsigned int vring_align, @@ -2738,19 +2738,19 @@ struct virtqueue *vring_create_virtqueue_dma( bool (*notify)(struct virtqueue *), void (*callback)(struct virtqueue *), const char *name, - struct device *dma_dev) + void *map_token) { =20 if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED)) return vring_create_virtqueue_packed(index, num, vring_align, vdev, weak_barriers, may_reduce_num, - context, notify, callback, name, dma_dev); + context, notify, callback, name, map_token); =20 return vring_create_virtqueue_split(index, num, vring_align, vdev, weak_barriers, may_reduce_num, - context, notify, callback, name, dma_dev); + context, notify, callback, name, map_token); } -EXPORT_SYMBOL_GPL(vring_create_virtqueue_dma); +EXPORT_SYMBOL_GPL(vring_create_virtqueue_map); =20 /** * virtqueue_resize - resize the vring of vq @@ -2886,19 +2886,19 @@ static void vring_free(struct virtqueue *_vq) vq->packed.ring_size_in_bytes, vq->packed.vring.desc, vq->packed.ring_dma_addr, - vring_dma_dev(vq)); + vring_map_token(vq)); =20 vring_free_queue(vq->vq.vdev, vq->packed.event_size_in_bytes, vq->packed.vring.driver, vq->packed.driver_event_dma_addr, - vring_dma_dev(vq)); + vring_map_token(vq)); =20 vring_free_queue(vq->vq.vdev, vq->packed.event_size_in_bytes, vq->packed.vring.device, vq->packed.device_event_dma_addr, - vring_dma_dev(vq)); + vring_map_token(vq)); =20 kfree(vq->packed.desc_state); kfree(vq->packed.desc_extra); @@ -2907,7 +2907,7 @@ static void vring_free(struct virtqueue *_vq) vq->split.queue_size_in_bytes, vq->split.vring.desc, vq->split.queue_dma_addr, - vring_dma_dev(vq)); + vring_map_token(vq)); } } if (!vq->packed_ring) { @@ -3143,7 +3143,7 @@ dma_addr_t virtqueue_map_single_attrs(const struct vi= rtqueue *_vq, void *ptr, "rejecting DMA map of vmalloc memory\n")) return DMA_MAPPING_ERROR; =20 - return dma_map_page_attrs(vring_dma_dev(vq), virt_to_page(ptr), + return dma_map_page_attrs(vring_map_token(vq), virt_to_page(ptr), offset_in_page(ptr), size, dir, attrs); } EXPORT_SYMBOL_GPL(virtqueue_map_single_attrs); @@ -3169,7 +3169,7 @@ void virtqueue_unmap_single_attrs(const struct virtqu= eue *_vq, if (!vq->use_map_api) return; =20 - dma_unmap_page_attrs(vring_dma_dev(vq), addr, size, dir, attrs); + dma_unmap_page_attrs(vring_map_token(vq), addr, size, dir, attrs); } EXPORT_SYMBOL_GPL(virtqueue_unmap_single_attrs); =20 @@ -3187,7 +3187,7 @@ int virtqueue_map_mapping_error(const struct virtqueu= e *_vq, dma_addr_t addr) if (!vq->use_map_api) return 0; =20 - return dma_mapping_error(vring_dma_dev(vq), addr); + return dma_mapping_error(vring_map_token(vq), addr); } EXPORT_SYMBOL_GPL(virtqueue_map_mapping_error); =20 @@ -3208,7 +3208,7 @@ bool virtqueue_map_need_sync(const struct virtqueue *= _vq, dma_addr_t addr) if (!vq->use_map_api) return false; =20 - return dma_need_sync(vring_dma_dev(vq), addr); + return dma_need_sync(vring_map_token(vq), addr); } EXPORT_SYMBOL_GPL(virtqueue_map_need_sync); =20 @@ -3230,7 +3230,7 @@ void virtqueue_map_sync_single_range_for_cpu(const st= ruct virtqueue *_vq, enum dma_data_direction dir) { const struct vring_virtqueue *vq =3D to_vvq(_vq); - struct device *dev =3D vring_dma_dev(vq); + struct device *dev =3D vring_map_token(vq); =20 if (!vq->use_map_api) return; @@ -3256,7 +3256,7 @@ void virtqueue_map_sync_single_range_for_device(const= struct virtqueue *_vq, enum dma_data_direction dir) { const struct vring_virtqueue *vq =3D to_vvq(_vq); - struct device *dev =3D vring_dma_dev(vq); + struct device *dev =3D vring_map_token(vq); =20 if (!vq->use_map_api) return; diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index 1f60c9d5cb18..59b53032f1e2 100644 --- a/drivers/virtio/virtio_vdpa.c +++ b/drivers/virtio/virtio_vdpa.c @@ -205,7 +205,7 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsign= ed int index, dma_dev =3D ops->get_vq_dma_dev(vdpa, index); else dma_dev =3D vdpa_get_dma_dev(vdpa); - vq =3D vring_create_virtqueue_dma(index, max_num, align, vdev, + vq =3D vring_create_virtqueue_map(index, max_num, align, vdev, true, may_reduce_num, ctx, notify, callback, name, dma_dev); if (!vq) { diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 0371b500ed19..3812661d3761 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -74,7 +74,7 @@ int virtqueue_add_sgs(struct virtqueue *vq, void *data, gfp_t gfp); =20 -struct device *virtqueue_dma_dev(struct virtqueue *vq); +void *virtqueue_map_token(struct virtqueue *vq); =20 bool virtqueue_kick(struct virtqueue *vq); =20 diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index 9b33df741b63..a995bca6785f 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -79,9 +79,9 @@ struct virtqueue *vring_create_virtqueue(unsigned int ind= ex, =20 /* * Creates a virtqueue and allocates the descriptor ring with per - * virtqueue DMA device. + * virtqueue mapping operations. */ -struct virtqueue *vring_create_virtqueue_dma(unsigned int index, +struct virtqueue *vring_create_virtqueue_map(unsigned int index, unsigned int num, unsigned int vring_align, struct virtio_device *vdev, @@ -91,7 +91,7 @@ struct virtqueue *vring_create_virtqueue_dma(unsigned int= index, bool (*notify)(struct virtqueue *vq), void (*callback)(struct virtqueue *vq), const char *name, - struct device *dma_dev); + void *map_token); =20 /* * Creates a virtqueue with a standard layout but a caller-allocated --=20 2.34.1