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

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

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

+91 −92
Original line number Diff line number Diff line
@@ -513,12 +513,13 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, 
				      struct amdgpu_irq_src *source,

				      struct amdgpu_iv_entry *entry)

{

	struct amdgpu_vmhub *hub;

	bool retry_fault = !!(entry->src_data[1] & 0x80);

	uint32_t status = 0, cid = 0, rw = 0;

	u64 addr;

	char hub_name[10];

	struct amdgpu_task_info task_info;

	struct amdgpu_vmhub *hub;

	const char *mmhub_cid;

	const char *hub_name;

	u64 addr;



	addr = (u64)entry->src_data[0] << 12;

	addr |= ((u64)entry->src_data[1] & 0xf) << 44;
@@ -527,23 +528,41 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, 
						    entry->timestamp))

		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) {

		snprintf(hub_name, sizeof(hub_name), "mmhub0");

		hub_name = "mmhub0";

		hub = &adev->vmhub[AMDGPU_MMHUB_0];

	} 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];

	} else {

		snprintf(hub_name, sizeof(hub_name), "gfxhub0");

		hub_name = "gfxhub0";

		hub = &adev->vmhub[AMDGPU_GFXHUB_0];

	}



	/* 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 */

	memset(&task_info, 0, sizeof(struct amdgpu_task_info));

	amdgpu_vm_get_task_info(adev, entry->pasid, &task_info);



	dev_err(adev->dev,

		"[%s] %s page fault (src_id:%u ring:%u vmid:%u "

		"pasid:%u, for process %s pid %d thread %s pid %d)\n",

		hub_name, retry_fault ? "retry" : "no-retry",

		entry->src_id, entry->ring_id, entry->vmid,

		entry->pasid, task_info.process_name, task_info.tgid,

		task_info.task_name, task_info.pid);

	dev_err(adev->dev, "  in page starting at address 0x%016llx from client %d\n",

		addr, entry->client_id);



	if (amdgpu_sriov_vf(adev))

		return 0;



	if (!amdgpu_sriov_vf(adev)) {

	/*

	 * Issue a dummy read to wait for the status register to

	 * be updated to avoid reading an incorrect value due to
@@ -553,35 +572,18 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, 
		RREG32(hub->vm_l2_pro_fault_status);



	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);

	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()) {

		struct amdgpu_task_info task_info;



		memset(&task_info, 0, sizeof(struct amdgpu_task_info));

		amdgpu_vm_get_task_info(adev, entry->pasid, &task_info);



		dev_err(adev->dev,

			"[%s] %s page fault (src_id:%u ring:%u vmid:%u "

			"pasid:%u, for process %s pid %d thread %s pid %d)\n",

			hub_name, retry_fault ? "retry" : "no-retry",

			entry->src_id, entry->ring_id, entry->vmid,

			entry->pasid, task_info.process_name, task_info.tgid,

			task_info.task_name, task_info.pid);

		dev_err(adev->dev, "  in page starting at address 0x%016llx from client %d\n",

			addr, entry->client_id);

		if (!amdgpu_sriov_vf(adev)) {

	dev_err(adev->dev,

		"VM_L2_PROTECTION_FAULT_STATUS:0x%08X\n",

		status);

	if (hub == &adev->vmhub[AMDGPU_GFXHUB_0]) {

		dev_err(adev->dev, "\t Faulty UTCL2 client ID: %s (0x%x)\n",

					cid >= ARRAY_SIZE(gfxhub_client_ids) ? "unknown" : gfxhub_client_ids[cid],

			cid >= ARRAY_SIZE(gfxhub_client_ids) ? "unknown" :

			gfxhub_client_ids[cid],

			cid);

	} else {

		switch (adev->asic_type) {
@@ -623,9 +625,6 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, 
		REG_GET_FIELD(status,

		VM_L2_PROTECTION_FAULT_STATUS, MAPPING_ERROR));

	dev_err(adev->dev, "\t RW: 0x%x\n", rw);

		}

	}



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE