[PATCH i-g-t v4 1/5] lib/igt_sysfs: Usage of Original debug mask to read/reset

[Sokolowski, Jan]

> -----Original Message-----
> From: igt-dev <igt-dev-bounces at lists.freedesktop.org> On Behalf Of Pranay
> Samala
> Sent: Wednesday, June 4, 2025 7:31 AM
> To: igt-dev at lists.freedesktop.org
> Cc: B S, Karthik <karthik.b.s at intel.com>; Joshi, Kunal1
> <kunal1.joshi at intel.com>; Lattannavar, Sameer
> <sameer.lattannavar at intel.com>; Samala, Pranay
> <pranay.samala at intel.com>
> Subject: [PATCH i-g-t v4 1/5] lib/igt_sysfs: Usage of Original debug mask to
> read/reset
> 
> Original debug mask holds the mask before the test and will be
> used to reset the debug mask post test.

Patch subject and description are in my opinion strangely worded,
especially as this patch doesn't change anything else.

I think it would be better to phrase it something like this:

"
lib/igt_sysfs: Rename log_level to saved_drm_debug_mask

Rename log_level variable to properly reflect what this
variable will be used for.
"

Other than that, lgtm for this and the rest in the series, just fix that.

Reviewed-by: Jan Sokolowski <jan.sokolowski at intel.com>

> 
> v3:
> - Refactored for readability and address logical comment.
> 
> v4:
> - Improve variable name for debug mask saving (Kunal)
> 
> Fixes: 56b91193b825 ("lib/igt_sysfs: Implement dynamic adjustment of
> debug log level")
> Signed-off-by: Pranay Samala <pranay.samala at intel.com>
> ---
>  lib/igt_sysfs.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
> index 2ba96ca7f..b7ca1f2b6 100644
> --- a/lib/igt_sysfs.c
> +++ b/lib/igt_sysfs.c
> @@ -443,7 +443,7 @@ int igt_sysfs_drm_module_params_open(void)
>  	return open(path, O_RDONLY);
>  }
> 
> -static int log_level = -1;
> +static int saved_drm_debug_mask = -1;
> 
>  /**
>   * igt_drm_debug_level_get:
> @@ -458,8 +458,8 @@ int igt_drm_debug_level_get(int dir)
>  {
>  	char buf[20];
> 
> -	if (log_level >= 0)
> -		return log_level;
> +	if (saved_drm_debug_mask >= 0)
> +		return saved_drm_debug_mask;
> 
>  	if (igt_sysfs_read(dir, "debug", buf, sizeof(buf) - 1) < 0)
>  		return -1;
> @@ -479,15 +479,15 @@ void igt_drm_debug_level_reset(void)
>  	char buf[20];
>  	int dir;
> 
> -	if (log_level < 0)
> +	if (saved_drm_debug_mask < 0)
>  		return;
> 
>  	dir = igt_sysfs_drm_module_params_open();
>  	if (dir < 0)
>  		return;
> 
> -	igt_debug("Resetting DRM debug level to %d\n", log_level);
> -	snprintf(buf, sizeof(buf), "%d", log_level);
> +	igt_debug("Resetting DRM debug level to %d\n",
> saved_drm_debug_mask);
> +	snprintf(buf, sizeof(buf), "%d", saved_drm_debug_mask);
>  	igt_assert(igt_sysfs_set(dir, "debug", buf));
> 
>  	close(dir);
> @@ -513,8 +513,8 @@ void igt_drm_debug_level_update(unsigned int
> new_log_level)
>  	if (dir < 0)
>  		return;
> 
> -	log_level = igt_drm_debug_level_get(dir);
> -	if (log_level < 0) {
> +	saved_drm_debug_mask = igt_drm_debug_level_get(dir);
> +	if (saved_drm_debug_mask < 0) {
>  		close(dir);
>  		return;
>  	}
> --
> 2.34.1