From: Jakub Sitnicki <jakub@cloudflare.com>
To: John Fastabend <john.fastabend@gmail.com>
Cc: lmb@cloudflare.com, daniel@iogearbox.net, netdev@vger.kernel.org,
bpf@vger.kernel.org, ast@kernel.org
Subject: Re: [bpf-next PATCH 03/10] bpf: selftests, sockmap test prog run without setting cgroup
Date: Thu, 7 May 2020 10:31:57 +0200 [thread overview]
Message-ID: <20200507102902.6b27705c@toad> (raw)
In-Reply-To: <158871183500.7537.4803419328947579658.stgit@john-Precision-5820-Tower>
On Tue, 05 May 2020 13:50:35 -0700
John Fastabend <john.fastabend@gmail.com> wrote:
> Running test_sockmap with arguments to specify a test pattern requires
> including a cgroup argument. Instead of requiring this if the option is
> not provided create one
>
> This is not used by selftest runs but I use it when I want to test a
> specific test. Most useful when developing new code and/or tests.
>
> Signed-off-by: John Fastabend <john.fastabend@gmail.com>
> ---
> tools/testing/selftests/bpf/test_sockmap.c | 28 ++++++++++++++++++++++------
> 1 file changed, 22 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
> index 6bdacc4..a0884f8 100644
> --- a/tools/testing/selftests/bpf/test_sockmap.c
> +++ b/tools/testing/selftests/bpf/test_sockmap.c
> @@ -1725,6 +1725,7 @@ int main(int argc, char **argv)
> int opt, longindex, err, cg_fd = 0;
> char *bpf_file = BPF_SOCKMAP_FILENAME;
> int test = PING_PONG;
> + bool cg_created = 0;
>
> if (argc < 2)
> return test_suite(-1);
> @@ -1805,13 +1806,25 @@ int main(int argc, char **argv)
> }
> }
>
> - if (argc <= 3 && cg_fd)
> - return test_suite(cg_fd);
> -
> if (!cg_fd) {
> - fprintf(stderr, "%s requires cgroup option: --cgroup <path>\n",
> - argv[0]);
> - return -1;
> + if (setup_cgroup_environment()) {
> + fprintf(stderr, "ERROR: cgroup env failed\n");
> + return -EINVAL;
> + }
> +
> + cg_fd = create_and_get_cgroup(CG_PATH);
> + if (cg_fd < 0) {
> + fprintf(stderr,
> + "ERROR: (%i) open cg path failed: %s\n",
> + cg_fd, optarg);
Looks like you wanted to log strerror(errno) instead of optarg here.
> + return cg_fd;
> + }
> +
> + if (join_cgroup(CG_PATH)) {
> + fprintf(stderr, "ERROR: failed to join cgroup\n");
> + return -EINVAL;
> + }
> + cg_created = 1;
> }
>
> err = populate_progs(bpf_file);
> @@ -1830,6 +1843,9 @@ int main(int argc, char **argv)
> options.rate = rate;
>
> err = run_options(&options, cg_fd, test);
> +
> + if (cg_created)
> + cleanup_cgroup_environment();
> close(cg_fd);
> return err;
> }
>
next prev parent reply other threads:[~2020-05-07 8:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 20:49 [bpf-next PATCH 00/10] bpf: selftests, test_sockmap improvements John Fastabend
2020-05-05 20:49 ` [bpf-next PATCH 01/10] bpf: selftests, move sockmap bpf prog header into progs John Fastabend
2020-05-05 20:50 ` [bpf-next PATCH 02/10] bpf: selftests, remove prints from sockmap tests John Fastabend
2020-05-05 20:50 ` [bpf-next PATCH 03/10] bpf: selftests, sockmap test prog run without setting cgroup John Fastabend
2020-05-07 8:31 ` Jakub Sitnicki [this message]
2020-05-07 18:10 ` John Fastabend
2020-05-05 20:50 ` [bpf-next PATCH 04/10] bpf: selftests, print error in test_sockmap error cases John Fastabend
2020-05-05 20:51 ` [bpf-next PATCH 05/10] bpf: selftests, improve test_sockmap total bytes counter John Fastabend
2020-05-07 8:55 ` Jakub Sitnicki
2020-05-05 20:51 ` [bpf-next PATCH 06/10] bpf: selftests, break down test_sockmap into subtests John Fastabend
2020-05-05 20:51 ` [bpf-next PATCH 07/10] bpf: selftests, provide verbose option for selftests execution John Fastabend
2020-05-05 20:52 ` [bpf-next PATCH 08/10] bpf: selftests, add whitelist option to test_sockmap John Fastabend
2020-05-05 20:52 ` [bpf-next PATCH 09/10] bpf: selftests, add blacklist " John Fastabend
2020-05-05 20:52 ` [bpf-next PATCH 10/10] bpf: selftests, add ktls tests " John Fastabend
2020-05-05 21:04 ` [bpf-next PATCH 00/10] bpf: selftests, test_sockmap improvements John Fastabend
2020-05-07 10:37 ` Jakub Sitnicki
2020-05-07 18:12 ` John Fastabend
2020-05-08 21:34 ` Andrii Nakryiko
2020-05-09 14:55 ` John Fastabend
2020-05-12 3:13 ` Andrii Nakryiko
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=20200507102902.6b27705c@toad \
--to=jakub@cloudflare.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=john.fastabend@gmail.com \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.org \
/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