github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dma-buf: Rename dma_buf_move_notify() to dma_buf_invalidate_mappings()

Browse Source 
Along with renaming the .move_notify() callback, rename the corresponding
dma-buf core function. This makes the expected behavior clear to exporters
calling this function.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20260124-dmabuf-revoke-v5-2-f98fca917e96@nvidia.com
Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Leon Romanovsky 2026-01-24 21:14:14 +02:00 committed by Christian König
parent ef246da8e6
commit 95308225e5
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma-buf/dma-buf.c
View File

@ -981,7 +981,7 @@ dma_buf_pin_on_map(struct dma_buf_attachment *attach)
* 3. Exporters must hold the dma-buf reservation lock when calling these * 3. Exporters must hold the dma-buf reservation lock when calling these
* functions: * functions:
* *
* - dma_buf_move_notify() * - dma_buf_invalidate_mappings()
*/ */
/** /**
@ -1323,14 +1323,14 @@ void dma_buf_unmap_attachment_unlocked(struct dma_buf_attachment *attach,
EXPORT_SYMBOL_NS_GPL(dma_buf_unmap_attachment_unlocked, "DMA_BUF"); EXPORT_SYMBOL_NS_GPL(dma_buf_unmap_attachment_unlocked, "DMA_BUF");
/** /**
* dma_buf_move_notify - notify attachments that DMA-buf is moving * dma_buf_invalidate_mappings - notify attachments that DMA-buf is moving
* *
* @dmabuf: [in] buffer which is moving * @dmabuf: [in] buffer which is moving
* *
* Informs all attachments that they need to destroy and recreate all their * Informs all attachments that they need to destroy and recreate all their
* mappings. * mappings.
*/ */
void dma_buf_move_notify(struct dma_buf *dmabuf) void dma_buf_invalidate_mappings(struct dma_buf *dmabuf)
{ {
struct dma_buf_attachment *attach; struct dma_buf_attachment *attach;
@ -1340,7 +1340,7 @@ void dma_buf_move_notify(struct dma_buf *dmabuf)
if (attach->importer_ops) if (attach->importer_ops)
attach->importer_ops->invalidate_mappings(attach); attach->importer_ops->invalidate_mappings(attach);
} }
EXPORT_SYMBOL_NS_GPL(dma_buf_move_notify, "DMA_BUF"); EXPORT_SYMBOL_NS_GPL(dma_buf_invalidate_mappings, "DMA_BUF");
/** /**
* DOC: cpu access * DOC: cpu access

2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
View File

@ -1270,7 +1270,7 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,
if (abo->tbo.base.dma_buf && !drm_gem_is_imported(&abo->tbo.base) && if (abo->tbo.base.dma_buf && !drm_gem_is_imported(&abo->tbo.base) &&
old_mem && old_mem->mem_type != TTM_PL_SYSTEM) old_mem && old_mem->mem_type != TTM_PL_SYSTEM)
dma_buf_move_notify(abo->tbo.base.dma_buf); dma_buf_invalidate_mappings(abo->tbo.base.dma_buf);
/* move_notify is called before move happens */ /* move_notify is called before move happens */
trace_amdgpu_bo_move(abo, new_mem ? new_mem->mem_type : -1, trace_amdgpu_bo_move(abo, new_mem ? new_mem->mem_type : -1,

2
drivers/gpu/drm/xe/xe_bo.c
View File

@ -819,7 +819,7 @@ static int xe_bo_move_notify(struct xe_bo *bo,
/* Don't call move_notify() for imported dma-bufs. */ /* Don't call move_notify() for imported dma-bufs. */
if (ttm_bo->base.dma_buf && !ttm_bo->base.import_attach) if (ttm_bo->base.dma_buf && !ttm_bo->base.import_attach)
dma_buf_move_notify(ttm_bo->base.dma_buf); dma_buf_invalidate_mappings(ttm_bo->base.dma_buf);
/* /*
* TTM has already nuked the mmap for us (see ttm_bo_unmap_virtual), * TTM has already nuked the mmap for us (see ttm_bo_unmap_virtual),

2
drivers/iommu/iommufd/selftest.c
View File

@ -2073,7 +2073,7 @@ static int iommufd_test_dmabuf_revoke(struct iommufd_ucmd *ucmd, int fd,
priv = dmabuf->priv; priv = dmabuf->priv;
dma_resv_lock(dmabuf->resv, NULL); dma_resv_lock(dmabuf->resv, NULL);
priv->revoked = revoked; priv->revoked = revoked;
dma_buf_move_notify(dmabuf); dma_buf_invalidate_mappings(dmabuf);
dma_resv_unlock(dmabuf->resv); dma_resv_unlock(dmabuf->resv);
err_put: err_put:

4
drivers/vfio/pci/vfio_pci_dmabuf.c
View File

@ -320,7 +320,7 @@ void vfio_pci_dma_buf_move(struct vfio_pci_core_device *vdev, bool revoked)
if (priv->revoked != revoked) { if (priv->revoked != revoked) {
dma_resv_lock(priv->dmabuf->resv, NULL); dma_resv_lock(priv->dmabuf->resv, NULL);
priv->revoked = revoked; priv->revoked = revoked;
dma_buf_move_notify(priv->dmabuf); dma_buf_invalidate_mappings(priv->dmabuf);
dma_resv_unlock(priv->dmabuf->resv); dma_resv_unlock(priv->dmabuf->resv);
} }
fput(priv->dmabuf->file); fput(priv->dmabuf->file);
@ -341,7 +341,7 @@ void vfio_pci_dma_buf_cleanup(struct vfio_pci_core_device *vdev)
list_del_init(&priv->dmabufs_elm); list_del_init(&priv->dmabufs_elm);
priv->vdev = NULL; priv->vdev = NULL;
priv->revoked = true; priv->revoked = true;
dma_buf_move_notify(priv->dmabuf); dma_buf_invalidate_mappings(priv->dmabuf);
dma_resv_unlock(priv->dmabuf->resv); dma_resv_unlock(priv->dmabuf->resv);
vfio_device_put_registration(&vdev->vdev); vfio_device_put_registration(&vdev->vdev);
fput(priv->dmabuf->file); fput(priv->dmabuf->file);

2
include/linux/dma-buf.h
View File

@ -588,7 +588,7 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *,
enum dma_data_direction); enum dma_data_direction);
void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *, void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *,
enum dma_data_direction); enum dma_data_direction);
void dma_buf_move_notify(struct dma_buf *dma_buf); void dma_buf_invalidate_mappings(struct dma_buf *dma_buf);
int dma_buf_begin_cpu_access(struct dma_buf *dma_buf, int dma_buf_begin_cpu_access(struct dma_buf *dma_buf,
enum dma_data_direction dir); enum dma_data_direction dir);
int dma_buf_end_cpu_access(struct dma_buf *dma_buf, int dma_buf_end_cpu_access(struct dma_buf *dma_buf,