From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@linaro.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org
Subject: [PATCH v2 04/11] perf tools: Add lock to struct nsinfo
Date: Sun, 15 Nov 2026 21:57:24 -0800 [thread overview]
Message-ID: <20261116055731.707164-5-namhyung@kernel.org> (raw)
In-Reply-To: <20261116055731.707164-1-namhyung@kernel.org>
A struct nsinfo instance can be shared across threads via
thread->nsinfo and dso->nsinfo. Add a mutex lock inside struct nsinfo
to synchronize access to its fields, initialization, copying, and mount
namespace path duplication in nsinfo__mountns_enter().
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/namespaces.c | 106 +++++++++++++++++++++++++++--------
tools/perf/util/namespaces.h | 2 +
2 files changed, 86 insertions(+), 22 deletions(-)
diff --git a/tools/perf/util/namespaces.c b/tools/perf/util/namespaces.c
index f426eba04d6ef449..845a62045405c80a 100644
--- a/tools/perf/util/namespaces.c
+++ b/tools/perf/util/namespaces.c
@@ -94,7 +94,7 @@ static int nsinfo__get_nspid(pid_t *tgid, pid_t *nstgid, bool *in_pidns, const c
return 0;
}
-int nsinfo__init(struct nsinfo *nsi)
+static int nsinfo__init_locked(struct nsinfo *nsi)
{
char oldns[PATH_MAX];
char spath[PATH_MAX];
@@ -140,14 +140,29 @@ int nsinfo__init(struct nsinfo *nsi)
return rv;
}
+int nsinfo__init(struct nsinfo *nsi)
+{
+ int rv;
+
+ if (!nsi)
+ return -1;
+
+ mutex_lock(&RC_CHK_ACCESS(nsi)->lock);
+ rv = nsinfo__init_locked(nsi);
+ mutex_unlock(&RC_CHK_ACCESS(nsi)->lock);
+ return rv;
+}
+
static struct nsinfo *nsinfo__alloc(void)
{
struct nsinfo *res;
RC_STRUCT(nsinfo) *nsi;
nsi = calloc(1, sizeof(*nsi));
- if (ADD_RC_CHK(res, nsi))
+ if (ADD_RC_CHK(res, nsi)) {
refcount_set(&nsi->refcnt, 1);
+ mutex_init(&nsi->lock);
+ }
return res;
}
@@ -184,9 +199,9 @@ struct nsinfo *nsinfo__new(pid_t pid)
return nsinfo__new_thread(pid, pid);
}
-static const char *nsinfo__mntns_path(const struct nsinfo *nsi)
+static struct mutex *nsinfo__lock(const struct nsinfo *nsi)
{
- return RC_CHK_ACCESS(nsi)->mntns_path;
+ return (struct mutex *)&RC_CHK_ACCESS(nsi)->lock;
}
struct nsinfo *nsinfo__copy(const struct nsinfo *nsi)
@@ -200,19 +215,22 @@ struct nsinfo *nsinfo__copy(const struct nsinfo *nsi)
if (!nnsi)
return NULL;
- RC_CHK_ACCESS(nnsi)->pid = nsinfo__pid(nsi);
- RC_CHK_ACCESS(nnsi)->tid = nsinfo__tid(nsi);
- RC_CHK_ACCESS(nnsi)->tgid = nsinfo__tgid(nsi);
- RC_CHK_ACCESS(nnsi)->nstgid = nsinfo__nstgid(nsi);
- RC_CHK_ACCESS(nnsi)->need_setns = nsinfo__need_setns(nsi);
- RC_CHK_ACCESS(nnsi)->in_pidns = nsinfo__in_pidns(nsi);
- if (nsinfo__mntns_path(nsi)) {
- RC_CHK_ACCESS(nnsi)->mntns_path = strdup(nsinfo__mntns_path(nsi));
+ mutex_lock(nsinfo__lock(nsi));
+ RC_CHK_ACCESS(nnsi)->pid = RC_CHK_ACCESS(nsi)->pid;
+ RC_CHK_ACCESS(nnsi)->tid = RC_CHK_ACCESS(nsi)->tid;
+ RC_CHK_ACCESS(nnsi)->tgid = RC_CHK_ACCESS(nsi)->tgid;
+ RC_CHK_ACCESS(nnsi)->nstgid = RC_CHK_ACCESS(nsi)->nstgid;
+ RC_CHK_ACCESS(nnsi)->need_setns = RC_CHK_ACCESS(nsi)->need_setns;
+ RC_CHK_ACCESS(nnsi)->in_pidns = RC_CHK_ACCESS(nsi)->in_pidns;
+ if (RC_CHK_ACCESS(nsi)->mntns_path) {
+ RC_CHK_ACCESS(nnsi)->mntns_path = strdup(RC_CHK_ACCESS(nsi)->mntns_path);
if (!RC_CHK_ACCESS(nnsi)->mntns_path) {
+ mutex_unlock(nsinfo__lock(nsi));
nsinfo__put(nnsi);
return NULL;
}
}
+ mutex_unlock(nsinfo__lock(nsi));
return nnsi;
}
@@ -227,6 +245,7 @@ static void nsinfo__delete(struct nsinfo *nsi)
if (nsi) {
WARN_ONCE(refcount_read(nsinfo__refcnt(nsi)) != 0, "nsinfo refcnt unbalanced\n");
zfree(&RC_CHK_ACCESS(nsi)->mntns_path);
+ mutex_destroy(&RC_CHK_ACCESS(nsi)->lock);
RC_CHK_FREE(nsi);
}
}
@@ -251,22 +270,46 @@ void nsinfo__put(struct nsinfo *nsi)
bool nsinfo__need_setns(const struct nsinfo *nsi)
{
- return RC_CHK_ACCESS(nsi)->need_setns;
+ bool ret;
+
+ if (!nsi)
+ return false;
+
+ mutex_lock(nsinfo__lock(nsi));
+ ret = RC_CHK_ACCESS(nsi)->need_setns;
+ mutex_unlock(nsinfo__lock(nsi));
+ return ret;
}
void nsinfo__clear_need_setns(struct nsinfo *nsi)
{
+ if (!nsi)
+ return;
+
+ mutex_lock(nsinfo__lock(nsi));
RC_CHK_ACCESS(nsi)->need_setns = false;
+ zfree(&RC_CHK_ACCESS(nsi)->mntns_path);
+ mutex_unlock(nsinfo__lock(nsi));
}
-pid_t nsinfo__tgid(const struct nsinfo *nsi)
+pid_t nsinfo__tgid(const struct nsinfo *nsi)
{
- return RC_CHK_ACCESS(nsi)->tgid;
+ pid_t ret;
+
+ mutex_lock(nsinfo__lock(nsi));
+ ret = RC_CHK_ACCESS(nsi)->tgid;
+ mutex_unlock(nsinfo__lock(nsi));
+ return ret;
}
-pid_t nsinfo__nstgid(const struct nsinfo *nsi)
+pid_t nsinfo__nstgid(const struct nsinfo *nsi)
{
- return RC_CHK_ACCESS(nsi)->nstgid;
+ pid_t ret;
+
+ mutex_lock(nsinfo__lock(nsi));
+ ret = RC_CHK_ACCESS(nsi)->nstgid;
+ mutex_unlock(nsinfo__lock(nsi));
+ return ret;
}
pid_t nsinfo__pid(const struct nsinfo *nsi)
@@ -281,18 +324,26 @@ pid_t nsinfo__tid(const struct nsinfo *nsi)
bool nsinfo__in_pidns(const struct nsinfo *nsi)
{
- return RC_CHK_ACCESS(nsi)->in_pidns;
+ bool ret;
+
+ mutex_lock(nsinfo__lock(nsi));
+ ret = RC_CHK_ACCESS(nsi)->in_pidns;
+ mutex_unlock(nsinfo__lock(nsi));
+ return ret;
}
void nsinfo__set_in_pidns(struct nsinfo *nsi)
{
+ mutex_lock(&RC_CHK_ACCESS(nsi)->lock);
RC_CHK_ACCESS(nsi)->in_pidns = true;
+ mutex_unlock(&RC_CHK_ACCESS(nsi)->lock);
}
void nsinfo__mountns_enter(struct nsinfo *nsi,
struct nscookie *nc)
{
char curpath[PATH_MAX];
+ char *mntns_path = NULL;
int oldns = -1;
int newns = -1;
char *oldcwd = NULL;
@@ -303,27 +354,36 @@ void nsinfo__mountns_enter(struct nsinfo *nsi,
nc->oldns = -1;
nc->newns = -1;
- if (!nsi || !nsinfo__need_setns(nsi))
+ if (!nsi)
+ return;
+
+ mutex_lock(&RC_CHK_ACCESS(nsi)->lock);
+ if (RC_CHK_ACCESS(nsi)->need_setns && RC_CHK_ACCESS(nsi)->mntns_path)
+ mntns_path = strdup(RC_CHK_ACCESS(nsi)->mntns_path);
+ mutex_unlock(&RC_CHK_ACCESS(nsi)->lock);
+
+ if (!mntns_path)
return;
if (!getcwd(curpath, sizeof(curpath)))
- return;
+ goto out;
oldcwd = strdup(curpath);
if (!oldcwd)
- return;
+ goto out;
oldns = open("/proc/self/ns/mnt", O_RDONLY);
if (oldns < 0)
goto errout;
- newns = open(nsinfo__mntns_path(nsi), O_RDONLY);
+ newns = open(mntns_path, O_RDONLY);
if (newns < 0)
goto errout;
if (setns(newns, CLONE_NEWNS) < 0)
goto errout;
+ free(mntns_path);
nc->oldcwd = oldcwd;
nc->oldns = oldns;
nc->newns = newns;
@@ -335,6 +395,8 @@ void nsinfo__mountns_enter(struct nsinfo *nsi,
close(oldns);
if (newns > -1)
close(newns);
+out:
+ free(mntns_path);
}
void nsinfo__mountns_exit(struct nscookie *nc)
diff --git a/tools/perf/util/namespaces.h b/tools/perf/util/namespaces.h
index ea645954944de4be..bbb47a6f9e8323f2 100644
--- a/tools/perf/util/namespaces.h
+++ b/tools/perf/util/namespaces.h
@@ -14,6 +14,7 @@
#include <linux/refcount.h>
#include <linux/types.h>
#include <internal/rc_check.h>
+#include "mutex.h"
#ifndef HAVE_SETNS_SUPPORT
int setns(int fd, int nstype);
@@ -31,6 +32,7 @@ struct namespaces *namespaces__new(struct perf_record_namespaces *event);
void namespaces__free(struct namespaces *namespaces);
DECLARE_RC_STRUCT(nsinfo) {
+ struct mutex lock;
pid_t pid;
pid_t tid;
pid_t tgid;
--
2.56.0.611.g1030f0b940-goog
next prev parent reply other threads:[~2026-11-16 5:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 5:57 [PATCH v2 00/11] perf tools: Enhance namespace and chroot handling Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 01/11] perf tools: Add HEADER_BOOT_ID feature Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 02/11] perf tools: Add perf_env__is_same_boot() Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 03/11] perf tools: Add nsinfo__new_thread() to track tid Namhyung Kim
2026-11-16 5:57 ` Namhyung Kim [this message]
2026-11-16 5:57 ` [PATCH v2 05/11] perf tools: Defer /proc lookup until nsinfo is used Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 06/11] perf tools: Verify thread status and mount namespace inode Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 07/11] perf tools: Check thread liveness when accessing /proc Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 08/11] perf tools: Export filename__read_build_id_ns() Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 09/11] perf tools: Only enter mount namespace if necessary Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 10/11] perf tools: Scope mount namespace entry in dso__load() Namhyung Kim
2026-11-16 5:57 ` [PATCH v2 11/11] perf tests: Add namespace, nsinfo, and boot ID tests 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=20261116055731.707164-5-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=irogers@google.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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
all inboxes | Powered by JetHome®