From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Ian Rogers <irogers@google.com>,
Stephane Eranian <eranian@google.com>,
Alexei Budankov <abudankov@huawei.com>
Subject: Re: [PATCH 04/22] perf tools: Add perf_home_perfconfig function
Date: Mon, 18 Jan 2021 13:05:08 -0300 [thread overview]
Message-ID: <20210118160508.GE12699@kernel.org> (raw)
In-Reply-To: <20210102220441.794923-5-jolsa@kernel.org>
Em Sat, Jan 02, 2021 at 11:04:23PM +0100, Jiri Olsa escreveu:
> Factor out the perf_home_perfconfig, that looks for
> .perfconfig in home directory including check for
> PERF_CONFIG_NOGLOBAL and for proper permission.
Thanks, applied.
- Arnaldo
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/config.c | 89 ++++++++++++++++++++++++----------------
> tools/perf/util/config.h | 1 +
> 2 files changed, 54 insertions(+), 36 deletions(-)
>
> diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
> index 222cb2e2de25..34fe80ccdad1 100644
> --- a/tools/perf/util/config.c
> +++ b/tools/perf/util/config.c
> @@ -531,6 +531,56 @@ static int perf_config_global(void)
> return !perf_env_bool("PERF_CONFIG_NOGLOBAL", 0);
> }
>
> +static char *home_perfconfig(void)
> +{
> + const char *home = NULL;
> + char *config;
> + struct stat st;
> +
> + home = getenv("HOME");
> +
> + /*
> + * Skip reading user config if:
> + * - there is no place to read it from (HOME)
> + * - we are asked not to (PERF_CONFIG_NOGLOBAL=1)
> + */
> + if (!home || !*home || !perf_config_global())
> + return NULL;
> +
> + config = strdup(mkpath("%s/.perfconfig", home));
> + if (config == NULL) {
> + pr_warning("Not enough memory to process %s/.perfconfig, ignoring it.", home);
> + return NULL;
> + }
> +
> + if (stat(config, &st) < 0)
> + goto out_free;
> +
> + if (st.st_uid && (st.st_uid != geteuid())) {
> + pr_warning("File %s not owned by current user or root, ignoring it.", config);
> + goto out_free;
> + }
> +
> + if (st.st_size)
> + return config;
> +
> +out_free:
> + free(config);
> + return NULL;
> +}
> +
> +const char *perf_home_perfconfig(void)
> +{
> + static const char *config;
> + static bool failed;
> +
> + config = failed ? NULL : home_perfconfig();
> + if (!config)
> + failed = true;
> +
> + return config;
> +}
> +
> static struct perf_config_section *find_section(struct list_head *sections,
> const char *section_name)
> {
> @@ -676,9 +726,6 @@ int perf_config_set__collect(struct perf_config_set *set, const char *file_name,
> static int perf_config_set__init(struct perf_config_set *set)
> {
> int ret = -1;
> - const char *home = NULL;
> - char *user_config;
> - struct stat st;
>
> /* Setting $PERF_CONFIG makes perf read _only_ the given config file. */
> if (config_exclusive_filename)
> @@ -687,41 +734,11 @@ static int perf_config_set__init(struct perf_config_set *set)
> if (perf_config_from_file(collect_config, perf_etc_perfconfig(), set) < 0)
> goto out;
> }
> -
> - home = getenv("HOME");
> -
> - /*
> - * Skip reading user config if:
> - * - there is no place to read it from (HOME)
> - * - we are asked not to (PERF_CONFIG_NOGLOBAL=1)
> - */
> - if (!home || !*home || !perf_config_global())
> - return 0;
> -
> - user_config = strdup(mkpath("%s/.perfconfig", home));
> - if (user_config == NULL) {
> - pr_warning("Not enough memory to process %s/.perfconfig, ignoring it.", home);
> - goto out;
> - }
> -
> - if (stat(user_config, &st) < 0) {
> - if (errno == ENOENT)
> - ret = 0;
> - goto out_free;
> - }
> -
> - ret = 0;
> -
> - if (st.st_uid && (st.st_uid != geteuid())) {
> - pr_warning("File %s not owned by current user or root, ignoring it.", user_config);
> - goto out_free;
> + if (perf_config_global() && perf_home_perfconfig()) {
> + if (perf_config_from_file(collect_config, perf_home_perfconfig(), set) < 0)
> + goto out;
> }
>
> - if (st.st_size)
> - ret = perf_config_from_file(collect_config, user_config, set);
> -
> -out_free:
> - free(user_config);
> out:
> return ret;
> }
> diff --git a/tools/perf/util/config.h b/tools/perf/util/config.h
> index ee5a242446e9..d6c4f80f367c 100644
> --- a/tools/perf/util/config.h
> +++ b/tools/perf/util/config.h
> @@ -37,6 +37,7 @@ int perf_config_u64(u64 *dest, const char *, const char *);
> int perf_config_bool(const char *, const char *);
> int config_error_nonbool(const char *);
> const char *perf_etc_perfconfig(void);
> +const char *perf_home_perfconfig(void);
>
> struct perf_config_set *perf_config_set__new(void);
> struct perf_config_set *perf_config_set__load_file(const char *file);
> --
> 2.26.2
>
--
- Arnaldo
next prev parent reply other threads:[~2021-01-18 16:07 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 22:04 [PATCHv2 00/22] perf tools: Add daemon command Jiri Olsa
2021-01-02 22:04 ` [PATCH 01/22] perf tools: Make perf_config_from_file static Jiri Olsa
2021-01-18 15:51 ` Arnaldo Carvalho de Melo
2021-01-02 22:04 ` [PATCH 02/22] perf tools: Add config set interface Jiri Olsa
2021-01-18 15:53 ` Arnaldo Carvalho de Melo
2021-01-02 22:04 ` [PATCH 03/22] perf tools: Add debug_set_display_time function Jiri Olsa
2021-01-18 16:02 ` Arnaldo Carvalho de Melo
2021-01-19 14:59 ` Arnaldo Carvalho de Melo
2021-01-19 17:39 ` Jiri Olsa
2021-01-19 19:42 ` Arnaldo Carvalho de Melo
2021-01-02 22:04 ` [PATCH 04/22] perf tools: Add perf_home_perfconfig function Jiri Olsa
2021-01-18 16:05 ` Arnaldo Carvalho de Melo [this message]
2021-01-02 22:04 ` [PATCH 05/22] perf tools: Make perf_config_system global Jiri Olsa
2021-01-18 16:03 ` Arnaldo Carvalho de Melo
2021-01-02 22:04 ` [PATCH 06/22] perf tools: Make perf_config_global gobal Jiri Olsa
2021-01-18 16:05 ` Arnaldo Carvalho de Melo
2021-01-02 22:04 ` [PATCH 07/22] perf daemon: Add daemon command Jiri Olsa
2021-01-19 4:08 ` Namhyung Kim
2021-01-19 18:31 ` Jiri Olsa
2021-01-21 4:53 ` Namhyung Kim
2021-01-27 7:09 ` Namhyung Kim
2021-01-27 22:01 ` Jiri Olsa
2021-01-02 22:04 ` [PATCH 08/22] perf daemon: Add config file change check Jiri Olsa
2021-01-19 5:31 ` Namhyung Kim
2021-01-19 17:49 ` Jiri Olsa
2021-01-21 4:54 ` Namhyung Kim
2021-01-02 22:04 ` [PATCH 09/22] perf daemon: Add signalfd support Jiri Olsa
2021-01-02 22:04 ` [PATCH 10/22] perf daemon: Add signal command Jiri Olsa
2021-01-02 22:04 ` [PATCH 11/22] perf daemon: Add stop command Jiri Olsa
2021-01-19 5:35 ` Namhyung Kim
2021-01-02 22:04 ` [PATCH 12/22] perf daemon: Allow only one daemon over base directory Jiri Olsa
2021-01-19 5:37 ` Namhyung Kim
2021-01-19 17:44 ` Jiri Olsa
2021-01-02 22:04 ` [PATCH 13/22] perf daemon: Set control fifo for session Jiri Olsa
2021-01-02 22:04 ` [PATCH 14/22] perf daemon: Add ping command Jiri Olsa
2021-01-02 22:04 ` [PATCH 15/22] perf daemon: Use control to stop session Jiri Olsa
2021-01-02 22:04 ` [PATCH 16/22] perf daemon: Add up time for daemon/session list Jiri Olsa
2021-01-02 22:04 ` [PATCH 17/22] perf daemon: Add man page for perf-daemon Jiri Olsa
2021-01-02 22:04 ` [PATCH 18/22] perf test: Add daemon list command test Jiri Olsa
2021-01-02 22:04 ` [PATCH 19/22] perf test: Add daemon reconfig test Jiri Olsa
2021-01-02 22:04 ` [PATCH 20/22] perf test: Add daemon stop command test Jiri Olsa
2021-01-02 22:04 ` [PATCH 21/22] perf test: Add daemon signal " Jiri Olsa
2021-01-02 22:04 ` [PATCH 22/22] perf test: Add daemon ping " Jiri Olsa
2021-01-18 12:55 ` [PATCHv2 00/22] perf tools: Add daemon command Jiri Olsa
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=20210118160508.GE12699@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=abudankov@huawei.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.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).