From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: [PATCH v2 net-next 5/8] samples/bpf: Add detach option to test_cgrp2_sock Date: Fri, 25 Aug 2017 12:05:38 -0700 Message-ID: <1503687941-626-6-git-send-email-dsahern@gmail.com> References: <1503687941-626-1-git-send-email-dsahern@gmail.com> Cc: David Ahern To: netdev@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org, tj@kernel.org, davem@davemloft.net Return-path: Received: from mail-pg0-f66.google.com ([74.125.83.66]:37665 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758132AbdHYTFz (ORCPT ); Fri, 25 Aug 2017 15:05:55 -0400 Received: by mail-pg0-f66.google.com with SMTP id a7so887894pgn.4 for ; Fri, 25 Aug 2017 12:05:55 -0700 (PDT) In-Reply-To: <1503687941-626-1-git-send-email-dsahern@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Add option to detach programs from a cgroup. Signed-off-by: David Ahern --- samples/bpf/test_cgrp2_sock.c | 50 ++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c index b018bf948933..a1ef7b8bd3f9 100644 --- a/samples/bpf/test_cgrp2_sock.c +++ b/samples/bpf/test_cgrp2_sock.c @@ -114,7 +114,12 @@ static int prog_load(__u32 idx, __u32 mark, __u32 prio) static int usage(const char *argv0) { - printf("Usage: %s -b bind-to-dev -m mark -p prio -r cg-path\n", argv0); + printf("Usage:\n"); + printf(" Attach a program\n"); + printf(" %s -b bind-to-dev -m mark -p prio -r cg-path\n", argv0); + printf("\n"); + printf(" Detach a program\n"); + printf(" %s -d cg-path\n", argv0); return EXIT_FAILURE; } @@ -124,10 +129,14 @@ int main(int argc, char **argv) __u32 idx = 0, mark = 0, prio = 0; const char *cgrp_path = NULL; int cg_fd, prog_fd, ret; + int do_attach = 1; int rc; - while ((rc = getopt(argc, argv, "b:m:p:r")) != -1) { + while ((rc = getopt(argc, argv, "db:m:p:r")) != -1) { switch (rc) { + case 'd': + do_attach = 0; + break; case 'b': idx = if_nametoindex(optarg); if (!idx) { @@ -161,7 +170,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - if (!idx && !mark && !prio) { + if (do_attach && !idx && !mark && !prio) { fprintf(stderr, "One of device, mark or priority must be given\n"); return EXIT_FAILURE; } @@ -172,20 +181,31 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - prog_fd = prog_load(idx, mark, prio); - if (prog_fd < 0) { - printf("Failed to load prog: '%s'\n", strerror(errno)); - printf("Output from kernel verifier:\n%s\n-------\n", bpf_log_buf); - return EXIT_FAILURE; - } + if (do_attach) { + prog_fd = prog_load(idx, mark, prio); + if (prog_fd < 0) { + printf("Failed to load prog: '%s'\n", strerror(errno)); + printf("Output from kernel verifier:\n%s\n-------\n", + bpf_log_buf); + return EXIT_FAILURE; + } - ret = bpf_prog_attach(prog_fd, cg_fd, BPF_CGROUP_INET_SOCK_CREATE, - attach_flags); - if (ret < 0) { - printf("Failed to attach prog to cgroup: '%s'\n", - strerror(errno)); - return EXIT_FAILURE; + ret = bpf_prog_attach(prog_fd, cg_fd, BPF_CGROUP_INET_SOCK_CREATE, + attach_flags); + if (ret < 0) { + printf("Failed to attach prog to cgroup: '%s'\n", + strerror(errno)); + 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; } -- 2.1.4