habanalabs: add uapi to retrieve device utilization
PATCH 1/2 habanalabs: add uapi to retrieve device utilization
Users and sysadmins usually want to know what is the device utilization as a level 0 indication if they are efficiently using the device.
Add a new opcode to the INFO IOCTL that will return the device utilization over the last period of 100-1000ms. The return value is 0-100, representing as percentage the total utilization rate.
--- drivers/misc/habanalabs/command_submission.c | 20 +++- drivers/misc/habanalabs/device.c | 114 ++++++++++++++++++- drivers/misc/habanalabs/habanalabs.h | 23 +++- drivers/misc/habanalabs/habanalabs_ioctl.c | 27 +++++ drivers/misc/habanalabs/hw_queue.c | 8 +- drivers/misc/habanalabs/include/goya/goya.h | 2 + include/uapi/misc/habanalabs.h | 49 +++++--- 7 files changed, 220 insertions(+), 23 deletions(-)
drivers/misc/habanalabs/command_submission.c +16 -4
@@ -178,11 +178,23 @@ static void cs_do_release(struct kref *ref)/* We also need to update CI for internal queues */ if (cs->submitted) { -int cs_cnt =atomic_dec_return (&hdev->cs_active_cnt); + hdev->asic_funcs->hw_queues_lock (hdev); -WARN_ONCE ((cs_cnt <0 ), -"hl%d: error in CS active cnt %d\n" , - hdev->id, cs_cnt); + hdev->cs_active_cnt--; +if (!hdev->cs_active_cnt) { +struct hl_device_idle_busy_ts *ts; + + ts = &hdev->idle_busy_ts_arr[hdev->idle_busy_ts_idx++]; + ts->busy_to_idle_ts =ktime_get (); + +if (hdev->idle_busy_ts_idx ==HL_IDLE_BUSY_TS_ARR_SIZE ) + hdev->idle_busy_ts_idx =0 ; + }else if (hdev->cs_active_cnt <0 ) { +dev_crit (hdev->dev,"CS active cnt %d is negative\n" , + hdev->cs_active_cnt); + } + + hdev->asic_funcs->hw_queues_unlock (hdev);hl_int_hw_queue_update_ci (cs);
drivers/misc/habanalabs/device.c +113 -1
147 lines not on this page · raw message
drivers/misc/habanalabs/habanalabs.h +21 -2
@@ -45,6 +45,8 @@/* MUST BE POWER OF 2 and larger than 1 */ #define HL_MAX_PENDING_CS 64 +#define HL_IDLE_BUSY_TS_ARR_SIZE 4096 +/* Memory */ #define MEM_HASH_TABLE_BITS 7/* 1 << 7 buckets */
@@ -1156,6 +1158,16 @@ struct hl_device_reset_work {struct hl_device *hdev; }; +/** +* struct hl_device_idle_busy_ts - used for calculating device utilization rate. +* @idle_to_busy_ts: timestamp where device changed from idle to busy. +* @busy_to_idle_ts: timestamp where device changed from busy to idle. +*/ +struct hl_device_idle_busy_ts { +ktime_t idle_to_busy_ts; +ktime_t busy_to_idle_ts; +}; +/** * struct hl_device - habanalabs device structure. * @pdev: pointer to PCI device, can be NULL in case of simulator device.
@@ -1203,19 +1215,22 @@ struct hl_device_reset_work {* when a user opens the device * @fpriv_list_lock: protects the fpriv_list * @compute_ctx: current compute context executing. +* @idle_busy_ts_arr: array to hold time stamps of transitions from idle to busy +* and vice-versa * @dram_used_mem: current DRAM memory consumption. * @timeout_jiffies: device CS timeout value. * @max_power: the max power of the device, as configured by the sysadmin. This * value is saved so in case of hard-reset, KMD will restore this * value and update the F/W after the re-initialization * @in_reset: is device in reset flow. +* @curr_pll_profile: current PLL profile. * @cs_active_cnt: number of active command submissions on this device (active * means already in H/W queues) -* @curr_pll_profile: current PLL profile. * @major: habanalabs KMD major. * @high_pll: high PLL profile frequency. * @soft_reset_cnt: number of soft reset since KMD loading. * @hard_reset_cnt: number of hard reset since KMD loading. +* @idle_busy_ts_idx: index of current entry in idle_busy_ts_arr * @id: device minor. * @id_control: minor of the control device * @disabled: is device disabled.
@@ -1285,16 +1300,19 @@ struct hl_device {struct hl_ctx *compute_ctx; +struct hl_device_idle_busy_ts *idle_busy_ts_arr; +atomic64_t dram_used_mem;u64 timeout_jiffies;u64 max_power;atomic_t in_reset; -atomic_t cs_active_cnt;enum hl_pll_frequency curr_pll_profile; +int cs_active_cnt;u32 major;u32 high_pll;u32 soft_reset_cnt;u32 hard_reset_cnt; +u32 idle_busy_ts_idx;u16 id;u16 id_control;u8 disabled;
@@ -1457,6 +1475,7 @@ int hl_device_reset(struct hl_device *hdev, bool hard_reset,void hl_hpriv_get (struct hl_fpriv *hpriv);void hl_hpriv_put (struct hl_fpriv *hpriv);int hl_device_set_frequency (struct hl_device *hdev,enum hl_pll_frequency freq); +uint32_t hl_device_utilization (struct hl_device *hdev,uint32_t period_ms);int hl_build_hwmon_channel_info (struct hl_device *hdev,struct armcp_sensor *sensors_arr);
drivers/misc/habanalabs/habanalabs_ioctl.c +27 -0
@@ -197,6 +197,29 @@ static int debug_coresight(struct hl_device *hdev, struct hl_debug_args *args)return rc; } +static int device_utilization (struct hl_device *hdev,struct hl_info_args *args) +{ +struct hl_info_device_utilization device_util = {0 }; +u32 max_size = args->return_size; +void __user *out = (void __user *) (uintptr_t ) args->return_pointer; + +if ((!max_size) || (!out)) +return -EINVAL ; + +if ((args->period_ms <100 ) || (args->period_ms >1000 ) || + (args->period_ms %100 )) { +dev_err (hdev->dev, +"period %u must be between 100 - 1000 and must be divisible by 100\n" , + args->period_ms); +return -EINVAL ; + } + + device_util.utilization =hl_device_utilization (hdev, args->period_ms); + +return copy_to_user (out, &device_util, +min ((size_t ) max_size,sizeof (device_util))) ? -EFAULT :0 ; +} +static int _hl_info_ioctl (struct hl_fpriv *hpriv,void *data,struct device *dev) {
@@ -239,6 +262,10 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data, rc =hw_idle (hdev, args);break ; +case HL_INFO_DEVICE_UTILIZATION : + rc =device_utilization (hdev, args); +break ; +default :dev_err (dev,"Invalid request %d\n" , args->op); rc = -ENOTTY ;
drivers/misc/habanalabs/hw_queue.c +7 -1
@@ -364,7 +364,13 @@ int hl_hw_queue_schedule_cs(struct hl_cs *cs)spin_unlock (&hdev->hw_queues_mirror_lock); } -atomic_inc (&hdev->cs_active_cnt); +if (!hdev->cs_active_cnt++) { +struct hl_device_idle_busy_ts *ts; + + ts = &hdev->idle_busy_ts_arr[hdev->idle_busy_ts_idx]; + ts->busy_to_idle_ts =ktime_set (0 ,0 ); + ts->idle_to_busy_ts =ktime_get (); + }list_for_each_entry_safe (job, tmp, &cs->job_list, cs_node)if (job->ext_queue)
drivers/misc/habanalabs/include/goya/goya.h +2 -0
@@ -38,4 +38,6 @@#define TPC_MAX_NUM 8 +#define MME_MAX_NUM 1 +#endif /* GOYA_H */
include/uapi/misc/habanalabs.h +34 -15
70 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/2 habanalabs: add uapi to retrieve aggregate H/W events
Add a new opcode to INFO IOCTL to retrieve aggregate H/W events. i.e. the events counters are NOT cleared upon device reset, but count from the loading of the driver.
Add the code to support it in the device event handling function.
--- drivers/misc/habanalabs/goya/goya.c | 9 +++++++-- drivers/misc/habanalabs/goya/goyaP.h | 3 ++- drivers/misc/habanalabs/habanalabs.h | 3 ++- drivers/misc/habanalabs/habanalabs_ioctl.c | 11 ++++++++--- include/uapi/misc/habanalabs.h | 3 +++ 5 files changed, 22 insertions(+), 7 deletions(-)
drivers/misc/habanalabs/goya/goya.c +7 -2
@@ -4469,6 +4469,7 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry)struct goya_device *goya = hdev->asic_specific; goya->events_stat[event_type]++; + goya->events_stat_aggregate[event_type]++;switch (event_type) {case GOYA_ASYNC_EVENT_ID_PCIE_IF :
@@ -4550,12 +4551,16 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry) } } -void *goya_get_events_stat (struct hl_device *hdev,u32 *size) +void *goya_get_events_stat (struct hl_device *hdev,bool aggregate,u32 *size) {struct goya_device *goya = hdev->asic_specific; - *size = (u32 )sizeof (goya->events_stat); +if (aggregate) { + *size = (u32 )sizeof (goya->events_stat_aggregate); +return goya->events_stat_aggregate; + } + *size = (u32 )sizeof (goya->events_stat);return goya->events_stat; }
drivers/misc/habanalabs/goya/goyaP.h +2 -1
@@ -162,6 +162,7 @@ struct goya_device {u64 ddr_bar_cur_addr;u32 events_stat[GOYA_ASYNC_EVENT_ID_SIZE ]; +u32 events_stat_aggregate[GOYA_ASYNC_EVENT_ID_SIZE ];u32 hw_cap_initialized;u8 device_cpu_mmu_mappings_done; };
@@ -215,7 +216,7 @@ int goya_suspend(struct hl_device *hdev);int goya_resume (struct hl_device *hdev);void goya_handle_eqe (struct hl_device *hdev,struct hl_eq_entry *eq_entry); -void *goya_get_events_stat (struct hl_device *hdev,u32 *size); +void *goya_get_events_stat (struct hl_device *hdev,bool aggregate,u32 *size);void goya_add_end_of_cb_packets (struct hl_device *hdev,u64 kernel_address,u32 len,u64 cq_addr,u32 cq_val,u32 msix_vec);
drivers/misc/habanalabs/habanalabs.h +2 -1
@@ -558,7 +558,8 @@ struct hl_asic_funcs { struct hl_eq_entry *eq_entry);void (*set_pll_profile)(struct hl_device *hdev,enum hl_pll_frequency freq); -void * (*get_events_stat)(struct hl_device *hdev,u32 *size); +void * (*get_events_stat)(struct hl_device *hdev,bool aggregate, +u32 *size);u64 (*read_pte)(struct hl_device *hdev,u64 addr);void (*write_pte)(struct hl_device *hdev,u64 addr,u64 val);void (*mmu_invalidate_cache)(struct hl_device *hdev,bool is_hard);
drivers/misc/habanalabs/habanalabs_ioctl.c +8 -3
@@ -75,7 +75,8 @@ static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args) min((size_t)size, sizeof(hw_ip))) ? -EFAULT : 0; } -static int hw_events_info (struct hl_device *hdev,struct hl_info_args *args) +static int hw_events_info (struct hl_device *hdev,bool aggregate, +struct hl_info_args *args) {u32 size, max_size = args->return_size;void __user *out = (void __user *) (uintptr_t ) args->return_pointer;
@@ -84,7 +85,7 @@ static int hw_events_info(struct hl_device *hdev, struct hl_info_args *args)if ((!max_size) || (!out))return -EINVAL ; - arr = hdev->asic_funcs->get_events_stat (hdev, &size); + arr = hdev->asic_funcs->get_events_stat (hdev, aggregate, &size);return copy_to_user (out, arr,min (max_size, size)) ? -EFAULT :0 ; }
@@ -251,7 +252,7 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data,switch (args->op) {case HL_INFO_HW_EVENTS : - rc =hw_events_info (hdev, args); + rc =hw_events_info (hdev, false, args);break ;case HL_INFO_DRAM_USAGE :
@@ -266,6 +267,10 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data, rc =device_utilization (hdev, args);break ; +case HL_INFO_HW_EVENTS_AGGREGATE : + rc =hw_events_info (hdev, true, args); +break ; +default :dev_err (dev,"Invalid request %d\n" , args->op); rc = -ENOTTY ;
include/uapi/misc/habanalabs.h +3 -0
@@ -93,6 +93,8 @@ enum hl_device_status {* The period can be between 100ms to 1s, in * resolution of 100ms. The return value is a * percentage of the utilization rate. +* HL_INFO_HW_EVENTS_AGGREGATE - Receive an array describing how many times each +* event occurred since the driver was loaded. */ #define HL_INFO_HW_IP_INFO 0#define HL_INFO_HW_EVENTS 1
@@ -100,6 +102,7 @@ enum hl_device_status {#define HL_INFO_HW_IDLE 3#define HL_INFO_DEVICE_STATUS 4#define HL_INFO_DEVICE_UTILIZATION 6 +#define HL_INFO_HW_EVENTS_AGGREGATE 7#define HL_INFO_VERSION_MAX_LEN 128
Signature · 1 line
2.17.1
RE: [PATCH 2/2] habanalabs: add uapi to retrieve aggregate H/W events
From: Oded Gabbay <[email protected]>
Sent: Friday, 30 August 2019 13:57
Quoted 7 lines
Add a new opcode to INFO IOCTL to retrieve aggregate H/W events. i.e. the events counters are NOT cleared upon device reset, but count from the loading of the driver.
Add the code to support it in the device event handling function.
Signed-off-by Oded Gabbay <[email protected]>
From: Oded Gabbay <[email protected]>
Sent: Friday, 30 August 2019 13:57
Quoted 8 lines
Users and sysadmins usually want to know what is the device utilization as a level 0 indication if they are efficiently using the device.
Add a new opcode to the INFO IOCTL that will return the device utilization over the last period of 100-1000ms. The return value is 0-100, representing as percentage the total utilization rate.
Signed-off-by Oded Gabbay <[email protected]>