Skip to content

Commit 13578d4

Browse files
jpemartinsjgunthorpe
authored andcommitted
iommufd/iova_bitmap: Move symbols to IOMMUFD namespace
Have the IOVA bitmap exported symbols adhere to the IOMMUFD symbol export convention i.e. using the IOMMUFD namespace. In doing so, import the namespace in the current users. This means VFIO and the vfio-pci drivers that use iova_bitmap_set(). Link: https://lore.kernel.org/r/20231024135109.73787-4-joao.m.martins@oracle.com Suggested-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Joao Martins <joao.m.martins@oracle.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Reviewed-by: Brett Creeley <brett.creeley@amd.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Reviewed-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
1 parent 8c9c727 commit 13578d4

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

drivers/iommu/iommufd/iova_bitmap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ struct iova_bitmap *iova_bitmap_alloc(unsigned long iova, size_t length,
268268
iova_bitmap_free(bitmap);
269269
return ERR_PTR(rc);
270270
}
271-
EXPORT_SYMBOL_GPL(iova_bitmap_alloc);
271+
EXPORT_SYMBOL_NS_GPL(iova_bitmap_alloc, IOMMUFD);
272272

273273
/**
274274
* iova_bitmap_free() - Frees an IOVA bitmap object
@@ -290,7 +290,7 @@ void iova_bitmap_free(struct iova_bitmap *bitmap)
290290

291291
kfree(bitmap);
292292
}
293-
EXPORT_SYMBOL_GPL(iova_bitmap_free);
293+
EXPORT_SYMBOL_NS_GPL(iova_bitmap_free, IOMMUFD);
294294

295295
/*
296296
* Returns the remaining bitmap indexes from mapped_total_index to process for
@@ -389,7 +389,7 @@ int iova_bitmap_for_each(struct iova_bitmap *bitmap, void *opaque,
389389

390390
return ret;
391391
}
392-
EXPORT_SYMBOL_GPL(iova_bitmap_for_each);
392+
EXPORT_SYMBOL_NS_GPL(iova_bitmap_for_each, IOMMUFD);
393393

394394
/**
395395
* iova_bitmap_set() - Records an IOVA range in bitmap
@@ -423,4 +423,4 @@ void iova_bitmap_set(struct iova_bitmap *bitmap,
423423
cur_bit += nbits;
424424
} while (cur_bit <= last_bit);
425425
}
426-
EXPORT_SYMBOL_GPL(iova_bitmap_set);
426+
EXPORT_SYMBOL_NS_GPL(iova_bitmap_set, IOMMUFD);

drivers/vfio/pci/mlx5/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,6 +1376,7 @@ static struct pci_driver mlx5vf_pci_driver = {
13761376

13771377
module_pci_driver(mlx5vf_pci_driver);
13781378

1379+
MODULE_IMPORT_NS(IOMMUFD);
13791380
MODULE_LICENSE("GPL");
13801381
MODULE_AUTHOR("Max Gurtovoy <mgurtovoy@nvidia.com>");
13811382
MODULE_AUTHOR("Yishai Hadas <yishaih@nvidia.com>");

drivers/vfio/pci/pds/pci_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ static struct pci_driver pds_vfio_pci_driver = {
204204

205205
module_pci_driver(pds_vfio_pci_driver);
206206

207+
MODULE_IMPORT_NS(IOMMUFD);
207208
MODULE_DESCRIPTION(PDS_VFIO_DRV_DESCRIPTION);
208209
MODULE_AUTHOR("Brett Creeley <brett.creeley@amd.com>");
209210
MODULE_LICENSE("GPL");

drivers/vfio/vfio_main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,6 +1693,7 @@ static void __exit vfio_cleanup(void)
16931693
module_init(vfio_init);
16941694
module_exit(vfio_cleanup);
16951695

1696+
MODULE_IMPORT_NS(IOMMUFD);
16961697
MODULE_VERSION(DRIVER_VERSION);
16971698
MODULE_LICENSE("GPL v2");
16981699
MODULE_AUTHOR(DRIVER_AUTHOR);

0 commit comments

Comments
 (0)