From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0452C7EE26 for ; Tue, 9 May 2023 21:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235955AbjEIVsk (ORCPT ); Tue, 9 May 2023 17:48:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbjEIVsi (ORCPT ); Tue, 9 May 2023 17:48:38 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDB5840EB; Tue, 9 May 2023 14:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683668917; x=1715204917; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=3hv2Qo4oePkHaA7J18/ufdWM8iwR+6nUZPzFpBhK/H8=; b=n2jMyp6oBjKLUfVejkL4FD9BtHBXDI41vMVwWgcES6/WbSCxIY25QU4t F9TYwvTbgBE8cUWUyMvlJvk7m3jtjFodCOPAmHVe2buuvPV0bvqR9vYNY gyivOMV5Z+IZQSG/298O3EpERo5pvzTRUqMt331o4GvEf94bizDn8LeeZ 9rZuEQ43E8tO5UY/arAEZJu7iEsjNNF1UUx9R1Q5z9cXFEdYmB0EzTQRp pi/+zUYxwQ5POo/S0qXnYcFWSk5NTqxthFZWm+kYHkGlEOB2hm3yL+tht Euot6nRLf5+8ksFBRjwlxvFOYkOFCjwXG6wAvS172FvtlpoJwOUVH8xoy Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10705"; a="350092087" X-IronPort-AV: E=Sophos;i="5.99,262,1677571200"; d="scan'208";a="350092087" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2023 14:48:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10705"; a="768668109" X-IronPort-AV: E=Sophos;i="5.99,262,1677571200"; d="scan'208";a="768668109" Received: from djiang5-mobl3.amr.corp.intel.com (HELO [10.212.97.226]) ([10.212.97.226]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2023 14:48:36 -0700 Message-ID: <1ae44bae-d5a7-95fc-24c4-07fc8b24cfd0@intel.com> Date: Tue, 9 May 2023 14:48:36 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.10.0 Subject: Re: [PATCH v7 4/8] cxl/mem: Trace DRAM Event Record Content-Language: en-US To: Ira Weiny , Dan Williams Cc: Bjorn Helgaas , Alison Schofield , Vishal Verma , Davidlohr Bueso , Jonathan Cameron , Ben Widawsky , Steven Rostedt , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-cxl@vger.kernel.org References: <20221216-cxl-ev-log-v7-0-2316a5c8f7d8@intel.com> <20221216-cxl-ev-log-v7-4-2316a5c8f7d8@intel.com> From: Dave Jiang In-Reply-To: <20221216-cxl-ev-log-v7-4-2316a5c8f7d8@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On 1/17/23 10:53 PM, Ira Weiny wrote: > CXL rev 3.0 section 8.2.9.2.1.2 defines the DRAM Event Record. > > Determine if the event read is a DRAM event record and if so trace the > record. > > Reviewed-by: Dan Williams > Reviewed-by: Davidlohr Bueso > Reviewed-by: Jonathan Cameron > Signed-off-by: Ira Weiny Reviewed-by: Dave Jiang > --- > Changes in v7: > > --- > drivers/cxl/core/mbox.c | 12 +++++++ > drivers/cxl/core/trace.h | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/cxl/cxlmem.h | 23 ++++++++++++ > 3 files changed, 127 insertions(+) > > diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c > index d5fe2f2a23ad..552d98bc9f93 100644 > --- a/drivers/cxl/core/mbox.c > +++ b/drivers/cxl/core/mbox.c > @@ -726,6 +726,14 @@ static const uuid_t gen_media_event_uuid = > UUID_INIT(0xfbcd0a77, 0xc260, 0x417f, > 0x85, 0xa9, 0x08, 0x8b, 0x16, 0x21, 0xeb, 0xa6); > > +/* > + * DRAM Event Record > + * CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44 > + */ > +static const uuid_t dram_event_uuid = > + UUID_INIT(0x601dcbb3, 0x9c06, 0x4eab, > + 0xb8, 0xaf, 0x4e, 0x9b, 0xfb, 0x5c, 0x96, 0x24); > + > static void cxl_event_trace_record(const struct device *dev, > enum cxl_event_log_type type, > struct cxl_event_record_raw *record) > @@ -737,6 +745,10 @@ static void cxl_event_trace_record(const struct device *dev, > (struct cxl_event_gen_media *)record; > > trace_cxl_general_media(dev, type, rec); > + } else if (uuid_equal(id, &dram_event_uuid)) { > + struct cxl_event_dram *rec = (struct cxl_event_dram *)record; > + > + trace_cxl_dram(dev, type, rec); > } else { > /* For unknown record types print just the header */ > trace_cxl_generic_event(dev, type, record); > diff --git a/drivers/cxl/core/trace.h b/drivers/cxl/core/trace.h > index d85f0481661d..b6321cfb1d9f 100644 > --- a/drivers/cxl/core/trace.h > +++ b/drivers/cxl/core/trace.h > @@ -347,6 +347,98 @@ TRACE_EVENT(cxl_general_media, > ) > ); > > +/* > + * DRAM Event Record - DER > + * > + * CXL rev 3.0 section 8.2.9.2.1.2; Table 8-44 > + */ > +/* > + * DRAM Event Record defines many fields the same as the General Media Event > + * Record. Reuse those definitions as appropriate. > + */ > +#define CXL_DER_VALID_CHANNEL BIT(0) > +#define CXL_DER_VALID_RANK BIT(1) > +#define CXL_DER_VALID_NIBBLE BIT(2) > +#define CXL_DER_VALID_BANK_GROUP BIT(3) > +#define CXL_DER_VALID_BANK BIT(4) > +#define CXL_DER_VALID_ROW BIT(5) > +#define CXL_DER_VALID_COLUMN BIT(6) > +#define CXL_DER_VALID_CORRECTION_MASK BIT(7) > +#define show_dram_valid_flags(flags) __print_flags(flags, "|", \ > + { CXL_DER_VALID_CHANNEL, "CHANNEL" }, \ > + { CXL_DER_VALID_RANK, "RANK" }, \ > + { CXL_DER_VALID_NIBBLE, "NIBBLE" }, \ > + { CXL_DER_VALID_BANK_GROUP, "BANK GROUP" }, \ > + { CXL_DER_VALID_BANK, "BANK" }, \ > + { CXL_DER_VALID_ROW, "ROW" }, \ > + { CXL_DER_VALID_COLUMN, "COLUMN" }, \ > + { CXL_DER_VALID_CORRECTION_MASK, "CORRECTION MASK" } \ > +) > + > +TRACE_EVENT(cxl_dram, > + > + TP_PROTO(const struct device *dev, enum cxl_event_log_type log, > + struct cxl_event_dram *rec), > + > + TP_ARGS(dev, log, rec), > + > + TP_STRUCT__entry( > + CXL_EVT_TP_entry > + /* DRAM */ > + __field(u64, dpa) > + __field(u8, descriptor) > + __field(u8, type) > + __field(u8, transaction_type) > + __field(u8, channel) > + __field(u16, validity_flags) > + __field(u16, column) /* Out of order to pack trace record */ > + __field(u32, nibble_mask) > + __field(u32, row) > + __array(u8, cor_mask, CXL_EVENT_DER_CORRECTION_MASK_SIZE) > + __field(u8, rank) /* Out of order to pack trace record */ > + __field(u8, bank_group) /* Out of order to pack trace record */ > + __field(u8, bank) /* Out of order to pack trace record */ > + __field(u8, dpa_flags) /* Out of order to pack trace record */ > + ), > + > + TP_fast_assign( > + CXL_EVT_TP_fast_assign(dev, log, rec->hdr); > + > + /* DRAM */ > + __entry->dpa = le64_to_cpu(rec->phys_addr); > + __entry->dpa_flags = __entry->dpa & CXL_DPA_FLAGS_MASK; > + __entry->dpa &= CXL_DPA_MASK; > + __entry->descriptor = rec->descriptor; > + __entry->type = rec->type; > + __entry->transaction_type = rec->transaction_type; > + __entry->validity_flags = get_unaligned_le16(rec->validity_flags); > + __entry->channel = rec->channel; > + __entry->rank = rec->rank; > + __entry->nibble_mask = get_unaligned_le24(rec->nibble_mask); > + __entry->bank_group = rec->bank_group; > + __entry->bank = rec->bank; > + __entry->row = get_unaligned_le24(rec->row); > + __entry->column = get_unaligned_le16(rec->column); > + memcpy(__entry->cor_mask, &rec->correction_mask, > + CXL_EVENT_DER_CORRECTION_MASK_SIZE); > + ), > + > + CXL_EVT_TP_printk("dpa=%llx dpa_flags='%s' descriptor='%s' type='%s' " \ > + "transaction_type='%s' channel=%u rank=%u nibble_mask=%x " \ > + "bank_group=%u bank=%u row=%u column=%u cor_mask=%s " \ > + "validity_flags='%s'", > + __entry->dpa, show_dpa_flags(__entry->dpa_flags), > + show_event_desc_flags(__entry->descriptor), > + show_mem_event_type(__entry->type), > + show_trans_type(__entry->transaction_type), > + __entry->channel, __entry->rank, __entry->nibble_mask, > + __entry->bank_group, __entry->bank, > + __entry->row, __entry->column, > + __print_hex(__entry->cor_mask, CXL_EVENT_DER_CORRECTION_MASK_SIZE), > + show_dram_valid_flags(__entry->validity_flags) > + ) > +); > + > #endif /* _CXL_EVENTS_H */ > > #define TRACE_INCLUDE_FILE trace > diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h > index 910a1b2a30e0..82832dd74e4c 100644 > --- a/drivers/cxl/cxlmem.h > +++ b/drivers/cxl/cxlmem.h > @@ -463,6 +463,29 @@ struct cxl_event_gen_media { > u8 reserved[46]; > } __packed; > > +/* > + * DRAM Event Record - DER > + * CXL rev 3.0 section 8.2.9.2.1.2; Table 3-44 > + */ > +#define CXL_EVENT_DER_CORRECTION_MASK_SIZE 0x20 > +struct cxl_event_dram { > + struct cxl_event_record_hdr hdr; > + __le64 phys_addr; > + u8 descriptor; > + u8 type; > + u8 transaction_type; > + u8 validity_flags[2]; > + u8 channel; > + u8 rank; > + u8 nibble_mask[3]; > + u8 bank_group; > + u8 bank; > + u8 row[3]; > + u8 column[2]; > + u8 correction_mask[CXL_EVENT_DER_CORRECTION_MASK_SIZE]; > + u8 reserved[0x17]; > +} __packed; > + > struct cxl_mbox_get_partition_info { > __le64 active_volatile_cap; > __le64 active_persistent_cap; >