Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-09 16:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amdgpu: add mutex lock for cper ring

Browse Source 
Avoid the confliction between read and write of ring buffer.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tao Zhou 2025-02-10 15:28:37 +08:00 committed by Alex Deucher
parent b1118df145
commit 8652920d2c
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c
View File

@ -440,6 +440,7 @@ void amdgpu_cper_ring_write(struct amdgpu_ring *ring,
wptr_old = ring->wptr; wptr_old = ring->wptr;
mutex_lock(&ring->adev->cper.ring_lock);
while (count) { while (count) {
ent_sz = amdgpu_cper_ring_get_ent_sz(ring, ring->wptr); ent_sz = amdgpu_cper_ring_get_ent_sz(ring, ring->wptr);
chunk = umin(ent_sz, count); chunk = umin(ent_sz, count);
@ -468,6 +469,7 @@ void amdgpu_cper_ring_write(struct amdgpu_ring *ring,
pos = rptr; pos = rptr;
} while (!amdgpu_cper_is_hdr(ring, rptr)); } while (!amdgpu_cper_is_hdr(ring, rptr));
} }
mutex_unlock(&ring->adev->cper.ring_lock);
if (ring->count_dw >= (count >> 2)) if (ring->count_dw >= (count >> 2))
ring->count_dw -= (count >> 2); ring->count_dw -= (count >> 2);
@ -497,6 +499,8 @@ static int amdgpu_cper_ring_init(struct amdgpu_device *adev)
{ {
struct amdgpu_ring *ring = &(adev->cper.ring_buf); struct amdgpu_ring *ring = &(adev->cper.ring_buf);
mutex_init(&adev->cper.ring_lock);
ring->adev = NULL; ring->adev = NULL;
ring->ring_obj = NULL; ring->ring_obj = NULL;
ring->use_doorbell = false; ring->use_doorbell = false;

1
drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h
View File

@ -64,6 +64,7 @@ struct amdgpu_cper {
void *ring[CPER_MAX_ALLOWED_COUNT]; void *ring[CPER_MAX_ALLOWED_COUNT];
struct amdgpu_ring ring_buf; struct amdgpu_ring ring_buf;
struct mutex ring_lock;
}; };
void amdgpu_cper_entry_fill_hdr(struct amdgpu_device *adev, void amdgpu_cper_entry_fill_hdr(struct amdgpu_device *adev,

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

@ -510,13 +510,18 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf,
result = 0; result = 0;
if (*pos < 12) { if (*pos < 12) {
if (ring->funcs->type == AMDGPU_RING_TYPE_CPER)
mutex_lock(&ring->adev->cper.ring_lock);
early[0] = amdgpu_ring_get_rptr(ring) & ring->buf_mask; early[0] = amdgpu_ring_get_rptr(ring) & ring->buf_mask;
early[1] = amdgpu_ring_get_wptr(ring) & ring->buf_mask; early[1] = amdgpu_ring_get_wptr(ring) & ring->buf_mask;
early[2] = ring->wptr & ring->buf_mask; early[2] = ring->wptr & ring->buf_mask;
for (i = *pos / 4; i < 3 && size; i++) { for (i = *pos / 4; i < 3 && size; i++) {
r = put_user(early[i], (uint32_t *)buf); r = put_user(early[i], (uint32_t *)buf);
if (r) if (r) {
return r; result = r;
goto out;
}
buf += 4; buf += 4;
result += 4; result += 4;
size -= 4; size -= 4;
@ -547,12 +552,14 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf,
while (size) { while (size) {
if (p == early[1]) if (p == early[1])
return result; goto out;
value = ring->ring[p]; value = ring->ring[p];
r = put_user(value, (uint32_t *)buf); r = put_user(value, (uint32_t *)buf);
if (r) if (r) {
return r; result = r;
goto out;
}
buf += 4; buf += 4;
result += 4; result += 4;
@ -562,6 +569,10 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf,
} }
} }
out:
if (ring->funcs->type == AMDGPU_RING_TYPE_CPER)
mutex_unlock(&ring->adev->cper.ring_lock);
return result; return result;
} }