Skip to contentSkip to conversation

drm/ttm: Do page counting after populate callback succeed

RFC PATCH In review xinhui pan 4 participants 6 messages Jun 15, 2021

Subsystems (3)
lore
Share & tools
lore

xinhui pan

author
#0 lore raw

RFC PATCH 1/1 drm/ttm: Do page counting after populate callback succeed

Amdgpu set SG flag in populate callback. So TTM still count pages in SG BO.
One easy way to fix this is lets count pages after populate callback.

We hit one issue that amdgpu alloc many SG BOs, but TTM try to do swap again and again even if swapout does not swap SG BOs at all.

---
 drivers/gpu/drm/ttm/ttm_tt.c | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +13 -19
index a1a25410ec74..4fa0a8cd71c0 100644
@@ -317,13 +317,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
 	if (ttm_tt_is_populated(ttm))
 		return 0;
 
-	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_add(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
-
 	while (atomic_long_read(&ttm_pages_allocated) > ttm_pages_limit ||
 	       atomic_long_read(&ttm_dma32_pages_allocated) >
 	       ttm_dma32_pages_limit) {
@@ -342,6 +335,13 @@ int ttm_tt_populate(struct ttm_device *bdev,
 	if (ret)
 		goto error;
 
+	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
+		if (bdev->pool.use_dma32)
+			atomic_long_add(ttm->num_pages,
+					&ttm_dma32_pages_allocated);
+	}
+
 	ttm_tt_add_mapping(bdev, ttm);
 	ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;
 	if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
@@ -355,12 +355,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
 	return 0;
 
 error:
-	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_sub(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
 	return ret;
 }
 EXPORT_SYMBOL(ttm_tt_populate);
@@ -384,12 +378,6 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
 	if (!ttm_tt_is_populated(ttm))
 		return;
 
-	ttm_tt_clear_mapping(ttm);
-	if (bdev->funcs->ttm_tt_unpopulate)
-		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
-	else
-		ttm_pool_free(&bdev->pool, ttm);
-
 	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
 		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
 		if (bdev->pool.use_dma32)
@@ -397,6 +385,12 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
 					&ttm_dma32_pages_allocated);
 	}
 
+	ttm_tt_clear_mapping(ttm);
+	if (bdev->funcs->ttm_tt_unpopulate)
+		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
+	else
+		ttm_pool_free(&bdev->pool, ttm);
+
 	ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED;
 }
 
Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw

Am 15.06.21 um 13:57 schrieb xinhui pan:

Quoted 2 lines

Amdgpu set SG flag in populate callback. So TTM still count pages in SG BO.

It's probably better to fix this instead. E.g. why does amdgpu modify the SG flag during populate and not during initial creation? That doesn't seem to make sense.

Christian.

Quoted 81 lines

One easy way to fix this is lets count pages after populate callback.

We hit one issue that amdgpu alloc many SG BOs, but TTM try to do swap again and again even if swapout does not swap SG BOs at all.

---
  drivers/gpu/drm/ttm/ttm_tt.c | 32 +++++++++++++-------------------
  1 file changed, 13 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +13 -19
index a1a25410ec74..4fa0a8cd71c0 100644
@@ -317,13 +317,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
  	if (ttm_tt_is_populated(ttm))
  		return 0;
 
-	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_add(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
-
  	while (atomic_long_read(&ttm_pages_allocated) > ttm_pages_limit ||
  	       atomic_long_read(&ttm_dma32_pages_allocated) >
  	       ttm_dma32_pages_limit) {
@@ -342,6 +335,13 @@ int ttm_tt_populate(struct ttm_device *bdev,
  	if (ret)
  		goto error;
 
+	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
+		if (bdev->pool.use_dma32)
+			atomic_long_add(ttm->num_pages,
+					&ttm_dma32_pages_allocated);
+	}
+
  	ttm_tt_add_mapping(bdev, ttm);
  	ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;
  	if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
@@ -355,12 +355,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
  	return 0;
 
  error:
-	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_sub(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
  	return ret;
  }
  EXPORT_SYMBOL(ttm_tt_populate);
@@ -384,12 +378,6 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
  	if (!ttm_tt_is_populated(ttm))
  		return;
 
-	ttm_tt_clear_mapping(ttm);
-	if (bdev->funcs->ttm_tt_unpopulate)
-		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
-	else
-		ttm_pool_free(&bdev->pool, ttm);
-
  	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
  		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
  		if (bdev->pool.use_dma32)
@@ -397,6 +385,12 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
  					&ttm_dma32_pages_allocated);
  	}
 
+	ttm_tt_clear_mapping(ttm);
+	if (bdev->funcs->ttm_tt_unpopulate)
+		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
+	else
+		ttm_pool_free(&bdev->pool, ttm);
+
  	ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED;
  }
 
#2 lore raw
Quoted 9 lines

2021年6月15日 20:01,Christian König <[email protected]> 写道:

Am 15.06.21 um 13:57 schrieb xinhui pan:

Quoted 2 lines

Amdgpu set SG flag in populate callback. So TTM still count pages in SG BO.

It's probably better to fix this instead. E.g. why does amdgpu modify the SG flag during populate and not during initial creation? That doesn't seem to make sense.

fair enough. Let me have a try.
No idea why we set SG flag in populate years ago.

Quoted 80 lines

Christian.

Quoted 76 lines

One easy way to fix this is lets count pages after populate callback.

We hit one issue that amdgpu alloc many SG BOs, but TTM try to do swap again and again even if swapout does not swap SG BOs at all.

---
 drivers/gpu/drm/ttm/ttm_tt.c | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +11 -17
index a1a25410ec74..4fa0a8cd71c0 100644
@@ -317,13 +317,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
 	if (ttm_tt_is_populated(ttm))
 		return 0;
 -	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_add(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
-
 	while (atomic_long_read(&ttm_pages_allocated) > ttm_pages_limit ||
 	       atomic_long_read(&ttm_dma32_pages_allocated) >
 	       ttm_dma32_pages_limit) {
@@ -342,6 +335,13 @@ int ttm_tt_populate(struct ttm_device *bdev,
 	if (ret)
 		goto error;
 +	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
+		if (bdev->pool.use_dma32)
+			atomic_long_add(ttm->num_pages,
+					&ttm_dma32_pages_allocated);
+	}
+
 	ttm_tt_add_mapping(bdev, ttm);
 	ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;
 	if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
@@ -355,12 +355,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
 	return 0;
   error:
-	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_sub(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
 	return ret;
 }
 EXPORT_SYMBOL(ttm_tt_populate);
@@ -384,12 +378,6 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
 	if (!ttm_tt_is_populated(ttm))
 		return;
 -	ttm_tt_clear_mapping(ttm);
-	if (bdev->funcs->ttm_tt_unpopulate)
-		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
-	else
-		ttm_pool_free(&bdev->pool, ttm);
-
 	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
 		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
 		if (bdev->pool.use_dma32)
@@ -397,6 +385,12 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
 					&ttm_dma32_pages_allocated);
 	}
 +	ttm_tt_clear_mapping(ttm);
+	if (bdev->funcs->ttm_tt_unpopulate)
+		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
+	else
+		ttm_pool_free(&bdev->pool, ttm);
+
 	ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED;
 }
 
#3 lore raw

Am 15.06.21 um 14:11 schrieb Pan, Xinhui:

Quoted 8 lines
Quoted 6 lines

2021年6月15日 20:01,Christian König <[email protected]> 写道:

Am 15.06.21 um 13:57 schrieb xinhui pan:

Quoted 2 lines

Amdgpu set SG flag in populate callback. So TTM still count pages in SG BO.

It's probably better to fix this instead. E.g. why does amdgpu modify the SG flag during populate and not during initial creation? That doesn't seem to make sense.

fair enough. Let me have a try.
No idea why we set SG flag in populate years ago.

That's pretty recent IIRC. Felix moved the code around a bit to fix another problem.

Christian.

Quoted 79 lines
Quoted 79 lines

Christian.

Quoted 76 lines

One easy way to fix this is lets count pages after populate callback.

We hit one issue that amdgpu alloc many SG BOs, but TTM try to do swap again and again even if swapout does not swap SG BOs at all.

---
  drivers/gpu/drm/ttm/ttm_tt.c | 32 +++++++++++++-------------------
  1 file changed, 13 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +11 -17
index a1a25410ec74..4fa0a8cd71c0 100644
@@ -317,13 +317,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
  	if (ttm_tt_is_populated(ttm))
  		return 0;
  -	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_add(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
-
  	while (atomic_long_read(&ttm_pages_allocated) > ttm_pages_limit ||
  	       atomic_long_read(&ttm_dma32_pages_allocated) >
  	       ttm_dma32_pages_limit) {
@@ -342,6 +335,13 @@ int ttm_tt_populate(struct ttm_device *bdev,
  	if (ret)
  		goto error;
  +	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+		atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
+		if (bdev->pool.use_dma32)
+			atomic_long_add(ttm->num_pages,
+					&ttm_dma32_pages_allocated);
+	}
+
  	ttm_tt_add_mapping(bdev, ttm);
  	ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;
  	if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
@@ -355,12 +355,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
  	return 0;
    error:
-	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
-		if (bdev->pool.use_dma32)
-			atomic_long_sub(ttm->num_pages,
-					&ttm_dma32_pages_allocated);
-	}
  	return ret;
  }
  EXPORT_SYMBOL(ttm_tt_populate);
@@ -384,12 +378,6 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
  	if (!ttm_tt_is_populated(ttm))
  		return;
  -	ttm_tt_clear_mapping(ttm);
-	if (bdev->funcs->ttm_tt_unpopulate)
-		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
-	else
-		ttm_pool_free(&bdev->pool, ttm);
-
  	if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
  		atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
  		if (bdev->pool.use_dma32)
@@ -397,6 +385,12 @@ void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm)
  					&ttm_dma32_pages_allocated);
  	}
  +	ttm_tt_clear_mapping(ttm);
+	if (bdev->funcs->ttm_tt_unpopulate)
+		bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
+	else
+		ttm_pool_free(&bdev->pool, ttm);
+
  	ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED;
  }
 
#4 lore raw

Am 2021-06-15 um 8:18 a.m. schrieb Christian König:

Quoted 8 lines

Am 15.06.21 um 14:11 schrieb Pan, Xinhui:

Quoted 7 lines
Quoted 7 lines

2021年6月15日 20:01,Christian König <[email protected]> 写道:

Am 15.06.21 um 13:57 schrieb xinhui pan:

Quoted 3 lines

Amdgpu set SG flag in populate callback. So TTM still count pages in SG
BO.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

It's probably better to fix this instead. E.g. why does amdgpu modify the SG flag during populate and not during initial creation? That doesn't seem to make sense.

fair enough. Let me have a try.
No idea why we set SG flag in populate years ago.

That's pretty recent IIRC. Felix moved the code around a bit to fix another problem.

I moved some code from populate/unpopulate to backend_bind/unbind for attaching and detaching dmabufs. I didn't change the setting/unsetting of SG flags for userptr BOs. That goes back all the way to 2015.

As far as I can tell, this is needed because userptr BOs are not created as SG BOs. That's something I've also pointed out before.

Regards,
  Felix

Quoted 78 lines

Christian.

Quoted 75 lines
Quoted 75 lines

Christian.

Quoted 72 lines

One easy way to fix this is lets count pages after populate callback.

We hit one issue that amdgpu alloc many SG BOs, but TTM try to do swap again and again even if swapout does not swap SG BOs at all.

