Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf jitdump: Fixup in_pidns member when java agent and 'perf record' are not in the same pidns

When running 'perf record' outside a container and the java agent inside
a container the jit_repipe_code_load() and friends will emit
PERF_RECORD_MMAP2 entries for the jitdump records and will check if we
need to fixup the pid/tid:

nspid = jr->load.pid;
pid = jr_entry_pid(jd, jr);
tid = jr_entry_tid(jd, jr);

The jr_entry_pid() function looks if we're in the same pidns:

static pid_t jr_entry_pid(struct jit_buf_desc *jd, union jr_entry *jr)
{
if (jd->nsi && nsinfo__in_pidns(jd->nsi))
return nsinfo__tgid(jd->nsi);
return jr->load.pid;
}

But since the thread, populated from perf.data records, try to figure
out if in the same pidns by actually trying, on the system where 'perf
inject' is running to open a procfs file (a bug that remains to be
fixed), assuming that if it is not possible that is because that thread
terminated and thus we can't get its namespace info and tolerates
nsinfo__init() failing, noting only that that namespace can't be
entered, so don't even try.

But we can kinda get at least that info (thread->nsinfo->in_pidns) from
the data in the perf.data file, namely the pid and tid in the
PERF_RECORD_MMAP2 for the jit-<PID>.dump file generated from the java
agent, if the PERF_RECORD_MMAP2->pid is the same as what is in the
jitdump file, then we're in the same namespace, otherwise we need to use
the PERF_RECORD_MMAP2->pid.

This all has to be revamped for this jitdump + running perf from
outside, as the meaning of in_pidns is being abused, the initialization
of nsinfo->pid with the value coming from the PERF_RECORD_MMAP2 data is
wrong as it is the pid _outside_ the container since perf was running
there.

The hack in this patch at least produces the expected result in this
scenario by following the assumptions in the current codebase for
finding maps and for generating the PERF_RECORD_MMAP2 for the ELF files
synthesized from the jitdump records in jit_repipe_code_load(), etc.s

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-5-acme@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+12 -3
+12 -3
tools/perf/util/jitdump.c
··· 737 737 * as captured in the RECORD_MMAP record 738 738 */ 739 739 static int 740 - jit_detect(const char *mmap_name, pid_t pid, struct nsinfo *nsi) 740 + jit_detect(const char *mmap_name, pid_t pid, struct nsinfo *nsi, bool *in_pidns) 741 741 { 742 742 char *p; 743 743 char *end = NULL; ··· 773 773 if (!end) 774 774 return -1; 775 775 776 + *in_pidns = pid == nsinfo__nstgid(nsi); 776 777 /* 777 778 * pid does not match mmap pid 778 779 * pid==0 in system-wide mode (synthesized) 780 + * 781 + * If the pid in the file name is equal to the nstgid, then 782 + * the agent ran inside a container and perf outside the 783 + * container, so record it for further use in jit_inject(). 779 784 */ 780 - if (pid && pid2 && pid != nsinfo__nstgid(nsi)) 785 + if (pid && !(pid2 == pid || *in_pidns)) 781 786 return -1; 782 787 /* 783 788 * validate suffix ··· 835 830 struct nsinfo *nsi; 836 831 struct evsel *first; 837 832 struct jit_buf_desc jd; 833 + bool in_pidns = false; 838 834 int ret; 839 835 840 836 thread = machine__findnew_thread(machine, pid, tid); ··· 850 844 /* 851 845 * first, detect marker mmap (i.e., the jitdump mmap) 852 846 */ 853 - if (jit_detect(filename, pid, nsi)) { 847 + if (jit_detect(filename, pid, nsi, &in_pidns)) { 854 848 nsinfo__put(nsi); 855 849 856 850 /* ··· 871 865 jd.output = output; 872 866 jd.machine = machine; 873 867 jd.nsi = nsi; 868 + 869 + if (in_pidns) 870 + nsinfo__set_in_pidns(nsi); 874 871 875 872 /* 876 873 * track sample_type to compute id_all layout