From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 366E9C282DE for ; Thu, 13 Mar 2025 17:33:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DB85B10E903; Thu, 13 Mar 2025 17:33:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="l2PK5mUo"; dkim-atps=neutral Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D31D10E901 for ; Thu, 13 Mar 2025 17:33:30 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso8320125e9.0 for ; Thu, 13 Mar 2025 10:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741887209; x=1742492009; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9BwRoA7oTRcT6JM6li4ksH93g/lzuGyrL47Y1tS2mqU=; b=l2PK5mUoHmcO9h/FWXil4GRQ/LeowQbWqR90wgC8beTKAEWEhfqSxHFNmBmaj30cQT 4bmFNHAR7UzfPpPqNXViUyPeeUENQmssYOIF9GSwDk42t+SrtX/MZJ+GQgGLeGcSz47O dnHZveu0wry4rVFsahVdVn0m02PwDASBcZQkF3JabNIBOlhJuKgjPDvir8klNHK5VrZ7 Rgb7uYKQ4gjHo619X3mFuZkAuHORKvKlBThvRqC5y+czwGyZE1GI50n+ze9NbOjkak44 nzGjK1lDbwGDoz2mmph0d6dsavdFXz4PdUg15QOeUAL90Sn7oaXvAGe8n3JiJ/YvyG93 czuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741887209; x=1742492009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9BwRoA7oTRcT6JM6li4ksH93g/lzuGyrL47Y1tS2mqU=; b=Ky3SfZsfhcW+7tosiidva3NwQx66khTkMtrofVmUv6SLtUNaa/KNGVvQXUHeGRwqdi w/in0yxdJSeREPMCE3zn4nwf+ZgM8Zg9/Q82o4RmgGnN3pSVYfF1d2ADJeEQfeBkxU2a 6n85cub5Fb3zwTbu2UB6l2VK1P6BsQvTywR3qd1NtZoRT/ixCeNj9n3oGo6yGcLhb7WZ vmlYWilzyJA07pJCbWLgeRDrrZGmJqZeC3zXIQ6yGwoW0Boz0NGzeJM83NCu7OFUw/X7 jKyR1E3dZRtS7s/LEGEtbC59o8hn1dUi1NLLVRttkpoTClLAOcwg3SH9UnYZSam8bE3q kFJQ== X-Gm-Message-State: AOJu0YyFT8dQuE6oxvjotC7zJS7fqJXe1kgFyIomrLnGMrkEXXR0PUoN 29mXRy8kz9V3X/lRPJYmFUO3ibaM9u1RfXiDOSot0gZzmxiq3ihjGtOr8oIY X-Gm-Gg: ASbGncs0S7ahuQ6EP+e1nVay/iM3dcSGKeB+1/4q8+m/5gey+iTYDQ1cQi7VYMBBhNG qt1Hk2+tdafOgemidsEUfjT5ae1o4iC+JOnwBL2m3+HevLn4hRZzrrrL3jxDoovlDOOJPzWzRDF JyRU3rR3M0xnYLLHOg7N741B0wQVun49AaVf8u3GwsqguJKcltfyu0XeFax0TgD1grCAE3E22O2 9MiOOjdEeXh/tw9fbBAH2UGKtaJypa1Lavt9O93KXTU5DO3y6pSHcl60JX/TTXYUFCjtaxPqFA7 XAJwkVl8Syas+LLetwykLYB58j1DkAS9QAfAX/ZLSYAq X-Google-Smtp-Source: AGHT+IGPVHVwsscHHrFAxII1OoxX/RIzSkQHxtpPaqkSKaWRHT0kZljWKn41ehptZlfUGXqJxEKh7Q== X-Received: by 2002:a05:600c:5599:b0:43c:fa24:8721 with SMTP id 5b1f17b1804b1-43d0ac5266dmr59258045e9.17.1741887208316; Thu, 13 Mar 2025 10:33:28 -0700 (PDT) Received: from fedora.. ([94.73.34.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d18a2aab1sm27172625e9.31.2025.03.13.10.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 10:33:27 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: igt-dev@lists.freedesktop.org Cc: louis.chauvet@bootlin.com, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH i-g-t v2 05/43] lib/vkms: Allow to enable/disable VKMS devices Date: Thu, 13 Mar 2025 18:32:40 +0100 Message-ID: <20250313173318.5818-6-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313173318.5818-1-jose.exposito89@gmail.com> References: <20250313173318.5818-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Add helper to enable, disable and check the enabled status of a VKMS device and add a test to ensure that the default value is correctly set. Signed-off-by: José Expósito --- lib/igt_vkms.c | 98 ++++++++++++++++++++++++++++++++++++++ lib/igt_vkms.h | 7 +++ tests/vkms/vkms_configfs.c | 18 +++++++ 3 files changed, 123 insertions(+) diff --git a/lib/igt_vkms.c b/lib/igt_vkms.c index fa41f741e..1fd00afd7 100644 --- a/lib/igt_vkms.c +++ b/lib/igt_vkms.c @@ -7,7 +7,12 @@ #include #include +#include +#include +#include +#include #include +#include #include #include @@ -17,6 +22,7 @@ #include "igt_vkms.h" #define VKMS_ROOT_DIR_NAME "vkms" +#define VKMS_FILE_ENABLED "enabled" /** * SECTION:igt_vkms @@ -47,6 +53,50 @@ static const char *mount_vkms_configfs(void) return vkms_root_path; } +static int read_int(const char *path) +{ + FILE *file; + int value; + int ret; + + file = fopen(path, "r"); + igt_assert_f(file, "Error opening '%s'\n", path); + + ret = fscanf(file, "%d", &value); + fclose(file); + igt_assert_f(ret == 1, "Error reading integer from '%s'\n", path); + + return value; +} + +static bool read_bool(const char *path) +{ + int ret; + + ret = read_int(path); + + return !!ret; +} + +static void write_int(const char *path, int value) +{ + FILE *file; + int ret; + + file = fopen(path, "w"); + igt_assert_f(file, "Error opening '%s'\n", path); + + ret = fprintf(file, "%d", value); + igt_assert_f(ret >= 0, "Error writing to '%s'\n", path); + + fclose(file); +} + +static void write_bool(const char *path, bool value) +{ + write_int(path, value ? 1 : 0); +} + /** * igt_require_vkms_configfs: * @@ -65,6 +115,22 @@ void igt_require_vkms_configfs(void) closedir(dir); } +/** + * igt_vkms_get_device_enabled_path: + * @dev: Device to get the enabled path from + * @path: Output path + * @len: Maximum @path length + * + * Returns the device "enabled" file path. + */ +void igt_vkms_get_device_enabled_path(igt_vkms_t *dev, char *path, size_t len) +{ + int ret; + + ret = snprintf(path, len, "%s/%s", dev->path, VKMS_FILE_ENABLED); + igt_assert(ret >= 0 && ret < len); +} + /** * igt_vkms_device_create: * @name: VKMS device name @@ -167,6 +233,8 @@ void igt_vkms_device_destroy(igt_vkms_t *dev) igt_assert(dev); + igt_vkms_device_set_enabled(dev, false); + ret = remove_device_dir(dev); igt_assert_f(ret == 0, "Unable to rmdir device directory '%s'. Got errno=%d (%s)\n", @@ -205,3 +273,33 @@ void igt_vkms_destroy_all_devices(void) closedir(dir); } + +/** + * igt_vkms_device_is_enabled: + * @dev: The device to check + * + * Indicate whether a VKMS device is enabled or not. + */ +bool igt_vkms_device_is_enabled(igt_vkms_t *dev) +{ + char path[PATH_MAX]; + + igt_vkms_get_device_enabled_path(dev, path, sizeof(path)); + + return read_bool(path); +} + +/** + * igt_vkms_device_set_enabled: + * @dev: Device to enable or disable + * + * Enable or disable a VKMS device. + */ +void igt_vkms_device_set_enabled(igt_vkms_t *dev, bool enabled) +{ + char path[PATH_MAX]; + + igt_vkms_get_device_enabled_path(dev, path, sizeof(path)); + + write_bool(path, enabled); +} diff --git a/lib/igt_vkms.h b/lib/igt_vkms.h index 48c48f296..d3741b6ee 100644 --- a/lib/igt_vkms.h +++ b/lib/igt_vkms.h @@ -8,6 +8,8 @@ #ifndef __IGT_VKMS_H__ #define __IGT_VKMS_H__ +#include + /** * igt_vkms_t: * @path: VKMS root directory inside configfs mounted directory @@ -20,8 +22,13 @@ typedef struct igt_vkms { void igt_require_vkms_configfs(void); +void igt_vkms_get_device_enabled_path(igt_vkms_t *dev, char *path, size_t len); + igt_vkms_t *igt_vkms_device_create(const char *name); void igt_vkms_device_destroy(igt_vkms_t *dev); void igt_vkms_destroy_all_devices(void); +bool igt_vkms_device_is_enabled(igt_vkms_t *dev); +void igt_vkms_device_set_enabled(igt_vkms_t *dev, bool enabled); + #endif /* __IGT_VKMS_H__ */ diff --git a/tests/vkms/vkms_configfs.c b/tests/vkms/vkms_configfs.c index b942cec64..aa7cd9e4e 100644 --- a/tests/vkms/vkms_configfs.c +++ b/tests/vkms/vkms_configfs.c @@ -103,6 +103,23 @@ static void test_device_default_files(void) igt_vkms_device_destroy(dev); } +/** + * SUBTEST: device-default-values + * Description: Check that the default values for the device are correct. + */ + +static void test_device_default_values(void) +{ + igt_vkms_t *dev; + + dev = igt_vkms_device_create(__func__); + igt_assert(dev); + + igt_assert(!igt_vkms_device_is_enabled(dev)); + + igt_vkms_device_destroy(dev); +} + igt_main { struct { @@ -110,6 +127,7 @@ igt_main void (*fn)(void); } tests[] = { { "device-default-files", test_device_default_files }, + { "device-default-values", test_device_default_values }, }; igt_fixture { -- 2.48.1