From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH i-g-t v2] lib/igt_sysfs: make sure to write empty strings
Date: Wed, 31 Jan 2024 19:11:56 -0800 [thread overview]
Message-ID: <20240201031156.352973-1-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20240201005115.352192-3-lucas.demarchi@intel.com>
echo -n "" > /sys/module/<modulename>/parameters/<param>
doesn't really work as it will just create a open() + close() expecting
the file to be truncated. The same issue happens with igt as it will
stop writing when there are 0 chars to write. Special case the empty
string so it always write a '\0' and make sure igt_sysfs_set() accounts
for the extra null char.
Shell example:
# echo -n "/foo" > /sys/module/firmware_class/parameters/path
# cat /sys/module/firmware_class/parameters/path
/foo
# echo -n "" > /sys/module/firmware_class/parameters/path
/foo
# # make sure to actually write a \0:
echo -ne "\0" > /sys/module/firmware_class/parameters/path
# cat /sys/module/firmware_class/parameters/path
/foo
Same thing happens when testing igt_sysfs_set():
int dirfd = open("/sys/module/firmware_class/parameters", O_RDONLY);
igt_sysfs_set(dirfd, "path", "");
Previously it was not really setting the param.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
lib/igt_sysfs.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
index 567b4f6d5..64c2aaabb 100644
--- a/lib/igt_sysfs.c
+++ b/lib/igt_sysfs.c
@@ -406,7 +406,7 @@ int igt_sysfs_read(int dir, const char *attr, void *data, int len)
*/
bool igt_sysfs_set(int dir, const char *attr, const char *value)
{
- int len = strlen(value);
+ int len = strlen(value) + 1;
return igt_sysfs_write(dir, attr, value, len) == len;
}
@@ -513,8 +513,16 @@ int igt_sysfs_vprintf(int dir, const char *attr, const char *fmt, va_list ap)
return -errno;
va_copy(tmp, ap);
- ret = vsnprintf(buf, sizeof(stack), fmt, tmp);
+ ret = vsnprintf(stack, sizeof(stack), fmt, tmp);
va_end(tmp);
+
+ /*
+ * make sure to always issue a write() syscall, even if writing an empty string,
+ * otherwise values in sysfs like module parameters don't really get overwritten
+ */
+ if (igt_debug_on(ret == 0))
+ return igt_writen(fd, "", 1);
+
if (igt_debug_on(ret < 0))
return -EINVAL;
--
2.43.0
next prev parent reply other threads:[~2024-02-01 3:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-01 0:50 [PATCH i-g-t 0/3] igt_kmod and sysfs fixes Lucas De Marchi
2024-02-01 0:50 ` [PATCH i-g-t 1/3] lib/igt_kmod: stop using KMOD_REMOVE_FORCE Lucas De Marchi
2024-02-01 13:05 ` Kamil Konieczny
2024-02-01 14:03 ` Lucas De Marchi
2024-02-06 17:27 ` Kamil Konieczny
2024-02-01 0:50 ` [PATCH i-g-t 2/3] lib/igt_sysfs: make sure to write empty strings Lucas De Marchi
2024-02-01 3:11 ` Lucas De Marchi [this message]
2024-02-01 13:12 ` [PATCH i-g-t v2] " Kamil Konieczny
2024-02-01 13:59 ` Lucas De Marchi
2024-02-07 16:18 ` Kamil Konieczny
2024-02-07 16:46 ` Lucas De Marchi
2024-02-01 13:15 ` [PATCH i-g-t 2/3] " Janusz Krzysztofik
2024-02-01 13:51 ` Lucas De Marchi
2024-02-06 15:25 ` Janusz Krzysztofik
2024-02-06 17:13 ` Lucas De Marchi
2024-02-07 10:09 ` Janusz Krzysztofik
2024-02-01 0:50 ` [PATCH i-g-t 3/3] lib/igt_sysfs: Fix dir fd documentation Lucas De Marchi
2024-02-01 13:05 ` Kamil Konieczny
2024-02-01 2:56 ` ✗ Fi.CI.BAT: failure for igt_kmod and sysfs fixes Patchwork
2024-02-01 3:08 ` ✗ CI.xeBAT: " Patchwork
2024-02-01 3:41 ` ✗ CI.xeBAT: failure for igt_kmod and sysfs fixes (rev2) Patchwork
2024-02-01 4:05 ` ✗ Fi.CI.BAT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240201031156.352973-1-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox