| Message ID | 20190523194532.2376233-5-guro@fb.com |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | cgroup bpf auto-detachment | expand |
On 5/23/19 12:45 PM, Roman Gushchin wrote: > Add a kselftest to cover bpf auto-detachment functionality. > The test creates a cgroup, associates some resources with it, > attaches a couple of bpf programs and deletes the cgroup. > > Then it checks that bpf programs are going away in 5 seconds. > > Expected output: > $ ./test_cgroup_attach > #override:PASS > #multi:PASS > #autodetach:PASS > test_cgroup_attach:PASS > > On a kernel without auto-detaching: > $ ./test_cgroup_attach > #override:PASS > #multi:PASS > #autodetach:FAIL > test_cgroup_attach:FAIL > > Signed-off-by: Roman Gushchin <guro@fb.com> Looks good to me. It will be good if you can add test_cgroup_attach to .gitignore to avoid it shows up in `git status`. With that, Acked-by: Yonghong Song <yhs@fb.com> > --- > .../selftests/bpf/test_cgroup_attach.c | 98 ++++++++++++++++++- > 1 file changed, 97 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/bpf/test_cgroup_attach.c b/tools/testing/selftests/bpf/test_cgroup_attach.c > index 2d6d57f50e10..7671909ee1cb 100644 > --- a/tools/testing/selftests/bpf/test_cgroup_attach.c > +++ b/tools/testing/selftests/bpf/test_cgroup_attach.c > @@ -456,9 +456,105 @@ static int test_multiprog(void) > return rc; > } > > +static int test_autodetach(void) > +{ > + __u32 prog_cnt = 4, attach_flags; > + int allow_prog[2] = {0}; > + __u32 prog_ids[2] = {0}; > + int cg = 0, i, rc = -1; > + void *ptr = NULL; > + int attempts; > + > + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) { > + allow_prog[i] = prog_load_cnt(1, 1 << i); > + if (!allow_prog[i]) > + goto err; > + } > + > + if (setup_cgroup_environment()) > + goto err; > + > + /* create a cgroup, attach two programs and remember their ids */ > + cg = create_and_get_cgroup("/cg_autodetach"); > + if (cg < 0) > + goto err; > + > + if (join_cgroup("/cg_autodetach")) > + goto err; > + > + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) { > + if (bpf_prog_attach(allow_prog[i], cg, BPF_CGROUP_INET_EGRESS, > + BPF_F_ALLOW_MULTI)) { > + log_err("Attaching prog[%d] to cg:egress", i); > + goto err; > + } > + } > + > + /* make sure that programs are attached and run some traffic */ > + assert(bpf_prog_query(cg, BPF_CGROUP_INET_EGRESS, 0, &attach_flags, > + prog_ids, &prog_cnt) == 0); > + assert(system(PING_CMD) == 0); > + > + /* allocate some memory (4Mb) to pin the original cgroup */ > + ptr = malloc(4 * (1 << 20)); > + if (!ptr) > + goto err; > + > + /* close programs and cgroup fd */ > + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) { > + close(allow_prog[i]); > + allow_prog[i] = 0; > + } > + > + close(cg); > + cg = 0; > + > + /* leave the cgroup and remove it. don't detach programs */ > + cleanup_cgroup_environment(); > + > + /* wait for the asynchronous auto-detachment. > + * wait for no more than 5 sec and give up. > + */ > + for (i = 0; i < ARRAY_SIZE(prog_ids); i++) { > + for (attempts = 5; attempts >= 0; attempts--) { > + int fd = bpf_prog_get_fd_by_id(prog_ids[i]); > + > + if (fd < 0) > + break; > + > + /* don't leave the fd open */ > + close(fd); > + > + if (!attempts) > + goto err; > + > + sleep(1); > + } > + } > + > + rc = 0; > +err: > + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) > + if (allow_prog[i] > 0) > + close(allow_prog[i]); > + if (cg) > + close(cg); > + free(ptr); > + cleanup_cgroup_environment(); > + if (!rc) > + printf("#autodetach:PASS\n"); > + else > + printf("#autodetach:FAIL\n"); > + return rc; > +} > + > int main(void) > { > - int (*tests[])(void) = {test_foo_bar, test_multiprog}; > + int (*tests[])(void) = { > + test_foo_bar, > + test_multiprog, > + test_autodetach, > + }; > int errors = 0; > int i; > >
On Thu, May 23, 2019 at 04:09:30PM -0700, Yonghong Song wrote: > > > On 5/23/19 12:45 PM, Roman Gushchin wrote: > > Add a kselftest to cover bpf auto-detachment functionality. > > The test creates a cgroup, associates some resources with it, > > attaches a couple of bpf programs and deletes the cgroup. > > > > Then it checks that bpf programs are going away in 5 seconds. > > > > Expected output: > > $ ./test_cgroup_attach > > #override:PASS > > #multi:PASS > > #autodetach:PASS > > test_cgroup_attach:PASS > > > > On a kernel without auto-detaching: > > $ ./test_cgroup_attach > > #override:PASS > > #multi:PASS > > #autodetach:FAIL > > test_cgroup_attach:FAIL > > > > Signed-off-by: Roman Gushchin <guro@fb.com> > > Looks good to me. It will be good if you can add test_cgroup_attach > to .gitignore to avoid it shows up in `git status`. With that, I don't think it deserves a new version, I'll prepare a separate patch for it. > > Acked-by: Yonghong Song <yhs@fb.com> Thank you for the review!
On Thu, May 23, 2019 at 04:09:30PM -0700, Yonghong Song wrote: > > > On 5/23/19 12:45 PM, Roman Gushchin wrote: > > Add a kselftest to cover bpf auto-detachment functionality. > > The test creates a cgroup, associates some resources with it, > > attaches a couple of bpf programs and deletes the cgroup. > > > > Then it checks that bpf programs are going away in 5 seconds. > > > > Expected output: > > $ ./test_cgroup_attach > > #override:PASS > > #multi:PASS > > #autodetach:PASS > > test_cgroup_attach:PASS > > > > On a kernel without auto-detaching: > > $ ./test_cgroup_attach > > #override:PASS > > #multi:PASS > > #autodetach:FAIL > > test_cgroup_attach:FAIL > > > > Signed-off-by: Roman Gushchin <guro@fb.com> > > Looks good to me. It will be good if you can add test_cgroup_attach > to .gitignore to avoid it shows up in `git status`. With that, > Here it is! Thanks! --- From 150fb4db7ab37f0e8b6482386e8830f3d11b64e1 Mon Sep 17 00:00:00 2001 From: Roman Gushchin <guro@fb.com> Date: Thu, 23 May 2019 16:46:58 -0700 Subject: [PATCH bpf-next] selftests/bpf: add test_cgroup_attach to .gitignore Add test_cgroup_attach binary to .gitignore. Signed-off-by: Roman Gushchin <guro@fb.com> --- tools/testing/selftests/bpf/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/.gitignore b/tools/testing/selftests/bpf/.gitignore index dd5d69529382..86a546e5e4db 100644 --- a/tools/testing/selftests/bpf/.gitignore +++ b/tools/testing/selftests/bpf/.gitignore @@ -22,6 +22,7 @@ test_lirc_mode2_user get_cgroup_id_user test_skb_cgroup_id_user test_socket_cookie +test_cgroup_attach test_cgroup_storage test_select_reuseport test_flow_dissector
diff --git a/tools/testing/selftests/bpf/test_cgroup_attach.c b/tools/testing/selftests/bpf/test_cgroup_attach.c index 2d6d57f50e10..7671909ee1cb 100644 --- a/tools/testing/selftests/bpf/test_cgroup_attach.c +++ b/tools/testing/selftests/bpf/test_cgroup_attach.c @@ -456,9 +456,105 @@ static int test_multiprog(void) return rc; } +static int test_autodetach(void) +{ + __u32 prog_cnt = 4, attach_flags; + int allow_prog[2] = {0}; + __u32 prog_ids[2] = {0}; + int cg = 0, i, rc = -1; + void *ptr = NULL; + int attempts; + + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) { + allow_prog[i] = prog_load_cnt(1, 1 << i); + if (!allow_prog[i]) + goto err; + } + + if (setup_cgroup_environment()) + goto err; + + /* create a cgroup, attach two programs and remember their ids */ + cg = create_and_get_cgroup("/cg_autodetach"); + if (cg < 0) + goto err; + + if (join_cgroup("/cg_autodetach")) + goto err; + + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) { + if (bpf_prog_attach(allow_prog[i], cg, BPF_CGROUP_INET_EGRESS, + BPF_F_ALLOW_MULTI)) { + log_err("Attaching prog[%d] to cg:egress", i); + goto err; + } + } + + /* make sure that programs are attached and run some traffic */ + assert(bpf_prog_query(cg, BPF_CGROUP_INET_EGRESS, 0, &attach_flags, + prog_ids, &prog_cnt) == 0); + assert(system(PING_CMD) == 0); + + /* allocate some memory (4Mb) to pin the original cgroup */ + ptr = malloc(4 * (1 << 20)); + if (!ptr) + goto err; + + /* close programs and cgroup fd */ + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) { + close(allow_prog[i]); + allow_prog[i] = 0; + } + + close(cg); + cg = 0; + + /* leave the cgroup and remove it. don't detach programs */ + cleanup_cgroup_environment(); + + /* wait for the asynchronous auto-detachment. + * wait for no more than 5 sec and give up. + */ + for (i = 0; i < ARRAY_SIZE(prog_ids); i++) { + for (attempts = 5; attempts >= 0; attempts--) { + int fd = bpf_prog_get_fd_by_id(prog_ids[i]); + + if (fd < 0) + break; + + /* don't leave the fd open */ + close(fd); + + if (!attempts) + goto err; + + sleep(1); + } + } + + rc = 0; +err: + for (i = 0; i < ARRAY_SIZE(allow_prog); i++) + if (allow_prog[i] > 0) + close(allow_prog[i]); + if (cg) + close(cg); + free(ptr); + cleanup_cgroup_environment(); + if (!rc) + printf("#autodetach:PASS\n"); + else + printf("#autodetach:FAIL\n"); + return rc; +} + int main(void) { - int (*tests[])(void) = {test_foo_bar, test_multiprog}; + int (*tests[])(void) = { + test_foo_bar, + test_multiprog, + test_autodetach, + }; int errors = 0; int i;
Add a kselftest to cover bpf auto-detachment functionality. The test creates a cgroup, associates some resources with it, attaches a couple of bpf programs and deletes the cgroup. Then it checks that bpf programs are going away in 5 seconds. Expected output: $ ./test_cgroup_attach #override:PASS #multi:PASS #autodetach:PASS test_cgroup_attach:PASS On a kernel without auto-detaching: $ ./test_cgroup_attach #override:PASS #multi:PASS #autodetach:FAIL test_cgroup_attach:FAIL Signed-off-by: Roman Gushchin <guro@fb.com> --- .../selftests/bpf/test_cgroup_attach.c | 98 ++++++++++++++++++- 1 file changed, 97 insertions(+), 1 deletion(-)