[Intel-xe] [PATCH V3 1/2] drm/xe: Indroduce low level driver error counting APIs

Fri Sep 29 05:55:09 UTC 2023

On 27/09/23 19:03, Upadhyay, Tejas wrote:
>
>> -----Original Message-----
>> From: Aravind Iddamsetty <aravind.iddamsetty at linux.intel.com>
>> Sent: Wednesday, September 27, 2023 3:29 PM
>> To: Upadhyay, Tejas <tejas.upadhyay at intel.com>; intel-
>> xe at lists.freedesktop.org
>> Cc: Roper, Matthew D <matthew.d.roper at intel.com>
>> Subject: Re: [Intel-xe] [PATCH V3 1/2] drm/xe: Indroduce low level driver error
>> counting APIs
>>
>>
>> On 25/09/23 20:13, Tejas Upadhyay wrote:
>>> Low level driver error that might have power or performance impact on
>>> the system, we are adding a new error counter to GT and tile and
>>> increment on each occurrance. Lets introduce APIs to define and
>>> increment each error type counter.
>>>
>>> V3:
>>>   - correct #define max value
>>> V2:
>>>   - Move some code to its related patch - Michal
>>>   - Renaming if API and enum - Michal
>>>   - GUC errors are moved per GT - Michal
>>>   - Some nits - Michal
>>>
>>> Signed-off-by: Tejas Upadhyay <tejas.upadhyay at intel.com>
>>> ---
>>>  drivers/gpu/drm/xe/xe_device.h       |  2 ++
>>>  drivers/gpu/drm/xe/xe_device_types.h |  9 +++++++++
>>>  drivers/gpu/drm/xe/xe_gt.c           | 18 ++++++++++++++++++
>>>  drivers/gpu/drm/xe/xe_gt.h           |  3 +++
>>>  drivers/gpu/drm/xe/xe_gt_types.h     | 10 ++++++++++
>>>  drivers/gpu/drm/xe/xe_tile.c         | 18 ++++++++++++++++++
>>>  6 files changed, 60 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/xe/xe_device.h
>>> b/drivers/gpu/drm/xe/xe_device.h index c4232de40ae0..b44c91d1cec9
>>> 100644
>>> --- a/drivers/gpu/drm/xe/xe_device.h
>>> +++ b/drivers/gpu/drm/xe/xe_device.h
>>> @@ -159,5 +159,7 @@ static inline bool xe_device_has_flat_ccs(struct
>>> xe_device *xe)  }
>>>
>>>  u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size);
>>> +void xe_tile_report_driver_error(struct xe_tile *tile,
>>> +				 const enum xe_tile_drv_err_type err);
>>>
>>>  #endif
>>> diff --git a/drivers/gpu/drm/xe/xe_device_types.h
>>> b/drivers/gpu/drm/xe/xe_device_types.h
>>> index 32ab0fea04ee..a28e140f9e64 100644
>>> --- a/drivers/gpu/drm/xe/xe_device_types.h
>>> +++ b/drivers/gpu/drm/xe/xe_device_types.h
>>> @@ -57,6 +57,12 @@ struct xe_ggtt;
>>>  		 const struct xe_tile * : (const struct xe_device *)((tile__)->xe),
>> 	\
>>>  		 struct xe_tile * : (tile__)->xe)
>>>
>>> +#define XE_TILE_DRV_ERR_MAX	2
>> this shall be part of below enum no need to define separately
>>> +enum xe_tile_drv_err_type {
>>> +	XE_TILE_DRV_ERR_GGTT,
>>> +	XE_TILE_DRV_ERR_INTR
>>> +};
> Hi Aravind, it was done same way in previous version, but Michal's comment was if someone passes " XE_TILE_DRV_ERR_MAX" then compiler wont throw an error. So better to define outside which I don’t think is bad idea.

in that case do like this, so one would not accidentally miss updating the max when enum is updated.

enum xe_tile_drv_err_type {
    XE_TILE_DRV_ERR_GGTT,
    XE_TILE_DRV_ERR_INTR
    __XE_TILE_DRV_ERR_MAX
};

#define XE_TILE_DRV_ERR_MAX __XE_TILE_DRV_ERR_MAX

