Commit 01615881 authored by Edward O'Callaghan's avatar Edward O'Callaghan Committed by Alex Deucher
Browse files

amdgpu: Wrap dev_err() calls on vm faults with printk_ratelimit() 



It can be the case that upon GPU page faults we start trashing
the logs, and so let us ratelimit here to avoid that.

V2. Fix issue where calling dev_err_ratelimited separately for
    each line means that some lines corresponding to a single
    VM fault may or may not appear depending on the rate.
    - Michel Dänzer.

Reviewed-by: Christian König <christian.koenig@amd.com> (v1)
Signed-off-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b01dd025

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

+9 −7
Original line number Diff line number Diff line
@@ -1036,6 +1036,7 @@ static int gmc_v6_0_process_interrupt(struct amdgpu_device *adev, 
	if (amdgpu_vm_fault_stop == AMDGPU_VM_FAULT_STOP_FIRST)

		gmc_v6_0_set_fault_enable_default(adev, false);



	if (printk_ratelimit()) {

		dev_err(adev->dev, "GPU fault detected: %d 0x%08x\n",

			entry->src_id, entry->src_data);

		dev_err(adev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_ADDR   0x%08X\n",
@@ -1043,6 +1044,7 @@ static int gmc_v6_0_process_interrupt(struct amdgpu_device *adev, 
		dev_err(adev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

			status);

		gmc_v6_0_vm_decode_fault(adev, status, addr, 0);

	}



	return 0;

}

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

+9 −7
Original line number Diff line number Diff line
@@ -1198,6 +1198,7 @@ static int gmc_v7_0_process_interrupt(struct amdgpu_device *adev, 
	if (amdgpu_vm_fault_stop == AMDGPU_VM_FAULT_STOP_FIRST)

		gmc_v7_0_set_fault_enable_default(adev, false);



	if (printk_ratelimit()) {

		dev_err(adev->dev, "GPU fault detected: %d 0x%08x\n",

			entry->src_id, entry->src_data);

		dev_err(adev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_ADDR   0x%08X\n",
@@ -1205,6 +1206,7 @@ static int gmc_v7_0_process_interrupt(struct amdgpu_device *adev, 
		dev_err(adev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

			status);

		gmc_v7_0_vm_decode_fault(adev, status, addr, mc_client);

	}



	return 0;

}

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

+9 −7
Original line number Diff line number Diff line
@@ -1242,6 +1242,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev, 
	if (amdgpu_vm_fault_stop == AMDGPU_VM_FAULT_STOP_FIRST)

		gmc_v8_0_set_fault_enable_default(adev, false);



	if (printk_ratelimit()) {

		dev_err(adev->dev, "GPU fault detected: %d 0x%08x\n",

			entry->src_id, entry->src_data);

		dev_err(adev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_ADDR   0x%08X\n",
@@ -1249,6 +1250,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev, 
		dev_err(adev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

			status);

		gmc_v8_0_vm_decode_fault(adev, status, addr, mc_client);

	}



	return 0;

}