From nobody Sat Oct 4 03:00:38 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 564C82E973C for ; Thu, 21 Aug 2025 06:47:43 +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=1755758866; cv=none; b=WdvQC5EYVEbNJooKul3fiyq7nLnS/sMePUNOWSy56ucqCD8XUUjezJrFNfzgUTZcvdlC7pXcYPi/e+YcGDZl2+Kwxd9DFzNeJ2wxWwF/tfnuaTm6iu+5JcQRjFnVIlIb2GtUdYlNd4Zn5g02aeaV9fhNidxTYsIFJx/54gmigP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755758866; c=relaxed/simple; bh=PDP4P6egeTsLOsOIBrQaxizLcnHSslKALgzjPJ8e7pI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B/oX5bC5t4sMsleBFlsmtaUcwIg8mLjNMSGLZ1ZEbC9KJpxQaomojV04vfO0W+gHGypky6mGksyHv6R2jg23ibNGQNC7hPEKWK4UOgXMNL+mGFVj9NmZMkGWca3E4vRvMuuHJ6SRhp6EzvLhMliHy/mTwIeYj31LZbzpBz3SlTA= 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=OloQnnHw; 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="OloQnnHw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755758862; 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=RwpyGkWAskbA+Dijkjg5QtB7nD9ItvN5eC1PMLuQA1A=; b=OloQnnHw9HHedCKkZo6onN71EjnWVM3h/Txh7fi9nQdnM4DatI5h6rNV0anTqtWTf8n+EO /q/zGHmwXIVhF3/i4UHBu+fxJT/jhxo9uTPfteILcEfw3f9JvzT0RO1zM9m2uq8zgDESvn rT6y37figKYjqUXgQjAr005g5FGV+UM= 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-423-RE6AsPFSOVOhh4C48R5J4Q-1; Thu, 21 Aug 2025 02:47:38 -0400 X-MC-Unique: RE6AsPFSOVOhh4C48R5J4Q-1 X-Mimecast-MFC-AGG-ID: RE6AsPFSOVOhh4C48R5J4Q_1755758856 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 C773A19560B3; Thu, 21 Aug 2025 06:47:36 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.130]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EF13B19560B0; Thu, 21 Aug 2025 06:47:32 +0000 (UTC) From: Jason Wang To: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, hch@infradead.org Subject: [PATCH V6 7/9] vdpa: support virtio_map Date: Thu, 21 Aug 2025 14:46:39 +0800 Message-ID: <20250821064641.5025-8-jasowang@redhat.com> In-Reply-To: <20250821064641.5025-1-jasowang@redhat.com> References: <20250821064641.5025-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.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" Virtio core switches from DMA device to virtio_map, let's do that as well for vDPA. Signed-off-by: Jason Wang --- 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 | 6 ++++-- drivers/virtio/virtio_vdpa.c | 11 +++++------ include/linux/vdpa.h | 15 ++++++++------- 14 files changed, 37 insertions(+), 32 deletions(-) diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdp= a.c index ad7f3447fe90..54aea086d08c 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.vmap.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..979d188d74ee 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.vmap.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..8870a7169267 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.vmap.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.vmap.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..a7e76f175914 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 virtio_map mlx5_get_vq_map(struct vdpa_device *vdev, u16 idx) { struct mlx5_vdpa_dev *mvdev =3D to_mvdev(vdev); + union virtio_map map; =20 if (is_ctrl_vq_idx(mvdev, idx)) - return &vdev->dev; + map.dma_dev =3D &vdev->dev; + else + map.dma_dev =3D mvdev->vdev.vmap.dma_dev; =20 - return mvdev->vdev.dma_dev; + return map; } =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_map =3D mlx5_get_vq_map, .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.vmap.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..5818dae133a3 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.vmap.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..63d82263fb52 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.vmap.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..39050aab147f 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 metadata */ + snet->vdpa.vmap.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..c71debeb8471 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/map is not set or fail to g= et * 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..22ee53538444 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.vmap.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..f68ed569394c 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.vmap.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..242641c0f2bd 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.vmap.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 af1e1fdfd9ed..05a481e4c385 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -1318,7 +1318,8 @@ 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 virtio_map map =3D vdpa_get_map(vdpa); + struct device *dma_dev =3D map.dma_dev; int ret; =20 /* Device want to do DMA by itself */ @@ -1353,7 +1354,8 @@ 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 virtio_map map =3D vdpa_get_map(vdpa); + struct device *dma_dev =3D map.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 d4be689e3626..8b27c6e8eebb 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_map) + map =3D ops->get_vq_map(vdpa, index); else - dma_dev =3D vdpa_get_dma_dev(vdpa); - map.dma_dev =3D dma_dev; + map =3D vdpa_get_map(vdpa); + vq =3D vring_create_virtqueue_map(index, max_num, align, vdev, true, may_reduce_num, ctx, notify, callback, name, map); @@ -467,7 +466,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_map(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..ae0451945851 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 + * @vmap: the metadata 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 virtio_map vmap; 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_map: Get the map metadata 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 virtio_map (*get_vq_map)(struct vdpa_device *vdev, 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 virtio_map vdpa_get_map(struct vdpa_device *vdev) { - return vdev->dma_dev; + return vdev->vmap; } =20 static inline int vdpa_reset(struct vdpa_device *vdev, u32 flags) --=20 2.31.1