habanalabs: improve MMU cache invalidation code
PATCH 1/4 habanalabs: improve MMU cache invalidation code
From: Omer Shpigelman <[email protected]>
A new sequence is introduced to invalidate the MMU cache in order to avoid timeouts.
--- drivers/misc/habanalabs/gaudi/gaudi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +4 -2
@@ -5982,16 +5982,18 @@ static void gaudi_mmu_invalidate_cache(struct hl_device *hdev, bool is_hard, timeout_usec =MMU_CONFIG_TIMEOUT_USEC ;/* L0 & L1 invalidation */ -WREG32 (mmSTLB_INV_ALL_START,1 ); +WREG32 (mmSTLB_INV_PS,2 ); rc =hl_poll_timeout ( hdev, - mmSTLB_INV_ALL_START, + mmSTLB_INV_PS, status, !status,1000 , timeout_usec); +WREG32 (mmSTLB_INV_SET,0 ); +if (rc)dev_notice_ratelimited (hdev->dev,"Timeout when waiting for MMU cache invalidation\n" );
Signature · 1 line
2.17.1
PATCH 2/4 habanalabs: add print for soft reset due to event
From: Omer Shpigelman <[email protected]>
Print the event name that caused the soft reset.
--- drivers/misc/habanalabs/gaudi/gaudi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +10 -2
@@ -5843,8 +5843,12 @@ static void gaudi_handle_eqe(struct hl_device *hdev, soft_reset_required =gaudi_tpc_read_interrupts (hdev,tpc_dec_event_to_tpc_id (event_type),"AXI_SLV_DEC_Error" ); -if (soft_reset_required) +if (soft_reset_required) { +dev_err_ratelimited (hdev->dev, +"soft reset required due to %s\n" , + gaudi_irq_map_table[event_type].name);hl_device_reset (hdev, false, false); + }hl_fw_unmask_irq (hdev, event_type);break ;
@@ -5860,8 +5864,12 @@ static void gaudi_handle_eqe(struct hl_device *hdev, soft_reset_required =gaudi_tpc_read_interrupts (hdev,tpc_krn_event_to_tpc_id (event_type),"KRN_ERR" ); -if (soft_reset_required) +if (soft_reset_required) { +dev_err_ratelimited (hdev->dev, +"soft reset required due to %s\n" , + gaudi_irq_map_table[event_type].name);hl_device_reset (hdev, false, false); + }hl_fw_unmask_irq (hdev, event_type);break ;
Signature · 1 line
2.17.1
PATCH 3/4 habanalabs: GAUDI does not support soft-reset
In reply to Oded GabbayGAUDI does not support soft-reset as it leaves the NIC ports in an awkward state, where their QMANs were reset but the NIC itself is still working.
In addition, there is not much sense in doing soft-reset when training is done on multiple GAUDIs.
--- drivers/misc/habanalabs/device.c | 6 +++++ drivers/misc/habanalabs/gaudi/gaudi.c | 38 +++++++++++++++------------ drivers/misc/habanalabs/goya/goya.c | 1 + drivers/misc/habanalabs/habanalabs.h | 2 ++ drivers/misc/habanalabs/sysfs.c | 5 ++++ 5 files changed, 35 insertions(+), 17 deletions(-)
drivers/misc/habanalabs/device.c +6 -0
@@ -801,6 +801,7 @@ static void device_hard_reset_pending(struct work_struct *work)* @hdev: pointer to habanalabs device structure * @hard_reset: should we do hard reset to all engines or just reset the * compute/dma engines +* @from_hard_reset_thread: is the caller the hard-reset thread * * Block future CS and wait for pending CS to be enqueued * Call ASIC H/W fini
@@ -823,6 +824,11 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset,return 0 ; } +if ((!hard_reset) && (!hdev->supports_soft_reset)) { +dev_dbg (hdev->dev,"Doing hard-reset instead of soft-reset\n" ); + hard_reset = true; + } +/* * Prevent concurrency in this function - only one reset should be * done at any given time. Only need to perform this if we didn't
drivers/misc/habanalabs/gaudi/gaudi.c +21 -17
@@ -5774,7 +5774,7 @@ static void gaudi_handle_eqe(struct hl_device *hdev,u16 event_type = ((ctl &EQ_CTL_EVENT_TYPE_MASK ) >>EQ_CTL_EVENT_TYPE_SHIFT );u8 cause; -bool soft_reset_required; +bool reset_required; gaudi->events_stat[event_type]++; gaudi->events_stat_aggregate[event_type]++;
@@ -5840,16 +5840,18 @@ static void gaudi_handle_eqe(struct hl_device *hdev,case GAUDI_EVENT_TPC6_DEC :case GAUDI_EVENT_TPC7_DEC :gaudi_print_irq_info (hdev, event_type, true); - soft_reset_required =gaudi_tpc_read_interrupts (hdev, + reset_required =gaudi_tpc_read_interrupts (hdev,tpc_dec_event_to_tpc_id (event_type),"AXI_SLV_DEC_Error" ); -if (soft_reset_required) { -dev_err_ratelimited (hdev->dev, -"soft reset required due to %s\n" , - gaudi_irq_map_table[event_type].name); -hl_device_reset (hdev, false, false); +if (reset_required) { +dev_err (hdev->dev,"hard reset required due to %s\n" , + gaudi_irq_map_table[event_type].name); + +if (hdev->hard_reset_on_fw_events) +hl_device_reset (hdev, true, false); + }else { +hl_fw_unmask_irq (hdev, event_type); } -hl_fw_unmask_irq (hdev, event_type);break ;case GAUDI_EVENT_TPC0_KRN_ERR :
@@ -5861,16 +5863,18 @@ static void gaudi_handle_eqe(struct hl_device *hdev,case GAUDI_EVENT_TPC6_KRN_ERR :case GAUDI_EVENT_TPC7_KRN_ERR :gaudi_print_irq_info (hdev, event_type, true); - soft_reset_required =gaudi_tpc_read_interrupts (hdev, + reset_required =gaudi_tpc_read_interrupts (hdev,tpc_krn_event_to_tpc_id (event_type),"KRN_ERR" ); -if (soft_reset_required) { -dev_err_ratelimited (hdev->dev, -"soft reset required due to %s\n" , - gaudi_irq_map_table[event_type].name); -hl_device_reset (hdev, false, false); +if (reset_required) { +dev_err (hdev->dev,"hard reset required due to %s\n" , + gaudi_irq_map_table[event_type].name); + +if (hdev->hard_reset_on_fw_events) +hl_device_reset (hdev, true, false); + }else { +hl_fw_unmask_irq (hdev, event_type); } -hl_fw_unmask_irq (hdev, event_type);break ;case GAUDI_EVENT_PCIE_CORE_SERR :
@@ -5921,8 +5925,8 @@ static void gaudi_handle_eqe(struct hl_device *hdev,case GAUDI_EVENT_RAZWI_OR_ADC_SW :gaudi_print_irq_info (hdev, event_type, true); -hl_device_reset (hdev, false, false); -hl_fw_unmask_irq (hdev, event_type); +if (hdev->hard_reset_on_fw_events) +hl_device_reset (hdev, true, false);break ;case GAUDI_EVENT_TPC0_BMON_SPMU :
drivers/misc/habanalabs/goya/goya.c +1 -0
@@ -752,6 +752,7 @@ static int goya_sw_init(struct hl_device *hdev)spin_lock_init (&goya->hw_queues_lock); hdev->supports_coresight = true; + hdev->supports_soft_reset = true;return 0 ;
drivers/misc/habanalabs/habanalabs.h +2 -0
@@ -1436,6 +1436,7 @@ struct hl_device_idle_busy_ts {* @stop_on_err: true if engines should stop on error. * @supports_sync_stream: is sync stream supported. * @supports_coresight: is CoreSight supported. +* @supports_soft_reset: is soft reset supported. */ struct hl_device {struct pci_dev *pdev;
@@ -1522,6 +1523,7 @@ struct hl_device {u8 stop_on_err;u8 supports_sync_stream;u8 supports_coresight; +u8 supports_soft_reset;/* Parameters for bring-up */ u8 mmu_enable;
drivers/misc/habanalabs/sysfs.c +5 -0
@@ -183,6 +183,11 @@ static ssize_t soft_reset_store(struct device *dev, goto out; } +if (!hdev->supports_soft_reset) { +dev_err (hdev->dev,"Device does not support soft-reset\n" ); + goto out; + } +dev_warn (hdev->dev,"Soft-Reset requested through sysfs\n" );hl_device_reset (hdev, false, false);
Signature · 1 line
2.17.1
PATCH 4/4 habanalabs: don't allow hard reset with open processes
In reply to Oded GabbayFrom: Omer Shpigelman <[email protected]>
When the MMU is heavily used by the engines, unmapping might take a lot of time due to a full MMU cache invalidation done as part of the unmap flow. Hence we might not be able to kill all open processes before going to hard reset the device, as it involves unmapping of all user memory. In case of a failure in killing all open processes, we should stop the hard reset flow as it might lead to a kernel crash - one thread (killing of a process) is updating MMU structures that other thread (hard reset) is freeing.
Stopping a hard reset flow leaves the device as nonoperational and the user can then initiate a hard reset via sysfs to reinitialize the device.
--- drivers/misc/habanalabs/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/misc/habanalabs/device.c +11 -6
@@ -726,7 +726,7 @@ int hl_device_resume(struct hl_device *hdev)return rc; } -static void device_kill_open_processes (struct hl_device *hdev) +static int device_kill_open_processes (struct hl_device *hdev) {u16 pending_total, pending_cnt;struct hl_fpriv *hpriv;
@@ -779,9 +779,7 @@ static void device_kill_open_processes(struct hl_device *hdev)ssleep (1 ); } -if (!list_empty (&hdev->fpriv_list)) -dev_crit (hdev->dev, -"Going to hard reset with open user contexts\n" ); +return list_empty (&hdev->fpriv_list) ?0 : -EBUSY ; }static void device_hard_reset_pending (struct work_struct *work)
@@ -908,7 +906,12 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset,* process can't really exit until all its CSs are done, which * is what we do in cs rollback */ -device_kill_open_processes (hdev); + rc =device_kill_open_processes (hdev); +if (rc) { +dev_crit (hdev->dev, +"Failed to kill all open processes, stopping hard reset\n" ); + goto out_err; + }/* Flush the Event queue workers to make sure no other thread is * reading or writing to registers during the reset
@@ -1391,7 +1394,9 @@ void hl_device_fini(struct hl_device *hdev)* can't really exit until all its CSs are done, which is what we * do in cs rollback */ -device_kill_open_processes (hdev); + rc =device_kill_open_processes (hdev); +if (rc) +dev_crit (hdev->dev,"Failed to kill all open processes\n" );hl_cb_pool_fini (hdev);
Signature · 1 line
2.17.1
RE: [PATCH 3/4] habanalabs: GAUDI does not support soft-reset
In reply to Oded GabbayQuoted 7 lines · Oded Gabbay
GAUDI does not support soft-reset as it leaves the NIC ports in an awkward state, where their QMANs were reset but the NIC itself is still working.
In addition, there is not much sense in doing soft-reset when training is done on multiple GAUDIs.
Signed-off-by Oded Gabbay <[email protected]>