Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753374AbdLMPTv (ORCPT ); Wed, 13 Dec 2017 10:19:51 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:39740 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751975AbdLMPTm (ORCPT ); Wed, 13 Dec 2017 10:19:42 -0500 From: Roman Gushchin To: CC: , , , , , , , Quentin Monnet , David Ahern Subject: [PATCH v4 net-next 0/4] bpftool: cgroup bpf operations Date: Wed, 13 Dec 2017 15:18:50 +0000 Message-ID: <20171213151854.21960-1-guro@fb.com> X-Mailer: git-send-email 2.14.3 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c092:180::1:f726] X-ClientProxiedBy: DB6PR07CA0138.eurprd07.prod.outlook.com (2603:10a6:6:16::31) To BL2PR15MB1075.namprd15.prod.outlook.com (2603:10b6:201:17::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26d6a210-26e2-47a1-0f9b-08d5423cdf6a X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307);SRVR:BL2PR15MB1075; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;3:4B7RgjZJH1VPDVBwDyDpckwBv5vD7UMk9oeRbEg9n5rX7SNKiRInJoS7aRwzwwNY1tPcNOhf8bb35Vxoju5orvXru8/VZQ8vDBiiFWNVhhvduOvNU9aqLW45SElb9CnU8SfuvozA2PHXcxPrSCXAE85nwEVuWOvlYDvjgqYZnmxnswA4Jf8UjhQSfKm5gtWgNE4k6Yf9VgKItxTM4yp6LJdV6aPTZrLh6uoeGYemKlOlFjZNVe3TA5rNBYoKgxaj;25:mIy8QiuVGyiM3w2Nm3htsDuhL7cxtpC3TvjuvSurMRVyLLld48df4H5nfQh6JKj//BNpqvJf3yxTsTGCfSXwm9CmHUSWzi4l1VhL/x3TRjiqzn8bP1Ij2uhd3DBl2QHGJMPiCTzkfCGmD5fSr4IXzFCkh96SsiE2zxLk8cf1zTFkcmZaV1k+hzD86NYxfNNqaZubEaDGi5rGI6hLaco81Q4rqChKAl4MRZaSVnH74tBbgKbHh55nC2jO1s4o7ZbWLlcgJnD+LfFn+RLyBunhoop+WCjAD9Yxc57Jed6wQ81BbaLPAzmL0ffcJEFIQ4PWXA7V/h1GgHPPRNpHlo6MxQ==;31:E+W8AXToeTGqQqxE/p6lAs82ROe6nY3uJs0laPaT6Dnjqk/6RSNRyT3UFKxRN5BUa874pgej0B0XHp9f30AR0lc05XWE7KIVxKBdEzq0bAiO2Ff+ONJ4nd3GbAeKccVCLsd9UQDMMl5hotnwEQmsN4rjFZzcTvFQZseuvSJRI8drzRcRqHLAJ8tVHc6jfpzT5NapNROiQJwKFmSfe2vpy1fR2K+AvO6m8TCnb9494oE= X-MS-TrafficTypeDiagnostic: BL2PR15MB1075: X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;20:y0ZlvF+8iySnmc0RECYbTdr8aFFRiKGrTThWD94Om697FhxxNCs2yfjeV6iSVwkiAp8V3jOQe3ibK2vfCmLtFALvidw7Nc2eO/hmDR726GmhUX7xsqUyhrHGx4sBfJyve6TOBIsLNuxnLeqzQTEf7usCgAYv5q/1iJGo1cX+J5S0EaUCFCySQ2hMtL+TvW2/TYAS4mZ8+WggfiMMR+YPwhOgjDwCthgqmorAhfrpVCJKkYHUyPgPXU4nqiBCgZaOlvNBlzhNval3fSNMPVjSZog9hI+F//fd7fQCmItShCeVRgghWJfYlSMqngA8rtgjQGIzE53XT0CkPlF9OWNImL5J4MiIk2ZDrKX3e/MFkkd7BdiP/MgNmv2naIy4d26oYf+nhMRDKtNvDVPz4nflpfYhrAdvMreiQnejwoDBKwFQkR0thGk22K4ANKRwmFVHkWGuzV/ph6cpSP3Xglqy4KZ9d9jHBMtzNW4TGFDdSBW9fhGclEHghF6uYYfVnb2+;4:oWKsUpnM5Whh9om3VMO9Li6vgFY9WOSGa4Aq8ccnL7faL0dT60UwZ1oMykJjNr8eY5VSHTUNfiQEQo9mxMvroDAHDMAvwuiSZN3eaJkHXWnNZhu3FGbF1+/bsFQctCeBDV/Y7QND9GBvSp8OLu2cbpwvG2FtL9YU6wtMgRO7IiOp98SIDeXYfqWQZNLjn4nnnLDpUC5V+uWCjFfct+/2sTRKVH5toq/jZtucByPdzTpRajV+KwdrsUksWCArX47RpW6Kscb0ET3MUvCBolBt1A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231023)(11241501184)(93006095)(93001095)(6041248)(20161123564025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(6072148)(201708071742011);SRVR:BL2PR15MB1075;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:BL2PR15MB1075; X-Forefront-PRVS: 052017CAF1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(376002)(366004)(11905935001)(199004)(189003)(48376002)(7736002)(52116002)(6306002)(6512007)(6116002)(1076002)(305945005)(5660300001)(53936002)(52396003)(68736007)(39060400002)(50226002)(4326008)(51416003)(8936002)(386003)(6506007)(8676002)(25786009)(81156014)(478600001)(6916009)(2351001)(2361001)(316002)(59450400001)(81166006)(86362001)(6666003)(50466002)(54906003)(16586007)(69596002)(47776003)(97736004)(36756003)(106356001)(6486002)(2906002)(53416004)(105586002)(966005)(5890100001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR15MB1075;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR15MB1075;23:51eQ1H0fOEXJ3o5stF0O5TsRe9qLvhaXkJxCcTVnq?= =?us-ascii?Q?e7H7jRpdKqSQrLTB6UvR9tuj2YEBVvTzNQS907+XhIWVy61Nby4n2/+pWnTs?= =?us-ascii?Q?deMmFM9AESscTAV7XYYGv6HQkTTSW4m9q+oMx7unPDlrpX+j5uZiU/QQ/d+A?= =?us-ascii?Q?svl7/x3Av8zP0NXbZPQR9EQpO5QF+HzRwqlCWx1r0/WEFYQAZ7cnc/SW9okX?= =?us-ascii?Q?FIIlvgkMYO++8etKiwQSGJD3xdI5HU7ITrjWNYvmH6QRXE9ruvOOwywvkd/i?= =?us-ascii?Q?wfn6OdepLIl5g8bu1WWh5XzuyusRPRAk16DFtFLj5HcxhJEIctUmZKKlE8Eh?= =?us-ascii?Q?qTmLGSg18r8oF/CpQSa/Lu/tptNd03Cn4ENk+Q+3Y2cRNVM5fS6LYLIHHYIB?= =?us-ascii?Q?VReSUce3vwKnQatDN0fNAQZQnaOM05BXOXCcYMHkPjuZB6MK8oedYhdqhXIY?= =?us-ascii?Q?5RRkZ1Hk2hX7qii2c+s3cgr5CYD4owmW/gtuNMUj3MQl4pYgvD+rR/E5dmri?= =?us-ascii?Q?UtJLH3MDGAAKHyqi40E/OQeTI2vlKaKeOX8z/VX8VfFhQwihqE8Zf7v9/kUp?= =?us-ascii?Q?hqtphBtf9XbCoCBKe0O2408ZGGSNrPqYJeq9LIGPusTUK7gtouMSy1JkC8Jv?= =?us-ascii?Q?zAh1s647dK7s1ArYvH/jcHvuHO+RtHqGLIPuBuEuG+IbGEPN9ZmHWJiJoIEW?= =?us-ascii?Q?RQbVB/DZHvvY/vM+5q047LJRKhFYWUadDIyDGoNOTCr5TRmGclz/j4CAyMSL?= =?us-ascii?Q?zdXg8fcx1rq6dJ34QE3l3m/Jurm84UIGigruZjLjznYAefOD+UxNWQH8UqlJ?= =?us-ascii?Q?0JF6EskE8SFUeByo5cESIZUr/n70W87XSVUsyLsWtXsiHYu5IrhNSivn/NM/?= =?us-ascii?Q?dxDswLhmJZvZCud5Jg3A4WIqFkXc7cEXOgTdnlIFRgPAJTZAcwxMO03M0NmI?= =?us-ascii?Q?K7HNM6CI389RiGgEmcU5KRQfg3MVCwI9y2SHGnwQvg0jWdWPr6H97wNcxunG?= =?us-ascii?Q?hvE0pHrYGr4EPOBKaJiRCyuGsxC9/5eg02dY7IPL2Zf7PTpB4VCix/oddni7?= =?us-ascii?Q?v/RN35WtAhGCrZGpkEQBDIo+vqhG+nVWdcEjgOpL1YE49zlnPKxXokMoTNx3?= =?us-ascii?Q?wDGyuSQLmx+25Gfz+Qr7uNh0aLypG47Adk0cXqQNjUBOqbbCp/TmXn0CuMUE?= =?us-ascii?Q?bjiPjCd5lo67VJj9CspIfbwmH0xLRURVa7xiNvHdCwXXcXGHHFyo2Jgsw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;6:/PoL1LJ5+z3Obpv9clq5AhR64ZqsX2nD+Ni9Ux+kOu0b9WVg1FqtnsIeOLveyrlFpuUzwrdrlNAKsK0Y0R17DmUVtKJhKsPyr46nlsssR0FM9qbvYHzUwZ2+k7vz2Hy1eA/8aM3rh9mwZzaI9BBfYnNE/DDEoGUq3BuSnnGTYnJT1IPVN20hcHDZaxyVLSc0/dIhlNVZghYd23cmXQF2QElUs3I9j2r2M2FVIBTs8mUDy+AreAod5EJfNnZ/MYnhxFJ3J3KgIqGPmtJty6nKvQR/m5E/wsUQvdCwnpGKBE5Y/JtZWPWgiHZspYmSq37MdCmTHlrV8V5R6l03JdpbwDG+4seOa8624qdyFpP+oQo=;5:v+xyoXUsBqJrbsrls9zq+ziKRB3s+4o3RMCo+jY539P6HKufCpFIMQeJRg0aW2QtDf1Y0cLwC5fwLOHaO90ZnzAXQ8lBlvxmup2GCRl2NEvQeTaIb/0JNaWzsupjWzMNDVN4mRVV5Kn7d0FH5pKw4OFpLVi7JxpMu4j9G2bGfYI=;24:IKucxY3FA2CJuujTas74snyLFrfUj0Emv4Cxd2husS9yX6LD1u/i7l4Zc/xhRtPFGhUwaYen9KBlbjT4HGzS7h1oY6tDLQrznG7lxr9gMWE=;7:a8jq5D0j7D/XUl6b+/RAgc+/TOEonXS2hRXKy3FMb7iFyPz/OcWjq5zxQq4zR7WdJkKWODSBY0wXKNmE1Jd+nYdkTpJEhS/EC1WEht/ecOeUANzfGMO9N3LSGDikOnK4Jd6y8S5+m7Gb90qcCVkM2Bhgcqs6TOauMxUeKwkcZI8DgCgEA537F2AnX8K19jYICe8c7GsVD1GHyc+08H2A+FWHoyxosu0be8Yn36A/p4xVCi2rMILb8RfA1MHqw5/L SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;20:v1foiZsbjZig1KwrZgnQbLbPc6abYvqVsVmvXWbjiNTtqjBn7+43bMxICe5IZyBc5mtf/1Ye0wIbK9XJWImBtkVX6fQ7O8JBu88hAuwIde6p3GC4GZNBlQUpEDzoIkIXSMnzc+Nbs/xJaw8oitb2nAgrIWpQJ7GD32ExnbDct9k= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2017 15:19:14.0283 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26d6a210-26e2-47a1-0f9b-08d5423cdf6a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR15MB1075 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-12-13_07:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2613 Lines: 61 This patchset adds basic cgroup bpf operations to bpftool. Right now there is no convenient way to perform these operations. The /samples/bpf/load_sock_ops.c implements attach/detacg operations, but only for BPF_CGROUP_SOCK_OPS programs. Bps (part of bcc) implements bpf introspection, but lacks any cgroup-related specific. I find having a tool to perform these basic operations in the kernel tree very useful, as it can be used in the corresponding bpf documentation without creating additional dependencies. And bpftool seems to be a right tool to extend with such functionality. v4: - ATTACH_FLAGS and ATTACH_TYPE are listed and described in docs and usage - ATTACH_FLAG names converted to "multi" and "override" - do_attach() recognizes ATTACH_FLAG abbreviations, e.g "mul" - Local variables sorted ("reverse Christmas tree") - unknown attach flags value will be never truncated v3: - SRC replaced with OBJ in prog load docs - Output unknown attach type in hex - License header in SPDX format - Minor style fixes (e.g. variable reordering) v2: - Added prog load operations - All cgroup operations are looking like bpftool cgroup - All cgroup-related stuff is moved to a separate file - Added support for attach flags - Added support for attaching/detaching programs by id, pinned name, etc - Changed cgroup detach arguments order - Added empty json output for succesful programs - Style fixed: includes order, strncmp and macroses, error handling - Added man pages v1: https://lwn.net/Articles/740366/ Roman Gushchin (4): libbpf: add ability to guess program type based on section name libbpf: prefer global symbols as bpf program name source bpftool: implement prog load command bpftool: implement cgroup bpf operations tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 118 ++++++++ tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- tools/bpf/bpftool/Documentation/bpftool-prog.rst | 12 +- tools/bpf/bpftool/Documentation/bpftool.rst | 8 +- tools/bpf/bpftool/cgroup.c | 307 +++++++++++++++++++++ tools/bpf/bpftool/common.c | 71 ++--- tools/bpf/bpftool/main.c | 3 +- tools/bpf/bpftool/main.h | 2 + tools/bpf/bpftool/prog.c | 29 +- tools/lib/bpf/libbpf.c | 53 ++++ 10 files changed, 566 insertions(+), 39 deletions(-) create mode 100644 tools/bpf/bpftool/Documentation/bpftool-cgroup.rst create mode 100644 tools/bpf/bpftool/cgroup.c -- 2.14.3