| Message ID | 20180608214746.136554-1-gthelen@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 08, 2018 at 02:47:46PM -0700, Greg Thelen wrote: > Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and > SKIP_STACK_VALIDATION=1 fail. > Example output: > /bin/sh: init/.tmp_main.o: Permission denied > > commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"), > added a mismatched endif. This causes cmd_objtool to get mistakenly > set. > > Relocate endif to balance the newly added -record-mcount check. > > Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace") > Signed-off-by: Greg Thelen <gthelen@google.com> Looks good thanks. Acked-by: Andi Kleen <ak@linux.intel.com> -Andi -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 8 Jun 2018, Greg Thelen wrote: > Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and > SKIP_STACK_VALIDATION=1 fail. > Example output: > /bin/sh: init/.tmp_main.o: Permission denied > > commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"), > added a mismatched endif. This causes cmd_objtool to get mistakenly > set. > > Relocate endif to balance the newly added -record-mcount check. > > Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace") > Signed-off-by: Greg Thelen <gthelen@google.com> Tested-by: David Rientjes <rientjes@google.com> -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2018-06-09 6:47 GMT+09:00 Greg Thelen <gthelen@google.com>: > Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and > SKIP_STACK_VALIDATION=1 fail. > Example output: > /bin/sh: init/.tmp_main.o: Permission denied > > commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"), > added a mismatched endif. This causes cmd_objtool to get mistakenly > set. > > Relocate endif to balance the newly added -record-mcount check. > > Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace") > Signed-off-by: Greg Thelen <gthelen@google.com> > --- Applied to linux-kbuild/fixes. Thanks! > scripts/Makefile.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index 34d9e9ce97c2..e7889f486ca1 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -239,6 +239,7 @@ cmd_record_mcount = \ > "$(CC_FLAGS_FTRACE)" ]; then \ > $(sub_cmd_record_mcount) \ > fi; > +endif # -record-mcount > endif # CONFIG_FTRACE_MCOUNT_RECORD > > ifdef CONFIG_STACK_VALIDATION > @@ -263,7 +264,6 @@ ifneq ($(RETPOLINE_CFLAGS),) > objtool_args += --retpoline > endif > endif > -endif > > > ifdef CONFIG_MODVERSIONS > -- > 2.18.0.rc1.242.g61856ae69a-goog > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 23 Jun 2018 02:42:26 +0900 Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > 2018-06-09 6:47 GMT+09:00 Greg Thelen <gthelen@google.com>: > > Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and > > SKIP_STACK_VALIDATION=1 fail. > > Example output: > > /bin/sh: init/.tmp_main.o: Permission denied > > > > commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"), > > added a mismatched endif. This causes cmd_objtool to get mistakenly > > set. > > > > Relocate endif to balance the newly added -record-mcount check. > > > > Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace") > > Signed-off-by: Greg Thelen <gthelen@google.com> > > --- > > Applied to linux-kbuild/fixes. Thanks! > > I already pushed this to Linus. As I was the one to mess it up in the first place ;-) (I think I applied it with some fuzz) https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ed7d40bc67b8353c677b38c6cdddcdc310c0f452 -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2018-06-25 23:16 GMT+09:00 Steven Rostedt <rostedt@goodmis.org>: > On Sat, 23 Jun 2018 02:42:26 +0900 > Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > >> 2018-06-09 6:47 GMT+09:00 Greg Thelen <gthelen@google.com>: >> > Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and >> > SKIP_STACK_VALIDATION=1 fail. >> > Example output: >> > /bin/sh: init/.tmp_main.o: Permission denied >> > >> > commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"), >> > added a mismatched endif. This causes cmd_objtool to get mistakenly >> > set. >> > >> > Relocate endif to balance the newly added -record-mcount check. >> > >> > Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace") >> > Signed-off-by: Greg Thelen <gthelen@google.com> >> > --- >> >> Applied to linux-kbuild/fixes. Thanks! >> >> > > I already pushed this to Linus. As I was the one to mess it up in the > first place ;-) (I think I applied it with some fuzz) > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ed7d40bc67b8353c677b38c6cdddcdc310c0f452 > OK. I will drop this, then. Thanks for the info. > -- Steve > -- > To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 34d9e9ce97c2..e7889f486ca1 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -239,6 +239,7 @@ cmd_record_mcount = \ "$(CC_FLAGS_FTRACE)" ]; then \ $(sub_cmd_record_mcount) \ fi; +endif # -record-mcount endif # CONFIG_FTRACE_MCOUNT_RECORD ifdef CONFIG_STACK_VALIDATION @@ -263,7 +264,6 @@ ifneq ($(RETPOLINE_CFLAGS),) objtool_args += --retpoline endif endif -endif ifdef CONFIG_MODVERSIONS
Non gcc-5 builds with CONFIG_STACK_VALIDATION=y and SKIP_STACK_VALIDATION=1 fail. Example output: /bin/sh: init/.tmp_main.o: Permission denied commit 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace"), added a mismatched endif. This causes cmd_objtool to get mistakenly set. Relocate endif to balance the newly added -record-mcount check. Fixes: 96f60dfa5819 ("trace: Use -mcount-record for dynamic ftrace") Signed-off-by: Greg Thelen <gthelen@google.com> --- scripts/Makefile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)