Commit e3898719 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: cleanup gmc_v9_0_process_interrupt

First of all don't snprintf into a char buffer allocated on the stack with
a constant hubname.

Then cleanup to exit the function early in case of a ratelimit or SRIOV.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e0457659
...@@ -510,15 +510,16 @@ static int gmc_v9_0_vm_fault_interrupt_state(struct amdgpu_device *adev, ...@@ -510,15 +510,16 @@ static int gmc_v9_0_vm_fault_interrupt_state(struct amdgpu_device *adev,
} }
static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
struct amdgpu_irq_src *source, struct amdgpu_irq_src *source,
struct amdgpu_iv_entry *entry) struct amdgpu_iv_entry *entry)
{ {
struct amdgpu_vmhub *hub;
bool retry_fault = !!(entry->src_data[1] & 0x80); bool retry_fault = !!(entry->src_data[1] & 0x80);
uint32_t status = 0, cid = 0, rw = 0; uint32_t status = 0, cid = 0, rw = 0;
u64 addr; struct amdgpu_task_info task_info;
char hub_name[10]; struct amdgpu_vmhub *hub;
const char *mmhub_cid; const char *mmhub_cid;
const char *hub_name;
u64 addr;
addr = (u64)entry->src_data[0] << 12; addr = (u64)entry->src_data[0] << 12;
addr |= ((u64)entry->src_data[1] & 0xf) << 44; addr |= ((u64)entry->src_data[1] & 0xf) << 44;
...@@ -527,105 +528,103 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, ...@@ -527,105 +528,103 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
entry->timestamp)) entry->timestamp))
return 1; /* This also prevents sending it to KFD */ return 1; /* This also prevents sending it to KFD */
/* If it's the first fault for this address, process it normally */
if (retry_fault && !in_interrupt() &&
amdgpu_vm_handle_fault(adev, entry->pasid, addr))
return 1; /* This also prevents sending it to KFD */
if (!printk_ratelimit())
return 0;
if (entry->client_id == SOC15_IH_CLIENTID_VMC) { if (entry->client_id == SOC15_IH_CLIENTID_VMC) {
snprintf(hub_name, sizeof(hub_name), "mmhub0"); hub_name = "mmhub0";
hub = &adev->vmhub[AMDGPU_MMHUB_0]; hub = &adev->vmhub[AMDGPU_MMHUB_0];
} else if (entry->client_id == SOC15_IH_CLIENTID_VMC1) { } else if (entry->client_id == SOC15_IH_CLIENTID_VMC1) {
snprintf(hub_name, sizeof(hub_name), "mmhub1"); hub_name = "mmhub1";
hub = &adev->vmhub[AMDGPU_MMHUB_1]; hub = &adev->vmhub[AMDGPU_MMHUB_1];
} else { } else {
snprintf(hub_name, sizeof(hub_name), "gfxhub0"); hub_name = "gfxhub0";
hub = &adev->vmhub[AMDGPU_GFXHUB_0]; hub = &adev->vmhub[AMDGPU_GFXHUB_0];
} }
/* If it's the first fault for this address, process it normally */ memset(&task_info, 0, sizeof(struct amdgpu_task_info));
if (retry_fault && !in_interrupt() && amdgpu_vm_get_task_info(adev, entry->pasid, &task_info);
amdgpu_vm_handle_fault(adev, entry->pasid, addr))
return 1; /* This also prevents sending it to KFD */
if (!amdgpu_sriov_vf(adev)) { dev_err(adev->dev,
/* "[%s] %s page fault (src_id:%u ring:%u vmid:%u "
* Issue a dummy read to wait for the status register to "pasid:%u, for process %s pid %d thread %s pid %d)\n",
* be updated to avoid reading an incorrect value due to hub_name, retry_fault ? "retry" : "no-retry",
* the new fast GRBM interface. entry->src_id, entry->ring_id, entry->vmid,
*/ entry->pasid, task_info.process_name, task_info.tgid,
if (entry->vmid_src == AMDGPU_GFXHUB_0) task_info.task_name, task_info.pid);
RREG32(hub->vm_l2_pro_fault_status); dev_err(adev->dev, " in page starting at address 0x%016llx from client %d\n",
addr, entry->client_id);
status = RREG32(hub->vm_l2_pro_fault_status);
cid = REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, CID);
rw = REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, RW);
WREG32_P(hub->vm_l2_pro_fault_cntl, 1, ~1);
}
if (printk_ratelimit()) { if (amdgpu_sriov_vf(adev))
struct amdgpu_task_info task_info; return 0;
memset(&task_info, 0, sizeof(struct amdgpu_task_info)); /*
amdgpu_vm_get_task_info(adev, entry->pasid, &task_info); * Issue a dummy read to wait for the status register to
* be updated to avoid reading an incorrect value due to
dev_err(adev->dev, * the new fast GRBM interface.
"[%s] %s page fault (src_id:%u ring:%u vmid:%u " */
"pasid:%u, for process %s pid %d thread %s pid %d)\n", if (entry->vmid_src == AMDGPU_GFXHUB_0)
hub_name, retry_fault ? "retry" : "no-retry", RREG32(hub->vm_l2_pro_fault_status);
entry->src_id, entry->ring_id, entry->vmid,
entry->pasid, task_info.process_name, task_info.tgid, status = RREG32(hub->vm_l2_pro_fault_status);
task_info.task_name, task_info.pid); cid = REG_GET_FIELD(status, VM_L2_PROTECTION_FAULT_STATUS, CID);
dev_err(adev->dev, " in page starting at address 0x%016llx from client %d\n", rw = REG_GET_FIELD(status, VM_L2_PROTECTION_FAULT_STATUS, RW);
addr, entry->client_id); WREG32_P(hub->vm_l2_pro_fault_cntl, 1, ~1);
if (!amdgpu_sriov_vf(adev)) {
dev_err(adev->dev,
"VM_L2_PROTECTION_FAULT_STATUS:0x%08X\n", dev_err(adev->dev,
status); "VM_L2_PROTECTION_FAULT_STATUS:0x%08X\n",
if (hub == &adev->vmhub[AMDGPU_GFXHUB_0]) { status);
dev_err(adev->dev, "\t Faulty UTCL2 client ID: %s (0x%x)\n", if (hub == &adev->vmhub[AMDGPU_GFXHUB_0]) {
cid >= ARRAY_SIZE(gfxhub_client_ids) ? "unknown" : gfxhub_client_ids[cid], dev_err(adev->dev, "\t Faulty UTCL2 client ID: %s (0x%x)\n",
cid); cid >= ARRAY_SIZE(gfxhub_client_ids) ? "unknown" :
} else { gfxhub_client_ids[cid],
switch (adev->asic_type) { cid);
case CHIP_VEGA10: } else {
mmhub_cid = mmhub_client_ids_vega10[cid][rw]; switch (adev->asic_type) {
break; case CHIP_VEGA10:
case CHIP_VEGA12: mmhub_cid = mmhub_client_ids_vega10[cid][rw];
mmhub_cid = mmhub_client_ids_vega12[cid][rw]; break;
break; case CHIP_VEGA12:
case CHIP_VEGA20: mmhub_cid = mmhub_client_ids_vega12[cid][rw];
mmhub_cid = mmhub_client_ids_vega20[cid][rw]; break;
break; case CHIP_VEGA20:
case CHIP_ARCTURUS: mmhub_cid = mmhub_client_ids_vega20[cid][rw];
mmhub_cid = mmhub_client_ids_arcturus[cid][rw]; break;
break; case CHIP_ARCTURUS:
case CHIP_RAVEN: mmhub_cid = mmhub_client_ids_arcturus[cid][rw];
mmhub_cid = mmhub_client_ids_raven[cid][rw]; break;
break; case CHIP_RAVEN:
case CHIP_RENOIR: mmhub_cid = mmhub_client_ids_raven[cid][rw];
mmhub_cid = mmhub_client_ids_renoir[cid][rw]; break;
break; case CHIP_RENOIR:
default: mmhub_cid = mmhub_client_ids_renoir[cid][rw];
mmhub_cid = NULL; break;
break; default:
} mmhub_cid = NULL;
dev_err(adev->dev, "\t Faulty UTCL2 client ID: %s (0x%x)\n", break;
mmhub_cid ? mmhub_cid : "unknown", cid);
}
dev_err(adev->dev, "\t MORE_FAULTS: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, MORE_FAULTS));
dev_err(adev->dev, "\t WALKER_ERROR: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, WALKER_ERROR));
dev_err(adev->dev, "\t PERMISSION_FAULTS: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, PERMISSION_FAULTS));
dev_err(adev->dev, "\t MAPPING_ERROR: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, MAPPING_ERROR));
dev_err(adev->dev, "\t RW: 0x%x\n", rw);
} }
dev_err(adev->dev, "\t Faulty UTCL2 client ID: %s (0x%x)\n",
mmhub_cid ? mmhub_cid : "unknown", cid);
} }
dev_err(adev->dev, "\t MORE_FAULTS: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, MORE_FAULTS));
dev_err(adev->dev, "\t WALKER_ERROR: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, WALKER_ERROR));
dev_err(adev->dev, "\t PERMISSION_FAULTS: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, PERMISSION_FAULTS));
dev_err(adev->dev, "\t MAPPING_ERROR: 0x%lx\n",
REG_GET_FIELD(status,
VM_L2_PROTECTION_FAULT_STATUS, MAPPING_ERROR));
dev_err(adev->dev, "\t RW: 0x%x\n", rw);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment