From: Martin KaFai Lau <martin.lau@linux.dev>
To: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>,
Geliang Tang <geliang@kernel.org>
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
bpf@vger.kernel.org, linux-kselftest@vger.kernel.org,
mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Mykola Lysenko <mykolal@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
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@fomichev.me>, Hao Luo <haoluo@google.com>,
Jiri Olsa <jolsa@kernel.org>, Shuah Khan <shuah@kernel.org>
Subject: Re: [PATCH bpf-next/net v6 3/3] selftests/bpf: Add mptcp subflow subtest
Date: Fri, 13 Sep 2024 17:29:25 -0700 [thread overview]
Message-ID: <6b678872-5303-4088-b65c-42e166b4d9e5@linux.dev> (raw)
In-Reply-To: <20240911-upstream-bpf-next-20240506-mptcp-subflow-test-v6-3-7872294c466b@kernel.org>
On 9/11/24 8:16 AM, Matthieu Baerts (NGI0) wrote:
> +static void test_subflow(void)
> +{
> + int cgroup_fd, prog_fd, err;
> + struct mptcp_subflow *skel;
> + struct nstoken *nstoken;
> + struct bpf_link *link;
> +
> + cgroup_fd = test__join_cgroup("/mptcp_subflow");
> + if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: mptcp_subflow"))
> + return;
> +
> + skel = mptcp_subflow__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "skel_open_load: mptcp_subflow"))
> + goto close_cgroup;
> +
> + skel->bss->pid = getpid();
> +
> + err = mptcp_subflow__attach(skel);
This is not needed.
> + if (!ASSERT_OK(err, "skel_attach: mptcp_subflow"))
> + goto skel_destroy;
> +
> + prog_fd = bpf_program__fd(skel->progs.mptcp_subflow);
> + err = bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_SOCK_OPS, 0);
Use bpf_program__attach_cgroup here instead since ...
> + if (!ASSERT_OK(err, "prog_attach"))
> + goto skel_destroy;
> +
> + nstoken = create_netns();
> + if (!ASSERT_OK_PTR(nstoken, "create_netns: mptcp_subflow"))
> + goto skel_destroy;
> +
> + if (endpoint_init("subflow") < 0)
> + goto close_netns;
> +
> + link = bpf_program__attach_cgroup(skel->progs._getsockopt_subflow,
> + cgroup_fd);
... bpf_program__attach_cgroup is used here also.
Instead of declaring a local "link", use the skel->links.{mptcp_subflow,
_getsockopt_subflow}. Then mptcp_subflow__destroy(skel) will take care of them
also. e.g. "skel->links._getsockopt_subflow = bpf_program__attach_cgroup(...)"
pw-bot: cr
prev parent reply other threads:[~2024-09-14 0:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-11 15:16 [PATCH bpf-next/net v6 0/3] selftests/bpf: new MPTCP subflow subtest Matthieu Baerts (NGI0)
2024-09-11 15:16 ` [PATCH bpf-next/net v6 1/3] selftests/bpf: Add mptcp subflow example Matthieu Baerts (NGI0)
2024-09-11 15:16 ` [PATCH bpf-next/net v6 2/3] selftests/bpf: Add getsockopt to inspect mptcp subflow Matthieu Baerts (NGI0)
2024-09-14 0:11 ` Martin KaFai Lau
2024-09-11 15:16 ` [PATCH bpf-next/net v6 3/3] selftests/bpf: Add mptcp subflow subtest Matthieu Baerts (NGI0)
2024-09-14 0:29 ` Martin KaFai Lau [this message]
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=6b678872-5303-4088-b65c-42e166b4d9e5@linux.dev \
--to=martin.lau@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=geliang@kernel.org \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martineau@kernel.org \
--cc=matttbe@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--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).