Skip to content

Commit 6df8e84

Browse files
2045geminialexdeucher
authored andcommitted
drm/amdgpu: use atomic functions with memory barriers for vm fault info
The atomic variable vm_fault_info_updated is used to synchronize access to adev->gmc.vm_fault_info between the interrupt handler and get_vm_fault_info(). The default atomic functions like atomic_set() and atomic_read() do not provide memory barriers. This allows for CPU instruction reordering, meaning the memory accesses to vm_fault_info and the vm_fault_info_updated flag are not guaranteed to occur in the intended order. This creates a race condition that can lead to inconsistent or stale data being used. The previous implementation, which used an explicit mb(), was incomplete and inefficient. It failed to account for all potential CPU reorderings, such as the access of vm_fault_info being reordered before the atomic_read of the flag. This approach is also more verbose and less performant than using the proper atomic functions with acquire/release semantics. Fix this by switching to atomic_set_release() and atomic_read_acquire(). These functions provide the necessary acquire and release semantics, which act as memory barriers to ensure the correct order of operations. It is also more efficient and idiomatic than using explicit full memory barriers. Fixes: b97dfa2 ("drm/amdgpu: save vm fault information for amdkfd") Cc: [email protected] Signed-off-by: Gui-Dong Han <[email protected]> Signed-off-by: Felix Kuehling <[email protected]> Reviewed-by: Felix Kuehling <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent ff780f4 commit 6df8e84

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,10 +2329,9 @@ void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct kgd_mem *mem)
23292329
int amdgpu_amdkfd_gpuvm_get_vm_fault_info(struct amdgpu_device *adev,
23302330
struct kfd_vm_fault_info *mem)
23312331
{
2332-
if (atomic_read(&adev->gmc.vm_fault_info_updated) == 1) {
2332+
if (atomic_read_acquire(&adev->gmc.vm_fault_info_updated) == 1) {
23332333
*mem = *adev->gmc.vm_fault_info;
2334-
mb(); /* make sure read happened */
2335-
atomic_set(&adev->gmc.vm_fault_info_updated, 0);
2334+
atomic_set_release(&adev->gmc.vm_fault_info_updated, 0);
23362335
}
23372336
return 0;
23382337
}

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ static int gmc_v7_0_sw_init(struct amdgpu_ip_block *ip_block)
10681068
GFP_KERNEL);
10691069
if (!adev->gmc.vm_fault_info)
10701070
return -ENOMEM;
1071-
atomic_set(&adev->gmc.vm_fault_info_updated, 0);
1071+
atomic_set_release(&adev->gmc.vm_fault_info_updated, 0);
10721072

10731073
return 0;
10741074
}
@@ -1290,7 +1290,7 @@ static int gmc_v7_0_process_interrupt(struct amdgpu_device *adev,
12901290
vmid = REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS,
12911291
VMID);
12921292
if (amdgpu_amdkfd_is_kfd_vmid(adev, vmid)
1293-
&& !atomic_read(&adev->gmc.vm_fault_info_updated)) {
1293+
&& !atomic_read_acquire(&adev->gmc.vm_fault_info_updated)) {
12941294
struct kfd_vm_fault_info *info = adev->gmc.vm_fault_info;
12951295
u32 protections = REG_GET_FIELD(status,
12961296
VM_CONTEXT1_PROTECTION_FAULT_STATUS,
@@ -1306,8 +1306,7 @@ static int gmc_v7_0_process_interrupt(struct amdgpu_device *adev,
13061306
info->prot_read = protections & 0x8 ? true : false;
13071307
info->prot_write = protections & 0x10 ? true : false;
13081308
info->prot_exec = protections & 0x20 ? true : false;
1309-
mb();
1310-
atomic_set(&adev->gmc.vm_fault_info_updated, 1);
1309+
atomic_set_release(&adev->gmc.vm_fault_info_updated, 1);
13111310
}
13121311

13131312
return 0;

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ static int gmc_v8_0_sw_init(struct amdgpu_ip_block *ip_block)
11831183
GFP_KERNEL);
11841184
if (!adev->gmc.vm_fault_info)
11851185
return -ENOMEM;
1186-
atomic_set(&adev->gmc.vm_fault_info_updated, 0);
1186+
atomic_set_release(&adev->gmc.vm_fault_info_updated, 0);
11871187

11881188
return 0;
11891189
}
@@ -1478,7 +1478,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,
14781478
vmid = REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS,
14791479
VMID);
14801480
if (amdgpu_amdkfd_is_kfd_vmid(adev, vmid)
1481-
&& !atomic_read(&adev->gmc.vm_fault_info_updated)) {
1481+
&& !atomic_read_acquire(&adev->gmc.vm_fault_info_updated)) {
14821482
struct kfd_vm_fault_info *info = adev->gmc.vm_fault_info;
14831483
u32 protections = REG_GET_FIELD(status,
14841484
VM_CONTEXT1_PROTECTION_FAULT_STATUS,
@@ -1494,8 +1494,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,
14941494
info->prot_read = protections & 0x8 ? true : false;
14951495
info->prot_write = protections & 0x10 ? true : false;
14961496
info->prot_exec = protections & 0x20 ? true : false;
1497-
mb();
1498-
atomic_set(&adev->gmc.vm_fault_info_updated, 1);
1497+
atomic_set_release(&adev->gmc.vm_fault_info_updated, 1);
14991498
}
15001499

15011500
return 0;

0 commit comments

Comments
 (0)