From nobody Sat Oct 4 21:00:55 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 D28042BEFFF for ; Wed, 13 Aug 2025 05:48:48 +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=1755064130; cv=none; b=SIgba6CiwXtVWgX61LfZ0agR8xBf2j6YGHjgdnyB0a3auMVcg/6Aslt3KvR/gp+DnSDtGCruuXNtTaj/6GR9UcKml//NPWwDLhwyy4jswFcr73ikOhiJXLaLiPMkrGQiBjP+GL8Nqco4txZa3+XvupsZtRc8WhWU2+9NQ1BZPMc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064130; c=relaxed/simple; bh=TOSZRHVlqf40RfvoGG/BUBfT3LeE9vJCXaz/GE2hDuY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OWZ8D4W1IMuROapk2yXwf5iEsCa2ph5xi+7Gwv5Bu0lURMNqvwCmU0ATw+rPXMoBat1xCMheCHnrbOecdagJM80+UWXs2QS2yKO2V+gwURr4MTmDe+Qg68yHbcNokSG0ByM0Uqg/Jge75P0QG3tEEGLfZCUGkhc3g93TPdPdqvk= 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=MQk2jUgw; 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="MQk2jUgw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064127; 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=ZOy0pv/ZmqnoL+rDHsLjyrQgJtxCVYPj5U64E/LdlAw=; b=MQk2jUgwCSbWxgBwzo2pciBvia4p4dAorX0aqO8+i1XHuAWAXrTC7NPbSs8gETKIWO46I9 3wxq2sFy7OxquO+OA68Za0v8lzcs5S8qYgN8UOxItG9RJlPDP9oPaflhzanFlHUG4dNdDi 6wCLe5zPjhgITeAv5bzXYqhsTrb9mgc= Received: from mx-prod-mc-01.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-79-iGNsChy5PRO90SNaf7DV_A-1; Wed, 13 Aug 2025 01:48:46 -0400 X-MC-Unique: iGNsChy5PRO90SNaf7DV_A-1 X-Mimecast-MFC-AGG-ID: iGNsChy5PRO90SNaf7DV_A_1755064125 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AF6CA19560A1; Wed, 13 Aug 2025 05:48:44 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 292601800280; Wed, 13 Aug 2025 05:48:39 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org, Christoph Hellwig Subject: [PATCH V5 1/9] virtio_ring: constify virtqueue pointer for DMA helpers Date: Wed, 13 Aug 2025 13:48:23 +0800 Message-ID: <20250813054831.25865-2-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" This patch consities virtqueue point for DMA helpers. Reviewed-by: Christoph Hellwig Reviewed-by: Xuan Zhuo Signed-off-by: Jason Wang Reviewed-by: Eugenio P=C3=A9rez --- drivers/virtio/virtio_ring.c | 25 +++++++++++++------------ include/linux/virtio.h | 12 ++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index f5062061c408..103bad8cffff 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -3149,12 +3149,12 @@ EXPORT_SYMBOL_GPL(virtqueue_get_vring); * * return DMA address. Caller should check that by virtqueue_dma_mapping_e= rror(). */ -dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr, +dma_addr_t virtqueue_dma_map_single_attrs(const struct virtqueue *_vq, voi= d *ptr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) { kmsan_handle_dma(virt_to_page(ptr), offset_in_page(ptr), size, dir); @@ -3176,11 +3176,12 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_map_single_attrs); * Unmap the address that is mapped by the virtqueue_dma_map_* APIs. * */ -void virtqueue_dma_unmap_single_attrs(struct virtqueue *_vq, dma_addr_t ad= dr, +void virtqueue_dma_unmap_single_attrs(const struct virtqueue *_vq, + dma_addr_t addr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) return; @@ -3196,9 +3197,9 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_unmap_single_attrs); * * Returns 0 means dma valid. Other means invalid dma address. */ -int virtqueue_dma_mapping_error(struct virtqueue *_vq, dma_addr_t addr) +int virtqueue_dma_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) return 0; @@ -3217,9 +3218,9 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_mapping_error); * * return bool */ -bool virtqueue_dma_need_sync(struct virtqueue *_vq, dma_addr_t addr) +bool virtqueue_dma_need_sync(const struct virtqueue *_vq, dma_addr_t addr) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (!vq->use_dma_api) return false; @@ -3240,12 +3241,12 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_need_sync); * the DMA address really needs to be synchronized * */ -void virtqueue_dma_sync_single_range_for_cpu(struct virtqueue *_vq, +void virtqueue_dma_sync_single_range_for_cpu(const struct virtqueue *_vq, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); struct device *dev =3D vring_dma_dev(vq); =20 if (!vq->use_dma_api) @@ -3266,12 +3267,12 @@ EXPORT_SYMBOL_GPL(virtqueue_dma_sync_single_range_f= or_cpu); * Before calling this function, use virtqueue_dma_need_sync() to confirm = that * the DMA address really needs to be synchronized */ -void virtqueue_dma_sync_single_range_for_device(struct virtqueue *_vq, +void virtqueue_dma_sync_single_range_for_device(const struct virtqueue *_v= q, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir) { - struct vring_virtqueue *vq =3D to_vvq(_vq); + const struct vring_virtqueue *vq =3D to_vvq(_vq); struct device *dev =3D vring_dma_dev(vq); =20 if (!vq->use_dma_api) diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 8b745ce0cf5f..cf8def717dfd 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -259,18 +259,18 @@ void unregister_virtio_driver(struct virtio_driver *d= rv); module_driver(__virtio_driver, register_virtio_driver, \ unregister_virtio_driver) =20 -dma_addr_t virtqueue_dma_map_single_attrs(struct virtqueue *_vq, void *ptr= , size_t size, +dma_addr_t virtqueue_dma_map_single_attrs(const struct virtqueue *_vq, voi= d *ptr, size_t size, enum dma_data_direction dir, unsigned long attrs); -void virtqueue_dma_unmap_single_attrs(struct virtqueue *_vq, dma_addr_t ad= dr, +void virtqueue_dma_unmap_single_attrs(const struct virtqueue *_vq, dma_add= r_t addr, size_t size, enum dma_data_direction dir, unsigned long attrs); -int virtqueue_dma_mapping_error(struct virtqueue *_vq, dma_addr_t addr); +int virtqueue_dma_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr); =20 -bool virtqueue_dma_need_sync(struct virtqueue *_vq, dma_addr_t addr); -void virtqueue_dma_sync_single_range_for_cpu(struct virtqueue *_vq, dma_ad= dr_t addr, +bool virtqueue_dma_need_sync(const struct virtqueue *_vq, dma_addr_t addr); +void virtqueue_dma_sync_single_range_for_cpu(const struct virtqueue *_vq, = dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir); -void virtqueue_dma_sync_single_range_for_device(struct virtqueue *_vq, dma= _addr_t addr, +void virtqueue_dma_sync_single_range_for_device(const struct virtqueue *_v= q, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir); =20 --=20 2.31.1 From nobody Sat Oct 4 21:00:55 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 E04A12C1585 for ; Wed, 13 Aug 2025 05:48:55 +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=1755064137; cv=none; b=jusbzwsGvVFCIWh5+Xc1s+8mXckT6gMG4IzhsTB575DJurJUg3NEffKqouiH0XxPL8NkKuTFlwVwMneRIUWk58k4AEKF8hXLcy+PqpIe0jUlE3F+NSC4y6tUs3JpfV68e5PzdLYxlDJWwZVH6BkxQFIRNbs10o3PC9CbXwKR2cY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064137; c=relaxed/simple; bh=3NgP69ZIidL2PedX3D/vVBsM7x97X20bJSOKU4P0Bpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hKy8WOH2DYR9gxL660JR4NbRwFxlf+fGJ0W6ULuiCTMuix0CraJzqZn7P0ofqbSTFTc9vyAvj3tKdgatCUqxIDZGgLG8hNFTV4KjrZhBzmakb+F2DhzVuqYzo2XGZxA4xIat3vSeKfbsgx7yqVXimXiJI00JtwZXIA7uzrgr6Cg= 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=MwRnO/BS; 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="MwRnO/BS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064135; 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=WEFSDGpbV88H0GYy2d3GXMr9/s0bna5eXxPzXidUw9g=; b=MwRnO/BSJOz+5pAk0eXj/IudKt25GfEaigLWKNxh4peuSGRrVV5tTnbRdoQ9yNBuGVQq7w mESpvtFLq9Zd3nNhMjhkCR0g0ECKjx2447Iqtih7twP/VwpObTEN363I4rCODc62fiGR+P mdLJEKQrKDPa0S73ckzxEtXSaAVCcA8= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-651-XpVwxH1fN6Ge4nsx9cqjhQ-1; Wed, 13 Aug 2025 01:48:51 -0400 X-MC-Unique: XpVwxH1fN6Ge4nsx9cqjhQ-1 X-Mimecast-MFC-AGG-ID: XpVwxH1fN6Ge4nsx9cqjhQ_1755064130 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC85E1800446; Wed, 13 Aug 2025 05:48:49 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8A56F180028D; Wed, 13 Aug 2025 05:48:45 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org, Christoph Hellwig Subject: [PATCH V5 2/9] virtio_ring: switch to use dma_{map|unmap}_page() Date: Wed, 13 Aug 2025 13:48:24 +0800 Message-ID: <20250813054831.25865-3-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" This patch switches to use dma_{map|unmap}_page() to reduce the coverage of DMA operations. This would help for the following rework on the virtio map operations. Reviewed-by: Christoph Hellwig Signed-off-by: Jason Wang Reviewed-by: Eugenio P=C3=A9rez --- drivers/virtio/virtio_ring.c | 55 +++++++++++++++--------------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 103bad8cffff..75e5f6336c8d 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -405,8 +405,8 @@ static dma_addr_t vring_map_single(const struct vring_v= irtqueue *vq, if (!vq->use_dma_api) return (dma_addr_t)virt_to_phys(cpu_addr); =20 - return dma_map_single(vring_dma_dev(vq), - cpu_addr, size, direction); + return virtqueue_dma_map_single_attrs(&vq->vq, cpu_addr, + size, direction, 0); } =20 static int vring_mapping_error(const struct vring_virtqueue *vq, @@ -451,22 +451,14 @@ static unsigned int vring_unmap_one_split(const struc= t vring_virtqueue *vq, if (flags & VRING_DESC_F_INDIRECT) { if (!vq->use_dma_api) goto out; + } else if (!vring_need_unmap_buffer(vq, extra)) + goto out; =20 - dma_unmap_single(vring_dma_dev(vq), - extra->addr, - extra->len, - (flags & VRING_DESC_F_WRITE) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); - } else { - if (!vring_need_unmap_buffer(vq, extra)) - goto out; - - dma_unmap_page(vring_dma_dev(vq), - extra->addr, - extra->len, - (flags & VRING_DESC_F_WRITE) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); - } + dma_unmap_page(vring_dma_dev(vq), + extra->addr, + extra->len, + (flags & VRING_DESC_F_WRITE) ? + DMA_FROM_DEVICE : DMA_TO_DEVICE); =20 out: return extra->next; @@ -1276,20 +1268,13 @@ static void vring_unmap_extra_packed(const struct v= ring_virtqueue *vq, if (flags & VRING_DESC_F_INDIRECT) { if (!vq->use_dma_api) return; + } else if (!vring_need_unmap_buffer(vq, extra)) + return; =20 - dma_unmap_single(vring_dma_dev(vq), - extra->addr, extra->len, - (flags & VRING_DESC_F_WRITE) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); - } else { - if (!vring_need_unmap_buffer(vq, extra)) - return; - - dma_unmap_page(vring_dma_dev(vq), - extra->addr, extra->len, - (flags & VRING_DESC_F_WRITE) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); - } + dma_unmap_page(vring_dma_dev(vq), + extra->addr, extra->len, + (flags & VRING_DESC_F_WRITE) ? + DMA_FROM_DEVICE : DMA_TO_DEVICE); } =20 static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_= sg, @@ -3161,7 +3146,13 @@ dma_addr_t virtqueue_dma_map_single_attrs(const stru= ct virtqueue *_vq, void *ptr return (dma_addr_t)virt_to_phys(ptr); } =20 - return dma_map_single_attrs(vring_dma_dev(vq), ptr, size, dir, attrs); + /* DMA must never operate on areas that might be remapped. */ + if (dev_WARN_ONCE(&_vq->vdev->dev, is_vmalloc_addr(ptr), + "rejecting DMA map of vmalloc memory\n")) + return DMA_MAPPING_ERROR; + + return dma_map_page_attrs(vring_dma_dev(vq), virt_to_page(ptr), + offset_in_page(ptr), size, dir, attrs); } EXPORT_SYMBOL_GPL(virtqueue_dma_map_single_attrs); =20 @@ -3186,7 +3177,7 @@ void virtqueue_dma_unmap_single_attrs(const struct vi= rtqueue *_vq, if (!vq->use_dma_api) return; =20 - dma_unmap_single_attrs(vring_dma_dev(vq), addr, size, dir, attrs); + dma_unmap_page_attrs(vring_dma_dev(vq), addr, size, dir, attrs); } EXPORT_SYMBOL_GPL(virtqueue_dma_unmap_single_attrs); =20 --=20 2.31.1 From nobody Sat Oct 4 21:00:55 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 CBA7E2C159E for ; Wed, 13 Aug 2025 05:49:01 +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=1755064144; cv=none; b=bWpkYXimP8sbhKMfJNJ4PhYTCjpNdnMGF0XiEHvk4fzDeLvQFlvUU0XZuWJsmzJByTy/8WVm+r4fYjmKlut4nHzQOuB3OtUxUqZo94g+PE4CTv/+jtwfwFyzxnBeLjtL49gMD0orwHe7MfhR4ctL6JI7qw9uTvaYgewEM2tw0Lg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064144; c=relaxed/simple; bh=1F+vcQoKFHKQTaY98Xh0IWk8T1gM6ueQiaXdsOqTJBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rryqaJRb9R9HgYFa2vRP8fcHrhRZerVgLXVEpNektrfT22MiP2cVtsz8pO6eHhyUkPczOVwKKkn0G9LPISd5zHeTnAUNaMfcGqimkgPQQNIhpd6N3VzfOvpC/ExoF98G7oBGnqOgKj4LpyfS1ZNiErmrINoyfYcpvBK//sSg6ns= 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=R+tIDTMH; 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="R+tIDTMH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064140; 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=DNF8G//CqsZDa16YXwFHuCVfswZReswUz+aIxV+uqwA=; b=R+tIDTMHz3d3VpLNyXozuSRd3640DWd+ZzZ4QJwsJjGoU9tfELXUTA63+bzZBumbgtsdcR SvXXHyTm3swbhjuvXOLlbgHybvkANNwlMlxhcDuOPEhZqfF4Ibtf/PjTqhi7f52N7OxBfR t+qKveG/yDrJFkvCASIa67qwgrmSGqk= Received: from mx-prod-mc-04.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-321-tSNEmn6gMeGIcyC4NGFwxQ-1; Wed, 13 Aug 2025 01:48:56 -0400 X-MC-Unique: tSNEmn6gMeGIcyC4NGFwxQ-1 X-Mimecast-MFC-AGG-ID: tSNEmn6gMeGIcyC4NGFwxQ_1755064135 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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6EFA519560AF; Wed, 13 Aug 2025 05:48:55 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CB69C1800446; Wed, 13 Aug 2025 05:48:50 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org, Christoph Hellwig Subject: [PATCH V5 3/9] virtio: rename dma helpers Date: Wed, 13 Aug 2025 13:48:25 +0800 Message-ID: <20250813054831.25865-4-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" Following patch will introduce virtio mapping function to avoid abusing DMA API for device that doesn't do DMA. To ease the introduction, this patch rename "dma" to "map" for the current dma mapping helpers. Reviewed-by: Christoph Hellwig Reviewed-by: Xuan Zhuo Signed-off-by: Jason Wang Reviewed-by: Eugenio P=C3=A9rez --- drivers/net/virtio_net.c | 28 ++++----- drivers/virtio/virtio_ring.c | 114 +++++++++++++++++------------------ include/linux/virtio.h | 12 ++-- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 5d674eb9a0f2..929db41a579b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -933,7 +933,7 @@ static void virtnet_rq_unmap(struct receive_queue *rq, = void *buf, u32 len) if (dma->need_sync && len) { offset =3D buf - (head + sizeof(*dma)); =20 - virtqueue_dma_sync_single_range_for_cpu(rq->vq, dma->addr, + virtqueue_map_sync_single_range_for_cpu(rq->vq, dma->addr, offset, len, DMA_FROM_DEVICE); } @@ -941,8 +941,8 @@ static void virtnet_rq_unmap(struct receive_queue *rq, = void *buf, u32 len) if (dma->ref) return; =20 - virtqueue_dma_unmap_single_attrs(rq->vq, dma->addr, dma->len, - DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + virtqueue_unmap_single_attrs(rq->vq, dma->addr, dma->len, + DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); put_page(page); } =20 @@ -1009,13 +1009,13 @@ static void *virtnet_rq_alloc(struct receive_queue = *rq, u32 size, gfp_t gfp) =20 dma->len =3D alloc_frag->size - sizeof(*dma); =20 - addr =3D virtqueue_dma_map_single_attrs(rq->vq, dma + 1, - dma->len, DMA_FROM_DEVICE, 0); - if (virtqueue_dma_mapping_error(rq->vq, addr)) + addr =3D virtqueue_map_single_attrs(rq->vq, dma + 1, + dma->len, DMA_FROM_DEVICE, 0); + if (virtqueue_map_mapping_error(rq->vq, addr)) return NULL; =20 dma->addr =3D addr; - dma->need_sync =3D virtqueue_dma_need_sync(rq->vq, addr); + dma->need_sync =3D virtqueue_map_need_sync(rq->vq, addr); =20 /* Add a reference to dma to prevent the entire dma from * being released during error handling. This reference @@ -5921,9 +5921,9 @@ static int virtnet_xsk_pool_enable(struct net_device = *dev, if (!rq->xsk_buffs) return -ENOMEM; =20 - hdr_dma =3D virtqueue_dma_map_single_attrs(sq->vq, &xsk_hdr, vi->hdr_len, - DMA_TO_DEVICE, 0); - if (virtqueue_dma_mapping_error(sq->vq, hdr_dma)) { + hdr_dma =3D virtqueue_map_single_attrs(sq->vq, &xsk_hdr, vi->hdr_len, + DMA_TO_DEVICE, 0); + if (virtqueue_map_mapping_error(sq->vq, hdr_dma)) { err =3D -ENOMEM; goto err_free_buffs; } @@ -5952,8 +5952,8 @@ static int virtnet_xsk_pool_enable(struct net_device = *dev, err_rq: xsk_pool_dma_unmap(pool, 0); err_xsk_map: - virtqueue_dma_unmap_single_attrs(rq->vq, hdr_dma, vi->hdr_len, - DMA_TO_DEVICE, 0); + virtqueue_unmap_single_attrs(rq->vq, hdr_dma, vi->hdr_len, + DMA_TO_DEVICE, 0); err_free_buffs: kvfree(rq->xsk_buffs); return err; @@ -5980,8 +5980,8 @@ static int virtnet_xsk_pool_disable(struct net_device= *dev, u16 qid) =20 xsk_pool_dma_unmap(pool, 0); =20 - virtqueue_dma_unmap_single_attrs(sq->vq, sq->xsk_hdr_dma_addr, - vi->hdr_len, DMA_TO_DEVICE, 0); + virtqueue_unmap_single_attrs(sq->vq, sq->xsk_hdr_dma_addr, + vi->hdr_len, DMA_TO_DEVICE, 0); kvfree(rq->xsk_buffs); =20 return err; diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 75e5f6336c8d..482a268af851 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -166,7 +166,7 @@ struct vring_virtqueue { bool packed_ring; =20 /* Is DMA API used? */ - bool use_dma_api; + bool use_map_api; =20 /* Can we use weak barriers? */ bool weak_barriers; @@ -268,7 +268,7 @@ static bool virtqueue_use_indirect(const struct vring_v= irtqueue *vq, * unconditionally on data path. */ =20 -static bool vring_use_dma_api(const struct virtio_device *vdev) +static bool vring_use_map_api(const struct virtio_device *vdev) { if (!virtio_has_dma_quirk(vdev)) return true; @@ -291,14 +291,14 @@ static bool vring_use_dma_api(const struct virtio_dev= ice *vdev) static bool vring_need_unmap_buffer(const struct vring_virtqueue *vring, const struct vring_desc_extra *extra) { - return vring->use_dma_api && (extra->addr !=3D DMA_MAPPING_ERROR); + return vring->use_map_api && (extra->addr !=3D DMA_MAPPING_ERROR); } =20 size_t virtio_max_dma_size(const struct virtio_device *vdev) { size_t max_segment_size =3D SIZE_MAX; =20 - if (vring_use_dma_api(vdev)) + if (vring_use_map_api(vdev)) max_segment_size =3D dma_max_mapping_size(vdev->dev.parent); =20 return max_segment_size; @@ -309,7 +309,7 @@ static void *vring_alloc_queue(struct virtio_device *vd= ev, size_t size, dma_addr_t *dma_handle, gfp_t flag, struct device *dma_dev) { - if (vring_use_dma_api(vdev)) { + if (vring_use_map_api(vdev)) { return dma_alloc_coherent(dma_dev, size, dma_handle, flag); } else { @@ -343,7 +343,7 @@ static void vring_free_queue(struct virtio_device *vdev= , size_t size, void *queue, dma_addr_t dma_handle, struct device *dma_dev) { - if (vring_use_dma_api(vdev)) + if (vring_use_map_api(vdev)) dma_free_coherent(dma_dev, size, queue, dma_handle); else free_pages_exact(queue, PAGE_ALIGN(size)); @@ -372,7 +372,7 @@ static int vring_map_one_sg(const struct vring_virtqueu= e *vq, struct scatterlist =20 *len =3D sg->length; =20 - if (!vq->use_dma_api) { + if (!vq->use_map_api) { /* * If DMA is not used, KMSAN doesn't know that the scatterlist * is initialized by the hardware. Explicitly check/unpoison it @@ -402,17 +402,17 @@ static dma_addr_t vring_map_single(const struct vring= _virtqueue *vq, void *cpu_addr, size_t size, enum dma_data_direction direction) { - if (!vq->use_dma_api) + if (!vq->use_map_api) return (dma_addr_t)virt_to_phys(cpu_addr); =20 - return virtqueue_dma_map_single_attrs(&vq->vq, cpu_addr, - size, direction, 0); + return virtqueue_map_single_attrs(&vq->vq, cpu_addr, + size, direction, 0); } =20 static int vring_mapping_error(const struct vring_virtqueue *vq, dma_addr_t addr) { - if (!vq->use_dma_api) + if (!vq->use_map_api) return 0; =20 return dma_mapping_error(vring_dma_dev(vq), addr); @@ -449,7 +449,7 @@ static unsigned int vring_unmap_one_split(const struct = vring_virtqueue *vq, flags =3D extra->flags; =20 if (flags & VRING_DESC_F_INDIRECT) { - if (!vq->use_dma_api) + if (!vq->use_map_api) goto out; } else if (!vring_need_unmap_buffer(vq, extra)) goto out; @@ -782,7 +782,7 @@ static void detach_buf_split(struct vring_virtqueue *vq= , unsigned int head, =20 extra =3D (struct vring_desc_extra *)&indir_desc[num]; =20 - if (vq->use_dma_api) { + if (vq->use_map_api) { for (j =3D 0; j < num; j++) vring_unmap_one_split(vq, &extra[j]); } @@ -1150,7 +1150,7 @@ static struct virtqueue *__vring_new_virtqueue_split(= unsigned int index, vq->broken =3D false; #endif vq->dma_dev =3D dma_dev; - vq->use_dma_api =3D vring_use_dma_api(vdev); + vq->use_map_api =3D vring_use_map_api(vdev); =20 vq->indirect =3D virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) && !context; @@ -1266,7 +1266,7 @@ static void vring_unmap_extra_packed(const struct vri= ng_virtqueue *vq, flags =3D extra->flags; =20 if (flags & VRING_DESC_F_INDIRECT) { - if (!vq->use_dma_api) + if (!vq->use_map_api) return; } else if (!vring_need_unmap_buffer(vq, extra)) return; @@ -1351,7 +1351,7 @@ static int virtqueue_add_indirect_packed(struct vring= _virtqueue *vq, desc[i].addr =3D cpu_to_le64(addr); desc[i].len =3D cpu_to_le32(len); =20 - if (unlikely(vq->use_dma_api)) { + if (unlikely(vq->use_map_api)) { extra[i].addr =3D premapped ? DMA_MAPPING_ERROR : addr; extra[i].len =3D len; extra[i].flags =3D n < out_sgs ? 0 : VRING_DESC_F_WRITE; @@ -1373,7 +1373,7 @@ static int virtqueue_add_indirect_packed(struct vring= _virtqueue *vq, sizeof(struct vring_packed_desc)); vq->packed.vring.desc[head].id =3D cpu_to_le16(id); =20 - if (vq->use_dma_api) { + if (vq->use_map_api) { vq->packed.desc_extra[id].addr =3D addr; vq->packed.desc_extra[id].len =3D total_sg * sizeof(struct vring_packed_desc); @@ -1515,7 +1515,7 @@ static inline int virtqueue_add_packed(struct virtque= ue *_vq, desc[i].len =3D cpu_to_le32(len); desc[i].id =3D cpu_to_le16(id); =20 - if (unlikely(vq->use_dma_api)) { + if (unlikely(vq->use_map_api)) { vq->packed.desc_extra[curr].addr =3D premapped ? DMA_MAPPING_ERROR : addr; vq->packed.desc_extra[curr].len =3D len; @@ -1650,7 +1650,7 @@ static void detach_buf_packed(struct vring_virtqueue = *vq, vq->free_head =3D id; vq->vq.num_free +=3D state->num; =20 - if (unlikely(vq->use_dma_api)) { + if (unlikely(vq->use_map_api)) { curr =3D id; for (i =3D 0; i < state->num; i++) { vring_unmap_extra_packed(vq, @@ -1668,7 +1668,7 @@ static void detach_buf_packed(struct vring_virtqueue = *vq, if (!desc) return; =20 - if (vq->use_dma_api) { + if (vq->use_map_api) { len =3D vq->packed.desc_extra[id].len; num =3D len / sizeof(struct vring_packed_desc); =20 @@ -2121,7 +2121,7 @@ static struct virtqueue *__vring_new_virtqueue_packed= (unsigned int index, #endif vq->packed_ring =3D true; vq->dma_dev =3D dma_dev; - vq->use_dma_api =3D vring_use_dma_api(vdev); + vq->use_map_api =3D vring_use_map_api(vdev); =20 vq->indirect =3D virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) && !context; @@ -2433,7 +2433,7 @@ struct device *virtqueue_dma_dev(struct virtqueue *_v= q) { struct vring_virtqueue *vq =3D to_vvq(_vq); =20 - if (vq->use_dma_api) + if (vq->use_map_api) return vring_dma_dev(vq); else return NULL; @@ -3122,7 +3122,7 @@ const struct vring *virtqueue_get_vring(const struct = virtqueue *vq) EXPORT_SYMBOL_GPL(virtqueue_get_vring); =20 /** - * virtqueue_dma_map_single_attrs - map DMA for _vq + * virtqueue_map_single_attrs - map DMA for _vq * @_vq: the struct virtqueue we're talking about. * @ptr: the pointer of the buffer to do dma * @size: the size of the buffer to do dma @@ -3132,16 +3132,16 @@ EXPORT_SYMBOL_GPL(virtqueue_get_vring); * The caller calls this to do dma mapping in advance. The DMA address can= be * passed to this _vq when it is in pre-mapped mode. * - * return DMA address. Caller should check that by virtqueue_dma_mapping_e= rror(). + * return DMA address. Caller should check that by virtqueue_mapping_error= (). */ -dma_addr_t virtqueue_dma_map_single_attrs(const struct virtqueue *_vq, voi= d *ptr, - size_t size, - enum dma_data_direction dir, - unsigned long attrs) +dma_addr_t virtqueue_map_single_attrs(const struct virtqueue *_vq, void *p= tr, + size_t size, + enum dma_data_direction dir, + unsigned long attrs) { const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 - if (!vq->use_dma_api) { + if (!vq->use_map_api) { kmsan_handle_dma(virt_to_page(ptr), offset_in_page(ptr), size, dir); return (dma_addr_t)virt_to_phys(ptr); } @@ -3154,85 +3154,85 @@ dma_addr_t virtqueue_dma_map_single_attrs(const str= uct virtqueue *_vq, void *ptr return dma_map_page_attrs(vring_dma_dev(vq), virt_to_page(ptr), offset_in_page(ptr), size, dir, attrs); } -EXPORT_SYMBOL_GPL(virtqueue_dma_map_single_attrs); +EXPORT_SYMBOL_GPL(virtqueue_map_single_attrs); =20 /** - * virtqueue_dma_unmap_single_attrs - unmap DMA for _vq + * virtqueue_unmap_single_attrs - unmap map for _vq * @_vq: the struct virtqueue we're talking about. * @addr: the dma address to unmap * @size: the size of the buffer * @dir: DMA direction * @attrs: DMA Attrs * - * Unmap the address that is mapped by the virtqueue_dma_map_* APIs. + * Unmap the address that is mapped by the virtqueue_map_* APIs. * */ -void virtqueue_dma_unmap_single_attrs(const struct virtqueue *_vq, - dma_addr_t addr, - size_t size, enum dma_data_direction dir, - unsigned long attrs) +void virtqueue_unmap_single_attrs(const struct virtqueue *_vq, + dma_addr_t addr, + size_t size, enum dma_data_direction dir, + unsigned long attrs) { const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 - if (!vq->use_dma_api) + if (!vq->use_map_api) return; =20 dma_unmap_page_attrs(vring_dma_dev(vq), addr, size, dir, attrs); } -EXPORT_SYMBOL_GPL(virtqueue_dma_unmap_single_attrs); +EXPORT_SYMBOL_GPL(virtqueue_unmap_single_attrs); =20 /** - * virtqueue_dma_mapping_error - check dma address + * virtqueue_map_mapping_error - check dma address * @_vq: the struct virtqueue we're talking about. * @addr: DMA address * * Returns 0 means dma valid. Other means invalid dma address. */ -int virtqueue_dma_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr) +int virtqueue_map_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr) { const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 - if (!vq->use_dma_api) + if (!vq->use_map_api) return 0; =20 return dma_mapping_error(vring_dma_dev(vq), addr); } -EXPORT_SYMBOL_GPL(virtqueue_dma_mapping_error); +EXPORT_SYMBOL_GPL(virtqueue_map_mapping_error); =20 /** - * virtqueue_dma_need_sync - check a dma address needs sync + * virtqueue_map_need_sync - check a dma address needs sync * @_vq: the struct virtqueue we're talking about. * @addr: DMA address * - * Check if the dma address mapped by the virtqueue_dma_map_* APIs needs t= o be + * Check if the dma address mapped by the virtqueue_map_* APIs needs to be * synchronized * * return bool */ -bool virtqueue_dma_need_sync(const struct virtqueue *_vq, dma_addr_t addr) +bool virtqueue_map_need_sync(const struct virtqueue *_vq, dma_addr_t addr) { const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 - if (!vq->use_dma_api) + if (!vq->use_map_api) return false; =20 return dma_need_sync(vring_dma_dev(vq), addr); } -EXPORT_SYMBOL_GPL(virtqueue_dma_need_sync); +EXPORT_SYMBOL_GPL(virtqueue_map_need_sync); =20 /** - * virtqueue_dma_sync_single_range_for_cpu - dma sync for cpu + * virtqueue_map_sync_single_range_for_cpu - map sync for cpu * @_vq: the struct virtqueue we're talking about. * @addr: DMA address * @offset: DMA address offset * @size: buf size for sync * @dir: DMA direction * - * Before calling this function, use virtqueue_dma_need_sync() to confirm = that + * Before calling this function, use virtqueue_map_need_sync() to confirm = that * the DMA address really needs to be synchronized * */ -void virtqueue_dma_sync_single_range_for_cpu(const struct virtqueue *_vq, +void virtqueue_map_sync_single_range_for_cpu(const struct virtqueue *_vq, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir) @@ -3240,25 +3240,25 @@ void virtqueue_dma_sync_single_range_for_cpu(const = struct virtqueue *_vq, const struct vring_virtqueue *vq =3D to_vvq(_vq); struct device *dev =3D vring_dma_dev(vq); =20 - if (!vq->use_dma_api) + if (!vq->use_map_api) return; =20 dma_sync_single_range_for_cpu(dev, addr, offset, size, dir); } -EXPORT_SYMBOL_GPL(virtqueue_dma_sync_single_range_for_cpu); +EXPORT_SYMBOL_GPL(virtqueue_map_sync_single_range_for_cpu); =20 /** - * virtqueue_dma_sync_single_range_for_device - dma sync for device + * virtqueue_map_sync_single_range_for_device - map sync for device * @_vq: the struct virtqueue we're talking about. * @addr: DMA address * @offset: DMA address offset * @size: buf size for sync * @dir: DMA direction * - * Before calling this function, use virtqueue_dma_need_sync() to confirm = that + * Before calling this function, use virtqueue_map_need_sync() to confirm = that * the DMA address really needs to be synchronized */ -void virtqueue_dma_sync_single_range_for_device(const struct virtqueue *_v= q, +void virtqueue_map_sync_single_range_for_device(const struct virtqueue *_v= q, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir) @@ -3266,12 +3266,12 @@ void virtqueue_dma_sync_single_range_for_device(con= st struct virtqueue *_vq, const struct vring_virtqueue *vq =3D to_vvq(_vq); struct device *dev =3D vring_dma_dev(vq); =20 - if (!vq->use_dma_api) + if (!vq->use_map_api) return; =20 dma_sync_single_range_for_device(dev, addr, offset, size, dir); } -EXPORT_SYMBOL_GPL(virtqueue_dma_sync_single_range_for_device); +EXPORT_SYMBOL_GPL(virtqueue_map_sync_single_range_for_device); =20 MODULE_DESCRIPTION("Virtio ring implementation"); MODULE_LICENSE("GPL"); diff --git a/include/linux/virtio.h b/include/linux/virtio.h index cf8def717dfd..addbc209275a 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -259,18 +259,18 @@ void unregister_virtio_driver(struct virtio_driver *d= rv); module_driver(__virtio_driver, register_virtio_driver, \ unregister_virtio_driver) =20 -dma_addr_t virtqueue_dma_map_single_attrs(const struct virtqueue *_vq, voi= d *ptr, size_t size, +dma_addr_t virtqueue_map_single_attrs(const struct virtqueue *_vq, void *p= tr, size_t size, enum dma_data_direction dir, unsigned long attrs); -void virtqueue_dma_unmap_single_attrs(const struct virtqueue *_vq, dma_add= r_t addr, +void virtqueue_unmap_single_attrs(const struct virtqueue *_vq, dma_addr_t = addr, size_t size, enum dma_data_direction dir, unsigned long attrs); -int virtqueue_dma_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr); +int virtqueue_map_mapping_error(const struct virtqueue *_vq, dma_addr_t ad= dr); =20 -bool virtqueue_dma_need_sync(const struct virtqueue *_vq, dma_addr_t addr); -void virtqueue_dma_sync_single_range_for_cpu(const struct virtqueue *_vq, = dma_addr_t addr, +bool virtqueue_map_need_sync(const struct virtqueue *_vq, dma_addr_t addr); +void virtqueue_map_sync_single_range_for_cpu(const struct virtqueue *_vq, = dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir); -void virtqueue_dma_sync_single_range_for_device(const struct virtqueue *_v= q, dma_addr_t addr, +void virtqueue_map_sync_single_range_for_device(const struct virtqueue *_v= q, dma_addr_t addr, unsigned long offset, size_t size, enum dma_data_direction dir); =20 --=20 2.31.1 From nobody Sat Oct 4 21:00:55 2025 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 B1C472C374B for ; Wed, 13 Aug 2025 05:49:05 +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=1755064147; cv=none; b=poZ5Kvfs6NwGZvz8SFjGzwQp5Bppk+OzF/VhT9kbkS1TNjM9+n9mQvnzIql78M62hiNcizOgoFp5AExCp9GfKZnaMrAnNJX1Kh3Anh/Abf9y09MqENFbtdvHoiteWHr3CDzJMKGyVqUipkaZp5x40C+ll6xQc7t4IJNvzcV37Ao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064147; c=relaxed/simple; bh=Z1sWde1p6/Axkl74rKVg/jg3BQkrsPHNaFowlKlbTtg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nygdWLrUauh31DDgssHIlR5Lz0RLMRaiEteqSZCe4Fs/hoL6nILsX75vHmbuCS3MRXpah6k73JuqaaSsF4fhupI4oZbHYsKgVcX69m6eOQeORizNADICVYtMhbim9SrYsU+TpBbbYdvGydso2bOxG10UKr9Bj+x25aMtIK4STRA= 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=eEVSC2eo; 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="eEVSC2eo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064144; 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=riVQKuwrnPqzh+a3gW/nlAdUFPVlmvC0HCNWRc3mbms=; b=eEVSC2eod2djgkTW6xeKWitZEa4CZWgRjWXeIlundfxrx4PTtlgqv6CdYG3TNWrnRyAnJS EnWdWBQyi5rIUEpDkxuharaUVcrZkah6TdUrbQm0IH7SkS4gShG77qx/oJ5qjxr9iA9Q3s mOGJ8x2b60oc3bqqs7g4YnEgTUaqkak= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-286-x-1YDzejPi6qu8rDNNv4eg-1; Wed, 13 Aug 2025 01:49:01 -0400 X-MC-Unique: x-1YDzejPi6qu8rDNNv4eg-1 X-Mimecast-MFC-AGG-ID: x-1YDzejPi6qu8rDNNv4eg_1755064140 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 03A801800291; Wed, 13 Aug 2025 05:49:00 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1F4591800446; Wed, 13 Aug 2025 05:48:55 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org Subject: [PATCH V5 4/9] virtio: introduce vring_mapping_token Date: Wed, 13 Aug 2025 13:48:26 +0800 Message-ID: <20250813054831.25865-5-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" Following patch will introduce the mapping operations for virtio device. In order to achieve this, besides the dma device, virtio core needs to support a transport or device specific mapping token as well. So this patch introduces a union container of a dma device and opaque mapping token. 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. For the transport or device that is using DMA, dma device is still being used. Signed-off-by: Jason Wang Acked-by: Eugenio P=C3=A9rez --- drivers/virtio/virtio_ring.c | 110 ++++++++++++++++++----------------- drivers/virtio/virtio_vdpa.c | 6 +- include/linux/virtio.h | 7 +++ include/linux/virtio_ring.h | 7 ++- 4 files changed, 72 insertions(+), 58 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 482a268af851..fb1d407d5f1b 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -210,8 +210,7 @@ struct vring_virtqueue { /* DMA, allocation, and size information */ bool we_own_ring; =20 - /* Device used for doing DMA */ - struct device *dma_dev; + union vring_mapping_token mapping_token; =20 #ifdef DEBUG /* They're supposed to lock for us. */ @@ -307,10 +306,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) + union vring_mapping_token *mapping_token) { if (vring_use_map_api(vdev)) { - return dma_alloc_coherent(dma_dev, size, + return dma_alloc_coherent(mapping_token->dma_dev, size, dma_handle, flag); } else { void *queue =3D alloc_pages_exact(PAGE_ALIGN(size), flag); @@ -341,22 +340,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) + union vring_mapping_token *mapping_token) { if (vring_use_map_api(vdev)) - dma_free_coherent(dma_dev, size, queue, dma_handle); + dma_free_coherent(mapping_token->dma_dev, 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) { - return vq->dma_dev; + return vq->mapping_token.dma_dev; } =20 /* Map one sg entry. */ @@ -1056,12 +1055,13 @@ 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, + union vring_mapping_token *mapping_token) { vring_free_queue(vdev, vring_split->queue_size_in_bytes, vring_split->vring.desc, vring_split->queue_dma_addr, - dma_dev); + mapping_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) + union vring_mapping_token *mapping_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); + mapping_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); + mapping_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) + union vring_mapping_token *mapping_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->mapping_token =3D *mapping_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) + union vring_mapping_token *mapping_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, mapping_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, mapping_token); if (!vq) { - vring_free_split(&vring_split, vdev, dma_dev); + vring_free_split(&vring_split, vdev, mapping_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)); + &vq->mapping_token); 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, &vq->mapping_token); err: virtqueue_reinit_split(vq); return -ENOMEM; @@ -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) + union vring_mapping_token *mapping_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); + mapping_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); + mapping_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); + mapping_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, union vring_mapping_token *mapping_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); + mapping_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); + mapping_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); + mapping_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, mapping_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) + union vring_mapping_token *mapping_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->mapping_token =3D *mapping_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) + union vring_mapping_token *mapping_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, mapping_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, mapping_token); if (!vq) { - vring_free_packed(&vring_packed, vdev, dma_dev); + vring_free_packed(&vring_packed, vdev, mapping_token); return NULL; } =20 @@ -2185,7 +2185,8 @@ 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, &vq->mapping_token)) goto err_ring; =20 err =3D vring_alloc_state_extra_packed(&vring_packed); @@ -2202,7 +2203,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, &vq->mapping_token); err_ring: virtqueue_reinit_packed(vq); return -ENOMEM; @@ -2423,6 +2424,7 @@ int virtqueue_add_inbuf_premapped(struct virtqueue *v= q, } EXPORT_SYMBOL_GPL(virtqueue_add_inbuf_premapped); =20 + /** * virtqueue_dma_dev - get the dma dev * @_vq: the struct virtqueue we're talking about. @@ -2434,7 +2436,7 @@ struct device *virtqueue_dma_dev(struct virtqueue *_v= q) struct vring_virtqueue *vq =3D to_vvq(_vq); =20 if (vq->use_map_api) - return vring_dma_dev(vq); + return vq->mapping_token.dma_dev; else return NULL; } @@ -2719,19 +2721,20 @@ struct virtqueue *vring_create_virtqueue( void (*callback)(struct virtqueue *), const char *name) { + union vring_mapping_token mapping_token =3D {.dma_dev =3D vdev->dev.paren= t}; =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, vdev->dev.parent); + context, notify, callback, name, &mapping_token); =20 return vring_create_virtqueue_split(index, num, vring_align, vdev, weak_barriers, may_reduce_num, - context, notify, callback, name, vdev->dev.parent); + context, notify, callback, name, &mapping_token); } 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, @@ -2742,19 +2745,19 @@ struct virtqueue *vring_create_virtqueue_dma( bool (*notify)(struct virtqueue *), void (*callback)(struct virtqueue *), const char *name, - struct device *dma_dev) + union vring_mapping_token *mapping_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, mapping_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, mapping_token); } -EXPORT_SYMBOL_GPL(vring_create_virtqueue_dma); +EXPORT_SYMBOL_GPL(vring_create_virtqueue_map); =20 /** * virtqueue_resize - resize the vring of vq @@ -2865,6 +2868,7 @@ struct virtqueue *vring_new_virtqueue(unsigned int in= dex, const char *name) { struct vring_virtqueue_split vring_split =3D {}; + union vring_mapping_token mapping_token =3D {.dma_dev =3D vdev->dev.paren= t}; =20 if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED)) { struct vring_virtqueue_packed vring_packed =3D {}; @@ -2874,13 +2878,13 @@ struct virtqueue *vring_new_virtqueue(unsigned int = index, return __vring_new_virtqueue_packed(index, &vring_packed, vdev, weak_barriers, context, notify, callback, - name, vdev->dev.parent); + name, &mapping_token); } =20 vring_init(&vring_split.vring, num, pages, vring_align); return __vring_new_virtqueue_split(index, &vring_split, vdev, weak_barrie= rs, context, notify, callback, name, - vdev->dev.parent); + &mapping_token); } EXPORT_SYMBOL_GPL(vring_new_virtqueue); =20 @@ -2894,19 +2898,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)); + &vq->mapping_token); =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)); + &vq->mapping_token); =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)); + &vq->mapping_token); =20 kfree(vq->packed.desc_state); kfree(vq->packed.desc_extra); @@ -2915,7 +2919,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)); + &vq->mapping_token); } } if (!vq->packed_ring) { diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index e25610e3393a..acea98ab08ee 100644 --- a/drivers/virtio/virtio_vdpa.c +++ b/drivers/virtio/virtio_vdpa.c @@ -139,6 +139,7 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsign= ed int index, struct vdpa_callback cb; struct virtqueue *vq; u64 desc_addr, driver_addr, device_addr; + union vring_mapping_token mapping_token =3D {0}; /* Assume split virtqueue, switch to packed if necessary */ struct vdpa_vq_state state =3D {0}; u32 align, max_num, min_num =3D 1; @@ -185,9 +186,10 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsig= ned 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, + mapping_token.dma_dev =3D dma_dev; + vq =3D vring_create_virtqueue_map(index, max_num, align, vdev, true, may_reduce_num, ctx, - notify, callback, name, dma_dev); + notify, callback, name, &mapping_token); if (!vq) { err =3D -ENOMEM; goto error_new_virtqueue; diff --git a/include/linux/virtio.h b/include/linux/virtio.h index addbc209275a..37029df94aaf 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -40,6 +40,13 @@ struct virtqueue { void *priv; }; =20 +union vring_mapping_token { + /* Device that performs DMA */ + struct device *dma_dev; + /* Transport specific token used for doing map */ + void *opaque; +}; + int virtqueue_add_outbuf(struct virtqueue *vq, struct scatterlist sg[], unsigned int num, void *data, diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index 9b33df741b63..fd997178da2a 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -3,6 +3,7 @@ #define _LINUX_VIRTIO_RING_H =20 #include +#include #include #include =20 @@ -79,9 +80,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 +92,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); + union vring_mapping_token *mapping_token); =20 /* * Creates a virtqueue with a standard layout but a caller-allocated --=20 2.31.1 From nobody Sat Oct 4 21:00:55 2025 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 B25D02D028A for ; Wed, 13 Aug 2025 05:49:08 +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=1755064150; cv=none; b=XICTP4ctyvq9p7RTmJbgn+gkHw3oB//iSXY1bkhNEA942+92jPCrNxTm5IIXjVOodjynpFImP6td1/H2d3IpVS95EqSFU9nUNgKHxdCrSOOeX7rImbT6F7g9fZGT+h15wquIhvwdH9fyWbY8kzZplDSTilR59zm9M512IS/pC2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064150; c=relaxed/simple; bh=5oqAJoPzHR0GxmVVo7AvUscPsv5V0EJLro0zKMyYk2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EpbdJXrpCQIxOGu1tHU0uk5ReDp9S910Fmd/5xHA09amLdGnwHP9a81R+yQkmhzNyhJP9qZIelGLHshcOjNjUvbWMH+pM0AzbOYBsUmwOPCTYg+ajwDrSyrsg6fYdkQlkQdAA9V9OxMmJFuM5SAHLV9O+I1hhxVLP7vSVEsZxmM= 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=BMxgGq1k; 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="BMxgGq1k" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064147; 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=80lhT498S4jOzJ/P6kb5gkt8pK+u0mT9rN4yk+mBlD0=; b=BMxgGq1k7USUxNj7fponfYCZxpy97LmHAbZKZt+XdTHoZspUm8SsFon1me4o6Tx5TTZgG/ ta/DFRwXWyzn7wbTddPnAEuRyG7qzY/KZCllA4EAU5kNtT74KVdOka+tdC6VNJYqQmFNzA DMjCuIq4Fbh4nH1O83LX2B5eHELJgss= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-536-o41aZ9LeO8mQGQu7Ep0CAA-1; Wed, 13 Aug 2025 01:49:06 -0400 X-MC-Unique: o41aZ9LeO8mQGQu7Ep0CAA-1 X-Mimecast-MFC-AGG-ID: o41aZ9LeO8mQGQu7Ep0CAA_1755064145 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DFF12180034F; Wed, 13 Aug 2025 05:49:04 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C4A3F180028D; Wed, 13 Aug 2025 05:49:00 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org, Christoph Hellwig Subject: [PATCH V5 5/9] virtio_ring: rename dma_handle to map_handle Date: Wed, 13 Aug 2025 13:48:27 +0800 Message-ID: <20250813054831.25865-6-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" Following patch will introduce virtio map opreations which means the address is not necessarily used for DMA. Let's rename the dma_handle to map_handle first. Reviewed-by: Christoph Hellwig Reviewed-by: Xuan Zhuo Signed-off-by: Jason Wang Reviewed-by: Eugenio P=C3=A9rez --- drivers/virtio/virtio_ring.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index fb1d407d5f1b..94b2a8f3acc2 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -305,18 +305,18 @@ size_t virtio_max_dma_size(const struct virtio_device= *vdev) 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, + dma_addr_t *map_handle, gfp_t flag, union vring_mapping_token *mapping_token) { if (vring_use_map_api(vdev)) { return dma_alloc_coherent(mapping_token->dma_dev, size, - dma_handle, flag); + map_handle, flag); } else { void *queue =3D alloc_pages_exact(PAGE_ALIGN(size), flag); =20 if (queue) { phys_addr_t phys_addr =3D virt_to_phys(queue); - *dma_handle =3D (dma_addr_t)phys_addr; + *map_handle =3D (dma_addr_t)phys_addr; =20 /* * Sanity check: make sure we dind't truncate @@ -329,7 +329,7 @@ static void *vring_alloc_queue(struct virtio_device *vd= ev, size_t size, * warning and abort if we end up with an * unrepresentable address. */ - if (WARN_ON_ONCE(*dma_handle !=3D phys_addr)) { + if (WARN_ON_ONCE(*map_handle !=3D phys_addr)) { free_pages_exact(queue, PAGE_ALIGN(size)); return NULL; } @@ -339,11 +339,11 @@ 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, + void *queue, dma_addr_t map_handle, union vring_mapping_token *mapping_token) { if (vring_use_map_api(vdev)) - dma_free_coherent(mapping_token->dma_dev, size, queue, dma_handle); + dma_free_coherent(mapping_token->dma_dev, size, queue, map_handle); else free_pages_exact(queue, PAGE_ALIGN(size)); } --=20 2.31.1 From nobody Sat Oct 4 21:00:55 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 EEA032D0C81 for ; Wed, 13 Aug 2025 05:49:12 +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=1755064155; cv=none; b=McKjclvzCqn6kuqrIJ9V0vk8YsUHJTPJib/reEPw8AXseQrnZGHtXYUEW7Z+7ZhbXa6NHsNj6TGAaB0mkxM+I4GQflTsNuVe6BpmT9i0if19QBleRvmjaoniBv3NaxMx5FA1d8i1ILWWDZSmhXONB5i2p1TjUGuiydbYiCo4fYs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064155; c=relaxed/simple; bh=288OXpvW8XcQdq1CYzdsEgxA4KAT4WL6xmr3dvS+N48=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WxcY3sAeuKblr7y3D0saMwhYQ0yWlQEXWopeI3sMxRoStb1b8blo8iWCTXHMpRG5H9Q5+Q7fcxKP66MT+t76y9R7k3+gidqwNIdWODx3Ye34/cMaJzrsUJ1H0hakkFX+jqTXHoBIBvSE2OXH5rdhwkzHXZel9txVvoc7nH+LkW8= 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=CtAx7n8T; 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="CtAx7n8T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064152; 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=k52rTVrWyoq13QeEFke/HSFi6Lcgu2unCHktMWNf2S4=; b=CtAx7n8T9LE3BxZXcEP1DY6AW5k9PABqo+ZRxAMKSkvyDXU7wgWoS0Y9cIBlPr31TIyRiW eX0/8yPEE1Md1UNzMES6ZouiODkmHjIzhZK6DZ90VwYVGf+fFqCWZTdi2KAM4hJk4n2XrA 1KVdaIF4T6IAhZ+NFTQynmDIQl4flQI= 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-423-Zcr9m_YdM3GWN7_4RurRNA-1; Wed, 13 Aug 2025 01:49:10 -0400 X-MC-Unique: Zcr9m_YdM3GWN7_4RurRNA-1 X-Mimecast-MFC-AGG-ID: Zcr9m_YdM3GWN7_4RurRNA_1755064149 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8D16E195608E; Wed, 13 Aug 2025 05:49:09 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ADA41180028D; Wed, 13 Aug 2025 05:49:05 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org Subject: [PATCH V5 6/9] virtio: introduce map ops in virtio core Date: Wed, 13 Aug 2025 13:48:28 +0800 Message-ID: <20250813054831.25865-7-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" This patch introduces map operations for virtio device. Virtio use to use DMA API which is not necessarily the case since some devices doesn't do DMA. Instead of using tricks and abusing DMA API, let's simply abstract the current mapping logic into a virtio specific mapping operations. For the device or transport that doesn't do DMA, they can implement their own mapping logic without the need to trick DMA core. In this case the map_token is opaque to the virtio core that will be passed back to the transport or device specific map operations. For other devices, DMA API will still be used, so map token will still be the dma device to minimize the changeset and performance impact. The mapping operations are abstracted as a independent structure instead of reusing virtio_config_ops. This allows the transport can simply reuse the structure for lower layers like vDPA. A set of new mapping helpers were introduced for the device that want to do mapping by themselves. Signed-off-by: Jason Wang Acked-by: Eugenio P=C3=A9rez --- drivers/virtio/virtio_ring.c | 217 +++++++++++++++++++++++++++------- include/linux/virtio.h | 26 +++- include/linux/virtio_config.h | 72 +++++++++++ 3 files changed, 271 insertions(+), 44 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 94b2a8f3acc2..86188ffbce00 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -297,8 +297,14 @@ size_t virtio_max_dma_size(const struct virtio_device = *vdev) { size_t max_segment_size =3D SIZE_MAX; =20 - if (vring_use_map_api(vdev)) - max_segment_size =3D dma_max_mapping_size(vdev->dev.parent); + if (vring_use_map_api(vdev)) { + if (vdev->map) + max_segment_size =3D + vdev->map->max_mapping_size(vdev->dev.parent); + else + max_segment_size =3D + dma_max_mapping_size(vdev->dev.parent); + } =20 return max_segment_size; } @@ -309,8 +315,8 @@ static void *vring_alloc_queue(struct virtio_device *vd= ev, size_t size, union vring_mapping_token *mapping_token) { if (vring_use_map_api(vdev)) { - return dma_alloc_coherent(mapping_token->dma_dev, size, - map_handle, flag); + return virtqueue_map_alloc_coherent(vdev, mapping_token, size, + map_handle, flag); } else { void *queue =3D alloc_pages_exact(PAGE_ALIGN(size), flag); =20 @@ -343,7 +349,8 @@ static void vring_free_queue(struct virtio_device *vdev= , size_t size, union vring_mapping_token *mapping_token) { if (vring_use_map_api(vdev)) - dma_free_coherent(mapping_token->dma_dev, size, queue, map_handle); + virtqueue_map_free_coherent(vdev, mapping_token, size, + queue, map_handle); else free_pages_exact(queue, PAGE_ALIGN(size)); } @@ -358,6 +365,25 @@ static struct device *vring_dma_dev(const struct vring= _virtqueue *vq) return vq->mapping_token.dma_dev; } =20 +static void *vring_mapping_token(const struct vring_virtqueue *vq) +{ + return vq->mapping_token.token; +} + +static int vring_mapping_error(const struct vring_virtqueue *vq, + dma_addr_t addr) +{ + struct virtio_device *vdev =3D vq->vq.vdev; + + if (!vq->use_map_api) + return 0; + + if (vdev->map) + return vdev->map->mapping_error(vring_mapping_token(vq), addr); + else + return dma_mapping_error(vring_dma_dev(vq), addr); +} + /* Map one sg entry. */ static int vring_map_one_sg(const struct vring_virtqueue *vq, struct scatt= erlist *sg, enum dma_data_direction direction, dma_addr_t *addr, @@ -387,11 +413,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), - sg_page(sg), sg->offset, sg->length, - direction); + *addr =3D virtqueue_map_page_attrs(&vq->vq, sg_page(sg), + sg->offset, sg->length, + direction, 0); =20 - if (dma_mapping_error(vring_dma_dev(vq), *addr)) + if (vring_mapping_error(vq, *addr)) return -ENOMEM; =20 return 0; @@ -408,15 +434,6 @@ static dma_addr_t vring_map_single(const struct vring_= virtqueue *vq, size, direction, 0); } =20 -static int vring_mapping_error(const struct vring_virtqueue *vq, - dma_addr_t addr) -{ - if (!vq->use_map_api) - return 0; - - return dma_mapping_error(vring_dma_dev(vq), addr); -} - static void virtqueue_init(struct vring_virtqueue *vq, u32 num) { vq->vq.num_free =3D num; @@ -453,11 +470,12 @@ static unsigned int vring_unmap_one_split(const struc= t vring_virtqueue *vq, } else if (!vring_need_unmap_buffer(vq, extra)) goto out; =20 - dma_unmap_page(vring_dma_dev(vq), - extra->addr, - extra->len, - (flags & VRING_DESC_F_WRITE) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); + virtqueue_unmap_page_attrs(&vq->vq, + extra->addr, + extra->len, + (flags & VRING_DESC_F_WRITE) ? + DMA_FROM_DEVICE : DMA_TO_DEVICE, + 0); =20 out: return extra->next; @@ -1271,10 +1289,11 @@ static void vring_unmap_extra_packed(const struct v= ring_virtqueue *vq, } else if (!vring_need_unmap_buffer(vq, extra)) return; =20 - dma_unmap_page(vring_dma_dev(vq), - extra->addr, extra->len, - (flags & VRING_DESC_F_WRITE) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); + virtqueue_unmap_page_attrs(&vq->vq, + extra->addr, extra->len, + (flags & VRING_DESC_F_WRITE) ? + DMA_FROM_DEVICE : DMA_TO_DEVICE, + 0); } =20 static struct vring_packed_desc *alloc_indirect_packed(unsigned int total_= sg, @@ -2434,8 +2453,7 @@ EXPORT_SYMBOL_GPL(virtqueue_add_inbuf_premapped); struct device *virtqueue_dma_dev(struct virtqueue *_vq) { struct vring_virtqueue *vq =3D to_vvq(_vq); - - if (vq->use_map_api) + if (vq->use_map_api && !_vq->vdev->map) return vq->mapping_token.dma_dev; else return NULL; @@ -3125,6 +3143,107 @@ const struct vring *virtqueue_get_vring(const struc= t virtqueue *vq) } EXPORT_SYMBOL_GPL(virtqueue_get_vring); =20 +/** + * virtqueue_map_alloc_coherent - alloc coherent mapping + * @vdev: the virtio device we are talking to + * @mapping_token: device specific mapping token + * @size: the size of the buffer + * @map_handle: the pointer to the mapped address + * @gfp: allocation flag (GFP_XXX) + * + * return virtual address or NULL on error + */ +void *virtqueue_map_alloc_coherent(struct virtio_device *vdev, + union vring_mapping_token *mapping_token, + size_t size, dma_addr_t *map_handle, + gfp_t gfp) +{ + if (vdev->map) + return vdev->map->alloc(mapping_token->token, size, + map_handle, gfp); + else + return dma_alloc_coherent(mapping_token->dma_dev, size, + map_handle, gfp); +} +EXPORT_SYMBOL_GPL(virtqueue_map_alloc_coherent); + +/** + * virtqueue_map_free_coherent - free coherent mapping + * @vdev: the virtio device we are talking to + * @token: device specific mapping token + * @size: the size of the buffer + * @map_handle: the mapped address that needs to be freed + * + */ +void virtqueue_map_free_coherent(struct virtio_device *vdev, + union vring_mapping_token *mapping_token, size_t size, void *vaddr, + dma_addr_t map_handle) +{ + if (vdev->map) + vdev->map->free(mapping_token->token, size, vaddr, + map_handle, 0); + else + dma_free_coherent(mapping_token->dma_dev, size, vaddr, map_handle); +} +EXPORT_SYMBOL_GPL(virtqueue_map_free_coherent); + +/** + * virtqueue_map_page_attrs - map a page to the device + * @_vq: the virtqueue we are talking to + * @page: the page that will be mapped by the device + * @offset: the offset in the page for a buffer + * @size: the buffer size + * @dir: mapping direction + * @attrs: mapping attributes + * + * Returns mapped address. Caller should check that by virtqueue_mapping_e= rror(). + */ +dma_addr_t virtqueue_map_page_attrs(const struct virtqueue *_vq, + struct page *page, + unsigned long offset, + size_t size, + enum dma_data_direction dir, + unsigned long attrs) +{ + const struct vring_virtqueue *vq =3D to_vvq(_vq); + struct virtio_device *vdev =3D _vq->vdev; + + if (vdev->map) + return vdev->map->map_page(vring_mapping_token(vq), + page, offset, size, + dir, attrs); + + return dma_map_page_attrs(vring_dma_dev(vq), + page, offset, size, + dir, attrs); +} +EXPORT_SYMBOL_GPL(virtqueue_map_page_attrs); + +/** + * virtqueue_unmap_page_attrs - map a page to the device + * @_vq: the virtqueue we are talking to + * @map_handle: the mapped address + * @size: the buffer size + * @dir: mapping direction + * @attrs: unmapping attributes + */ +void virtqueue_unmap_page_attrs(const struct virtqueue *_vq, + dma_addr_t map_handle, + size_t size, enum dma_data_direction dir, + unsigned long attrs) +{ + const struct vring_virtqueue *vq =3D to_vvq(_vq); + struct virtio_device *vdev =3D _vq->vdev; + + if (vdev->map) + vdev->map->unmap_page(vring_mapping_token(vq), map_handle, + size, dir, attrs); + else + dma_unmap_page_attrs(vring_dma_dev(vq), map_handle, + size, dir, attrs); +} +EXPORT_SYMBOL_GPL(virtqueue_unmap_page_attrs); + /** * virtqueue_map_single_attrs - map DMA for _vq * @_vq: the struct virtqueue we're talking about. @@ -3136,7 +3255,7 @@ EXPORT_SYMBOL_GPL(virtqueue_get_vring); * The caller calls this to do dma mapping in advance. The DMA address can= be * passed to this _vq when it is in pre-mapped mode. * - * return DMA address. Caller should check that by virtqueue_mapping_error= (). + * return mapped address. Caller should check that by virtqueue_mapping_er= ror(). */ dma_addr_t virtqueue_map_single_attrs(const struct virtqueue *_vq, void *p= tr, size_t size, @@ -3155,8 +3274,8 @@ 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), - offset_in_page(ptr), size, dir, attrs); + return virtqueue_map_page_attrs(&vq->vq, virt_to_page(ptr), + offset_in_page(ptr), size, dir, attrs); } EXPORT_SYMBOL_GPL(virtqueue_map_single_attrs); =20 @@ -3181,12 +3300,12 @@ void virtqueue_unmap_single_attrs(const struct virt= queue *_vq, if (!vq->use_map_api) return; =20 - dma_unmap_page_attrs(vring_dma_dev(vq), addr, size, dir, attrs); + virtqueue_unmap_page_attrs(_vq, addr, size, dir, attrs); } EXPORT_SYMBOL_GPL(virtqueue_unmap_single_attrs); =20 /** - * virtqueue_map_mapping_error - check dma address + * virtqueue_mapping_error - check dma address * @_vq: the struct virtqueue we're talking about. * @addr: DMA address * @@ -3196,10 +3315,7 @@ int virtqueue_map_mapping_error(const struct virtque= ue *_vq, dma_addr_t addr) { const struct vring_virtqueue *vq =3D to_vvq(_vq); =20 - if (!vq->use_map_api) - return 0; - - return dma_mapping_error(vring_dma_dev(vq), addr); + return vring_mapping_error(vq, addr); } EXPORT_SYMBOL_GPL(virtqueue_map_mapping_error); =20 @@ -3216,11 +3332,15 @@ EXPORT_SYMBOL_GPL(virtqueue_map_mapping_error); bool virtqueue_map_need_sync(const struct virtqueue *_vq, dma_addr_t addr) { const struct vring_virtqueue *vq =3D to_vvq(_vq); + struct virtio_device *vdev =3D _vq->vdev; =20 if (!vq->use_map_api) return false; =20 - return dma_need_sync(vring_dma_dev(vq), addr); + if (vdev->map) + return vdev->map->need_sync(vring_mapping_token(vq), addr); + else + return dma_need_sync(vring_dma_dev(vq), addr); } EXPORT_SYMBOL_GPL(virtqueue_map_need_sync); =20 @@ -3242,12 +3362,17 @@ void virtqueue_map_sync_single_range_for_cpu(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 virtio_device *vdev =3D _vq->vdev; =20 if (!vq->use_map_api) return; =20 - dma_sync_single_range_for_cpu(dev, addr, offset, size, dir); + if (vdev->map) + vdev->map->sync_single_for_cpu(vring_mapping_token(vq), + addr + offset, size, dir); + else + dma_sync_single_range_for_cpu(vring_dma_dev(vq), + addr, offset, size, dir); } EXPORT_SYMBOL_GPL(virtqueue_map_sync_single_range_for_cpu); =20 @@ -3268,12 +3393,18 @@ void virtqueue_map_sync_single_range_for_device(con= st 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 virtio_device *vdev =3D _vq->vdev; =20 if (!vq->use_map_api) return; =20 - dma_sync_single_range_for_device(dev, addr, offset, size, dir); + if (vdev->map) + vdev->map->sync_single_for_device(vring_mapping_token(vq), + addr + offset, + size, dir); + else + dma_sync_single_range_for_device(vring_dma_dev(vq), addr, + offset, size, dir); } EXPORT_SYMBOL_GPL(virtqueue_map_sync_single_range_for_device); =20 diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 37029df94aaf..e1973c7b1d1c 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -44,7 +44,7 @@ union vring_mapping_token { /* Device that performs DMA */ struct device *dma_dev; /* Transport specific token used for doing map */ - void *opaque; + void *token; }; =20 int virtqueue_add_outbuf(struct virtqueue *vq, @@ -165,6 +165,7 @@ struct virtio_device { struct virtio_device_id id; const struct virtio_config_ops *config; const struct vringh_config_ops *vringh_config; + const struct virtio_map_ops *map; struct list_head vqs; u64 features; void *priv; @@ -266,6 +267,29 @@ void unregister_virtio_driver(struct virtio_driver *dr= v); module_driver(__virtio_driver, register_virtio_driver, \ unregister_virtio_driver) =20 + +void *virtqueue_map_alloc_coherent(struct virtio_device *vdev, + union vring_mapping_token *mapping_token, + size_t size, dma_addr_t *dma_handle, + gfp_t gfp); + +void virtqueue_map_free_coherent(struct virtio_device *vdev, + union vring_mapping_token *mapping_token, + size_t size, void *vaddr, + dma_addr_t dma_handle); + +dma_addr_t virtqueue_map_page_attrs(const struct virtqueue *_vq, + struct page *page, + unsigned long offset, + size_t size, + enum dma_data_direction dir, + unsigned long attrs); + +void virtqueue_unmap_page_attrs(const struct virtqueue *_vq, + dma_addr_t dma_handle, + size_t size, enum dma_data_direction dir, + unsigned long attrs); + dma_addr_t virtqueue_map_single_attrs(const struct virtqueue *_vq, void *p= tr, size_t size, enum dma_data_direction dir, unsigned long attrs); void virtqueue_unmap_single_attrs(const struct virtqueue *_vq, dma_addr_t = addr, diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h index b3e1d30c765b..784ce56197c4 100644 --- a/include/linux/virtio_config.h +++ b/include/linux/virtio_config.h @@ -133,6 +133,78 @@ struct virtio_config_ops { int (*enable_vq_after_reset)(struct virtqueue *vq); }; =20 +/** + * struct virtio_map_ops - operations for mapping buffer for a virtio devi= ce + * Note: For transport that has its own mapping logic it must + * implements all of the operations + * @map_page: map a buffer to the device + * token: device specific mapping token + * page: the page that will be mapped by the device + * offset: the offset in the page for a buffer + * size: the buffer size + * dir: mapping direction + * attrs: mapping attributes + * Returns: the mapped address + * @unmap_page: unmap a buffer from the device + * token: device specific mapping token + * map_handle: the mapped address + * size: the buffer size + * dir: mapping direction + * attrs: unmapping attributes + * @sync_single_for_cpu: sync a single buffer from device to cpu + * token: device specific mapping token + * map_handle: the mapping address to sync + * size: the size of the buffer + * dir: synchronization direction + * @sync_single_for_device: sync a single buffer from cpu to device + * token: device specific mapping token + * map_handle: the mapping address to sync + * size: the size of the buffer + * dir: synchronization direction + * @alloc: alloc a coherent buffer mapping + * token: device specific mapping token + * size: the size of the buffer + * map_handle: the mapping address to sync + * gfp: allocation flag (GFP_XXX) + * Returns: virtual address of the allocated buffer + * @free: free a coherent buffer mapping + * token: device specific mapping token + * size: the size of the buffer + * vaddr: virtual address of the buffer + * map_handle: the mapping address to sync + * attrs: unmapping attributes + * @need_sync: if the buffer needs synchronization + * token: device specific mapping token + * map_handle: the mapped address + * Returns: whether the buffer needs synchronization + * @mapping_error: if the mapping address is error + * token: device specific mapping token + * map_handle: the mapped address + * @max_mapping_size: get the maximum buffer size that can be mapped + * token: device specific mapping token + * Returns: the maximum buffer size that can be mapped + */ +struct virtio_map_ops { + dma_addr_t (*map_page)(void *token, struct page *page, + unsigned long offset, size_t size, + enum dma_data_direction dir, unsigned long attrs); + void (*unmap_page)(void *token, dma_addr_t map_handle, + size_t size, enum dma_data_direction dir, + unsigned long attrs); + void (*sync_single_for_cpu)(void *token, dma_addr_t map_handle, + size_t size, enum dma_data_direction dir); + void (*sync_single_for_device)(void *token, + dma_addr_t map_handle, size_t size, + enum dma_data_direction dir); + void *(*alloc)(void *token, size_t size, + dma_addr_t *map_handle, gfp_t gfp); + void (*free)(void *token, size_t size, void *vaddr, + dma_addr_t map_handle, unsigned long attrs); + bool (*need_sync)(void *token, dma_addr_t map_handle); + int (*mapping_error)(void *token, dma_addr_t map_handle); + size_t (*max_mapping_size)(void *token); +}; + /* If driver didn't advertise the feature, it will never appear. */ void virtio_check_driver_offered_feature(const struct virtio_device *vdev, unsigned int fbit); --=20 2.31.1 From nobody Sat Oct 4 21:00:55 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 E8BAE2D1901 for ; Wed, 13 Aug 2025 05:49:17 +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=1755064160; cv=none; b=scOdqdNgG34RggAWmvC5PTPqN0qHBWoAj5oeQJM8zMxCgW7XKG0bYdEqtfPZu0TSkrpr9fEXMRd1liFGkI53qPLRuXKkFgqduJJFywvXAhgrGq1nMpDRUBs6zy5cmijLefETXVFreISzNBLMPeFMsDnp97hHiBMYdjzXJZznvJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064160; c=relaxed/simple; bh=CYrqaNGEzOHnFmQWGjkuzFbpWTcRQhA/HjOJJhA9+bQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k+SJUJOzAzY5RrPN7SA7Vmpxg80rULAW50soOeRdk5I4nhYSW6J6MqGur0AyZG7SCzgJ7PrzhE16xNYId4CQeOtS1dGvuKjg6mK/l3Ngndyc7nx7GAUjt7TrTEM1ruOvgel3zoFSUXH4CwSbjpPRYmkPTOmSmT5OJtTxJ+OXJiU= 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=WRkrTl9C; 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="WRkrTl9C" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064156; 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=iSsWI97iPEadgwqnjWiViOIg94GNOxiNFwrIJTSLjuQ=; b=WRkrTl9CAoltSFjTgYa1zwVZcahVAx6vhVn3DNl4FCa7mCcAbKSp+yP8BR+Y6JSBHrAdZj C0HgAyBIzEyjBIWbHz+9TpsWOFRQMqFpjGEn9D8xzKCXfYPX1yO4t8Otkf79SOFcnX0/zq QGzsBgi5l6WCsh6dalA2P2hYDWd9IZs= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-333-pXBP8BHpMwecWe3wo9Z1Bw-1; Wed, 13 Aug 2025 01:49:15 -0400 X-MC-Unique: pXBP8BHpMwecWe3wo9Z1Bw-1 X-Mimecast-MFC-AGG-ID: pXBP8BHpMwecWe3wo9Z1Bw_1755064154 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 57F53180035F; Wed, 13 Aug 2025 05:49:14 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5F5601800280; Wed, 13 Aug 2025 05:49:09 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org Subject: [PATCH V5 7/9] vdpa: support mapping token Date: Wed, 13 Aug 2025 13:48:29 +0800 Message-ID: <20250813054831.25865-8-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" Virtio core switches from DMA device to mapping token, let's do that as well for vDPA. Signed-off-by: Jason Wang Acked-by: Eugenio P=C3=A9rez --- drivers/vdpa/alibaba/eni_vdpa.c | 2 +- drivers/vdpa/ifcvf/ifcvf_main.c | 2 +- drivers/vdpa/mlx5/core/mr.c | 4 ++-- drivers/vdpa/mlx5/net/mlx5_vnet.c | 13 ++++++++----- drivers/vdpa/octeon_ep/octep_vdpa_main.c | 2 +- drivers/vdpa/pds/vdpa_dev.c | 2 +- drivers/vdpa/solidrun/snet_main.c | 4 ++-- drivers/vdpa/vdpa.c | 2 +- drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- drivers/vdpa/virtio_pci/vp_vdpa.c | 2 +- drivers/vhost/vdpa.c | 8 ++++++-- drivers/virtio/virtio_vdpa.c | 11 +++++------ include/linux/vdpa.h | 15 ++++++++------- 14 files changed, 39 insertions(+), 32 deletions(-) diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdp= a.c index ad7f3447fe90..cbec3fcffaef 100644 --- a/drivers/vdpa/alibaba/eni_vdpa.c +++ b/drivers/vdpa/alibaba/eni_vdpa.c @@ -496,7 +496,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const s= truct pci_device_id *id) pci_set_master(pdev); pci_set_drvdata(pdev, eni_vdpa); =20 - eni_vdpa->vdpa.dma_dev =3D &pdev->dev; + eni_vdpa->vdpa.mapping_token.dma_dev =3D &pdev->dev; eni_vdpa->queues =3D eni_vdpa_get_num_queues(eni_vdpa); =20 eni_vdpa->vring =3D devm_kcalloc(&pdev->dev, eni_vdpa->queues, diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_mai= n.c index ccf64d7bbfaa..520a7d4db435 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -713,7 +713,7 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mde= v, const char *name, =20 ifcvf_mgmt_dev->adapter =3D adapter; adapter->pdev =3D pdev; - adapter->vdpa.dma_dev =3D &pdev->dev; + adapter->vdpa.mapping_token.dma_dev =3D &pdev->dev; adapter->vdpa.mdev =3D mdev; adapter->vf =3D vf; vdpa_dev =3D &adapter->vdpa; diff --git a/drivers/vdpa/mlx5/core/mr.c b/drivers/vdpa/mlx5/core/mr.c index c7a20278bc3c..b4806324afa0 100644 --- a/drivers/vdpa/mlx5/core/mr.c +++ b/drivers/vdpa/mlx5/core/mr.c @@ -378,7 +378,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, s= truct mlx5_vdpa_direct_mr u64 pa, offset; u64 paend; struct scatterlist *sg; - struct device *dma =3D mvdev->vdev.dma_dev; + struct device *dma =3D mvdev->vdev.mapping_token.dma_dev; =20 for (map =3D vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1); map; map =3D vhost_iotlb_itree_next(map, mr->start, mr->end - 1)) { @@ -432,7 +432,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, s= truct mlx5_vdpa_direct_mr =20 static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_= direct_mr *mr) { - struct device *dma =3D mvdev->vdev.dma_dev; + struct device *dma =3D mvdev->vdev.mapping_token.dma_dev; =20 destroy_direct_mr(mvdev, mr); dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0); diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index 0ed2fc28e1ce..4a1a8b0a0123 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -3395,14 +3395,17 @@ static int mlx5_vdpa_reset_map(struct vdpa_device *= vdev, unsigned int asid) return err; } =20 -static struct device *mlx5_get_vq_dma_dev(struct vdpa_device *vdev, u16 id= x) +static union vring_mapping_token mlx5_get_vq_mapping_token(struct vdpa_dev= ice *vdev, u16 idx) { struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); + union vring_mapping_token mapping_token; =20 if (is_ctrl_vq_idx(mvdev, idx)) - return &vdev->dev; + mapping_token.dma_dev =3D &vdev->dev; + else + mapping_token.dma_dev =3D mvdev->vdev.mapping_token.dma_dev; =20 - return mvdev->vdev.dma_dev; + return mapping_token; } =20 static void free_irqs(struct mlx5_vdpa_net *ndev) @@ -3686,7 +3689,7 @@ static const struct vdpa_config_ops mlx5_vdpa_ops =3D= { .set_map =3D mlx5_vdpa_set_map, .reset_map =3D mlx5_vdpa_reset_map, .set_group_asid =3D mlx5_set_group_asid, - .get_vq_dma_dev =3D mlx5_get_vq_dma_dev, + .get_vq_mapping_token =3D mlx5_get_vq_mapping_token, .free =3D mlx5_vdpa_free, .suspend =3D mlx5_vdpa_suspend, .resume =3D mlx5_vdpa_resume, /* Op disabled if not supported. */ @@ -3965,7 +3968,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_= mdev, const char *name, } =20 ndev->mvdev.mlx_features =3D device_features; - mvdev->vdev.dma_dev =3D &mdev->pdev->dev; + mvdev->vdev.mapping_token.dma_dev =3D &mdev->pdev->dev; err =3D mlx5_vdpa_alloc_resources(&ndev->mvdev); if (err) goto err_alloc; diff --git a/drivers/vdpa/octeon_ep/octep_vdpa_main.c b/drivers/vdpa/octeon= _ep/octep_vdpa_main.c index 9b49efd24391..e229b421d194 100644 --- a/drivers/vdpa/octeon_ep/octep_vdpa_main.c +++ b/drivers/vdpa/octeon_ep/octep_vdpa_main.c @@ -516,7 +516,7 @@ static int octep_vdpa_dev_add(struct vdpa_mgmt_dev *mde= v, const char *name, } =20 oct_vdpa->pdev =3D pdev; - oct_vdpa->vdpa.dma_dev =3D &pdev->dev; + oct_vdpa->vdpa.mapping_token.dma_dev =3D &pdev->dev; oct_vdpa->vdpa.mdev =3D mdev; oct_vdpa->oct_hw =3D oct_hw; vdpa_dev =3D &oct_vdpa->vdpa; diff --git a/drivers/vdpa/pds/vdpa_dev.c b/drivers/vdpa/pds/vdpa_dev.c index 301d95e08596..c9da0e519d5c 100644 --- a/drivers/vdpa/pds/vdpa_dev.c +++ b/drivers/vdpa/pds/vdpa_dev.c @@ -643,7 +643,7 @@ static int pds_vdpa_dev_add(struct vdpa_mgmt_dev *mdev,= const char *name, =20 pdev =3D vdpa_aux->padev->vf_pdev; dma_dev =3D &pdev->dev; - pdsv->vdpa_dev.dma_dev =3D dma_dev; + pdsv->vdpa_dev.mapping_token.dma_dev =3D dma_dev; =20 status =3D pds_vdpa_get_status(&pdsv->vdpa_dev); if (status =3D=3D 0xff) { diff --git a/drivers/vdpa/solidrun/snet_main.c b/drivers/vdpa/solidrun/snet= _main.c index 55ec51c17ab3..d7b4eff77c95 100644 --- a/drivers/vdpa/solidrun/snet_main.c +++ b/drivers/vdpa/solidrun/snet_main.c @@ -1052,8 +1052,8 @@ static int snet_vdpa_probe_vf(struct pci_dev *pdev) */ snet_reserve_irq_idx(pf_irqs ? pdev_pf : pdev, snet); =20 - /*set DMA device*/ - snet->vdpa.dma_dev =3D &pdev->dev; + /* set map token */ + snet->vdpa.mapping_token.dma_dev =3D &pdev->dev; =20 /* Register VDPA device */ ret =3D vdpa_register_device(&snet->vdpa, snet->cfg->vq_num); diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 8a372b51c21a..0115ce04979c 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -151,7 +151,7 @@ static void vdpa_release_dev(struct device *d) * Driver should use vdpa_alloc_device() wrapper macro instead of * using this directly. * - * Return: Returns an error when parent/config/dma_dev is not set or fail = to get + * Return: Returns an error when parent/config/mapping_token is not set or= fail to get * ida. */ struct vdpa_device *__vdpa_alloc_device(struct device *parent, diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_= sim.c index c204fc8e471a..9a07063aaff7 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -272,7 +272,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr = *dev_attr, vringh_set_iotlb(&vdpasim->vqs[i].vring, &vdpasim->iommu[0], &vdpasim->iommu_lock); =20 - vdpasim->vdpa.dma_dev =3D dev; + vdpasim->vdpa.mapping_token.dma_dev =3D dev; =20 return vdpasim; =20 diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 04620bb77203..8e32b3db8608 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -2022,7 +2022,7 @@ static int vduse_dev_init_vdpa(struct vduse_dev *dev,= const char *name) return ret; } set_dma_ops(&vdev->vdpa.dev, &vduse_dev_dma_ops); - vdev->vdpa.dma_dev =3D &vdev->vdpa.dev; + vdev->vdpa.mapping_token.dma_dev =3D &vdev->vdpa.dev; vdev->vdpa.mdev =3D &vduse_mgmt->mgmt_dev; =20 return 0; diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp= _vdpa.c index 8787407f75b0..2cb0dbf1740e 100644 --- a/drivers/vdpa/virtio_pci/vp_vdpa.c +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c @@ -520,7 +520,7 @@ static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev= , const char *name, =20 vp_vdpa_mgtdev->vp_vdpa =3D vp_vdpa; =20 - vp_vdpa->vdpa.dma_dev =3D &pdev->dev; + vp_vdpa->vdpa.mapping_token.dma_dev =3D &pdev->dev; vp_vdpa->queues =3D vp_modern_get_num_queues(mdev); vp_vdpa->mdev =3D mdev; =20 diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index 5a49b5a6d496..3d4c44b3f2b7 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -1320,7 +1320,9 @@ static int vhost_vdpa_alloc_domain(struct vhost_vdpa = *v) { struct vdpa_device *vdpa =3D v->vdpa; const struct vdpa_config_ops *ops =3D vdpa->config; - struct device *dma_dev =3D vdpa_get_dma_dev(vdpa); + union vring_mapping_token *mapping_token =3D + vdpa_get_mapping_token(vdpa); + struct device *dma_dev =3D mapping_token->dma_dev; int ret; =20 /* Device want to do DMA by itself */ @@ -1355,7 +1357,9 @@ static int vhost_vdpa_alloc_domain(struct vhost_vdpa = *v) static void vhost_vdpa_free_domain(struct vhost_vdpa *v) { struct vdpa_device *vdpa =3D v->vdpa; - struct device *dma_dev =3D vdpa_get_dma_dev(vdpa); + union vring_mapping_token *mapping_token =3D + vdpa_get_mapping_token(vdpa); + struct device *dma_dev =3D mapping_token->dma_dev; =20 if (v->domain) { iommu_detach_device(v->domain, dma_dev); diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index acea98ab08ee..1a10024a8e4f 100644 --- a/drivers/virtio/virtio_vdpa.c +++ b/drivers/virtio/virtio_vdpa.c @@ -133,7 +133,6 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsign= ed int index, const char *name, bool ctx) { struct vdpa_device *vdpa =3D vd_get_vdpa(vdev); - struct device *dma_dev; const struct vdpa_config_ops *ops =3D vdpa->config; bool (*notify)(struct virtqueue *vq) =3D virtio_vdpa_notify; struct vdpa_callback cb; @@ -182,11 +181,11 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsi= gned int index, /* Create the vring */ align =3D ops->get_vq_align(vdpa); =20 - if (ops->get_vq_dma_dev) - dma_dev =3D ops->get_vq_dma_dev(vdpa, index); + if (ops->get_vq_mapping_token) + mapping_token =3D ops->get_vq_mapping_token(vdpa, index); else - dma_dev =3D vdpa_get_dma_dev(vdpa); - mapping_token.dma_dev =3D dma_dev; + mapping_token =3D *vdpa_get_mapping_token(vdpa); + vq =3D vring_create_virtqueue_map(index, max_num, align, vdev, true, may_reduce_num, ctx, notify, callback, name, &mapping_token); @@ -463,7 +462,7 @@ static int virtio_vdpa_probe(struct vdpa_device *vdpa) if (!vd_dev) return -ENOMEM; =20 - vd_dev->vdev.dev.parent =3D vdpa_get_dma_dev(vdpa); + vd_dev->vdev.dev.parent =3D vdpa_get_mapping_token(vdpa)->dma_dev; vd_dev->vdev.dev.release =3D virtio_vdpa_release_dev; vd_dev->vdev.config =3D &virtio_vdpa_config_ops; vd_dev->vdpa =3D vdpa; diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index 2e7a30fe6b92..f806f13ca260 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -70,7 +71,7 @@ struct vdpa_mgmt_dev; /** * struct vdpa_device - representation of a vDPA device * @dev: underlying device - * @dma_dev: the actual device that is performing DMA + * @mapping_token: the token passed to upper layer to be used for mapping * @driver_override: driver name to force a match; do not set directly, * because core frees it; use driver_set_override() to * set or clear it. @@ -87,7 +88,7 @@ struct vdpa_mgmt_dev; */ struct vdpa_device { struct device dev; - struct device *dma_dev; + union vring_mapping_token mapping_token; const char *driver_override; const struct vdpa_config_ops *config; struct rw_semaphore cf_lock; /* Protects get/set config */ @@ -352,11 +353,11 @@ struct vdpa_map_file { * @vdev: vdpa device * @asid: address space identifier * Returns integer: success (0) or error (< 0) - * @get_vq_dma_dev: Get the dma device for a specific + * @get_vq_mapping_token: Get the map token for a specific * virtqueue (optional) * @vdev: vdpa device * @idx: virtqueue index - * Returns pointer to structure device or error (NULL) + * Returns map token union error (NULL) * @bind_mm: Bind the device to a specific address space * so the vDPA framework can use VA when this * callback is implemented. (optional) @@ -436,7 +437,7 @@ struct vdpa_config_ops { int (*reset_map)(struct vdpa_device *vdev, unsigned int asid); int (*set_group_asid)(struct vdpa_device *vdev, unsigned int group, unsigned int asid); - struct device *(*get_vq_dma_dev)(struct vdpa_device *vdev, u16 idx); + union vring_mapping_token (*get_vq_mapping_token)(struct vdpa_device *vde= v, u16 idx); int (*bind_mm)(struct vdpa_device *vdev, struct mm_struct *mm); void (*unbind_mm)(struct vdpa_device *vdev); =20 @@ -520,9 +521,9 @@ static inline void vdpa_set_drvdata(struct vdpa_device = *vdev, void *data) dev_set_drvdata(&vdev->dev, data); } =20 -static inline struct device *vdpa_get_dma_dev(struct vdpa_device *vdev) +static inline union vring_mapping_token *vdpa_get_mapping_token(struct vdp= a_device *vdev) { - return vdev->dma_dev; + return &vdev->mapping_token; } =20 static inline int vdpa_reset(struct vdpa_device *vdev, u32 flags) --=20 2.31.1 From nobody Sat Oct 4 21:00:55 2025 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 BCD862D1F4A for ; Wed, 13 Aug 2025 05:49:24 +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=1755064166; cv=none; b=asJuFmZeIjuusEffZT+1MPTqogZ5L+L90yQiLb+Ftn6GwQ1abnZi44iFkIrlgz7LEVci7STNlf6kwVbbIg0BEuHKDwQyWctaWOo4aYiCmzpCl2Nn19bRs5PDb8MeNNla7GtEQaja9hLCWdgDkp2CbF5WwOJv7Ix/ZTG97KrMSGA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064166; c=relaxed/simple; bh=cE7ivMj9V02Cj5Qk81EJzx4q+SUy6j0AAF71NUCzb9U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fnUuZxYj+fbd1O3pw3MHWQeoBdiddEpXx1a34NdH1+bE8/41fABdhAmYJIbum5QnM/BVwnycbCax2z6xfkXk7LQlAzxGaKBCQ7jNrKanBnofkodEkQd/lsWOEnQKJrwTJ8gLvwHrnNcis7mALRW0u7KPBhUEo3rYR+fH05PjsRw= 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=WjX4Qb+P; 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="WjX4Qb+P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064163; 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=KrCph31Dj9FYN9+2Tn4R+nxwXGM+l19IOSezhR32ZbQ=; b=WjX4Qb+PeGAmlrCcP6Llf91arPo1vVcaHPbmRfY0Mp5yuPxj17lSvYXCqnExn4dBTobWLe jozbjWg9aCRl9GPo3b1beiS1lsw73FylGyNjs77gnHGA7L0Uj/HxG6OeDV6CY25xv8eb6S S3ViJysTKdWZKOSXlgpEPUmVfb4ULRg= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-638-n86RWQo2Nx6Ahgv-37sqgw-1; Wed, 13 Aug 2025 01:49:20 -0400 X-MC-Unique: n86RWQo2Nx6Ahgv-37sqgw-1 X-Mimecast-MFC-AGG-ID: n86RWQo2Nx6Ahgv-37sqgw_1755064159 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5C56318002C3; Wed, 13 Aug 2025 05:49:19 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 25C061800446; Wed, 13 Aug 2025 05:49:14 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org, Christoph Hellwig Subject: [PATCH V5 8/9] vdpa: introduce map ops Date: Wed, 13 Aug 2025 13:48:30 +0800 Message-ID: <20250813054831.25865-9-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" Virtio core allows the transport to provide device or transport specific mapping functions. This patch adds this support to vDPA. We can simply do this by allowing the vDPA parent to register a virtio_map_ops. Reviewed-by: Christoph Hellwig Signed-off-by: Jason Wang Reviewed-by: Eugenio P=C3=A9rez --- drivers/vdpa/alibaba/eni_vdpa.c | 3 ++- drivers/vdpa/ifcvf/ifcvf_main.c | 3 ++- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- drivers/vdpa/octeon_ep/octep_vdpa_main.c | 4 ++-- drivers/vdpa/pds/vdpa_dev.c | 3 ++- drivers/vdpa/solidrun/snet_main.c | 4 ++-- drivers/vdpa/vdpa.c | 3 +++ drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- drivers/vdpa/vdpa_user/vduse_dev.c | 3 ++- drivers/vdpa/virtio_pci/vp_vdpa.c | 3 ++- drivers/vhost/vdpa.c | 10 ++++++++++ drivers/virtio/virtio_vdpa.c | 4 +++- include/linux/vdpa.h | 10 +++++++--- 13 files changed, 39 insertions(+), 15 deletions(-) diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdp= a.c index cbec3fcffaef..a0420da37863 100644 --- a/drivers/vdpa/alibaba/eni_vdpa.c +++ b/drivers/vdpa/alibaba/eni_vdpa.c @@ -478,7 +478,8 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const s= truct pci_device_id *id) return ret; =20 eni_vdpa =3D vdpa_alloc_device(struct eni_vdpa, vdpa, - dev, &eni_vdpa_ops, 1, 1, NULL, false); + dev, &eni_vdpa_ops, NULL, + 1, 1, NULL, false); if (IS_ERR(eni_vdpa)) { ENI_ERR(pdev, "failed to allocate vDPA structure\n"); return PTR_ERR(eni_vdpa); diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_mai= n.c index 520a7d4db435..2fd8a9b20ac3 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -705,7 +705,8 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mde= v, const char *name, vf =3D &ifcvf_mgmt_dev->vf; pdev =3D vf->pdev; adapter =3D vdpa_alloc_device(struct ifcvf_adapter, vdpa, - &pdev->dev, &ifc_vdpa_ops, 1, 1, NULL, false); + &pdev->dev, &ifc_vdpa_ops, + NULL, 1, 1, NULL, false); if (IS_ERR(adapter)) { IFCVF_ERR(pdev, "Failed to allocate vDPA structure"); return PTR_ERR(adapter); diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index 4a1a8b0a0123..8a8cf6942998 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -3882,7 +3882,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_= mdev, const char *name, } =20 ndev =3D vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device= , &mgtdev->vdpa_ops, - MLX5_VDPA_NUMVQ_GROUPS, MLX5_VDPA_NUM_AS, name, false); + NULL, MLX5_VDPA_NUMVQ_GROUPS, MLX5_VDPA_NUM_AS, name, false); if (IS_ERR(ndev)) return PTR_ERR(ndev); =20 diff --git a/drivers/vdpa/octeon_ep/octep_vdpa_main.c b/drivers/vdpa/octeon= _ep/octep_vdpa_main.c index e229b421d194..3ef9c2fd8f57 100644 --- a/drivers/vdpa/octeon_ep/octep_vdpa_main.c +++ b/drivers/vdpa/octeon_ep/octep_vdpa_main.c @@ -508,8 +508,8 @@ static int octep_vdpa_dev_add(struct vdpa_mgmt_dev *mde= v, const char *name, u64 device_features; int ret; =20 - oct_vdpa =3D vdpa_alloc_device(struct octep_vdpa, vdpa, &pdev->dev, &octe= p_vdpa_ops, 1, 1, - NULL, false); + oct_vdpa =3D vdpa_alloc_device(struct octep_vdpa, vdpa, &pdev->dev, &octe= p_vdpa_ops, + NULL, 1, 1, NULL, false); if (IS_ERR(oct_vdpa)) { dev_err(&pdev->dev, "Failed to allocate vDPA structure for octep vdpa de= vice"); return PTR_ERR(oct_vdpa); diff --git a/drivers/vdpa/pds/vdpa_dev.c b/drivers/vdpa/pds/vdpa_dev.c index c9da0e519d5c..ed3e015c4668 100644 --- a/drivers/vdpa/pds/vdpa_dev.c +++ b/drivers/vdpa/pds/vdpa_dev.c @@ -632,7 +632,8 @@ static int pds_vdpa_dev_add(struct vdpa_mgmt_dev *mdev,= const char *name, } =20 pdsv =3D vdpa_alloc_device(struct pds_vdpa_device, vdpa_dev, - dev, &pds_vdpa_ops, 1, 1, name, false); + dev, &pds_vdpa_ops, NULL, + 1, 1, name, false); if (IS_ERR(pdsv)) { dev_err(dev, "Failed to allocate vDPA structure: %pe\n", pdsv); return PTR_ERR(pdsv); diff --git a/drivers/vdpa/solidrun/snet_main.c b/drivers/vdpa/solidrun/snet= _main.c index d7b4eff77c95..849d325cab31 100644 --- a/drivers/vdpa/solidrun/snet_main.c +++ b/drivers/vdpa/solidrun/snet_main.c @@ -1008,8 +1008,8 @@ static int snet_vdpa_probe_vf(struct pci_dev *pdev) } =20 /* Allocate vdpa device */ - snet =3D vdpa_alloc_device(struct snet, vdpa, &pdev->dev, &snet_config_op= s, 1, 1, NULL, - false); + snet =3D vdpa_alloc_device(struct snet, vdpa, &pdev->dev, &snet_config_op= s, + NULL, 1, 1, NULL, false); if (!snet) { SNET_ERR(pdev, "Failed to allocate a vdpa device\n"); ret =3D -ENOMEM; diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 0115ce04979c..8421c882f4d6 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -142,6 +142,7 @@ static void vdpa_release_dev(struct device *d) * initialized but before registered. * @parent: the parent device * @config: the bus operations that is supported by this device + * @map: the map opeartions that is supported by this device * @ngroups: number of groups supported by this device * @nas: number of address spaces supported by this device * @size: size of the parent structure that contains private data @@ -156,6 +157,7 @@ static void vdpa_release_dev(struct device *d) */ struct vdpa_device *__vdpa_alloc_device(struct device *parent, const struct vdpa_config_ops *config, + const struct virtio_map_ops *map, unsigned int ngroups, unsigned int nas, size_t size, const char *name, bool use_va) @@ -187,6 +189,7 @@ struct vdpa_device *__vdpa_alloc_device(struct device *= parent, vdev->dev.release =3D vdpa_release_dev; vdev->index =3D err; vdev->config =3D config; + vdev->map =3D map; vdev->features_valid =3D false; vdev->use_va =3D use_va; vdev->ngroups =3D ngroups; diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_= sim.c index 9a07063aaff7..fa288960d53f 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -215,7 +215,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr = *dev_attr, else ops =3D &vdpasim_config_ops; =20 - vdpa =3D __vdpa_alloc_device(NULL, ops, + vdpa =3D __vdpa_alloc_device(NULL, ops, NULL, dev_attr->ngroups, dev_attr->nas, dev_attr->alloc_size, dev_attr->name, use_va); diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index 8e32b3db8608..f161059d543e 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -2009,7 +2009,8 @@ static int vduse_dev_init_vdpa(struct vduse_dev *dev,= const char *name) return -EEXIST; =20 vdev =3D vdpa_alloc_device(struct vduse_vdpa, vdpa, dev->dev, - &vduse_vdpa_config_ops, 1, 1, name, true); + &vduse_vdpa_config_ops, NULL, + 1, 1, name, true); if (IS_ERR(vdev)) return PTR_ERR(vdev); =20 diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp= _vdpa.c index 2cb0dbf1740e..e908b2a37c92 100644 --- a/drivers/vdpa/virtio_pci/vp_vdpa.c +++ b/drivers/vdpa/virtio_pci/vp_vdpa.c @@ -511,7 +511,8 @@ static int vp_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev= , const char *name, int ret, i; =20 vp_vdpa =3D vdpa_alloc_device(struct vp_vdpa, vdpa, - dev, &vp_vdpa_ops, 1, 1, name, false); + dev, &vp_vdpa_ops, NULL, + 1, 1, name, false); =20 if (IS_ERR(vp_vdpa)) { dev_err(dev, "vp_vdpa: Failed to allocate vDPA structure\n"); diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index 3d4c44b3f2b7..147fdef02f06 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -1322,13 +1322,23 @@ static int vhost_vdpa_alloc_domain(struct vhost_vdp= a *v) const struct vdpa_config_ops *ops =3D vdpa->config; union vring_mapping_token *mapping_token =3D vdpa_get_mapping_token(vdpa); + const struct virtio_map_ops *map =3D vdpa->map; struct device *dma_dev =3D mapping_token->dma_dev; int ret; =20 + /* IOMMU domain only works for DMA device */ + if (vdpa->map) + return -EINVAL; + /* Device want to do DMA by itself */ if (ops->set_map || ops->dma_map) return 0; =20 + if (map) { + dev_warn(&v->dev, "Can't allocate a domian, device use vendor specific m= appings\n"); + return -EINVAL; + } + if (!device_iommu_capable(dma_dev, IOMMU_CAP_CACHE_COHERENCY)) { dev_warn_once(&v->dev, "Failed to allocate domain, device is not IOMMU cache coherent ca= pable\n"); diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c index 1a10024a8e4f..fddfcfabf28e 100644 --- a/drivers/virtio/virtio_vdpa.c +++ b/drivers/virtio/virtio_vdpa.c @@ -462,9 +462,11 @@ static int virtio_vdpa_probe(struct vdpa_device *vdpa) if (!vd_dev) return -ENOMEM; =20 - vd_dev->vdev.dev.parent =3D vdpa_get_mapping_token(vdpa)->dma_dev; + vd_dev->vdev.dev.parent =3D vdpa->map ? &vdpa->dev : + vdpa_get_mapping_token(vdpa)->dma_dev; vd_dev->vdev.dev.release =3D virtio_vdpa_release_dev; vd_dev->vdev.config =3D &virtio_vdpa_config_ops; + vd_dev->vdev.map =3D vdpa->map; vd_dev->vdpa =3D vdpa; =20 vd_dev->vdev.id.device =3D ops->get_device_id(vdpa); diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index f806f13ca260..d328ec1ab5ea 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -76,6 +76,7 @@ struct vdpa_mgmt_dev; * because core frees it; use driver_set_override() to * set or clear it. * @config: the configuration ops for this device. + * @map: the map ops for this device * @cf_lock: Protects get and set access to configuration layout. * @index: device index * @features_valid: were features initialized? for legacy guests @@ -91,6 +92,7 @@ struct vdpa_device { union vring_mapping_token mapping_token; const char *driver_override; const struct vdpa_config_ops *config; + const struct virtio_map_ops *map; struct rw_semaphore cf_lock; /* Protects get/set config */ unsigned int index; bool features_valid; @@ -447,6 +449,7 @@ struct vdpa_config_ops { =20 struct vdpa_device *__vdpa_alloc_device(struct device *parent, const struct vdpa_config_ops *config, + const struct virtio_map_ops *map, unsigned int ngroups, unsigned int nas, size_t size, const char *name, bool use_va); @@ -458,6 +461,7 @@ struct vdpa_device *__vdpa_alloc_device(struct device *= parent, * @member: the name of struct vdpa_device within the @dev_struct * @parent: the parent device * @config: the bus operations that is supported by this device + * @map: the map operations that is supported by this device * @ngroups: the number of virtqueue groups supported by this device * @nas: the number of address spaces * @name: name of the vdpa device @@ -465,10 +469,10 @@ struct vdpa_device *__vdpa_alloc_device(struct device= *parent, * * Return allocated data structure or ERR_PTR upon error */ -#define vdpa_alloc_device(dev_struct, member, parent, config, ngroups, nas= , \ - name, use_va) \ +#define vdpa_alloc_device(dev_struct, member, parent, config, map, \ + ngroups, nas, name, use_va) \ container_of((__vdpa_alloc_device( \ - parent, config, ngroups, nas, \ + parent, config, map, ngroups, nas, \ (sizeof(dev_struct) + \ BUILD_BUG_ON_ZERO(offsetof( \ dev_struct, member))), name, use_va)), \ --=20 2.31.1 From nobody Sat Oct 4 21:00:55 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 154122D2385 for ; Wed, 13 Aug 2025 05:49:27 +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=1755064169; cv=none; b=MLxDFvy+WypSeqmxsbmo067yuj+C975uN5SPGqL587zwb+EFC44VjLuEh7KCPOlrJH5v7dQKDQLAAZp9fHH/BobCQ6qCmPc0iIZdUmLiuEjr5lK11hX803hmNM6orTy6H04EvXvdxbKTPnip2cXj1g1d6qfVwhcxHbZ7QCy7YZA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755064169; c=relaxed/simple; bh=ct2P4Jylji6l95HatANo7+Nm1zSSO67jYR8EPb0kjMg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W+Tv59XE8lRMcH/WZL4UJ2U03NCuj8auyvGQjliSVPNUabTVDOFLoDfXi3h7Yq8rRbnnxxq/VTSVyUmDfoNmc9s+mOy8yjckaRbQQTpj959t2MRgaavHS71tuLDjYe4S4aFe4becSXpxbOpKmqs5Ke6gYBuehtHQaJB6fvfyJV4= 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=Gs04jd+o; 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="Gs04jd+o" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755064166; 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=MrnLAqNPP3MNN09OO/tPRCXaRUs0p44l+QLGU8ZWbJk=; b=Gs04jd+oBnfdtoEit/0FTB3U8eTEq9odnQJHiXGoyvMBHedFiAjKvirpPixZ9C67k7zSk5 Sacax/9bND2YH/wt7wqjULhA+iMAkkf6xgpRHAeLvVDw0/zrjJv0pv6uVyNCN1/89tsmXM qWw3X3IEhmGjkDpBuUm9o+r39GpNp2Y= 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-249-kSQY00JZNVishG9zl_7usg-1; Wed, 13 Aug 2025 01:49:25 -0400 X-MC-Unique: kSQY00JZNVishG9zl_7usg-1 X-Mimecast-MFC-AGG-ID: kSQY00JZNVishG9zl_7usg_1755064164 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4676A1956095; Wed, 13 Aug 2025 05:49:24 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.168]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 444581800280; Wed, 13 Aug 2025 05:49:19 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org Cc: hch@infradead.org Subject: [PATCH V5 9/9] vduse: switch to use virtio map API instead of DMA API Date: Wed, 13 Aug 2025 13:48:31 +0800 Message-ID: <20250813054831.25865-10-jasowang@redhat.com> In-Reply-To: <20250813054831.25865-1-jasowang@redhat.com> References: <20250813054831.25865-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.111 Content-Type: text/plain; charset="utf-8" Lacking the support of device specific mapping supported in virtio, VDUSE must trick the DMA API in order to make virtio-vdpa transport work. This is done by advertising vDPA device as dma device with a VDUSE specific dma_ops even if it doesn't do DMA at all. This will be fixed by this patch. Thanks to the new mapping operations support by virtio and vDPA. VDUSE can simply switch to advertise its specific mappings operations to virtio via virtio-vdpa then DMA API is not needed for VDUSE any more and iova domain could be used as the mapping token instead. Signed-off-by: Jason Wang --- drivers/vdpa/Kconfig | 8 +-- drivers/vdpa/vdpa_user/iova_domain.c | 2 +- drivers/vdpa/vdpa_user/iova_domain.h | 2 +- drivers/vdpa/vdpa_user/vduse_dev.c | 75 ++++++++++++++-------------- 4 files changed, 41 insertions(+), 46 deletions(-) diff --git a/drivers/vdpa/Kconfig b/drivers/vdpa/Kconfig index 559fb9d3271f..857cf288c876 100644 --- a/drivers/vdpa/Kconfig +++ b/drivers/vdpa/Kconfig @@ -34,13 +34,7 @@ config VDPA_SIM_BLOCK =20 config VDPA_USER tristate "VDUSE (vDPA Device in Userspace) support" - depends on EVENTFD && MMU && HAS_DMA - # - # This driver incorrectly tries to override the dma_ops. It should - # never have done that, but for now keep it working on architectures - # that use dma ops - # - depends on ARCH_HAS_DMA_OPS + depends on EVENTFD && MMU select VHOST_IOTLB select IOMMU_IOVA help diff --git a/drivers/vdpa/vdpa_user/iova_domain.c b/drivers/vdpa/vdpa_user/= iova_domain.c index 58116f89d8da..ccaed24b7ef8 100644 --- a/drivers/vdpa/vdpa_user/iova_domain.c +++ b/drivers/vdpa/vdpa_user/iova_domain.c @@ -447,7 +447,7 @@ void vduse_domain_unmap_page(struct vduse_iova_domain *= domain, =20 void *vduse_domain_alloc_coherent(struct vduse_iova_domain *domain, size_t size, dma_addr_t *dma_addr, - gfp_t flag, unsigned long attrs) + gfp_t flag) { struct iova_domain *iovad =3D &domain->consistent_iovad; unsigned long limit =3D domain->iova_limit; diff --git a/drivers/vdpa/vdpa_user/iova_domain.h b/drivers/vdpa/vdpa_user/= iova_domain.h index 7f3f0928ec78..1f3c30be272a 100644 --- a/drivers/vdpa/vdpa_user/iova_domain.h +++ b/drivers/vdpa/vdpa_user/iova_domain.h @@ -64,7 +64,7 @@ void vduse_domain_unmap_page(struct vduse_iova_domain *do= main, =20 void *vduse_domain_alloc_coherent(struct vduse_iova_domain *domain, size_t size, dma_addr_t *dma_addr, - gfp_t flag, unsigned long attrs); + gfp_t flag); =20 void vduse_domain_free_coherent(struct vduse_iova_domain *domain, size_t s= ize, void *vaddr, dma_addr_t dma_addr, diff --git a/drivers/vdpa/vdpa_user/vduse_dev.c b/drivers/vdpa/vdpa_user/vd= use_dev.c index f161059d543e..3260edefdf0d 100644 --- a/drivers/vdpa/vdpa_user/vduse_dev.c +++ b/drivers/vdpa/vdpa_user/vduse_dev.c @@ -88,6 +88,7 @@ struct vduse_dev { struct device *dev; struct vduse_virtqueue **vqs; struct vduse_iova_domain *domain; + struct vduse_iova_domain *dom; char *name; struct mutex lock; spinlock_t msg_lock; @@ -814,59 +815,53 @@ static const struct vdpa_config_ops vduse_vdpa_config= _ops =3D { .free =3D vduse_vdpa_free, }; =20 -static void vduse_dev_sync_single_for_device(struct device *dev, +static void vduse_dev_sync_single_for_device(void *token, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - struct vduse_dev *vdev =3D dev_to_vduse(dev); - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D token; =20 vduse_domain_sync_single_for_device(domain, dma_addr, size, dir); } =20 -static void vduse_dev_sync_single_for_cpu(struct device *dev, +static void vduse_dev_sync_single_for_cpu(void *token, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir) { - struct vduse_dev *vdev =3D dev_to_vduse(dev); - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D token; =20 vduse_domain_sync_single_for_cpu(domain, dma_addr, size, dir); } =20 -static dma_addr_t vduse_dev_map_page(struct device *dev, struct page *page, +static dma_addr_t vduse_dev_map_page(void *token, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct vduse_dev *vdev =3D dev_to_vduse(dev); - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D token; =20 return vduse_domain_map_page(domain, page, offset, size, dir, attrs); } =20 -static void vduse_dev_unmap_page(struct device *dev, dma_addr_t dma_addr, +static void vduse_dev_unmap_page(void *token, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir, unsigned long attrs) { - struct vduse_dev *vdev =3D dev_to_vduse(dev); - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D token; =20 return vduse_domain_unmap_page(domain, dma_addr, size, dir, attrs); } =20 -static void *vduse_dev_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_addr, gfp_t flag, - unsigned long attrs) +static void *vduse_dev_alloc_coherent(void *token, size_t size, + dma_addr_t *dma_addr, gfp_t flag) { - struct vduse_dev *vdev =3D dev_to_vduse(dev); - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D token; unsigned long iova; void *addr; =20 *dma_addr =3D DMA_MAPPING_ERROR; addr =3D vduse_domain_alloc_coherent(domain, size, - (dma_addr_t *)&iova, flag, attrs); + (dma_addr_t *)&iova, flag); if (!addr) return NULL; =20 @@ -875,31 +870,45 @@ static void *vduse_dev_alloc_coherent(struct device *= dev, size_t size, return addr; } =20 -static void vduse_dev_free_coherent(struct device *dev, size_t size, - void *vaddr, dma_addr_t dma_addr, - unsigned long attrs) +static void vduse_dev_free_coherent(void *token, size_t size, + void *vaddr, dma_addr_t dma_addr, + unsigned long attrs) { - struct vduse_dev *vdev =3D dev_to_vduse(dev); - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D token; =20 vduse_domain_free_coherent(domain, size, vaddr, dma_addr, attrs); } =20 -static size_t vduse_dev_max_mapping_size(struct device *dev) +static bool vduse_dev_need_sync(void *token, dma_addr_t dma_addr) { - struct vduse_dev *vdev =3D dev_to_vduse(dev); - struct vduse_iova_domain *domain =3D vdev->domain; + struct vduse_iova_domain *domain =3D token; + + return dma_addr < domain->bounce_size; +} + +static int vduse_dev_mapping_error(void *token, dma_addr_t dma_addr) +{ + if (unlikely(dma_addr =3D=3D DMA_MAPPING_ERROR)) + return -ENOMEM; + return 0; +} + +static size_t vduse_dev_max_mapping_size(void *token) +{ + struct vduse_iova_domain *domain =3D token; =20 return domain->bounce_size; } =20 -static const struct dma_map_ops vduse_dev_dma_ops =3D { +static const struct virtio_map_ops vduse_map_ops =3D { .sync_single_for_device =3D vduse_dev_sync_single_for_device, .sync_single_for_cpu =3D vduse_dev_sync_single_for_cpu, .map_page =3D vduse_dev_map_page, .unmap_page =3D vduse_dev_unmap_page, .alloc =3D vduse_dev_alloc_coherent, .free =3D vduse_dev_free_coherent, + .need_sync =3D vduse_dev_need_sync, + .mapping_error =3D vduse_dev_mapping_error, .max_mapping_size =3D vduse_dev_max_mapping_size, }; =20 @@ -2003,27 +2012,18 @@ static struct vduse_mgmt_dev *vduse_mgmt; static int vduse_dev_init_vdpa(struct vduse_dev *dev, const char *name) { struct vduse_vdpa *vdev; - int ret; =20 if (dev->vdev) return -EEXIST; =20 vdev =3D vdpa_alloc_device(struct vduse_vdpa, vdpa, dev->dev, - &vduse_vdpa_config_ops, NULL, + &vduse_vdpa_config_ops, &vduse_map_ops, 1, 1, name, true); if (IS_ERR(vdev)) return PTR_ERR(vdev); =20 dev->vdev =3D vdev; vdev->dev =3D dev; - vdev->vdpa.dev.dma_mask =3D &vdev->vdpa.dev.coherent_dma_mask; - ret =3D dma_set_mask_and_coherent(&vdev->vdpa.dev, DMA_BIT_MASK(64)); - if (ret) { - put_device(&vdev->vdpa.dev); - return ret; - } - set_dma_ops(&vdev->vdpa.dev, &vduse_dev_dma_ops); - vdev->vdpa.mapping_token.dma_dev =3D &vdev->vdpa.dev; vdev->vdpa.mdev =3D &vduse_mgmt->mgmt_dev; =20 return 0; @@ -2056,6 +2056,7 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, c= onst char *name, return -ENOMEM; } =20 + dev->vdev->vdpa.mapping_token.token =3D dev->domain; ret =3D _vdpa_register_device(&dev->vdev->vdpa, dev->vq_num); if (ret) { put_device(&dev->vdev->vdpa.dev); --=20 2.31.1