From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753133AbdK3NoC (ORCPT ); Thu, 30 Nov 2017 08:44:02 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:50722 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752819AbdK3Nnz (ORCPT ); Thu, 30 Nov 2017 08:43:55 -0500 From: Roman Gushchin To: CC: , , , , , , Subject: [PATCH net-next 2/5] libbpf: prefer global symbols as bpf program name source Date: Thu, 30 Nov 2017 13:42:59 +0000 Message-ID: <20171130134302.2840-3-guro@fb.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171130134302.2840-1-guro@fb.com> References: <20171130134302.2840-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c092:200::1:638c] X-ClientProxiedBy: VI1PR0602CA0010.eurprd06.prod.outlook.com (2603:10a6:800:bc::20) To CO1PR15MB1079.namprd15.prod.outlook.com (2a01:111:e400:7b66::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 295e0239-102d-424d-6e9c-08d537f85990 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603286);SRVR:CO1PR15MB1079; X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;3:fzjwaMZDKW3NSM/Z0mRGr8Jh7j0Ouzxmv87Vr+QkkOnyPuDQVSHGvsh/3R8+w3Z+dkJAXymJR6QQQqUnwvhd676lulK7jrYC6UBDTTcWeaGNVykaa5vfnMacVMibX+2xGToTcCzaKGRTuiWlLFcayUB6aKjgkQg6+j0P1kBsSaa5eVtzYP+DJzOMtT/m7dnDkP/gmDjFySce1Z4TF/9skjZzKtT8owEOzN7rYuiCvmlu+YIn5oF6leqv7x7M3we3;25:iF0XKfaMz3nRnIBjsxqzGJGYQotCL8/vRjk3zrpHn6zgcC/yhew0KwwTCe1xJmemsFKL35BtiCJOxAh1nP+vP6JR+YTa4hNeP8MJd2k7AbX4mRvvctSaDYJd7BwtD61Lo9XZ8T5qnes2LdRGL73NobQtaIPuiwjs0uwJlENMdvsSYp9xa6uoyNfyZ5Krdieev+oLuJ86QG2S/XP73Vd0Ycv6Dm9n2qnHKiBG6ssa8WVAeNpSWHp0ozTEIOd3h8vOzNcGHtMlrl8svAw5Ec1iZKFUZvDsEOlIaBJYM/blRZthiLgGL5DzIpGTLLHIPdEbEfJ4NC7aAuxMHHC4wC+gTA==;31:ERF9Qhg2FiolwYFlEla0JJR3YIjnDAVRp6nE/h+5qFplRfa/CAZZZMJsZmbUt1vi9nGE8wpqWz/UKDSR5hDJ7hUGB8d6FiMv76fifz9L9dSLzn+CAPYc6vKXgojx8R16xqDJMJvvFY0itUihxN/j2sYPuw99yxAug46FGJFbsvkZ0D3zbWy7B0DkIvB084uoc/AwByJzPLqNyCwU5I1eC7JR5ELZBXXNNvlQLhmEoG0= X-MS-TrafficTypeDiagnostic: CO1PR15MB1079: X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;20:bXrUuDW0ifLzXhPu8GTxh52zD9w868Q/MzVoZ4f9/z8aUEYdFwQutOR6RMuI2NvIr7F2ozJJxS9lP9SoG1FOerzCjs5rp45Vnkaenidjf/hX2YNh3ko1xKQQ70J60oZLMIs+l7yaHV098BERxgrgQK9lg4DAbRp5KpvPGXTt9BXeycGOKt9UGXjbMQfzL4AHG4A411Q8RaoIPcDJBpvSly2jJVb6cdgqsVMxatJkJfqjuKqybfo1B2ndkXeQQntvhcnY0seS1mIR0w+gTccDwX/IVEyk93A8HiC9XE2lyK493rgiT2XX1y81X1St8vHb01NCLyUaVZTCeDoaMbYdN8NidTMpcRp319qEWywx6narZqGCkyYMBZnviTkjasZ8cfQqFjjh7buaRw54pJKhN+iMnYqRY+A0pV7bhnYLbojwPD6sBoPXHZ2DVmHrDvQWHJ9i07DQ2fGLVremLgLDMMdWpsDZ/x5hTeh/cWBC8kEoR/87is6cBvPmvT0ajm/o;4:M4Ef6CcdlmrOicdoTzJTYPuy1Re76kx+2avJfyk8Lac0CLUXxfQkfJSjDxFLMnfoP5OQDfO8PCm7wSkpPpuzUzXMLzUbbBI6R6IL5sisVrztSO1gZFVGrjzZ869ihcOFGsVmm0mM5N/0AmVI/7bndm/QJsHXoGqGXnZxpu4KiX0kAgYbVM+Q9oJBKFppGbF32ejkDb2HaJnw5/FZGPofatIRAV6aghIYsn5aKnm3ttJnoRdx2WIgKuvO/e0H5BVlaVKNye6kYG53DAOpSyzrT1F5RoN6onxBQLfkbRhTKsOE29ZUyCrklruuiZTAenqq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(11241501159)(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231022)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011);SRVR:CO1PR15MB1079;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:CO1PR15MB1079; X-Forefront-PRVS: 05079D8470 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(376002)(346002)(366004)(199003)(189002)(68736007)(48376002)(53416004)(86362001)(478600001)(189998001)(50466002)(52396003)(52116002)(39060400002)(53936002)(2906002)(50986010)(6116002)(81156014)(81166006)(51416003)(1076002)(8676002)(8936002)(76176010)(50226002)(97736004)(105586002)(2361001)(2351001)(5660300001)(6512007)(101416001)(7736002)(305945005)(6486002)(4326008)(6506006)(25786009)(106356001)(69596002)(6666003)(33646002)(2950100002)(6916009)(36756003)(47776003)(316002)(16586007)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:CO1PR15MB1079;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO1PR15MB1079;23:bE4Na7l6Ep+VfvBEelH1ciTGcDDmSvEH2l3Ep/Uod?= =?us-ascii?Q?nCvuYTG/lRcz1tQ5gX9z/rzsUu+ztFErMtFmtJY+VqYeOcRSRUiETZhB2dEW?= =?us-ascii?Q?VdwUVQkNJ3qyo3bLXo2L+XzlHM86AzKvDZ6GIszDbFpUfZHKrw6KyT6btRL2?= =?us-ascii?Q?dty8wf4RF12/F6wtUe7q1McrNuzSjuH4iTgHnYHpVZ9NFk7K9z/+adPg8ASh?= =?us-ascii?Q?gkKWzSo349dgnvw3PMw3Eqk7qtB43YoxxXzrTgoGJ+1fQBW8kJ3AdKaLuJol?= =?us-ascii?Q?QyM3AQBhDsOxaypRxclEywYdVwkgy1ey3Gr2aUgMXboZmT1DlIiXRwVrWQxy?= =?us-ascii?Q?+/1Tg/CLPXc6hiDrmrqzT49z32jZN9Zx7ZZ07+ARE27tnUrmJXyUVgEi4NhV?= =?us-ascii?Q?p6wjS4LbXHQJb8kN0fmTmdY1vy44kL9E1/taore4d8qRQ0t+JmQ9M6bJ8KiU?= =?us-ascii?Q?fhWnUWWXU8a2oIB0hfF1gTIFSoWoAsmJs+FJon6VYEUviE8CNX0qOUZJXGoZ?= =?us-ascii?Q?S93egqhbK1TQEv4CnOhnztcCj9cCP4zWI1ddevCvu2acd3Trhz5qn5OKZhR7?= =?us-ascii?Q?LSWV9a/jv+Jf68hbPzt7PX8QyqoffnnhgwA9+wjDLWH1n3QU5EQmlDQa7tg6?= =?us-ascii?Q?/GO8D1VYwbM8scZHB1yiFXdQLkXqKUvG4c3+ZOnk36iW+XxYo/sxuf4NjcIi?= =?us-ascii?Q?P2kf+RUtT0wQjqCxKC//+Fg2orDesxZc88kKHHj9TsqXDngoaPhiP2G2jf7C?= =?us-ascii?Q?02xrFZ/b6foHcR/j21jdsJpMx6NmNk8LkoGyug/nz1+i0uK3N4asyHDQ8odu?= =?us-ascii?Q?8fthKNrNRouWIywoDAkHkj9gKle/vUEAUhWIXYRgGzbCObZZp5qooOG3skz7?= =?us-ascii?Q?jTmlquFHDip+IStYXn5dRC9dZSl8yzhX0NhJEYI0dUVOGayHtppkvBzB4TsD?= =?us-ascii?Q?/+1kUBaBpJ/Cjz57r3QWHwm8hnV7zyBa2hK9d5klYcJPewladVSmAJsx/MWb?= =?us-ascii?Q?BzW6m+mBDtgfA2/cugRJEPYNf1Ovj3cKV+VFVcTSRdYYc9goO1BdwbX1u5kM?= =?us-ascii?Q?E24jdTZTGuwYkQKldicMc/lTARXg9kUQ7O7vDSo3JmUuO0P1hvElr3eGQs9n?= =?us-ascii?Q?qbRrHL2pIAjmTAMa8DfQervj1jvAEet0LuzjzMMsak7pzGS+FWUCpSTAtSvz?= =?us-ascii?Q?WyrevmZQ2S8NqP2sKPTCfPcZEMq1y5/DnYa?= X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;6:qPqK2gMOpB1rvtOeRKRslhYHFOMGR60QdMKNVNhM5VS8x+VxlTiNIiKruR+OZkv4j8tTCL/RSwuUg2ZHtAYWB51E6I6qrTtI/Yz/SpCAwv72HN282lrpzJTPVlIf4XV7OFefevzcBJVmrIZp6GMriJYKwSjVYpaC2pPAGzxgGGlVfpXP76aDdFFyGpoFMS1/TZOj4nKzyaWJqgsd/PKDDGvXo1jesKdb0vpTIO3sAzJ7NwqQ5HczkobvAxqemPgAES/eYxMDk+y/ilZouwReCHc1dG/bNk8k14b8724cH8gZAwn0ISDJMbNzpMweULWeofUfeB+3gTlH3tC4yJKkpawOuSj6VT1fAMmNIQ4IEu0=;5:2J475yTebTSrg5WlblGF7d04L+3PAOY60LiD2qDov3D5YsaC1ut64Tf+Fy+QZUyXGxskXeNg8KfPf/qCWfXyjLYYIsaD3Qc3ooVbyRdIoQV3W2fXLZnjxGqgqdkFUnJawAfiy0glBu9FgENStbpjPhTj5Djp8WlgcCxsfO1JAIk=;24:0mwGH1wVhDGeA26YVHt41H2+ipiVlHss/8pjS4DpSzLNsOZ5gzvBhS8rD6wTRCO1CqFbSH03Xp1vLNeZGH8p5x199VqTtUrMbzM3p3sdhYc=;7:Jk/OASNSYY0WRSw4LxoTSUmyxL+5aaL0PErnIBzMIytjOqHkKMyV3YtBKq65C/1pK8kXhey1EDku0GHXTHvRqsH2jTH5+c5GhdGt5h/fQnqAqyMzfveNAFX4ahitAYKJ5YUAzAXlFclf8nL2ckr5cp3jtx1UP0u3LoUtI2ONRL2ykap33z1lRleheBYSfdYLsjMvQuIXvCYJZDNlgjeCf5yAiDdqhDYpIUv49xGif2qqDRor+2WgKgDa4xdAbiI/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1079;20:6mD4rOdNjU0Ijz73nHMotT/XBGIkpUyn2UzLTGGwzqI+fogbZsFsECZglYo+4MY6hF/hQSbgb9VZR50kpK2eEjcNpeC4woiwhYmpa9nVbRKPO6uEJA4p8AjlwnU8OsYpOByaPfYtEPjANX0YKurZHAeoGBF+dRNaoK0psvZpboA= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2017 13:43:31.6691 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 295e0239-102d-424d-6e9c-08d537f85990 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-11-30_04:,, 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 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 cglist /sys/fs/cgroup/system.slice/tmp.mount/ 16 device LBB0_10 Fix this by preferring global symbols as program name. For instance: $ bpftool cglist /sys/fs/cgroup/system.slice/tmp.mount/ 17 device bpf_prog1 Signed-off-by: Roman Gushchin Cc: Martin KaFai Lau Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Jakub Kicinski --- tools/lib/bpf/libbpf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 9f2410beaa18..5191afd46556 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, -- 2.14.3