Commit f4c6217f authored by Kajol Jain's avatar Kajol Jain Committed by Peter Zijlstra
Browse files

perf: Add comment about current state of PERF_MEM_LVL_* namespace and remove an extra line 



Add a comment about PERF_MEM_LVL_* namespace being depricated
to some extent in favour of added PERF_MEM_{LVLNUM_,REMOTE_,SNOOPX_}
fields.

Remove an extra line present in perf_mem__lvl_scnprintf function.

Signed-off-by: default avatarKajol Jain <kjain@linux.ibm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20211006140654.298352-2-kjain@linux.ibm.com
parent 79df4573

include/uapi/linux/perf_event.h

+7 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,13 @@ union perf_mem_data_src { 
#define PERF_MEM_OP_EXEC	0x10 /* code (execution) */

#define PERF_MEM_OP_SHIFT	0



/* memory hierarchy (memory level, hit or miss) */

/*

 * PERF_MEM_LVL_* namespace being depricated to some extent in the

 * favour of newer composite PERF_MEM_{LVLNUM_,REMOTE_,SNOOPX_} fields.

 * Supporting this namespace inorder to not break defined ABIs.

 *

 * memory hierarchy (memory level, hit or miss)

 */

#define PERF_MEM_LVL_NA		0x01  /* not available */

#define PERF_MEM_LVL_HIT	0x02  /* hit level */

#define PERF_MEM_LVL_MISS	0x04  /* miss level  */

tools/include/uapi/linux/perf_event.h

+7 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,13 @@ union perf_mem_data_src { 
#define PERF_MEM_OP_EXEC	0x10 /* code (execution) */

#define PERF_MEM_OP_SHIFT	0



/* memory hierarchy (memory level, hit or miss) */

/*

 * PERF_MEM_LVL_* namespace being depricated to some extent in the

 * favour of newer composite PERF_MEM_{LVLNUM_,REMOTE_,SNOOPX_} fields.

 * Supporting this namespace inorder to not break defined ABIs.

 *

 * memory hierarchy (memory level, hit or miss)

 */

#define PERF_MEM_LVL_NA		0x01  /* not available */

#define PERF_MEM_LVL_HIT	0x02  /* hit level */

#define PERF_MEM_LVL_MISS	0x04  /* miss level  */

tools/perf/util/mem-events.c

+0 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ int perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info) 
	/* already taken care of */

	m &= ~(PERF_MEM_LVL_HIT|PERF_MEM_LVL_MISS);





	if (mem_info && mem_info->data_src.mem_remote) {

		strcat(out, "Remote ");

		l += 7;