drm/amd/amdgpu: Fix GPR read from debugfs
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: Fix GPR read from debugfs
The offset into the array was specified in bytes but should be in terms of 32-bit words. Also prevent large reads that would also cause a buffer overread.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2 -2
@@ -783,11 +783,11 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,ssize_t result =0 ;uint32_t offset, se, sh, cu, wave, simd, thread, bank, *data; -if (size &3 || *pos &3 ) +if (size >4096 || size &3 || *pos &3 )return -EINVAL ;/* decode offset */ - offset = *pos &GENMASK_ULL (11 ,0 ); + offset = (*pos &GENMASK_ULL (11 ,0 )) /4 ; se = (*pos &GENMASK_ULL (19 ,12 )) >>12 ; sh = (*pos &GENMASK_ULL (27 ,20 )) >>20 ; cu = (*pos &GENMASK_ULL (35 ,28 )) >>28 ;
Signature · 6 lines
2.24.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 10.03.20 um 13:53 schrieb Tom St Denis:
Quoted 5 lines
The offset into the array was specified in bytes but should be in terms of 32-bit words. Also prevent large reads that would also cause a buffer overread.
Signed-off-by Tom St Denis <[email protected]>
Quoted 12 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +0
-0@@ -783,11 +783,11 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,ssize_t result =0 ;uint32_t offset, se, sh, cu, wave, simd, thread, bank, *data;
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, · line 793
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +2
-2-if (size &3 || *pos &3 ) +if (size >4096 || size &3 || *pos &3 )return -EINVAL ;/* decode offset */ - offset = *pos &GENMASK_ULL (11 ,0 ); + offset = (*pos &GENMASK_ULL (11 ,0 )) /4 ; se = (*pos &GENMASK_ULL (19 ,12 )) >>12 ; sh = (*pos &GENMASK_ULL (27 ,20 )) >>20 ; cu = (*pos &GENMASK_ULL (35 ,28 )) >>28 ;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 15 lines · Tom St Denis
The offset into the array was specified in bytes but should be in terms of 32-bit words. Also prevent large reads that would also cause a buffer overread.
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, · line 786
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-1@@ -783,11 +783,11 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,ssize_t result =0 ;uint32_t offset, se, sh, cu, wave, simd, thread, bank, *data; -if (size &3 || *pos &3 ) +if (size >4096 || size &3 || *pos &3 )
Is size in dwords as well?
Alex
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-2return -EINVAL ;/* decode offset */ - offset = *pos &GENMASK_ULL (11 ,0 ); + offset = (*pos &GENMASK_ULL (11 ,0 )) /4 ; se = (*pos &GENMASK_ULL (19 ,12 )) >>12 ; sh = (*pos &GENMASK_ULL (27 ,20 )) >>20 ; cu = (*pos &GENMASK_ULL (35 ,28 )) >>28 ; --2.24.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 18 lines · Alex Deucher
Quoted 17 lines · Tom St Denis
The offset into the array was specified in bytes but should be in terms of 32-bit words. Also prevent large reads that would also cause a buffer overread.
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +0
-0@@ -783,11 +783,11 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,ssize_t result =0 ;uint32_t offset, se, sh, cu, wave, simd, thread, bank, *data;
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, · line 786
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-1-if (size &3 || *pos &3 ) +if (size >4096 || size &3 || *pos &3 )Is size in dwords as well?
Nope it's in bytes (as per the calling convention standards as well as later in the function we subtract 4 from it repeatedly).
Tom
Quoted 18 lines
Alex
Quoted 15 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-2return -EINVAL ;/* decode offset */ - offset = *pos &GENMASK_ULL (11 ,0 ); + offset = (*pos &GENMASK_ULL (11 ,0 )) /4 ; se = (*pos &GENMASK_ULL (19 ,12 )) >>12 ; sh = (*pos &GENMASK_ULL (27 ,20 )) >>20 ; cu = (*pos &GENMASK_ULL (35 ,28 )) >>28 ; --2.24.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Ctom.stdenis%40amd.com%7C550ca4aaaf084c3d7a9f08d7c5cf2c65%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637195365897948298&sdata=YTb2YGBlAlDS%2FffaVOo2Yrej21N%2FJYVpFVIc1rQERWg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Hi Alex,
I sent out a v2 of the patch to the list that also addresses the fact we were reading from the wrong offset from the internal buffer.
This entry was really only tested with offset==0 which is why this didn't come up until now that people want those trap registers :-)
Tom
Quoted 18 lines · Alex Deucher
Quoted 17 lines · Tom St Denis
The offset into the array was specified in bytes but should be in terms of 32-bit words. Also prevent large reads that would also cause a buffer overread.
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +0
-0@@ -783,11 +783,11 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,ssize_t result =0 ;uint32_t offset, se, sh, cu, wave, simd, thread, bank, *data;
Quoted 21 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, · line 786
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-1-if (size &3 || *pos &3 ) +if (size >4096 || size &3 || *pos &3 )Is size in dwords as well?
Alex
Quoted 15 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1
-2return -EINVAL ;/* decode offset */ - offset = *pos &GENMASK_ULL (11 ,0 ); + offset = (*pos &GENMASK_ULL (11 ,0 )) /4 ; se = (*pos &GENMASK_ULL (19 ,12 )) >>12 ; sh = (*pos &GENMASK_ULL (27 ,20 )) >>20 ; cu = (*pos &GENMASK_ULL (35 ,28 )) >>28 ; --2.24.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Ctom.stdenis%40amd.com%7C550ca4aaaf084c3d7a9f08d7c5cf2c65%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637195365897948298&sdata=YTb2YGBlAlDS%2FffaVOo2Yrej21N%2FJYVpFVIc1rQERWg%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx