Skip to contentSkip to conversation

drm/radeon: Replace kmap() with kmap_local_page()

PATCH Applied Fabio M. De Francesco 4 participants 6 messages Oct 13, 2022 – Nov 1, 2022

Subsystems (5)

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon: Replace kmap() with kmap_local_page()

The use of kmap() is being deprecated in favor of kmap_local_page().

There are two main problems with kmap(): (1) It comes with an overhead as the mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmap’s pool wraps and it might block when the mapping space is fully utilized until a slot becomes available.

With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and still valid.

Therefore, replace kmap() with kmap_local_page() in radeon_ttm_gtt_read().

---
 drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +2 -2
index d33fec488713..bdb4c0e0736b 100644
@@ -869,11 +869,11 @@ static ssize_t radeon_ttm_gtt_read(struct file *f, char __user *buf,
 
 		page = rdev->gart.pages[p];
 		if (page) {
-			ptr = kmap(page);
+			ptr = kmap_local_page(page);
 			ptr += off;
 
 			r = copy_to_user(buf, ptr, cur_size);
-			kunmap(rdev->gart.pages[p]);
+			kunmap_local(ptr);
 		} else
 			r = clear_user(buf, cur_size);
 
Signature · 1 line
2.37.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Fabio M. De Francesco

The use of kmap() is being deprecated in favor of kmap_local_page().

There are two main problems with kmap(): (1) It comes with an overhead as the mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmap’s pool wraps and it might block when the mapping space is fully utilized until a slot becomes available.

With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and still valid.

Quoted 5 lines

Therefore, replace kmap() with kmap_local_page() in radeon_ttm_gtt_read().

Signature · 1 line
Kees Cook
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Fabio M. De Francesco

Am 13.10.22 um 23:07 schrieb Fabio M. De Francesco:

Quoted 14 lines

The use of kmap() is being deprecated in favor of kmap_local_page().

There are two main problems with kmap(): (1) It comes with an overhead as the mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmap’s pool wraps and it might block when the mapping space is fully utilized until a slot becomes available.

With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and still valid.

Quoted 5 lines

Therefore, replace kmap() with kmap_local_page() in radeon_ttm_gtt_read().

Quoted 22 lines
---
  drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +2 -2
index d33fec488713..bdb4c0e0736b 100644
@@ -869,11 +869,11 @@ static ssize_t radeon_ttm_gtt_read(struct file *f, char __user *buf,
 
  		page = rdev->gart.pages[p];
  		if (page) {
-			ptr = kmap(page);
+			ptr = kmap_local_page(page);
  			ptr += off;
 
  			r = copy_to_user(buf, ptr, cur_size);
-			kunmap(rdev->gart.pages[p]);
+			kunmap_local(ptr);
  		} else
  			r = clear_user(buf, cur_size);
 
Applied
#3 lore raw

Applied. Thanks!

Quoted 47 lines · Christian König

Am 13.10.22 um 23:07 schrieb Fabio M. De Francesco:

Quoted 14 lines

The use of kmap() is being deprecated in favor of kmap_local_page().

There are two main problems with kmap(): (1) It comes with an overhead as the mapping space is restricted and protected by a global lock for synchronization and (2) it also requires global TLB invalidation when the kmap’s pool wraps and it might block when the mapping space is fully utilized until a slot becomes available.

With kmap_local_page() the mappings are per thread, CPU local, can take page faults, and can be called from any context (including interrupts). It is faster than kmap() in kernels with HIGHMEM enabled. Furthermore, the tasks can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and still valid.

Quoted 5 lines

Therefore, replace kmap() with kmap_local_page() in radeon_ttm_gtt_read().

Quoted 22 lines
---
  drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_ttm.c +2 -2
index d33fec488713..bdb4c0e0736b 100644
@@ -869,11 +869,11 @@ static ssize_t radeon_ttm_gtt_read(struct file *f, char __user *buf,
 
              page = rdev->gart.pages[p];
              if (page) {
-                     ptr = kmap(page);
+                     ptr = kmap_local_page(page);
                      ptr += off;
 
                      r = copy_to_user(buf, ptr, cur_size);
-                     kunmap(rdev->gart.pages[p]);
+                     kunmap_local(ptr);
              } else
                      r = clear_user(buf, cur_size);
 
#4 lore raw
Quoted 1 line · On lunedì 17 ottobre 2022 18:52:10 CET Alex Deucher wrote:

Applied. Thanks!

Many thanks to you!

However, about a week ago, I received a report saying that this patch is "Not Applicable".

That email was also referring to another patch, for which I'll reply in its own thread.

That report has a link to https://patchwork.linuxtv.org/project/linux-media/
patch/[email protected]/

Can you please let me understand why, despite it was applied, this patch later shifted "State" to "Not Applicable"?

Thanks,

Fabio

#5 lore raw
Quoted 8 lines · Fabio M. De Francesco
Quoted 1 line · On lunedì 17 ottobre 2022 18:52:10 CET Alex Deucher wrote:

Applied. Thanks!

Many thanks to you!

However, about a week ago, I received a report saying that this patch is "Not Applicable".

Quoted 8 lines

That email was also referring to another patch, for which I'll reply in its own thread.

That report has a link to https://patchwork.linuxtv.org/project/linux-media/
patch/[email protected]/

Can you please let me understand why, despite it was applied, this patch later shifted "State" to "Not Applicable"?

The kernel has multiple patchwork instances, so you got an "N/A" from linux-media, but it was applied to the drm tree. (Yes, confusing. :P)

Signature · 1 line
Kees Cook