History

scsi: ufs: Use __print_symbolic() for UFS trace string print

__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.

Bean Huo committed 5 years ago

Commit 28fa68f1 parent c7c730a3 files · +69 −43Browse files

Showing the changes to include/trace (1 of 3 files). Show all

Unified · Split

include/trace/events/ufs.h+35−19
@@ -37,6 +37,17 @@ · 36 unmodified lines
37 EM(REQ_CLKS_OFF, "REQ_CLKS_OFF") \37 EM(REQ_CLKS_OFF, "REQ_CLKS_OFF") \
38 EMe(REQ_CLKS_ON, "REQ_CLKS_ON")38 EMe(REQ_CLKS_ON, "REQ_CLKS_ON")
39 39
40#define UFS_CMD_TRACE_STRINGS \
41 EM(UFS_CMD_SEND, "send_req") \
42 EM(UFS_CMD_COMP, "complete_rsp") \
43 EM(UFS_DEV_COMP, "dev_complete") \
44 EM(UFS_QUERY_SEND, "query_send") \
45 EM(UFS_QUERY_COMP, "query_complete") \
46 EM(UFS_QUERY_ERR, "query_complete_err") \
47 EM(UFS_TM_SEND, "tm_send") \
48 EM(UFS_TM_COMP, "tm_complete") \
49 EMe(UFS_TM_ERR, "tm_complete_err")
50
40/* Enums require being exported to userspace, for user tool parsing */51/* Enums require being exported to userspace, for user tool parsing */
41#undef EM52#undef EM
42#undef EMe53#undef EMe
@@ -46,6 +57,7 @@ · 3 unmodified lines
46UFS_LINK_STATES;57UFS_LINK_STATES;
47UFS_PWR_MODES;58UFS_PWR_MODES;
48UFSCHD_CLK_GATING_STATES;59UFSCHD_CLK_GATING_STATES;
60UFS_CMD_TRACE_STRINGS
49 61
50/*62/*
51 * Now redefine the EM() and EMe() macros to map the enums to the strings63 * Now redefine the EM() and EMe() macros to map the enums to the strings
@@ -56,6 +68,9 @@ UFSCHD_CLK_GATING_STATES; · 4 unmodified lines
56#define EM(a, b) {a, b},68#define EM(a, b) {a, b},
57#define EMe(a, b) {a, b}69#define EMe(a, b) {a, b}
58 70
71#define show_ufs_cmd_trace_str(str_t) \
72 __print_symbolic(str_t, UFS_CMD_TRACE_STRINGS)
73
59TRACE_EVENT(ufshcd_clk_gating,74TRACE_EVENT(ufshcd_clk_gating,
60 75
61 TP_PROTO(const char *dev_name, int state),76 TP_PROTO(const char *dev_name, int state),
@@ -223,16 +238,16 @@ DEFINE_EVENT(ufshcd_template, ufshcd_init, · 161 unmodified lines
223 TP_ARGS(dev_name, err, usecs, dev_state, link_state));238 TP_ARGS(dev_name, err, usecs, dev_state, link_state));
224 239
225TRACE_EVENT(ufshcd_command,240TRACE_EVENT(ufshcd_command,
226 TP_PROTO(const char *dev_name, const char *str, unsigned int tag,241 TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t,
227 u32 doorbell, int transfer_len, u32 intr, u64 lba,242 unsigned int tag, u32 doorbell, int transfer_len, u32 intr,
228 u8 opcode, u8 group_id),243 u64 lba, u8 opcode, u8 group_id),
229 244
230 TP_ARGS(dev_name, str, tag, doorbell, transfer_len,245 TP_ARGS(dev_name, str_t, tag, doorbell, transfer_len,
231 intr, lba, opcode, group_id),246 intr, lba, opcode, group_id),
232 247
233 TP_STRUCT__entry(248 TP_STRUCT__entry(
234 __string(dev_name, dev_name)249 __string(dev_name, dev_name)
235 __string(str, str)250 __field(enum ufs_trace_str_t, str_t)
236 __field(unsigned int, tag)251 __field(unsigned int, tag)
237 __field(u32, doorbell)252 __field(u32, doorbell)
238 __field(int, transfer_len)253 __field(int, transfer_len)
@@ -244,7 +259,7 @@ TRACE_EVENT(ufshcd_command, · 5 unmodified lines
244 259
245 TP_fast_assign(260 TP_fast_assign(
246 __assign_str(dev_name, dev_name);261 __assign_str(dev_name, dev_name);
247 __assign_str(str, str);262 __entry->str_t = str_t;
248 __entry->tag = tag;263 __entry->tag = tag;
249 __entry->doorbell = doorbell;264 __entry->doorbell = doorbell;
250 __entry->transfer_len = transfer_len;265 __entry->transfer_len = transfer_len;
@@ -256,22 +271,22 @@ TRACE_EVENT(ufshcd_command, · 5 unmodified lines
256 271
257 TP_printk(272 TP_printk(
258 "%s: %s: tag: %u, DB: 0x%x, size: %d, IS: %u, LBA: %llu, opcode: 0x%x (%s), group_id: 0x%x",273 "%s: %s: tag: %u, DB: 0x%x, size: %d, IS: %u, LBA: %llu, opcode: 0x%x (%s), group_id: 0x%x",
259 __get_str(str), __get_str(dev_name), __entry->tag,274 show_ufs_cmd_trace_str(__entry->str_t), __get_str(dev_name),
260 __entry->doorbell, __entry->transfer_len,275 __entry->tag, __entry->doorbell, __entry->transfer_len,
261 __entry->intr, __entry->lba, (u32)__entry->opcode,276 __entry->intr, __entry->lba, (u32)__entry->opcode,
262 str_opcode(__entry->opcode), (u32)__entry->group_id277 str_opcode(__entry->opcode), (u32)__entry->group_id
263 )278 )
264);279);
265 280
266TRACE_EVENT(ufshcd_uic_command,281TRACE_EVENT(ufshcd_uic_command,
267 TP_PROTO(const char *dev_name, const char *str, u32 cmd,282 TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t, u32 cmd,
268 u32 arg1, u32 arg2, u32 arg3),283 u32 arg1, u32 arg2, u32 arg3),
269 284
270 TP_ARGS(dev_name, str, cmd, arg1, arg2, arg3),285 TP_ARGS(dev_name, str_t, cmd, arg1, arg2, arg3),
271 286
272 TP_STRUCT__entry(287 TP_STRUCT__entry(
273 __string(dev_name, dev_name)288 __string(dev_name, dev_name)
274 __string(str, str)289 __field(enum ufs_trace_str_t, str_t)
275 __field(u32, cmd)290 __field(u32, cmd)
276 __field(u32, arg1)291 __field(u32, arg1)
277 __field(u32, arg2)292 __field(u32, arg2)
@@ -280,7 +295,7 @@ TRACE_EVENT(ufshcd_uic_command, · 2 unmodified lines
280 295
281 TP_fast_assign(296 TP_fast_assign(
282 __assign_str(dev_name, dev_name);297 __assign_str(dev_name, dev_name);
283 __assign_str(str, str);298 __entry->str_t = str_t;
284 __entry->cmd = cmd;299 __entry->cmd = cmd;
285 __entry->arg1 = arg1;300 __entry->arg1 = arg1;
286 __entry->arg2 = arg2;301 __entry->arg2 = arg2;
@@ -289,33 +304,34 @@ TRACE_EVENT(ufshcd_uic_command, · 2 unmodified lines
289 304
290 TP_printk(305 TP_printk(
291 "%s: %s: cmd: 0x%x, arg1: 0x%x, arg2: 0x%x, arg3: 0x%x",306 "%s: %s: cmd: 0x%x, arg1: 0x%x, arg2: 0x%x, arg3: 0x%x",
292 __get_str(str), __get_str(dev_name), __entry->cmd,307 show_ufs_cmd_trace_str(__entry->str_t), __get_str(dev_name),
293 __entry->arg1, __entry->arg2, __entry->arg3308 __entry->cmd, __entry->arg1, __entry->arg2, __entry->arg3
294 )309 )
295);310);
296 311
297TRACE_EVENT(ufshcd_upiu,312TRACE_EVENT(ufshcd_upiu,
298 TP_PROTO(const char *dev_name, const char *str, void *hdr, void *tsf),313 TP_PROTO(const char *dev_name, enum ufs_trace_str_t str_t, void *hdr,
314 void *tsf),
299 315
300 TP_ARGS(dev_name, str, hdr, tsf),316 TP_ARGS(dev_name, str_t, hdr, tsf),
301 317
302 TP_STRUCT__entry(318 TP_STRUCT__entry(
303 __string(dev_name, dev_name)319 __string(dev_name, dev_name)
304 __string(str, str)320 __field(enum ufs_trace_str_t, str_t)
305 __array(unsigned char, hdr, 12)321 __array(unsigned char, hdr, 12)
306 __array(unsigned char, tsf, 16)322 __array(unsigned char, tsf, 16)
307 ),323 ),
308 324
309 TP_fast_assign(325 TP_fast_assign(
310 __assign_str(dev_name, dev_name);326 __assign_str(dev_name, dev_name);
311 __assign_str(str, str);327 __entry->str_t = str_t;
312 memcpy(__entry->hdr, hdr, sizeof(__entry->hdr));328 memcpy(__entry->hdr, hdr, sizeof(__entry->hdr));
313 memcpy(__entry->tsf, tsf, sizeof(__entry->tsf));329 memcpy(__entry->tsf, tsf, sizeof(__entry->tsf));
314 ),330 ),
315 331
316 TP_printk(332 TP_printk(
317 "%s: %s: HDR:%s, CDB:%s",333 "%s: %s: HDR:%s, CDB:%s",
318 __get_str(str), __get_str(dev_name),334 show_ufs_cmd_trace_str(__entry->str_t), __get_str(dev_name),
319 __print_hex(__entry->hdr, sizeof(__entry->hdr)),335 __print_hex(__entry->hdr, sizeof(__entry->hdr)),
320 __print_hex(__entry->tsf, sizeof(__entry->tsf))336 __print_hex(__entry->tsf, sizeof(__entry->tsf))
321 )337 )

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t