Commit b703b31e authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Alex Williamson
Browse files

types: reuse common phys_vec type instead of DMABUF open‑coded variant 



After commit fcf463b9 ("types: move phys_vec definition to common header"),
we can use the shared phys_vec type instead of the DMABUF‑specific
dma_buf_phys_vec, which duplicated the same structure and semantics.

Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20260107-convert-to-pvec-v1-1-6e3ab8079708@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex@shazbot.org>
parent fcf463b9

drivers/dma-buf/dma-buf-mapping.c

+3 −3
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ static struct scatterlist *fill_sg_entry(struct scatterlist *sgl, size_t length, 
}



static unsigned int calc_sg_nents(struct dma_iova_state *state,

				  struct dma_buf_phys_vec *phys_vec,

				  size_t nr_ranges, size_t size)

				  struct phys_vec *phys_vec, size_t nr_ranges,

				  size_t size)

{

	unsigned int nents = 0;

	size_t i;
@@ -91,7 +91,7 @@ struct dma_buf_dma { 
 */

struct sg_table *dma_buf_phys_vec_to_sgt(struct dma_buf_attachment *attach,

					 struct p2pdma_provider *provider,

					 struct dma_buf_phys_vec *phys_vec,

					 struct phys_vec *phys_vec,

					 size_t nr_ranges, size_t size,

					 enum dma_data_direction dir)

{

drivers/iommu/iommufd/io_pagetable.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ struct iopt_pages_dmabuf_track { 


struct iopt_pages_dmabuf {

	struct dma_buf_attachment *attach;

	struct dma_buf_phys_vec phys;

	struct phys_vec phys;

	/* Always PAGE_SIZE aligned */

	unsigned long start;

	struct list_head tracker;

drivers/iommu/iommufd/iommufd_private.h

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ struct iommu_group; 
struct iommu_option;

struct iommufd_device;

struct dma_buf_attachment;

struct dma_buf_phys_vec;



struct iommufd_sw_msi_map {

	struct list_head sw_msi_item;
@@ -718,7 +717,7 @@ int __init iommufd_test_init(void); 
void iommufd_test_exit(void);

bool iommufd_selftest_is_mock_dev(struct device *dev);

int iommufd_test_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,

				     struct dma_buf_phys_vec *phys);

				     struct phys_vec *phys);

#else

static inline void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd,

						 unsigned int ioas_id,
@@ -742,7 +741,7 @@ static inline bool iommufd_selftest_is_mock_dev(struct device *dev) 
}

static inline int

iommufd_test_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,

				 struct dma_buf_phys_vec *phys)

				 struct phys_vec *phys)

{

	return -EOPNOTSUPP;

}

drivers/iommu/iommufd/pages.c

+2 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ static int pfn_reader_user_update_pinned(struct pfn_reader_user *user, 
}



struct pfn_reader_dmabuf {

	struct dma_buf_phys_vec phys;

	struct phys_vec phys;

	unsigned long start_offset;

};
@@ -1460,7 +1460,7 @@ static struct dma_buf_attach_ops iopt_dmabuf_attach_revoke_ops = { 
 */

static int

sym_vfio_pci_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,

				 struct dma_buf_phys_vec *phys)

				 struct phys_vec *phys)

{

	typeof(&vfio_pci_dma_buf_iommufd_map) fn;

	int rc;

drivers/iommu/iommufd/selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -2002,7 +2002,7 @@ static const struct dma_buf_ops iommufd_test_dmabuf_ops = { 
};



int iommufd_test_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,

				     struct dma_buf_phys_vec *phys)

				     struct phys_vec *phys)

{

	struct iommufd_test_dma_buf *priv = attachment->dmabuf->priv;