Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cxl: Add extended linear cache address alias emission for cxl events 

Add the aliased address of extended linear cache when emitting event
trace for poison, DRAM and general media of CXL events.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Li Ming <ming.li@zohomail.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com>
Link: https://patch.msgid.link/20250226162224.3633792-4-dave.jiang@intel.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
This commit is contained in:
Dave Jiang 2025-02-26 09:21:20 -07:00
parent 0ec9849b63
commit 8c520c5f1e
3 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/cxl/core/mbox.c
View File

@ -871,7 +871,7 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd,
} }
if (trace_cxl_general_media_enabled() || trace_cxl_dram_enabled()) { if (trace_cxl_general_media_enabled() || trace_cxl_dram_enabled()) {
u64 dpa, hpa = ULLONG_MAX; u64 dpa, hpa = ULLONG_MAX, hpa_alias = ULLONG_MAX;
struct cxl_region *cxlr; struct cxl_region *cxlr;
/* /*
@ -884,14 +884,20 @@ void cxl_event_trace_record(const struct cxl_memdev *cxlmd,
dpa = le64_to_cpu(evt->media_hdr.phys_addr) & CXL_DPA_MASK; dpa = le64_to_cpu(evt->media_hdr.phys_addr) & CXL_DPA_MASK;
cxlr = cxl_dpa_to_region(cxlmd, dpa); cxlr = cxl_dpa_to_region(cxlmd, dpa);
if (cxlr) if (cxlr) {
u64 cache_size = cxlr->params.cache_size;
hpa = cxl_dpa_to_hpa(cxlr, cxlmd, dpa); hpa = cxl_dpa_to_hpa(cxlr, cxlmd, dpa);
if (cache_size)
hpa_alias = hpa - cache_size;
}
if (event_type == CXL_CPER_EVENT_GEN_MEDIA) if (event_type == CXL_CPER_EVENT_GEN_MEDIA)
trace_cxl_general_media(cxlmd, type, cxlr, hpa, trace_cxl_general_media(cxlmd, type, cxlr, hpa,
&evt->gen_media); hpa_alias, &evt->gen_media);
else if (event_type == CXL_CPER_EVENT_DRAM) else if (event_type == CXL_CPER_EVENT_DRAM)
trace_cxl_dram(cxlmd, type, cxlr, hpa, &evt->dram); trace_cxl_dram(cxlmd, type, cxlr, hpa, hpa_alias,
&evt->dram);
} }
} }
EXPORT_SYMBOL_NS_GPL(cxl_event_trace_record, "CXL"); EXPORT_SYMBOL_NS_GPL(cxl_event_trace_record, "CXL");

2
drivers/cxl/core/region.c
View File

@ -3260,7 +3260,7 @@ static int cxl_extended_linear_cache_resize(struct cxl_region *cxlr,
if (size != cache_size) { if (size != cache_size) {
dev_warn(&cxlr->dev, dev_warn(&cxlr->dev,
"Extended Linear Cache size %#lld != CXL size %#lld. No Support!", "Extended Linear Cache size %lld != CXL size %lld. No Support!",
cache_size, size); cache_size, size);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }

34
drivers/cxl/core/trace.h
View File

@ -392,9 +392,10 @@ TRACE_EVENT(cxl_generic_event,
TRACE_EVENT(cxl_general_media, TRACE_EVENT(cxl_general_media,
TP_PROTO(const struct cxl_memdev *cxlmd, enum cxl_event_log_type log, TP_PROTO(const struct cxl_memdev *cxlmd, enum cxl_event_log_type log,
struct cxl_region *cxlr, u64 hpa, struct cxl_event_gen_media *rec), struct cxl_region *cxlr, u64 hpa, u64 hpa_alias0,
struct cxl_event_gen_media *rec),
TP_ARGS(cxlmd, log, cxlr, hpa, rec), TP_ARGS(cxlmd, log, cxlr, hpa, hpa_alias0, rec),
TP_STRUCT__entry( TP_STRUCT__entry(
CXL_EVT_TP_entry CXL_EVT_TP_entry
@ -408,6 +409,7 @@ TRACE_EVENT(cxl_general_media,
__array(u8, comp_id, CXL_EVENT_GEN_MED_COMP_ID_SIZE) __array(u8, comp_id, CXL_EVENT_GEN_MED_COMP_ID_SIZE)
/* Following are out of order to pack trace record */ /* Following are out of order to pack trace record */
__field(u64, hpa) __field(u64, hpa)
__field(u64, hpa_alias0)
__field_struct(uuid_t, region_uuid) __field_struct(uuid_t, region_uuid)
__field(u16, validity_flags) __field(u16, validity_flags)
__field(u8, rank) __field(u8, rank)
@ -438,6 +440,7 @@ TRACE_EVENT(cxl_general_media,
CXL_EVENT_GEN_MED_COMP_ID_SIZE); CXL_EVENT_GEN_MED_COMP_ID_SIZE);
__entry->validity_flags = get_unaligned_le16(&rec->media_hdr.validity_flags); __entry->validity_flags = get_unaligned_le16(&rec->media_hdr.validity_flags);
__entry->hpa = hpa; __entry->hpa = hpa;
__entry->hpa_alias0 = hpa_alias0;
if (cxlr) { if (cxlr) {
__assign_str(region_name); __assign_str(region_name);
uuid_copy(&__entry->region_uuid, &cxlr->params.uuid); uuid_copy(&__entry->region_uuid, &cxlr->params.uuid);
@ -455,7 +458,7 @@ TRACE_EVENT(cxl_general_media,
"device=%x validity_flags='%s' " \ "device=%x validity_flags='%s' " \
"comp_id=%s comp_id_pldm_valid_flags='%s' " \ "comp_id=%s comp_id_pldm_valid_flags='%s' " \
"pldm_entity_id=%s pldm_resource_id=%s " \ "pldm_entity_id=%s pldm_resource_id=%s " \
"hpa=%llx region=%s region_uuid=%pUb " \ "hpa=%llx hpa_alias0=%llx region=%s region_uuid=%pUb " \
"cme_threshold_ev_flags='%s' cme_count=%u", "cme_threshold_ev_flags='%s' cme_count=%u",
__entry->dpa, show_dpa_flags(__entry->dpa_flags), __entry->dpa, show_dpa_flags(__entry->dpa_flags),
show_event_desc_flags(__entry->descriptor), show_event_desc_flags(__entry->descriptor),
@ -470,7 +473,7 @@ TRACE_EVENT(cxl_general_media,
CXL_GMER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id), CXL_GMER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id),
show_pldm_resource_id(__entry->validity_flags, CXL_GMER_VALID_COMPONENT, show_pldm_resource_id(__entry->validity_flags, CXL_GMER_VALID_COMPONENT,
CXL_GMER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id), CXL_GMER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id),
__entry->hpa, __get_str(region_name), &__entry->region_uuid, __entry->hpa, __entry->hpa_alias0, __get_str(region_name), &__entry->region_uuid,
show_cme_threshold_ev_flags(__entry->cme_threshold_ev_flags), __entry->cme_count show_cme_threshold_ev_flags(__entry->cme_threshold_ev_flags), __entry->cme_count
) )
); );
@ -529,9 +532,10 @@ TRACE_EVENT(cxl_general_media,
TRACE_EVENT(cxl_dram, TRACE_EVENT(cxl_dram,
TP_PROTO(const struct cxl_memdev *cxlmd, enum cxl_event_log_type log, TP_PROTO(const struct cxl_memdev *cxlmd, enum cxl_event_log_type log,
struct cxl_region *cxlr, u64 hpa, struct cxl_event_dram *rec), struct cxl_region *cxlr, u64 hpa, u64 hpa_alias0,
struct cxl_event_dram *rec),
TP_ARGS(cxlmd, log, cxlr, hpa, rec), TP_ARGS(cxlmd, log, cxlr, hpa, hpa_alias0, rec),
TP_STRUCT__entry( TP_STRUCT__entry(
CXL_EVT_TP_entry CXL_EVT_TP_entry
@ -547,6 +551,7 @@ TRACE_EVENT(cxl_dram,
__field(u32, row) __field(u32, row)
__array(u8, cor_mask, CXL_EVENT_DER_CORRECTION_MASK_SIZE) __array(u8, cor_mask, CXL_EVENT_DER_CORRECTION_MASK_SIZE)
__field(u64, hpa) __field(u64, hpa)
__field(u64, hpa_alias0)
__field_struct(uuid_t, region_uuid) __field_struct(uuid_t, region_uuid)
__field(u8, rank) /* Out of order to pack trace record */ __field(u8, rank) /* Out of order to pack trace record */
__field(u8, bank_group) /* Out of order to pack trace record */ __field(u8, bank_group) /* Out of order to pack trace record */
@ -584,6 +589,7 @@ TRACE_EVENT(cxl_dram,
memcpy(__entry->cor_mask, &rec->correction_mask, memcpy(__entry->cor_mask, &rec->correction_mask,
CXL_EVENT_DER_CORRECTION_MASK_SIZE); CXL_EVENT_DER_CORRECTION_MASK_SIZE);
__entry->hpa = hpa; __entry->hpa = hpa;
__entry->hpa_alias0 = hpa_alias0;
if (cxlr) { if (cxlr) {
__assign_str(region_name); __assign_str(region_name);
uuid_copy(&__entry->region_uuid, &cxlr->params.uuid); uuid_copy(&__entry->region_uuid, &cxlr->params.uuid);
@ -604,7 +610,7 @@ TRACE_EVENT(cxl_dram,
"validity_flags='%s' " \ "validity_flags='%s' " \
"comp_id=%s comp_id_pldm_valid_flags='%s' " \ "comp_id=%s comp_id_pldm_valid_flags='%s' " \
"pldm_entity_id=%s pldm_resource_id=%s " \ "pldm_entity_id=%s pldm_resource_id=%s " \
"hpa=%llx region=%s region_uuid=%pUb " \ "hpa=%llx hpa_alias0=%llx region=%s region_uuid=%pUb " \
"sub_channel=%u cme_threshold_ev_flags='%s' cvme_count=%u", "sub_channel=%u cme_threshold_ev_flags='%s' cvme_count=%u",
__entry->dpa, show_dpa_flags(__entry->dpa_flags), __entry->dpa, show_dpa_flags(__entry->dpa_flags),
show_event_desc_flags(__entry->descriptor), show_event_desc_flags(__entry->descriptor),
@ -622,7 +628,7 @@ TRACE_EVENT(cxl_dram,
CXL_DER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id), CXL_DER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id),
show_pldm_resource_id(__entry->validity_flags, CXL_DER_VALID_COMPONENT, show_pldm_resource_id(__entry->validity_flags, CXL_DER_VALID_COMPONENT,
CXL_DER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id), CXL_DER_VALID_COMPONENT_ID_FORMAT, __entry->comp_id),
__entry->hpa, __get_str(region_name), &__entry->region_uuid, __entry->hpa, __entry->hpa_alias0, __get_str(region_name), &__entry->region_uuid,
__entry->sub_channel, show_cme_threshold_ev_flags(__entry->cme_threshold_ev_flags), __entry->sub_channel, show_cme_threshold_ev_flags(__entry->cme_threshold_ev_flags),
__entry->cvme_count __entry->cvme_count
) )
@ -870,6 +876,7 @@ TRACE_EVENT(cxl_poison,
__string(region, cxlr ? dev_name(&cxlr->dev) : "") __string(region, cxlr ? dev_name(&cxlr->dev) : "")
__field(u64, overflow_ts) __field(u64, overflow_ts)
__field(u64, hpa) __field(u64, hpa)
__field(u64, hpa_alias0)
__field(u64, dpa) __field(u64, dpa)
__field(u32, dpa_length) __field(u32, dpa_length)
__array(char, uuid, 16) __array(char, uuid, 16)
@ -892,16 +899,22 @@ TRACE_EVENT(cxl_poison,
memcpy(__entry->uuid, &cxlr->params.uuid, 16); memcpy(__entry->uuid, &cxlr->params.uuid, 16);
__entry->hpa = cxl_dpa_to_hpa(cxlr, cxlmd, __entry->hpa = cxl_dpa_to_hpa(cxlr, cxlmd,
__entry->dpa); __entry->dpa);
if (__entry->hpa != ULLONG_MAX && cxlr->params.cache_size)
__entry->hpa_alias0 = __entry->hpa +
cxlr->params.cache_size;
else
__entry->hpa_alias0 = ULLONG_MAX;
} else { } else {
__assign_str(region); __assign_str(region);
memset(__entry->uuid, 0, 16); memset(__entry->uuid, 0, 16);
__entry->hpa = ULLONG_MAX; __entry->hpa = ULLONG_MAX;
__entry->hpa_alias0 = ULLONG_MAX;
} }
), ),
TP_printk("memdev=%s host=%s serial=%lld trace_type=%s region=%s " \ TP_printk("memdev=%s host=%s serial=%lld trace_type=%s region=%s " \
"region_uuid=%pU hpa=0x%llx dpa=0x%llx dpa_length=0x%x " \ "region_uuid=%pU hpa=0x%llx hpa_alias0=0x%llx dpa=0x%llx " \
"source=%s flags=%s overflow_time=%llu", "dpa_length=0x%x source=%s flags=%s overflow_time=%llu",
__get_str(memdev), __get_str(memdev),
__get_str(host), __get_str(host),
__entry->serial, __entry->serial,
@ -909,6 +922,7 @@ TRACE_EVENT(cxl_poison,
__get_str(region), __get_str(region),
__entry->uuid, __entry->uuid,
__entry->hpa, __entry->hpa,
__entry->hpa_alias0,
__entry->dpa, __entry->dpa,
__entry->dpa_length, __entry->dpa_length,
show_poison_source(__entry->source), show_poison_source(__entry->source),