Skip to contentSkip to conversation

amd/amdkfd: Set correct svm range actual loc after spliting

PATCH Superseded Philip Yang 3 participants 3 messages Jan 8, 2024 – Jan 9, 2024

Subsystems (3)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 amd/amdkfd: Set correct svm range actual loc after spliting

After range spliting, set new range and old range actual_loc:
new range actual_loc is 0 if new->vram_pages is 0.
old range actual_loc is 0 if old->vram_pages - new->vram_pages == 0.

---
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +5 -3
index cc24f30f88fb..cb09e1d3a643 100644
@@ -362,7 +362,6 @@ svm_range *svm_range_new(struct svm_range_list *svms, uint64_t start,
 	INIT_LIST_HEAD(&prange->child_list);
 	atomic_set(&prange->invalid, 0);
 	prange->validate_timestamp = 0;
-	prange->vram_pages = 0;
 	mutex_init(&prange->migrate_mutex);
 	mutex_init(&prange->lock);
 
@@ -980,8 +979,12 @@ svm_range_split_pages(struct svm_range *new, struct svm_range *old,
 		if (r)
 			return r;
 	}
-	if (old->actual_loc)
+	if (old->actual_loc && new->vram_pages) {
 		old->vram_pages -= new->vram_pages;
+		new->actual_loc = old->actual_loc;
+		if (!old->vram_pages)
+			old->actual_loc = 0;
+	}
 
 	return 0;
 }
@@ -1058,7 +1061,6 @@ svm_range_split_adjust(struct svm_range *new, struct svm_range *old,
 	new->flags = old->flags;
 	new->preferred_loc = old->preferred_loc;
 	new->prefetch_loc = old->prefetch_loc;
-	new->actual_loc = old->actual_loc;
 	new->granularity = old->granularity;
 	new->mapped_to_gpu = old->mapped_to_gpu;
 	bitmap_copy(new->bitmap_access, old->bitmap_access, MAX_GPU_INSTANCE);
Signature · 1 line
2.35.1
Reviewed-by on v1 1/1
#1 lore raw

With a nitpick below, this patch is

Quoted 14 lines · Philip Yang

After range spliting, set new range and old range actual_loc:
new range actual_loc is 0 if new->vram_pages is 0.
old range actual_loc is 0 if old->vram_pages - new->vram_pages == 0.

---
  drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +0 -0
index cc24f30f88fb..cb09e1d3a643 100644

drivers/gpu/drm/amd/amdkfd/kfd_svm.c svm_range *svm_range_new(struct svm_range_list *svms, uint64_t start, · line 365

Quoted 4 lines
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +0 -1
@@ -362,7 +362,6 @@ svm_range *svm_range_new(struct svm_range_list *svms, uint64_t start,
  	INIT_LIST_HEAD(&prange->child_list);
  	atomic_set(&prange->invalid, 0);
  	prange->validate_timestamp = 0;
-	prange->vram_pages = 0;

I think it is better to keep it, also:

+new->actual_loc = 0;

though not necessary as prange is allocated by kzalloc, just keep consistent with previous statements, or remove

atomic_set(&prange->invalid, 0);
prange->validate_timestamp = 0;

too.

Regards
Xiaogang

Quoted 25 lines
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +5 -2
  	mutex_init(&prange->migrate_mutex);
  	mutex_init(&prange->lock);
 
@@ -980,8 +979,12 @@ svm_range_split_pages(struct svm_range *new, struct svm_range *old,
  		if (r)
  			return r;
  	}
-	if (old->actual_loc)
+	if (old->actual_loc && new->vram_pages) {
  		old->vram_pages -= new->vram_pages;
+		new->actual_loc = old->actual_loc;
+		if (!old->vram_pages)
+			old->actual_loc = 0;
+	}
 
  	return 0;
  }
@@ -1058,7 +1061,6 @@ svm_range_split_adjust(struct svm_range *new, struct svm_range *old,
  	new->flags = old->flags;
  	new->preferred_loc = old->preferred_loc;
  	new->prefetch_loc = old->prefetch_loc;
-	new->actual_loc = old->actual_loc;
  	new->granularity = old->granularity;
  	new->mapped_to_gpu = old->mapped_to_gpu;
  	bitmap_copy(new->bitmap_access, old->bitmap_access, MAX_GPU_INSTANCE);
Reviewed-by Xiaogang Chen
#2 lore raw

On 2024-01-08 18:17, Chen, Xiaogang wrote:
With a nitpick below, this patch is

On 1/8/2024 4:36 PM, Philip Yang wrote:
After range spliting, set new range and old range actual_loc:
new range actual_loc is 0 if new->vram_pages is 0.
old range actual_loc is 0 if old->vram_pages - new->vram_pages == 0.

---
  drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 +++++---

  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +0 -0
index cc24f30f88fb..cb09e1d3a643 100644
@@ -362,7 +362,6 @@ svm_range *svm_range_new(struct svm_range_list *svms, uint64_t start,

      INIT_LIST_HEAD(&prange->child_list);
      atomic_set(&prange->invalid, 0);
      prange->validate_timestamp = 0;
-    prange->vram_pages = 0;
I think it is better to keep it, also:

+new->actual_loc = 0;

though not necessary as prange is allocated by kzalloc, just keep consistent with previous statements, or remove

atomic_set(&prange->invalid, 0);
prange->validate_timestamp = 0;

too.
kzalloc memset prange to 0, we should remove unnecessary 0 assignment. prange->validate_timestamp will be removed completely in the following patch. Will send out v2 patch to fix other related issues.

Regards,
Philip

Regards
Xiaogang

      mutex_init(&prange->migrate_mutex);
      mutex_init(&prange->lock);
  @@ -980,8 +979,12 @@ svm_range_split_pages(struct svm_range *new, struct svm_range *old, if (r)
              return r;
      }
-    if (old->actual_loc)
+    if (old->actual_loc && new->vram_pages) {
          old->vram_pages -= new->vram_pages;
+        new->actual_loc = old->actual_loc;
+        if (!old->vram_pages)
+            old->actual_loc = 0;
+    }
        return 0;
  }
@@ -1058,7 +1061,6 @@ svm_range_split_adjust(struct svm_range *new, struct svm_range *old, new->flags = old->flags;
      new->preferred_loc = old->preferred_loc;
      new->prefetch_loc = old->prefetch_loc;
-    new->actual_loc = old->actual_loc;
      new->granularity = old->granularity;
      new->mapped_to_gpu = old->mapped_to_gpu; bitmap_copy(new->bitmap_access, old->bitmap_access, MAX_GPU_INSTANCE);