Commit 4ef5d6af authored by Eduard Zingerman's avatar Eduard Zingerman Committed by Andrii Nakryiko
Browse files

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



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: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarEduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20240722233844.1406874-7-eddyz87@gmail.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parent 203e6aba

tools/testing/selftests/bpf/test_loader.c

+8 −11
Original line number Diff line number Diff line
@@ -434,7 +434,6 @@ static void prepare_case(struct test_loader *tester, 
	bpf_program__set_flags(prog, prog_flags | spec->prog_flags);



	tester->log_buf[0] = '\0';

	tester->next_match_pos = 0;

}



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,

			  int load_err)

{

	int i, j, err;

	char *match;

	regmatch_t reg_match[1];

	const char *log = tester->log_buf;

	int i, j, err;



	for (i = 0; i < subspec->expect_msg_cnt; i++) {

		struct expect_msg *msg = &subspec->expect_msgs[i];

		const char *match = NULL;



		if (msg->substr) {

			match = strstr(tester->log_buf + tester->next_match_pos, msg->substr);

			match = strstr(log, msg->substr);

			if (match)

				tester->next_match_pos = match - tester->log_buf + strlen(msg->substr);

				log += strlen(msg->substr);

		} else {

			err = regexec(&msg->regex,

				      tester->log_buf + tester->next_match_pos, 1, reg_match, 0);

			err = regexec(&msg->regex, log, 1, reg_match, 0);

			if (err == 0) {

				match = tester->log_buf + tester->next_match_pos + reg_match[0].rm_so;

				tester->next_match_pos += reg_match[0].rm_eo;

			} else {

				match = NULL;

				match = log + reg_match[0].rm_so;

				log += reg_match[0].rm_eo;

			}

		}

tools/testing/selftests/bpf/test_progs.h

+0 −1
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ typedef int (*pre_execution_cb)(struct bpf_object *obj); 
struct test_loader {

	char *log_buf;

	size_t log_buf_sz;

	size_t next_match_pos;

	pre_execution_cb pre_execution_cb;



	struct bpf_object *obj;