From patchwork Tue Mar 4 00:13:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peilin Ye X-Patchwork-Id: 13999624 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 785145228 for ; Tue, 4 Mar 2025 00:13:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741047215; cv=none; b=NAbmx3GEYzhHKI/HO/1QoaABwubSextxvNXOVZJmqJnyaMvrRMEJy+xFLkbWXE8qzp/0GpQw5MrZEsQFmOUhmA4J+25eMBaiVzbjBDTFhQJ8ckI3ocyFJsSMoHJsTWoTyNdt2Bau+/sxmcrnKeppoa6NR5IXjuStbBB96TeIjNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741047215; c=relaxed/simple; bh=vzV524D1G+szDvxKeg2GwSuIEARn3bSPJWTBVrulejI=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=vDhUBQK89LBDSkeeXz3DxdsAsV/yaF1uCX2EI+kIHrQFLvXWj+Ztg9rHqxlbOMQVXVXnMp9yWYdK6l0tBRx1zQzSfyg1zW45cFVaNNeYqws/OgpzQOvfpLOWxOfy+ifm5eyxfCNO83SgkK/dKVK33MvSBVfW0muOYZG/1Lgsww4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yepeilin.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=2eUpe22I; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--yepeilin.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="2eUpe22I" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-223477ba158so151646375ad.0 for ; Mon, 03 Mar 2025 16:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1741047213; x=1741652013; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=Q3wqOikOcXwkFYQdHd+IOlFSNX40F3Q2Xvhkkctp+0E=; b=2eUpe22ILw7t/GuBr6cG8VH5uV3Epwo7qc0hoAG24d9e+oKxvjK73ZgZyp62C8hiFH M+qeIY7otb4tEYLmI8nS9xhSaMOw2Pxg1OZAiXgACNBrhUKUe0/LO2d/1Akmff0WV4vi yZQOezBV08qhs4IGLgSCI+IK44pJxb4LcP3ERBWBZxrrLW8/YOtNgrnQnmSuvxvzKCd+ bwEixFH8TkCRsXYfMmXYn59iD7aawF1+3FPy+4UPFRkk/O/5q5+r0GVOieJrsAUw1Kvd 5zVeKEv8TtE2hr1lXfU/a0G58/sqVYbp/nGElkozU6b3KBxLPPqnteSreY9EX7QmTBg4 Dtgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741047213; x=1741652013; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Q3wqOikOcXwkFYQdHd+IOlFSNX40F3Q2Xvhkkctp+0E=; b=G+JMEGlwUHTGqWjphtkt7OkkuT6lp8IhPn8hNs2t+QENcYYpTChdGsd3m54+tyUvdH QgpDIDG9zrjQdP0/dSyW63JTZi+X1y9RVMTrpZtvNM0BurFYlSvOMoLEot369Db0OFtQ XnL7HBU8pijhgd1TQGnMe2TejgB2q+LkG4v02H7Bdk4qanyTWxrvRFX84r/lv7YkhV7i O6udG+/DJtVDKzuIlFxH7dfqXOw+Br79jr4PVcICXr1yL7Lhdl6zO4Dbd2EmH0/D7ptn 1T1+lp6mrpLP/snA+CAhKLhvJOYsmBajn/6IlNyqBVDi5GboJ9oy66OktR1KP0Ki3foR G8SQ== X-Gm-Message-State: AOJu0YyLzvLmSvWLfg/Y4wtFShpX4Hxq6tSYspRZffJyTNd67T4hPaiv b0woGsa996oEeTFvaJNyHl+s/iCCZz3DP1mq5O2MbaSLhmhxc0PGmb6xQJMXfIewrWT/NmuYOUb To3yVRiNI51gxqY3KfGjgwnqrzflru5eQzunU/FvXsWjNjj0GXS+CaecUM5jqvmeEXH4CmwvdXV DfeKuJ3LGwz9MqWy9g4tX2AcvKeelD7wM0cOd0gPQ= X-Google-Smtp-Source: AGHT+IFmmwcjQ6DMOqtv0toPZx7xqVST7m9UxDsuCyxZVeBScrG92ahmY7O7H7tlXVdHzJYj2DAfC+7wUUyshA== X-Received: from pjbkl3.prod.google.com ([2002:a17:90b:4983:b0:2fa:a101:743]) (user=yepeilin job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ecd0:b0:223:2aab:4626 with SMTP id d9443c01a7336-22368f60a3fmr247563795ad.11.1741047212605; Mon, 03 Mar 2025 16:13:32 -0800 (PST) Date: Tue, 4 Mar 2025 00:13:19 +0000 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: Subject: [PATCH bpf-next v5 0/6] Introduce load-acquire and store-release BPF instructions From: Peilin Ye To: bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Peilin Ye , bpf@ietf.org, Alexei Starovoitov , Xu Kuohai , Eduard Zingerman , David Vernet , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jonathan Corbet , "Paul E. McKenney" , Puranjay Mohan , Ilya Leoshkevich , Heiko Carstens , Vasily Gorbik , Catalin Marinas , Will Deacon , Quentin Monnet , Mykola Lysenko , Shuah Khan , Ihor Solodrai , Yingchi Long , Josh Don , Barret Rhoden , Neel Natu , Benjamin Segall , linux-kernel@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Hi all! This patchset adds kernel support for BPF load-acquire and store-release instructions (for background, please see [1]), including core/verifier and arm64/x86-64 JIT compiler changes, as well as selftests. riscv64 is also planned to be supported. The corresponding LLVM changes can be found at: https://github.com/llvm/llvm-project/pull/108636 The first 3 patches from v4 have already been applied: - [bpf-next,v4,01/10] bpf/verifier: Factor out atomic_ptr_type_ok() https://git.kernel.org/bpf/bpf-next/c/b2d9ef71d4c9 - [bpf-next,v4,02/10] bpf/verifier: Factor out check_atomic_rmw() https://git.kernel.org/bpf/bpf-next/c/d430c46c7580 - [bpf-next,v4,03/10] bpf/verifier: Factor out check_load_mem() and check_store_reg() https://git.kernel.org/bpf/bpf-next/c/d38ad248fb7a Please refer to the LLVM PR and individual kernel patches for details. Thanks! v4: https://lore.kernel.org/bpf/cover.1740978603.git.yepeilin@google.com/ v4..v5 notable changes: o (kernel test robot) for 32-bit arches: make the verifier reject 64-bit load-acquires/store-releases, and fix build error in interpreter changes * tested ARCH=arc build following instructions from kernel test robot o (Alexei) drop Documentation/ patch (v4 10/10) for now v3: https://lore.kernel.org/bpf/cover.1740009184.git.yepeilin@google.com/ v3..v4 notable changes: o (Alexei) add x86-64 JIT support (including arena) o add Acked-by: tags from Xu v2: https://lore.kernel.org/bpf/cover.1738888641.git.yepeilin@google.com/ v2..v3 notable changes: o (Alexei) change encoding to BPF_LOAD_ACQ=0x100, BPF_STORE_REL=0x110 o add Acked-by: tags from Ilya and Eduard o make new selftests depend on: * __clang_major__ >= 18, and * ENABLE_ATOMICS_TESTS is defined (currently this means -mcpu=v3 or v4), and * JIT supports load_acq/store_rel (currenty only arm64) o work around llvm-17 CI job failure by conditionally define __arena_global variables as 64-bit if __clang_major__ < 18, to make sure .addr_space.1 has no holes o add Google copyright notice in new files v1: https://lore.kernel.org/all/cover.1737763916.git.yepeilin@google.com/ v1..v2 notable changes: o (Eduard) for x86 and s390, make bpf_jit_supports_insn(..., /*in_arena=*/true) return false for load_acq/store_rel o add Eduard's Acked-by: tag o (Eduard) extract LDX and non-ATOMIC STX handling into helpers, see PATCH v2 3/9 o allow unpriv programs to store-release pointers to stack o (Alexei) make it clearer in the interpreter code (PATCH v2 4/9) that only W and DW are supported for atomic RMW o test misaligned load_acq/store_rel o (Eduard) other selftests/ changes: * test load_acq/store_rel with !atomic_ptr_type_ok() pointers: - PTR_TO_CTX, for is_ctx_reg() - PTR_TO_PACKET, for is_pkt_reg() - PTR_TO_FLOW_KEYS, for is_flow_key_reg() - PTR_TO_SOCKET, for is_sk_reg() * drop atomics/ tests * delete unnecessary 'pid' checks from arena_atomics/ tests * avoid depending on __BPF_FEATURE_LOAD_ACQ_STORE_REL, use __imm_insn() and inline asm macros instead RFC v1: https://lore.kernel.org/all/cover.1734742802.git.yepeilin@google.com RFC v1..v1 notable changes: o 1-2/8: minor verifier.c refactoring patches o 3/8: core/verifier changes * (Eduard) handle load-acquire properly in backtrack_insn() * (Eduard) avoid skipping checks (e.g., bpf_jit_supports_insn()) for load-acquires * track the value stored by store-releases, just like how non-atomic STX instructions are handled * (Eduard) add missing link in commit message * (Eduard) always print 'r' for disasm.c changes o 4/8: arm64/insn: avoid treating load_acq/store_rel as load_ex/store_ex o 5/8: arm64/insn: add load_acq/store_rel * (Xu) include Should-Be-One (SBO) bits in "mask" and "value", to avoid setting fixed bits during runtime (JIT-compile time) o 6/8: arm64 JIT compiler changes * (Xu) use emit_a64_add_i() for "pointer + offset" to optimize code emission o 7/8: selftests * (Eduard) avoid adding new tests to the 'test_verifier' runner * add more tests, e.g., checking mark_precise logic o 8/8: instruction-set.rst changes [1] https://lore.kernel.org/all/20240729183246.4110549-1-yepeilin@google.com/ Thanks, Peilin Ye (6): bpf: Introduce load-acquire and store-release instructions arm64: insn: Add BIT(23) to {load,store}_ex's mask arm64: insn: Add load-acquire and store-release instructions bpf, arm64: Support load-acquire and store-release instructions bpf, x86: Support load-acquire and store-release instructions selftests/bpf: Add selftests for load-acquire and store-release instructions arch/arm64/include/asm/insn.h | 12 +- arch/arm64/lib/insn.c | 29 ++ arch/arm64/net/bpf_jit.h | 20 ++ arch/arm64/net/bpf_jit_comp.c | 86 +++++- arch/s390/net/bpf_jit_comp.c | 14 +- arch/x86/net/bpf_jit_comp.c | 95 ++++++- include/linux/bpf.h | 15 + include/linux/filter.h | 2 + include/uapi/linux/bpf.h | 3 + kernel/bpf/core.c | 67 ++++- kernel/bpf/disasm.c | 12 + kernel/bpf/verifier.c | 59 +++- tools/include/uapi/linux/bpf.h | 3 + .../selftests/bpf/prog_tests/arena_atomics.c | 66 ++++- .../selftests/bpf/prog_tests/verifier.c | 4 + .../selftests/bpf/progs/arena_atomics.c | 121 +++++++- .../bpf/progs/verifier_load_acquire.c | 197 +++++++++++++ .../selftests/bpf/progs/verifier_precision.c | 49 ++++ .../bpf/progs/verifier_store_release.c | 264 ++++++++++++++++++ 19 files changed, 1085 insertions(+), 33 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/verifier_load_acquire.c create mode 100644 tools/testing/selftests/bpf/progs/verifier_store_release.c