Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c129db12 authored by Felix Kuehling's avatar Felix Kuehling Committed by Oded Gabbay
Browse files

drm/amdkfd: Add sanity checks in IRQ handlers 



Only accept interrupts from KFD VMIDs. Just checking for a PASID may
not be enough because amdgpu started using PASIDs to map VM faults
to processes.

Warn if an IRQ doesn't have a valid PASID (indicating a firmware bug).

Suggested-by: default avatarShaoyun Liu <Shaoyun.Liu@amd.com>
Suggested-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 2533f074

drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c

+15 −5
Original line number Original line Diff line number Diff line
@@ -27,18 +27,28 @@ 
static bool cik_event_interrupt_isr(struct kfd_dev *dev,

static bool cik_event_interrupt_isr(struct kfd_dev *dev,

					const uint32_t *ih_ring_entry)

					const uint32_t *ih_ring_entry)

{

{

	unsigned int pasid;

	const struct cik_ih_ring_entry *ihre =

	const struct cik_ih_ring_entry *ihre =

			(const struct cik_ih_ring_entry *)ih_ring_entry;

			(const struct cik_ih_ring_entry *)ih_ring_entry;

	unsigned int vmid, pasid;



	/* Only handle interrupts from KFD VMIDs */

	vmid  = (ihre->ring_id & 0x0000ff00) >> 8;

	if (vmid < dev->vm_info.first_vmid_kfd ||

	    vmid > dev->vm_info.last_vmid_kfd)

		return 0;





	/* If there is no valid PASID, it's likely a firmware bug */

	pasid = (ihre->ring_id & 0xffff0000) >> 16;

	pasid = (ihre->ring_id & 0xffff0000) >> 16;

	if (WARN_ONCE(pasid == 0, "FW bug: No PASID in KFD interrupt"))

		return 0;





	/* Do not process in ISR, just request it to be forwarded to WQ. */

	/* Interrupt types we care about: various signals and faults.

	return (pasid != 0) &&

	 * They will be forwarded to a work queue (see below).

		(ihre->source_id == CIK_INTSRC_CP_END_OF_PIPE ||

	 */

	return ihre->source_id == CIK_INTSRC_CP_END_OF_PIPE ||

		ihre->source_id == CIK_INTSRC_SDMA_TRAP ||

		ihre->source_id == CIK_INTSRC_SDMA_TRAP ||

		ihre->source_id == CIK_INTSRC_SQ_INTERRUPT_MSG ||

		ihre->source_id == CIK_INTSRC_SQ_INTERRUPT_MSG ||

		ihre->source_id == CIK_INTSRC_CP_BAD_OPCODE);

		ihre->source_id == CIK_INTSRC_CP_BAD_OPCODE;

}

}





static void cik_event_interrupt_wq(struct kfd_dev *dev,

static void cik_event_interrupt_wq(struct kfd_dev *dev,

drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c

+24 −16
Original line number Original line Diff line number Diff line
@@ -29,27 +29,35 @@ static bool event_interrupt_isr_v9(struct kfd_dev *dev, 
					const uint32_t *ih_ring_entry)

					const uint32_t *ih_ring_entry)

{

{

	uint16_t source_id, client_id, pasid, vmid;

	uint16_t source_id, client_id, pasid, vmid;

	const uint32_t *data = ih_ring_entry;





	source_id = SOC15_SOURCE_ID_FROM_IH_ENTRY(ih_ring_entry);

	/* Only handle interrupts from KFD VMIDs */

	client_id = SOC15_CLIENT_ID_FROM_IH_ENTRY(ih_ring_entry);

	pasid = SOC15_PASID_FROM_IH_ENTRY(ih_ring_entry);

	vmid = SOC15_VMID_FROM_IH_ENTRY(ih_ring_entry);

	vmid = SOC15_VMID_FROM_IH_ENTRY(ih_ring_entry);

	if (vmid < dev->vm_info.first_vmid_kfd ||

	    vmid > dev->vm_info.last_vmid_kfd)

		return 0;





	if (pasid) {

	/* If there is no valid PASID, it's likely a firmware bug */

		const uint32_t *data = ih_ring_entry;

	pasid = SOC15_PASID_FROM_IH_ENTRY(ih_ring_entry);

	if (WARN_ONCE(pasid == 0, "FW bug: No PASID in KFD interrupt"))

		return 0;



	source_id = SOC15_SOURCE_ID_FROM_IH_ENTRY(ih_ring_entry);

	client_id = SOC15_CLIENT_ID_FROM_IH_ENTRY(ih_ring_entry);





	pr_debug("client id 0x%x, source id %d, pasid 0x%x. raw data:\n",

	pr_debug("client id 0x%x, source id %d, pasid 0x%x. raw data:\n",

		 client_id, source_id, pasid);

		 client_id, source_id, pasid);

	pr_debug("%8X, %8X, %8X, %8X, %8X, %8X, %8X, %8X.\n",

	pr_debug("%8X, %8X, %8X, %8X, %8X, %8X, %8X, %8X.\n",

		 data[0], data[1], data[2], data[3],

		 data[0], data[1], data[2], data[3],

		 data[4], data[5], data[6], data[7]);

		 data[4], data[5], data[6], data[7]);

	}





	return (pasid != 0) &&

	/* Interrupt types we care about: various signals and faults.

		(source_id == SOC15_INTSRC_CP_END_OF_PIPE ||

	 * They will be forwarded to a work queue (see below).

	 */

	return source_id == SOC15_INTSRC_CP_END_OF_PIPE ||

		source_id == SOC15_INTSRC_SDMA_TRAP ||

		source_id == SOC15_INTSRC_SDMA_TRAP ||

		source_id == SOC15_INTSRC_SQ_INTERRUPT_MSG ||

		source_id == SOC15_INTSRC_SQ_INTERRUPT_MSG ||

		 source_id == SOC15_INTSRC_CP_BAD_OPCODE);

		source_id == SOC15_INTSRC_CP_BAD_OPCODE;

}

}





static void event_interrupt_wq_v9(struct kfd_dev *dev,

static void event_interrupt_wq_v9(struct kfd_dev *dev,