diff mbox series

[RESEND] drm/amd/amdgpu: Replace kmap() with kmap_local_page()

Message ID 20221016174158.16638-1-fmdefrancesco@gmail.com
State New
Headers
Series [RESEND] drm/amd/amdgpu: Replace kmap() with kmap_local_page() |

Commit Message

Fabio M. De Francesco Oct. 16, 2022, 5:41 p.m. UTC 
  kmap() is being deprecated in favor of kmap_local_page().

There are two main problems with kmap(): (1) It comes with an overhead as
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 are still valid.

Since its use in amdgpu/amdgpu_ttm.c is safe, it should be preferred.

Therefore, replace kmap() with kmap_local_page() in amdgpu/amdgpu_ttm.c.

Suggested-by: Ira Weiny <ira.weiny@intel.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
---

I'm resending because I suspect that this patch might have been lost. In
the meantime I added an "Acked-by" tag from Christian K.. Obviviously,
there are no further changes in the code.

 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Alex Deucher Oct. 17, 2022, 4:53 p.m. UTC | #1 
Applied.  Thanks!

On Sun, Oct 16, 2022 at 1:42 PM Fabio M. De Francesco
<fmdefrancesco@gmail.com> wrote:
>
> kmap() is being deprecated in favor of kmap_local_page().
>
> There are two main problems with kmap(): (1) It comes with an overhead as
> 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 are still valid.
>
> Since its use in amdgpu/amdgpu_ttm.c is safe, it should be preferred.
>
> Therefore, replace kmap() with kmap_local_page() in amdgpu/amdgpu_ttm.c.
>
> Suggested-by: Ira Weiny <ira.weiny@intel.com>
> Acked-by: Christian König <christian.koenig@amd.com>
> Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
> ---
>
> I'm resending because I suspect that this patch might have been lost. In
> the meantime I added an "Acked-by" tag from Christian K.. Obviviously,
> there are no further changes in the code.
>
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 3b4c19412625..c11657b5915f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -2301,9 +2301,9 @@ static ssize_t amdgpu_iomem_read(struct file *f, char __user *buf,
>                 if (p->mapping != adev->mman.bdev.dev_mapping)
>                         return -EPERM;
>
> -               ptr = kmap(p);
> +               ptr = kmap_local_page(p);
>                 r = copy_to_user(buf, ptr + off, bytes);
> -               kunmap(p);
> +               kunmap_local(ptr);
>                 if (r)
>                         return -EFAULT;
>
> @@ -2352,9 +2352,9 @@ static ssize_t amdgpu_iomem_write(struct file *f, const char __user *buf,
>                 if (p->mapping != adev->mman.bdev.dev_mapping)
>                         return -EPERM;
>
> -               ptr = kmap(p);
> +               ptr = kmap_local_page(p);
>                 r = copy_from_user(ptr + off, buf, bytes);
> -               kunmap(p);
> +               kunmap_local(ptr);
>                 if (r)
>                         return -EFAULT;
>
> --
> 2.37.1
>
Fabio M. De Francesco Nov. 1, 2022, 11:09 p.m. UTC | #2 
On lunedì 17 ottobre 2022 18:53:24 CET Alex Deucher wrote:
> Applied.  Thanks!
> 

The same report about which I just wrote in my previous email to you is also 
referring to this patch which later changed status to "Not Applicable".

It points to https://patchwork.linuxtv.org/project/linux-media/patch/
20220812175753.22926-1-fmdefrancesco@gmail.com/

Can you please let me understand why?

Thanks,

Fabio
Alex Deucher Nov. 2, 2022, 1:01 p.m. UTC | #3 
On Tue, Nov 1, 2022 at 7:21 PM Fabio M. De Francesco
<fmdefrancesco@gmail.com> wrote:
>
> On lunedì 17 ottobre 2022 18:53:24 CET Alex Deucher wrote:
> > Applied.  Thanks!
> >
>
> The same report about which I just wrote in my previous email to you is also
> referring to this patch which later changed status to "Not Applicable".
>
> It points to https://patchwork.linuxtv.org/project/linux-media/patch/
> 20220812175753.22926-1-fmdefrancesco@gmail.com/
>
> Can you please let me understand why?

I'm not sure I understand what you are asking.  The patch is applied:
https://gitlab.freedesktop.org/agd5f/linux/-/commit/a2c554262d39f81be7422fd8bee2f2fe3779f7f5

Alex

>
> Thanks,
>
> Fabio
>
>
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 3b4c19412625..c11657b5915f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2301,9 +2301,9 @@  static ssize_t amdgpu_iomem_read(struct file *f, char __user *buf,
 		if (p->mapping != adev->mman.bdev.dev_mapping)
 			return -EPERM;
 
-		ptr = kmap(p);
+		ptr = kmap_local_page(p);
 		r = copy_to_user(buf, ptr + off, bytes);
-		kunmap(p);
+		kunmap_local(ptr);
 		if (r)
 			return -EFAULT;
 
@@ -2352,9 +2352,9 @@  static ssize_t amdgpu_iomem_write(struct file *f, const char __user *buf,
 		if (p->mapping != adev->mman.bdev.dev_mapping)
 			return -EPERM;
 
-		ptr = kmap(p);
+		ptr = kmap_local_page(p);
 		r = copy_from_user(ptr + off, buf, bytes);
-		kunmap(p);
+		kunmap_local(ptr);
 		if (r)
 			return -EFAULT;