Commit bcaf0a97 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf namespaces: Add functions to access nsinfo 



Having functions to access nsinfo reduces the places where reference
counting checking needs to be added.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: André Almeida <andrealmeid@collabora.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Hao Luo <haoluo@google.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Song Liu <song@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: http://lore.kernel.org/lkml/20220211103415.2737789-14-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b80675fa

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static struct dso *findnew_dso(int pid, int tid, const char *filename, 
		nnsi = nsinfo__copy(nsi);

		if (nnsi) {

			nsinfo__put(nsi);

			nnsi->need_setns = false;

			nsinfo__clear_need_setns(nnsi);

			nsi = nnsi;

		}

		dso = machine__findnew_vdso(machine, thread);

tools/perf/builtin-probe.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int opt_set_target_ns(const struct option *opt __maybe_unused, 
			return ret;

		}

		nsip = nsinfo__new(ns_pid);

		if (nsip && nsip->need_setns)

		if (nsip && nsinfo__need_setns(nsip))

			params.nsi = nsinfo__get(nsip);

		nsinfo__put(nsip);

tools/perf/util/build-id.c

+2 −2
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ build_id_cache__add(const char *sbuild_id, const char *name, const char *realnam 
		if (is_kallsyms) {

			if (copyfile("/proc/kallsyms", filename))

				goto out_free;

		} else if (nsi && nsi->need_setns) {

		} else if (nsi && nsinfo__need_setns(nsi)) {

			if (copyfile_ns(name, filename, nsi))

				goto out_free;

		} else if (link(realname, filename) && errno != EEXIST &&
@@ -730,7 +730,7 @@ build_id_cache__add(const char *sbuild_id, const char *name, const char *realnam 
				goto out_free;

			}

			if (access(filename, F_OK)) {

				if (nsi && nsi->need_setns) {

				if (nsi && nsinfo__need_setns(nsi)) {

					if (copyfile_ns(debugfile, filename,

							nsi))

						goto out_free;

tools/perf/util/jitdump.c

+5 −5
Original line number Diff line number Diff line
@@ -382,15 +382,15 @@ jit_inject_event(struct jit_buf_desc *jd, union perf_event *event) 


static pid_t jr_entry_pid(struct jit_buf_desc *jd, union jr_entry *jr)

{

	if (jd->nsi && jd->nsi->in_pidns)

		return jd->nsi->tgid;

	if (jd->nsi && nsinfo__in_pidns(jd->nsi))

		return nsinfo__tgid(jd->nsi);

	return jr->load.pid;

}



static pid_t jr_entry_tid(struct jit_buf_desc *jd, union jr_entry *jr)

{

	if (jd->nsi && jd->nsi->in_pidns)

		return jd->nsi->pid;

	if (jd->nsi && nsinfo__in_pidns(jd->nsi))

		return nsinfo__pid(jd->nsi);

	return jr->load.tid;

}
@@ -779,7 +779,7 @@ jit_detect(char *mmap_name, pid_t pid, struct nsinfo *nsi) 
	 * pid does not match mmap pid

	 * pid==0 in system-wide mode (synthesized)

	 */

	if (pid && pid2 != nsi->nstgid)

	if (pid && pid2 != nsinfo__nstgid(nsi))

		return -1;

	/*

	 * validate suffix

tools/perf/util/map.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, 


		if ((anon || no_dso) && nsi && (prot & PROT_EXEC)) {

			snprintf(newfilename, sizeof(newfilename),

				 "/tmp/perf-%d.map", nsi->pid);

				 "/tmp/perf-%d.map", nsinfo__pid(nsi));

			filename = newfilename;

		}
@@ -168,7 +168,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, 
			nnsi = nsinfo__copy(nsi);

			if (nnsi) {

				nsinfo__put(nsi);

				nnsi->need_setns = false;

				nsinfo__clear_need_setns(nnsi);

				nsi = nnsi;

			}

			pgoff = 0;