---
  drivers/gpu/drm/ttm/ttm_tt.c | 32 +++++++++++++-------------------

  1 file changed, 13 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +0 -6
index a1a25410ec74..4fa0a8cd71c0 100644
@@ -317,13 +317,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
       if (ttm_tt_is_populated(ttm))
           return 0;
   -    if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-        atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
-        if (bdev->pool.use_dma32)
-            atomic_long_add(ttm->num_pages,
-                    &ttm_dma32_pages_allocated);
-    }
-

      while (atomic_long_read(&ttm_pages_allocated) > ttm_pages_limit || atomic_long_read(&ttm_dma32_pages_allocated) > ttm_dma32_pages_limit) {

drivers/gpu/drm/ttm/ttm_tt.c +6 -0
@@ -342,6 +335,13 @@ int ttm_tt_populate(struct ttm_device *bdev,
       if (ret)
           goto error;
   +    if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+        atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
+        if (bdev->pool.use_dma32)
+            atomic_long_add(ttm->num_pages,
+                    &ttm_dma32_pages_allocated);
+    }
+
       ttm_tt_add_mapping(bdev, ttm);
       ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;
       if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
@@ -355,12 +355,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
       return 0;

    error:
-    if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-        atomic_long_sub(ttm->num_pages, &ttm_pages_allocated); -        if (bdev->pool.use_dma32)
-            atomic_long_sub(ttm->num_pages,
-                    &ttm_dma32_pages_allocated);
-    }
      return ret;
  }
  EXPORT_SYMBOL(ttm_tt_populate);

drivers/gpu/drm/ttm/ttm_tt.c +0 -5
@@ -384,12 +378,6 @@ void ttm_tt_unpopulate(struct ttm_device
 *bdev, struct ttm_tt *ttm)
       if (!ttm_tt_is_populated(ttm))
           return;
   -    ttm_tt_clear_mapping(ttm);
-    if (bdev->funcs->ttm_tt_unpopulate)
-        bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
-    else
-        ttm_pool_free(&bdev->pool, ttm);
-
       if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
           atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);

          if (bdev->pool.use_dma32)

drivers/gpu/drm/ttm/ttm_tt.c +0 -0
@@ -397,6 +385,12 @@ void ttm_tt_unpopulate(struct ttm_device
 *bdev, struct ttm_tt *ttm)
                       &ttm_dma32_pages_allocated);
       }
   +    ttm_tt_clear_mapping(ttm);
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/ttm/ttm_tt.c +5 -0
+    if (bdev->funcs->ttm_tt_unpopulate)
+        bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
+    else
+        ttm_pool_free(&bdev->pool, ttm);
+
       ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED;
   }

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#5 lore raw

Am 15.06.21 um 17:06 schrieb Felix Kuehling:

Quoted 14 lines

Am 2021-06-15 um 8:18 a.m. schrieb Christian König:

Quoted 13 lines

Am 15.06.21 um 14:11 schrieb Pan, Xinhui:

Quoted 12 lines
Quoted 10 lines

2021年6月15日 20:01,Christian König <[email protected]> 写道:

Am 15.06.21 um 13:57 schrieb xinhui pan:

Quoted 3 lines

Amdgpu set SG flag in populate callback. So TTM still count pages in SG
BO.

It's probably better to fix this instead. E.g. why does amdgpu modify the SG flag during populate and not during initial creation? That doesn't seem to make sense.

fair enough. Let me have a try.
No idea why we set SG flag in populate years ago.

Quoted 8 lines
Quoted 2 lines

That's pretty recent IIRC. Felix moved the code around a bit to fix another problem.

I moved some code from populate/unpopulate to backend_bind/unbind for attaching and detaching dmabufs. I didn't change the setting/unsetting of SG flags for userptr BOs. That goes back all the way to 2015.

