{"id":805997,"url":"http://patchwork.ozlabs.org/api/1.2/patches/805997/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1503687941-626-6-git-send-email-dsahern@gmail.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1503687941-626-6-git-send-email-dsahern@gmail.com>","list_archive_url":null,"date":"2017-08-25T19:05:38","name":"[v2,net-next,5/8] samples/bpf: Add detach option to test_cgrp2_sock","commit_ref":null,"pull_url":null,"state":"deferred","archived":true,"hash":"6f9014398de742cfa66b9a16aa2585a1c07ded10","submitter":{"id":6918,"url":"http://patchwork.ozlabs.org/api/1.2/people/6918/?format=json","name":"David Ahern","email":"dsahern@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1503687941-626-6-git-send-email-dsahern@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805997/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805997/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"kf3+1m+V\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xf9cB08y5z9t2h\n\tfor ;\n\tSat, 26 Aug 2017 05:06:02 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1758143AbdHYTGA (ORCPT );\n\tFri, 25 Aug 2017 15:06:00 -0400","from mail-pg0-f66.google.com ([74.125.83.66]:37665 \"EHLO\n\tmail-pg0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1758132AbdHYTFz (ORCPT\n\t); Fri, 25 Aug 2017 15:05:55 -0400","by mail-pg0-f66.google.com with SMTP id a7so887894pgn.4\n\tfor ; Fri, 25 Aug 2017 12:05:55 -0700 (PDT)","from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com.\n\t[216.129.126.126]) by smtp.googlemail.com with ESMTPSA id\n\t16sm16642137pfn.188.2017.08.25.12.05.54\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 25 Aug 2017 12:05:54 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=Ex8AODDByQRjWmVzfjwGy4x2XYeGpVXgkd3eD8eQvqg=;\n\tb=kf3+1m+VOJUcPhcYGF8Y9eJ8l8/3rZEqs+dd1PefqpTbEhe+ezDRO3sPwv9NgvKp5j\n\t9JYB3agIelImIvNfLjc/8RGwb3QRh5C7PI+2uJknSCCP3G5cuBjmKDp9bfjgYuMZDdwA\n\tfb10LGcyP0j4blp/GP3oqxY+XZCdUBe12sMO4MCvHovN30KNhMBimTemxMh+mmd8D5wr\n\tEuPyl1QDSCiTCbOmLWRUpDDKVnpp1+rMrNhnsyoBK+yCjuKXpY5DAcqI5EtjmCjlac2n\n\tvGJCTRtP7Q3qg7pke/7Q+IM2h+iYQ2B+am9uBuxzcyE7E3X3cyw1/SFyKsJmuFvtOiFT\n\tl28A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=Ex8AODDByQRjWmVzfjwGy4x2XYeGpVXgkd3eD8eQvqg=;\n\tb=QlZP+phMtl00cNcDX12qvgZothI54Vkuf5QJabo/deaNv1UzjZQLGNGP6TpWOWsJ2Q\n\txCrn0JhZYsZUPEU/joTXyCZDw3u4ZuKNeM+AN+lZIwl+i8ifjr0NKwWUfVrUs28WrwHW\n\tI6NrRHXWE25aRBRdr10HUGGkGvKsi2qJyNl9Vx0G7zOC1+OlG/i5HN+AHNeTTsLD/nsY\n\tmwdLqSictYe9RiPslm6igd50Vdk4cDmz+2awT9ctl1BtLRLTCdJJxsQ4QbgxjxxmYoi8\n\tO5TYRhIhT2KSyIlkN1MF2CA9wL83GX/qyizbEbvUN1vkyrYFLacYieRNPZu38OhcqRf6\n\tTGhA==","X-Gm-Message-State":"AHYfb5ghtUzMQY6RBBp3R02gh1zYO0T3vnS1/G50C3DOXCPsMSP6ew04\n\tv/K1xHc0uI9VodIf","X-Received":"by 10.84.167.2 with SMTP id c2mr11778990plb.368.1503687955203;\n\tFri, 25 Aug 2017 12:05:55 -0700 (PDT)","From":"David Ahern ","To":"netdev@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org,\n\ttj@kernel.org, davem@davemloft.net","Cc":"David Ahern ","Subject":"[PATCH v2 net-next 5/8] samples/bpf: Add detach option to\n\ttest_cgrp2_sock","Date":"Fri, 25 Aug 2017 12:05:38 -0700","Message-Id":"<1503687941-626-6-git-send-email-dsahern@gmail.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1503687941-626-1-git-send-email-dsahern@gmail.com>","References":"<1503687941-626-1-git-send-email-dsahern@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Add option to detach programs from a cgroup.\n\nSigned-off-by: David Ahern \n---\n samples/bpf/test_cgrp2_sock.c | 50 ++++++++++++++++++++++++++++++-------------\n 1 file changed, 35 insertions(+), 15 deletions(-)","diff":"diff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c\nindex b018bf948933..a1ef7b8bd3f9 100644\n--- a/samples/bpf/test_cgrp2_sock.c\n+++ b/samples/bpf/test_cgrp2_sock.c\n@@ -114,7 +114,12 @@ static int prog_load(__u32 idx, __u32 mark, __u32 prio)\n \n static int usage(const char *argv0)\n {\n-\tprintf(\"Usage: %s -b bind-to-dev -m mark -p prio -r cg-path\\n\", argv0);\n+\tprintf(\"Usage:\\n\");\n+\tprintf(\" Attach a program\\n\");\n+\tprintf(\" %s -b bind-to-dev -m mark -p prio -r cg-path\\n\", argv0);\n+\tprintf(\"\\n\");\n+\tprintf(\" Detach a program\\n\");\n+\tprintf(\" %s -d cg-path\\n\", argv0);\n \treturn EXIT_FAILURE;\n }\n \n@@ -124,10 +129,14 @@ int main(int argc, char **argv)\n \t__u32 idx = 0, mark = 0, prio = 0;\n \tconst char *cgrp_path = NULL;\n \tint cg_fd, prog_fd, ret;\n+\tint do_attach = 1;\n \tint rc;\n \n-\twhile ((rc = getopt(argc, argv, \"b:m:p:r\")) != -1) {\n+\twhile ((rc = getopt(argc, argv, \"db:m:p:r\")) != -1) {\n \t\tswitch (rc) {\n+\t\tcase 'd':\n+\t\t\tdo_attach = 0;\n+\t\t\tbreak;\n \t\tcase 'b':\n \t\t\tidx = if_nametoindex(optarg);\n \t\t\tif (!idx) {\n@@ -161,7 +170,7 @@ int main(int argc, char **argv)\n \t\treturn EXIT_FAILURE;\n \t}\n \n-\tif (!idx && !mark && !prio) {\n+\tif (do_attach && !idx && !mark && !prio) {\n \t\tfprintf(stderr, \"One of device, mark or priority must be given\\n\");\n \t\treturn EXIT_FAILURE;\n \t}\n@@ -172,20 +181,31 @@ int main(int argc, char **argv)\n \t\treturn EXIT_FAILURE;\n \t}\n \n-\tprog_fd = prog_load(idx, mark, prio);\n-\tif (prog_fd < 0) {\n-\t\tprintf(\"Failed to load prog: '%s'\\n\", strerror(errno));\n-\t\tprintf(\"Output from kernel verifier:\\n%s\\n-------\\n\", bpf_log_buf);\n-\t\treturn EXIT_FAILURE;\n-\t}\n+\tif (do_attach) {\n+\t\tprog_fd = prog_load(idx, mark, prio);\n+\t\tif (prog_fd < 0) {\n+\t\t\tprintf(\"Failed to load prog: '%s'\\n\", strerror(errno));\n+\t\t\tprintf(\"Output from kernel verifier:\\n%s\\n-------\\n\",\n+\t\t\t bpf_log_buf);\n+\t\t\treturn EXIT_FAILURE;\n+\t\t}\n \n-\tret = bpf_prog_attach(prog_fd, cg_fd, BPF_CGROUP_INET_SOCK_CREATE,\n-\t\t\t attach_flags);\n-\tif (ret < 0) {\n-\t\tprintf(\"Failed to attach prog to cgroup: '%s'\\n\",\n-\t\t strerror(errno));\n-\t\treturn EXIT_FAILURE;\n+\t\tret = bpf_prog_attach(prog_fd, cg_fd, BPF_CGROUP_INET_SOCK_CREATE,\n+\t\t\t\t attach_flags);\n+\t\tif (ret < 0) {\n+\t\t\tprintf(\"Failed to attach prog to cgroup: '%s'\\n\",\n+\t\t\t strerror(errno));\n+\t\t\treturn EXIT_FAILURE;\n+\t\t}\n+\t} else {\n+\t\tret = bpf_prog_detach(cg_fd, BPF_CGROUP_INET_SOCK_CREATE);\n+\t\tif (ret < 0) {\n+\t\t\tprintf(\"Failed to detach prog from cgroup: '%s'\\n\",\n+\t\t\t strerror(errno));\n+\t\t\treturn EXIT_FAILURE;\n+\t\t}\n \t}\n \n+\tclose(cg_fd);\n \treturn EXIT_SUCCESS;\n }\n","prefixes":["v2","net-next","5/8"]}