mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
perf intel-pt: decoder: Add MODE.Exec IFLAG processing
As of Intel SDM (https://www.intel.com/sdm) version 076, there is a new Intel PT feature called Event Trace which adds a bit to the existing MODE.Exec packet to record the interrupt flag. Previously, the MODE.Exec packet did not generate any events, so the new processing required is practically the same as a new packet. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Link: https://lore.kernel.org/r/20220124084201.2699795-9-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter
Arnaldo Carvalho de Melo
parent
3733a98bd2
commit
cf0c98e2ef
2 changed files with 121 additions and 12 deletions
|
|
@ -144,6 +144,8 @@ struct intel_pt_decoder {
|
|||
bool vm_tm_corr_continuous;
|
||||
bool nr;
|
||||
bool next_nr;
|
||||
bool iflag;
|
||||
bool next_iflag;
|
||||
enum intel_pt_param_flags flags;
|
||||
uint64_t pos;
|
||||
uint64_t last_ip;
|
||||
|
|
@ -215,6 +217,7 @@ struct intel_pt_decoder {
|
|||
bool set_fup_bep;
|
||||
bool set_fup_cfe_ip;
|
||||
bool set_fup_cfe;
|
||||
bool set_fup_mode_exec;
|
||||
bool sample_cyc;
|
||||
unsigned int fup_tx_flags;
|
||||
unsigned int tx_flags;
|
||||
|
|
@ -1102,6 +1105,52 @@ static void intel_pt_sample_insn(struct intel_pt_decoder *decoder)
|
|||
decoder->state.type |= INTEL_PT_INSTRUCTION;
|
||||
}
|
||||
|
||||
/*
|
||||
* Sample FUP instruction at the same time as reporting the FUP event, so the
|
||||
* instruction sample gets the same flags as the FUP event.
|
||||
*/
|
||||
static void intel_pt_sample_fup_insn(struct intel_pt_decoder *decoder)
|
||||
{
|
||||
struct intel_pt_insn intel_pt_insn;
|
||||
uint64_t max_insn_cnt, insn_cnt = 0;
|
||||
int err;
|
||||
|
||||
decoder->state.insn_op = INTEL_PT_OP_OTHER;
|
||||
decoder->state.insn_len = 0;
|
||||
|
||||
if (!decoder->branch_enable || !decoder->pge || decoder->hop ||
|
||||
decoder->ip != decoder->last_ip)
|
||||
return;
|
||||
|
||||
if (!decoder->mtc_insn)
|
||||
decoder->mtc_insn = true;
|
||||
|
||||
max_insn_cnt = intel_pt_next_sample(decoder);
|
||||
if (max_insn_cnt != 1)
|
||||
return;
|
||||
|
||||
err = decoder->walk_insn(&intel_pt_insn, &insn_cnt, &decoder->ip,
|
||||
0, max_insn_cnt, decoder->data);
|
||||
/* Ignore error, it will be reported next walk anyway */
|
||||
if (err)
|
||||
return;
|
||||
|
||||
if (intel_pt_insn.branch != INTEL_PT_BR_NO_BRANCH) {
|
||||
intel_pt_log_at("ERROR: Unexpected branch at FUP instruction", decoder->ip);
|
||||
return;
|
||||
}
|
||||
|
||||
decoder->tot_insn_cnt += insn_cnt;
|
||||
decoder->timestamp_insn_cnt += insn_cnt;
|
||||
decoder->sample_insn_cnt += insn_cnt;
|
||||
decoder->period_insn_cnt += insn_cnt;
|
||||
|
||||
intel_pt_sample_insn(decoder);
|
||||
|
||||
decoder->state.type |= INTEL_PT_INSTRUCTION;
|
||||
decoder->ip += intel_pt_insn.length;
|
||||
}
|
||||
|
||||
static int intel_pt_walk_insn(struct intel_pt_decoder *decoder,
|
||||
struct intel_pt_insn *intel_pt_insn, uint64_t ip)
|
||||
{
|
||||
|
|
@ -1211,6 +1260,39 @@ static int intel_pt_walk_insn(struct intel_pt_decoder *decoder,
|
|||
return err;
|
||||
}
|
||||
|
||||
static void intel_pt_mode_exec_status(struct intel_pt_decoder *decoder)
|
||||
{
|
||||
bool iflag = decoder->packet.count & INTEL_PT_IFLAG;
|
||||
|
||||
decoder->exec_mode = decoder->packet.payload;
|
||||
decoder->iflag = iflag;
|
||||
decoder->next_iflag = iflag;
|
||||
decoder->state.from_iflag = iflag;
|
||||
decoder->state.to_iflag = iflag;
|
||||
}
|
||||
|
||||
static void intel_pt_mode_exec(struct intel_pt_decoder *decoder)
|
||||
{
|
||||
bool iflag = decoder->packet.count & INTEL_PT_IFLAG;
|
||||
|
||||
decoder->exec_mode = decoder->packet.payload;
|
||||
decoder->next_iflag = iflag;
|
||||
}
|
||||
|
||||
static void intel_pt_sample_iflag(struct intel_pt_decoder *decoder)
|
||||
{
|
||||
decoder->state.type |= INTEL_PT_IFLAG_CHG;
|
||||
decoder->state.from_iflag = decoder->iflag;
|
||||
decoder->state.to_iflag = decoder->next_iflag;
|
||||
decoder->iflag = decoder->next_iflag;
|
||||
}
|
||||
|
||||
static void intel_pt_sample_iflag_chg(struct intel_pt_decoder *decoder)
|
||||
{
|
||||
if (decoder->iflag != decoder->next_iflag)
|
||||
intel_pt_sample_iflag(decoder);
|
||||
}
|
||||
|
||||
static void intel_pt_clear_fup_event(struct intel_pt_decoder *decoder)
|
||||
{
|
||||
decoder->set_fup_tx_flags = false;
|
||||
|
|
@ -1222,11 +1304,14 @@ static void intel_pt_clear_fup_event(struct intel_pt_decoder *decoder)
|
|||
decoder->set_fup_cfe_ip = false;
|
||||
decoder->set_fup_cfe = false;
|
||||
decoder->evd_cnt = 0;
|
||||
decoder->set_fup_mode_exec = false;
|
||||
decoder->iflag = decoder->next_iflag;
|
||||
}
|
||||
|
||||
static bool intel_pt_fup_event(struct intel_pt_decoder *decoder)
|
||||
static bool intel_pt_fup_event(struct intel_pt_decoder *decoder, bool no_tip)
|
||||
{
|
||||
enum intel_pt_sample_type type = decoder->state.type;
|
||||
bool sample_fup_insn = false;
|
||||
bool ret = false;
|
||||
|
||||
decoder->state.type &= ~INTEL_PT_BRANCH;
|
||||
|
|
@ -1248,6 +1333,12 @@ static bool intel_pt_fup_event(struct intel_pt_decoder *decoder)
|
|||
decoder->state.flags |= INTEL_PT_FUP_IP;
|
||||
ret = true;
|
||||
}
|
||||
if (decoder->set_fup_mode_exec) {
|
||||
decoder->set_fup_mode_exec = false;
|
||||
intel_pt_sample_iflag(decoder);
|
||||
sample_fup_insn = no_tip;
|
||||
ret = true;
|
||||
}
|
||||
if (decoder->set_fup_tx_flags) {
|
||||
decoder->set_fup_tx_flags = false;
|
||||
decoder->tx_flags = decoder->fup_tx_flags;
|
||||
|
|
@ -1304,6 +1395,8 @@ static bool intel_pt_fup_event(struct intel_pt_decoder *decoder)
|
|||
if (ret) {
|
||||
decoder->state.from_ip = decoder->ip;
|
||||
decoder->state.to_ip = 0;
|
||||
if (sample_fup_insn)
|
||||
intel_pt_sample_fup_insn(decoder);
|
||||
} else {
|
||||
decoder->state.type = type;
|
||||
}
|
||||
|
|
@ -1336,7 +1429,7 @@ static int intel_pt_walk_fup(struct intel_pt_decoder *decoder)
|
|||
bool no_tip = decoder->pkt_state != INTEL_PT_STATE_FUP;
|
||||
|
||||
decoder->pkt_state = INTEL_PT_STATE_IN_SYNC;
|
||||
if (intel_pt_fup_event(decoder) && no_tip)
|
||||
if (intel_pt_fup_event(decoder, no_tip) && no_tip)
|
||||
return 0;
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
|
@ -1388,6 +1481,7 @@ static int intel_pt_walk_tip(struct intel_pt_decoder *decoder)
|
|||
return err;
|
||||
|
||||
intel_pt_update_nr(decoder);
|
||||
intel_pt_sample_iflag_chg(decoder);
|
||||
|
||||
if (intel_pt_insn.branch == INTEL_PT_BR_INDIRECT) {
|
||||
if (decoder->pkt_state == INTEL_PT_STATE_TIP_PGD) {
|
||||
|
|
@ -1502,6 +1596,7 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder)
|
|||
decoder->state.to_ip = decoder->last_ip;
|
||||
decoder->ip = decoder->last_ip;
|
||||
intel_pt_update_nr(decoder);
|
||||
intel_pt_sample_iflag_chg(decoder);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1944,7 +2039,7 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)
|
|||
break;
|
||||
|
||||
case INTEL_PT_MODE_EXEC:
|
||||
decoder->exec_mode = decoder->packet.payload;
|
||||
intel_pt_mode_exec_status(decoder);
|
||||
break;
|
||||
|
||||
case INTEL_PT_PIP:
|
||||
|
|
@ -2078,6 +2173,7 @@ static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)
|
|||
decoder->state.to_ip = decoder->ip;
|
||||
}
|
||||
intel_pt_update_nr(decoder);
|
||||
intel_pt_sample_iflag_chg(decoder);
|
||||
return 0;
|
||||
|
||||
case INTEL_PT_PIP:
|
||||
|
|
@ -2095,7 +2191,7 @@ static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)
|
|||
break;
|
||||
|
||||
case INTEL_PT_MODE_EXEC:
|
||||
decoder->exec_mode = decoder->packet.payload;
|
||||
intel_pt_mode_exec(decoder);
|
||||
break;
|
||||
|
||||
case INTEL_PT_VMCS:
|
||||
|
|
@ -2777,6 +2873,7 @@ static int intel_pt_hop_trace(struct intel_pt_decoder *decoder, bool *no_tip, in
|
|||
decoder->state.from_ip = decoder->ip;
|
||||
decoder->state.to_ip = 0;
|
||||
intel_pt_update_nr(decoder);
|
||||
intel_pt_sample_iflag_chg(decoder);
|
||||
return HOP_RETURN;
|
||||
|
||||
case INTEL_PT_FUP:
|
||||
|
|
@ -2791,10 +2888,10 @@ static int intel_pt_hop_trace(struct intel_pt_decoder *decoder, bool *no_tip, in
|
|||
decoder->state.type = INTEL_PT_INSTRUCTION;
|
||||
decoder->state.from_ip = decoder->ip;
|
||||
decoder->state.to_ip = 0;
|
||||
intel_pt_fup_event(decoder);
|
||||
intel_pt_fup_event(decoder, *no_tip);
|
||||
return HOP_RETURN;
|
||||
}
|
||||
intel_pt_fup_event(decoder);
|
||||
intel_pt_fup_event(decoder, *no_tip);
|
||||
decoder->state.type |= INTEL_PT_INSTRUCTION | INTEL_PT_BRANCH;
|
||||
*err = intel_pt_walk_fup_tip(decoder);
|
||||
if (!*err && decoder->state.to_ip)
|
||||
|
|
@ -3058,6 +3155,7 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)
|
|||
decoder->pos);
|
||||
break;
|
||||
}
|
||||
intel_pt_sample_iflag_chg(decoder);
|
||||
intel_pt_set_ip(decoder);
|
||||
decoder->state.from_ip = 0;
|
||||
decoder->state.to_ip = decoder->ip;
|
||||
|
|
@ -3090,7 +3188,7 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)
|
|||
intel_pt_set_last_ip(decoder);
|
||||
if (!decoder->branch_enable || !decoder->pge) {
|
||||
decoder->ip = decoder->last_ip;
|
||||
if (intel_pt_fup_event(decoder))
|
||||
if (intel_pt_fup_event(decoder, no_tip))
|
||||
return 0;
|
||||
no_tip = false;
|
||||
break;
|
||||
|
|
@ -3172,8 +3270,15 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)
|
|||
break;
|
||||
|
||||
case INTEL_PT_MODE_EXEC:
|
||||
decoder->exec_mode = decoder->packet.payload;
|
||||
break;
|
||||
intel_pt_mode_exec(decoder);
|
||||
err = intel_pt_get_next_packet(decoder);
|
||||
if (err)
|
||||
return err;
|
||||
if (decoder->packet.type == INTEL_PT_FUP) {
|
||||
decoder->set_fup_mode_exec = true;
|
||||
no_tip = true;
|
||||
}
|
||||
goto next;
|
||||
|
||||
case INTEL_PT_MODE_TSX:
|
||||
/* MODE_TSX need not be followed by FUP */
|
||||
|
|
@ -3291,7 +3396,7 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)
|
|||
decoder->fup_cfe_pkt = decoder->packet;
|
||||
decoder->set_fup_cfe = true;
|
||||
if (!decoder->pge) {
|
||||
intel_pt_fup_event(decoder);
|
||||
intel_pt_fup_event(decoder, true);
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
|
|
@ -3403,7 +3508,7 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)
|
|||
break;
|
||||
|
||||
case INTEL_PT_MODE_EXEC:
|
||||
decoder->exec_mode = decoder->packet.payload;
|
||||
intel_pt_mode_exec_status(decoder);
|
||||
break;
|
||||
|
||||
case INTEL_PT_MODE_TSX:
|
||||
|
|
@ -3522,7 +3627,7 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)
|
|||
break;
|
||||
|
||||
case INTEL_PT_MODE_EXEC:
|
||||
decoder->exec_mode = decoder->packet.payload;
|
||||
intel_pt_mode_exec_status(decoder);
|
||||
break;
|
||||
|
||||
case INTEL_PT_MODE_TSX:
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#define INTEL_PT_IN_TX (1 << 0)
|
||||
#define INTEL_PT_ABORT_TX (1 << 1)
|
||||
#define INTEL_PT_IFLAG (1 << 2)
|
||||
#define INTEL_PT_ASYNC (1 << 2)
|
||||
#define INTEL_PT_FUP_IP (1 << 3)
|
||||
#define INTEL_PT_SAMPLE_IPC (1 << 4)
|
||||
|
|
@ -36,6 +37,7 @@ enum intel_pt_sample_type {
|
|||
INTEL_PT_BLK_ITEMS = 1 << 11,
|
||||
INTEL_PT_PSB_EVT = 1 << 12,
|
||||
INTEL_PT_EVT = 1 << 13,
|
||||
INTEL_PT_IFLAG_CHG = 1 << 14,
|
||||
};
|
||||
|
||||
enum intel_pt_period_type {
|
||||
|
|
@ -226,6 +228,8 @@ struct intel_pt_state {
|
|||
enum intel_pt_sample_type type;
|
||||
bool from_nr;
|
||||
bool to_nr;
|
||||
bool from_iflag;
|
||||
bool to_iflag;
|
||||
int err;
|
||||
uint64_t from_ip;
|
||||
uint64_t to_ip;
|
||||
|
|
|
|||
Loading…
Reference in a new issue