On 1/24/26 20:14, Leon Romanovsky wrote: > From: Leon Romanovsky <[email protected]> > > 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 <[email protected]>
Reviewed-by: Christian König <[email protected]> > --- > drivers/dma-buf/dma-buf.c | 8 ++++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- > drivers/gpu/drm/xe/xe_bo.c | 2 +- > drivers/iommu/iommufd/selftest.c | 2 +- > drivers/vfio/pci/vfio_pci_dmabuf.c | 4 ++-- > include/linux/dma-buf.h | 2 +- > 6 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c > index 59cc647bf40e..e12db540c413 100644 > --- a/drivers/dma-buf/dma-buf.c > +++ b/drivers/dma-buf/dma-buf.c > @@ -912,7 +912,7 @@ dma_buf_pin_on_map(struct dma_buf_attachment *attach) > * 3. Exporters must hold the dma-buf reservation lock when calling these > * functions: > * > - * - dma_buf_move_notify() > + * - dma_buf_invalidate_mappings() > */ > > /** > @@ -1247,14 +1247,14 @@ void dma_buf_unmap_attachment_unlocked(struct > dma_buf_attachment *attach, > 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 > * > * Informs all attachments that they need to destroy and recreate all their > * mappings. > */ > -void dma_buf_move_notify(struct dma_buf *dmabuf) > +void dma_buf_invalidate_mappings(struct dma_buf *dmabuf) > { > struct dma_buf_attachment *attach; > > @@ -1264,7 +1264,7 @@ void dma_buf_move_notify(struct dma_buf *dmabuf) > if (attach->importer_ops) > 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 > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > index e08f58de4b17..f73dc99d1887 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > @@ -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) && > 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 */ > trace_amdgpu_bo_move(abo, new_mem ? new_mem->mem_type : -1, > diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c > index bf4ee976b680..7d02cd9a8501 100644 > --- a/drivers/gpu/drm/xe/xe_bo.c > +++ b/drivers/gpu/drm/xe/xe_bo.c > @@ -819,7 +819,7 @@ static int xe_bo_move_notify(struct xe_bo *bo, > > /* Don't call move_notify() for imported dma-bufs. */ > 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), > diff --git a/drivers/iommu/iommufd/selftest.c > b/drivers/iommu/iommufd/selftest.c > index 550ff36dec3a..f60cbd5328cc 100644 > --- a/drivers/iommu/iommufd/selftest.c > +++ b/drivers/iommu/iommufd/selftest.c > @@ -2081,7 +2081,7 @@ static int iommufd_test_dmabuf_revoke(struct > iommufd_ucmd *ucmd, int fd, > priv = dmabuf->priv; > dma_resv_lock(dmabuf->resv, NULL); > priv->revoked = revoked; > - dma_buf_move_notify(dmabuf); > + dma_buf_invalidate_mappings(dmabuf); > dma_resv_unlock(dmabuf->resv); > > err_put: > diff --git a/drivers/vfio/pci/vfio_pci_dmabuf.c > b/drivers/vfio/pci/vfio_pci_dmabuf.c > index 4be4a85005cb..d8ceafabef48 100644 > --- a/drivers/vfio/pci/vfio_pci_dmabuf.c > +++ b/drivers/vfio/pci/vfio_pci_dmabuf.c > @@ -332,7 +332,7 @@ void vfio_pci_dma_buf_move(struct vfio_pci_core_device > *vdev, bool revoked) > if (priv->revoked != revoked) { > dma_resv_lock(priv->dmabuf->resv, NULL); > priv->revoked = revoked; > - dma_buf_move_notify(priv->dmabuf); > + dma_buf_invalidate_mappings(priv->dmabuf); > dma_resv_unlock(priv->dmabuf->resv); > } > fput(priv->dmabuf->file); > @@ -353,7 +353,7 @@ void vfio_pci_dma_buf_cleanup(struct vfio_pci_core_device > *vdev) > list_del_init(&priv->dmabufs_elm); > priv->vdev = NULL; > priv->revoked = true; > - dma_buf_move_notify(priv->dmabuf); > + dma_buf_invalidate_mappings(priv->dmabuf); > dma_resv_unlock(priv->dmabuf->resv); > vfio_device_put_registration(&vdev->vdev); > fput(priv->dmabuf->file); > diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h > index 1b397635c793..d5c3ce2b3aa4 100644 > --- a/include/linux/dma-buf.h > +++ b/include/linux/dma-buf.h > @@ -600,7 +600,7 @@ struct sg_table *dma_buf_map_attachment(struct > dma_buf_attachment *, > enum dma_data_direction); > void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *, > 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, > enum dma_data_direction dir); > int dma_buf_end_cpu_access(struct dma_buf *dma_buf, >
