From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41D2610E4C7 for ; Fri, 19 May 2023 15:15:23 +0000 (UTC) From: Bhanuprakash Modem To: igt-dev@lists.freedesktop.org Date: Fri, 19 May 2023 20:39:56 +0530 Message-Id: <20230519150956.519525-1-bhanuprakash.modem@intel.com> In-Reply-To: <20230516165058.4047595-2-bhanuprakash.modem@intel.com> References: <20230516165058.4047595-2-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [i-g-t V3 01/20] lib: Interface to close the drm fd List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Add new helper drm_close_driver() to close the drm fd. Now every user could call drm_close_driver() instead of close(). V2: - Fix commit message - Add debug prints V3: - Check the validity of fd before close Cc: Zbigniew Kempczyński Signed-off-by: Bhanuprakash Modem --- lib/drmtest.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ lib/drmtest.h | 1 + 2 files changed, 45 insertions(+) diff --git a/lib/drmtest.c b/lib/drmtest.c index 7630bb793..d148211a2 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -605,6 +605,50 @@ int drm_open_driver(int chipset) return fd; } +static bool is_valid_fd(int fd) +{ + char path[32]; + char buf[PATH_MAX]; + int len; + + if (fd < 0) + return false; + + snprintf(path, sizeof(path), "/proc/self/fd/%d", fd); + + memset(buf, 0, sizeof(buf)); + len = readlink(path, buf, sizeof(buf) - 1); + if (len <= 0) + return false; + + buf[len] = '\0'; + if (strstr(buf, "/dev/dri/card") == buf || + strstr(buf, "/dev/dri/renderD") == buf) + return true; + + return false; +} + +/** + * drm_close_driver: + * @fd: a drm file descriptor + * + * Check the given drm file descriptor @fd is valid & Close if it is + * an valid drm fd. + * + * Returns: 0 on success or -1 on error. + */ +int drm_close_driver(int fd) +{ + if (!is_valid_fd(fd)) { + igt_debug("Don't attempt to close standard/invalid file " + "descriptor: %d\n", fd); + return -1; + } + + return close(fd); +} + /** * drm_open_driver_master: * @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL diff --git a/lib/drmtest.h b/lib/drmtest.h index ae86ee19a..9c3ea5d14 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -105,6 +105,7 @@ int drm_open_driver_render(int chipset); int __drm_open_driver_another(int idx, int chipset); int __drm_open_driver(int chipset); int __drm_open_driver_render(int chipset); +int drm_close_driver(int fd); int drm_reopen_driver(int fd); -- 2.40.0