Skip to content

Commit f8846a1

Browse files
captain5050acmel
authored andcommitted
tools api fs: Avoid reading whole file for a 1 byte bool
sysfs__read_bool() used the first byte from a fully read file into a string. It then looked at the first byte's value. Avoid doing this and just read the first byte. Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com> Cc: Changbin Du <changbin.du@huawei.com> Cc: Colin Ian King <colin.i.king@gmail.com> Cc: Dmitrii Dolgov <9erthalion6@gmail.com> Cc: German Gomez <german.gomez@arm.com> Cc: Guilherme Amadio <amadio@gentoo.org> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: K Prateek Nayak <kprateek.nayak@amd.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Li Dong <lidong@vivo.com> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Ming Wang <wangming01@loongson.cn> Cc: Nick Terrell <terrelln@fb.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@amd.com> Cc: Sandipan Das <sandipan.das@amd.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Steinar H. Gunderson <sesse@google.com> Cc: Vincent Whitchurch <vincent.whitchurch@axis.com> Cc: Wenyu Liu <liuwenyu7@huawei.com> Cc: Yang Jihong <yangjihong1@huawei.com> Link: https://lore.kernel.org/r/20231127220902.1315692-6-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent b6a1526 commit f8846a1

File tree

1 file changed

+15
-9
lines changed
  • tools/lib/api/fs

1 file changed

+15
-9
lines changed

tools/lib/api/fs/fs.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -447,15 +447,22 @@ int sysfs__read_str(const char *entry, char **buf, size_t *sizep)
447447

448448
int sysfs__read_bool(const char *entry, bool *value)
449449
{
450-
char *buf;
451-
size_t size;
452-
int ret;
450+
struct io io;
451+
char bf[16];
452+
int ret = 0;
453+
char path[PATH_MAX];
454+
const char *sysfs = sysfs__mountpoint();
455+
456+
if (!sysfs)
457+
return -1;
453458

454-
ret = sysfs__read_str(entry, &buf, &size);
455-
if (ret < 0)
456-
return ret;
459+
snprintf(path, sizeof(path), "%s/%s", sysfs, entry);
460+
io.fd = open(path, O_RDONLY);
461+
if (io.fd < 0)
462+
return -errno;
457463

458-
switch (buf[0]) {
464+
io__init(&io, io.fd, bf, sizeof(bf));
465+
switch (io__get_char(&io)) {
459466
case '1':
460467
case 'y':
461468
case 'Y':
@@ -469,8 +476,7 @@ int sysfs__read_bool(const char *entry, bool *value)
469476
default:
470477
ret = -1;
471478
}
472-
473-
free(buf);
479+
close(io.fd);
474480

475481
return ret;
476482
}

0 commit comments

Comments
 (0)