[PATCH v4 1/6] cxl/events: Update Common Event Record to CXL spec rev 3.1

shiju.jose@huawei.com posted 6 patches 1 year, 2 months ago
There is a newer version of this series
[PATCH v4 1/6] cxl/events: Update Common Event Record to CXL spec rev 3.1
Posted by shiju.jose@huawei.com 1 year, 2 months ago
From: Shiju Jose <shiju.jose@huawei.com>

CXL spec 3.1 section 8.2.9.2.1 Table 8-42, Common Event Record format has
updated with Maintenance Operation Subclass information.

Add updates for the above spec change in the CXL events record and CXL
common trace event implementations.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
---
 drivers/cxl/core/trace.h | 13 +++++++++----
 include/cxl/event.h      |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h
index 8389a94adb1a..7305974e2301 100644
--- a/drivers/cxl/core/trace.h
+++ b/drivers/cxl/core/trace.h
@@ -166,11 +166,13 @@ TRACE_EVENT(cxl_overflow,
 #define CXL_EVENT_RECORD_FLAG_MAINT_NEEDED	BIT(3)
 #define CXL_EVENT_RECORD_FLAG_PERF_DEGRADED	BIT(4)
 #define CXL_EVENT_RECORD_FLAG_HW_REPLACE	BIT(5)
+#define CXL_EVENT_RECORD_FLAG_MAINT_OP_SUB_CLASS_VALID	BIT(6)
 #define show_hdr_flags(flags)	__print_flags(flags, " | ",			   \
 	{ CXL_EVENT_RECORD_FLAG_PERMANENT,	"PERMANENT_CONDITION"		}, \
 	{ CXL_EVENT_RECORD_FLAG_MAINT_NEEDED,	"MAINTENANCE_NEEDED"		}, \
 	{ CXL_EVENT_RECORD_FLAG_PERF_DEGRADED,	"PERFORMANCE_DEGRADED"		}, \
-	{ CXL_EVENT_RECORD_FLAG_HW_REPLACE,	"HARDWARE_REPLACEMENT_NEEDED"	}  \
+	{ CXL_EVENT_RECORD_FLAG_HW_REPLACE,	"HARDWARE_REPLACEMENT_NEEDED"	},  \
+	{ CXL_EVENT_RECORD_FLAG_MAINT_OP_SUB_CLASS_VALID,	"MAINT_OP_SUB_CLASS_VALID" }	\
 )
 
 /*
@@ -197,7 +199,8 @@ TRACE_EVENT(cxl_overflow,
 	__field(u16, hdr_related_handle)			\
 	__field(u64, hdr_timestamp)				\
 	__field(u8, hdr_length)					\
-	__field(u8, hdr_maint_op_class)
+	__field(u8, hdr_maint_op_class)				\
+	__field(u8, hdr_maint_op_sub_class)
 
 #define CXL_EVT_TP_fast_assign(cxlmd, l, hdr)					\
 	__assign_str(memdev);				\
@@ -209,17 +212,19 @@ TRACE_EVENT(cxl_overflow,
 	__entry->hdr_handle = le16_to_cpu((hdr).handle);			\
 	__entry->hdr_related_handle = le16_to_cpu((hdr).related_handle);	\
 	__entry->hdr_timestamp = le64_to_cpu((hdr).timestamp);			\
-	__entry->hdr_maint_op_class = (hdr).maint_op_class
+	__entry->hdr_maint_op_class = (hdr).maint_op_class;			\
+	__entry->hdr_maint_op_sub_class = (hdr).maint_op_sub_class
 
 #define CXL_EVT_TP_printk(fmt, ...) \
 	TP_printk("memdev=%s host=%s serial=%lld log=%s : time=%llu uuid=%pUb "	\
 		"len=%d flags='%s' handle=%x related_handle=%x "		\
-		"maint_op_class=%u : " fmt,					\
+		"maint_op_class=%u maint_op_sub_class=%u : " fmt,		\
 		__get_str(memdev), __get_str(host), __entry->serial,		\
 		cxl_event_log_type_str(__entry->log),				\
 		__entry->hdr_timestamp, &__entry->hdr_uuid, __entry->hdr_length,\
 		show_hdr_flags(__entry->hdr_flags), __entry->hdr_handle,	\
 		__entry->hdr_related_handle, __entry->hdr_maint_op_class,	\
+		__entry->hdr_maint_op_sub_class,	\
 		##__VA_ARGS__)
 
 TRACE_EVENT(cxl_generic_event,
diff --git a/include/cxl/event.h b/include/cxl/event.h
index 0bea1afbd747..e1d485ad376b 100644
--- a/include/cxl/event.h
+++ b/include/cxl/event.h
@@ -18,7 +18,8 @@ struct cxl_event_record_hdr {
 	__le16 related_handle;
 	__le64 timestamp;
 	u8 maint_op_class;
-	u8 reserved[15];
+	u8 maint_op_sub_class;
+	u8 reserved[14];
 } __packed;
 
 struct cxl_event_media_hdr {
-- 
2.43.0
Re: [PATCH v4 1/6] cxl/events: Update Common Event Record to CXL spec rev 3.1
Posted by Fan Ni 1 year, 2 months ago
On Wed, Nov 20, 2024 at 09:37:40AM +0000, shiju.jose@huawei.com wrote:
> From: Shiju Jose <shiju.jose@huawei.com>
> 
> CXL spec 3.1 section 8.2.9.2.1 Table 8-42, Common Event Record format has
> updated with Maintenance Operation Subclass information.
The table reference is incorrect, should be Table 8-43 based on spec r3.1,
v1.0, Auguest 7, 2023.

Other than that,


Reviewed-by: Fan Ni <fan.ni@samsung.com>

> 
> Add updates for the above spec change in the CXL events record and CXL
> common trace event implementations.
> 
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
> Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
> ---
>  drivers/cxl/core/trace.h | 13 +++++++++----
>  include/cxl/event.h      |  3 ++-
>  2 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h
> index 8389a94adb1a..7305974e2301 100644
> --- a/drivers/cxl/core/trace.h
> +++ b/drivers/cxl/core/trace.h
> @@ -166,11 +166,13 @@ TRACE_EVENT(cxl_overflow,
>  #define CXL_EVENT_RECORD_FLAG_MAINT_NEEDED	BIT(3)
>  #define CXL_EVENT_RECORD_FLAG_PERF_DEGRADED	BIT(4)
>  #define CXL_EVENT_RECORD_FLAG_HW_REPLACE	BIT(5)
> +#define CXL_EVENT_RECORD_FLAG_MAINT_OP_SUB_CLASS_VALID	BIT(6)
>  #define show_hdr_flags(flags)	__print_flags(flags, " | ",			   \
>  	{ CXL_EVENT_RECORD_FLAG_PERMANENT,	"PERMANENT_CONDITION"		}, \
>  	{ CXL_EVENT_RECORD_FLAG_MAINT_NEEDED,	"MAINTENANCE_NEEDED"		}, \
>  	{ CXL_EVENT_RECORD_FLAG_PERF_DEGRADED,	"PERFORMANCE_DEGRADED"		}, \
> -	{ CXL_EVENT_RECORD_FLAG_HW_REPLACE,	"HARDWARE_REPLACEMENT_NEEDED"	}  \
> +	{ CXL_EVENT_RECORD_FLAG_HW_REPLACE,	"HARDWARE_REPLACEMENT_NEEDED"	},  \
> +	{ CXL_EVENT_RECORD_FLAG_MAINT_OP_SUB_CLASS_VALID,	"MAINT_OP_SUB_CLASS_VALID" }	\
>  )
>  
>  /*
> @@ -197,7 +199,8 @@ TRACE_EVENT(cxl_overflow,
>  	__field(u16, hdr_related_handle)			\
>  	__field(u64, hdr_timestamp)				\
>  	__field(u8, hdr_length)					\
> -	__field(u8, hdr_maint_op_class)
> +	__field(u8, hdr_maint_op_class)				\
> +	__field(u8, hdr_maint_op_sub_class)
>  
>  #define CXL_EVT_TP_fast_assign(cxlmd, l, hdr)					\
>  	__assign_str(memdev);				\
> @@ -209,17 +212,19 @@ TRACE_EVENT(cxl_overflow,
>  	__entry->hdr_handle = le16_to_cpu((hdr).handle);			\
>  	__entry->hdr_related_handle = le16_to_cpu((hdr).related_handle);	\
>  	__entry->hdr_timestamp = le64_to_cpu((hdr).timestamp);			\
> -	__entry->hdr_maint_op_class = (hdr).maint_op_class
> +	__entry->hdr_maint_op_class = (hdr).maint_op_class;			\
> +	__entry->hdr_maint_op_sub_class = (hdr).maint_op_sub_class
>  
>  #define CXL_EVT_TP_printk(fmt, ...) \
>  	TP_printk("memdev=%s host=%s serial=%lld log=%s : time=%llu uuid=%pUb "	\
>  		"len=%d flags='%s' handle=%x related_handle=%x "		\
> -		"maint_op_class=%u : " fmt,					\
> +		"maint_op_class=%u maint_op_sub_class=%u : " fmt,		\
>  		__get_str(memdev), __get_str(host), __entry->serial,		\
>  		cxl_event_log_type_str(__entry->log),				\
>  		__entry->hdr_timestamp, &__entry->hdr_uuid, __entry->hdr_length,\
>  		show_hdr_flags(__entry->hdr_flags), __entry->hdr_handle,	\
>  		__entry->hdr_related_handle, __entry->hdr_maint_op_class,	\
> +		__entry->hdr_maint_op_sub_class,	\
>  		##__VA_ARGS__)
>  
>  TRACE_EVENT(cxl_generic_event,
> diff --git a/include/cxl/event.h b/include/cxl/event.h
> index 0bea1afbd747..e1d485ad376b 100644
> --- a/include/cxl/event.h
> +++ b/include/cxl/event.h
> @@ -18,7 +18,8 @@ struct cxl_event_record_hdr {
>  	__le16 related_handle;
>  	__le64 timestamp;
>  	u8 maint_op_class;
> -	u8 reserved[15];
> +	u8 maint_op_sub_class;
> +	u8 reserved[14];
>  } __packed;
>  
>  struct cxl_event_media_hdr {
> -- 
> 2.43.0
> 

-- 
Fan Ni (From gmail)
RE: [PATCH v4 1/6] cxl/events: Update Common Event Record to CXL spec rev 3.1
Posted by Shiju Jose 1 year, 2 months ago
>-----Original Message-----
>From: Fan Ni <nifan.cxl@gmail.com>
>Sent: 26 November 2024 17:27
>To: Shiju Jose <shiju.jose@huawei.com>
>Cc: dave.jiang@intel.com; dan.j.williams@intel.com; Jonathan Cameron
><jonathan.cameron@huawei.com>; alison.schofield@intel.com;
>nifan.cxl@gmail.com; vishal.l.verma@intel.com; ira.weiny@intel.com;
>dave@stgolabs.net; linux-cxl@vger.kernel.org; linux-kernel@vger.kernel.org;
>Linuxarm <linuxarm@huawei.com>; tanxiaofei <tanxiaofei@huawei.com>;
>Zengtao (B) <prime.zeng@hisilicon.com>
>Subject: Re: [PATCH v4 1/6] cxl/events: Update Common Event Record to CXL
>spec rev 3.1
>
>On Wed, Nov 20, 2024 at 09:37:40AM +0000, shiju.jose@huawei.com wrote:
>> From: Shiju Jose <shiju.jose@huawei.com>
>>
>> CXL spec 3.1 section 8.2.9.2.1 Table 8-42, Common Event Record format
>> has updated with Maintenance Operation Subclass information.
>The table reference is incorrect, should be Table 8-43 based on spec r3.1, v1.0,
>Auguest 7, 2023.
>
Hi Fan, 

Thanks for reviewing.  Will fix.

>Other than that,
>
>
>Reviewed-by: Fan Ni <fan.ni@samsung.com>
>
>>
>> Add updates for the above spec change in the CXL events record and CXL
>> common trace event implementations.
>>
>> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
>> Reviewed-by: Davidlohr Bueso <dave@stgolabs.net>
>> Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
>> ---
>>  drivers/cxl/core/trace.h | 13 +++++++++----
>>  include/cxl/event.h      |  3 ++-
>>  2 files changed, 11 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h index
>> 8389a94adb1a..7305974e2301 100644
>> --- a/drivers/cxl/core/trace.h
>> +++ b/drivers/cxl/core/trace.h
>> @@ -166,11 +166,13 @@ TRACE_EVENT(cxl_overflow,
>>  #define CXL_EVENT_RECORD_FLAG_MAINT_NEEDED	BIT(3)
>>  #define CXL_EVENT_RECORD_FLAG_PERF_DEGRADED	BIT(4)
>>  #define CXL_EVENT_RECORD_FLAG_HW_REPLACE	BIT(5)
>> +#define CXL_EVENT_RECORD_FLAG_MAINT_OP_SUB_CLASS_VALID	BIT(6)
>>  #define show_hdr_flags(flags)	__print_flags(flags, " | ",
>		   \
>>  	{ CXL_EVENT_RECORD_FLAG_PERMANENT,
>	"PERMANENT_CONDITION"		}, \
>>  	{ CXL_EVENT_RECORD_FLAG_MAINT_NEEDED,
>	"MAINTENANCE_NEEDED"		}, \
>>  	{ CXL_EVENT_RECORD_FLAG_PERF_DEGRADED,
>	"PERFORMANCE_DEGRADED"		}, \
>> -	{ CXL_EVENT_RECORD_FLAG_HW_REPLACE,
>	"HARDWARE_REPLACEMENT_NEEDED"	}  \
>> +	{ CXL_EVENT_RECORD_FLAG_HW_REPLACE,
>	"HARDWARE_REPLACEMENT_NEEDED"	},  \
>> +	{ CXL_EVENT_RECORD_FLAG_MAINT_OP_SUB_CLASS_VALID,
>	"MAINT_OP_SUB_CLASS_VALID" }	\
>>  )
>>
>>  /*
>> @@ -197,7 +199,8 @@ TRACE_EVENT(cxl_overflow,
>>  	__field(u16, hdr_related_handle)			\
>>  	__field(u64, hdr_timestamp)				\
>>  	__field(u8, hdr_length)					\
>> -	__field(u8, hdr_maint_op_class)
>> +	__field(u8, hdr_maint_op_class)				\
>> +	__field(u8, hdr_maint_op_sub_class)
>>
>>  #define CXL_EVT_TP_fast_assign(cxlmd, l, hdr)
>		\
>>  	__assign_str(memdev);				\
>> @@ -209,17 +212,19 @@ TRACE_EVENT(cxl_overflow,
>>  	__entry->hdr_handle = le16_to_cpu((hdr).handle);
>	\
>>  	__entry->hdr_related_handle = le16_to_cpu((hdr).related_handle);
>	\
>>  	__entry->hdr_timestamp = le64_to_cpu((hdr).timestamp);
>		\
>> -	__entry->hdr_maint_op_class = (hdr).maint_op_class
>> +	__entry->hdr_maint_op_class = (hdr).maint_op_class;
>	\
>> +	__entry->hdr_maint_op_sub_class = (hdr).maint_op_sub_class
>>
>>  #define CXL_EVT_TP_printk(fmt, ...) \
>>  	TP_printk("memdev=%s host=%s serial=%lld log=%s : time=%llu
>uuid=%pUb "	\
>>  		"len=%d flags='%s' handle=%x related_handle=%x "
>	\
>> -		"maint_op_class=%u : " fmt,
>	\
>> +		"maint_op_class=%u maint_op_sub_class=%u : " fmt,
>	\
>>  		__get_str(memdev), __get_str(host), __entry->serial,
>	\
>>  		cxl_event_log_type_str(__entry->log),
>	\
>>  		__entry->hdr_timestamp, &__entry->hdr_uuid, __entry-
>>hdr_length,\
>>  		show_hdr_flags(__entry->hdr_flags), __entry->hdr_handle,
>	\
>>  		__entry->hdr_related_handle, __entry->hdr_maint_op_class,
>	\
>> +		__entry->hdr_maint_op_sub_class,	\
>>  		##__VA_ARGS__)
>>
>>  TRACE_EVENT(cxl_generic_event,
>> diff --git a/include/cxl/event.h b/include/cxl/event.h index
>> 0bea1afbd747..e1d485ad376b 100644
>> --- a/include/cxl/event.h
>> +++ b/include/cxl/event.h
>> @@ -18,7 +18,8 @@ struct cxl_event_record_hdr {
>>  	__le16 related_handle;
>>  	__le64 timestamp;
>>  	u8 maint_op_class;
>> -	u8 reserved[15];
>> +	u8 maint_op_sub_class;
>> +	u8 reserved[14];
>>  } __packed;
>>
>>  struct cxl_event_media_hdr {
>> --
>> 2.43.0
>>
>
>--
>Fan Ni (From gmail)

Thanks,
Shiju