{"id":808442,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808442/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/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},"msgid":"<1504217150-16151-5-git-send-email-dsahern@gmail.com>","date":"2017-08-31T22:05:47","name":"[v3,net-next,4/7] samples/bpf: Add detach option to test_cgrp2_sock","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"cd1997361c2beed169375583dd3bcc3076f86a1a","submitter":{"id":6918,"url":"http://patchwork.ozlabs.org/api/1.0/people/6918/?format=json","name":"David Ahern","email":"dsahern@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504217150-16151-5-git-send-email-dsahern@gmail.com/mbox/","series":[{"id":913,"url":"http://patchwork.ozlabs.org/api/1.0/series/913/?format=json","date":"2017-08-31T22:05:43","name":"bpf: Add option to set mark and priority in cgroup sock programs","version":3,"mbox":"http://patchwork.ozlabs.org/series/913/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808442/checks/","tags":{},"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=\"gxYcM0I+\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjxKn4MlDz9s81\n\tfor ;\n\tFri, 1 Sep 2017 08:06:37 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751805AbdHaWGf (ORCPT );\n\tThu, 31 Aug 2017 18:06:35 -0400","from mail-pf0-f196.google.com ([209.85.192.196]:36323 \"EHLO\n\tmail-pf0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751409AbdHaWGM (ORCPT\n\t); Thu, 31 Aug 2017 18:06:12 -0400","by mail-pf0-f196.google.com with SMTP id k3so530106pfc.3\n\tfor ; Thu, 31 Aug 2017 15:06:12 -0700 (PDT)","from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com.\n\t[216.129.126.126]) by smtp.googlemail.com with ESMTPSA id\n\tx12sm845336pfk.42.2017.08.31.15.06.11\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 31 Aug 2017 15:06:11 -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=0Kfva43P4Vab8Uor+Nh2s0M5qWDBWPi+fjR0yz4GR2I=;\n\tb=gxYcM0I+Sv0Wio3vFLdISMcBibEXluwXDYPZJOY+0imFpJ2A9rnBD08AaLpccbTQ7x\n\tx0lghpctGH08L3wPLuR1lW7TW3Xu9uPsZDlCJ5qpbPEWrPbckDNqCTPyQn1lTosfCXco\n\tcU7Vw2nFDgg/V0ey6K0GENFGJwrRA4bVayX7db8U7AIaZpIQyhyFb6AEbLsMuWxHi0zb\n\tNJWndQlEcGUBUe+w5vCVu2zTq+UoQicaD1KlTEyM0L3hAmm2JalmzAWA8OPW9nQARJkl\n\tW7/po0tJyECYRqRa5EDIT2k3PyPJzM5/RtG6QzyIFxTNcV3o8HcxcL8VbX4N+Po4SRs1\n\tlGEg==","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=0Kfva43P4Vab8Uor+Nh2s0M5qWDBWPi+fjR0yz4GR2I=;\n\tb=Sg6B1tCPs1MzwYl4TqJ4mst9PRHVM9QhbYk6YXXrnlyTtHnlkoVKCgISbaHCLrkNKs\n\trA9+EKL4zZZs5ym7dFlDIrvdPwXJCuqFjUCHUBKMqGqfewu4WZwi91V8W6Q9JDVoUznp\n\twfBuujTmnNHTZ6aHgaa6sYzMlV6ZVAY1LJx6X+FB54lePvB4RjEtDONjn9Sv685lhwco\n\tjx6ib+obMmFwjYQkm4DLJQOjxvCtPQQwoku+hTS1/kYmvHjhZMK3GWk2r3Vzpk8Debm8\n\tHjetz5XDQ6H/p9AZu8z4W8XfVXPTVqpL5VpYZeXY2i2tD6Sd+ZlZExVTAyrK+ICaqvDf\n\tG/gw==","X-Gm-Message-State":"AHYfb5h03QabpowCBJfx31iDvm19DDlfzZ6wh6irlgPwOHVLz+nmMgqe\n\tY8Qbz+NmvVRBJPFK","X-Google-Smtp-Source":"ADKCNb5DBRWE6VpKWTUjU7ljlxgcCumvchGxzdO2KQvOTC7gkUJ2L31W7SVvskg416d5ilCf8/ClWw==","X-Received":"by 10.99.2.83 with SMTP id 80mr4040710pgc.170.1504217172185;\n\tThu, 31 Aug 2017 15:06:12 -0700 (PDT)","From":"David Ahern ","To":"netdev@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org","Cc":"David Ahern ","Subject":"[PATCH v3 net-next 4/7] samples/bpf: Add detach option to\n\ttest_cgrp2_sock","Date":"Thu, 31 Aug 2017 15:05:47 -0700","Message-Id":"<1504217150-16151-5-git-send-email-dsahern@gmail.com>","X-Mailer":"git-send-email 2.1.4","In-Reply-To":"<1504217150-16151-1-git-send-email-dsahern@gmail.com>","References":"<1504217150-16151-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 681abbe6c85e..15396761c5cc 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 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 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@@ -123,10 +128,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:\")) != -1) {\n+\twhile ((rc = getopt(argc, argv, \"db:m:p:\")) != -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@@ -157,7 +166,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,\n \t\t\t\"One of device, mark or priority must be given\\n\");\n \t\treturn EXIT_FAILURE;\n@@ -169,20 +178,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\",\n-\t\t 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, 0);\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,\n+\t\t\t\t BPF_CGROUP_INET_SOCK_CREATE, 0);\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":["v3","net-next","4/7"]}