Several changes for the UPIU trace
Subsystems (9)
v3 cover Several changes for the UPIU trace
From: Bean Huo <[email protected]>
Changelog:
V2--V3:
1. Fix a typo in patch 1/6 (Reported-by: Joe Perches <[email protected]>)
V1--V2:
1. Convert __get_str(str) to __print_symbolic()
2. Add new patches 1/6, 2/6,3/6
3. Use __print_symbolic() in patch 6/6
Bean Huo (6):
scsi: ufs: Remove stringize operator '#' restriction
scsi: ufs: Use __print_symbolic() for UFS trace string print
scsi: ufs: Don't call trace_ufshcd_upiu() in case trace poit is
disabled
scsi: ufs: Distinguish between query REQ and query RSP in query trace
scsi: ufs: Distinguish between TM request UPIU and response UPIU in TM
UPIU trace
scsi: ufs: Make UPIU trace easier differentiate among CDB, OSF, and TM
drivers/scsi/ufs/ufs.h | 17 ++++++ drivers/scsi/ufs/ufshcd.c | 72 ++++++++++++++++--------- include/trace/events/ufs.h | 108 +++++++++++++++++++++++-------------- 3 files changed, 131 insertions(+), 66 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/6 scsi: ufs: Remove stringize operator '#' restriction
From: Bean Huo <[email protected]>
Current EM macro definition, we use stringize operator '#', which turns the argument it precedes into a quoted string. Thus requires the symbol of __print_symbolic() should be the string corresponding to the name of the enum.
However, we have other cases, the symbol and enum name are not the same, we can redefine EM/EMe, but there will introduce some redundant codes. This patch is to remove this restriction, let others reuse the current EM/EMe definition.
--- include/trace/events/ufs.h | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
include/trace/events/ufs.h +20 -20
@@ -20,28 +20,28 @@ { SYNCHRONIZE_CACHE, "SYNC" }, \ { UNMAP, "UNMAP" }) -#define UFS_LINK_STATES \ - EM(UIC_LINK_OFF_STATE) \ - EM(UIC_LINK_ACTIVE_STATE) \ - EMe(UIC_LINK_HIBERN8_STATE) - -#define UFS_PWR_MODES \ - EM(UFS_ACTIVE_PWR_MODE) \ - EM(UFS_SLEEP_PWR_MODE) \ - EM(UFS_POWERDOWN_PWR_MODE) \ - EMe(UFS_DEEPSLEEP_PWR_MODE) - -#define UFSCHD_CLK_GATING_STATES \ - EM(CLKS_OFF) \ - EM(CLKS_ON) \ - EM(REQ_CLKS_OFF) \ - EMe(REQ_CLKS_ON) +#define UFS_LINK_STATES \ + EM(UIC_LINK_OFF_STATE, "UIC_LINK_OFF_STATE") \ + EM(UIC_LINK_ACTIVE_STATE, "UIC_LINK_ACTIVE_STATE") \ + EMe(UIC_LINK_HIBERN8_STATE, "UIC_LINK_HIBERN8_STATE") + +#define UFS_PWR_MODES \ + EM(UFS_ACTIVE_PWR_MODE, "UFS_ACTIVE_PWR_MODE") \ + EM(UFS_SLEEP_PWR_MODE, "UFS_SLEEP_PWR_MODE") \ + EM(UFS_POWERDOWN_PWR_MODE, "UFS_POWERDOWN_PWR_MODE") \ + EMe(UFS_DEEPSLEEP_PWR_MODE, "UFS_DEEPSLEEP_PWR_MODE") + +#define UFSCHD_CLK_GATING_STATES \ + EM(CLKS_OFF, "CLKS_OFF") \ + EM(CLKS_ON, "CLKS_ON") \ + EM(REQ_CLKS_OFF, "REQ_CLKS_OFF") \ + EMe(REQ_CLKS_ON, "REQ_CLKS_ON")/* Enums require being exported to userspace, for user tool parsing */ #undef EM#undef EMe -#define EM (a) TRACE_DEFINE_ENUM(a); -#define EMe (a) TRACE_DEFINE_ENUM(a); +#define EM (a, b) TRACE_DEFINE_ENUM(a); +#define EMe (a, b) TRACE_DEFINE_ENUM(a);UFS_LINK_STATES ;UFS_PWR_MODES ;
@@ -53,8 +53,8 @@ UFSCHD_CLK_GATING_STATES;*/ #undef EM#undef EMe -#define EM (a) { a, #a }, -#define EMe (a) { a, #a } +#define EM (a, b) {a, b}, +#define EMe (a, b) {a, b} TRACE_EVENT(ufshcd_clk_gating,
Signature · 1 line
2.17.1
Re: [PATCH v3 1/6] scsi: ufs: Remove stringize operator '#' restriction
Quoted 11 lines · Bean Huo
From: Bean Huo <[email protected]>
Current EM macro definition, we use stringize operator '#', which turns the argument it precedes into a quoted string. Thus requires the symbol of
__print_symbolic()should be the string corresponding to the name of the enum.However, we have other cases, the symbol and enum name are not the same, we can redefine EM/EMe, but there will introduce some redundant codes. This patch is to remove this restriction, let others reuse the current EM/EMe definition.
While this version doesn't have the copy/paste typo, I fail to see value in defining EMe as a trailing comma in an array declaration isn't meaningful and doesn't emit any error or warning.
Maybe all the uses of EMe can be converted to EM and the macro definitions removed.
--- include/ras/ras_event.h | 64 ++++++++--------- include/trace/events/9p.h | 142 ++++++++++++++++++------------------- include/trace/events/btrfs.h | 66 ++++++++--------- include/trace/events/huge_memory.h | 58 +++++++-------- include/trace/events/migrate.h | 26 +++---- include/trace/events/mmflags.h | 34 ++++----- include/trace/events/sock.h | 56 +++++++-------- include/trace/events/sunrpc.h | 44 ++++++------ include/trace/events/tlb.h | 16 ++--- include/trace/events/ufs.h | 12 ++-- include/trace/events/v4l2.h | 54 +++++++------- include/trace/events/writeback.h | 24 +++---- 12 files changed, 274 insertions(+), 322 deletions(-)
include/ras/ras_event.h +30 -34
@@ -348,56 +348,52 @@ TRACE_EVENT(aer_event,#ifdef CONFIG_MEMORY_FAILURE #define MF_ACTION_RESULT \ - EM ( MF_IGNORED, "Ignored" ) \ - EM ( MF_FAILED, "Failed" ) \ - EM ( MF_DELAYED, "Delayed" ) \ - EMe ( MF_RECOVERED, "Recovered" ) - -#define MF_PAGE_TYPE \ - EM ( MF_MSG_KERNEL, "reserved kernel page" ) \ - EM ( MF_MSG_KERNEL_HIGH_ORDER, "high-order kernel page" ) \ - EM ( MF_MSG_SLAB, "kernel slab page" ) \ - EM ( MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking" ) \ - EM ( MF_MSG_POISONED_HUGE, "huge page already hardware poisoned" ) \ - EM ( MF_MSG_HUGE, "huge page" ) \ - EM ( MF_MSG_FREE_HUGE, "free huge page" ) \ - EM ( MF_MSG_NON_PMD_HUGE, "non-pmd-sized huge page" ) \ - EM ( MF_MSG_UNMAP_FAILED, "unmapping failed page" ) \ - EM ( MF_MSG_DIRTY_SWAPCACHE, "dirty swapcache page" ) \ - EM ( MF_MSG_CLEAN_SWAPCACHE, "clean swapcache page" ) \ - EM ( MF_MSG_DIRTY_MLOCKED_LRU, "dirty mlocked LRU page" ) \ - EM ( MF_MSG_CLEAN_MLOCKED_LRU, "clean mlocked LRU page" ) \ - EM ( MF_MSG_DIRTY_UNEVICTABLE_LRU, "dirty unevictable LRU page" ) \ - EM ( MF_MSG_CLEAN_UNEVICTABLE_LRU, "clean unevictable LRU page" ) \ - EM ( MF_MSG_DIRTY_LRU, "dirty LRU page" ) \ - EM ( MF_MSG_CLEAN_LRU, "clean LRU page" ) \ - EM ( MF_MSG_TRUNCATED_LRU, "already truncated LRU page" ) \ - EM ( MF_MSG_BUDDY, "free buddy page" ) \ - EM ( MF_MSG_BUDDY_2ND, "free buddy page (2nd try)" ) \ - EM ( MF_MSG_DAX, "dax page" ) \ - EM ( MF_MSG_UNSPLIT_THP, "unsplit thp" ) \ - EMe ( MF_MSG_UNKNOWN, "unknown page" ) + EM(MF_IGNORED, "Ignored") \ + EM(MF_FAILED, "Failed") \ + EM(MF_DELAYED, "Delayed") \ + EM(MF_RECOVERED, "Recovered") + +#define MF_PAGE_TYPE \ + EM(MF_MSG_KERNEL, "reserved kernel page") \ + EM(MF_MSG_KERNEL_HIGH_ORDER, "high-order kernel page") \ + EM(MF_MSG_SLAB, "kernel slab page") \ + EM(MF_MSG_DIFFERENT_COMPOUND, "different compound page after locking") \ + EM(MF_MSG_POISONED_HUGE, "huge page already hardware poisoned") \ + EM(MF_MSG_HUGE, "huge page") \ + EM(MF_MSG_FREE_HUGE, "free huge page") \ + EM(MF_MSG_NON_PMD_HUGE, "non-pmd-sized huge page") \ + EM(MF_MSG_UNMAP_FAILED, "unmapping failed page") \ + EM(MF_MSG_DIRTY_SWAPCACHE, "dirty swapcache page") \ + EM(MF_MSG_CLEAN_SWAPCACHE, "clean swapcache page") \ + EM(MF_MSG_DIRTY_MLOCKED_LRU, "dirty mlocked LRU page") \ + EM(MF_MSG_CLEAN_MLOCKED_LRU, "clean mlocked LRU page") \ + EM(MF_MSG_DIRTY_UNEVICTABLE_LRU, "dirty unevictable LRU page") \ + EM(MF_MSG_CLEAN_UNEVICTABLE_LRU, "clean unevictable LRU page") \ + EM(MF_MSG_DIRTY_LRU, "dirty LRU page") \ + EM(MF_MSG_CLEAN_LRU, "clean LRU page") \ + EM(MF_MSG_TRUNCATED_LRU, "already truncated LRU page") \ + EM(MF_MSG_BUDDY, "free buddy page") \ + EM(MF_MSG_BUDDY_2ND, "free buddy page (2nd try)") \ + EM(MF_MSG_DAX, "dax page") \ + EM(MF_MSG_UNSPLIT_THP, "unsplit thp") \ + EM(MF_MSG_UNKNOWN, "unknown page")/* * First define the enums in MM_ACTION_RESULT to be exported to userspace * via TRACE_DEFINE_ENUM(). */ #undef EM -#undef EMe#define EM (a, b) TRACE_DEFINE_ENUM(a); -#define EMe (a, b) TRACE_DEFINE_ENUM(a);MF_ACTION_RESULT MF_PAGE_TYPE /* -* Now redefine the EM() and EMe() macros to map the enums to the strings +* Now redefine the EM() macro to map the enums to the strings * that will be printed in the output. */#undef EM -#undef EMe#define EM (a, b) { a, b }, -#define EMe (a, b) { a, b } TRACE_EVENT(memory_failure_event, TP_PROTO(unsigned long pfn,
include/trace/events/9p.h +69 -73
160 lines not on this page · raw message
include/trace/events/btrfs.h +31 -35
100 lines not on this page · raw message
include/trace/events/huge_memory.h +27 -31
72 lines not on this page · raw message
include/trace/events/migrate.h +11 -15
@@ -8,40 +8,36 @@#include <linux/tracepoint.h> #define MIGRATE_MODE \ - EM( MIGRATE_ASYNC, "MIGRATE_ASYNC") \ - EM( MIGRATE_SYNC_LIGHT, "MIGRATE_SYNC_LIGHT") \ - EMe(MIGRATE_SYNC, "MIGRATE_SYNC") + EM(MIGRATE_ASYNC, "MIGRATE_ASYNC") \ + EM(MIGRATE_SYNC_LIGHT, "MIGRATE_SYNC_LIGHT") \ + EM(MIGRATE_SYNC, "MIGRATE_SYNC")#define MIGRATE_REASON \ - EM( MR_COMPACTION, "compaction") \ - EM( MR_MEMORY_FAILURE, "memory_failure") \ - EM( MR_MEMORY_HOTPLUG, "memory_hotplug") \ - EM( MR_SYSCALL, "syscall_or_cpuset") \ - EM( MR_MEMPOLICY_MBIND, "mempolicy_mbind") \ - EM( MR_NUMA_MISPLACED, "numa_misplaced") \ - EMe(MR_CONTIG_RANGE, "contig_range") + EM(MR_COMPACTION, "compaction") \ + EM(MR_MEMORY_FAILURE, "memory_failure") \ + EM(MR_MEMORY_HOTPLUG, "memory_hotplug") \ + EM(MR_SYSCALL, "syscall_or_cpuset") \ + EM(MR_MEMPOLICY_MBIND, "mempolicy_mbind") \ + EM(MR_NUMA_MISPLACED, "numa_misplaced") \ + EM(MR_CONTIG_RANGE, "contig_range")/* * First define the enums in the above macros to be exported to userspace * via TRACE_DEFINE_ENUM(). */ #undef EM -#undef EMe#define EM (a, b) TRACE_DEFINE_ENUM(a); -#define EMe (a, b) TRACE_DEFINE_ENUM(a);MIGRATE_MODE MIGRATE_REASON /* -* Now redefine the EM() and EMe() macros to map the enums to the strings +* Now redefine the EM() macro to map the enums to the strings * that will be printed in the output. */#undef EM -#undef EMe#define EM (a, b) {a, b}, -#define EMe (a, b) {a, b} TRACE_EVENT(mm_migrate_pages,
include/trace/events/mmflags.h +15 -19
@@ -178,15 +178,15 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \#ifdef CONFIG_COMPACTION #define COMPACTION_STATUS \ - EM( COMPACT_SKIPPED, "skipped") \ - EM( COMPACT_DEFERRED, "deferred") \ - EM( COMPACT_CONTINUE, "continue") \ - EM( COMPACT_SUCCESS, "success") \ - EM( COMPACT_PARTIAL_SKIPPED, "partial_skipped") \ - EM( COMPACT_COMPLETE, "complete") \ - EM( COMPACT_NO_SUITABLE_PAGE, "no_suitable_page") \ - EM( COMPACT_NOT_SUITABLE_ZONE, "not_suitable_zone") \ - EMe(COMPACT_CONTENDED, "contended") + EM(COMPACT_SKIPPED, "skipped") \ + EM(COMPACT_DEFERRED, "deferred") \ + EM(COMPACT_CONTINUE, "continue") \ + EM(COMPACT_SUCCESS, "success") \ + EM(COMPACT_PARTIAL_SKIPPED, "partial_skipped") \ + EM(COMPACT_COMPLETE, "complete") \ + EM(COMPACT_NO_SUITABLE_PAGE, "no_suitable_page") \ + EM(COMPACT_NOT_SUITABLE_ZONE, "not_suitable_zone") \ + EM(COMPACT_CONTENDED, "contended")/* High-level compaction status feedback */ #define COMPACTION_FAILED 1
@@ -203,12 +203,12 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \#define COMPACTION_FEEDBACK \ EM(COMPACTION_FAILED, "failed") \ EM(COMPACTION_WITHDRAWN, "withdrawn") \ - EMe(COMPACTION_PROGRESS, "progress") + EM(COMPACTION_PROGRESS, "progress")#define COMPACTION_PRIORITY \ EM(COMPACT_PRIO_SYNC_FULL, "COMPACT_PRIO_SYNC_FULL") \ EM(COMPACT_PRIO_SYNC_LIGHT, "COMPACT_PRIO_SYNC_LIGHT") \ - EMe(COMPACT_PRIO_ASYNC, "COMPACT_PRIO_ASYNC") + EM(COMPACT_PRIO_ASYNC, "COMPACT_PRIO_ASYNC")#else #define COMPACTION_STATUS #define COMPACTION_PRIORITY
@@ -238,23 +238,21 @@ IF_HAVE_VM_SOFTDIRTY(VM_SOFTDIRTY, "softdirty" ) \IFDEF_ZONE_DMA32 (EM (ZONE_DMA32 ,"DMA32" )) \ EM (ZONE_NORMAL, "Normal") \IFDEF_ZONE_HIGHMEM (EM (ZONE_HIGHMEM ,"HighMem" )) \ - EMe(ZONE_MOVABLE,"Movable") + EM (ZONE_MOVABLE,"Movable")#define LRU_NAMES \ EM (LRU_INACTIVE_ANON, "inactive_anon") \ EM (LRU_ACTIVE_ANON, "active_anon") \ EM (LRU_INACTIVE_FILE, "inactive_file") \ EM (LRU_ACTIVE_FILE, "active_file") \ - EMe(LRU_UNEVICTABLE, "unevictable") + EM (LRU_UNEVICTABLE, "unevictable")/* -* First define the enums in the above macros to be exported to userspace +* First define the enum in the EM macro to be exported to userspace * via TRACE_DEFINE_ENUM(). */ #undef EM -#undef EMe#define EM (a, b) TRACE_DEFINE_ENUM(a); -#define EMe (a, b) TRACE_DEFINE_ENUM(a);COMPACTION_STATUS COMPACTION_PRIORITY
@@ -263,10 +261,8 @@ ZONE_TYPE LRU_NAMES/* -* Now redefine the EM() and EMe() macros to map the enums to the strings +* Now redefine the EM() macro to map the enums to the strings * that will be printed in the output. */ #undef EM -#undef EMe#define EM (a, b) {a, b}, -#define EMe (a, b) {a, b}
include/trace/events/sock.h +26 -30
75 lines not on this page · raw message
include/trace/events/sunrpc.h +20 -24
71 lines not on this page · raw message
include/trace/events/tlb.h +6 -10
@@ -9,31 +9,27 @@#include <linux/tracepoint.h> #define TLB_FLUSH_REASON \ - EM( TLB_FLUSH_ON_TASK_SWITCH, "flush on task switch" ) \ - EM( TLB_REMOTE_SHOOTDOWN, "remote shootdown" ) \ - EM( TLB_LOCAL_SHOOTDOWN, "local shootdown" ) \ - EM( TLB_LOCAL_MM_SHOOTDOWN, "local mm shootdown" ) \ - EMe( TLB_REMOTE_SEND_IPI, "remote ipi send" ) + EM(TLB_FLUSH_ON_TASK_SWITCH, "flush on task switch") \ + EM(TLB_REMOTE_SHOOTDOWN, "remote shootdown") \ + EM(TLB_LOCAL_SHOOTDOWN, "local shootdown") \ + EM(TLB_LOCAL_MM_SHOOTDOWN, "local mm shootdown") \ + EM(TLB_REMOTE_SEND_IPI, "remote ipi send")/* * First define the enums in TLB_FLUSH_REASON to be exported to userspace * via TRACE_DEFINE_ENUM(). */ #undef EM -#undef EMe#define EM (a,b) TRACE_DEFINE_ENUM(a); -#define EMe (a,b) TRACE_DEFINE_ENUM(a);TLB_FLUSH_REASON /* -* Now redefine the EM() and EMe() macros to map the enums to the strings +* Now redefine the EM() macro to map the enums to the strings * that will be printed in the output. */#undef EM -#undef EMe#define EM (a,b) { a, b }, -#define EMe (a,b) { a, b } TRACE_EVENT(tlb_flush,
include/trace/events/ufs.h +4 -8
@@ -23,38 +23,34 @@#define UFS_LINK_STATES \ EM(UIC_LINK_OFF_STATE) \ EM(UIC_LINK_ACTIVE_STATE) \ - EMe(UIC_LINK_HIBERN8_STATE) + EM(UIC_LINK_HIBERN8_STATE)#define UFS_PWR_MODES \ EM(UFS_ACTIVE_PWR_MODE) \ EM(UFS_SLEEP_PWR_MODE) \ EM(UFS_POWERDOWN_PWR_MODE) \ - EMe(UFS_DEEPSLEEP_PWR_MODE) + EM(UFS_DEEPSLEEP_PWR_MODE)#define UFSCHD_CLK_GATING_STATES \ EM(CLKS_OFF) \ EM(CLKS_ON) \ EM(REQ_CLKS_OFF) \ - EMe(REQ_CLKS_ON) + EM(REQ_CLKS_ON)/* Enums require being exported to userspace, for user tool parsing */ #undef EM -#undef EMe#define EM (a) TRACE_DEFINE_ENUM(a); -#define EMe (a) TRACE_DEFINE_ENUM(a);UFS_LINK_STATES ;UFS_PWR_MODES ;UFSCHD_CLK_GATING_STATES ;/* -* Now redefine the EM() and EMe() macros to map the enums to the strings +* Now redefine the EM() macro to map the enums to the strings * that will be printed in the output. */ #undef EM -#undef EMe#define EM (a) { a, #a }, -#define EMe (a) { a, #a } TRACE_EVENT(ufshcd_clk_gating,
include/trace/events/v4l2.h +25 -29
80 lines not on this page · raw message
include/trace/events/writeback.h +10 -14
@@ -25,29 +25,25 @@/* enums need to be exported to user space */ #undef EM -#undef EMe -#define EM (a,b) TRACE_DEFINE_ENUM(a); -#define EMe (a,b) TRACE_DEFINE_ENUM(a); +#define EM (a, b) TRACE_DEFINE_ENUM(a);#define WB_WORK_REASON \ - EM( WB_REASON_BACKGROUND, "background") \ - EM( WB_REASON_VMSCAN, "vmscan") \ - EM( WB_REASON_SYNC, "sync") \ - EM( WB_REASON_PERIODIC, "periodic") \ - EM( WB_REASON_LAPTOP_TIMER, "laptop_timer") \ - EM( WB_REASON_FS_FREE_SPACE, "fs_free_space") \ - EMe(WB_REASON_FORKER_THREAD, "forker_thread") + EM(WB_REASON_BACKGROUND, "background") \ + EM(WB_REASON_VMSCAN, "vmscan") \ + EM(WB_REASON_SYNC, "sync") \ + EM(WB_REASON_PERIODIC, "periodic") \ + EM(WB_REASON_LAPTOP_TIMER, "laptop_timer") \ + EM(WB_REASON_FS_FREE_SPACE, "fs_free_space") \ + EM(WB_REASON_FORKER_THREAD, "forker_thread")WB_WORK_REASON /* -* Now redefine the EM() and EMe() macros to map the enums to the strings +* Now redefine the EM() macro to map the enums to the strings * that will be printed in the output. */#undef EM -#undef EMe -#define EM (a,b) { a, b }, -#define EMe (a,b) { a, b } +#define EM (a, b) { a, b },struct wb_writeback_work ;
Re: [PATCH v3 1/6] scsi: ufs: Remove stringize operator '#' restriction
Quoted 18 lines · Joe Perches
Quoted 10 lines
From: Bean Huo <[email protected]>
Current EM macro definition, we use stringize operator '#', which turns
the argument it precedes into a quoted string. Thus requires the symbol
of__print_symbolic()should be the string corresponding to the name of
the enum.Quoted 7 lines
However, we have other cases, the symbol and enum name are not the same,
we can redefine EM/EMe, but there will introduce some redundant codes.
This patch is to remove this restriction, let others reuse the current
EM/EMe definition.
Quoted 7 lines
While this version doesn't have the copy/paste typo, I fail to see value in defining EMe as a trailing comma in an array declaration isn't meaningful and doesn't emit any error or warning.
Maybe all the uses of EMe can be converted to EM and the macro definitions removed.
Hi Joe
I removed EMe, but there is this error:
./include/trace/trace_events.h:300:18: error: initializer element is not constant
{ symbol_array, { -1, NULL }}; \./include/trace/trace_events.h:300:18: error: expected expression before ‘,’ token
{ symbol_array, { -1, NULL }}; \did you choose kernel trace and event trace before compiling?
Thanks,
Bean
RE: [PATCH v3 1/6] scsi: ufs: Remove stringize operator '#' restriction
In reply to Bean HuoFrom: Bean Huo <[email protected]>
Quoted 25 lines
Sent: 14 December 2020 20:20
From: Bean Huo <[email protected]>
Current EM macro definition, we use stringize operator '#', which turns the argument it precedes into a quoted string. Thus requires the symbol of
__print_symbolic()should be the string corresponding to the name of the enum.However, we have other cases, the symbol and enum name are not the same, we can redefine EM/EMe, but there will introduce some redundant codes. This patch is to remove this restriction, let others reuse the current EM/EMe definition.
Signed-off-by Bean Huo <[email protected]>--- include/trace/events/ufs.h | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-)include/trace/events/ufs.h +0
-0@@ -20,28 +20,28 @@
..
include/trace/events/ufs.h line 26
Quoted 4 lines
include/trace/events/ufs.h +4
-0+#define UFS_LINK_STATES \ + EM(UIC_LINK_OFF_STATE, "UIC_LINK_OFF_STATE") \ + EM(UIC_LINK_ACTIVE_STATE, "UIC_LINK_ACTIVE_STATE") \ + EMe(UIC_LINK_HIBERN8_STATE, "UIC_LINK_HIBERN8_STATE")
If you make EM a parameter to UFS_LINK_STATES then the caller can pass in the name of a #define that does the required expansion. The caller can also add in any required terminator after the last entry. For an enum (which doesn't want a , at the end) just add a dummy entry. You often want a constant for the number of items anyway.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Steven Rostedt
maintainerRe: [PATCH v3 1/6] scsi: ufs: Remove stringize operator '#' restriction
Quoted 10 lines · On Mon, 14 Dec 2020 23:11:40 +0000 David Laight <[email protected]> wrote:
Quoted 9 lines
--- include/trace/events/ufs.h | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-)include/trace/events/ufs.h +0
-0@@ -20,28 +20,28 @@..
Quoted 10 lines
include/trace/events/ufs.h line 26
Quoted 4 lines
include/trace/events/ufs.h +4
-0+#define UFS_LINK_STATES \ + EM(UIC_LINK_OFF_STATE, "UIC_LINK_OFF_STATE") \ + EM(UIC_LINK_ACTIVE_STATE, "UIC_LINK_ACTIVE_STATE") \ + EMe(UIC_LINK_HIBERN8_STATE, "UIC_LINK_HIBERN8_STATE")If you make EM a parameter to
UFS_LINK_STATESthen the caller can pass in the name of a #define that does the required expansion. The caller can also add in any required terminator after the last entry. For an enum (which doesn't want a , at the end) just add a dummy entry. You often want a constant for the number of items anyway.
This is currently the way its done in multiple other places. When creating the "EMe" trick, I've thought about it, but then realized it would make the other locations look strange without the expected comma, and decided that EMe() would be the best solution, as it's only strange in where it's added, and not where its used.
$ git grep -l EMe include/trace/ |wc -l
11It's already used in 11 other files, let's not muck with it now.
-- Steve
PATCH v3 2/6 scsi: ufs: Use __print_symbolic() for UFS trace string print
In reply to Bean HuoFrom: Bean Huo <[email protected]>
__print_symbolic() is designed for exporting the print formatting table to userspace and allows parsing tool, such as trace-cmd and perf, to analyze trace log according to this print formatting table, meanwhile, by using __print_symbolic()s, save space in the trace ring buffer.
original print format:
print fmt: "%s: %s: HDR:%s, CDB:%s", __get_str(str), __get_str(dev_name),
__print_hex(REC->hdr, sizeof(REC->hdr)),
__print_hex(REC->tsf, sizeof(REC->tsf))after this change:
print fmt: "%s: %s: HDR:%s, CDB:%s",
print_symbolic(REC->str_t, {0, "send"},
{1, "complete"},
{2, "dev_complete"},
{3, "query_send"},
{4, "query_complete"},
{5, "query_complete_err"},
{6, "tm_send"},
{7, "tm_complete"},
{8, "tm_complete_err"}),
__get_str(dev_name), __print_hex(REC->hdr, sizeof(REC->hdr)),
__print_hex(REC->tsf, sizeof(REC->tsf))Note: This patch just converts current __get_str(str) to __print_symbolic(),
the original tracing log will not be affected by this change, so it doesn't break what current parsers expect.
--- drivers/scsi/ufs/ufs.h | 10 +++++++ drivers/scsi/ufs/ufshcd.c | 48 ++++++++++++++++----------------- include/trace/events/ufs.h | 54 ++++++++++++++++++++++++-------------- 3 files changed, 69 insertions(+), 43 deletions(-)
drivers/scsi/ufs/ufs.h +10 -0
@@ -545,6 +545,16 @@ struct ufs_dev_info {u8 b_presrv_uspc_en; }; +/* +* This enum is used in string mapping in include/trace/events/ufs.h. +*/ +enum ufs_trace_str_t { +UFS_CMD_SEND ,UFS_CMD_COMP ,UFS_DEV_COMP , +UFS_QUERY_SEND ,UFS_QUERY_COMP ,UFS_QUERY_ERR , +UFS_TM_SEND ,UFS_TM_COMP ,UFS_TM_ERR +}; + +/** * ufs_is_valid_unit_desc_lun - checks if the given LUN has a unit descriptor * @dev_info: pointer of instance of struct ufs_dev_info
drivers/scsi/ufs/ufshcd.c +24 -24
167 lines not on this page · raw message
include/trace/events/ufs.h +35 -19
138 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v3 3/6 scsi: ufs: Don't call trace_ufshcd_upiu() in case trace poit is disabled
In reply to Bean HuoFrom: Bean Huo <[email protected]>
Don't call trace_ufshcd_upiu() in case ufshba_upiu trace poit is not enabled.
--- drivers/scsi/ufs/ufshcd.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/scsi/ufs/ufshcd.c +9 -0
@@ -309,6 +309,9 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag, {struct utp_upiu_req *rq = hba->lrb[tag].ucd_req_ptr; +if (!trace_ufshcd_upiu_enabled ()) +return ; +trace_ufshcd_upiu (dev_name (hba->dev), str_t, &rq->header, &rq->sc.cdb); }
@@ -317,6 +320,9 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag, {struct utp_upiu_req *rq = hba->lrb[tag].ucd_req_ptr; +if (!trace_ufshcd_upiu_enabled ()) +return ; +trace_ufshcd_upiu (dev_name (hba->dev), str_t, &rq->header, &rq->qr); }
@@ -326,6 +332,9 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,int off = (int )tag - hba->nutrs;struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[off]; +if (!trace_ufshcd_upiu_enabled ()) +return ; +trace_ufshcd_upiu (dev_name (hba->dev), str_t, &descp->req_header, &descp->input_param1); }
Signature · 1 line
2.17.1
PATCH v3 4/6 scsi: ufs: Distinguish between query REQ and query RSP in query trace
In reply to Bean HuoFrom: Bean Huo <[email protected]>
Currently, in the query completion trace print, since we use hba->lrb[tag].ucd_req_ptr and didn't differentiate UPIU between request and response, thus header and transaction-specific field in UPIU printed by query trace are identical. This is not very practical. As below:
query_send: HDR:16 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 00 00 00 00 00query_complete: HDR:16 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 00 00 00 00 00
For the failure analysis, we want to understand the real response reported by the UFS device, however, the current query trace tells us nothing. After this patch, the query trace on the query_send, and the above a pair of query_send and query_complete will be:
query_send: HDR:16 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 00 00 00 00 00ufshcd_upiu: HDR:36 00 00 0e 00 81 00 00 00 00 00 00, CDB:06 0e 03 00 00 00 00 00 00 00 00 01 00 00 00 00
--- drivers/scsi/ufs/ufshcd.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +8 -2
@@ -318,12 +318,18 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag,static void ufshcd_add_query_upiu_trace (struct ufs_hba *hba,unsigned int tag,enum ufs_trace_str_t str_t) { -struct utp_upiu_req *rq = hba->lrb[tag].ucd_req_ptr; +struct utp_upiu_req *rq_rsp;if (!trace_ufshcd_upiu_enabled ())return ; -trace_ufshcd_upiu (dev_name (hba->dev), str_t, &rq->header, &rq->qr); +if (str_t ==UFS_QUERY_SEND ) + rq_rsp = hba->lrb[tag].ucd_req_ptr; +else + rq_rsp = (struct utp_upiu_req *)hba->lrb[tag].ucd_rsp_ptr; + +trace_ufshcd_upiu (dev_name (hba->dev), str_t, &rq_rsp->header, + &rq_rsp->qr); } static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,
Signature · 1 line
2.17.1
PATCH v3 5/6 scsi: ufs: Distinguish between TM request UPIU and response UPIU in TM UPIU trace
In reply to Bean HuoFrom: Bean Huo <[email protected]>
Distinguish between TM request UPIU and response UPIU in TM UPIU trace, for the TM response, let TM UPIU trace print its TM response UPIU.
--- drivers/scsi/ufs/ufshcd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd.c +6 -2
@@ -341,8 +341,12 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,if (!trace_ufshcd_upiu_enabled ())return ; -trace_ufshcd_upiu (dev_name (hba->dev), str_t, &descp->req_header, - &descp->input_param1); +if (str_t ==UFS_TM_SEND ) +trace_ufshcd_upiu (dev_name (hba->dev), str_t, &descp->req_header, + &descp->input_param1); +else +trace_ufshcd_upiu (dev_name (hba->dev), str_t, &descp->rsp_header, + &descp->output_param1); } static void ufshcd_add_uic_command_trace(struct ufs_hba *hba,
Signature · 1 line
2.17.1
PATCH v3 6/6 scsi: ufs: Make UPIU trace easier differentiate among CDB, OSF, and TM
In reply to Bean HuoFrom: Bean Huo <[email protected]>
Transaction Specific Fields (TSF) in the UPIU package could be CDB (SCSI/UFS Command Descriptor Block), OSF (Opcode Specific Field), and TM I/O parameter (Task Management Input/Output Parameter). But, currently, we take all of these as CDB in the UPIU trace. Thus makes user confuse among CDB, OSF, and TM message. So fix it with this patch.
--- drivers/scsi/ufs/ufs.h | 7 +++++++ drivers/scsi/ufs/ufshcd.c | 9 +++++---- include/trace/events/ufs.h | 18 +++++++++++++++--- 3 files changed, 27 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufs.h +7 -0
@@ -554,6 +554,13 @@ enum ufs_trace_str_t { UFS_TM_SEND, UFS_TM_COMP, UFS_TM_ERR }; +/* +* Transaction Specific Fields (TSF) type in the UPIU package, this enum is +* used in include/trace/events/ufs.h for UFS command trace. +*/ +enum ufs_trace_tsf_t { +UFS_TSF_CDB ,UFS_TSF_OSF ,UFS_TSF_TM_INPUT ,UFS_TSF_TM_OUTPUT +};/** * ufs_is_valid_unit_desc_lun - checks if the given LUN has a unit descriptor
drivers/scsi/ufs/ufshcd.c +5 -4
@@ -312,7 +312,8 @@ static void ufshcd_add_cmd_upiu_trace(struct ufs_hba *hba, unsigned int tag,if (!trace_ufshcd_upiu_enabled ())return ; -trace_ufshcd_upiu (dev_name (hba->dev), str_t, &rq->header, &rq->sc.cdb); +trace_ufshcd_upiu (dev_name (hba->dev), str_t, &rq->header, &rq->sc.cdb, +UFS_TSF_CDB ); } static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag,
@@ -329,7 +330,7 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, unsigned int tag, rq_rsp = (struct utp_upiu_req *)hba->lrb[tag].ucd_rsp_ptr;trace_ufshcd_upiu (dev_name (hba->dev), str_t, &rq_rsp->header, - &rq_rsp->qr); + &rq_rsp->qr,UFS_TSF_OSF ); } static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,
@@ -343,10 +344,10 @@ static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,if (str_t ==UFS_TM_SEND )trace_ufshcd_upiu (dev_name (hba->dev), str_t, &descp->req_header, - &descp->input_param1); + &descp->input_param1,UFS_TSF_TM_INPUT );else trace_ufshcd_upiu (dev_name (hba->dev), str_t, &descp->rsp_header, - &descp->output_param1); + &descp->output_param1,UFS_TSF_TM_OUTPUT ); } static void ufshcd_add_uic_command_trace(struct ufs_hba *hba,
include/trace/events/ufs.h +15 -3
@@ -48,6 +48,12 @@ EM(UFS_TM_COMP, "tm_complete") \ EMe(UFS_TM_ERR, "tm_complete_err") +#define UFS_CMD_TRACE_TSF_TYPES \ + EM(UFS_TSF_CDB, "CDB") \ + EM(UFS_TSF_OSF, "OSF") \ + EM(UFS_TSF_TM_INPUT, "TM_INPUT") \ + EMe(UFS_TSF_TM_OUTPUT, "TM_OUTPUT") +/* Enums require being exported to userspace, for user tool parsing */ #undef EM#undef EMe
@@ -58,6 +64,7 @@ UFS_LINK_STATES;UFS_PWR_MODES ;UFSCHD_CLK_GATING_STATES ;UFS_CMD_TRACE_STRINGS +UFS_CMD_TRACE_TSF_TYPES /* * Now redefine the EM() and EMe() macros to map the enums to the strings
@@ -70,6 +77,8 @@ UFS_CMD_TRACE_STRINGS#define show_ufs_cmd_trace_str (str_t) \ __print_symbolic(str_t, UFS_CMD_TRACE_STRINGS) +#define show_ufs_cmd_trace_tsf (tsf) \ + __print_symbolic(tsf, UFS_CMD_TRACE_TSF_TYPES) TRACE_EVENT(ufshcd_clk_gating,
@@ -311,15 +320,16 @@ TRACE_EVENT(ufshcd_uic_command, TRACE_EVENT(ufshcd_upiu, TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t, void *hdr, - void *tsf), + void *tsf, enum ufs_trace_tsf_t tsf_t), - TP_ARGS(dev_name, str_t, hdr, tsf), + TP_ARGS(dev_name, str_t, hdr, tsf, tsf_t), TP_STRUCT__entry( __string(dev_name, dev_name) __field(enum ufs_trace_str_t, str_t) __array(unsigned char, hdr, 12) __array(unsigned char, tsf, 16) + __field(enum ufs_trace_tsf_t, tsf_t) ), TP_fast_assign(
@@ -327,12 +337,14 @@ TRACE_EVENT(ufshcd_upiu, __entry->str_t = str_t;memcpy (__entry->hdr, hdr,sizeof (__entry->hdr));memcpy (__entry->tsf, tsf,sizeof (__entry->tsf)); + __entry->tsf_t = tsf_t; ),TP_printk ( -"%s: %s: HDR:%s, CDB:%s" , +"%s: %s: HDR:%s, %s:%s" ,show_ufs_cmd_trace_str (__entry->str_t),__get_str (dev_name),__print_hex (__entry->hdr,sizeof (__entry->hdr)), +show_ufs_cmd_trace_tsf (__entry->tsf_t),__print_hex (__entry->tsf,sizeof (__entry->tsf)) ) );
Signature · 1 line
2.17.1
Bean Hi,
I support this series.
I think it is a good idea to print the response on complete,
But you need to change the prefix strings, otherwise you are breaking the current parsers.
Say that you have a trace log, generated sometime during 2020 using the current upiu trace. It would look something like:
"send" <request upiu>
"complete" <request upiu>
And another log generated sometime during 2021 after your change is merged:
"send" <request upiu>
"complete" < ****response upiu ****>
The current parser won't be able to differentiate between those logs.
Just change the prefix strings to be "send_req" and "complete_rsp", or something, so the parsing tools that support the new format will be able to differentiate it from the old one.
Also, once the parser can differentiate the new format from the old, whatever follows its fine: cdb / osf / tsf or whatever makes sense to you.
Thanks,
Avri
Quoted 45 lines
-----Original Message-----
From: Bean Huo <[email protected]>
Sent: Monday, December 14, 2020 10:20 PM
To: [email protected]; Avri Altman <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]
Subject: [PATCH v3 0/6] Several changes for the UPIU traceCAUTION: This email originated from outside of Western Digital. Do not click on links or open attachments unless you recognize the sender and know that the content is safe.
From: Bean Huo <[email protected]>
Changelog:
V2--V3:
1. Fix a typo in patch 1/6 (Reported-by: Joe Perches <[email protected]>)V1--V2:
1. Convert__get_str(str)to__print_symbolic()
2. Add new patches 1/6, 2/6,3/6
3. Use__print_symbolic()in patch 6/6Bean Huo (6):
scsi: ufs: Remove stringize operator '#' restriction
scsi: ufs: Use__print_symbolic()for UFS trace string print
scsi: ufs: Don't calltrace_ufshcd_upiu()in case trace poit is
disabled
scsi: ufs: Distinguish between query REQ and query RSP in query trace
scsi: ufs: Distinguish between TM request UPIU and response UPIU in TM
UPIU trace
scsi: ufs: Make UPIU trace easier differentiate among CDB, OSF, and TMdrivers/scsi/ufs/ufs.h | 17 ++++++ drivers/scsi/ufs/ufshcd.c | 72 ++++++++++++++++--------- include/trace/events/ufs.h | 108 +++++++++++++++++++++++-------------- 3 files changed, 131 insertions(+), 66 deletions(-)--
2.17.1
Quoted 17 lines · Avri Altman
Bean Hi,
I support this series.
I think it is a good idea to print the response on complete, But you need to change the prefix strings, otherwise you are breaking the current parsers.Say that you have a trace log, generated sometime during 2020 using the current upiu trace.
It would look something like:
"send" <request upiu>
"complete" <request upiu>And another log generated sometime during 2021 after your change is merged:
"send" <request upiu>
"complete" < ****response upiu ****>
Quoted 5 lines
The current parser won't be able to differentiate between those logs. Just change the prefix strings to be "
send_req" and "complete_rsp", or something,
so the parsing tools that support the new format will be able to differentiate it from the old one.
Avri,
I still don't understand, this change doesn't break you current parser. if you still trace "send", "complete", "CDB", "query_send/complte", they are still there, doesn't change. I suggest you just run on your system. see if there is conflict.
Regarding your suggestion:
This is not problem now, we just change this definition.
do you mean just "send" and "complete" or all?
#define
UFS_CMD_TRACE_STRINGS \
EM(UFS_CMD_SEND, "send_req") \
EM(UFS_CMD_COMP, "complete_rsp") \ below also need add "req" and "rsp"?
EM(UFS_DEV_COMP, "dev_complete_rsp") \
EM(UFS_QUERY_SEND, "query_send") \
EM(UFS_QUERY_COMP, "query_complete") \
EM(UFS_QUERY_ERR, "query_complete_err") \
EM(UFS_TM_SEND, "tm_send") \
EM(UFS_TM_COMP, "tm_complete") \
EM(UFS_TM_ERR, "tm_complete_err") Quoted 7 lines
Also, once the parser can differentiate the new format from the old, whatever follows its fine: cdb / osf / tsf or whatever makes sense to you.
Thanks,
Avri
Quoted 49 lines · Bean Huo
Quoted 11 lines
And another log generated sometime during 2021 after your change is merged:
"send" <request upiu>
"complete" < ****response upiu ****>The current parser won't be able to differentiate between those logs.
Just change the prefix strings to be "send_req" and "complete_rsp", or something,
so the parsing tools that support the new format will be able to differentiate it from the old one.Avri,
I still don't understand, this change doesn't break you current parser.
if you still trace "send", "complete", "CDB", "query_send/complte", they are still there, doesn't change. I suggest you just run on your system. see if there is conflict.Regarding your suggestion:
This is not problem now, we just change this definition.do you mean just "send" and "complete" or all?
#define
UFS_CMD_TRACE_STRINGS
\
EM(UFS_CMD_SEND, "send_req")
\
EM(UFS_CMD_COMP, "complete_rsp")
\below also need add "req" and "rsp"?
EM(UFS_DEV_COMP, "dev_complete_rsp")
\
EM(UFS_QUERY_SEND, "query_send")
\
EM(UFS_QUERY_COMP, "query_complete")
\
EM(UFS_QUERY_ERR, "query_complete_err")
\
Quoted 7 lines
EM(UFS_TM_SEND, "tm_send")
\
EM(UFS_TM_COMP, "tm_complete")
\
EM(UFS_TM_ERR, "tm_complete_err")
Hi Avri
I am waiting for your answer. How can I change these strings to back- compatible with your tool? Tt seems only you use these strings.
Thanks,
Bean
Quoted 62 lines · Bean Huo
Quoted 52 lines · Bean Huo
Quoted 6 lines
And another log generated sometime during 2021 after your change is
merged:
"send" <request upiu>
"complete" < ****response upiu ****>Quoted 7 lines
The current parser won't be able to differentiate between those logs.
Just change the prefix strings to be "send_req" and "complete_rsp",
or something,
so the parsing tools that support the new format will be able to differentiate it from the old one.Avri,
I still don't understand, this change doesn't break you current parser.
if you still trace "send", "complete", "CDB", "query_send/complte", they are still there, doesn't change. I suggest you just run on your
system. see if there is conflict.Regarding your suggestion:
This is not problem now, we just change this definition.do you mean just "send" and "complete" or all?
#define
UFS_CMD_TRACE_STRINGS
\
EM(UFS_CMD_SEND, "send_req")
\
EM(UFS_CMD_COMP, "complete_rsp")
\below also need add "req" and "rsp"?
EM(UFS_DEV_COMP, "dev_complete_rsp")
\
EM(UFS_QUERY_SEND, "query_send")
\
EM(UFS_QUERY_COMP, "query_complete")
\
EM(UFS_QUERY_ERR, "query_complete_err")
\Quoted 7 lines
EM(UFS_TM_SEND, "tm_send")
\
EM(UFS_TM_COMP, "tm_complete")
\
EM(UFS_TM_ERR, "tm_complete_err")
Quoted 8 lines
Hi Avri
I am waiting for your answer. How can I change these strings to back- compatible with your tool? Tt seems only you use these strings.
Thanks,
Bean
Hi Avri
Before sending next version, double confirm with your. I think you just need change:
"send" to "send_req"
"complete" to "complete_rsp"
Bean