From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Borislav Petkov <bp@suse.de>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] tools/perf: Convert to insn_decode()
Date: Mon, 15 Mar 2021 15:47:44 -0000 [thread overview]
Message-ID: <161582326443.398.670225451830163620.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210304174237.31945-20-bp@alien8.de>
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 62660b0fd238253aff951479a2adf1f06a231422
Gitweb: https://git.kernel.org/tip/62660b0fd238253aff951479a2adf1f06a231422
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 23 Nov 2020 23:00:16 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 15 Mar 2021 12:41:26 +01:00
tools/perf: Convert to insn_decode()
Simplify code, no functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: https://lkml.kernel.org/r/20210304174237.31945-20-bp@alien8.de
---
tools/perf/arch/x86/tests/insn-x86.c | 9 +---
tools/perf/arch/x86/util/archinsn.c | 9 ++--
tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c | 17 ++++---
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/tools/perf/arch/x86/tests/insn-x86.c b/tools/perf/arch/x86/tests/insn-x86.c
index 4f75ae9..0262b0d 100644
--- a/tools/perf/arch/x86/tests/insn-x86.c
+++ b/tools/perf/arch/x86/tests/insn-x86.c
@@ -96,13 +96,12 @@ static int get_branch(const char *branch_str)
static int test_data_item(struct test_data *dat, int x86_64)
{
struct intel_pt_insn intel_pt_insn;
+ int op, branch, ret;
struct insn insn;
- int op, branch;
- insn_init(&insn, dat->data, MAX_INSN_SIZE, x86_64);
- insn_get_length(&insn);
-
- if (!insn_complete(&insn)) {
+ ret = insn_decode(&insn, dat->data, MAX_INSN_SIZE,
+ x86_64 ? INSN_MODE_64 : INSN_MODE_32);
+ if (ret < 0) {
pr_debug("Failed to decode: %s\n", dat->asm_rep);
return -1;
}
diff --git a/tools/perf/arch/x86/util/archinsn.c b/tools/perf/arch/x86/util/archinsn.c
index 34d600c..546feda 100644
--- a/tools/perf/arch/x86/util/archinsn.c
+++ b/tools/perf/arch/x86/util/archinsn.c
@@ -11,7 +11,7 @@ void arch_fetch_insn(struct perf_sample *sample,
struct machine *machine)
{
struct insn insn;
- int len;
+ int len, ret;
bool is64bit = false;
if (!sample->ip)
@@ -19,8 +19,9 @@ void arch_fetch_insn(struct perf_sample *sample,
len = thread__memcpy(thread, machine, sample->insn, sample->ip, sizeof(sample->insn), &is64bit);
if (len <= 0)
return;
- insn_init(&insn, sample->insn, len, is64bit);
- insn_get_length(&insn);
- if (insn_complete(&insn) && insn.length <= len)
+
+ ret = insn_decode(&insn, sample->insn, len,
+ is64bit ? INSN_MODE_64 : INSN_MODE_32);
+ if (ret >= 0 && insn.length <= len)
sample->insn_len = insn.length;
}
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
index 2f6cc7e..593f20e 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
@@ -169,11 +169,13 @@ int intel_pt_get_insn(const unsigned char *buf, size_t len, int x86_64,
struct intel_pt_insn *intel_pt_insn)
{
struct insn insn;
+ int ret;
- insn_init(&insn, buf, len, x86_64);
- insn_get_length(&insn);
- if (!insn_complete(&insn) || insn.length > len)
+ ret = insn_decode(&insn, buf, len,
+ x86_64 ? INSN_MODE_64 : INSN_MODE_32);
+ if (ret < 0 || insn.length > len)
return -1;
+
intel_pt_insn_decoder(&insn, intel_pt_insn);
if (insn.length < INTEL_PT_INSN_BUF_SZ)
memcpy(intel_pt_insn->buf, buf, insn.length);
@@ -194,12 +196,13 @@ const char *dump_insn(struct perf_insn *x, uint64_t ip __maybe_unused,
u8 *inbuf, int inlen, int *lenp)
{
struct insn insn;
- int n, i;
+ int n, i, ret;
int left;
- insn_init(&insn, inbuf, inlen, x->is64bit);
- insn_get_length(&insn);
- if (!insn_complete(&insn) || insn.length > inlen)
+ ret = insn_decode(&insn, inbuf, inlen,
+ x->is64bit ? INSN_MODE_64 : INSN_MODE_32);
+
+ if (ret < 0 || insn.length > inlen)
return "<bad>";
if (lenp)
*lenp = insn.length;
next prev parent reply other threads:[~2021-03-15 15:48 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 17:42 [PATCH v3 00/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 01/21] x86/insn: Rename insn_decode() to insn_decode_from_regs() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 02/21] x86/insn: Add @buf_len param to insn_init() kernel-doc comment Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 03/21] x86/insn: Add a __ignore_sync_check__ marker Borislav Petkov
2021-03-12 3:07 ` Masami Hiramatsu
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 04/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-15 16:53 ` Peter Zijlstra
2021-03-17 1:14 ` [PATCH v3 04/21] " Ian Rogers
2021-03-24 13:43 ` Arnaldo Carvalho de Melo
2021-03-24 13:54 ` Borislav Petkov
2021-03-24 18:21 ` Ian Rogers
2021-03-24 18:52 ` Arnaldo Carvalho de Melo
2021-03-04 17:42 ` [PATCH v3 05/21] x86/insn-eval: Handle return values from the decoder Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 06/21] x86/boot/compressed/sev-es: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 07/21] perf/x86/intel/ds: Check insn_get_length() retval Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 08/21] perf/x86/intel/ds: Check return values of insn decoder functions Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 09/21] x86/alternative: Use insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 10/21] x86/mce: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 11/21] x86/kprobes: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 12/21] x86/sev-es: Split vc_decode_insn() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 13/21] x86/sev-es: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 14/21] x86/traps: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 15/21] x86/uprobes: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 16/21] x86/tools/insn_decoder_test: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 17/21] tools/objtool: " Borislav Petkov
2021-03-04 17:49 ` Peter Zijlstra
2021-03-04 18:06 ` Borislav Petkov
2021-03-05 8:55 ` Peter Zijlstra
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 18/21] x86/tools/insn_sanity: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 19/21] tools/perf: " Borislav Petkov
2021-03-15 15:47 ` tip-bot2 for Borislav Petkov [this message]
2021-03-04 17:42 ` [PATCH v3 20/21] x86/insn: Remove kernel_insn_init() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 21/21] x86/insn: Make insn_complete() static Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161582326443.398.670225451830163620.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=acme@redhat.com \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).