git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-23 05:56:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amdgpu: stop unmapping MQD for kernel queues v3

Browse Source 
This looks unnecessary and actually extremely harmful since using kmap()
is not possible while inside the ring reset.

Remove all the extra mapping and unmapping of the MQDs.

v2: also fix debugfs
v3: fix coding style typo

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König
2025-03-18 16:15:12 +01:00
committed by Alex Deucher
parent 510a16d995
commit 1f86f4125e
7 changed files with 66 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
View File

@@ -608,59 +608,17 @@ static ssize_t amdgpu_debugfs_mqd_read(struct file *f, char __user *buf,
size_t size, loff_t *pos)
{
struct amdgpu_ring *ring = file_inode(f)->i_private;
volatile u32 *mqd;
u32 *kbuf;
int r, i;
uint32_t value, result;
ssize_t bytes = min_t(ssize_t, ring->mqd_size - *pos, size);
void *from = ((u8 *)ring->mqd_ptr) + *pos;
if (*pos & 3 || size & 3)
return -EINVAL;
if (*pos > ring->mqd_size)
return 0;
kbuf = kmalloc(ring->mqd_size, GFP_KERNEL);
if (!kbuf)
return -ENOMEM;
if (copy_to_user(buf, from, bytes))
return -EFAULT;
r = amdgpu_bo_reserve(ring->mqd_obj, false);
if (unlikely(r != 0))
goto err_free;
r = amdgpu_bo_kmap(ring->mqd_obj, (void **)&mqd);
if (r)
goto err_unreserve;
/*
* Copy to local buffer to avoid put_user(), which might fault
* and acquire mmap_sem, under reservation_ww_class_mutex.
*/
for (i = 0; i < ring->mqd_size/sizeof(u32); i++)
kbuf[i] = mqd[i];
amdgpu_bo_kunmap(ring->mqd_obj);
amdgpu_bo_unreserve(ring->mqd_obj);
result = 0;
while (size) {
if (*pos >= ring->mqd_size)
break;
value = kbuf[*pos/4];
r = put_user(value, (uint32_t *)buf);
if (r)
goto err_free;
buf += 4;
result += 4;
size -= 4;
*pos += 4;
}
kfree(kbuf);
return result;
err_unreserve:
amdgpu_bo_unreserve(ring->mqd_obj);
err_free:
kfree(kbuf);
return r;
*pos += bytes;
return bytes;
}
static const struct file_operations amdgpu_debugfs_mqd_fops = {