perf/mem: AMD IBS improvements
Subsystems (2)
v4 cover perf/mem: AMD IBS improvements
Kernel IBS driver wasn't using new PERF_MEM_* APIs due to some of its limitations. Mainly:
1. mem_lvl_num doesn't allow setting multiple sources whereas old API allows it. Setting multiple data sources is useful because IBS on pre-zen4 uarch doesn't provide fine granular DataSrc details (there is only one such DataSrc(2h) though).
2. perf mem sorting logic (sort__lvl_cmp()) ignores mem_lvl_num. perf c2c (c2c_decode_stats()) does not use mem_lvl_num at all.
Set mem_lvl_num, mem_remote and mem_hops for data_src via IBS. Handle first issue using mem_lvl_num = ANY_CACHE | HOPS_0. In addition to setting new API fields, convert all individual field assignments to compile time wrapper macros built using PERF_MEM_S(). Also convert DataSrc conditional code to array lookups.
v3: https://lore.kernel.org/r/[email protected]v3->v4:
- Tool patches were already picked up by Arnaldo. Resending only kernel patches with few tweaks in commit messages. No functionality changes.
Namhyung Kim (1):
perf/x86/ibs: Set mem_lvl_num, mem_remote and mem_hops for data_src
Ravi Bangoria (2):
perf/mem: Introduce PERF_MEM_LVLNUM_UNC
perf/mem: Add PERF_MEM_LVLNUM_NA to PERF_MEM_NA
arch/x86/events/amd/ibs.c | 156 ++++++++++++++------------------ include/linux/perf_event.h | 3 +- include/uapi/linux/perf_event.h | 3 +- 3 files changed, 72 insertions(+), 90 deletions(-)
Signature · 1 line
2.41.0
PATCH RESEND v4 1/3 perf/mem: Introduce PERF_MEM_LVLNUM_UNC
Older API PERF_MEM_LVL_UNC can be replaced by PERF_MEM_LVLNUM_UNC.
--- include/uapi/linux/perf_event.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/uapi/linux/perf_event.h +2 -1
@@ -1339,7 +1339,8 @@ union perf_mem_data_src {#define PERF_MEM_LVLNUM_L2 0x02/* L2 */ #define PERF_MEM_LVLNUM_L3 0x03/* L3 */ #define PERF_MEM_LVLNUM_L4 0x04/* L4 */ -/* 5-0x8 available */ +/* 5-0x7 available */ +#define PERF_MEM_LVLNUM_UNC 0x08/* Uncached */ #define PERF_MEM_LVLNUM_CXL 0x09/* CXL */ #define PERF_MEM_LVLNUM_IO 0x0a/* I/O */ #define PERF_MEM_LVLNUM_ANY_CACHE 0x0b/* Any cache */
Signature · 1 line
2.41.0
[tip: perf/core] perf/mem: Introduce PERF_MEM_LVLNUM_UNC
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 526fffabc5fb63e80eb890c74b6570df2570c87f Gitweb: https://git.kernel.org/tip/526fffabc5fb63e80eb890c74b6570df2570c87f Author: Ravi Bangoria <[email protected]> AuthorDate: Tue, 25 Jul 2023 20:32:04 +05:30 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 26 Jul 2023 12:28:44 +02:00
perf/mem: Introduce PERF_MEM_LVLNUM_UNC
Older API PERF_MEM_LVL_UNC can be replaced by PERF_MEM_LVLNUM_UNC.
--- include/uapi/linux/perf_event.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/uapi/linux/perf_event.h +2 -1
@@ -1339,7 +1339,8 @@ union perf_mem_data_src {#define PERF_MEM_LVLNUM_L2 0x02/* L2 */ #define PERF_MEM_LVLNUM_L3 0x03/* L3 */ #define PERF_MEM_LVLNUM_L4 0x04/* L4 */ -/* 5-0x8 available */ +/* 5-0x7 available */ +#define PERF_MEM_LVLNUM_UNC 0x08/* Uncached */ #define PERF_MEM_LVLNUM_CXL 0x09/* CXL */ #define PERF_MEM_LVLNUM_IO 0x0a/* I/O */ #define PERF_MEM_LVLNUM_ANY_CACHE 0x0b/* Any cache */
PATCH RESEND v4 2/3 perf/mem: Add PERF_MEM_LVLNUM_NA to PERF_MEM_NA
In reply to Ravi BangoriaAdd PERF_MEM_LVLNUM_NA wherever PERF_MEM_NA is used to set default values.
--- include/linux/perf_event.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/perf_event.h +2 -1
@@ -1194,7 +1194,8 @@ struct perf_sample_data { PERF_MEM_S(LVL, NA) |\ PERF_MEM_S(SNOOP, NA) |\ PERF_MEM_S(LOCK, NA) |\ - PERF_MEM_S(TLB, NA)) + PERF_MEM_S(TLB, NA) |\ + PERF_MEM_S(LVLNUM, NA))static inline void perf_sample_data_init (struct perf_sample_data *data,u64 addr,u64 period)
Signature · 1 line
2.41.0
[tip: perf/core] perf/mem: Add PERF_MEM_LVLNUM_NA to PERF_MEM_NA
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 5c6e623f1b8ebca39eeefba4b18d574eb5acf0bd Gitweb: https://git.kernel.org/tip/5c6e623f1b8ebca39eeefba4b18d574eb5acf0bd Author: Ravi Bangoria <[email protected]> AuthorDate: Tue, 25 Jul 2023 20:32:05 +05:30 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 26 Jul 2023 12:28:45 +02:00
perf/mem: Add PERF_MEM_LVLNUM_NA to PERF_MEM_NA
Add PERF_MEM_LVLNUM_NA wherever PERF_MEM_NA is used to set default values.
--- include/linux/perf_event.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/perf_event.h +2 -1
@@ -1194,7 +1194,8 @@ struct perf_sample_data { PERF_MEM_S(LVL, NA) |\ PERF_MEM_S(SNOOP, NA) |\ PERF_MEM_S(LOCK, NA) |\ - PERF_MEM_S(TLB, NA)) + PERF_MEM_S(TLB, NA) |\ + PERF_MEM_S(LVLNUM, NA))static inline void perf_sample_data_init (struct perf_sample_data *data,u64 addr,u64 period)
PATCH RESEND v4 3/3 perf/x86/ibs: Set mem_lvl_num, mem_remote and mem_hops for data_src
In reply to Ravi BangoriaFrom: Namhyung Kim <[email protected]>
Kernel IBS driver wasn't using new PERF_MEM_* APIs due to some of its limitations. Mainly:
1. mem_lvl_num doesn't allow setting multiple sources whereas old API allows it. Setting multiple data sources is useful because IBS on pre-zen4 uarch doesn't provide fine granular DataSrc details (there is only one such DataSrc(2h) though).
2. perf mem sorting logic (sort__lvl_cmp()) ignores mem_lvl_num. perf c2c (c2c_decode_stats()) does not use mem_lvl_num at all.
1st one can be handled using ANY_CACHE with HOPS_0. 2nd is purely perf tool specific issue and should be fixed separately.
--- arch/x86/events/amd/ibs.c | 156 +++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 88 deletions(-)
arch/x86/events/amd/ibs.c +68 -88
@@ -728,38 +728,63 @@ static u8 perf_ibs_data_src(union ibs_op_data2 *op_data2)return op_data2->data_src_lo; } -static void perf_ibs_get_mem_lvl (union ibs_op_data2 *op_data2, -union ibs_op_data3 *op_data3, -struct perf_sample_data *data) +#define L (x) (PERF_MEM_S(LVL, x) | PERF_MEM_S(LVL, HIT)) +#define LN (x) PERF_MEM_S(LVLNUM, x) +#define REM PERF_MEM_S(REMOTE, REMOTE) +#define HOPS (x) PERF_MEM_S(HOPS, x) + +static u64 g_data_src[8 ] = { + [IBS_DATA_SRC_LOC_CACHE ] =L (L3 ) |L (REM_CCE1 ) |LN (ANY_CACHE ) |HOPS (0 ), + [IBS_DATA_SRC_DRAM ] =L (LOC_RAM ) |LN (RAM ), + [IBS_DATA_SRC_REM_CACHE ] =L (REM_CCE2 ) |LN (ANY_CACHE ) |REM |HOPS (1 ), + [IBS_DATA_SRC_IO ] =L (IO ) |LN (IO ), +}; + +#define RMT_NODE_BITS (1 << IBS_DATA_SRC_DRAM) +#define RMT_NODE_APPLICABLE (x) (RMT_NODE_BITS & (1 << x)) + +static u64 g_zen4_data_src[32 ] = { + [IBS_DATA_SRC_EXT_LOC_CACHE ] =L (L3 ) |LN (L3 ), + [IBS_DATA_SRC_EXT_NEAR_CCX_CACHE ] =L (REM_CCE1 ) |LN (ANY_CACHE ) |REM |HOPS (0 ), + [IBS_DATA_SRC_EXT_DRAM ] =L (LOC_RAM ) |LN (RAM ), + [IBS_DATA_SRC_EXT_FAR_CCX_CACHE ] =L (REM_CCE2 ) |LN (ANY_CACHE ) |REM |HOPS (1 ), + [IBS_DATA_SRC_EXT_PMEM ] =LN (PMEM ), + [IBS_DATA_SRC_EXT_IO ] =L (IO ) |LN (IO ), + [IBS_DATA_SRC_EXT_EXT_MEM ] =LN (CXL ), +}; + +#define ZEN4_RMT_NODE_BITS ((1 << IBS_DATA_SRC_EXT_DRAM) | \ + (1 << IBS_DATA_SRC_EXT_PMEM) | \ + (1 << IBS_DATA_SRC_EXT_EXT_MEM)) +#define ZEN4_RMT_NODE_APPLICABLE (x) (ZEN4_RMT_NODE_BITS & (1 << x)) + +static __u64 perf_ibs_get_mem_lvl (union ibs_op_data2 *op_data2, +union ibs_op_data3 *op_data3, +struct perf_sample_data *data) {union perf_mem_data_src *data_src = &data->data_src;u8 ibs_data_src =perf_ibs_data_src (op_data2); data_src->mem_lvl =0 ; + data_src->mem_lvl_num =0 ;/* * DcMiss, L2Miss, DataSrc, DcMissLat etc. are all invalid for Uncached * memory accesses. So, check DcUcMemAcc bit early. */ -if (op_data3->dc_uc_mem_acc && ibs_data_src !=IBS_DATA_SRC_EXT_IO ) { - data_src->mem_lvl =PERF_MEM_LVL_UNC |PERF_MEM_LVL_HIT ; -return ; - } +if (op_data3->dc_uc_mem_acc && ibs_data_src !=IBS_DATA_SRC_EXT_IO ) +return L (UNC ) |LN (UNC );/* L1 Hit */ -if (op_data3->dc_miss ==0 ) { - data_src->mem_lvl =PERF_MEM_LVL_L1 |PERF_MEM_LVL_HIT ; -return ; - } +if (op_data3->dc_miss ==0 ) +return L (L1 ) |LN (L1 );/* L2 Hit */ if (op_data3->l2_miss ==0 ) {/* Erratum #1293 */ if (boot_cpu_data.x86 !=0x19 || boot_cpu_data.x86_model >0xF || - !(op_data3->sw_pf || op_data3->dc_miss_no_mab_alloc)) { - data_src->mem_lvl =PERF_MEM_LVL_L2 |PERF_MEM_LVL_HIT ; -return ; - } + !(op_data3->sw_pf || op_data3->dc_miss_no_mab_alloc)) +return L (L2 ) |LN (L2 ); }/*
@@ -769,82 +794,36 @@ static void perf_ibs_get_mem_lvl(union ibs_op_data2 *op_data2,if (data_src->mem_op !=PERF_MEM_OP_LOAD ) goto check_mab; -/* L3 Hit */ if (ibs_caps &IBS_CAPS_ZEN4 ) { -if (ibs_data_src ==IBS_DATA_SRC_EXT_LOC_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_L3 |PERF_MEM_LVL_HIT ; -return ; - } - }else { -if (ibs_data_src ==IBS_DATA_SRC_LOC_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_L3 |PERF_MEM_LVL_REM_CCE1 | -PERF_MEM_LVL_HIT ; -return ; - } - } +u64 val = g_zen4_data_src[ibs_data_src]; -/* A peer cache in a near CCX */ -if (ibs_caps &IBS_CAPS_ZEN4 && - ibs_data_src ==IBS_DATA_SRC_EXT_NEAR_CCX_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_REM_CCE1 |PERF_MEM_LVL_HIT ; -return ; - } +if (!val) + goto check_mab; -/* A peer cache in a far CCX */ -if (ibs_caps &IBS_CAPS_ZEN4 ) { -if (ibs_data_src ==IBS_DATA_SRC_EXT_FAR_CCX_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_REM_CCE2 |PERF_MEM_LVL_HIT ; -return ; - } - }else { -if (ibs_data_src ==IBS_DATA_SRC_REM_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_REM_CCE2 |PERF_MEM_LVL_HIT ; -return ; +/* HOPS_1 because IBS doesn't provide remote socket detail */ +if (op_data2->rmt_node &&ZEN4_RMT_NODE_APPLICABLE (ibs_data_src)) { +if (ibs_data_src ==IBS_DATA_SRC_EXT_DRAM ) + val =L (REM_RAM1 ) |LN (RAM ) |REM |HOPS (1 ); +else + val |=REM |HOPS (1 ); } - } -/* DRAM */ -if (ibs_data_src ==IBS_DATA_SRC_EXT_DRAM ) { -if (op_data2->rmt_node ==0 ) - data_src->mem_lvl =PERF_MEM_LVL_LOC_RAM |PERF_MEM_LVL_HIT ; -else - data_src->mem_lvl =PERF_MEM_LVL_REM_RAM1 |PERF_MEM_LVL_HIT ; -return ; - } +return val; + }else { +u64 val = g_data_src[ibs_data_src]; -/* PMEM */ -if (ibs_caps &IBS_CAPS_ZEN4 && ibs_data_src ==IBS_DATA_SRC_EXT_PMEM ) { - data_src->mem_lvl_num =PERF_MEM_LVLNUM_PMEM ; -if (op_data2->rmt_node) { - data_src->mem_remote =PERF_MEM_REMOTE_REMOTE ; -/* IBS doesn't provide Remote socket detail */ - data_src->mem_hops =PERF_MEM_HOPS_1 ; - } -return ; - } +if (!val) + goto check_mab; -/* Extension Memory */ -if (ibs_caps &IBS_CAPS_ZEN4 && - ibs_data_src ==IBS_DATA_SRC_EXT_EXT_MEM ) { - data_src->mem_lvl_num =PERF_MEM_LVLNUM_CXL ; -if (op_data2->rmt_node) { - data_src->mem_remote =PERF_MEM_REMOTE_REMOTE ; -/* IBS doesn't provide Remote socket detail */ - data_src->mem_hops =PERF_MEM_HOPS_1 ; +/* HOPS_1 because IBS doesn't provide remote socket detail */ +if (op_data2->rmt_node &&RMT_NODE_APPLICABLE (ibs_data_src)) { +if (ibs_data_src ==IBS_DATA_SRC_DRAM ) + val =L (REM_RAM1 ) |LN (RAM ) |REM |HOPS (1 ); +else + val |=REM |HOPS (1 ); } -return ; - } -/* IO */ -if (ibs_data_src ==IBS_DATA_SRC_EXT_IO ) { - data_src->mem_lvl =PERF_MEM_LVL_IO ; - data_src->mem_lvl_num =PERF_MEM_LVLNUM_IO ; -if (op_data2->rmt_node) { - data_src->mem_remote =PERF_MEM_REMOTE_REMOTE ; -/* IBS doesn't provide Remote socket detail */ - data_src->mem_hops =PERF_MEM_HOPS_1 ; - } -return ; +return val; } check_mab:
@@ -855,12 +834,11 @@ static void perf_ibs_get_mem_lvl(union ibs_op_data2 *op_data2,* DataSrc simultaneously. Prioritize DataSrc over MAB, i.e. set * MAB only when IBS fails to provide DataSrc. */ -if (op_data3->dc_miss_no_mab_alloc) { - data_src->mem_lvl =PERF_MEM_LVL_LFB |PERF_MEM_LVL_HIT ; -return ; - } +if (op_data3->dc_miss_no_mab_alloc) +return L (LFB ) |LN (LFB ); - data_src->mem_lvl =PERF_MEM_LVL_NA ; +/* Don't set HIT with NA */ +return PERF_MEM_S (LVL ,NA ) |LN (NA ); }static bool perf_ibs_cache_hit_st_valid (void )
@@ -950,7 +928,9 @@ static void perf_ibs_get_data_src(struct perf_ibs_data *ibs_data,union ibs_op_data2 *op_data2, union ibs_op_data3 *op_data3) { -perf_ibs_get_mem_lvl (op_data2 ,op_data3 ,data ); + union perf_mem_data_src *data_src = &data->data_src; + + data_src->val |=perf_ibs_get_mem_lvl (op_data2, op_data3, data);perf_ibs_get_mem_snoop (op_data2, data);perf_ibs_get_tlb_lvl (op_data3, data);perf_ibs_get_mem_lock (op_data3, data);
Signature · 1 line
2.41.0
[tip: perf/core] perf/x86/ibs: Set mem_lvl_num, mem_remote and mem_hops for data_src
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 8bfc20baa9355d2ce6b031ff8bdb62c9456923f7 Gitweb: https://git.kernel.org/tip/8bfc20baa9355d2ce6b031ff8bdb62c9456923f7 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 25 Jul 2023 20:32:06 +05:30 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 26 Jul 2023 12:28:45 +02:00
perf/x86/ibs: Set mem_lvl_num, mem_remote and mem_hops for data_src
Kernel IBS driver wasn't using new PERF_MEM_* APIs due to some of its limitations. Mainly:
1. mem_lvl_num doesn't allow setting multiple sources whereas old API allows it. Setting multiple data sources is useful because IBS on pre-zen4 uarch doesn't provide fine granular DataSrc details (there is only one such DataSrc(2h) though).
2. perf mem sorting logic (sort__lvl_cmp()) ignores mem_lvl_num. perf c2c (c2c_decode_stats()) does not use mem_lvl_num at all.
1st one can be handled using ANY_CACHE with HOPS_0. 2nd is purely perf tool specific issue and should be fixed separately.
--- arch/x86/events/amd/ibs.c | 156 ++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 88 deletions(-)
arch/x86/events/amd/ibs.c +68 -88
@@ -728,38 +728,63 @@ static u8 perf_ibs_data_src(union ibs_op_data2 *op_data2)return op_data2->data_src_lo; } -static void perf_ibs_get_mem_lvl (union ibs_op_data2 *op_data2, -union ibs_op_data3 *op_data3, -struct perf_sample_data *data) +#define L (x) (PERF_MEM_S(LVL, x) | PERF_MEM_S(LVL, HIT)) +#define LN (x) PERF_MEM_S(LVLNUM, x) +#define REM PERF_MEM_S(REMOTE, REMOTE) +#define HOPS (x) PERF_MEM_S(HOPS, x) + +static u64 g_data_src[8 ] = { + [IBS_DATA_SRC_LOC_CACHE ] =L (L3 ) |L (REM_CCE1 ) |LN (ANY_CACHE ) |HOPS (0 ), + [IBS_DATA_SRC_DRAM ] =L (LOC_RAM ) |LN (RAM ), + [IBS_DATA_SRC_REM_CACHE ] =L (REM_CCE2 ) |LN (ANY_CACHE ) |REM |HOPS (1 ), + [IBS_DATA_SRC_IO ] =L (IO ) |LN (IO ), +}; + +#define RMT_NODE_BITS (1 << IBS_DATA_SRC_DRAM) +#define RMT_NODE_APPLICABLE (x) (RMT_NODE_BITS & (1 << x)) + +static u64 g_zen4_data_src[32 ] = { + [IBS_DATA_SRC_EXT_LOC_CACHE ] =L (L3 ) |LN (L3 ), + [IBS_DATA_SRC_EXT_NEAR_CCX_CACHE ] =L (REM_CCE1 ) |LN (ANY_CACHE ) |REM |HOPS (0 ), + [IBS_DATA_SRC_EXT_DRAM ] =L (LOC_RAM ) |LN (RAM ), + [IBS_DATA_SRC_EXT_FAR_CCX_CACHE ] =L (REM_CCE2 ) |LN (ANY_CACHE ) |REM |HOPS (1 ), + [IBS_DATA_SRC_EXT_PMEM ] =LN (PMEM ), + [IBS_DATA_SRC_EXT_IO ] =L (IO ) |LN (IO ), + [IBS_DATA_SRC_EXT_EXT_MEM ] =LN (CXL ), +}; + +#define ZEN4_RMT_NODE_BITS ((1 << IBS_DATA_SRC_EXT_DRAM) | \ + (1 << IBS_DATA_SRC_EXT_PMEM) | \ + (1 << IBS_DATA_SRC_EXT_EXT_MEM)) +#define ZEN4_RMT_NODE_APPLICABLE (x) (ZEN4_RMT_NODE_BITS & (1 << x)) + +static __u64 perf_ibs_get_mem_lvl (union ibs_op_data2 *op_data2, +union ibs_op_data3 *op_data3, +struct perf_sample_data *data) {union perf_mem_data_src *data_src = &data->data_src;u8 ibs_data_src =perf_ibs_data_src (op_data2); data_src->mem_lvl =0 ; + data_src->mem_lvl_num =0 ;/* * DcMiss, L2Miss, DataSrc, DcMissLat etc. are all invalid for Uncached * memory accesses. So, check DcUcMemAcc bit early. */ -if (op_data3->dc_uc_mem_acc && ibs_data_src !=IBS_DATA_SRC_EXT_IO ) { - data_src->mem_lvl =PERF_MEM_LVL_UNC |PERF_MEM_LVL_HIT ; -return ; - } +if (op_data3->dc_uc_mem_acc && ibs_data_src !=IBS_DATA_SRC_EXT_IO ) +return L (UNC ) |LN (UNC );/* L1 Hit */ -if (op_data3->dc_miss ==0 ) { - data_src->mem_lvl =PERF_MEM_LVL_L1 |PERF_MEM_LVL_HIT ; -return ; - } +if (op_data3->dc_miss ==0 ) +return L (L1 ) |LN (L1 );/* L2 Hit */ if (op_data3->l2_miss ==0 ) {/* Erratum #1293 */ if (boot_cpu_data.x86 !=0x19 || boot_cpu_data.x86_model >0xF || - !(op_data3->sw_pf || op_data3->dc_miss_no_mab_alloc)) { - data_src->mem_lvl =PERF_MEM_LVL_L2 |PERF_MEM_LVL_HIT ; -return ; - } + !(op_data3->sw_pf || op_data3->dc_miss_no_mab_alloc)) +return L (L2 ) |LN (L2 ); }/*
@@ -769,82 +794,36 @@ static void perf_ibs_get_mem_lvl(union ibs_op_data2 *op_data2,if (data_src->mem_op !=PERF_MEM_OP_LOAD ) goto check_mab; -/* L3 Hit */ if (ibs_caps &IBS_CAPS_ZEN4 ) { -if (ibs_data_src ==IBS_DATA_SRC_EXT_LOC_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_L3 |PERF_MEM_LVL_HIT ; -return ; - } - }else { -if (ibs_data_src ==IBS_DATA_SRC_LOC_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_L3 |PERF_MEM_LVL_REM_CCE1 | -PERF_MEM_LVL_HIT ; -return ; - } - } +u64 val = g_zen4_data_src[ibs_data_src]; -/* A peer cache in a near CCX */ -if (ibs_caps &IBS_CAPS_ZEN4 && - ibs_data_src ==IBS_DATA_SRC_EXT_NEAR_CCX_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_REM_CCE1 |PERF_MEM_LVL_HIT ; -return ; - } +if (!val) + goto check_mab; -/* A peer cache in a far CCX */ -if (ibs_caps &IBS_CAPS_ZEN4 ) { -if (ibs_data_src ==IBS_DATA_SRC_EXT_FAR_CCX_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_REM_CCE2 |PERF_MEM_LVL_HIT ; -return ; - } - }else { -if (ibs_data_src ==IBS_DATA_SRC_REM_CACHE ) { - data_src->mem_lvl =PERF_MEM_LVL_REM_CCE2 |PERF_MEM_LVL_HIT ; -return ; +/* HOPS_1 because IBS doesn't provide remote socket detail */ +if (op_data2->rmt_node &&ZEN4_RMT_NODE_APPLICABLE (ibs_data_src)) { +if (ibs_data_src ==IBS_DATA_SRC_EXT_DRAM ) + val =L (REM_RAM1 ) |LN (RAM ) |REM |HOPS (1 ); +else + val |=REM |HOPS (1 ); } - } -/* DRAM */ -if (ibs_data_src ==IBS_DATA_SRC_EXT_DRAM ) { -if (op_data2->rmt_node ==0 ) - data_src->mem_lvl =PERF_MEM_LVL_LOC_RAM |PERF_MEM_LVL_HIT ; -else - data_src->mem_lvl =PERF_MEM_LVL_REM_RAM1 |PERF_MEM_LVL_HIT ; -return ; - } +return val; + }else { +u64 val = g_data_src[ibs_data_src]; -/* PMEM */ -if (ibs_caps &IBS_CAPS_ZEN4 && ibs_data_src ==IBS_DATA_SRC_EXT_PMEM ) { - data_src->mem_lvl_num =PERF_MEM_LVLNUM_PMEM ; -if (op_data2->rmt_node) { - data_src->mem_remote =PERF_MEM_REMOTE_REMOTE ; -/* IBS doesn't provide Remote socket detail */ - data_src->mem_hops =PERF_MEM_HOPS_1 ; - } -return ; - } +if (!val) + goto check_mab; -/* Extension Memory */ -if (ibs_caps &IBS_CAPS_ZEN4 && - ibs_data_src ==IBS_DATA_SRC_EXT_EXT_MEM ) { - data_src->mem_lvl_num =PERF_MEM_LVLNUM_CXL ; -if (op_data2->rmt_node) { - data_src->mem_remote =PERF_MEM_REMOTE_REMOTE ; -/* IBS doesn't provide Remote socket detail */ - data_src->mem_hops =PERF_MEM_HOPS_1 ; +/* HOPS_1 because IBS doesn't provide remote socket detail */ +if (op_data2->rmt_node &&RMT_NODE_APPLICABLE (ibs_data_src)) { +if (ibs_data_src ==IBS_DATA_SRC_DRAM ) + val =L (REM_RAM1 ) |LN (RAM ) |REM |HOPS (1 ); +else + val |=REM |HOPS (1 ); } -return ; - } -/* IO */ -if (ibs_data_src ==IBS_DATA_SRC_EXT_IO ) { - data_src->mem_lvl =PERF_MEM_LVL_IO ; - data_src->mem_lvl_num =PERF_MEM_LVLNUM_IO ; -if (op_data2->rmt_node) { - data_src->mem_remote =PERF_MEM_REMOTE_REMOTE ; -/* IBS doesn't provide Remote socket detail */ - data_src->mem_hops =PERF_MEM_HOPS_1 ; - } -return ; +return val; } check_mab:
@@ -855,12 +834,11 @@ check_mab:* DataSrc simultaneously. Prioritize DataSrc over MAB, i.e. set * MAB only when IBS fails to provide DataSrc. */ -if (op_data3->dc_miss_no_mab_alloc) { - data_src->mem_lvl =PERF_MEM_LVL_LFB |PERF_MEM_LVL_HIT ; -return ; - } +if (op_data3->dc_miss_no_mab_alloc) +return L (LFB ) |LN (LFB ); - data_src->mem_lvl =PERF_MEM_LVL_NA ; +/* Don't set HIT with NA */ +return PERF_MEM_S (LVL ,NA ) |LN (NA ); }static bool perf_ibs_cache_hit_st_valid (void )
@@ -950,7 +928,9 @@ static void perf_ibs_get_data_src(struct perf_ibs_data *ibs_data,union ibs_op_data2 *op_data2, union ibs_op_data3 *op_data3) { -perf_ibs_get_mem_lvl (op_data2 ,op_data3 ,data ); + union perf_mem_data_src *data_src = &data->data_src; + + data_src->val |=perf_ibs_get_mem_lvl (op_data2, op_data3, data);perf_ibs_get_mem_snoop (op_data2, data);perf_ibs_get_tlb_lvl (op_data3, data);perf_ibs_get_mem_lock (op_data3, data);
Peter Zijlstra
maintainerQuoted 11 lines · Ravi Bangoria
Namhyung Kim (1):
perf/x86/ibs: Setmem_lvl_num,mem_remoteandmem_hopsfordata_srcRavi Bangoria (2):
perf/mem: IntroducePERF_MEM_LVLNUM_UNC
perf/mem: AddPERF_MEM_LVLNUM_NAtoPERF_MEM_NAarch/x86/events/amd/ibs.c | 156 ++++++++++++++------------------ include/linux/perf_event.h | 3 +- include/uapi/linux/perf_event.h | 3 +- 3 files changed, 72 insertions(+), 90 deletions(-)
Thanks!