As far as I can tell, this is needed because userptr BOs are not created as SG BOs. That's something I've also pointed out before.

Ah, yes. That's because we need the pages array for userptr BOs.

Then we should probably move that to amdgpu_ttm_tt_set_userptr().

Thanks,
Christian.

Quoted 81 lines

Regards,
  Felix

Quoted 76 lines

Christian.

Quoted 74 lines
Quoted 74 lines

Christian.

Quoted 72 lines

One easy way to fix this is lets count pages after populate callback.

We hit one issue that amdgpu alloc many SG BOs, but TTM try to do swap again and again even if swapout does not swap SG BOs at all.

---
   drivers/gpu/drm/ttm/ttm_tt.c | 32 +++++++++++++-------------------
   1 file changed, 13 insertions(+), 19 deletions(-)
drivers/gpu/drm/ttm/ttm_tt.c +0 -6
index a1a25410ec74..4fa0a8cd71c0 100644
@@ -317,13 +317,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
       if (ttm_tt_is_populated(ttm))
           return 0;
   -    if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-        atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
-        if (bdev->pool.use_dma32)
-            atomic_long_add(ttm->num_pages,
-                    &ttm_dma32_pages_allocated);
-    }
-
       while (atomic_long_read(&ttm_pages_allocated) >

ttm_pages_limit ||
             atomic_long_read(&ttm_dma32_pages_allocated) > ttm_dma32_pages_limit) {

drivers/gpu/drm/ttm/ttm_tt.c +6 -11
@@ -342,6 +335,13 @@ int ttm_tt_populate(struct ttm_device *bdev,
       if (ret)
           goto error;
   +    if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
+        atomic_long_add(ttm->num_pages, &ttm_pages_allocated);
+        if (bdev->pool.use_dma32)
+            atomic_long_add(ttm->num_pages,
+                    &ttm_dma32_pages_allocated);
+    }
+
       ttm_tt_add_mapping(bdev, ttm);
       ttm->page_flags |= TTM_PAGE_FLAG_PRIV_POPULATED;
       if (unlikely(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)) {
@@ -355,12 +355,6 @@ int ttm_tt_populate(struct ttm_device *bdev,
       return 0;
     error:
-    if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
-        atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
-        if (bdev->pool.use_dma32)
-            atomic_long_sub(ttm->num_pages,
-                    &ttm_dma32_pages_allocated);
-    }
       return ret;
   }
   EXPORT_SYMBOL(ttm_tt_populate);
@@ -384,12 +378,6 @@ void ttm_tt_unpopulate(struct ttm_device
 *bdev, struct ttm_tt *ttm)
       if (!ttm_tt_is_populated(ttm))
           return;
   -    ttm_tt_clear_mapping(ttm);
-    if (bdev->funcs->ttm_tt_unpopulate)
-        bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
-    else
-        ttm_pool_free(&bdev->pool, ttm);
-
       if (!(ttm->page_flags & TTM_PAGE_FLAG_SG)) {
           atomic_long_sub(ttm->num_pages, &ttm_pages_allocated);
           if (bdev->pool.use_dma32)
@@ -397,6 +385,12 @@ void ttm_tt_unpopulate(struct ttm_device
 *bdev, struct ttm_tt *ttm)
                       &ttm_dma32_pages_allocated);
       }
   +    ttm_tt_clear_mapping(ttm);
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/ttm/ttm_tt.c void ttm_tt_unpopulate(struct ttm_device *bdev, struct ttm_tt *ttm) · line 395

Quoted 8 lines
drivers/gpu/drm/ttm/ttm_tt.c +5 -0
+    if (bdev->funcs->ttm_tt_unpopulate)
+        bdev->funcs->ttm_tt_unpopulate(bdev, ttm);
+    else
+        ttm_pool_free(&bdev->pool, ttm);
+
       ttm->page_flags &= ~TTM_PAGE_FLAG_PRIV_POPULATED;
   }

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx