linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sathvika Vasireddy <sv@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: jpoimboe@redhat.com, peterz@infradead.org,
	linux-kernel@vger.kernel.org, aik@ozlabs.ru, mpe@ellerman.id.au,
	mingo@redhat.com, christophe.leroy@csgroup.eu,
	rostedt@goodmis.org, mbenes@suse.cz, npiggin@gmail.com,
	chenzhongjin@huawei.com, linux-arm-kernel@lists.infradead.org,
	naveen.n.rao@linux.vnet.ibm.com, sv@linux.ibm.com
Subject: [PATCH 16/16] objtool/powerpc: Add --mcount specific implementation
Date: Mon,  8 Aug 2022 17:19:08 +0530	[thread overview]
Message-ID: <20220808114908.240813-17-sv@linux.ibm.com> (raw)
In-Reply-To: <20220808114908.240813-1-sv@linux.ibm.com>

This patch enables objtool --mcount on powerpc, and
adds implementation specific to powerpc.

Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
---
 arch/powerpc/Kconfig                          |  1 +
 tools/objtool/arch/powerpc/decode.c           | 22 +++++++++++++++++++
 tools/objtool/arch/powerpc/include/arch/elf.h |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index dc05cd23c233..6be2e68fa9eb 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -238,6 +238,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 8b6a14680da7..b71c265ed503 100644
--- a/tools/objtool/arch/powerpc/decode.c
+++ b/tools/objtool/arch/powerpc/decode.c
@@ -9,6 +9,14 @@
 #include <objtool/builtin.h>
 #include <objtool/endianness.h>
 
+bool arch_ftrace_match(char *name)
+{
+	if (!strcmp(name, "_mcount"))
+		return true;
+
+	return false;
+}
+
 unsigned long arch_dest_reloc_offset(int addend)
 {
 	return addend;
@@ -41,12 +49,26 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec
 			    struct list_head *ops_list)
 {
 	u32 insn;
+	unsigned int opcode;
 
 	*immediate = 0;
 	insn = bswap_if_needed(file->elf, *(u32 *)(sec->data->d_buf + offset));
 	*len = 4;
 	*type = INSN_OTHER;
 
+	opcode = insn >> 26;
+
+	switch (opcode) {
+	case 18: /* bl */
+		if ((insn & 3) == 1) {
+			*type = INSN_CALL;
+			*immediate = insn & 0x3fffffc;
+			if (*immediate & 0x2000000)
+				*immediate -= 0x4000000;
+		}
+		break;
+	}
+
 	return 0;
 }
 
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


      parent reply	other threads:[~2022-08-08 11:52 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-08 11:48 [PATCH 00/16] objtool: Enable and implement --mcount option on powerpc Sathvika Vasireddy
2022-08-08 11:48 ` [PATCH 01/16] powerpc: Replace unreachable() with it's builtin variant in WARN_ON() Sathvika Vasireddy
2022-08-10  8:28   ` Christophe Leroy
2022-08-18 10:46     ` Naveen N. Rao
2022-08-18 11:06       ` Christophe Leroy
2022-08-18 12:25         ` Naveen N. Rao
2022-08-26 10:18   ` Christophe Leroy
2022-08-29  5:46     ` Sathvika Vasireddy
2022-08-08 11:48 ` [PATCH 02/16] powerpc: override __ALIGN() and __ALIGN_STR() macros Sathvika Vasireddy
2022-08-10  8:31   ` Christophe Leroy
2022-08-18 10:46     ` Sathvika Vasireddy
2022-08-08 11:48 ` [PATCH 03/16] powerpc: Fix objtool unannotated intra-function call warnings Sathvika Vasireddy
2022-08-10  8:32   ` Christophe Leroy
2022-08-18 10:55     ` Sathvika Vasireddy
2022-08-08 11:48 ` [PATCH 04/16] powerpc: curb " Sathvika Vasireddy
2022-08-08 11:48 ` [PATCH 05/16] powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.o Sathvika Vasireddy
2022-08-10  8:34   ` Christophe Leroy
2022-08-18 11:12     ` Sathvika Vasireddy
2022-08-08 11:48 ` [PATCH 06/16] powerpc: Fix objtool unannotated intra-function call warnings on PPC32 Sathvika Vasireddy
2022-08-09 23:31   ` kernel test robot
2022-08-08 11:48 ` [PATCH 07/16] powerpc: Skip objtool from running on VDSO files Sathvika Vasireddy
2022-08-08 11:49 ` [PATCH 08/16] objtool: Fix SEGFAULT Sathvika Vasireddy
2022-08-08 11:49 ` [PATCH 09/16] objtool: Use target file endianness instead of a compiled constant Sathvika Vasireddy
2022-08-08 11:49 ` [PATCH 10/16] objtool: Use target file class size " Sathvika Vasireddy
2022-08-08 11:49 ` [PATCH 11/16] objtool: Add --mnop as an option to --mcount Sathvika Vasireddy
2022-08-08 11:49 ` [PATCH 12/16] objtool: Read special sections with alts only when specific options are selected Sathvika Vasireddy
2022-08-08 11:49 ` [PATCH 13/16] objtool: Use macros to define arch specific reloc types Sathvika Vasireddy
2022-08-08 11:49 ` [PATCH 14/16] objtool: Add arch specific function arch_ftrace_match() Sathvika Vasireddy
2022-08-12 10:58   ` kernel test robot
2022-08-13 13:48   ` kernel test robot
2022-08-08 11:49 ` [PATCH 15/16] objtool/powerpc: Enable objtool to be built on ppc Sathvika Vasireddy
2022-08-08 11:49 ` Sathvika Vasireddy [this message]

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=20220808114908.240813-17-sv@linux.ibm.com \
    --to=sv@linux.ibm.com \
    --cc=aik@ozlabs.ru \
    --cc=chenzhongjin@huawei.com \
    --cc=christophe.leroy@csgroup.eu \
    --cc=jpoimboe@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mbenes@suse.cz \
    --cc=mingo@redhat.com \
    --cc=mpe@ellerman.id.au \
    --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).