Skip to content

Commit 8fdd1df

Browse files
acmelopsiff
authored andcommitted
perf namespaces: Introduce nsinfo__set_in_pidns()
[ Upstream commit 9c6a585 ] When we're processing a perf.data file we will, for every thread in that file do a machine__findnew_thread(machine, pid, tid) that when that pid is seen for the first time will create a 'struct thread' representing it. That in turn will call nsinfo__new() -> nsinfo__init() and there it will assume we're running live, which is wrong and will need to be addressed in a followup patch. The nsinfo__new() assumes that if we can't access that thread it has already finished and will ignore the -1 return from nsinfo__init(), just taking notes to avoid trying to enter in that namespace, since it isn't there anymore, a race. When doing this from 'perf inject', tho, we can fill in parts of that nsinfo from what we get from the PERF_RECORD_MMAP2 (pid, tid) and in the jitdump file name, that has the form of jit-<PID>.dump. So if the pid in the jitdump file name is not the one in the PERF_RECORD_MMAP2, we can assume that its the pid of the process _inside_ the namespace, and that perf was runing outside that namespace. This will be done in the following patch. Reported-by: Francesco Nigro <fnigro@redhat.com> Reported-by: Ilan Green <igreen@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Clark Williams <williams@redhat.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Yonatan Goldschmidt <yonatan.goldschmidt@granulate.io> Link: https://lore.kernel.org/r/20241206204828.507527-4-acme@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Stable-dep-of: 64a7617 ("perf namespaces: Fixup the nsinfo__in_pidns() return type, its bool") Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 41b6abb951ca59ea16c42f6d7fa61586262aa70b)
1 parent aef4a2e commit 8fdd1df

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

tools/perf/util/namespaces.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ pid_t nsinfo__in_pidns(const struct nsinfo *nsi)
271271
return RC_CHK_ACCESS(nsi)->in_pidns;
272272
}
273273

274+
void nsinfo__set_in_pidns(struct nsinfo *nsi)
275+
{
276+
RC_CHK_ACCESS(nsi)->in_pidns = true;
277+
}
278+
274279
void nsinfo__mountns_enter(struct nsinfo *nsi,
275280
struct nscookie *nc)
276281
{

tools/perf/util/namespaces.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pid_t nsinfo__tgid(const struct nsinfo *nsi);
5959
pid_t nsinfo__nstgid(const struct nsinfo *nsi);
6060
pid_t nsinfo__pid(const struct nsinfo *nsi);
6161
pid_t nsinfo__in_pidns(const struct nsinfo *nsi);
62+
void nsinfo__set_in_pidns(struct nsinfo *nsi);
6263

6364
void nsinfo__mountns_enter(struct nsinfo *nsi, struct nscookie *nc);
6465
void nsinfo__mountns_exit(struct nscookie *nc);

0 commit comments

Comments
 (0)