From: Sathvika Vasireddy <sv@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: peterz@infradead.org, npiggin@gmail.com,
linux-kernel@vger.kernel.org, aik@ozlabs.ru, mingo@redhat.com,
sv@linux.ibm.com, rostedt@goodmis.org, jpoimboe@redhat.com,
naveen.n.rao@linux.vnet.ibm.com, mbenes@suse.cz,
chenzhongjin@huawei.com
Subject: [PATCH v5 16/16] objtool/powerpc: Add --mcount specific implementation
Date: Fri, 28 Oct 2022 20:03:46 +0530 [thread overview]
Message-ID: <20221028143346.183569-17-sv@linux.ibm.com> (raw)
In-Reply-To: <20221028143346.183569-1-sv@linux.ibm.com>
This patch enables objtool --mcount on powerpc, and adds implementation
specific to powerpc.
Tested-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
---
arch/powerpc/Kconfig | 1 +
tools/objtool/arch/powerpc/decode.c | 16 ++++++++++++++++
tools/objtool/arch/powerpc/include/arch/elf.h | 2 ++
3 files changed, 19 insertions(+)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 12e6c16be54e..9c07068ba5e5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -239,6 +239,7 @@ config PPC
select HAVE_NMI if PERF_EVENTS || (PPC64 && PPC_BOOK3S)
select HAVE_OPTPROBES
select HAVE_OBJTOOL if PPC32 || MPROFILE_KERNEL
+ select HAVE_OBJTOOL_MCOUNT if HAVE_OBJTOOL
select HAVE_PERF_EVENTS
select HAVE_PERF_EVENTS_NMI if PPC64
select HAVE_PERF_REGS
diff --git a/tools/objtool/arch/powerpc/decode.c b/tools/objtool/arch/powerpc/decode.c
index dcd0975cad6b..01cade98b49e 100644
--- a/tools/objtool/arch/powerpc/decode.c
+++ b/tools/objtool/arch/powerpc/decode.c
@@ -9,6 +9,11 @@
#include <objtool/builtin.h>
#include <objtool/endianness.h>
+int arch_ftrace_match(char *name)
+{
+ return !strcmp(name, "_mcount");
+}
+
unsigned long arch_dest_reloc_offset(int addend)
{
return addend;
@@ -50,6 +55,17 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec
typ = INSN_OTHER;
imm = 0;
+ switch (opcode) {
+ case 18: /* b[l][a] */
+ if ((insn & 3) == 1) /* bl */
+ typ = INSN_CALL;
+
+ imm = insn & 0x3fffffc;
+ if (imm & 0x2000000)
+ imm -= 0x4000000;
+ break;
+ }
+
if (opcode == 1)
*len = 8;
else
diff --git a/tools/objtool/arch/powerpc/include/arch/elf.h b/tools/objtool/arch/powerpc/include/arch/elf.h
index 3c8ebb7d2a6b..73f9ae172fe5 100644
--- a/tools/objtool/arch/powerpc/include/arch/elf.h
+++ b/tools/objtool/arch/powerpc/include/arch/elf.h
@@ -4,5 +4,7 @@
#define _OBJTOOL_ARCH_ELF
#define R_NONE R_PPC_NONE
+#define R_ABS64 R_PPC64_ADDR64
+#define R_ABS32 R_PPC_ADDR32
#endif /* _OBJTOOL_ARCH_ELF */
--
2.31.1
next prev parent reply other threads:[~2022-10-28 14:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-28 14:33 [PATCH v5 00/16] objtool: Enable and implement --mcount option on powerpc Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 01/16] powerpc: Fix __WARN_FLAGS() for use with Objtool Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 02/16] powerpc: Override __ALIGN and __ALIGN_STR macros Sathvika Vasireddy
2022-11-02 12:35 ` Christophe Leroy
2022-11-03 0:01 ` Michael Ellerman
2022-11-03 8:48 ` Peter Zijlstra
2022-11-14 3:48 ` Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 03/16] powerpc: Fix objtool unannotated intra-function call warnings Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 04/16] powerpc: Curb objtool unannotated intra-function warnings Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 05/16] powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.o Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 06/16] powerpc: Fix objtool unannotated intra-function call warnings on PPC32 Sathvika Vasireddy
2022-11-02 12:44 ` Christophe Leroy
2022-10-28 14:33 ` [PATCH v5 07/16] powerpc: Skip objtool from running on VDSO files Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 08/16] objtool: Fix SEGFAULT Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 09/16] objtool: Use target file endianness instead of a compiled constant Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 10/16] objtool: Use target file class size " Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 11/16] objtool: Add --mnop as an option to --mcount Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 12/16] objtool: Read special sections with alts only when specific options are selected Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 13/16] objtool: Use macros to define arch specific reloc types Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 14/16] objtool: Add arch specific function arch_ftrace_match() Sathvika Vasireddy
2022-10-28 14:33 ` [PATCH v5 15/16] objtool/powerpc: Enable objtool to be built on ppc Sathvika Vasireddy
2022-10-28 14:33 ` Sathvika Vasireddy [this message]
2022-11-02 12:44 ` [PATCH v5 00/16] objtool: Enable and implement --mcount option on powerpc Christophe Leroy
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=20221028143346.183569-17-sv@linux.ibm.com \
--to=sv@linux.ibm.com \
--cc=aik@ozlabs.ru \
--cc=chenzhongjin@huawei.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mbenes@suse.cz \
--cc=mingo@redhat.com \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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).