Re: [igt-dev] [PATCH i-g-t v3 1/5] lib/igt_device: add igt_device_get_pci_addr by fd

[Katarzyna Dec <katarzyna.dec@intel.com>]

On Mon, Apr 15, 2019 at 10:59:33AM +0200, Daniel Mrzyglod wrote:
> From: Michał Winiarski <michal.winiarski@intel.com>
> 
> This function get us pci address based by fd.
> It allows us to make things a little bit more generic.
> Also, we now require fd rather than doing guesswork when it comes to pci address.
> 
> Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniel Mrzyglod <daniel.t.mrzyglod@intel.com>
> ---
>  lib/igt_device.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++
>  lib/igt_device.h |   2 +
>  2 files changed, 124 insertions(+)
> 
> diff --git a/lib/igt_device.c b/lib/igt_device.c
> index 08f39c8b..f3d2a9f5 100644
> --- a/lib/igt_device.c
> +++ b/lib/igt_device.c
> @@ -21,11 +21,14 @@
>   * IN THE SOFTWARE.
>   *
>   */
> +#include <sys/types.h>
> +#include <fcntl.h>
>  
>  #include <sys/stat.h>
>  #include <sys/sysmacros.h>
>  #include "igt.h"
>  #include "igt_device.h"
> +#include "igt_sysfs.h"
>  
>  int __igt_device_set_master(int fd)
>  {
> @@ -103,3 +106,122 @@ int igt_device_get_card_index(int fd)
>  
>  	return minor(st.st_rdev);
>  }
> +
> +#define IGT_DEV_PATH_LEN 80
> +
> +static bool igt_device_is_pci(int fd)
> +{
> +	char path[IGT_DEV_PATH_LEN];
> +	char *subsystem;
> +	int sysfs;
> +	int len;
> +
> +	sysfs = igt_sysfs_open(fd);
> +	if (sysfs == -1)
> +		return false;
> +
> +	len = readlinkat(sysfs, "device/subsystem", path, sizeof(path) - 1);
> +	if (len == -1)
> +		return false;
> +	path[len] = '\0';
> +
> +	subsystem = strrchr(path, '/');
> +	if (!subsystem)
> +		return false;
> +
I think that Chris already mentioned that you're leaking sysfs here.
> +	return strcmp(subsystem, "/pci") == 0;
> +}
> +
> +struct igt_pci_addr {
> +	unsigned int domain;
> +	unsigned int bus;
> +	unsigned int device;
> +	unsigned int function;
> +};
> +
> +static int igt_device_get_pci_addr(int fd, struct igt_pci_addr *pci)
> +{
> +	char path[IGT_DEV_PATH_LEN];
> +	char *buf;
> +	int sysfs;
> +	int len;
> +
> +	if (!igt_device_is_pci(fd))
> +		return -ENODEV;
> +
> +	sysfs = igt_sysfs_open(fd);
> +	if (sysfs == -1)
> +		return -ENOENT;
> +
> +	len = readlinkat(sysfs, "device", path, sizeof(path) - 1);
> +	if (len == -1)
> +		return -ENOENT;
> +	path[len] = '\0';
> +
> +	buf = strrchr(path, '/');
> +	if (!buf)
> +		return -ENOENT;
> +
> +	if (sscanf(buf, "/%4x:%2x:%2x.%2x",
> +		   &pci->domain, &pci->bus,
> +		   &pci->device, &pci->function) != 4) {
> +		igt_warn("Unable to extract PCI device address from '%s'\n", buf);
> +		return -ENOENT;
> +	}
> +
Same about close(sysfs) here.

I can add r-b after above are fixed.
Kasia :)
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev