Message ID | 20171207183909.16240-3-guro@fb.com |
---|---|
State | Changes Requested, archived |
Delegated to: | BPF Maintainers |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="nGCEo2tc"; dkim=pass (1024-bit key; unprotected) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="OV6USuus"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yt47R4Kw3z9s83 for <patchwork-incoming@ozlabs.org>; Fri, 8 Dec 2017 05:41:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752887AbdLGSkh (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Thu, 7 Dec 2017 13:40:37 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:41328 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752699AbdLGSkJ (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 7 Dec 2017 13:40:09 -0500 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vB7Icoel011658; Thu, 7 Dec 2017 10:39:53 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=wl6vjurJlNB5D00zYmtSGe6h26R0nmZcSuQKRK4gYUY=; b=nGCEo2tc9Ky38EYHMlpMggC7LmEbAqrmUfdXehMnnHbPQYLPH0Lzl1ABb56Zn/gDUs7d p6uq699gE+rXZ5QGVVwyCXhx/ULECZsvWsdsHuKf8OJFhlX+tcsZ09H2Ci3xUsslszYI iC/ya/B9DQ0bb7nYTOanvCpKCm8Eq3OjTdc= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0b-00082601.pphosted.com with ESMTP id 2eq8hhrqk4-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 07 Dec 2017 10:39:53 -0800 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (192.168.183.28) by o365-in.thefacebook.com (192.168.177.33) with Microsoft SMTP Server (TLS) id 14.3.361.1; Thu, 7 Dec 2017 13:39:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=wl6vjurJlNB5D00zYmtSGe6h26R0nmZcSuQKRK4gYUY=; b=OV6USuusfORRqf9vfcMEVsU3y7H5oD4+SxjWjQO5Wp5KMWL2yQoc4iTFld+HhjaMruTJbsFPeyrHNxdk9y4qcThGH9ezMv4T6UfMLJi8LBrocWwu/DxnxfCOzg9uCUkfDpCJPj3mIVer/ioKUoIGXpR8NBBBitNPBnZ6mTIrAs4= Received: from castle.thefacebook.com (2620:10d:c092:200::1:e273) by CO1PR15MB1079.namprd15.prod.outlook.com (2a01:111:e400:7b66::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Thu, 7 Dec 2017 18:39:38 +0000 From: Roman Gushchin <guro@fb.com> To: <netdev@vger.kernel.org> CC: <linux-kernel@vger.kernel.org>, <kernel-team@fb.com>, <ast@kernel.org>, <daniel@iogearbox.net>, <jakub.kicinski@netronome.com>, <kafai@fb.com>, <guro@fb.com>, Quentin Monnet <quentin.monnet@netronome.com>, David Ahern <dsahern@gmail.com> Subject: [PATCH v2 net-next 2/4] libbpf: prefer global symbols as bpf program name source Date: Thu, 7 Dec 2017 18:39:07 +0000 Message-ID: <20171207183909.16240-3-guro@fb.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171207183909.16240-1-guro@fb.com> References: <20171207183909.16240-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c092:200::1:e273] X-ClientProxiedBy: AM0PR0202CA0031.eurprd02.prod.outlook.com (2603:10a6:208:1::44) To CO1PR15MB1079.namprd15.prod.outlook.com (2a01:111:e400:7b66::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 210b0a41-9871-4732-3b0b-08d53da1e052 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603286); SRVR:CO1PR15MB1079; X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1079; 3:NhcpmNqduV7TmX7eHOUmge+QEc0Od/onEO/JZlAoyT8wskYPEqN20KW40kCzdgaZvUL+Wx48LX7HV7Ba0t/eXr+IsC8qNZfMBd98vcVI8B2uaS1HTkzBhNWKOqb2auBHBJZjfMGUfy+HqnsbKRvZgmPYnEGcosz5q9g8J+WunE8mnHX9AiL5cwox5yBGUtg3KDNCyiy/uGIcUjn32YNrdzXOVYFf8vpuE/CuQsS/rh8C17rQ12jaIVJELQh3mQET; 25:+pNUMu5PNnOF7IkOwt3TsKEOe3FD2EMhfAlGxJOE6nqWTvpQBVDQM/TAVqGQI6q/2DwxFLUeUoeJk2jty0J/Gfe4tazSVpGM6q1GfYqxptIMmT05IcDXqgfa5pV7sBDXD1k7IxFWkeqfNRLng/XkjJUK/gSzBEcWMl0hWqs7M9gHKsz6TALNGHqZEHRMpG2dcAAuU7JphAKKDblfowtP/XQ2rQilNSqevrjIR5syiB3+nJaVD9FO35d3wKQpvRNf244uY78NBBPn4OuBPUgabBesnWPNBmmiXgRZaHe86KXdqEwFjaPz4ZnFb/98EqLEsju16Yc852zGpy5arSubmA==; 31:uXGGWdUhxrb8+K+Mc1+ftU2Ul0xDkWpUEGpgNAvOC95F2vYG2LHsgz+f8u3rsOS5PLW2nTCz2rqrj+XxeLqK3nbdHyHT53JXdgVldddFlVYcbUxe+gMv6yn2rmoQfsu+YJi+orLfE6XB/7MfyQmsQugySfMyMdCXLizEcmmO47DDp1S9yJsaJoHFDsFVB+9buH09SIMRnUjFBWobXNoEAlZ0QyWryMod3kNbJn6dF8o= X-MS-TrafficTypeDiagnostic: CO1PR15MB1079: X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1079; 20:C/RNjykCNOnjcCqjjPwFp0eNJHZ4wds+Rvjkmr24+I/UrMCZq7OCSoq0UR7epzGqYoLv+fsWHIP0pBxJzIINoXapJrS9L0Vm+EVYSTKgkby1eDgj0rUlAS9sxij/fVGZKlKfBozAAcTcJeNUfXjLk9CSm3wm/vmc6ZStBWyiSwipILUBtY28SabKS1P3DEFiY2pTV5i1LF16cjNPLjkIzrmwENhPuiFZHhmBn3eJriyWil/mtdFiv3AF3xm+jiFTb4I5+Jj94kHmkVC3KbGSjoK+f0nZRqwt6GOtpMTRnA+28Xi6zgG9lZ8eHJZT++/TEBjQ9iHF9SygzRHaY6HV6rLmALCeGWXHT8GgHJ0Ygy+QGWd7h060CYbNO0fdqDLXPLcQFug9IjSsNYGJ+dJ29IH0YHZeCBdDPL0e4z06nZdj+ftgYVk34BZKKZTedkJ0Z388D5gi/kT+OgwmjetbCwDwu6sgsNxe7+fLeeXK58SObefHSgVuy2BhLpapGvTS; 4:e0KY23mY8kouacLbxLXLpp4atnjUTx7Raifdu+/uHIN3nUst6t2ZWi9nkdZxmDhVcMVRY9RQvD80c/ylPQ8iKKueyg6D1b/q5pBrWAqY/4Y4fjrNWmT/wQ20F5//M/M2bvHkThc80LcFkuzYE+FND8ChevkTBbIerJJNkOaLcP4a4LEQ0qQMFCX5hGWYc2cVBr9qrnBSDiQbd4eM6covH3VKjuSOlCttd1jK7Ir7+qyoDPOX4VK86EQqpCtnfRGPjUB6UNQC215tVw2geRR2a83wBbntSKueFivAnEri5N2rPbCEuJLlEnJfUPYAr5aZ X-Microsoft-Antispam-PRVS: <CO1PR15MB1079D9ABA163745E8331C1C4BE330@CO1PR15MB1079.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(11241501159)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231022)(3002001)(6041248)(20161123560025)(20161123562025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(6072148)(201708071742011); SRVR:CO1PR15MB1079; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CO1PR15MB1079; X-Forefront-PRVS: 05143A8241 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(346002)(376002)(199004)(189003)(101416001)(52116002)(6506006)(6486002)(8936002)(52396003)(478600001)(6512007)(97736004)(16586007)(316002)(36756003)(69596002)(6116002)(1076002)(5660300001)(6916009)(2950100002)(53416004)(54906003)(81166006)(81156014)(8676002)(305945005)(7736002)(105586002)(106356001)(33646002)(50226002)(76176011)(2361001)(68736007)(2351001)(25786009)(6666003)(50466002)(47776003)(48376002)(2906002)(4326008)(575784001)(51416003)(86362001)(39060400002)(53936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO1PR15MB1079; H:castle.thefacebook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1079; 23:71jbuetIDs0ptExfR/fcDuk/OYhZWXGDnuwv9DqdcFy0VdrLIYFgbs0aPQXeMGW2NxNJ//lIzIUQmG9JyGMVOSklSWrsYV2Bli7BCQAVY2z1tg/fsMsBhRkjAzW6dkw6aQCyKuzFf+oMNGQf3QzR2YAT2D5ZuQg3icYBJMkpMKij0wNwiFkbHqnG6CrW/eUS6DS6Ms1hJcO8MBpC84nScn4A7Hx+7Wh+jskcv86NaAgGRFrm+Lxn5maM+OHE0K1HuZsNEnMA56M/f/2k+hDaOnDiX1VjpKWyvUISyPjm4T4OnbW7KB2XaUc4fcaZ/awK1jXtyQIjIaOsKwDsyb9st3ls0hOWu/6YwMXRlissbSHwrB43IoEK7FAWQXsJhl3f7cfAopBe0c40bMHeSsRvvIoJpyZ43V3s2rTk2HSKyKvyBGhccmyW/LtJRhQmKnVQIL1ntuonOyre4IKiefZh8DLh6pfXCLNmBVbAqMmPZG6syfsP7JL4eP9c0mDMjwCpXj1gp2gYHfNY9EnW9TQSAzvm8KzdiNSW0oy9KcD691nzlfMCjwOYO56laSSCLpqR5jea9bJ6tRLkq81E8jOl0UApj0lbMbTU5kc4ocr9givBO2VPHNtGDZI+nY+K72IfUIYyOxBbL9MbrrsZqYGGtYW65kmtBscyAH9xiwgxTTYx3BDnR9QTsfYVPpdgE997O1pY9nTwyzdV/grmGlDsT1L4R8Cxx6Fi6bV4QRlzJSuYCAsvrqa3PovJNmos/4GJi8Y+9lpLQWChjt8sk3Nir7cmEahn/kwow0rP2iPejsz9JBQB8RqUjk6YeayngOVS3VFzCmENgsZYIm4di7ITaI2ae7DtqReNmK8nnMLV/7cWaE6PV/bG2Hz32+Z9/GXJX+sLiLc+zlbh2VqWXld1cfsRO1IqFJD9etJnh2f+H85T8IvyGb9rmlBNPGNymWl4Kf1UZnWAjFh/uBL2C3qf7m/J1rXfC/Jwq6rjwALNLkLd31SYgoma1iw07Nqejemtpj61a0TFSft/98cQStxeTw1Toagjy9TYCy/bnGl8lwrIsVeGGaXqMO6pUdM9pHsAlOFJ2sdFEjl03ZUxPTQDWbE7dKCP95uDQuPPRRwzjubK6C8GRXq0Mk7Ur+QeoWKxT63wYfjnPpuX75r5ykXbMGnijwflsMq+khR3w6GWJXyhn6exPCJCgDlCQe/52U69 X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1079; 6:38SuRM1XcddnAT71eBpiTMc9lgaYKQin6pHdEf3GCuFs2yQCyQs2u0N60nzBMa7BkpDI1oXelRrx0ZciVX79zrMINUCVuyzPdJW6/ADAytbk6ATlxPYVLR9yS/E5VgN82kJBnTKJhcKkbachOyn6fcMtHnj87OkW5TQZYuL+Jc+y3ChkUvBb9Rp3kbtv6OKoIinfoek/L4SNy45Qg3v90XFN/p8OizORkdiARPSUqxlkI9OCoEHxwqvqhrEO1aj4X+ic0Put8/d1cN8XaL1nV8N3ZGOJjVH3ux2aQvbYGBy+ouNW1EvwvgkrRyIDO8Q+o0z4FngHkLIVPd+z1suRUnhxUYUGeLWU/0PkIMf8hK8=; 5:SKubg1kAM1+pf9qj02AwGQTwEE0A+IJnquY8Bm/SPolt8UsrflRhIWwUaOOrQmM44Dk71hImZVv23FXmejXKQB8GQpn4XuddzUn9hhKY1d4Ffs/0YVJguBTvSV1LaWDjO8gnBIRGZo5StW7tcOTB8wtOoi9PorBl4i6NWOTyfeM=; 24:VFhgDcz+5/PU+HZCbknqEDa/xIB9D0RmyD8XumUevvi7RzGTOVdXDi/Bjy7InLm3dPqn0NQUMKnSaO0Ejf1EvRq9FZKI+BJM4bxjMcgYslc=; 7:vOLzE72lJ+wR55m8ZdV08w+QvqQ2skaqM0svmmz3RuWfAGisyh53oPLdxiQyM/6KdNqpdu9tI95ZyHp7ESK35nX/av1gvG9ax6nWsECDeVeCyTv9UpkhtD79F8cvNOg0k1TLokkVSdh3N/QzTJuX2QVSeLjDwEn7EtuBgcXNJREafn1YRUXek/vCj31NfpQ7piJO/aLcJvroJfb6FUG33+/UuSrJrH5JKCkyvRVDV/D6dUjNx29+Xi+Njp+jlE2x SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1079; 20:T07jaJ8q4q0RTuhZwfJVQkQMAxPpYwHy/3BDkC8w4sG4Vh7oqEeUSPp+NmU98KE5O9AT5xaM0c59VydIAmZgqIyZDwxeSBoPI4r237CHjYwWfLgdjzuSi5N882IeloKIp0sX8bA7BXNXogZ1w1psvDt9jDwW+pe5ww0/BKh0WOc= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2017 18:39:38.4681 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 210b0a41-9871-4732-3b0b-08d53da1e052 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR15MB1079 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-12-07_08:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
bpftool: cgroup bpf operations
|
expand
|
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 205b7822fa0a..65d0d0aff4fa 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -387,6 +387,8 @@ bpf_object__init_prog_names(struct bpf_object *obj) continue; if (sym.st_shndx != prog->idx) continue; + if (GELF_ST_BIND(sym.st_info) != STB_GLOBAL) + continue; name = elf_strptr(obj->efile.elf, obj->efile.strtabidx,
Libbpf picks the name of the first symbol in the corresponding elf section to use as a program name. But without taking symbol's scope into account it may end's up with some local label as a program name. E.g.: $ bpftool prog 1: type 15 name LBB0_10 tag 0390a5136ba23f5c loaded_at Dec 07/17:22 uid 0 xlated 456B not jited memlock 4096B Fix this by preferring global symbols as program name. For instance: $ bpftool prog 1: type 15 name bpf_prog1 tag 0390a5136ba23f5c loaded_at Dec 07/17:26 uid 0 xlated 456B not jited memlock 4096B Signed-off-by: Roman Gushchin <guro@fb.com> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Jakub Kicinski <jakub.kicinski@netronome.com> Cc: Martin KaFai Lau <kafai@fb.com> Cc: Quentin Monnet <quentin.monnet@netronome.com> Cc: David Ahern <dsahern@gmail.com> --- tools/lib/bpf/libbpf.c | 2 ++ 1 file changed, 2 insertions(+)