Thanks,
Aravind.
>
> Thanks,
> Tejas
>>> +
>>>  /**
>>>   * struct xe_mem_region - memory region structure
>>>   * This is used to describe a memory region in xe @@ -173,6 +179,9 @@
>>> struct xe_tile {
>>>
>>>  	/** @sysfs: sysfs' kobj used by xe_tile_sysfs */
>>>  	struct kobject *sysfs;
>>> +
>>> +	/** @drv_err_cnt: driver error counter for this tile */
>>> +	u32 drv_err_cnt[XE_TILE_DRV_ERR_MAX];
>>>  };
>>>
>>>  /**
>>> diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
>>> index 1aa44d4f9ac1..a1a0eb59ecc5 100644
>>> --- a/drivers/gpu/drm/xe/xe_gt.c
>>> +++ b/drivers/gpu/drm/xe/xe_gt.c
>>> @@ -47,6 +47,24 @@
>>>  #include "xe_wa.h"
>>>  #include "xe_wopcm.h"
>>>
>>> +/**
>>> + * xe_gt_report_driver_error - Count driver err for gt
>> %s/err/error/g
>>> + * @gt: GT to count error for
>>> + * @err: enum error type
>>> + *
>>> + * Increment the driver error counter in respective error
>>> + * category for this GT.
>>> + *
>>> + * Returns void.
>>> + */
>>> +void xe_gt_report_driver_error(struct xe_gt *gt,
>>> +			       const enum xe_gt_drv_err_type err) {
>>> +	xe_gt_assert(gt, err >= ARRAY_SIZE(gt->drv_err_cnt));
>>> +	WRITE_ONCE(gt->drv_err_cnt[err],
>>> +		   READ_ONCE(gt->drv_err_cnt[err]) + 1); }
>>> +
>>>  struct xe_gt *xe_gt_alloc(struct xe_tile *tile)  {
>>>  	struct xe_gt *gt;
>>> diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h
>>> index caded203a8a0..9442d615042f 100644
>>> --- a/drivers/gpu/drm/xe/xe_gt.h
>>> +++ b/drivers/gpu/drm/xe/xe_gt.h
>>> @@ -67,4 +67,7 @@ static inline bool xe_gt_is_usm_hwe(struct xe_gt *gt,
>> struct xe_hw_engine *hwe)
>>>  		hwe->instance == gt->usm.reserved_bcs_instance;  }
>>>
>>> +void xe_gt_report_driver_error(struct xe_gt *gt,
>>> +			       const enum xe_gt_drv_err_type err);
>>> +
>>>  #endif
>>> diff --git a/drivers/gpu/drm/xe/xe_gt_types.h
>>> b/drivers/gpu/drm/xe/xe_gt_types.h
>>> index d4310be3e1e7..4645ea9b7893 100644
>>> --- a/drivers/gpu/drm/xe/xe_gt_types.h
>>> +++ b/drivers/gpu/drm/xe/xe_gt_types.h
>>> @@ -24,6 +24,13 @@ enum xe_gt_type {
>>>  	XE_GT_TYPE_MEDIA,
>>>  };
>>>
>>> +#define XE_GT_DRV_ERR_MAX	3
>> same here add to below enum
>>> +enum xe_gt_drv_err_type {
>>> +	XE_GT_DRV_ERR_GUC_COMM,
>>> +	XE_GT_DRV_ERR_ENGINE,
>>> +	XE_GT_DRV_ERR_OTHERS
>>> +};
>>> +
>>>  #define XE_MAX_DSS_FUSE_REGS	3
>>>  #define XE_MAX_EU_FUSE_REGS	1
>>>
>>> @@ -347,6 +354,9 @@ struct xe_gt {
>>>  		/** @oob: bitmap with active OOB workaroudns */
>>>  		unsigned long *oob;
>>>  	} wa_active;
>>> +
>>> +	/** @drv_err_cnt: driver error counter for this GT */
>>> +	u32 drv_err_cnt[XE_GT_DRV_ERR_MAX];
>>>  };
>>>
>>>  #endif
>>> diff --git a/drivers/gpu/drm/xe/xe_tile.c
>>> b/drivers/gpu/drm/xe/xe_tile.c index 131752a57f65..4090798aff4c 100644
>>> --- a/drivers/gpu/drm/xe/xe_tile.c
>>> +++ b/drivers/gpu/drm/xe/xe_tile.c
>>> @@ -71,6 +71,24 @@
>>>   *  - MOCS and PAT programming
>>>   */
>>>
>>> +/**
>>> + * xe_tile_report_driver_error - Count driver err for tile
>> %s/err/error/g
>>> + * @tile: Tile to count error for
>>> + * @err: enum error type
>>> + *
>>> + * Increment the driver error counter in respective error
>>> + * category for this tile.
>>> + *
>>> + * Returns void.
>>> + */
>>> +void xe_tile_report_driver_error(struct xe_tile *tile,
>>> +				 const enum xe_tile_drv_err_type err) {
>>> +	xe_assert(tile_to_xe(tile), err >= ARRAY_SIZE(tile->drv_err_cnt));
>>> +	WRITE_ONCE(tile->drv_err_cnt[err],
>>> +		   READ_ONCE(tile->drv_err_cnt[err]) + 1); }
>>> +
>>>  /**
>>>   * xe_tile_alloc - Perform per-tile memory allocation
>>>   * @tile: Tile to perform allocations for
>> Thanks,
>> Aravind.