From mboxrd@z Thu Jan 1 00:00:00 1970 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 199ADC433ED for ; Thu, 1 Apr 2021 23:56:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD00961131 for ; Thu, 1 Apr 2021 23:56:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233789AbhDAX4T (ORCPT ); Thu, 1 Apr 2021 19:56:19 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:22716 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235296AbhDAX4R (ORCPT ); Thu, 1 Apr 2021 19:56:17 -0400 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 131NtR2o030101 for ; Thu, 1 Apr 2021 16:56:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=facebook; bh=tFXccwPL9LXmwEQGWhu5BHCirY5yzBic2T9RKL0/69o=; b=VRnva2WVk2afTEaZPnbhu5qWcnK3X0wRUnM1W84c6A5wt2lkOdn8uWDN9Bk0+vcb1CHD ctYR0VKCZBTnV7GuerL6iljSL8rPY+SOJQXK6DXZJ2utd+G68NVGtlCqjOfJw4yYvlbl Jlqe6EhYdVXsH89Rp812RbSL+2syX7rAWYI= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 37n28y78et-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 01 Apr 2021 16:56:17 -0700 Received: from intmgw001.06.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 1 Apr 2021 16:55:41 -0700 Received: by devbig003.ftw2.facebook.com (Postfix, from userid 128203) id CCAEFF37B61; Thu, 1 Apr 2021 16:55:34 -0700 (PDT) From: Yonghong Song To: Arnaldo Carvalho de Melo , CC: Alexei Starovoitov , Bill Wendling , , David Blaikie , , Nick Desaulniers Subject: [PATCH dwarves v2] dwarf_loader: handle subprogram ret type with abstract_origin properly Date: Thu, 1 Apr 2021 16:55:34 -0700 Message-ID: <20210401235534.3701191-1-yhs@fb.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: QPsnJi6bW0rkCF2avNWLWkeLLTvBvU5a X-Proofpoint-ORIG-GUID: QPsnJi6bW0rkCF2avNWLWkeLLTvBvU5a X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761 definitions=2021-04-01_14:2021-04-01,2021-04-01 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 mlxlogscore=988 malwarescore=0 spamscore=0 adultscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2103310000 definitions=main-2104010155 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: dwarves@vger.kernel.org With latest bpf-next built with clang lto (thin or full), I hit one test failures: $ ./test_progs -t tcp ... libbpf: extern (func ksym) 'tcp_slow_start': func_proto [23] incompatib= le with kernel [115303] libbpf: failed to load object 'bpf_cubic' libbpf: failed to load BPF skeleton 'bpf_cubic': -22 test_cubic:FAIL:bpf_cubic__open_and_load failed #9/2 cubic:FAIL ... The reason of the failure is due to bpf program 'tcp_slow_start' func signature is different from vmlinux BTF. bpf program uses the following signature: extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked); which is identical to the kernel definition in linux:include/net/tcp.h: u32 tcp_slow_start(struct tcp_sock *tp, u32 acked); While vmlinux BTF definition like: [115303] FUNC_PROTO '(anon)' ret_type_id=3D0 vlen=3D2 'tp' type_id=3D39373 'acked' type_id=3D18 [115304] FUNC 'tcp_slow_start' type_id=3D115303 linkage=3Dstatic The above is dumped with `bpftool btf dump file vmlinux`. You can see the ret_type_id is 0 and this caused the problem. Looking at dwarf, we have: 0x11f2ec67: DW_TAG_subprogram DW_AT_low_pc (0xffffffff81ed2330) DW_AT_high_pc (0xffffffff81ed235c) DW_AT_frame_base () DW_AT_GNU_all_call_sites (true) DW_AT_abstract_origin (0x11f2ed66 "tcp_slow_start") ... 0x11f2ed66: DW_TAG_subprogram DW_AT_name ("tcp_slow_start") DW_AT_decl_file ("/home/yhs/work/bpf-next/net/ipv4/tcp_co= ng.c") DW_AT_decl_line (392) DW_AT_prototyped (true) DW_AT_type (0x11f130c2 "u32") DW_AT_external (true) DW_AT_inline (DW_INL_inlined) We have a subprogram which has an abstract_origin pointing to the subprogram prototype with return type. Current one pass recoding cannot easily resolve this easily since at the time recoding for 0x11f2ec67, the return type in 0x11f2ed66 has not been resolved. To simplify implementation, I just added another pass to go through all functions after recoding pass. This should resolve the above issue. With this patch, among total 250999 functions in vmlinux, 4821 functions needs return type adjustment from type id 0 to correct values. The above failed bpf selftest passed too. Signed-off-by: Yonghong Song --- dwarf_loader.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) Changelogs: v1 -> v2: . remove dead code (check abstract_origin tag must be a subprogram). The dwarf standard ensures this is the case. (David Blaikie) diff --git a/dwarf_loader.c b/dwarf_loader.c index 026d137..5dea837 100644 --- a/dwarf_loader.c +++ b/dwarf_loader.c @@ -2198,6 +2198,34 @@ out: return 0; } =20 +static int cu__resolve_func_ret_types(struct cu *cu) +{ + struct ptr_table *pt =3D &cu->functions_table; + uint32_t i; + + for (i =3D 0; i < pt->nr_entries; ++i) { + struct tag *tag =3D pt->entries[i]; + + if (tag =3D=3D NULL || tag->type !=3D 0) + continue; + + struct function *fn =3D tag__function(tag); + if (!fn->abstract_origin) + continue; + + struct dwarf_tag *dtag =3D tag->priv; + struct dwarf_tag *dfunc; + dfunc =3D dwarf_cu__find_tag_by_ref(cu->priv, &dtag->abstract_origin); + if (dfunc =3D=3D NULL) { + tag__print_abstract_origin_not_found(tag); + return -1; + } + + tag->type =3D dfunc->tag->type; + } + return 0; +} + static int cu__recode_dwarf_types_table(struct cu *cu, struct ptr_table *pt, uint32_t i) @@ -2637,6 +2665,16 @@ static int cus__merge_and_process_cu(struct cus *c= us, struct conf_load *conf, /* process merged cu */ if (cu__recode_dwarf_types(cu) !=3D LSK__KEEPIT) return DWARF_CB_ABORT; + + /* + * for lto build, the function return type may not be + * resolved due to the return type of a subprogram is + * encoded in another subprogram through abstract_origin + * tag. Let us visit all subprograms again to resolve this. + */ + if (cu__resolve_func_ret_types(cu) !=3D LSK__KEEPIT) + return DWARF_CB_ABORT; + if (finalize_cu_immediately(cus, cu, dcu, conf) =3D=3D LSK__STOP_LOADING) return DWARF_CB_ABORT; --=20 2.30.2