From: Jordan Rife <jrife@google.com>
To: bpf@vger.kernel.org
Cc: Jordan Rife <jrife@google.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Eduard Zingerman <eddyz87@gmail.com>, Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Mykola Lysenko <mykolal@fb.com>,
Shuah Khan <shuah@kernel.org>,
Geliang Tang <tanggeliang@kylinos.cn>,
Daan De Meyer <daan.j.demeyer@gmail.com>,
Shung-Hsi Yu <shung-hsi.yu@suse.com>,
linux-kselftest@vger.kernel.org
Subject: [PATCH v1 bpf-next 02/17] selftests/bpf: Use program name for skel load/destroy functions
Date: Fri, 10 May 2024 14:02:19 -0500 [thread overview]
Message-ID: <20240510190246.3247730-3-jrife@google.com> (raw)
In-Reply-To: <20240510190246.3247730-1-jrife@google.com>
In preparation to migrate tests from bpf/test_sock_addr.c to
sock_addr.c, update BPF_SKEL_FUNCS so that it generates functions
based on prog_name instead of skel_name. This allows us to differentiate
between programs in the same skeleton.
Signed-off-by: Jordan Rife <jrife@google.com>
---
.../selftests/bpf/prog_tests/sock_addr.c | 96 ++++++++++---------
1 file changed, 50 insertions(+), 46 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/sock_addr.c b/tools/testing/selftests/bpf/prog_tests/sock_addr.c
index 9c709c33f8899..039c3e38e1bc2 100644
--- a/tools/testing/selftests/bpf/prog_tests/sock_addr.c
+++ b/tools/testing/selftests/bpf/prog_tests/sock_addr.c
@@ -357,7 +357,7 @@ struct sock_addr_test {
};
#define BPF_SKEL_FUNCS(skel_name, prog_name) \
-static void *skel_name##_load(int cgroup_fd) \
+static void *prog_name##_load(int cgroup_fd) \
{ \
struct skel_name *skel; \
skel = skel_name##__open_and_load(); \
@@ -372,7 +372,7 @@ cleanup: \
skel_name##__destroy(skel); \
return NULL; \
} \
-static void skel_name##_destroy(void *skel) \
+static void prog_name##_destroy(void *skel) \
{ \
skel_name##__destroy(skel); \
}
@@ -396,8 +396,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_BIND,
"bind4: bind (stream)",
- bind4_prog_load,
- bind4_prog_destroy,
+ bind_v4_prog_load,
+ bind_v4_prog_destroy,
&user_ops,
AF_INET,
SOCK_STREAM,
@@ -405,12 +405,13 @@ static struct sock_addr_test tests[] = {
SERV4_PORT,
SERV4_REWRITE_IP,
SERV4_REWRITE_PORT,
+ NULL,
},
{
SOCK_ADDR_TEST_BIND,
"bind4: bind (dgram)",
- bind4_prog_load,
- bind4_prog_destroy,
+ bind_v4_prog_load,
+ bind_v4_prog_destroy,
&user_ops,
AF_INET,
SOCK_DGRAM,
@@ -418,12 +419,13 @@ static struct sock_addr_test tests[] = {
SERV4_PORT,
SERV4_REWRITE_IP,
SERV4_REWRITE_PORT,
+ NULL,
},
{
SOCK_ADDR_TEST_BIND,
"bind6: bind (stream)",
- bind6_prog_load,
- bind6_prog_destroy,
+ bind_v6_prog_load,
+ bind_v6_prog_destroy,
&user_ops,
AF_INET6,
SOCK_STREAM,
@@ -431,12 +433,13 @@ static struct sock_addr_test tests[] = {
SERV6_PORT,
SERV6_REWRITE_IP,
SERV6_REWRITE_PORT,
+ NULL,
},
{
SOCK_ADDR_TEST_BIND,
"bind6: bind (dgram)",
- bind6_prog_load,
- bind6_prog_destroy,
+ bind_v6_prog_load,
+ bind_v6_prog_destroy,
&user_ops,
AF_INET6,
SOCK_DGRAM,
@@ -444,14 +447,15 @@ static struct sock_addr_test tests[] = {
SERV6_PORT,
SERV6_REWRITE_IP,
SERV6_REWRITE_PORT,
+ NULL,
},
/* bind - kernel calls */
{
SOCK_ADDR_TEST_BIND,
"bind4: kernel_bind (stream)",
- bind4_prog_load,
- bind4_prog_destroy,
+ bind_v4_prog_load,
+ bind_v4_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET,
SOCK_STREAM,
@@ -463,8 +467,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_BIND,
"bind4: kernel_bind (dgram)",
- bind4_prog_load,
- bind4_prog_destroy,
+ bind_v4_prog_load,
+ bind_v4_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET,
SOCK_DGRAM,
@@ -476,8 +480,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_BIND,
"bind6: kernel_bind (stream)",
- bind6_prog_load,
- bind6_prog_destroy,
+ bind_v6_prog_load,
+ bind_v6_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET6,
SOCK_STREAM,
@@ -489,8 +493,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_BIND,
"bind6: kernel_bind (dgram)",
- bind6_prog_load,
- bind6_prog_destroy,
+ bind_v6_prog_load,
+ bind_v6_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET6,
SOCK_DGRAM,
@@ -504,8 +508,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect4: connect (stream)",
- connect4_prog_load,
- connect4_prog_destroy,
+ connect_v4_prog_load,
+ connect_v4_prog_destroy,
&user_ops,
AF_INET,
SOCK_STREAM,
@@ -518,8 +522,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect4: connect (dgram)",
- connect4_prog_load,
- connect4_prog_destroy,
+ connect_v4_prog_load,
+ connect_v4_prog_destroy,
&user_ops,
AF_INET,
SOCK_DGRAM,
@@ -532,8 +536,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect6: connect (stream)",
- connect6_prog_load,
- connect6_prog_destroy,
+ connect_v6_prog_load,
+ connect_v6_prog_destroy,
&user_ops,
AF_INET6,
SOCK_STREAM,
@@ -546,8 +550,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect6: connect (dgram)",
- connect6_prog_load,
- connect6_prog_destroy,
+ connect_v6_prog_load,
+ connect_v6_prog_destroy,
&user_ops,
AF_INET6,
SOCK_DGRAM,
@@ -576,8 +580,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect4: kernel_connect (stream)",
- connect4_prog_load,
- connect4_prog_destroy,
+ connect_v4_prog_load,
+ connect_v4_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET,
SOCK_STREAM,
@@ -590,8 +594,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect4: kernel_connect (dgram)",
- connect4_prog_load,
- connect4_prog_destroy,
+ connect_v4_prog_load,
+ connect_v4_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET,
SOCK_DGRAM,
@@ -604,8 +608,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect6: kernel_connect (stream)",
- connect6_prog_load,
- connect6_prog_destroy,
+ connect_v6_prog_load,
+ connect_v6_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET6,
SOCK_STREAM,
@@ -618,8 +622,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_CONNECT,
"connect6: kernel_connect (dgram)",
- connect6_prog_load,
- connect6_prog_destroy,
+ connect_v6_prog_load,
+ connect_v6_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET6,
SOCK_DGRAM,
@@ -648,8 +652,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_SENDMSG,
"sendmsg4: sendmsg (dgram)",
- sendmsg4_prog_load,
- sendmsg4_prog_destroy,
+ sendmsg_v4_prog_load,
+ sendmsg_v4_prog_destroy,
&user_ops,
AF_INET,
SOCK_DGRAM,
@@ -662,8 +666,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_SENDMSG,
"sendmsg6: sendmsg (dgram)",
- sendmsg6_prog_load,
- sendmsg6_prog_destroy,
+ sendmsg_v6_prog_load,
+ sendmsg_v6_prog_destroy,
&user_ops,
AF_INET6,
SOCK_DGRAM,
@@ -692,8 +696,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_SENDMSG,
"sendmsg4: sock_sendmsg (dgram)",
- sendmsg4_prog_load,
- sendmsg4_prog_destroy,
+ sendmsg_v4_prog_load,
+ sendmsg_v4_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET,
SOCK_DGRAM,
@@ -706,8 +710,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_SENDMSG,
"sendmsg6: sock_sendmsg (dgram)",
- sendmsg6_prog_load,
- sendmsg6_prog_destroy,
+ sendmsg_v6_prog_load,
+ sendmsg_v6_prog_destroy,
&kern_ops_sock_sendmsg,
AF_INET6,
SOCK_DGRAM,
@@ -736,8 +740,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_SENDMSG,
"sendmsg4: kernel_sendmsg (dgram)",
- sendmsg4_prog_load,
- sendmsg4_prog_destroy,
+ sendmsg_v4_prog_load,
+ sendmsg_v4_prog_destroy,
&kern_ops_kernel_sendmsg,
AF_INET,
SOCK_DGRAM,
@@ -750,8 +754,8 @@ static struct sock_addr_test tests[] = {
{
SOCK_ADDR_TEST_SENDMSG,
"sendmsg6: kernel_sendmsg (dgram)",
- sendmsg6_prog_load,
- sendmsg6_prog_destroy,
+ sendmsg_v6_prog_load,
+ sendmsg_v6_prog_destroy,
&kern_ops_kernel_sendmsg,
AF_INET6,
SOCK_DGRAM,
--
2.45.0.118.g7fe29c98d7-goog
next prev parent reply other threads:[~2024-05-10 19:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 19:02 [PATCH v1 bpf-next 00/17] Retire progs/test_sock_addr.c Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 01/17] selftests/bpf: Migrate recvmsg* return code tests to verifier_sock_addr.c Jordan Rife
2024-05-10 19:02 ` Jordan Rife [this message]
2024-05-10 19:02 ` [PATCH v1 bpf-next 03/17] selftests/bpf: Handle LOAD_REJECT test cases Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 04/17] selftests/bpf: Handle ATTACH_REJECT " Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 05/17] selftests/bpf: Handle SYSCALL_EPERM and SYSCALL_ENOTSUPP " Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 06/17] selftests/bpf: Migrate WILDCARD_IP test Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 07/17] selftests/bpf: Migrate sendmsg deny test cases Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 08/17] selftests/bpf: Migrate sendmsg6 v4 mapped address tests Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 09/17] selftests/bpf: Migrate wildcard destination rewrite test Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 10/17] selftests/bpf: Migrate expected_attach_type tests Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 11/17] selftests/bpf: Migrate ATTACH_REJECT test cases Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 12/17] selftests/bpf: Remove redundant sendmsg " Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 13/17] selftests/bpf: Retire test_sock_addr.(c|sh) Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 14/17] selftests/bpf: Expand sockaddr program return value tests Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 15/17] sefltests/bpf: Expand sockaddr hook deny tests Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 16/17] selftests/bpf: Expand getsockname and getpeername tests Jordan Rife
2024-05-10 19:02 ` [PATCH v1 bpf-next 17/17] selftests/bpf: Expand ATTACH_REJECT tests Jordan Rife
2024-05-10 22:05 ` [PATCH v1 bpf-next 00/17] Retire progs/test_sock_addr.c Andrii Nakryiko
2024-05-10 22:12 ` Jordan Rife
2024-05-10 22:32 ` Andrii Nakryiko
2024-05-13 0:20 ` patchwork-bot+netdevbpf
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=20240510190246.3247730-3-jrife@google.com \
--to=jrife@google.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daan.j.demeyer@gmail.com \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=shung-hsi.yu@suse.com \
--cc=song@kernel.org \
--cc=tanggeliang@kylinos.cn \
--cc=yonghong.song@linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).