[PATCH] perf: Move debug initialization earlier

[PATCH] perf: Move debug initialization earlier

[Ian Rogers]

This avoids segfaults during option handlers that use pr_err. For
example, "perf --debug nopager list" segfaults before this change.

Fixes: 8abceacff87d (perf debug: Add debug_set_file function)
Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/perf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 20cb91ef06ff..2f6b67189b42 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -443,6 +443,8 @@ int main(int argc, const char **argv)
 	const char *cmd;
 	char sbuf[STRERR_BUFSIZE];
 
+	perf_debug_setup();
+
 	/* libsubcmd init */
 	exec_cmd_init("perf", PREFIX, PERF_EXEC_PATH, EXEC_PATH_ENVIRONMENT);
 	pager_init(PERF_PAGER_ENVIRONMENT);
@@ -531,8 +533,6 @@ int main(int argc, const char **argv)
 	 */
 	pthread__block_sigwinch();
 
-	perf_debug_setup();
-
 	while (1) {
 		static int done_help;
 
-- 
2.31.1.751.gd2f1c929bd-goog

Re: [PATCH] perf: Move debug initialization earlier

[Ian Rogers]

On Wed, May 19, 2021 at 9:44 AM Ian Rogers <irogers@google.com> wrote:
>
> This avoids segfaults during option handlers that use pr_err. For
> example, "perf --debug nopager list" segfaults before this change.
>
> Fixes: 8abceacff87d (perf debug: Add debug_set_file function)
> Signed-off-by: Ian Rogers <irogers@google.com>

Ping.

Thanks!
Ian

> ---
>  tools/perf/perf.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/perf.c b/tools/perf/perf.c
> index 20cb91ef06ff..2f6b67189b42 100644
> --- a/tools/perf/perf.c
> +++ b/tools/perf/perf.c
> @@ -443,6 +443,8 @@ int main(int argc, const char **argv)
>         const char *cmd;
>         char sbuf[STRERR_BUFSIZE];
>
> +       perf_debug_setup();
> +
>         /* libsubcmd init */
>         exec_cmd_init("perf", PREFIX, PERF_EXEC_PATH, EXEC_PATH_ENVIRONMENT);
>         pager_init(PERF_PAGER_ENVIRONMENT);
> @@ -531,8 +533,6 @@ int main(int argc, const char **argv)
>          */
>         pthread__block_sigwinch();
>
> -       perf_debug_setup();
> -
>         while (1) {
>                 static int done_help;
>
> --
> 2.31.1.751.gd2f1c929bd-goog
>

Re: [PATCH] perf: Move debug initialization earlier

[Arnaldo Carvalho de Melo]

Em Thu, May 27, 2021 at 08:51:41AM -0700, Ian Rogers escreveu:
> On Wed, May 19, 2021 at 9:44 AM Ian Rogers <irogers@google.com> wrote:
> >
> > This avoids segfaults during option handlers that use pr_err. For
> > example, "perf --debug nopager list" segfaults before this change.
> >
> > Fixes: 8abceacff87d (perf debug: Add debug_set_file function)
> > Signed-off-by: Ian Rogers <irogers@google.com>
> 
> Ping.

I thought I had this one in, its now, will go to Linus probably tomorrow,

- Arnaldo
 
> Thanks!
> Ian
> 
> > ---
> >  tools/perf/perf.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/perf/perf.c b/tools/perf/perf.c
> > index 20cb91ef06ff..2f6b67189b42 100644
> > --- a/tools/perf/perf.c
> > +++ b/tools/perf/perf.c
> > @@ -443,6 +443,8 @@ int main(int argc, const char **argv)
> >         const char *cmd;
> >         char sbuf[STRERR_BUFSIZE];
> >
> > +       perf_debug_setup();
> > +
> >         /* libsubcmd init */
> >         exec_cmd_init("perf", PREFIX, PERF_EXEC_PATH, EXEC_PATH_ENVIRONMENT);
> >         pager_init(PERF_PAGER_ENVIRONMENT);
> > @@ -531,8 +533,6 @@ int main(int argc, const char **argv)
> >          */
> >         pthread__block_sigwinch();
> >
> > -       perf_debug_setup();
> > -
> >         while (1) {
> >                 static int done_help;
> >
> > --
> > 2.31.1.751.gd2f1c929bd-goog
> >

-- 

- Arnaldo