From patchwork Sat Feb 26 12:19:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hou Tao X-Patchwork-Id: 12761291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 821A6C433EF for ; Sat, 26 Feb 2022 12:20:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231582AbiBZMUv (ORCPT ); Sat, 26 Feb 2022 07:20:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231520AbiBZMUt (ORCPT ); Sat, 26 Feb 2022 07:20:49 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBD8650E15; Sat, 26 Feb 2022 04:20:15 -0800 (PST) Received: from dggpeml500025.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4K5QZz1l2Jz1FDVp; Sat, 26 Feb 2022 20:15:39 +0800 (CST) Received: from huawei.com (10.175.124.27) by dggpeml500025.china.huawei.com (7.185.36.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Sat, 26 Feb 2022 20:20:13 +0800 From: Hou Tao To: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Will Deacon CC: Song Liu , John Fastabend , Yonghong Song , Andrii Nakryiko , "David S . Miller" , Jakub Kicinski , , , , Zi Shen Lim , Catalin Marinas , Ard Biesheuvel , Subject: [PATCH bpf-next v4 0/2] bpf, arm64: fix bpf line info Date: Sat, 26 Feb 2022 20:19:04 +0800 Message-ID: <20220226121906.5709-1-houtao1@huawei.com> X-Mailer: git-send-email 2.18.2 MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpeml500025.china.huawei.com (7.185.36.35) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Hi, The patchset addresses two issues in bpf line info for arm64: (1) insn_to_jit_off only considers the body itself and ignores prologue before the body. Fixed in patch #1. (2) insn_to_jit_off passed to bpf_prog_fill_jited_linfo() is calculated in instruction granularity instead of bytes granularity. Fixed in patch #2. Comments are always welcome. Regards, Tao Change Log: v4: * patch #2: convert ctx.offset into byte offset before call bpf_prog_fill_jited_linfo() instead of converting it back and forth. v3: https://lore.kernel.org/bpf/20220208012539.491753-1-houtao1@huawei.com * patch #2: explain why bpf2a64_offset() needs update * add Fixes tags in both patches v2: https://lore.kernel.org/bpf/20220125105707.292449-1-houtao1@huawei.com * split into two independent patches (from Daniel) * use AARCH64_INSN_SIZE instead of defining INSN_SIZE v1: https://lore.kernel.org/bpf/20220104014236.1512639-1-houtao1@huawei.com Hou Tao (2): bpf, arm64: call build_prologue() first in first JIT pass bpf, arm64: feed byte-offset into bpf line info arch/arm64/net/bpf_jit_comp.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)