drm/amdgpu: fix userq page count in input_validate
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix userq page count in input_validate
amdgpu_userq_input_va_validate() converts userq expected_size to page count by right shift.
This undercounts va buffers that less than a page. For example, in the AMDGPU_HW_IP_COMPUTE userq creation case, the expected_size 2048,
so size(page count) becomes zero page and the "va_map->last - user_addr + 1 >= size" is always true once the start addr locates in the va_map mapping.
A similar case is AMDGPU_HW_IP_DMA, where expected_size is 32.
This commit calculates a proper page count by subtracting the start_addr and end_addr in pages.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +11 -3
@@ -25,6 +25,7 @@#include <drm/drm_auth.h> #include <drm/drm_exec.h> #include <linux/pm_runtime.h> +#include <linux/overflow.h> #include <drm/drm_drv.h> #include "amdgpu.h"
@@ -238,14 +239,21 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, {struct amdgpu_bo_va_mapping *va_map;struct amdgpu_vm *vm = queue->vm; -u64 user_addr; +u64 user_addr, end;u64 size;/* Caller must hold vm->root.bo reservation */ dma_resv_assert_held (queue->vm->root.bo->tbo.base.resv); - user_addr = (addr &AMDGPU_GMC_HOLE_MASK ) >>AMDGPU_GPU_PAGE_SHIFT ; - size = expected_size >>AMDGPU_GPU_PAGE_SHIFT ; +if (!expected_size) +return -EINVAL ; + + user_addr = addr &AMDGPU_GMC_HOLE_MASK ; +if (check_add_overflow (user_addr, expected_size -1 , &end)) +return -EINVAL ; + + user_addr >>=AMDGPU_GPU_PAGE_SHIFT ; + size = (end >>AMDGPU_GPU_PAGE_SHIFT ) - user_addr +1 ; va_map =amdgpu_vm_bo_lookup_mapping (vm, user_addr);if (!va_map)
Signature · 1 line
2.53.0
Christian König
maintainerQuoted 35 lines · Zhu Lingshan
amdgpu_userq_input_va_validate()converts userqexpected_sizeto page count by right shift.This undercounts va buffers that less than a page. For example, in the
AMDGPU_HW_IP_COMPUTEuserq creation case, theexpected_size2048,
so size(page count) becomes zero page and the "va_map->last-user_addr+ 1 >= size" is always true once the start addr locates in theva_mapmapping.A similar case is
AMDGPU_HW_IP_DMA, whereexpected_sizeis 32.This commit calculates a proper page count by subtracting the
start_addrandend_addrin pages.Signed-off-by Zhu Lingshan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +1
-0@@ -25,6 +25,7 @@#include <drm/drm_auth.h> #include <drm/drm_exec.h> #include <linux/pm_runtime.h> +#include <linux/overflow.h> #include <drm/drm_drv.h> #include "amdgpu.h" @@ -238,14 +239,21 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, {struct amdgpu_bo_va_mapping *va_map;
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, · line 248
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +1
-3struct amdgpu_vm *vm = queue->vm; -u64 user_addr; +u64 user_addr, end;u64 size;/* Caller must hold vm->root.bo reservation */ dma_resv_assert_held (queue->vm->root.bo->tbo.base.resv); - user_addr = (addr &AMDGPU_GMC_HOLE_MASK ) >>AMDGPU_GPU_PAGE_SHIFT ; - size = expected_size >>AMDGPU_GPU_PAGE_SHIFT ;
Good catch, but I would just use ALIGN(expected_size, AMDGPU_GPU_PAGE_SIZE) here.
Regards,
Christian.
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +9
-0+if (!expected_size) +return -EINVAL ; + + user_addr = addr &AMDGPU_GMC_HOLE_MASK ; +if (check_add_overflow (user_addr, expected_size -1 , &end)) +return -EINVAL ; + + user_addr >>=AMDGPU_GPU_PAGE_SHIFT ; + size = (end >>AMDGPU_GPU_PAGE_SHIFT ) - user_addr +1 ; va_map =amdgpu_vm_bo_lookup_mapping (vm, user_addr);if (!va_map)
Quoted 42 lines · Christian König
Quoted 40 lines · Zhu Lingshan
amdgpu_userq_input_va_validate()converts userqexpected_sizeto page count by right shift.This undercounts va buffers that less than a page. For example, in the
AMDGPU_HW_IP_COMPUTEuserq creation case, theexpected_size2048,
so size(page count) becomes zero page and the "va_map->last-user_addr+ 1 >= size" is always true once the start addr locates in theva_mapmapping.A similar case is
AMDGPU_HW_IP_DMA, whereexpected_sizeis 32.This commit calculates a proper page count by subtracting the
start_addrandend_addrin pages.Signed-off-by Zhu Lingshan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +2
-1@@ -25,6 +25,7 @@#include <drm/drm_auth.h> #include <drm/drm_exec.h> #include <linux/pm_runtime.h> +#include <linux/overflow.h> #include <drm/drm_drv.h> #include "amdgpu.h" @@ -238,14 +239,21 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, {struct amdgpu_bo_va_mapping *va_map;struct amdgpu_vm *vm = queue->vm; -u64 user_addr; +u64 user_addr, end;u64 size;
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, · line 248
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +0
-2/* Caller must hold vm->root.bo reservation */ dma_resv_assert_held (queue->vm->root.bo->tbo.base.resv); - user_addr = (addr &AMDGPU_GMC_HOLE_MASK ) >>AMDGPU_GPU_PAGE_SHIFT ; - size = expected_size >>AMDGPU_GPU_PAGE_SHIFT ;Good catch, but I would just use
ALIGN(expected_size, AMDGPU_GPU_PAGE_SIZE)here.
Hello Christian
ALIGN is more concise, however it is only correct when start_addr is PAGE aligned.
It undercounts one page when start_addr is not page aligned and "start_addr + expected_size" crosses page boundary.
An example is, if start_addr is 0xC00 (1024 X 3), and expected_size is 2048, so the size should be two pages, but the result of ALIGN() is one page, which is wrong.
I think this "start - end" is a more general solution.
Thanks
Lingshan
Quoted 16 lines
Regards,
Christian.Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +9
-0+if (!expected_size) +return -EINVAL ; + + user_addr = addr &AMDGPU_GMC_HOLE_MASK ; +if (check_add_overflow (user_addr, expected_size -1 , &end)) +return -EINVAL ; + + user_addr >>=AMDGPU_GPU_PAGE_SHIFT ; + size = (end >>AMDGPU_GPU_PAGE_SHIFT ) - user_addr +1 ; va_map =amdgpu_vm_bo_lookup_mapping (vm, user_addr);if (!va_map)
Ping Christian.
Quoted 78 lines · Lingshan
Quoted 41 lines · Christian König
Quoted 40 lines · Zhu Lingshan
amdgpu_userq_input_va_validate()converts userqexpected_sizeto page count by right shift.This undercounts va buffers that less than a page. For example, in the
AMDGPU_HW_IP_COMPUTEuserq creation case, theexpected_size2048,
so size(page count) becomes zero page and the "va_map->last-user_addr+ 1 >= size" is always true once the start addr locates in theva_mapmapping.A similar case is
AMDGPU_HW_IP_DMA, whereexpected_sizeis 32.This commit calculates a proper page count by subtracting the
start_addrandend_addrin pages.Signed-off-by Zhu Lingshan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +2
-1@@ -25,6 +25,7 @@#include <drm/drm_auth.h> #include <drm/drm_exec.h> #include <linux/pm_runtime.h> +#include <linux/overflow.h> #include <drm/drm_drv.h> #include "amdgpu.h" @@ -238,14 +239,21 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, {struct amdgpu_bo_va_mapping *va_map;struct amdgpu_vm *vm = queue->vm; -u64 user_addr; +u64 user_addr, end;u64 size;Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, · line 248
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +0
-2/* Caller must hold vm->root.bo reservation */ dma_resv_assert_held (queue->vm->root.bo->tbo.base.resv); - user_addr = (addr &AMDGPU_GMC_HOLE_MASK ) >>AMDGPU_GPU_PAGE_SHIFT ; - size = expected_size >>AMDGPU_GPU_PAGE_SHIFT ;Good catch, but I would just use
ALIGN(expected_size, AMDGPU_GPU_PAGE_SIZE)here.Hello Christian
ALIGN is more concise, however it is only correct when
start_addris PAGE aligned.It undercounts one page when
start_addris not page aligned and "start_addr+expected_size" crosses page boundary.An example is, if
start_addris0xC00(1024 X 3), andexpected_sizeis 2048, so the size should be two pages, but the result ofALIGN()is one page, which is wrong.I think this "start - end" is a more general solution.
Thanks
LingshanQuoted 15 lines
Regards,
Christian.Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +9
-0+if (!expected_size) +return -EINVAL ; + + user_addr = addr &AMDGPU_GMC_HOLE_MASK ; +if (check_add_overflow (user_addr, expected_size -1 , &end)) +return -EINVAL ; + + user_addr >>=AMDGPU_GPU_PAGE_SHIFT ; + size = (end >>AMDGPU_GPU_PAGE_SHIFT ) - user_addr +1 ; va_map =amdgpu_vm_bo_lookup_mapping (vm, user_addr);if (!va_map)
Quoted 11 lines · Zhu Lingshan
amdgpu_userq_input_va_validate()converts userqexpected_sizeto page count by right shift.This undercounts va buffers that less than a page. For example, in the
AMDGPU_HW_IP_COMPUTEuserq creation case, theexpected_size2048,
so size(page count) becomes zero page and the "va_map->last-user_addr+ 1 >= size" is always true once the start addr locates in theva_mapmapping.
Quoted 6 lines
A similar case is
AMDGPU_HW_IP_DMA, whereexpected_sizeis 32.This commit calculates a proper page count by subtracting the
start_addrandend_addrin pages.Signed-off-by Zhu Lingshan <[email protected]>
Quoted 44 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +11
-4@@ -25,6 +25,7 @@#include <drm/drm_auth.h> #include <drm/drm_exec.h> #include <linux/pm_runtime.h> +#include <linux/overflow.h> #include <drm/drm_drv.h> #include "amdgpu.h" @@ -238,14 +239,21 @@ int amdgpu_userq_input_va_validate(struct amdgpu_device *adev, {struct amdgpu_bo_va_mapping *va_map;struct amdgpu_vm *vm = queue->vm; -u64 user_addr; +u64 user_addr, end;u64 size;/* Caller must hold vm->root.bo reservation */ dma_resv_assert_held (queue->vm->root.bo->tbo.base.resv); - user_addr = (addr &AMDGPU_GMC_HOLE_MASK ) >>AMDGPU_GPU_PAGE_SHIFT ; - size = expected_size >>AMDGPU_GPU_PAGE_SHIFT ; +if (!expected_size) +return -EINVAL ; + + user_addr = addr &AMDGPU_GMC_HOLE_MASK ; +if (check_add_overflow (user_addr, expected_size -1 , &end)) +return -EINVAL ; + + user_addr >>=AMDGPU_GPU_PAGE_SHIFT ; + size = (end >>AMDGPU_GPU_PAGE_SHIFT ) - user_addr +1 ; va_map =amdgpu_vm_bo_lookup_mapping (vm, user_addr);if (!va_map) --2.53.0