Skip to content

Commit b703b31

Browse files
rleonawilliam
rleon
authored and
awilliam
committed
types: reuse common phys_vec type instead of DMABUF open‑coded variant
After commit fcf463b ("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: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Link: https://lore.kernel.org/r/20260107-convert-to-pvec-v1-1-6e3ab8079708@nvidia.com Signed-off-by: Alex Williamson <alex@shazbot.org>
1 parent fcf463b commit b703b31

10 files changed

Lines changed: 21 additions & 33 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ static struct scatterlist *fill_sg_entry(struct scatterlist *sgl, size_t length,
3333
}
3434

3535
static unsigned int calc_sg_nents(struct dma_iova_state *state,
36-
struct dma_buf_phys_vec *phys_vec,
37-
size_t nr_ranges, size_t size)
36+
struct phys_vec *phys_vec, size_t nr_ranges,
37+
size_t size)
3838
{
3939
unsigned int nents = 0;
4040
size_t i;
@@ -91,7 +91,7 @@ struct dma_buf_dma {
9191
*/
9292
struct sg_table *dma_buf_phys_vec_to_sgt(struct dma_buf_attachment *attach,
9393
struct p2pdma_provider *provider,
94-
struct dma_buf_phys_vec *phys_vec,
94+
struct phys_vec *phys_vec,
9595
size_t nr_ranges, size_t size,
9696
enum dma_data_direction dir)
9797
{

‎drivers/iommu/iommufd/io_pagetable.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ struct iopt_pages_dmabuf_track {
202202

203203
struct iopt_pages_dmabuf {
204204
struct dma_buf_attachment *attach;
205-
struct dma_buf_phys_vec phys;
205+
struct phys_vec phys;
206206
/* Always PAGE_SIZE aligned */
207207
unsigned long start;
208208
struct list_head tracker;

‎drivers/iommu/iommufd/iommufd_private.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ struct iommu_group;
2020
struct iommu_option;
2121
struct iommufd_device;
2222
struct dma_buf_attachment;
23-
struct dma_buf_phys_vec;
2423

2524
struct iommufd_sw_msi_map {
2625
struct list_head sw_msi_item;
@@ -718,7 +717,7 @@ int __init iommufd_test_init(void);
718717
void iommufd_test_exit(void);
719718
bool iommufd_selftest_is_mock_dev(struct device *dev);
720719
int iommufd_test_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,
721-
struct dma_buf_phys_vec *phys);
720+
struct phys_vec *phys);
722721
#else
723722
static inline void iommufd_test_syz_conv_iova_id(struct iommufd_ucmd *ucmd,
724723
unsigned int ioas_id,
@@ -742,7 +741,7 @@ static inline bool iommufd_selftest_is_mock_dev(struct device *dev)
742741
}
743742
static inline int
744743
iommufd_test_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,
745-
struct dma_buf_phys_vec *phys)
744+
struct phys_vec *phys)
746745
{
747746
return -EOPNOTSUPP;
748747
}

‎drivers/iommu/iommufd/pages.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ static int pfn_reader_user_update_pinned(struct pfn_reader_user *user,
10771077
}
10781078

10791079
struct pfn_reader_dmabuf {
1080-
struct dma_buf_phys_vec phys;
1080+
struct phys_vec phys;
10811081
unsigned long start_offset;
10821082
};
10831083

@@ -1460,7 +1460,7 @@ static struct dma_buf_attach_ops iopt_dmabuf_attach_revoke_ops = {
14601460
*/
14611461
static int
14621462
sym_vfio_pci_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,
1463-
struct dma_buf_phys_vec *phys)
1463+
struct phys_vec *phys)
14641464
{
14651465
typeof(&vfio_pci_dma_buf_iommufd_map) fn;
14661466
int rc;

‎drivers/iommu/iommufd/selftest.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2002,7 +2002,7 @@ static const struct dma_buf_ops iommufd_test_dmabuf_ops = {
20022002
};
20032003

20042004
int iommufd_test_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,
2005-
struct dma_buf_phys_vec *phys)
2005+
struct phys_vec *phys)
20062006
{
20072007
struct iommufd_test_dma_buf *priv = attachment->dmabuf->priv;
20082008

‎drivers/vfio/pci/nvgrace-gpu/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ nvgrace_gpu_write(struct vfio_device *core_vdev,
784784
static int nvgrace_get_dmabuf_phys(struct vfio_pci_core_device *core_vdev,
785785
struct p2pdma_provider **provider,
786786
unsigned int region_index,
787-
struct dma_buf_phys_vec *phys_vec,
787+
struct phys_vec *phys_vec,
788788
struct vfio_region_dma_range *dma_ranges,
789789
size_t nr_ranges)
790790
{

‎drivers/vfio/pci/vfio_pci_dmabuf.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct vfio_pci_dma_buf {
1414
struct vfio_pci_core_device *vdev;
1515
struct list_head dmabufs_elm;
1616
size_t size;
17-
struct dma_buf_phys_vec *phys_vec;
17+
struct phys_vec *phys_vec;
1818
struct p2pdma_provider *provider;
1919
u32 nr_ranges;
2020
u8 revoked : 1;
@@ -94,7 +94,7 @@ static const struct dma_buf_ops vfio_pci_dmabuf_ops = {
9494
* will fail if it is currently revoked
9595
*/
9696
int vfio_pci_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,
97-
struct dma_buf_phys_vec *phys)
97+
struct phys_vec *phys)
9898
{
9999
struct vfio_pci_dma_buf *priv;
100100

@@ -116,7 +116,7 @@ int vfio_pci_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,
116116
}
117117
EXPORT_SYMBOL_FOR_MODULES(vfio_pci_dma_buf_iommufd_map, "iommufd");
118118

119-
int vfio_pci_core_fill_phys_vec(struct dma_buf_phys_vec *phys_vec,
119+
int vfio_pci_core_fill_phys_vec(struct phys_vec *phys_vec,
120120
struct vfio_region_dma_range *dma_ranges,
121121
size_t nr_ranges, phys_addr_t start,
122122
phys_addr_t len)
@@ -148,7 +148,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_fill_phys_vec);
148148
int vfio_pci_core_get_dmabuf_phys(struct vfio_pci_core_device *vdev,
149149
struct p2pdma_provider **provider,
150150
unsigned int region_index,
151-
struct dma_buf_phys_vec *phys_vec,
151+
struct phys_vec *phys_vec,
152152
struct vfio_region_dma_range *dma_ranges,
153153
size_t nr_ranges)
154154
{

‎include/linux/dma-buf-mapping.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
struct sg_table *dma_buf_phys_vec_to_sgt(struct dma_buf_attachment *attach,
1111
struct p2pdma_provider *provider,
12-
struct dma_buf_phys_vec *phys_vec,
12+
struct phys_vec *phys_vec,
1313
size_t nr_ranges, size_t size,
1414
enum dma_data_direction dir);
1515
void dma_buf_free_sgt(struct dma_buf_attachment *attach, struct sg_table *sgt,

‎include/linux/dma-buf.h‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -531,16 +531,6 @@ struct dma_buf_export_info {
531531
void *priv;
532532
};
533533

534-
/**
535-
* struct dma_buf_phys_vec - describe continuous chunk of memory
536-
* @paddr: physical address of that chunk
537-
* @len: Length of this chunk
538-
*/
539-
struct dma_buf_phys_vec {
540-
phys_addr_t paddr;
541-
size_t len;
542-
};
543-
544534
/**
545535
* DEFINE_DMA_BUF_EXPORT_INFO - helper macro for exporters
546536
* @name: export-info name

‎include/linux/vfio_pci_core.h‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
struct vfio_pci_core_device;
2929
struct vfio_pci_region;
3030
struct p2pdma_provider;
31-
struct dma_buf_phys_vec;
3231
struct dma_buf_attachment;
3332

3433
struct vfio_pci_eventfd {
@@ -62,25 +61,25 @@ struct vfio_pci_device_ops {
6261
int (*get_dmabuf_phys)(struct vfio_pci_core_device *vdev,
6362
struct p2pdma_provider **provider,
6463
unsigned int region_index,
65-
struct dma_buf_phys_vec *phys_vec,
64+
struct phys_vec *phys_vec,
6665
struct vfio_region_dma_range *dma_ranges,
6766
size_t nr_ranges);
6867
};
6968

7069
#if IS_ENABLED(CONFIG_VFIO_PCI_DMABUF)
71-
int vfio_pci_core_fill_phys_vec(struct dma_buf_phys_vec *phys_vec,
70+
int vfio_pci_core_fill_phys_vec(struct phys_vec *phys_vec,
7271
struct vfio_region_dma_range *dma_ranges,
7372
size_t nr_ranges, phys_addr_t start,
7473
phys_addr_t len);
7574
int vfio_pci_core_get_dmabuf_phys(struct vfio_pci_core_device *vdev,
7675
struct p2pdma_provider **provider,
7776
unsigned int region_index,
78-
struct dma_buf_phys_vec *phys_vec,
77+
struct phys_vec *phys_vec,
7978
struct vfio_region_dma_range *dma_ranges,
8079
size_t nr_ranges);
8180
#else
8281
static inline int
83-
vfio_pci_core_fill_phys_vec(struct dma_buf_phys_vec *phys_vec,
82+
vfio_pci_core_fill_phys_vec(struct phys_vec *phys_vec,
8483
struct vfio_region_dma_range *dma_ranges,
8584
size_t nr_ranges, phys_addr_t start,
8685
phys_addr_t len)
@@ -89,7 +88,7 @@ vfio_pci_core_fill_phys_vec(struct dma_buf_phys_vec *phys_vec,
8988
}
9089
static inline int vfio_pci_core_get_dmabuf_phys(
9190
struct vfio_pci_core_device *vdev, struct p2pdma_provider **provider,
92-
unsigned int region_index, struct dma_buf_phys_vec *phys_vec,
91+
unsigned int region_index, struct phys_vec *phys_vec,
9392
struct vfio_region_dma_range *dma_ranges, size_t nr_ranges)
9493
{
9594
return -EOPNOTSUPP;
@@ -228,6 +227,6 @@ static inline bool is_aligned_for_order(struct vm_area_struct *vma,
228227
}
229228

230229
int vfio_pci_dma_buf_iommufd_map(struct dma_buf_attachment *attachment,
231-
struct dma_buf_phys_vec *phys);
230+
struct phys_vec *phys);
232231

233232
#endif /* VFIO_PCI_CORE_H */

0 commit comments

Comments
 (0)