raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

selftests/bpf: no need to track next_match_pos in struct test_loader

Browse Source 
The call stack for validate_case() function looks as follows:
- test_loader__run_subtests()
  - process_subtest()
    - run_subtest()
      - prepare_case(), which does 'tester->next_match_pos = 0';
      - validate_case(), which increments tester->next_match_pos.

Hence, each subtest is run with next_match_pos freshly set to zero.
Meaning that there is no need to persist this variable in the
struct test_loader, use local variable instead.

Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20240722233844.1406874-7-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
This commit is contained in:
Eduard Zingerman
2024-07-22 16:38:40 -07:00
committed by Andrii Nakryiko
parent 203e6aba76
commit 4ef5d6af49
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/testing/selftests/bpf/test_loader.c
View File

@@ -434,7 +434,6 @@ static void prepare_case(struct test_loader *tester,
bpf_program__set_flags(prog, prog_flags | spec->prog_flags); bpf_program__set_flags(prog, prog_flags | spec->prog_flags);
tester->log_buf[0] = '\0'; tester->log_buf[0] = '\0';
tester->next_match_pos = 0;
} }
static void emit_verifier_log(const char *log_buf, bool force) static void emit_verifier_log(const char *log_buf, bool force)
@@ -450,25 +449,23 @@ static void validate_case(struct test_loader *tester,
struct bpf_program *prog, struct bpf_program *prog,
int load_err) int load_err)
{ {
int i, j, err;
char *match;
regmatch_t reg_match[1]; regmatch_t reg_match[1];
const char *log = tester->log_buf;
int i, j, err;
for (i = 0; i < subspec->expect_msg_cnt; i++) { for (i = 0; i < subspec->expect_msg_cnt; i++) {
struct expect_msg *msg = &subspec->expect_msgs[i]; struct expect_msg *msg = &subspec->expect_msgs[i];
const char *match = NULL;
if (msg->substr) { if (msg->substr) {
match = strstr(tester->log_buf + tester->next_match_pos, msg->substr); match = strstr(log, msg->substr);
if (match) if (match)
tester->next_match_pos = match - tester->log_buf + strlen(msg->substr); log += strlen(msg->substr);
} else { } else {
err = regexec(&msg->regex, err = regexec(&msg->regex, log, 1, reg_match, 0);
tester->log_buf + tester->next_match_pos, 1, reg_match, 0);
if (err == 0) { if (err == 0) {
match = tester->log_buf + tester->next_match_pos + reg_match[0].rm_so; match = log + reg_match[0].rm_so;
tester->next_match_pos += reg_match[0].rm_eo; log += reg_match[0].rm_eo;
} else {
match = NULL;
} }
} }

1
tools/testing/selftests/bpf/test_progs.h
View File

@@ -447,7 +447,6 @@ typedef int (*pre_execution_cb)(struct bpf_object *obj);
struct test_loader { struct test_loader {
char *log_buf; char *log_buf;
size_t log_buf_sz; size_t log_buf_sz;
size_t next_match_pos;
pre_execution_cb pre_execution_cb; pre_execution_cb pre_execution_cb;
struct bpf_object *obj; struct bpf_object *obj;