From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v12 6/9] trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM
Date: Wed, 28 Aug 2019 11:57:43 +0300 [thread overview]
Message-ID: <20190828085746.26231-7-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20190828085746.26231-1-tz.stoyanov@gmail.com>
From: Tzvetomir Stoyanov <tstoyanov@vmware.com>
In order to match host and guest events, a mapping between guest VCPU
and the host task, running this VCPU is needed. Extended existing
struct guest to hold such mapping and added logic in read_qemu_guests()
function to initialize it. Implemented a new internal API,
get_guest_vcpu_pid(), to retrieve VCPU-task mapping for given VM.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tracecmd/include/trace-local.h | 1 +
tracecmd/trace-record.c | 57 ++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h
index 1d305bf..a4166b8 100644
--- a/tracecmd/include/trace-local.h
+++ b/tracecmd/include/trace-local.h
@@ -247,6 +247,7 @@ int tracecmd_local_cpu_count(void);
void tracecmd_set_clock(struct buffer_instance *instance);
void tracecmd_remove_instance(struct buffer_instance *instance);
+int get_guest_vcpu_pid(unsigned int guest_cid, unsigned int guest_vcpu);
/* No longer in event-utils.h */
void __noreturn die(const char *fmt, ...); /* Can be overriden */
void *malloc_or_die(unsigned int size); /* Can be overridden */
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index db1d37a..c30a57e 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -2795,10 +2795,12 @@ static bool is_digits(const char *s)
return true;
}
+#define VCPUS_MAX 256
struct guest {
char *name;
int cid;
int pid;
+ int cpu_pid[VCPUS_MAX];
};
static struct guest *guests;
@@ -2816,6 +2818,46 @@ static char *get_qemu_guest_name(char *arg)
return arg;
}
+static void read_qemu_guests_pids(char *guest_task, struct guest *guest)
+{
+ struct dirent *entry;
+ char path[PATH_MAX];
+ char *buf = NULL;
+ size_t n = 0;
+ int vcpu;
+ DIR *dir;
+ FILE *f;
+
+ snprintf(path, sizeof(path), "/proc/%s/task", guest_task);
+ dir = opendir(path);
+ if (!dir)
+ return;
+
+ while ((entry = readdir(dir))) {
+ if (!(entry->d_type == DT_DIR && is_digits(entry->d_name)))
+ continue;
+
+ snprintf(path, sizeof(path), "/proc/%s/task/%s/comm",
+ guest_task, entry->d_name);
+ f = fopen(path, "r");
+ if (!f)
+ continue;
+ if (getline(&buf, &n, f) < 0)
+ goto next;
+ if (strncmp(buf, "CPU ", 4) != 0)
+ goto next;
+
+ vcpu = atoi(buf+4);
+ if (!(vcpu >= 0 && vcpu < VCPUS_MAX))
+ goto next;
+ guest->cpu_pid[vcpu] = atoi(entry->d_name);
+
+next:
+ fclose(f);
+ }
+ free(buf);
+}
+
static void read_qemu_guests(void)
{
static bool initialized;
@@ -2879,6 +2921,8 @@ static void read_qemu_guests(void)
if (!is_qemu)
goto next;
+ read_qemu_guests_pids(entry->d_name, &guest);
+
guests = realloc(guests, (guests_len + 1) * sizeof(*guests));
if (!guests)
die("Can not allocate guest buffer");
@@ -2996,6 +3040,19 @@ static char *parse_guest_name(char *guest, int *cid, int *port)
return guest;
}
+int get_guest_vcpu_pid(unsigned int guest_cid, unsigned int guest_vcpu)
+{
+ int i;
+
+ if (!guests || guest_vcpu >= VCPUS_MAX)
+ return -1;
+
+ for (i = 0; i < guests_len; i++)
+ if (guest_cid == guests[i].cid)
+ return guests[i].cpu_pid[guest_vcpu];
+ return -1;
+}
+
static void set_prio(int prio)
{
struct sched_param sp;
--
2.21.0
next prev parent reply other threads:[~2019-08-28 8:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 8:57 [PATCH v12 0/9] trace-cmd: Timetamps sync between host and guest machines, relying on vsock events Tzvetomir Stoyanov (VMware)
2019-08-28 8:57 ` [PATCH v12 1/9] trace-cmd: Implemented new lib API: tracecmd_local_events_system() Tzvetomir Stoyanov (VMware)
2019-10-22 16:34 ` Steven Rostedt
2019-10-25 9:24 ` Tzvetomir Stoyanov
2019-08-28 8:57 ` [PATCH v12 2/9] trace-cmd: Added support for negative time offsets in trace.dat file Tzvetomir Stoyanov (VMware)
2019-08-28 8:57 ` [PATCH v12 3/9] trace-cmd: Fix tracecmd_read_page_record() to read more than one event Tzvetomir Stoyanov (VMware)
2019-10-22 17:34 ` Steven Rostedt
2019-08-28 8:57 ` [PATCH v12 4/9] trace-cmd: Added implementation of htonll() and ntohll() Tzvetomir Stoyanov (VMware)
2019-08-28 8:57 ` [PATCH v12 5/9] trace-cmd: Refactored few functions in trace-record.c Tzvetomir Stoyanov (VMware)
2019-10-22 17:47 ` Steven Rostedt
2019-08-28 8:57 ` Tzvetomir Stoyanov (VMware) [this message]
2019-08-28 8:57 ` [PATCH v12 7/9] trace-cmd: Implemented new API tracecmd_add_option_v() Tzvetomir Stoyanov (VMware)
2019-10-22 19:10 ` Steven Rostedt
2019-08-28 8:57 ` [PATCH v12 8/9] trace-cmd: Implemented new option in trace.dat file: TRACECMD_OPTION_TIME_SHIFT Tzvetomir Stoyanov (VMware)
2019-08-28 8:57 ` [PATCH v12 9/9] trace-cmd [POC]: Implemented timestamps synch algorithm, using vsock events Tzvetomir Stoyanov (VMware)
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=20190828085746.26231-7-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).