From: Martin KaFai Lau <martin.lau@linux.dev>
To: YiFei Zhu <zhuyifei@google.com>, bpf@vger.kernel.org
Cc: netdev@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Stanislav Fomichev <sdf@google.com>,
John Fastabend <john.fastabend@gmail.com>,
Jiri Olsa <jolsa@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
David Ahern <dsahern@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Subject: Re: [PATCH v2 bpf-next 3/3] selftests/bpf: Ensure cgroup/connect{4,6} programs can bind unpriv ICMP ping
Date: Wed, 7 Sep 2022 11:38:29 -0700 [thread overview]
Message-ID: <c76121f4-911e-81c4-fbc9-104da70cfb66@linux.dev> (raw)
In-Reply-To: <892e0898c1255f980da13b0c7cc77cd5642edd36.1662507638.git.zhuyifei@google.com>
On 9/6/22 4:48 PM, YiFei Zhu wrote:
> +void test_connect_ping(void)
> +{
> + struct connect_ping *obj;
nit. Rename it so skel. All other tests use variable name 'skel'
instead of 'obj'.
> + int cgroup_fd;
> +
> + if (!ASSERT_OK(unshare(CLONE_NEWNET | CLONE_NEWNS), "unshare"))
> + return;
> +
> + /* overmount sysfs, and making original sysfs private so overmount
> + * does not propagate to other mntns.
> + */
> + if (!ASSERT_OK(mount("none", "/sys", NULL, MS_PRIVATE, NULL),
> + "remount-private-sys"))
> + return;
> + if (!ASSERT_OK(mount("sysfs", "/sys", "sysfs", 0, NULL),
> + "mount-sys"))
> + return;
> + if (!ASSERT_OK(mount("bpffs", "/sys/fs/bpf", "bpf", 0, NULL),
> + "mount-bpf"))
> + goto clean_mount;
> +
> + if (!ASSERT_OK(system("ip link set dev lo up"), "lo-up"))
> + goto clean_mount;
> + if (!ASSERT_OK(system("ip addr add 1.1.1.1 dev lo"), "lo-addr-v4"))
> + goto clean_mount;
> + if (!ASSERT_OK(system("ip -6 addr add 2001:db8::1 dev lo"), "lo-addr-v6"))
> + goto clean_mount;
> + if (write_sysctl("/proc/sys/net/ipv4/ping_group_range", "0 0"))
> + goto clean_mount;
> +
> + cgroup_fd = test__join_cgroup("/connect_ping");
> + if (!ASSERT_GE(cgroup_fd, 0, "cg-create"))
> + goto clean_mount;
> +
> + obj = connect_ping__open_and_load();
> + if (!ASSERT_OK_PTR(obj, "skel-load"))
> + goto close_cgroup;
> + obj->links.connect_v4_prog =
> + bpf_program__attach_cgroup(obj->progs.connect_v4_prog, cgroup_fd);
> + if (!ASSERT_OK_PTR(obj->links.connect_v4_prog, "cg-attach-v4"))
> + goto close_cgroup;connect_ping__destroy() is also needed in this error path.
> + obj->links.connect_v6_prog =
> + bpf_program__attach_cgroup(obj->progs.connect_v6_prog, cgroup_fd);
> + if (!ASSERT_OK_PTR(obj->links.connect_v6_prog, "cg-attach-v6"))
> + goto close_cgroup;
Same here.
Others lgtm. Thanks for refactoring the write_sysctl().
prev parent reply other threads:[~2022-09-07 18:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 23:48 [PATCH v2 bpf-next 0/3] cgroup/connect{4,6} programs for unprivileged ICMP ping YiFei Zhu
2022-09-06 23:48 ` [PATCH v2 bpf-next 1/3] bpf: Invoke " YiFei Zhu
2022-09-06 23:48 ` [PATCH v2 bpf-next 2/3] selftests/bpf: Deduplicate write_sysctl() to test_progs.c YiFei Zhu
2022-09-06 23:48 ` [PATCH v2 bpf-next 3/3] selftests/bpf: Ensure cgroup/connect{4,6} programs can bind unpriv ICMP ping YiFei Zhu
2022-09-07 18:38 ` 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=c76121f4-911e-81c4-fbc9-104da70cfb66@linux.dev \
--to=martin.lau@linux.dev \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@google.com \
--cc=yoshfuji@linux-ipv6.org \
--cc=zhuyifei@google.com \
/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