Re: [igt-dev] [PATCH i-g-t 2/7] lib/igt_core: store GPU string or opened device name

[Petri Latvala <petri.latvala@intel.com>]

On Fri, Dec 02, 2022 at 09:57:00PM +0100, Kamil Konieczny wrote:
> From: Mauro Carvalho Chehab <mchehab@kernel.org>
> 
> This is helpful on tests that run with multiple GPUs.
> The name will be automatically filled when a device will
> be opened.
> 
> v2: reorganized code, changed commit message to note that
>   it will be filled with pathname of opended device, also
>   correct static initialization [Kamil]
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> Signed-off-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
> ---
>  lib/drmtest.c  |  4 +++-
>  lib/igt_core.c | 30 ++++++++++++++++++++++++++++++
>  lib/igt_core.h |  6 ++++++
>  3 files changed, 39 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index 16e80bdf..5eb98272 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -222,8 +222,10 @@ static int open_device(const char *name, unsigned int chipset)
>  			break;
>  		}
>  	}
> -	if ((chipset & chip) == chip)
> +	if ((chipset & chip) == chip) {
> +		set_gpu_string(name);
>  		return fd;
> +	}
>  
>  err:
>  	close(fd);
> diff --git a/lib/igt_core.c b/lib/igt_core.c
> index dca380d0..68ae7289 100644
> --- a/lib/igt_core.c
> +++ b/lib/igt_core.c
> @@ -1576,6 +1576,36 @@ static void kill_and_wait(pid_t *pids, int size, int signum)
>  	}
>  }
>  
> +static __thread char *gpu_string;
> +

This is assuming that multiple gpu usage is done from different
threads/processes per gpu. What about tests that call
drm_open_driver_another() from the same thread?

What about tests that don't call drm_open_driver() at all?


-- 
Petri Latvala


> +void set_gpu_string(const char *fname)
> +{
> +	char sysfs[PATH_MAX], *path, *p;
> +
> +	if (gpu_string) {
> +		free(gpu_string);
> +		gpu_string = NULL;
> +	}
> +
> +	if (!fname)
> +		return;
> +
> +	p = strrchr(fname, '/');
> +	if (!p) {
> +		path = strdup(fname);
> +	} else {
> +		p++;
> +
> +		strcpy(sysfs, "/sys/class/drm/");
> +		strcat(sysfs, p);
> +		path = realpath(sysfs, NULL);
> +		igt_debug("opened %s as %s\n", fname, path);
> +	}
> +
> +	gpu_string = path;
> +	igt_assert(gpu_string);
> +}
> +
>  __noreturn static void exit_subtest(const char *result)
>  {
>  	struct timespec now;
> diff --git a/lib/igt_core.h b/lib/igt_core.h
> index 5d5593e0..1f7e3652 100644
> --- a/lib/igt_core.h
> +++ b/lib/igt_core.h
> @@ -1519,4 +1519,10 @@ static inline void igt_pci_system_cleanup(void)
>  {
>  }
>  
> +/**
> + * set_gpu_string():
> + * Sets a string to describe the GPU being tested
> + */
> +void set_gpu_string(const char *string);
> +
>  #endif /* IGT_CORE_H */
> -- 
> 2.34.1
>