Skip to content

Commit

Permalink
iommufd/iova_bitmap: Move symbols to IOMMUFD namespace
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jpemartins authored and jgunthorpe committed Oct 24, 2023
1 parent 8c9c727 commit 13578d4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/iommu/iommufd/iova_bitmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ struct iova_bitmap *iova_bitmap_alloc(unsigned long iova, size_t length,
iova_bitmap_free(bitmap);
return ERR_PTR(rc);
}
EXPORT_SYMBOL_GPL(iova_bitmap_alloc);
EXPORT_SYMBOL_NS_GPL(iova_bitmap_alloc, IOMMUFD);

/**
* iova_bitmap_free() - Frees an IOVA bitmap object
Expand All @@ -290,7 +290,7 @@ void iova_bitmap_free(struct iova_bitmap *bitmap)

kfree(bitmap);
}
EXPORT_SYMBOL_GPL(iova_bitmap_free);
EXPORT_SYMBOL_NS_GPL(iova_bitmap_free, IOMMUFD);

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

return ret;
}
EXPORT_SYMBOL_GPL(iova_bitmap_for_each);
EXPORT_SYMBOL_NS_GPL(iova_bitmap_for_each, IOMMUFD);

/**
* iova_bitmap_set() - Records an IOVA range in bitmap
Expand Down Expand Up @@ -423,4 +423,4 @@ void iova_bitmap_set(struct iova_bitmap *bitmap,
cur_bit += nbits;
} while (cur_bit <= last_bit);
}
EXPORT_SYMBOL_GPL(iova_bitmap_set);
EXPORT_SYMBOL_NS_GPL(iova_bitmap_set, IOMMUFD);
1 change: 1 addition & 0 deletions drivers/vfio/pci/mlx5/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1376,6 +1376,7 @@ static struct pci_driver mlx5vf_pci_driver = {

module_pci_driver(mlx5vf_pci_driver);

MODULE_IMPORT_NS(IOMMUFD);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Max Gurtovoy <mgurtovoy@nvidia.com>");
MODULE_AUTHOR("Yishai Hadas <yishaih@nvidia.com>");
Expand Down
1 change: 1 addition & 0 deletions drivers/vfio/pci/pds/pci_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ static struct pci_driver pds_vfio_pci_driver = {

module_pci_driver(pds_vfio_pci_driver);

MODULE_IMPORT_NS(IOMMUFD);
MODULE_DESCRIPTION(PDS_VFIO_DRV_DESCRIPTION);
MODULE_AUTHOR("Brett Creeley <brett.creeley@amd.com>");
MODULE_LICENSE("GPL");
1 change: 1 addition & 0 deletions drivers/vfio/vfio_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,7 @@ static void __exit vfio_cleanup(void)
module_init(vfio_init);
module_exit(vfio_cleanup);

MODULE_IMPORT_NS(IOMMUFD);
MODULE_VERSION(DRIVER_VERSION);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR(DRIVER_AUTHOR);
Expand Down

0 comments on commit 13578d4

Please sign in to comment.