From patchwork Fri Dec 11 04:11:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 11967159 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7603C1B0E3 for ; Fri, 11 Dec 2020 04:13:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7962523ECF for ; Fri, 11 Dec 2020 04:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395311AbgLKENA convert rfc822-to-8bit (ORCPT ); Thu, 10 Dec 2020 23:13:00 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:26364 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395297AbgLKEMd (ORCPT ); Thu, 10 Dec 2020 23:12:33 -0500 Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BB44srs013346 for ; Thu, 10 Dec 2020 20:11:52 -0800 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 35brnbk433-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 10 Dec 2020 20:11:52 -0800 Received: from intmgw004.03.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 10 Dec 2020 20:11:51 -0800 Received: by devbig012.ftw2.facebook.com (Postfix, from userid 137359) id 118F62ECB19F; Thu, 10 Dec 2020 20:11:46 -0800 (PST) From: Andrii Nakryiko To: , , CC: , , Hao Luo , Jiri Olsa Subject: [PATCH dwarves 1/2] btf_encoder: fix BTF variable generation for kernel modules Date: Thu, 10 Dec 2020 20:11:37 -0800 Message-ID: <20201211041139.589692-2-andrii@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201211041139.589692-1-andrii@kernel.org> References: <20201211041139.589692-1-andrii@kernel.org> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2020-12-11_01:2020-12-09,2020-12-11 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 lowpriorityscore=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 suspectscore=8 spamscore=0 clxscore=1015 mlxscore=0 phishscore=0 bulkscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012110022 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Fix pahole's logic for determining per-CPU variables. For vmlinux, btfe->percpu_base_addr is always 0, so it didn't matter at which point to subtract it to get offset that later was matched against corresponding ELF symbol. For kernel module, though, the situation is different. Kernel module's per-CPU data section has non-zero offset, which is taken into account in all DWARF variable addresses calculation. For such cases, it's important to subtract section offset (btfe->percpu_base_addr) before ELF symbol look up is performed. This patch also records per-CPU data section size and uses it for early filtering of non-per-CPU variables by their address. Fixes: 2e719cca6672 ("btf_encoder: revamp how per-CPU variables are encoded") Signed-off-by: Andrii Nakryiko --- btf_encoder.c | 21 ++++++++++++++++----- libbtf.c | 1 + libbtf.h | 1 + 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/btf_encoder.c b/btf_encoder.c index c40f059580da..a7d484765ce2 100644 --- a/btf_encoder.c +++ b/btf_encoder.c @@ -651,7 +651,7 @@ int cu__encode_btf(struct cu *cu, int verbose, bool force, printf("search cu '%s' for percpu global variables.\n", cu->name); cu__for_each_variable(cu, core_id, pos) { - uint32_t size, type, linkage, offset; + uint32_t size, type, linkage; const char *name; uint64_t addr; int id; @@ -665,12 +665,24 @@ int cu__encode_btf(struct cu *cu, int verbose, bool force, /* addr has to be recorded before we follow spec */ addr = var->ip.addr; - if (var->spec) - var = var->spec; + + /* DWARF takes into account .data..percpu section offset + * within its segment, which for vmlinux is 0, but for kernel + * modules is >0. ELF symbols, on the other hand, don't take + * into account these offsets (as they are relative to the + * section start), so to match DWARF and ELF symbols we need + * to negate the section base address here. + */ + if (addr < btfe->percpu_base_addr || addr >= btfe->percpu_base_addr + btfe->percpu_sec_sz) + continue; + addr -= btfe->percpu_base_addr; if (!percpu_var_exists(addr, &size, &name)) continue; /* not a per-CPU variable */ + if (var->spec) + var = var->spec; + if (var->ip.tag.type == 0) { fprintf(stderr, "error: found variable '%s' in CU '%s' that has void type\n", name, cu->name); @@ -701,8 +713,7 @@ int cu__encode_btf(struct cu *cu, int verbose, bool force, * add a BTF_VAR_SECINFO in btfe->percpu_secinfo, which will be added into * btfe->types later when we add BTF_VAR_DATASEC. */ - offset = addr - btfe->percpu_base_addr; - id = btf_elf__add_var_secinfo(&btfe->percpu_secinfo, id, offset, size); + id = btf_elf__add_var_secinfo(&btfe->percpu_secinfo, id, addr, size); if (id < 0) { err = -1; fprintf(stderr, "error: failed to encode section info for variable '%s' at addr 0x%lx\n", diff --git a/libbtf.c b/libbtf.c index 246762c4b4e1..16e1d451e433 100644 --- a/libbtf.c +++ b/libbtf.c @@ -170,6 +170,7 @@ try_as_raw_btf: } btfe->percpu_shndx = elf_ndxscn(sec); btfe->percpu_base_addr = shdr.sh_addr; + btfe->percpu_sec_sz = shdr.sh_size; return btfe; diff --git a/libbtf.h b/libbtf.h index 71f6cecbea93..191f5862a695 100644 --- a/libbtf.h +++ b/libbtf.h @@ -26,6 +26,7 @@ struct btf_elf { bool raw_btf; // "/sys/kernel/btf/vmlinux" uint32_t percpu_shndx; uint64_t percpu_base_addr; + uint64_t percpu_sec_sz; struct btf *btf; struct btf *base_btf; }; From patchwork Fri Dec 11 04:11:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 11967161 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C7B5C2BB40 for ; Fri, 11 Dec 2020 04:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF58623C18 for ; Fri, 11 Dec 2020 04:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395297AbgLKENA convert rfc822-to-8bit (ORCPT ); Thu, 10 Dec 2020 23:13:00 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:46128 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395304AbgLKEMd (ORCPT ); Thu, 10 Dec 2020 23:12:33 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 0BB44cu7005446 for ; Thu, 10 Dec 2020 20:11:52 -0800 Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 35byu08etm-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 10 Dec 2020 20:11:52 -0800 Received: from intmgw003.03.ash8.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 10 Dec 2020 20:11:52 -0800 Received: by devbig012.ftw2.facebook.com (Postfix, from userid 137359) id 3A7092ECB19F; Thu, 10 Dec 2020 20:11:48 -0800 (PST) From: Andrii Nakryiko To: , , CC: , , Hao Luo , Jiri Olsa Subject: [PATCH dwarves 2/2] btf_encoder: fix skipping per-CPU variables at offset 0 Date: Thu, 10 Dec 2020 20:11:38 -0800 Message-ID: <20201211041139.589692-3-andrii@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201211041139.589692-1-andrii@kernel.org> References: <20201211041139.589692-1-andrii@kernel.org> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2020-12-11_01:2020-12-09,2020-12-11 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 adultscore=0 mlxlogscore=954 mlxscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 bulkscore=0 priorityscore=1501 spamscore=0 suspectscore=8 clxscore=1034 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012110022 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Adjust pahole logic of skipping any per-CPU symbol with offset 0, which is especially bad for kernel modules, because it most certainly skips the very first per-CPU variable. Instead, do collect per-CPU ELF symbol with 0 offset, but do extra check for non-kernel module case by verifying that ELF symbol name and DWARF variable name match. Due to the bug of DWARF name of variable sometimes being NULL, this is necessarily too pessimistic check (e.g., on my vmlinux image, fixed_percpu_data variable is still not emitted due to missing DWARF variable name), it allows to emit data for all module per-CPU variables. Fixes: f3d9054ba8ff ("btf_encoder: Teach pahole to store percpu variables in vmlinux BTF.") Signed-off-by: Andrii Nakryiko --- btf_encoder.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/btf_encoder.c b/btf_encoder.c index a7d484765ce2..1d7817078f89 100644 --- a/btf_encoder.c +++ b/btf_encoder.c @@ -412,21 +412,6 @@ static int collect_percpu_var(struct btf_elf *btfe, GElf_Sym *sym) return 0; addr = elf_sym__value(sym); - /* - * Store only those symbols that have allocated space in the percpu section. - * This excludes the following three types of symbols: - * - * 1. __ADDRESSABLE(sym), which are forcely emitted as symbols. - * 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids. - * 3. __exitcall(fn), functions which are labeled as exit calls. - * - * In addition, the variables defined using DEFINE_PERCPU_FIRST are - * also not included, which currently includes: - * - * 1. fixed_percpu_data - */ - if (!addr) - return 0; size = elf_sym__size(sym); if (!size) @@ -652,7 +637,7 @@ int cu__encode_btf(struct cu *cu, int verbose, bool force, cu__for_each_variable(cu, core_id, pos) { uint32_t size, type, linkage; - const char *name; + const char *name, *dwarf_name; uint64_t addr; int id; @@ -680,6 +665,29 @@ int cu__encode_btf(struct cu *cu, int verbose, bool force, if (!percpu_var_exists(addr, &size, &name)) continue; /* not a per-CPU variable */ + /* A lot of "special" DWARF variables (e.g, __UNIQUE_ID___xxx) + * have addr == 0, which is the same as, say, valid + * fixed_percpu_data per-CPU variable. To distinguish between + * them, additionally compare DWARF and ELF symbol names. If + * DWARF doesn't provide proper name, pessimistically assume + * bad variable. + * + * Examples of such special variables are: + * + * 1. __ADDRESSABLE(sym), which are forcely emitted as symbols. + * 2. __UNIQUE_ID(prefix), which are introduced to generate unique ids. + * 3. __exitcall(fn), functions which are labeled as exit calls. + * + * This is relevant only for vmlinux image, as for kernel + * modules per-CPU data section has non-zero offset so all + * per-CPU symbols have non-zero values. + */ + if (var->ip.addr == 0) { + dwarf_name = variable__name(var, cu); + if (!dwarf_name || strcmp(dwarf_name, name)) + continue; + } + if (var->spec) var = var->spec;