From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E28D6539A for ; Tue, 26 Nov 2024 07:22:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732605748; cv=none; b=rOREK1QZgQw6m9rUtMXNGzKk1+/apoIXpxDYveeCfAHxCoNX5kF9WnE8UYoQXkhsKm7RGbdvLct3r0tsRSBtr72pi47T9Y+mTMHo2HLqhLqV8+5XeKXv5BI5G1vHrL7vfxTNwE8rOefvatDaLaFzLpawgK5oBCEqlzs7w+sLSG8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732605748; c=relaxed/simple; bh=eqBK1Hs1Jo2nK32bCbEego9Z3Zb1nSa+gfn7imfBJWs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Espac4Vi1TWoxAUSKrPsPICBb4lbHgZr63SCAtxLi3PVKvfvjOWaFYtvYKfmRMT4TMlaEXCLb+A9Yusmw2Wi5GCHiTXlxKf2puChbnyqVbUsqqkGxuBzJfsFCXazZh7ymxeToWHBD6NdksOIexnl8AAzZznEwxhMFnK6TJapeao= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=Vpdevecd; arc=none smtp.client-ip=209.85.221.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="Vpdevecd" Received: by mail-wr1-f65.google.com with SMTP id ffacd0b85a97d-3825a721ae5so2905922f8f.1 for ; Mon, 25 Nov 2024 23:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1732605744; x=1733210544; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XQkbYyjC1yWb+bviVhbmPJ6jBvqdJtWkOLZMAzGxdAI=; b=Vpdevecdr8seMxCN+g8hOiQ6QUZLintP4ojpaIq2Y3d517FOOoAC89goICNbQePVZx m3rPDJN8K1Wo3fCp8YBWBhEvhpq1fyIaU5fFF65HZESEKZM05tynJDs81fGo9HxsZ/7k b0sTc57T2GYubg4LA77Fn7kWBacoNChi/N7yaeuP8+X8vlaN3Ef5c2GMEzKKLPWXeSl9 ZU+ZbHkOvGXxY9EBJ5RUxONYAo7TXSbhhqfihZMbS9sm8JYIqFGUzCcrnQY5GUlH40qz 1CWfzj+7bjs4nf/4pb3Gcm37Oh9F3Y6axnQGoMK1S+b57MJd5/HsNsui0zQFKrZwNUJp POwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732605744; x=1733210544; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XQkbYyjC1yWb+bviVhbmPJ6jBvqdJtWkOLZMAzGxdAI=; b=p7TcqBuhvV7Ub2s5QDyPMzkkZWKwx9ltE7/anM1OtwTJt6QV48S0emIJx71SDMjHIJ aJhzTTBbtuYtDv0tUXeVZTwrsbirJ7HyjaVyXoX/raYd1lG6Dxa10vuqC3Nb2iN15fAW 4pYukNTMK86ZgDBqtsq3XsoRyYaNvWhAKKQfq8M7QJW2pEtpPhzky8jmSXIzPANT7NRw 0vredl+a9cUzimTln8hMG6r45oZoDnedvjSoys8oLayoMQUyMHk3PmxUnB4buL2mrqGc FIwjyzObfAAezDBAUerH/PLWLq4mq9Tqv+KYB9ScSFPmYUhDQJ1XWYrBMDHwMKxgASS/ /Ipg== X-Gm-Message-State: AOJu0YwE3tYC6dHZ7EaL0shTwOR3zQ5uR+EorhC+eQVqQjd4yon7ABCp qDaNoRFiKAGhBvMoT87F7Mu9Twt1wAyY8/mqvI34XYUXbwh2aFRt19l+F1BXzL+J3U6XIRlQN4+ W4fpi4ysU9H4= X-Gm-Gg: ASbGncu5lwuropGRjdRySwBHx4nxhCilMdTgbkB3vbs9y2czUVQp7iinsGZO1a1wQX7 H/5WLD8ABReulWP755CqqDRnWmVbg2CrfCA0P7gk5l0tRiFWwTZCMuDBMRDD9QUiKBqvWH3NxgS Y805AjvN1D9TdeU0SfNWMaRLdjZD3MXGBxkK7ljU1SYVS1rFYQimrn0joxtrT26q7VwxJKqI9f2 OvRQ/9Jzhj1A8ReiQC86SldJcHzyO6dTpWbhWtEgVQZd1yrMZ4= X-Google-Smtp-Source: AGHT+IEas/CMTz7xs1WIco+vk+DpIc6Bc3nhtLND5O4tvvFQ6UN3QPnl216Ydk7JfP8MlGR6xmvlpQ== X-Received: by 2002:a05:6000:402c:b0:37d:460d:2d07 with SMTP id ffacd0b85a97d-385bfae861fmr1393161f8f.10.1732605744110; Mon, 25 Nov 2024 23:22:24 -0800 (PST) Received: from localhost ([2401:e180:8891:cc8b:6df8:da33:1f62:8cc]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7fbcc40143esm7965439a12.80.2024.11.25.23.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2024 23:22:23 -0800 (PST) From: Shung-Hsi Yu To: stable@vger.kernel.org Cc: Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann , Hao Luo , Shung-Hsi Yu , Eduard Zingerman , Hou Tao , Cupertino Miranda Subject: [PATCH stable 6.6 7/8] selftests/bpf: extract test_loader->expect_msgs as a data structure Date: Tue, 26 Nov 2024 15:21:29 +0800 Message-ID: <20241126072137.823699-8-shung-hsi.yu@suse.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241126072137.823699-1-shung-hsi.yu@suse.com> References: <20241126072137.823699-1-shung-hsi.yu@suse.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Eduard Zingerman [ Upstream commit 64f01e935ddb26f48baec71883c27878ac4231dc ] Non-functional change: use a separate data structure to represented expected messages in test_loader. This would allow to use the same functionality for expected set of disassembled instructions in the follow-up commit. Acked-by: Andrii Nakryiko Signed-off-by: Eduard Zingerman Link: https://lore.kernel.org/r/20240722233844.1406874-8-eddyz87@gmail.com Signed-off-by: Alexei Starovoitov Signed-off-by: Andrii Nakryiko Signed-off-by: Shung-Hsi Yu --- tools/testing/selftests/bpf/test_loader.c | 81 ++++++++++++----------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/bpf/test_loader.c b/tools/testing/selftests/bpf/test_loader.c index 226fca524516..a66745e9cf8d 100644 --- a/tools/testing/selftests/bpf/test_loader.c +++ b/tools/testing/selftests/bpf/test_loader.c @@ -54,11 +54,15 @@ struct expect_msg { regex_t regex; }; +struct expected_msgs { + struct expect_msg *patterns; + size_t cnt; +}; + struct test_subspec { char *name; bool expect_failure; - struct expect_msg *expect_msgs; - size_t expect_msg_cnt; + struct expected_msgs expect_msgs; int retval; bool execute; }; @@ -94,44 +98,45 @@ void test_loader_fini(struct test_loader *tester) free(tester->log_buf); } -static void free_test_spec(struct test_spec *spec) +static void free_msgs(struct expected_msgs *msgs) { int i; + for (i = 0; i < msgs->cnt; i++) + if (msgs->patterns[i].regex_str) + regfree(&msgs->patterns[i].regex); + free(msgs->patterns); + msgs->patterns = NULL; + msgs->cnt = 0; +} + +static void free_test_spec(struct test_spec *spec) +{ /* Deallocate expect_msgs arrays. */ - for (i = 0; i < spec->priv.expect_msg_cnt; i++) - if (spec->priv.expect_msgs[i].regex_str) - regfree(&spec->priv.expect_msgs[i].regex); - for (i = 0; i < spec->unpriv.expect_msg_cnt; i++) - if (spec->unpriv.expect_msgs[i].regex_str) - regfree(&spec->unpriv.expect_msgs[i].regex); + free_msgs(&spec->priv.expect_msgs); + free_msgs(&spec->unpriv.expect_msgs); free(spec->priv.name); free(spec->unpriv.name); - free(spec->priv.expect_msgs); - free(spec->unpriv.expect_msgs); - spec->priv.name = NULL; spec->unpriv.name = NULL; - spec->priv.expect_msgs = NULL; - spec->unpriv.expect_msgs = NULL; } -static int push_msg(const char *substr, const char *regex_str, struct test_subspec *subspec) +static int push_msg(const char *substr, const char *regex_str, struct expected_msgs *msgs) { void *tmp; int regcomp_res; char error_msg[100]; struct expect_msg *msg; - tmp = realloc(subspec->expect_msgs, - (1 + subspec->expect_msg_cnt) * sizeof(struct expect_msg)); + tmp = realloc(msgs->patterns, + (1 + msgs->cnt) * sizeof(struct expect_msg)); if (!tmp) { ASSERT_FAIL("failed to realloc memory for messages\n"); return -ENOMEM; } - subspec->expect_msgs = tmp; - msg = &subspec->expect_msgs[subspec->expect_msg_cnt]; + msgs->patterns = tmp; + msg = &msgs->patterns[msgs->cnt]; if (substr) { msg->substr = substr; @@ -148,7 +153,7 @@ static int push_msg(const char *substr, const char *regex_str, struct test_subsp } } - subspec->expect_msg_cnt += 1; + msgs->cnt += 1; return 0; } @@ -260,25 +265,25 @@ static int parse_test_spec(struct test_loader *tester, spec->mode_mask |= UNPRIV; } else if (str_has_pfx(s, TEST_TAG_EXPECT_MSG_PFX)) { msg = s + sizeof(TEST_TAG_EXPECT_MSG_PFX) - 1; - err = push_msg(msg, NULL, &spec->priv); + err = push_msg(msg, NULL, &spec->priv.expect_msgs); if (err) goto cleanup; spec->mode_mask |= PRIV; } else if (str_has_pfx(s, TEST_TAG_EXPECT_MSG_PFX_UNPRIV)) { msg = s + sizeof(TEST_TAG_EXPECT_MSG_PFX_UNPRIV) - 1; - err = push_msg(msg, NULL, &spec->unpriv); + err = push_msg(msg, NULL, &spec->unpriv.expect_msgs); if (err) goto cleanup; spec->mode_mask |= UNPRIV; } else if (str_has_pfx(s, TEST_TAG_EXPECT_REGEX_PFX)) { msg = s + sizeof(TEST_TAG_EXPECT_REGEX_PFX) - 1; - err = push_msg(NULL, msg, &spec->priv); + err = push_msg(NULL, msg, &spec->priv.expect_msgs); if (err) goto cleanup; spec->mode_mask |= PRIV; } else if (str_has_pfx(s, TEST_TAG_EXPECT_REGEX_PFX_UNPRIV)) { msg = s + sizeof(TEST_TAG_EXPECT_REGEX_PFX_UNPRIV) - 1; - err = push_msg(NULL, msg, &spec->unpriv); + err = push_msg(NULL, msg, &spec->unpriv.expect_msgs); if (err) goto cleanup; spec->mode_mask |= UNPRIV; @@ -366,11 +371,12 @@ static int parse_test_spec(struct test_loader *tester, spec->unpriv.execute = spec->priv.execute; } - if (!spec->unpriv.expect_msgs) { - for (i = 0; i < spec->priv.expect_msg_cnt; i++) { - struct expect_msg *msg = &spec->priv.expect_msgs[i]; + if (spec->unpriv.expect_msgs.cnt == 0) { + for (i = 0; i < spec->priv.expect_msgs.cnt; i++) { + struct expect_msg *msg = &spec->priv.expect_msgs.patterns[i]; - err = push_msg(msg->substr, msg->regex_str, &spec->unpriv); + err = push_msg(msg->substr, msg->regex_str, + &spec->unpriv.expect_msgs); if (err) goto cleanup; } @@ -422,18 +428,14 @@ static void emit_verifier_log(const char *log_buf, bool force) fprintf(stdout, "VERIFIER LOG:\n=============\n%s=============\n", log_buf); } -static void validate_case(struct test_loader *tester, - struct test_subspec *subspec, - struct bpf_object *obj, - struct bpf_program *prog, - int load_err) +static void validate_msgs(char *log_buf, struct expected_msgs *msgs) { regmatch_t reg_match[1]; - const char *log = tester->log_buf; + const char *log = log_buf; int i, j, err; - for (i = 0; i < subspec->expect_msg_cnt; i++) { - struct expect_msg *msg = &subspec->expect_msgs[i]; + for (i = 0; i < msgs->cnt; i++) { + struct expect_msg *msg = &msgs->patterns[i]; const char *match = NULL; if (msg->substr) { @@ -450,9 +452,9 @@ static void validate_case(struct test_loader *tester, if (!ASSERT_OK_PTR(match, "expect_msg")) { if (env.verbosity == VERBOSE_NONE) - emit_verifier_log(tester->log_buf, true /*force*/); + emit_verifier_log(log_buf, true /*force*/); for (j = 0; j <= i; j++) { - msg = &subspec->expect_msgs[j]; + msg = &msgs->patterns[j]; fprintf(stderr, "%s %s: '%s'\n", j < i ? "MATCHED " : "EXPECTED", msg->substr ? "SUBSTR" : " REGEX", @@ -664,9 +666,8 @@ void run_subtest(struct test_loader *tester, goto tobj_cleanup; } } - emit_verifier_log(tester->log_buf, false /*force*/); - validate_case(tester, subspec, tobj, tprog, err); + validate_msgs(tester->log_buf, &subspec->expect_msgs); if (should_do_test_run(spec, subspec)) { /* For some reason test_verifier executes programs -- 2.47.0