From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@redhat.com>,
Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
Andi Kleen <ak@linux.intel.com>,
Stephane Eranian <eranian@google.com>,
Song Liu <songliubraving@fb.com>
Subject: Re: [PATCH 2/4] perf tools: Add cgroup_is_v2() helper
Date: Wed, 30 Jun 2021 15:43:58 -0300 [thread overview]
Message-ID: <YNy7bjYMOZlvGWT4@kernel.org> (raw)
In-Reply-To: <CAM9d7cj5EUoDuanLXo+PGqUyaHmvFsR-AgjbtGgaj0SiWzaWew@mail.gmail.com>
Em Tue, Jun 29, 2021 at 11:35:17PM -0700, Namhyung Kim escreveu:
> Hi Ian,
>
> On Tue, Jun 29, 2021 at 8:51 AM Ian Rogers <irogers@google.com> wrote:
> >
> > On Fri, Jun 25, 2021 at 12:18 AM Namhyung Kim <namhyung@kernel.org> wrote:
> > >
> > > The cgroup_is_v2() is to check if the given subsystem is mounted on
> > > cgroup v2 or not. It'll be used by BPF cgroup code later.
> > >
> > > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > > ---
> > > tools/perf/util/cgroup.c | 19 +++++++++++++++++++
> > > tools/perf/util/cgroup.h | 2 ++
> > > 2 files changed, 21 insertions(+)
> > >
> > > diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c
> > > index ef18c988c681..e819a4f30fc2 100644
> > > --- a/tools/perf/util/cgroup.c
> > > +++ b/tools/perf/util/cgroup.c
> > > @@ -9,6 +9,7 @@
> > > #include <linux/zalloc.h>
> > > #include <sys/types.h>
> > > #include <sys/stat.h>
> > > +#include <sys/statfs.h>
> > > #include <fcntl.h>
> > > #include <stdlib.h>
> > > #include <string.h>
> > > @@ -70,6 +71,24 @@ int read_cgroup_id(struct cgroup *cgrp)
> > > }
> > > #endif /* HAVE_FILE_HANDLE */
> > >
> > > +#ifndef CGROUP2_SUPER_MAGIC
> > > +#define CGROUP2_SUPER_MAGIC 0x63677270
> > > +#endif
> > > +
> > > +int cgroup_is_v2(const char *subsys)
> > > +{
> > > + char mnt[PATH_MAX + 1];
> > > + struct statfs stbuf;
> > > +
> > > + if (cgroupfs_find_mountpoint(mnt, PATH_MAX + 1, subsys))
> > > + return -1;
> > > +
> > > + if (statfs(mnt, &stbuf) < 0)
> > > + return -1;
> > > +
> > > + return (stbuf.f_type == CGROUP2_SUPER_MAGIC);
> > > +}
> > > +
> > > static struct cgroup *evlist__find_cgroup(struct evlist *evlist, const char *str)
> > > {
> > > struct evsel *counter;
> > > diff --git a/tools/perf/util/cgroup.h b/tools/perf/util/cgroup.h
> > > index 707adbe25123..1549ec2fd348 100644
> > > --- a/tools/perf/util/cgroup.h
> > > +++ b/tools/perf/util/cgroup.h
> > > @@ -47,4 +47,6 @@ int read_cgroup_id(struct cgroup *cgrp)
> > > }
> > > #endif /* HAVE_FILE_HANDLE */
> > >
> > > +int cgroup_is_v2(const char *subsys);
> > > +
> >
> > I think this is okay. It may make sense to have this in
> > tools/lib/api/fs/fs.h, for example fs__valid_mount is already checking
> > magic numbers. Perhaps we can avoid a statfs call, but it'd need some
> > reorganization of the fs.h code.
> >
> > Acked-by: Ian Rogers <irogers@google.com>
>
> Thanks for your review!
>
> Actually I'm ok with moving it to tools/lib. Will do it in the next spin,
> if it needs one. :)
O think I'll take v4, we can improve this in followup work.
- Arnaldo
next prev parent reply other threads:[~2021-06-30 18:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 7:18 [PATCHSET v4 0/4] perf stat: Enable BPF counters with --for-each-cgroup Namhyung Kim
2021-06-25 7:18 ` [PATCH 1/4] perf tools: Add read_cgroup_id() function Namhyung Kim
2021-07-01 17:59 ` Arnaldo Carvalho de Melo
2021-06-25 7:18 ` [PATCH 2/4] perf tools: Add cgroup_is_v2() helper Namhyung Kim
2021-06-29 15:51 ` Ian Rogers
2021-06-30 6:35 ` Namhyung Kim
2021-06-30 18:43 ` Arnaldo Carvalho de Melo [this message]
2021-06-25 7:18 ` [PATCH 3/4] perf tools: Move common bpf functions to bpf_counter.h Namhyung Kim
2021-06-30 18:28 ` Song Liu
2021-07-01 19:09 ` Arnaldo Carvalho de Melo
2021-07-01 20:11 ` Namhyung Kim
2021-06-25 7:18 ` [PATCH 4/4] perf stat: Enable BPF counter with --for-each-cgroup Namhyung Kim
2021-06-30 18:47 ` Song Liu
2021-06-30 20:09 ` Namhyung Kim
2021-07-01 20:16 ` Namhyung Kim
2021-06-30 18:50 ` Arnaldo Carvalho de Melo
2021-06-30 20:12 ` Namhyung Kim
2021-07-01 13:43 ` Arnaldo Carvalho de Melo
2021-07-01 17:10 ` Namhyung Kim
2021-06-27 15:29 ` [PATCHSET v4 0/4] perf stat: Enable BPF counters " Namhyung Kim
2021-06-30 6:19 ` Namhyung Kim
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=YNy7bjYMOZlvGWT4@kernel.org \
--to=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.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).