Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Dong, Zhanjun" <zhanjun.dong@intel.com>
To: Michal Wajdeczko <michal.wajdeczko@intel.com>,
	<intel-xe@lists.freedesktop.org>
Subject: Re: [PATCH v6] drm/xe/guc: Cleanup GuC log buffer macros and helpers
Date: Mon, 27 Oct 2025 20:19:40 -0400	[thread overview]
Message-ID: <e9b98170-8dba-4640-a9ca-034bd40ac4c8@intel.com> (raw)
In-Reply-To: <cdcac9b3-79b2-4c3c-9a7c-de6fa584b2ac@intel.com>

Please see my inline comments below.

Regards,
Zhanjun Dong

On 2025-10-23 7:04 p.m., Michal Wajdeczko wrote:
> 
> 
> On 10/23/2025 7:58 PM, Zhanjun Dong wrote:
>> Cleanup GuC log buffer macros and helpers, add Xe style macro prefix.
>> Update buffer type values to align with the GuC specification
>> Update buffer offset calculation.
>> Remove helper functions, replaced with macros.
>>
>> Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
>> ---
>> Cc: michal.wajdeczko@intel.com
>> ---
>> Change list:
>> v6: Avoid change same line in series twice, squash into single patch
>>      Correct PAGE_SIZE to 4K
>>      Promote memory layout comment to kernel-doc
>> v5: Change patch order
>>      Sync macro names across buffer type, size and GUC_CTL_LOG_PARAMS
>>      Replace guc_log_size with macro
>>      Update log buffer layout comments
>> v4: Replace helper functions with macros
>>      Rename log type xxx_DEBUG to xxx_EVENT_LOG
>> v3: Update comments
>> v2: Use SZ_4K, instead of PAGE_SIZE
>>      Expand for loop with switch and fallthrough
>> ---
>>   drivers/gpu/drm/xe/abi/guc_log_abi.h |   4 +-
>>   drivers/gpu/drm/xe/xe_guc.c          |  23 ++---
>>   drivers/gpu/drm/xe/xe_guc_capture.c  |  16 ++--
>>   drivers/gpu/drm/xe/xe_guc_fwif.h     |   6 +-
>>   drivers/gpu/drm/xe/xe_guc_log.c      | 129 +++++++++++----------------
>>   drivers/gpu/drm/xe/xe_guc_log.h      |  14 ++-
>>   6 files changed, 82 insertions(+), 110 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/abi/guc_log_abi.h b/drivers/gpu/drm/xe/abi/guc_log_abi.h
>> index 554630b7ccd9..fb5e2b8e7cf9 100644
>> --- a/drivers/gpu/drm/xe/abi/guc_log_abi.h
>> +++ b/drivers/gpu/drm/xe/abi/guc_log_abi.h
>> @@ -10,9 +10,9 @@
>>   
>>   /* GuC logging buffer types */
>>   enum guc_log_buffer_type {
>> +	GUC_LOG_BUFFER_EVENT_DATA,
>>   	GUC_LOG_BUFFER_CRASH_DUMP,
>> -	GUC_LOG_BUFFER_DEBUG,
>> -	GUC_LOG_BUFFER_CAPTURE,
>> +	GUC_LOG_BUFFER_STATE_CAPTURE,
> 
> 	GUC_LOG_BUFFER_TYPE_EVENT_DATA,
> 	GUC_LOG_BUFFER_TYPE_CRASH_DUMP,
> 	GUC_LOG_BUFFER_TYPE_STATE_CAPTURE,
> 
> or
> 
>     enum guc_log_type {
> 	GUC_LOG_TYPE_EVENT_DATA,
> 	GUC_LOG_TYPE_CRASH_DUMP,
> 	GUC_LOG_TYPE_STATE_CAPTURE,
> 
>>   };
Will change to
/* GuC logging buffer types */	// <- Will leave this to prompt this is 
log buffer type
enum guc_log_type {
  	GUC_LOG_TYPE_EVENT_DATA,
  	GUC_LOG_TYPE_CRASH_DUMP,
  	GUC_LOG_TYPE_STATE_CAPTURE,
...

>>   
>>   #define GUC_LOG_BUFFER_TYPE_MAX		3
> 
> do we still need this?
Yes, upcoming LFD feature will need this>
>> diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
>> index d94490979adc..c82570c70964 100644
>> --- a/drivers/gpu/drm/xe/xe_guc.c
>> +++ b/drivers/gpu/drm/xe/xe_guc.c
>> @@ -99,7 +99,7 @@ static u32 guc_ctl_log_params_flags(struct xe_guc *guc)
>>   	u32 offset = guc_bo_ggtt_addr(guc, guc->log.bo) >> PAGE_SHIFT;
>>   	u32 flags;
>>   
>> -	#if (((CRASH_BUFFER_SIZE) % SZ_1M) == 0)
>> +	#if (((XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE) % SZ_1M) == 0)
>>   	#define LOG_UNIT SZ_1M
>>   	#define LOG_FLAG GUC_LOG_LOG_ALLOC_UNITS
>>   	#else
>> @@ -107,7 +107,7 @@ static u32 guc_ctl_log_params_flags(struct xe_guc *guc)
>>   	#define LOG_FLAG 0
>>   	#endif
>>   
>> -	#if (((CAPTURE_BUFFER_SIZE) % SZ_1M) == 0)
>> +	#if (((XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE) % SZ_1M) == 0)
>>   	#define CAPTURE_UNIT SZ_1M
>>   	#define CAPTURE_FLAG GUC_LOG_CAPTURE_ALLOC_UNITS
>>   	#else
>> @@ -115,20 +115,21 @@ static u32 guc_ctl_log_params_flags(struct xe_guc *guc)
>>   	#define CAPTURE_FLAG 0
>>   	#endif
>>   
>> -	BUILD_BUG_ON(!CRASH_BUFFER_SIZE);
>> -	BUILD_BUG_ON(!IS_ALIGNED(CRASH_BUFFER_SIZE, LOG_UNIT));
>> -	BUILD_BUG_ON(!DEBUG_BUFFER_SIZE);
>> -	BUILD_BUG_ON(!IS_ALIGNED(DEBUG_BUFFER_SIZE, LOG_UNIT));
>> -	BUILD_BUG_ON(!CAPTURE_BUFFER_SIZE);
>> -	BUILD_BUG_ON(!IS_ALIGNED(CAPTURE_BUFFER_SIZE, CAPTURE_UNIT));
>> +	BUILD_BUG_ON(!XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE);
>> +	BUILD_BUG_ON(!IS_ALIGNED(XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE, LOG_UNIT));
>> +	BUILD_BUG_ON(!XE_GUC_LOG_EVENT_DATA_BUFFER_SIZE);
>> +	BUILD_BUG_ON(!IS_ALIGNED(XE_GUC_LOG_EVENT_DATA_BUFFER_SIZE, LOG_UNIT));
>> +	BUILD_BUG_ON(!XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE);
>> +	BUILD_BUG_ON(!IS_ALIGNED(XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE, CAPTURE_UNIT));
>>   
>>   	flags = GUC_LOG_VALID |
>>   		GUC_LOG_NOTIFY_ON_HALF_FULL |
>>   		CAPTURE_FLAG |
>>   		LOG_FLAG |
>> -		FIELD_PREP(GUC_LOG_CRASH, CRASH_BUFFER_SIZE / LOG_UNIT - 1) |
>> -		FIELD_PREP(GUC_LOG_DEBUG, DEBUG_BUFFER_SIZE / LOG_UNIT - 1) |
>> -		FIELD_PREP(GUC_LOG_CAPTURE, CAPTURE_BUFFER_SIZE / CAPTURE_UNIT - 1) |
>> +		FIELD_PREP(GUC_LOG_CRASH_DUMP, XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE / LOG_UNIT - 1) |
>> +		FIELD_PREP(GUC_LOG_EVENT_DATA, XE_GUC_LOG_EVENT_DATA_BUFFER_SIZE / LOG_UNIT - 1) |
>> +		FIELD_PREP(GUC_LOG_STATE_CAPTURE, XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE /
>> +			   CAPTURE_UNIT - 1) |
>>   		FIELD_PREP(GUC_LOG_BUF_ADDR, offset);
>>   
>>   	#undef LOG_UNIT
>> diff --git a/drivers/gpu/drm/xe/xe_guc_capture.c b/drivers/gpu/drm/xe/xe_guc_capture.c
>> index 0c1fbe97b8bf..4e2c5a51adc8 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_capture.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_capture.c
>> @@ -843,7 +843,7 @@ static void check_guc_capture_size(struct xe_guc *guc)
>>   {
>>   	int capture_size = guc_capture_output_size_est(guc);
>>   	int spare_size = capture_size * GUC_CAPTURE_OVERBUFFER_MULTIPLIER;
>> -	u32 buffer_size = xe_guc_log_section_size_capture(&guc->log);
>> +	u32 buffer_size = XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE;
>>   
>>   	/*
>>   	 * NOTE: capture_size is much smaller than the capture region
>> @@ -949,7 +949,7 @@ guc_capture_init_node(struct xe_guc *guc, struct __guc_capture_parsed_output *no
>>    *                  ADS module also calls separately for PF vs VF.
>>    *
>>    *     --> alloc B: GuC output capture buf (registered via guc_init_params(log_param))
>> - *                  Size = #define CAPTURE_BUFFER_SIZE (warns if on too-small)
>> + *                  Size = #define XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE (warns if on too-small)
> 
> do we need this "#define" ? maybe just:
> 
>      *                  Size = &XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE (warns if on too-small)
Sure #define to be removed>
>>    *                  Note2: 'x 3' to hold multiple capture groups
>>    *
>>    * GUC Runtime notify capture:
>> @@ -1367,7 +1367,7 @@ static int __guc_capture_flushlog_complete(struct xe_guc *guc)
>>   {
>>   	u32 action[] = {
>>   		XE_GUC_ACTION_LOG_BUFFER_FILE_FLUSH_COMPLETE,
>> -		GUC_LOG_BUFFER_CAPTURE
>> +		GUC_LOG_BUFFER_STATE_CAPTURE
>>   	};
>>   
>>   	return xe_guc_ct_send_g2h_handler(&guc->ct, action, ARRAY_SIZE(action));
>> @@ -1384,8 +1384,8 @@ static void __guc_capture_process_output(struct xe_guc *guc)
>>   	u32 log_buf_state_offset;
>>   	u32 src_data_offset;
>>   
>> -	log_buf_state_offset = sizeof(struct guc_log_buffer_state) * GUC_LOG_BUFFER_CAPTURE;
>> -	src_data_offset = xe_guc_get_log_buffer_offset(&guc->log, GUC_LOG_BUFFER_CAPTURE);
>> +	log_buf_state_offset = sizeof(struct guc_log_buffer_state) * GUC_LOG_BUFFER_STATE_CAPTURE;
>> +	src_data_offset = xe_guc_get_log_buffer_offset(&guc->log, GUC_LOG_BUFFER_STATE_CAPTURE);
>>   
>>   	/*
>>   	 * Make a copy of the state structure, inside GuC log buffer
>> @@ -1395,15 +1395,15 @@ static void __guc_capture_process_output(struct xe_guc *guc)
>>   	xe_map_memcpy_from(guc_to_xe(guc), &log_buf_state_local, &guc->log.bo->vmap,
>>   			   log_buf_state_offset, sizeof(struct guc_log_buffer_state));
>>   
>> -	buffer_size = xe_guc_get_log_buffer_size(&guc->log, GUC_LOG_BUFFER_CAPTURE);
>> +	buffer_size = XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE;
>>   	read_offset = log_buf_state_local.read_ptr;
>>   	write_offset = log_buf_state_local.sampled_write_ptr;
>>   	full_count = FIELD_GET(GUC_LOG_BUFFER_STATE_BUFFER_FULL_CNT, log_buf_state_local.flags);
>>   
>>   	/* Bookkeeping stuff */
>>   	tmp = FIELD_GET(GUC_LOG_BUFFER_STATE_FLUSH_TO_FILE, log_buf_state_local.flags);
>> -	guc->log.stats[GUC_LOG_BUFFER_CAPTURE].flush += tmp;
>> -	new_overflow = xe_guc_check_log_buf_overflow(&guc->log, GUC_LOG_BUFFER_CAPTURE,
>> +	guc->log.stats[GUC_LOG_BUFFER_STATE_CAPTURE].flush += tmp;
>> +	new_overflow = xe_guc_check_log_buf_overflow(&guc->log, GUC_LOG_BUFFER_STATE_CAPTURE,
>>   						     full_count);
>>   
>>   	/* Now copy the actual logs. */
>> diff --git a/drivers/gpu/drm/xe/xe_guc_fwif.h b/drivers/gpu/drm/xe/xe_guc_fwif.h
>> index 50c4c2406132..8b5c58b1857c 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_fwif.h
>> +++ b/drivers/gpu/drm/xe/xe_guc_fwif.h
>> @@ -91,9 +91,9 @@ struct guc_update_exec_queue_policy {
>>   #define   GUC_LOG_NOTIFY_ON_HALF_FULL	BIT(1)
>>   #define   GUC_LOG_CAPTURE_ALLOC_UNITS	BIT(2)
>>   #define   GUC_LOG_LOG_ALLOC_UNITS	BIT(3)
>> -#define   GUC_LOG_CRASH			REG_GENMASK(5, 4)
>> -#define   GUC_LOG_DEBUG			REG_GENMASK(9, 6)
>> -#define   GUC_LOG_CAPTURE		REG_GENMASK(11, 10)
>> +#define   GUC_LOG_CRASH_DUMP		REG_GENMASK(5, 4)
>> +#define   GUC_LOG_EVENT_DATA		REG_GENMASK(9, 6)
>> +#define   GUC_LOG_STATE_CAPTURE		REG_GENMASK(11, 10)
>>   #define   GUC_LOG_BUF_ADDR		REG_GENMASK(31, 12)
>>   
>>   #define GUC_CTL_WA			1
>> diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
>> index c01ccb35dc75..995148e3f103 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_log.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_log.c
>> @@ -19,6 +19,45 @@
>>   #include "xe_mmio.h"
>>   #include "xe_module.h"
>>   
>> +/**
>> + * DOC: GuC Log buffer Layout
>> + *
>> + * The in-memory log buffer layout is as follows:
> 
> ... as follows::
> 
> and empty line here
will follow>
>> + *  +===============================+	      0000h
>> + *  |    Crash dump state header    |		^
>> + *  +-------------------------------+ 32B	|
>> + *  |      Debug state header       |		|
>> + *  +-------------------------------+ 64B	4KB
>> + *  |     Capture state header      |		|
>> + *  +-------------------------------+ 96B	|
>> + *  |                               |		v
>> + *  +===============================+ <--- EVENT_DATA offset
>> + *  |  Event logs(raw data)         |		^
>> + *  |                               |		|
>> + *  |                               | EVENT_DATA_BUFFER_SIZE
>> + *  |                               |		|
>> + *  |                               |		v
>> + *  +===============================+ <--- CRASH_DUMP offset
>> + *  | Crash Dump(raw data)          |		^
>> + *  |                               |		|
>> + *  |                               | CRASH_DUMP_BUFFER_SIZE
>> + *  |                               |		|
>> + *  |                               |		v
>> + *  +===============================+ <--- STATE_CAPTURE offset
>> + *  | Error state capture(raw data) |		^
>> + *  |                               |		|
>> + *  |                               | STATE_CAPTURE_BUFFER_SIZE
>> + *  |                               |		|
>> + *  |                               |		v
>> + *  +===============================+ Total: GUC_LOG_SIZE
>> + */
> 
> since above layout is fixed (up to actual data section size) this DOC could be placed in abi/log_abi.h
Yes, to be moved>
>> +#define GUC_LOG_SIZE (SZ_4K + \
> 
> maybe this one should also be defined in .h where other _BUFFER_SIZEs are defined:
> 
>     #define XE_GUC_LOG_BUFFER_SIZE (SZ_4K + ...CAPTURE_BUFFER_SIZE)
Will do.>
> or make all names shorter by using only _SIZEs suffix:
> 
>     #define XE_GUC_LOG_SIZE (SZ_4K + ...CAPTURE_SIZE)
Refer to my comments below about shorter names.
> 
>> +		      XE_GUC_LOG_EVENT_DATA_BUFFER_SIZE + \
>> +		      XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE + \
>> +		      XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE)
>> +
>> +#define GUC_LOG_CHUNK_SIZE	SZ_2M
>> +
>>   static struct xe_guc *
>>   log_to_guc(struct xe_guc_log *log)
>>   {
>> @@ -37,33 +76,6 @@ log_to_xe(struct xe_guc_log *log)
>>   	return gt_to_xe(log_to_gt(log));
>>   }
>>   
>> -static size_t guc_log_size(void)
>> -{
>> -	/*
>> -	 *  GuC Log buffer Layout
>> -	 *
>> -	 *  +===============================+ 00B
>> -	 *  |    Crash dump state header    |
>> -	 *  +-------------------------------+ 32B
>> -	 *  |      Debug state header       |
>> -	 *  +-------------------------------+ 64B
>> -	 *  |     Capture state header      |
>> -	 *  +-------------------------------+ 96B
>> -	 *  |                               |
>> -	 *  +===============================+ PAGE_SIZE (4KB)
>> -	 *  |        Crash Dump logs        |
>> -	 *  +===============================+ + CRASH_SIZE
>> -	 *  |          Debug logs           |
>> -	 *  +===============================+ + DEBUG_SIZE
>> -	 *  |         Capture logs          |
>> -	 *  +===============================+ + CAPTURE_SIZE
>> -	 */
>> -	return PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE +
>> -		CAPTURE_BUFFER_SIZE;
>> -}
>> -
>> -#define GUC_LOG_CHUNK_SIZE	SZ_2M
>> -
>>   static struct xe_guc_log_snapshot *xe_guc_log_snapshot_alloc(struct xe_guc_log *log, bool atomic)
>>   {
>>   	struct xe_guc_log_snapshot *snapshot;
>> @@ -257,7 +269,7 @@ int xe_guc_log_init(struct xe_guc_log *log)
>>   	struct xe_tile *tile = gt_to_tile(log_to_gt(log));
>>   	struct xe_bo *bo;
>>   
>> -	bo = xe_managed_bo_create_pin_map(xe, tile, guc_log_size(),
>> +	bo = xe_managed_bo_create_pin_map(xe, tile, GUC_LOG_SIZE,
>>   					  XE_BO_FLAG_SYSTEM |
>>   					  XE_BO_FLAG_GGTT |
>>   					  XE_BO_FLAG_GGTT_INVALIDATE |
>> @@ -265,7 +277,7 @@ int xe_guc_log_init(struct xe_guc_log *log)
>>   	if (IS_ERR(bo))
>>   		return PTR_ERR(bo);
>>   
>> -	xe_map_memset(xe, &bo->vmap, 0, 0, guc_log_size());
>> +	xe_map_memset(xe, &bo->vmap, 0, 0, GUC_LOG_SIZE);
> 
> use xe_bo_size(bo) instead
Good idea.>
>>   	log->bo = bo;
>>   	log->level = xe_modparam.guc_log_level;
>>   
>> @@ -274,49 +286,6 @@ int xe_guc_log_init(struct xe_guc_log *log)
>>   
>>   ALLOW_ERROR_INJECTION(xe_guc_log_init, ERRNO); /* See xe_pci_probe() */
>>   
>> -static u32 xe_guc_log_section_size_crash(struct xe_guc_log *log)
>> -{
>> -	return CRASH_BUFFER_SIZE;
>> -}
>> -
>> -static u32 xe_guc_log_section_size_debug(struct xe_guc_log *log)
>> -{
>> -	return DEBUG_BUFFER_SIZE;
>> -}
>> -
>> -/**
>> - * xe_guc_log_section_size_capture - Get capture buffer size within log sections.
>> - * @log: The log object.
>> - *
>> - * This function will return the capture buffer size within log sections.
>> - *
>> - * Return: capture buffer size.
>> - */
>> -u32 xe_guc_log_section_size_capture(struct xe_guc_log *log)
>> -{
>> -	return CAPTURE_BUFFER_SIZE;
>> -}
>> -
>> -/**
>> - * xe_guc_get_log_buffer_size - Get log buffer size for a type.
>> - * @log: The log object.
>> - * @type: The log buffer type
>> - *
>> - * Return: buffer size.
>> - */
>> -u32 xe_guc_get_log_buffer_size(struct xe_guc_log *log, enum guc_log_buffer_type type)
>> -{
>> -	switch (type) {
>> -	case GUC_LOG_BUFFER_CRASH_DUMP:
>> -		return xe_guc_log_section_size_crash(log);
>> -	case GUC_LOG_BUFFER_DEBUG:
>> -		return xe_guc_log_section_size_debug(log);
>> -	case GUC_LOG_BUFFER_CAPTURE:
>> -		return xe_guc_log_section_size_capture(log);
>> -	}
>> -	return 0;
>> -}
>> -
>>   /**
>>    * xe_guc_get_log_buffer_offset - Get offset in log buffer for a type.
>>    * @log: The log object.
>> @@ -327,13 +296,17 @@ u32 xe_guc_get_log_buffer_size(struct xe_guc_log *log, enum guc_log_buffer_type
>>    */
>>   u32 xe_guc_get_log_buffer_offset(struct xe_guc_log *log, enum guc_log_buffer_type type)
>>   {
>> -	enum guc_log_buffer_type i;
>> -	u32 offset = PAGE_SIZE;/* for the log_buffer_states */
>> +	u32 offset = SZ_4K;/* for the log_buffer_states */
>>   
>> -	for (i = GUC_LOG_BUFFER_CRASH_DUMP; i < GUC_LOG_BUFFER_TYPE_MAX; ++i) {
>> -		if (i == type)
>> -			break;
>> -		offset += xe_guc_get_log_buffer_size(log, i);
>> +	switch (type) {
>> +	case GUC_LOG_BUFFER_STATE_CAPTURE:
>> +		offset += XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE;
>> +		fallthrough;
>> +	case GUC_LOG_BUFFER_CRASH_DUMP:
>> +		offset += XE_GUC_LOG_EVENT_DATA_BUFFER_SIZE;
>> +		fallthrough;
>> +	case GUC_LOG_BUFFER_EVENT_DATA:
>> +		break;
>>   	}
>>   
>>   	return offset;
>> diff --git a/drivers/gpu/drm/xe/xe_guc_log.h b/drivers/gpu/drm/xe/xe_guc_log.h
>> index 98a47ac42b08..a3620462f44c 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_log.h
>> +++ b/drivers/gpu/drm/xe/xe_guc_log.h
>> @@ -13,13 +13,13 @@ struct drm_printer;
>>   struct xe_device;
>>   
>>   #if IS_ENABLED(CONFIG_DRM_XE_DEBUG_GUC)
>> -#define CRASH_BUFFER_SIZE       SZ_1M
>> -#define DEBUG_BUFFER_SIZE       SZ_8M
>> -#define CAPTURE_BUFFER_SIZE     SZ_2M
>> +#define XE_GUC_LOG_EVENT_DATA_BUFFER_SIZE	SZ_8M
>> +#define XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE	SZ_1M
>> +#define XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE	SZ_2M
>>   #else
>> -#define CRASH_BUFFER_SIZE	SZ_16K
>> -#define DEBUG_BUFFER_SIZE	SZ_64K
>> -#define CAPTURE_BUFFER_SIZE	SZ_1M
>> +#define XE_GUC_LOG_EVENT_DATA_BUFFER_SIZE	SZ_64K
>> +#define XE_GUC_LOG_CRASH_DUMP_BUFFER_SIZE	SZ_16K
>> +#define XE_GUC_LOG_STATE_CAPTURE_BUFFER_SIZE	SZ_1M
> 
> what about using shorter names:
> 
> #define XE_GUC_LOG_EVENT_DATA_SIZE	SZ_64K
> #define XE_GUC_LOG_CRASH_DUMP_SIZE	SZ_16K
> #define XE_GUC_LOG_STATE_CAPTURE_SIZE	SZ_1M
With BUFFER_SIZE, it is clear is the size of buffer, not data size.
Without BUFFER_SIZE, XE_GUC_LOG_EVENT_DATA_SIZE might mislead meaning to 
data size.

> 
>>   #endif
> 
> then we can also provide here:
> 
> #define XE_GUC_LOG_EVENT_DATA_OFFSET	SZ_4K /* btw, this fixed 4K header size should be part ABI def */
> #define XE_GUC_LOG_CRASH_DUMP_OFFSET	(XE_GUC_LOG_EVENT_DATA_OFFSET + XE_GUC_LOG_EVENT_DATA_SIZE)
> #define XE_GUC_LOG_STATE_CAPTURE_OFFSET	(XE_GUC_LOG_CRASH_DUMP_OFFSET + XE_GUC_LOG_CRASH_DUMP_SIZE)
Good idea>
> 
>>   /*
>>    * While we're using plain log level in i915, GuC controls are much more...
>> @@ -51,8 +51,6 @@ xe_guc_log_get_level(struct xe_guc_log *log)
>>   	return log->level;
>>   }
>>   
>> -u32 xe_guc_log_section_size_capture(struct xe_guc_log *log);
>> -u32 xe_guc_get_log_buffer_size(struct xe_guc_log *log, enum guc_log_buffer_type type);
>>   u32 xe_guc_get_log_buffer_offset(struct xe_guc_log *log, enum guc_log_buffer_type type);
> 
> then we can kill this function, as there is only one user which can use XE_GUC_LOG_STATE_CAPTURE_OFFSET	directly
Good idea >
>>   bool xe_guc_check_log_buf_overflow(struct xe_guc_log *log,
>>   				   enum guc_log_buffer_type type,
> 


  reply	other threads:[~2025-10-28  0:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-23 17:58 [PATCH v6] drm/xe/guc: Cleanup GuC log buffer macros and helpers Zhanjun Dong
2025-10-23 20:39 ` ✓ CI.KUnit: success for drm/xe/guc: Cleanup GuC log buffer macros and helpers (rev3) Patchwork
2025-10-23 21:26 ` ✓ Xe.CI.BAT: " Patchwork
2025-10-23 23:04 ` [PATCH v6] drm/xe/guc: Cleanup GuC log buffer macros and helpers Michal Wajdeczko
2025-10-28  0:19   ` Dong, Zhanjun [this message]
2025-10-24 10:52 ` ✗ Xe.CI.Full: failure for drm/xe/guc: Cleanup GuC log buffer macros and helpers (rev3) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e9b98170-8dba-4640-a9ca-034bd40ac4c8@intel.com \
    --to=zhanjun.dong@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=michal.wajdeczko@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox