From patchwork Thu Feb 17 07:22:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hou Tao X-Patchwork-Id: 12749485 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 D7E11C433EF for ; Thu, 17 Feb 2022 07:05:30 +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=18eSre0vLARLTdGNASTMbbs3BZvNRocFEM8VzM7N4Q4=; b=tFqIej+BY1E0tx RilwQAVzQxSjP5//5QiGXzmZjF4KL2o9xMVfxLFuHrh16snlRQY5XnFCuB7U88Oka/RtxXu+Lsj6S 5iZI7fEYitbHyAcb2m/uaO8wbFC+yYgYIN0PKlZG8R21vnvrQdHB+Tw4V4RFBgB8vEvbQitNy70BE Y2pNo8QKgfuIWB7irzcF005W47z1yrb6f+sB6RCgrHqxlQnFRdTg8UzyS22QJhfZAdM1i9Ox38CJL qsmIhBry5HGz/sdcEqcgPHQES2d732GLCC2LBgCgkmG+pXjy7106cB4auKxTvWIjNZpZH0oK2hmYE ueDnFxNvwDFJoRTUQqqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nKapp-009BGU-Ca; Thu, 17 Feb 2022 07:04:13 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nKapc-009BBy-0o for linux-arm-kernel@lists.infradead.org; Thu, 17 Feb 2022 07:04:02 +0000 Received: from dggpeml500025.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Jzm465DW6zbncn; Thu, 17 Feb 2022 15:02:46 +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; Thu, 17 Feb 2022 15:03:52 +0800 From: Hou Tao To: Alexei Starovoitov , Will Deacon CC: Martin KaFai Lau , Song Liu , John Fastabend , Yonghong Song , Daniel Borkmann , Andrii Nakryiko , "David S . Miller" , Jakub Kicinski , , , , Zi Shen Lim , Catalin Marinas , Mark Rutland , Subject: [PATCH bpf-next v4 0/4] bpf, arm64: support more atomic ops Date: Thu, 17 Feb 2022 15:22:28 +0800 Message-ID: <20220217072232.1186625-1-houtao1@huawei.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) 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-20220216_230400_425243_BF414C1B X-CRM114-Status: UNSURE ( 9.73 ) 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, Atomics support in bpf has already been done by "Atomics for eBPF" patch series [1], but it only adds support for x86, and this patchset adds support for arm64. Patch #1 & patch #2 are arm64 related. Patch #1 moves the common used macro AARCH64_BREAK_FAULT into insn-def.h for insn.h. Patch #2 adds necessary encoder helpers for atomic operations. Patch #3 implements atomic[64]_fetch_add, atomic[64]_[fetch_]{and,or,xor} and atomic[64]_{xchg|cmpxchg} for arm64 bpf. Patch #4 changes the type of test program from fentry/ to raw_tp/ for atomics test. For cpus_have_cap(ARM64_HAS_LSE_ATOMICS) case and no-LSE-ATOMICS case, ./test_verifier, "./test_progs -t atomic", and "insmod ./test_bpf.ko" are exercised and passed correspondingly. Comments are always welcome. Regards, Tao [1]: https://lore.kernel.org/bpf/20210114181751.768687-2-jackmanb@google.com/ Change Log: v4: * patch #2: update A64_STADD() accordingly to fix build failure after applying patch #1 & patch #2. v3: https://lore.kernel.org/bpf/20220129220452.194585-1-houtao1@huawei.com/ * split arm64 insn related code into a separated patch (from Mark) * update enum name in aarch64_insn_mem_atomic_op (from Mark) * consider all cases for aarch64_insn_mem_order_type and aarch64_insn_mb_type (from Mark) * exercise and pass "insmod ./test_bpf.ko" test (suggested by Daniel) * remove aarch64_insn_gen_store_release_ex() and extend aarch64_insn_ldst_type instead * compile aarch64_insn_gen_atomic_ld_op(), aarch64_insn_gen_cas() and emit_lse_atomic() out when CONFIG_ARM64_LSE_ATOMICS is disabled. v2: https://lore.kernel.org/bpf/20220127075322.675323-1-houtao1@huawei.com/ * patch #1: use two separated ASSERT_OK() instead of ASSERT_TRUE() * add Acked-by tag for both patches v1: https://lore.kernel.org/bpf/20220121135632.136976-1-houtao1@huawei.com Hou Tao (4): arm64: move AARCH64_BREAK_FAULT into insn-def.h arm64: insn: add encoders for atomic operations bpf, arm64: support more atomic operations selftests/bpf: use raw_tp program for atomic test arch/arm64/include/asm/debug-monitors.h | 12 - arch/arm64/include/asm/insn-def.h | 14 ++ arch/arm64/include/asm/insn.h | 80 ++++++- arch/arm64/lib/insn.c | 185 +++++++++++++-- arch/arm64/net/bpf_jit.h | 44 +++- arch/arm64/net/bpf_jit_comp.c | 223 ++++++++++++++---- .../selftests/bpf/prog_tests/atomics.c | 91 ++----- tools/testing/selftests/bpf/progs/atomics.c | 28 +-- 8 files changed, 517 insertions(+), 160 deletions(-)