Commit 609b1c32 authored by David Ahern's avatar David Ahern Committed by David S. Miller

samples/bpf: Add detach option to test_cgrp2_sock

Add option to detach programs from a cgroup.
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa38aa17
...@@ -114,7 +114,12 @@ static int prog_load(__u32 idx, __u32 mark, __u32 prio) ...@@ -114,7 +114,12 @@ static int prog_load(__u32 idx, __u32 mark, __u32 prio)
static int usage(const char *argv0) static int usage(const char *argv0)
{ {
printf("Usage: %s -b bind-to-dev -m mark -p prio cg-path\n", argv0); printf("Usage:\n");
printf(" Attach a program\n");
printf(" %s -b bind-to-dev -m mark -p prio cg-path\n", argv0);
printf("\n");
printf(" Detach a program\n");
printf(" %s -d cg-path\n", argv0);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
...@@ -123,10 +128,14 @@ int main(int argc, char **argv) ...@@ -123,10 +128,14 @@ int main(int argc, char **argv)
__u32 idx = 0, mark = 0, prio = 0; __u32 idx = 0, mark = 0, prio = 0;
const char *cgrp_path = NULL; const char *cgrp_path = NULL;
int cg_fd, prog_fd, ret; int cg_fd, prog_fd, ret;
int do_attach = 1;
int rc; int rc;
while ((rc = getopt(argc, argv, "b:m:p:")) != -1) { while ((rc = getopt(argc, argv, "db:m:p:")) != -1) {
switch (rc) { switch (rc) {
case 'd':
do_attach = 0;
break;
case 'b': case 'b':
idx = if_nametoindex(optarg); idx = if_nametoindex(optarg);
if (!idx) { if (!idx) {
...@@ -157,7 +166,7 @@ int main(int argc, char **argv) ...@@ -157,7 +166,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!idx && !mark && !prio) { if (do_attach && !idx && !mark && !prio) {
fprintf(stderr, fprintf(stderr,
"One of device, mark or priority must be given\n"); "One of device, mark or priority must be given\n");
return EXIT_FAILURE; return EXIT_FAILURE;
...@@ -169,6 +178,7 @@ int main(int argc, char **argv) ...@@ -169,6 +178,7 @@ int main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (do_attach) {
prog_fd = prog_load(idx, mark, prio); prog_fd = prog_load(idx, mark, prio);
if (prog_fd < 0) { if (prog_fd < 0) {
printf("Failed to load prog: '%s'\n", strerror(errno)); printf("Failed to load prog: '%s'\n", strerror(errno));
...@@ -177,12 +187,22 @@ int main(int argc, char **argv) ...@@ -177,12 +187,22 @@ int main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
ret = bpf_prog_attach(prog_fd, cg_fd, BPF_CGROUP_INET_SOCK_CREATE, 0); ret = bpf_prog_attach(prog_fd, cg_fd,
BPF_CGROUP_INET_SOCK_CREATE, 0);
if (ret < 0) { if (ret < 0) {
printf("Failed to attach prog to cgroup: '%s'\n", printf("Failed to attach prog to cgroup: '%s'\n",
strerror(errno)); strerror(errno));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} else {
ret = bpf_prog_detach(cg_fd, BPF_CGROUP_INET_SOCK_CREATE);
if (ret < 0) {
printf("Failed to detach prog from cgroup: '%s'\n",
strerror(errno));
return EXIT_FAILURE;
}
}
close(cg_fd);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment