Re: [PATCH v21 01/13] trace-cmd: Find and store pids of tasks, which run virtual CPUs of given VM

[Steven Rostedt <rostedt@xxxxxxxxxxx>]

On Mon,  2 Mar 2020 12:13:52 +0200
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@xxxxxxxxx> wrote:

> +static int read_qemu_guests_pids(char *guest_task, struct guest *guest)
> +{
> +	struct dirent *entry;
> +	char path[PATH_MAX];
> +	char *buf = NULL;
> +	size_t n = 0;
> +	long vcpu;
> +	long pid;
> +	DIR *dir;
> +	FILE *f;

	int ret = 0;

> +
> +	snprintf(path, sizeof(path), "/proc/%s/task", guest_task);
> +	dir = opendir(path);
> +	if (!dir)
> +		return -1;
> +
> +	while ((entry = readdir(dir))) {

	while (!ret && (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 &&
> +		    strncmp(buf, "CPU ", 4) == 0) {
> +			vcpu = strtol(buf + 4, NULL, 10);
> +			pid = strtol(entry->d_name, NULL, 10);
> +			if (vcpu < INT_MAX && pid < INT_MAX &&
> +			    vcpu >= 0 && pid >= 0) {
> +				if (set_vcpu_pid_mapping(guest, vcpu, pid))
> +					return -1;
> +			}

Perhaps this should error on else. Also, you don't want a return here, but
instead, a break.

				if (...) {
					ret = -1;
					break;
				}

> +		}
> +
> +		fclose(f);
> +	}
> +	free(buf);
> +	return 0;

	return ret;

Otherwise you don't close the file descriptor and free buf.

-- Steve


> +}
> +
>  static void read_qemu_guests(void)
>  {
>  	static bool initialized;
> @@ -3115,6 +3179,10 @@ static void read_qemu_guests(void)
>  		if (!is_qemu)
>  			goto next;
>  
> +		if (read_qemu_guests_pids(entry->d_name, &guest))
> +			warning("Failed to retrieve VPCU - PID mapping for guest %s",
> +					guest.name ? guest.name : "Unknown");
> +
>  		guests = realloc(guests, (guests_len + 1) * sizeof(*guests));
>  		if (!guests)
>  			die("Can not allocate guest buffer");
> @@ -3160,6 +3228,22 @@ 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)
> +		return -1;
> +
> +	for (i = 0; i < guests_len; i++) {
> +		if (guests[i].cpu_pid < 0 || guest_vcpu >= guests[i].cpu_max)
> +			continue;
> +		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;