[Intel-gfx] [PATCH igt] lib: Print other clients when DRM_SET_MASTER fails
Daniel Vetter
daniel at ffwll.ch
Thu Dec 7 17:55:43 UTC 2017
On Thu, Dec 07, 2017 at 10:09:33AM +0000, Chris Wilson wrote:
> It looks like there are some rogue processes running in CI that prevent
> DRM_MASTER from being obtained. Dump the list of clients on failure to
> make it more obvious what is being left behind.
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=104157
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Pls also update docs/reference/intel-gpu-tools/intel-gpu-tools.xml to
include the new file (builds better with meson ime, automake needs a
complete new autogen.sh run to pick that up). I think that also needs the
overview stanza for gtkdoc to pick it up.
Maybe longer-term we want to shuffle all the core open stuff in here, but
that can be done later on. With gtkdoc basics appeased:
Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> lib/Makefile.sources | 2 ++
> lib/drmtest.c | 4 +--
> lib/igt_device.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> lib/igt_device.h | 34 +++++++++++++++++++++++
> 4 files changed, 116 insertions(+), 2 deletions(-)
> create mode 100644 lib/igt_device.c
> create mode 100644 lib/igt_device.h
>
> diff --git a/lib/Makefile.sources b/lib/Makefile.sources
> index 6e968d9f7..686c0f145 100644
> --- a/lib/Makefile.sources
> +++ b/lib/Makefile.sources
> @@ -15,6 +15,8 @@ lib_source_list = \
> igt.h \
> igt_debugfs.c \
> igt_debugfs.h \
> + igt_device.c \
> + igt_device.h \
> igt_aux.c \
> igt_aux.h \
> igt_edid_template.h \
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index ef2f772ea..b2d8150f4 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -51,6 +51,7 @@
> #include "intel_chipset.h"
> #include "intel_io.h"
> #include "igt_debugfs.h"
> +#include "igt_device.h"
> #include "igt_gt.h"
> #include "igt_kmod.h"
> #include "version.h"
> @@ -423,8 +424,7 @@ int drm_open_driver_master(int chipset)
> {
> int fd = drm_open_driver(chipset);
>
> - igt_require_f(drmSetMaster(fd) == 0, "Can't become DRM master, "
> - "please check if no other DRM client is running.\n");
> + igt_device_set_master(fd);
>
> return fd;
> }
> diff --git a/lib/igt_device.c b/lib/igt_device.c
> new file mode 100644
> index 000000000..5bf0bdcd3
> --- /dev/null
> +++ b/lib/igt_device.c
> @@ -0,0 +1,78 @@
> +/*
> + * Copyright © 2017 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include "igt.h"
> +#include "igt_device.h"
> +
> +int __igt_device_set_master(int fd)
> +{
> + int err;
> +
> + err = 0;
> + if (drmIoctl(fd, DRM_IOCTL_SET_MASTER, NULL))
> + err = -errno;
> +
> + errno = 0;
> + return err;
> +}
> +
> +/**
> + * igt_device_set_master: Set DRM master
> + * @fd: the device
> + *
> + * Tell the kernel to become DRM master or skip the test.
> + */
> +void igt_device_set_master(int fd)
> +{
> + if (__igt_device_set_master(fd)) {
> + igt_debugfs_dump(fd, "clients");
> + igt_require_f(__igt_device_set_master(fd) == 0,
> + "Can't become DRM master, "
> + "please check if no other DRM client is running.\n");
> + }
> +}
> +
> +int __igt_device_drop_master(int fd)
> +{
> + int err;
> +
> + err = 0;
> + if (drmIoctl(fd, DRM_IOCTL_DROP_MASTER, NULL))
> + err = -errno;
> +
> + errno = 0;
> + return err;
> +}
> +
> +/**
> + * igt_device_drop_master: Drop DRM master
> + * @fd: the device
> + *
> + * Tell the kernel we no longer want to be the DRM master; asserting that
> + * we lose that privilege.
> + */
> +void igt_device_drop_master(int fd)
> +{
> + igt_assert_eq(__igt_device_drop_master(fd), 0);
> +}
> diff --git a/lib/igt_device.h b/lib/igt_device.h
> new file mode 100644
> index 000000000..2995f969e
> --- /dev/null
> +++ b/lib/igt_device.h
> @@ -0,0 +1,34 @@
> +/*
> + * Copyright © 2017 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#ifndef __IGT_DEVICE_H__
> +#define __IGT_DEVICE_H__
> +
> +int __igt_device_set_master(int fd);
> +void igt_device_set_master(int fd);
> +
> +int __igt_device_drop_master(int fd);
> +void igt_device_drop_master(int fd);
> +
> +#endif /* __IGT_DEVICE_H__ */
> --
> 2.15.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
More information about the Intel-gfx
mailing list