Message ID | 20171208145236.12635-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="BbxFVEx/"; dkim=pass (1024-bit key; unprotected) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="eaWRFC+W"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ytb4G35BBz9sPm for <patchwork-incoming@ozlabs.org>; Sat, 9 Dec 2017 01:55:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754137AbdLHOx4 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Fri, 8 Dec 2017 09:53:56 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:48698 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754130AbdLHOxs (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 8 Dec 2017 09:53:48 -0500 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vB8EoH3a008350; Fri, 8 Dec 2017 06:53:30 -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=BbxFVEx/iNM96lHYcw2y0M3+b9wiK9HooufspIKvskVfurdzDMLmRS9ft9100H/GIWI1 l7pSUAsWQiiUCixrGApWXa51zklanC4msqFvkx9Zh7ktdc+kvpxbhxi6uKnUrAVbOgdz CxeR9ott5WjkGSfrrH3YiLEMWqnAI4epNfg= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2equ61g9hm-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 08 Dec 2017 06:53:29 -0800 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.22) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 8 Dec 2017 06:53:28 -0800 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=eaWRFC+WDsaowlXIQpon1AoIJK3iUtNm2ADzxriYN7n+fPAMeKoBdTALlbIstVrgIZ5s/FXt1qi9OTG4txteNc68IBIby1WzlSkrwH2Ur9p6buZMm8jRvnuypUYaDSzlf5RzDVe1qeLua9mC76walaujhyj3w0O3dMgG1ZZkvmU= Received: from castle.thefacebook.com (2620:10d:c092:180::1:b43a) by CO1PR15MB1078.namprd15.prod.outlook.com (2a01:111:e400:7b66::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.302.9; Fri, 8 Dec 2017 14:53:11 +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 v3 net-next 2/4] libbpf: prefer global symbols as bpf program name source Date: Fri, 8 Dec 2017 14:52:34 +0000 Message-ID: <20171208145236.12635-3-guro@fb.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171208145236.12635-1-guro@fb.com> References: <20171208145236.12635-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c092:180::1:b43a] X-ClientProxiedBy: VI1PR0102CA0086.eurprd01.prod.exchangelabs.com (2603:10a6:803:15::27) To CO1PR15MB1078.namprd15.prod.outlook.com (2a01:111:e400:7b66::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96d503cf-5c14-4356-066a-08d53e4b692f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307); SRVR:CO1PR15MB1078; X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1078; 3:sWaMgUk8NOICNPEgdR2/nAUjw695pQB5Uyo6HsS8UlDjuw5/DlS76Ug4MQu6dV7FdsQW0FGWoBVJAJ1V+wghUmKudeJLnxjCoT+kX0MW2uUm3oG0wD736+JY3HcC9+2uAr2HlAgMf+nid0IjpaAEx3grddRrhrJyuj41XkY9udTxcirfSE0K0ZG/jJ+DUcVJFEupx+eAygKFCp/lkXfqTtcGbNjCi5RW7AeHNEb08MAKRpALSsFBC9cNaqj2wwZ6; 25:sWA7St01ZGrbYcOQVOcbcCfwdHPJgHJwLH3Hee7Z74IRP5j5QwqpyHS6Of1NyMGug8Avsyj3ifr3C4C//FRKNhlnR5x8CnzmiPPQQKIuBjbjXGtpqRZ0smKEcdhRueaG4h4HDLmlSUVTwbVszTUInMVsIzv6daVNilWaBPOrZmultniGfFNuFvnHbuKD1wN19Q3FB3mtCPtHv74oeltO41iJEC+YelGBKbvTn/JHt1UqBHqokwTES7rzLdKZkrHYebA2RkxmNNYZq/WY/q2u20Ps3O8dSPJ4MXTC0ZOtZ9WFXO6r2O/oJ8u7Xykt2b1sSrOx9xnlp3AWemRrmVlvgg==; 31:mJ7olN4Saj6E9bepxRn+0Nn5HAdG58K13kdbrtjYu+KWbLr480BhZSne6p8LET34Y2LjYE0/p0hW3g+3n5+APyX90lt6V/GCJLR4jO4I4emxsqxZl8fPQ3g3oDd5VeJKu62qPZ8KI4hb1SD+b/pP61xaAQTxGLtJGokmWI5zgntyD2+lKzPgm4ZuDDvbn0d6Q4RhI+gHIci1ZV+s3gRe3b+qtbR/TwEHChGCcXHnJp4= X-MS-TrafficTypeDiagnostic: CO1PR15MB1078: X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1078; 20:u50lSgd49MQ+1Aj5eHROoS4xRptXMxJOjDJRHzRstWaHe2yaiBRHqc1KNk7ZOEOHVkJE6HY8r9eUPnZHeETpPO7GZgLvI0QIqAeeFAc7NXfY79gux49WON3Cn10Z2ghVep/nfbCJrHe7+G/lplj0wkL3RqjIl8hqMX5WXrnRIVDDhK0Be04n6vl8QsR2PMIym+f3AMMOH4g0DmNRmdgQL4KvlwIoSquUWxD7mGASQGyHevy/2MiyiYWt8RBWaLTpUWPUlxDcd9NZQdiFkyHrmEe/io2+g26LdWiQ29HxBj1Emoy9BzxjDM1Glhida5cGX9sm+VfcgHDf6FcJJ/C3Fo7q0hRlFWKCnUfx+GP9t6vnCmd3MiXlwtBNBcXijiSRT95jCVuZ5unDz89NE9pR4Yyg+QQX7EnH/E3cp5rHPOPAdwRknu0oi1Z1r9xSIAUzbGZ1qL+rzI8zqMdcJ7NH70+ZI1equRWUO7fypBpueBEI3DERCNoM8c+Ow6yNDz6v; 4:LKoHFjgD16nI5DhZFi/4PIJIQxAYgjCr0R9u7ZfkvyDuDiXIXyk5ZKpwy5AfVpr2YYenPfQWNEDVk8GI2lNAAIZTXunfXsWmmFqUYLaLml8u++tqhzp7ugs0j1hfF6f6+entz7T6zVkhQYItxTnsuwWyDOQ22v9ti2QoDPXkpTuAOJ4NSyXqHmUwWdVOLcqwOVxSEbTqNTD8DTslxgqQBLkd1IQWTcw/O6eOteMPvaQIzeIgmGOt5Sq/q5mcXYuP1auwQZxWRcObVkfYA/TMzkoC6R8BpSzbqL9Zf9fNgSM8du8+ZwHJQeoqvBE0bVEk X-Microsoft-Antispam-PRVS: <CO1PR15MB10783CED45301074B289041FBE300@CO1PR15MB1078.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)(3002001)(10201501046)(3231022)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(20161123560025)(20161123555025)(6072148)(201708071742011); SRVR:CO1PR15MB1078; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CO1PR15MB1078; X-Forefront-PRVS: 0515208626 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(376002)(346002)(189003)(199004)(7736002)(68736007)(6116002)(86362001)(575784001)(1076002)(105586002)(48376002)(106356001)(33646002)(2351001)(50226002)(2361001)(305945005)(2906002)(53416004)(2950100002)(6666003)(8936002)(81166006)(50466002)(8676002)(6916009)(81156014)(5660300001)(52116002)(51416003)(69596002)(6506006)(478600001)(53936002)(52396003)(16586007)(316002)(6486002)(39060400002)(4326008)(36756003)(6512007)(76176011)(25786009)(47776003)(97736004)(54906003)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CO1PR15MB1078; H:castle.thefacebook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1078; 23:XoWIgE23r5x1H8u3gXsrLoDTcAF7/KJtW5iVgPt5y/aH39YfIi5ByTBVJsQ3urGzTI6JwRAxCGja45+UZk0ZsVn9TD5pGeNXMGDVm6oyuWt82wp9g4v8DPUx9rsqvGB4H+aulAD8a7z+uYv1PwyxteVI6GLvB8fxjrjd27e4YcXYHzfi2uAMY0MSl82mWXPgExPV7D4twNshNokysRoPkanGCpNC2+tpgguxQmL/TKp4mqoNC2CkSkg53HLbRV6kx8xTsgCSxTA3k5WiIGXQh0UP+6Wpe+QhLgyws+yrjZh4VpiT7NVnW4NAktDRf6IZcV5dcV3+4Ni5v4+7qeNWs8GjZfe9TT3Q37voI8wFk/+HLxc9HGJWCamrhmgMkp/1y0fQdCD8bDhpwU3H6YwAKcjxB11xdvW8eI14Jm/tvTB20yRxjeUUuiel17DE3l0Eplw0Jsm1XYr7kWy3uNRKymLmOeCwh0h4EYtOqW1XEp1FuM6F73zOgBekDxnc9LPhlWpfaB8uyBA245wk+Hh4g095CYMByqE9bg48Vw7x4Y6BeuO+44bIan6ug7GOU1coKm/uQbVvTP6CQmISi1/q/6+CLGSh75lXTD5gEF1z9shoR2XOEf5RS79TEpbonX8Uh//G7carX+mYxDZdEbmL4azmn8A0VfPS8dj7DX5l9mhwB9hc5XDCtomRMWVsponvI0Bj0Vg0apFun3oiGG4Q2VGFsiydfmNw0nAWUAzKThqoyivy7x59QOpsvSwub10Ev1PEQRXjOpVL1I9EEaWB0/TjgOpDaXn6R4SU1MrjNcXmcD0lxKKWYw/e5NG9Qysye8BS1P9zgKmAIZnHj2KGH801+3SLgUcD3bMAUqACsAqM7J0JIPi9+kiyGAeJ/IEsdVOgpnczcyzEkawDfi6+zdrg88XMUTLuAHGpJTmPVddQiHpiSieKUsszXwtV4wU/a3VZgVqYRQ+4NXHrdwb9lEnpsTdRBGHD//0dBPNJQYB6Zp8ezvo0AkEDuDnB2JMmV5bi3I39tT/wBsARL1V1LNVnhrrAAB/FoJa3dy4SBSzRUhZNCVb1OrwLqV26GDNor5y4+xMXJBXk2LisAfSphcQaSWsVtDiPkE+XR2A8BVPzstbUTuNo7y0F7mkANqDcCeoOZ+2h/MTf2BJuV8Xw3A== X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1078; 6:JZMmOl0JcXahXhG7Vl9Ka14yoIAexuC6IhVPbVPjhelVrhw45rEEbwwpMiQt7fcnrRFQftB0S95+ANrY20T1HW2DfhbUeHX/hZmAekNRmPVgVMcuUPFinbQ3NoaUdJXqnujUN76xw2biCcRzAyPwR/wCIL6BVfwYEo4RiofjIuXvTTkyTfTBPD/h+jXmyHMABlPcluKhXzGGQ5ITlZtQviiZBJGl8/9/tLPJzivBZVpSpQb9ucilKA6gto5mEvAO2r6RisZJ/JnsfcaoLjVMvfAz6GUvjLIexd7VwKdqVupRRR5D2HCHWe9euGHv1d1PVCqvmNXc+UQjsNfrDGVct5N0AFcRNKXLj2lD9t4XrVo=; 5:AWSF4uDqIvP6GjSntdDWho2TSU1fnxgeyyGN2JolMU22hhju1gm6jTX83tdztkTEDyaCUCAJGdIFZ2kEDCHvnABUE3EtGH7wpj34Y+IURAXSnyTaZNttxvNAO0Y2qx/tfIEvKkp9kEK7q61LRUCWvQCP6OlT6SI6W6vbmmUSwiw=; 24:X4+cinBBmUdt/5Q+XurUZDaZsxB7IiyMuGFLuYZ/9cLPGyLxuf94O6NsAc+bZfbjTgV8hLH7yV3DF1MWwqnsHFEYsAoj3GEUNPoVJh0OYUY=; 7:12jheQp3V2JRc+Xq4aImW8IlnqKdqggzVl+9nbHusLQHMtOhsQ8RC/W37hiBS3aXTroK8jx1KzuB5z9rnK2AMlX79ZPsI7Tk04ewDM7acIoQLn2trmCci+IO32ngmW21AKoJYenJwBF5JcIHBR2izWVgykDbrPzha1+G+kWzT9edOfvYBAfynel8KqHBxKnLHMOl3VuNN25o+Nv/weODfdLqLsj4ihIiavQM78FgcBNxkD/kyxMvbbC8yJtKa6Jw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB1078; 20:wTUMyp/JcchgsZlJpOiNuf8O3waohmqzKv+Db2dgppgc1XLBIndG7uU7j4v1bhF5SkTh2/tm1XSJgjxz8Fu/63E13mWtD0qZMmxJBEub0D9jZf46yWWm7TYc3ofg1CZOKHwpgOQzvPSTQBaiOW2h/E+bAfhYL7n4U0Q3FllyrC0= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2017 14:53:11.7201 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 96d503cf-5c14-4356-066a-08d53e4b692f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR15MB1078 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-12-08_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(+)