From patchwork Tue Feb 8 01:25:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hou Tao X-Patchwork-Id: 12738035 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 E92C0C433EF for ; Tue, 8 Feb 2022 01:27:31 +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=t4IfEfct9NDpj+1mRj3H6u01dU0bFwzL3UzZUAJUvMM=; b=42RtixHSmjhpVA y4eds+69LboJ9dLaDVihkCeBifJ0TmW7fznFOVn1L3Ml5AVwS8hjwY1P4P4wXNFgwK4Xyhh5g7GGu wYC6NkN8/ePk6kaz6m8UxbprpETZt3Xy49jd9q/tXeJ7A8dOskpIgL/c9aouXxrso7UB1DxW5GKoy s2W1X0sHLb79q2C2HGxvSQqacTgUYgdmZeVWIiTleamcMDzZaTqscWCgFlltaclRC3byiEa83iv2z xTZaefpfxmJQHoqHJ/pk8KaJikX1onamL7ZRCx8naUrRlYraa5uygY0E6n0o46nWvPvuI0aD+VH+x 0ldtGbicWFgnqK9OGPLA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHFGf-00CANY-5f; Tue, 08 Feb 2022 01:26:05 +0000 Received: from szxga03-in.huawei.com ([45.249.212.189]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHFGR-00CAKp-PO for linux-arm-kernel@lists.infradead.org; Tue, 08 Feb 2022 01:25:53 +0000 Received: from dggpeml500025.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Jt4xp1Lw9zdZTV; Tue, 8 Feb 2022 09:22:38 +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; Tue, 8 Feb 2022 09:25:45 +0800 From: Hou Tao To: Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau CC: Ard Biesheuvel , Yonghong Song , Andrii Nakryiko , Zi Shen Lim , Will Deacon , Catalin Marinas , , , Subject: [PATCH bpf-next v3 0/2] bpf, arm64: fix bpf line info Date: Tue, 8 Feb 2022 09:25:37 +0800 Message-ID: <20220208012539.491753-1-houtao1@huawei.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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-20220207_172552_038475_978431DF X-CRM114-Status: UNSURE ( 5.30 ) 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: v3: * 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: calculate offset as byte-offset for bpf line info arch/arm64/net/bpf_jit_comp.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) Acked-by: Martin KaFai Lau