ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-24 05:01:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

perf namespaces: Add 'in_pidns' to nsinfo struct

Browse Source 
Provides an accurate mean to determine if the owner thread is in a
different PID namespace.

Signed-off-by: Yonatan Goldschmidt <yonatan.goldschmidt@granulate.io>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20201105015418.1725218-1-yonatan.goldschmidt@granulate.io
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Yonatan Goldschmidt
2020-11-05 03:54:18 +02:00
committed by Arnaldo Carvalho de Melo
parent 473f742e18
commit 2b51c71be5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/perf/util/namespaces.c
View File

@@ -66,6 +66,7 @@ int nsinfo__init(struct nsinfo *nsi)
char spath[PATH_MAX]; char spath[PATH_MAX];
char *newns = NULL; char *newns = NULL;
char *statln = NULL; char *statln = NULL;
char *nspid;
struct stat old_stat; struct stat old_stat;
struct stat new_stat; struct stat new_stat;
FILE *f = NULL; FILE *f = NULL;
@@ -112,8 +113,12 @@ int nsinfo__init(struct nsinfo *nsi)
} }
if (strstr(statln, "NStgid:") != NULL) { if (strstr(statln, "NStgid:") != NULL) {
nsi->nstgid = (pid_t)strtol(strrchr(statln, '\t'), nspid = strrchr(statln, '\t');
NULL, 10); nsi->nstgid = (pid_t)strtol(nspid, NULL, 10);
/* If innermost tgid is not the first, process is in a different
* PID namespace.
*/
nsi->in_pidns = (statln + sizeof("NStgid:") - 1) != nspid;
break; break;
} }
} }
@@ -140,6 +145,7 @@ struct nsinfo *nsinfo__new(pid_t pid)
nsi->tgid = pid; nsi->tgid = pid;
nsi->nstgid = pid; nsi->nstgid = pid;
nsi->need_setns = false; nsi->need_setns = false;
nsi->in_pidns = false;
/* Init may fail if the process exits while we're trying to look /* Init may fail if the process exits while we're trying to look
* at its proc information. In that case, save the pid but * at its proc information. In that case, save the pid but
* don't try to enter the namespace. * don't try to enter the namespace.
@@ -166,6 +172,7 @@ struct nsinfo *nsinfo__copy(struct nsinfo *nsi)
nnsi->tgid = nsi->tgid; nnsi->tgid = nsi->tgid;
nnsi->nstgid = nsi->nstgid; nnsi->nstgid = nsi->nstgid;
nnsi->need_setns = nsi->need_setns; nnsi->need_setns = nsi->need_setns;
nnsi->in_pidns = nsi->in_pidns;
if (nsi->mntns_path) { if (nsi->mntns_path) {
nnsi->mntns_path = strdup(nsi->mntns_path); nnsi->mntns_path = strdup(nsi->mntns_path);
if (!nnsi->mntns_path) { if (!nnsi->mntns_path) {

1
tools/perf/util/namespaces.h
View File

@@ -33,6 +33,7 @@ struct nsinfo {
pid_t tgid; pid_t tgid;
pid_t nstgid; pid_t nstgid;
bool need_setns; bool need_setns;
bool in_pidns;
char *mntns_path; char *mntns_path;
refcount_t refcnt; refcount_t refcnt;
}; };