drm/amdkfd: check both client id and src id in interrupt handlers
Subsystems (3)
PATCH 1/1 drm/amdkfd: check both client id and src id in interrupt handlers
We can have the same src ids for different client ids so make sure to check both the client id and the source id when handling interrupts.
--- .../gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +35 -11
@@ -44,6 +44,21 @@ static bool event_interrupt_isr_v9(struct kfd_dev *dev, client_id =SOC15_CLIENT_ID_FROM_IH_ENTRY (ih_ring_entry); pasid =SOC15_PASID_FROM_IH_ENTRY (ih_ring_entry); +/* Only handle clients we care about */ +if (client_id !=SOC15_IH_CLIENTID_GRBM_CP && + client_id !=SOC15_IH_CLIENTID_SDMA0 && + client_id !=SOC15_IH_CLIENTID_SDMA1 && + client_id !=SOC15_IH_CLIENTID_SDMA2 && + client_id !=SOC15_IH_CLIENTID_SDMA3 && + client_id !=SOC15_IH_CLIENTID_SDMA4 && + client_id !=SOC15_IH_CLIENTID_SDMA5 && + client_id !=SOC15_IH_CLIENTID_SDMA6 && + client_id !=SOC15_IH_CLIENTID_SDMA7 && + client_id !=SOC15_IH_CLIENTID_VMC && + client_id !=SOC15_IH_CLIENTID_VMC1 && + client_id !=SOC15_IH_CLIENTID_UTCL2 ) +return false; +/* This is a known issue for gfx9. Under non HWS, pasid is not set * in the interrupt payload, so we need to find out the pasid on our * own.
@@ -96,17 +111,26 @@ static void event_interrupt_wq_v9(struct kfd_dev *dev, vmid =SOC15_VMID_FROM_IH_ENTRY (ih_ring_entry); context_id =SOC15_CONTEXT_ID0_FROM_IH_ENTRY (ih_ring_entry); -if (source_id ==SOC15_INTSRC_CP_END_OF_PIPE ) -kfd_signal_event_interrupt (pasid, context_id,32 ); -else if (source_id ==SOC15_INTSRC_SDMA_TRAP ) -kfd_signal_event_interrupt (pasid, context_id &0xfffffff ,28 ); -else if (source_id ==SOC15_INTSRC_SQ_INTERRUPT_MSG ) -kfd_signal_event_interrupt (pasid, context_id &0xffffff ,24 ); -else if (source_id ==SOC15_INTSRC_CP_BAD_OPCODE ) -kfd_signal_hw_exception_event (pasid); -else if (client_id ==SOC15_IH_CLIENTID_VMC || - client_id ==SOC15_IH_CLIENTID_VMC1 || - client_id ==SOC15_IH_CLIENTID_UTCL2 ) { +if (client_id ==SOC15_IH_CLIENTID_GRBM_CP ) { +if (source_id ==SOC15_INTSRC_CP_END_OF_PIPE ) +kfd_signal_event_interrupt (pasid, context_id,32 ); +else if (source_id ==SOC15_INTSRC_SQ_INTERRUPT_MSG ) +kfd_signal_event_interrupt (pasid, context_id &0xffffff ,24 ); +else if (source_id ==SOC15_INTSRC_CP_BAD_OPCODE ) +kfd_signal_hw_exception_event (pasid); + }else if (client_id ==SOC15_IH_CLIENTID_SDMA0 || + client_id ==SOC15_IH_CLIENTID_SDMA1 || + client_id ==SOC15_IH_CLIENTID_SDMA2 || + client_id ==SOC15_IH_CLIENTID_SDMA3 || + client_id ==SOC15_IH_CLIENTID_SDMA4 || + client_id ==SOC15_IH_CLIENTID_SDMA5 || + client_id ==SOC15_IH_CLIENTID_SDMA6 || + client_id ==SOC15_IH_CLIENTID_SDMA7 ) { +if (source_id ==SOC15_INTSRC_SDMA_TRAP ) +kfd_signal_event_interrupt (pasid, context_id &0xfffffff ,28 ); + }else if (client_id ==SOC15_IH_CLIENTID_VMC || + client_id ==SOC15_IH_CLIENTID_VMC1 || + client_id ==SOC15_IH_CLIENTID_UTCL2 ) {struct kfd_vm_fault_info info = {0 };uint16_t ring_id =SOC15_RING_ID_FROM_IH_ENTRY (ih_ring_entry);
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 2020-12-18 um 4:34 p.m. schrieb Alex Deucher:
Quoted 4 lines
We can have the same src ids for different client ids so make sure to check both the client id and the source id when handling interrupts.
Signed-off-by Alex Deucher <[email protected]>
Looks reasonable to me. Does this fix a real problem, e.g. KFD intercepting an interrupt meant for another client?
Quoted 58 lines
--- .../gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +28
-11@@ -44,6 +44,21 @@ static bool event_interrupt_isr_v9(struct kfd_dev *dev, client_id =SOC15_CLIENT_ID_FROM_IH_ENTRY (ih_ring_entry); pasid =SOC15_PASID_FROM_IH_ENTRY (ih_ring_entry); +/* Only handle clients we care about */ +if (client_id !=SOC15_IH_CLIENTID_GRBM_CP && + client_id !=SOC15_IH_CLIENTID_SDMA0 && + client_id !=SOC15_IH_CLIENTID_SDMA1 && + client_id !=SOC15_IH_CLIENTID_SDMA2 && + client_id !=SOC15_IH_CLIENTID_SDMA3 && + client_id !=SOC15_IH_CLIENTID_SDMA4 && + client_id !=SOC15_IH_CLIENTID_SDMA5 && + client_id !=SOC15_IH_CLIENTID_SDMA6 && + client_id !=SOC15_IH_CLIENTID_SDMA7 && + client_id !=SOC15_IH_CLIENTID_VMC && + client_id !=SOC15_IH_CLIENTID_VMC1 && + client_id !=SOC15_IH_CLIENTID_UTCL2 ) +return false; +/* This is a known issue for gfx9. Under non HWS, pasid is not set * in the interrupt payload, so we need to find out the pasid on our * own. @@ -96,17 +111,26 @@ static void event_interrupt_wq_v9(struct kfd_dev *dev, vmid =SOC15_VMID_FROM_IH_ENTRY (ih_ring_entry); context_id =SOC15_CONTEXT_ID0_FROM_IH_ENTRY (ih_ring_entry); -if (source_id ==SOC15_INTSRC_CP_END_OF_PIPE ) -kfd_signal_event_interrupt (pasid, context_id,32 ); -else if (source_id ==SOC15_INTSRC_SDMA_TRAP ) -kfd_signal_event_interrupt (pasid, context_id &0xfffffff ,28 ); -else if (source_id ==SOC15_INTSRC_SQ_INTERRUPT_MSG ) -kfd_signal_event_interrupt (pasid, context_id &0xffffff ,24 ); -else if (source_id ==SOC15_INTSRC_CP_BAD_OPCODE ) -kfd_signal_hw_exception_event (pasid); -else if (client_id ==SOC15_IH_CLIENTID_VMC || - client_id ==SOC15_IH_CLIENTID_VMC1 || - client_id ==SOC15_IH_CLIENTID_UTCL2 ) { +if (client_id ==SOC15_IH_CLIENTID_GRBM_CP ) { +if (source_id ==SOC15_INTSRC_CP_END_OF_PIPE ) +kfd_signal_event_interrupt (pasid, context_id,32 ); +else if (source_id ==SOC15_INTSRC_SQ_INTERRUPT_MSG ) +kfd_signal_event_interrupt (pasid, context_id &0xffffff ,24 ); +else if (source_id ==SOC15_INTSRC_CP_BAD_OPCODE ) +kfd_signal_hw_exception_event (pasid); + } else if (client_id == SOC15_IH_CLIENTID_SDMA0 || + client_id == SOC15_IH_CLIENTID_SDMA1 || + client_id == SOC15_IH_CLIENTID_SDMA2 || + client_id == SOC15_IH_CLIENTID_SDMA3 || + client_id == SOC15_IH_CLIENTID_SDMA4 || + client_id == SOC15_IH_CLIENTID_SDMA5 ||
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c static void event_interrupt_wq_v9(struct kfd_dev *dev, · line 136
Quoted 10 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +7
-0+ client_id == SOC15_IH_CLIENTID_SDMA6 || + client_id == SOC15_IH_CLIENTID_SDMA7) { +if (source_id ==SOC15_INTSRC_SDMA_TRAP ) +kfd_signal_event_interrupt (pasid, context_id &0xfffffff ,28 ); + } else if (client_id == SOC15_IH_CLIENTID_VMC || + client_id == SOC15_IH_CLIENTID_VMC1 || + client_id == SOC15_IH_CLIENTID_UTCL2) {struct kfd_vm_fault_info info = {0 };uint16_t ring_id =SOC15_RING_ID_FROM_IH_ENTRY (ih_ring_entry);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 9 lines · Felix Kuehling
Am 2020-12-18 um 4:34 p.m. schrieb Alex Deucher:
Quoted 4 lines
We can have the same src ids for different client ids so make sure to check both the client id and the source id when handling interrupts.
Signed-off-by Alex Deucher <[email protected]>Looks reasonable to me. Does this fix a real problem, e.g. KFD intercepting an interrupt meant for another client?
yeah, we are debugging an issue on another chip and ending up doing the wrong thing here because the source ids are the same for a different client id. I guess another option would be to filter the client ids sent to amdgpu_amdkfd_interrupt(). E.g.,
(quoted diff) +0 -0
b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index afbbec82a289..77a542c2c194 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +14 -1
@@ -464,7 +464,20 @@ void amdgpu_irq_dispatch(struct amdgpu_device *adev, }/* Send it to amdkfd as well if it isn't already handled */ -if (!handled) +if (!handled && + (client_id ==AMDGPU_IRQ_CLIENTID_LEGACY || + client_id ==SOC15_IH_CLIENTID_GRBM_CP || + client_id ==SOC15_IH_CLIENTID_SDMA0 || + client_id ==SOC15_IH_CLIENTID_SDMA1 || + client_id ==SOC15_IH_CLIENTID_SDMA2 || + client_id ==SOC15_IH_CLIENTID_SDMA3 || + client_id ==SOC15_IH_CLIENTID_SDMA4 || + client_id ==SOC15_IH_CLIENTID_SDMA5 || + client_id ==SOC15_IH_CLIENTID_SDMA6 || + client_id ==SOC15_IH_CLIENTID_SDMA7 || + client_id ==SOC15_IH_CLIENTID_VMC || + client_id ==SOC15_IH_CLIENTID_VMC1 || + client_id ==SOC15_IH_CLIENTID_UTCL2 ))amdgpu_amdkfd_interrupt (adev, entry.iv_entry); }
Alex
Quoted 63 lines
Reviewed-by Felix Kuehling <[email protected]>Quoted 60 lines
--- .../gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +30
-11@@ -44,6 +44,21 @@ static bool event_interrupt_isr_v9(struct kfd_dev *dev, client_id =SOC15_CLIENT_ID_FROM_IH_ENTRY (ih_ring_entry); pasid =SOC15_PASID_FROM_IH_ENTRY (ih_ring_entry); +/* Only handle clients we care about */ +if (client_id !=SOC15_IH_CLIENTID_GRBM_CP && + client_id !=SOC15_IH_CLIENTID_SDMA0 && + client_id !=SOC15_IH_CLIENTID_SDMA1 && + client_id !=SOC15_IH_CLIENTID_SDMA2 && + client_id !=SOC15_IH_CLIENTID_SDMA3 && + client_id !=SOC15_IH_CLIENTID_SDMA4 && + client_id !=SOC15_IH_CLIENTID_SDMA5 && + client_id !=SOC15_IH_CLIENTID_SDMA6 && + client_id !=SOC15_IH_CLIENTID_SDMA7 && + client_id !=SOC15_IH_CLIENTID_VMC && + client_id !=SOC15_IH_CLIENTID_VMC1 && + client_id !=SOC15_IH_CLIENTID_UTCL2 ) +return false; +/* This is a known issue for gfx9. Under non HWS, pasid is not set * in the interrupt payload, so we need to find out the pasid on our * own. @@ -96,17 +111,26 @@ static void event_interrupt_wq_v9(struct kfd_dev *dev, vmid =SOC15_VMID_FROM_IH_ENTRY (ih_ring_entry); context_id =SOC15_CONTEXT_ID0_FROM_IH_ENTRY (ih_ring_entry); -if (source_id ==SOC15_INTSRC_CP_END_OF_PIPE ) -kfd_signal_event_interrupt (pasid, context_id,32 ); -else if (source_id ==SOC15_INTSRC_SDMA_TRAP ) -kfd_signal_event_interrupt (pasid, context_id &0xfffffff ,28 ); -else if (source_id ==SOC15_INTSRC_SQ_INTERRUPT_MSG ) -kfd_signal_event_interrupt (pasid, context_id &0xffffff ,24 ); -else if (source_id ==SOC15_INTSRC_CP_BAD_OPCODE ) -kfd_signal_hw_exception_event (pasid); -else if (client_id ==SOC15_IH_CLIENTID_VMC || - client_id ==SOC15_IH_CLIENTID_VMC1 || - client_id ==SOC15_IH_CLIENTID_UTCL2 ) { +if (client_id ==SOC15_IH_CLIENTID_GRBM_CP ) { +if (source_id ==SOC15_INTSRC_CP_END_OF_PIPE ) +kfd_signal_event_interrupt (pasid, context_id,32 ); +else if (source_id ==SOC15_INTSRC_SQ_INTERRUPT_MSG ) +kfd_signal_event_interrupt (pasid, context_id &0xffffff ,24 ); +else if (source_id ==SOC15_INTSRC_CP_BAD_OPCODE ) +kfd_signal_hw_exception_event (pasid); + }else if (client_id ==SOC15_IH_CLIENTID_SDMA0 || + client_id ==SOC15_IH_CLIENTID_SDMA1 || + client_id ==SOC15_IH_CLIENTID_SDMA2 || + client_id ==SOC15_IH_CLIENTID_SDMA3 || + client_id ==SOC15_IH_CLIENTID_SDMA4 || + client_id ==SOC15_IH_CLIENTID_SDMA5 || + client_id ==SOC15_IH_CLIENTID_SDMA6 || + client_id ==SOC15_IH_CLIENTID_SDMA7 ) {
Quoted 8 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c static void event_interrupt_wq_v9(struct kfd_dev *dev, · line 136
Quoted 8 lines
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +5
-0+if (source_id ==SOC15_INTSRC_SDMA_TRAP ) +kfd_signal_event_interrupt (pasid, context_id &0xfffffff ,28 ); + }else if (client_id ==SOC15_IH_CLIENTID_VMC || + client_id ==SOC15_IH_CLIENTID_VMC1 || + client_id ==SOC15_IH_CLIENTID_UTCL2 ) {struct kfd_vm_fault_info info = {0 };uint16_t ring_id =SOC15_RING_ID_FROM_IH_ENTRY (ih_ring_entry);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx