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: 12761295 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21EACC433EF for ; Sat, 26 Feb 2022 12:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=UT9YYZ//NDcj8fHXD++B+a5ZxHJLjN9HC5a16/2Cq1M=; b=wufWobBggtFBCn uR+XMEIhTZ6+XRCrloKt0b8MA49+xReAK1ei8N6EE7CGaF4EcJmCcDrdYTOUi+AgD4PzEf8mNJx5M o4oYf/ODd/lQo5Je/SGIxCy/ZXlUWocDJgVCUYqbEVWcsq8oEHZAiTPMxLrJYnI7KYUQdPt4PY59W 0FNx/HMdQ0+cOR/tQPwqpDslTmYPTbleAFrTH158Ip3ktueK9o/xMLAQuCRN4dasPpGGKVDtkhIKs Onr7MGyLdq2M4tuJVJ3X9snpS5T8YGx7aHbD2bHmXwvtaOzZK1FJ63Es+BULRJ47B1NNWYtZjEjXf JSI+lM+HSFPXdFOWuBww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nNw3y-007zxU-MS; Sat, 26 Feb 2022 12:20:38 +0000 Received: from szxga08-in.huawei.com ([45.249.212.255]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nNw3n-007zsy-0v for linux-arm-kernel@lists.infradead.org; Sat, 26 Feb 2022 12:20:29 +0000 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220226_042027_269996_134404FC X-CRM114-Status: UNSURE ( 5.63 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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(-)