Re: [PATCH v3 04/12] drm/ttm: s/FLAG_SG/FLAG_EXTERNAL/

Am 15.09.21 um 20:59 schrieb Matthew Auld:

It covers more than just ttm_bo_type_sg usage, like with say dma-buf, since one other user is userptr in amdgpu, and in the future we might have some more. Hence EXTERNAL is likely a more suitable name.

Suggested-by: Christian König christian.koenig@amd.com Signed-off-by: Matthew Auld matthew.auld@intel.com Cc: Thomas Hellström thomas.hellstrom@linux.intel.com Cc: Christian König christian.koenig@amd.com

---

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 10 +++++----- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 ++-- drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++++---- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- drivers/gpu/drm/ttm/ttm_tt.c | 10 +++++----- include/drm/ttm/ttm_tt.h | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index c5fa6e62f6ca..a6d606f91dfd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -894,7 +894,7 @@ static int amdgpu_ttm_backend_bind(struct ttm_device *bdev, DRM_ERROR("failed to pin userptr\n"); return r; }

• } else if (ttm->page_flags & TTM_PAGE_FLAG_SG) {

• } else if (ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL) { if (!ttm->sg) { struct dma_buf_attachment *attach; struct sg_table *sgt;

@@ -1147,7 +1147,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_device *bdev, return 0; }

• if (ttm->page_flags & TTM_PAGE_FLAG_SG)

• if (ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL) return 0;

  ret = ttm_pool_alloc(&adev->mman.bdev.pool, ttm, ctx);

@@ -1179,7 +1179,7 @@ static void amdgpu_ttm_tt_unpopulate(struct ttm_device *bdev, return; }

• if (ttm->page_flags & TTM_PAGE_FLAG_SG)

• if (ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL) return;

  adev = amdgpu_ttm_adev(bdev);

@@ -1210,8 +1210,8 @@ int amdgpu_ttm_tt_set_userptr(struct ttm_buffer_object *bo, return -ENOMEM; }

• /* Set TTM_PAGE_FLAG_SG before populate but after create. */
• bo->ttm->page_flags |= TTM_PAGE_FLAG_SG;

• /* Set TTM_PAGE_FLAG_EXTERNAL before populate but after create. */

• bo->ttm->page_flags |= TTM_PAGE_FLAG_EXTERNAL;

  gtt = (void *)bo->ttm; gtt->userptr = addr;

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 33dca2565cca..ba0fec252df7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -1249,7 +1249,7 @@ nouveau_ttm_tt_populate(struct ttm_device *bdev, struct ttm_tt *ttm_dma = (void *)ttm; struct nouveau_drm *drm; struct device *dev;

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL);

  if (ttm_tt_is_populated(ttm)) return 0;

@@ -1272,7 +1272,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_device *bdev, { struct nouveau_drm *drm; struct device *dev;

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL);

  if (slave) return;

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 7793249bc549..d891491b6da8 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -545,14 +545,14 @@ static int radeon_ttm_tt_populate(struct ttm_device *bdev, { struct radeon_device *rdev = radeon_get_rdev(bdev); struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(rdev, ttm);

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL);

  if (gtt && gtt->userptr) { ttm->sg = kzalloc(sizeof(struct sg_table), GFP_KERNEL); if (!ttm->sg) return -ENOMEM;

• ttm->page_flags |= TTM_PAGE_FLAG_SG;
  

• ttm->page_flags |= TTM_PAGE_FLAG_EXTERNAL;
  

  return 0; }

@@ -569,13 +569,13 @@ static void radeon_ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm { struct radeon_device *rdev = radeon_get_rdev(bdev); struct radeon_ttm_tt *gtt = radeon_ttm_tt_to_gtt(rdev, ttm);

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_SG);

• bool slave = !!(ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL);

  radeon_ttm_tt_unbind(bdev, ttm);

  if (gtt && gtt->userptr) { kfree(ttm->sg);

• ttm->page_flags &= ~TTM_PAGE_FLAG_SG;
  

• ttm->page_flags &= ~TTM_PAGE_FLAG_EXTERNAL;
  

  return; }

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 3b22c0013dbf..642dc7ce3081 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -1115,7 +1115,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, return -EBUSY;

if (!bo->ttm || !ttm_tt_is_populated(bo->ttm) ||

•    bo->ttm->page_flags & TTM_PAGE_FLAG_SG ||
  

•    bo->ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL ||
   bo->ttm->page_flags & TTM_PAGE_FLAG_SWAPPED ||
   !ttm_bo_get_unless_zero(bo)) {
  

  if (locked)

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 906ec8a1bf5a..708390588c7c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -162,7 +162,7 @@ vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object *bo, * Refuse to fault imported pages. This should be handled * (if at all) by redirecting mmap to the exporter. */

• if (bo->ttm && (bo->ttm->page_flags & TTM_PAGE_FLAG_SG)) {

• if (bo->ttm && (bo->ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL)) { dma_resv_unlock(bo->base.resv); return VM_FAULT_SIGBUS; }

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 980ecb079b2c..9c586b613737 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -73,7 +73,7 @@ int ttm_tt_create(struct ttm_buffer_object *bo, bool zero_alloc) case ttm_bo_type_kernel: break; case ttm_bo_type_sg:

• page_flags |= TTM_PAGE_FLAG_SG;
  

• page_flags |= TTM_PAGE_FLAG_EXTERNAL;
  

  break; default: pr_err("Illegal buffer object type\n");

@@ -178,7 +178,7 @@ int ttm_sg_tt_init(struct ttm_tt *ttm, struct ttm_buffer_object *bo,

ttm_tt_init_fields(ttm, bo, page_flags, caching);

• if (page_flags & TTM_PAGE_FLAG_SG)

• if (page_flags & TTM_PAGE_FLAG_EXTERNAL) ret = ttm_sg_tt_alloc_page_directory(ttm); else ret = ttm_dma_tt_alloc_page_directory(ttm);

@@ -300,7 +300,7 @@ int ttm_tt_populate(struct ttm_device *bdev, if (ttm_tt_is_populated(ttm)) return 0;

• if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {

• if (!(ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL)) { atomic_long_add(ttm->num_pages, &ttm_pages_allocated); if (bdev->pool.use_dma32) atomic_long_add(ttm->num_pages,

@@ -337,7 +337,7 @@ int ttm_tt_populate(struct ttm_device *bdev, return 0;

error:

• if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {

• if (!(ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL)) { atomic_long_sub(ttm->num_pages, &ttm_pages_allocated); if (bdev->pool.use_dma32) atomic_long_sub(ttm->num_pages,

@@ -357,7 +357,7 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm) else ttm_pool_free(&bdev->pool, ttm);

• if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {

• if (!(ttm->page_flags & TTM_PAGE_FLAG_EXTERNAL)) { atomic_long_sub(ttm->num_pages, &ttm_pages_allocated); if (bdev->pool.use_dma32) atomic_long_sub(ttm->num_pages,

diff --git a/include/drm/ttm/ttm_tt.h b/include/drm/ttm/ttm_tt.h index 842ce756213c..a6c284c21e72 100644 --- a/include/drm/ttm/ttm_tt.h +++ b/include/drm/ttm/ttm_tt.h @@ -38,9 +38,9 @@ struct ttm_resource; struct ttm_buffer_object; struct ttm_operation_ctx;

-#define TTM_PAGE_FLAG_SWAPPED (1 << 4) -#define TTM_PAGE_FLAG_ZERO_ALLOC (1 << 6) -#define TTM_PAGE_FLAG_SG (1 << 8) +#define TTM_PAGE_FLAG_SWAPPED (1 << 4) +#define TTM_PAGE_FLAG_ZERO_ALLOC (1 << 6) +#define TTM_PAGE_FLAG_EXTERNAL (1 << 8)

While at it please renumber those and maybe also rename everything.

E.g. TTM_TT_FLAG_* instead of TTM_PAGE_FLAG_* since this really controls the TT object behavior.

Christian.

#define TTM_PAGE_FLAG_PRIV_POPULATED (1 << 31)