From: Josh Poimboeuf <jpoimboe@kernel.org>
To: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Cc: aik@ozlabs.ru, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com,
linux-kernel@vger.kernel.org, peterz@infradead.org,
mingo@redhat.com, Sathvika Vasireddy <sv@linux.ibm.com>,
jpoimboe@redhat.com, rostedt@goodmis.org, mbenes@suse.cz,
chenzhongjin@huawei.com
Subject: Re: [PATCH v4 11/16] objtool: Add --mnop as an option to --mcount
Date: Tue, 11 Oct 2022 13:33:32 -0700 [thread overview]
Message-ID: <20221011203332.zzmv6awd5eiydxgw@treble> (raw)
In-Reply-To: <1665401725.d3dolquorh.naveen@linux.ibm.com>
On Mon, Oct 10, 2022 at 05:07:46PM +0530, Naveen N. Rao wrote:
> > +++ b/scripts/Makefile.lib
> > @@ -234,6 +234,7 @@ objtool_args = \
> > $(if $(CONFIG_HAVE_NOINSTR_HACK), --hacks=noinstr) \
> > $(if $(CONFIG_X86_KERNEL_IBT), --ibt) \
> > $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount) \
> > + $(if $(CONFIG_HAVE_OBJTOOL_NOP_MCOUNT), --mnop) \
>
> This still won't help: for instance, if CONFIG_FTRACE itself is disabled. I
> think we should make this depend on CONFIG_FTRACE_MCOUNT_USE_OBJTOOL. The
> below change works for me:
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 54d2d6451bdacc..fd3f55a1fdb7bb 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -245,8 +245,8 @@ objtool_args = \
> $(if $(CONFIG_HAVE_JUMP_LABEL_HACK), --hacks=jump_label) \
> $(if $(CONFIG_HAVE_NOINSTR_HACK), --hacks=noinstr) \
> $(if $(CONFIG_X86_KERNEL_IBT), --ibt) \
> - $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount) \
> - $(if $(CONFIG_HAVE_OBJTOOL_NOP_MCOUNT), --mnop) \
> + $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), \
> + $(if $(CONFIG_HAVE_OBJTOOL_NOP_MCOUNT), --mcount --mnop, --mcount)) \
> $(if $(CONFIG_UNWINDER_ORC), --orc) \
> $(if $(CONFIG_RETPOLINE), --retpoline) \
> $(if $(CONFIG_RETHUNK), --rethunk) \
This has a new conflict, may need something like:
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -256,6 +256,9 @@ objtool-args-$(CONFIG_HAVE_JUMP_LABEL_HACK) += --hacks=jump_label
objtool-args-$(CONFIG_HAVE_NOINSTR_HACK) += --hacks=noinstr
objtool-args-$(CONFIG_X86_KERNEL_IBT) += --ibt
objtool-args-$(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL) += --mcount
+ifdef CONFIG_FTRACE_MCOUNT_USE_OBJTOOL
+objtool-args-$(CONFIG_HAVE_OBJTOOL_NOP_MCOUNT) += --mnop
+endif
objtool-args-$(CONFIG_UNWINDER_ORC) += --orc
objtool-args-$(CONFIG_RETPOLINE) += --retpoline
objtool-args-$(CONFIG_RETHUNK) += --rethunk
next prev parent reply other threads:[~2022-10-11 20:34 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-02 10:42 [PATCH v4 00/16] objtool: Enable and implement --mcount option on powerpc Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 01/16] powerpc: Fix __WARN_FLAGS() for use with Objtool Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 02/16] powerpc: Override __ALIGN and __ALIGN_STR macros Sathvika Vasireddy
2022-10-02 17:41 ` Christophe Leroy
2022-10-02 10:42 ` [PATCH v4 03/16] powerpc: Fix objtool unannotated intra-function call warnings Sathvika Vasireddy
2022-10-10 11:34 ` Naveen N. Rao
2022-10-02 10:42 ` [PATCH v4 04/16] powerpc: Curb objtool unannotated intra-function warnings Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 05/16] powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.o Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 06/16] powerpc: Fix objtool unannotated intra-function call warnings on PPC32 Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 07/16] powerpc: Skip objtool from running on VDSO files Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 08/16] objtool: Fix SEGFAULT Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 09/16] objtool: Use target file endianness instead of a compiled constant Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 10/16] objtool: Use target file class size " Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 11/16] objtool: Add --mnop as an option to --mcount Sathvika Vasireddy
2022-10-02 17:40 ` Christophe Leroy
2022-10-10 11:37 ` Naveen N. Rao
2022-10-11 20:33 ` Josh Poimboeuf [this message]
2022-10-12 13:47 ` Naveen N. Rao
2022-10-02 10:42 ` [PATCH v4 12/16] objtool: Read special sections with alts only when specific options are selected Sathvika Vasireddy
2022-10-02 17:42 ` Christophe Leroy
2022-10-02 10:42 ` [PATCH v4 13/16] objtool: Use macros to define arch specific reloc types Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 14/16] objtool: Add arch specific function arch_ftrace_match() Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 15/16] objtool/powerpc: Enable objtool to be built on ppc Sathvika Vasireddy
2022-10-02 10:42 ` [PATCH v4 16/16] objtool/powerpc: Add --mcount specific implementation Sathvika Vasireddy
2022-10-02 17:42 ` Christophe Leroy
2022-10-10 11:49 ` [PATCH v4 00/16] objtool: Enable and implement --mcount option on powerpc Naveen N. Rao
[not found] ` <notmuch-sha1-66fb111b87471c685a53b80a0502d959f90d07a7>
2022-10-13 0:05 ` Josh Poimboeuf
2022-10-13 3:40 ` Naveen N. Rao
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=20221011203332.zzmv6awd5eiydxgw@treble \
--to=jpoimboe@kernel.org \
--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 \
--cc=sv@linux.ibm.com \
/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).