From patchwork Mon Mar 3 05:37:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peilin Ye X-Patchwork-Id: 13998209 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-oa1-f73.google.com (mail-oa1-f73.google.com [209.85.160.73]) (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 CFE6623BE for ; Mon, 3 Mar 2025 05:37:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740980237; cv=none; b=dlM+dr2p4ztNT6ap3KFiBp6Q96MFkxUVpeF5nTpYZBpkR2UAPlkjCd1Kb7RRnBzt7oi846PrmapbQGec6lgelMMGuQZY8KJmd5tc/SB/G3IG31QgoyRfVNO2L1r8n2N+fzJNgUVRBRo1tCWUS01rHLJBU2Zn8jnT0bDuU5OlV8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740980237; c=relaxed/simple; bh=KeBcH1GjqJCNyObldrkYVJDwv79JdE7giTQ8iZ/gB7U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nZzs4/NH8RkNlRghd81bjR9jsnSK0W3V6VCBqjtm9Rgsxyx11sCPyZVnh0ue+mgsru+OeLQw+pTjioFpWf5WW1kvHJ3sYwMg8kdE4HSmBc21tcckG4RlwEqBgiLPIjaeHu8d+1G9fVubmFk6YJo6AsrSU+yc7h3CCeX9ucOKDA4= 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=KdG1V7Dg; arc=none smtp.client-ip=209.85.160.73 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="KdG1V7Dg" Received: by mail-oa1-f73.google.com with SMTP id 586e51a60fabf-2c14aae048bso6165865fac.1 for ; Sun, 02 Mar 2025 21:37:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740980235; x=1741585035; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=11XVZ4zj75vGzfRxwzqc/xjgcajBZqFGyuNELSq3ePM=; b=KdG1V7DgDBJlRRjLlHWiM7gRvNQCHWFnuCB4dTui8Wz1IX6aqm4KTWznftIz2WrEKd JTr9OrWUgnyywkAKVrUJhc9YoxCOr9y1hrWqOICjeLhN/fUgC27MsviwjOCo3pD5pOmW SNp5OIXzCbFS3ZIMVxWgf5G8c/BILhnp4g6vzJJbatdFhcOchVEUM8jwGwNc0aVNKzWz GB4jwXnrqn1s+lbVk2bKAUaVKYjoEiaEn6aljuqHxyG5hsFy5AtKsnwXU2paLq8ieEEm MQACG8Eb/WTs5bflM1xH1iXcoOT1WO6ZuJgT12eVXQvmfdLg0vPLODgA8CdcU7r6Bs04 zqnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740980235; x=1741585035; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=11XVZ4zj75vGzfRxwzqc/xjgcajBZqFGyuNELSq3ePM=; b=jkjEUG08hFen4+86Thvt6eCQkP+ZOrwKk1p03WNHXL8oj8vmTEA1UKpMxYz7JpF3fI ZmlGQpoWbEsD6LnxoMdbfkGfi/hWWyADyVTVXmXi6OCSJc349JhZFE86vaAcVOnKyVvn 44iy0sCX2UlDalgbYjUIgUSVhk4tAhI4K2JjdKAm1D8RF5uGcABgldfEEaL3J78WThfF 6FYnmD5uMQru7sYb1UJjUhaZx76b7Vqn6T/lsnI3amHC8nBi/JOJe/umjs1Wa7FHnaVV 8Gj9c7/wtU8axdmx3fZtlm8rtUrwe95ucqp6J8JuuROVD32kJ097SmEmN7cO5J/pkbrR H1gg== X-Gm-Message-State: AOJu0Yygck7Rdv5h61G0gMlnwqYn0ijgC9Jcb+rVE4HqowAjDxdDJq26 xpcA4hUIuLvaKs1OF/SZja+BTwEF3fJpAg8wBJp2naKR5anTnZM3jk7dZPoEp6eSfjgh4TvKw0z PTVVYNbmhmZH7574O52Oi3qfLMSULv7ynXgSJXCjcE3Zz+zcBYsxGbUJQud4Gr72ksQLi7YeOeM +INYdlikkHsjIcVneEWg521remo0kot8zuT04g9B0= X-Google-Smtp-Source: AGHT+IHCMcja7O5nHvC3arJ2BfVxXnE0ShNgQeyCXpt5rqYUWe3LnL8pz4yrPXjuWabnQEE7N86n3GCAwOPQKA== X-Received: from oablh23.prod.google.com ([2002:a05:6870:b17:b0:2ba:487b:683e]) (user=yepeilin job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:332b:b0:2c1:7289:d62a with SMTP id 586e51a60fabf-2c1786d0bdamr7852051fac.36.1740980234887; Sun, 02 Mar 2025 21:37:14 -0800 (PST) Date: Mon, 3 Mar 2025 05:37:07 +0000 In-Reply-To: Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog Message-ID: Subject: [PATCH bpf-next v4 01/10] bpf/verifier: Factor out atomic_ptr_type_ok() 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 Factor out atomic_ptr_type_ok() as a helper function to be used later. Signed-off-by: Peilin Ye --- kernel/bpf/verifier.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index eb1624f6e743..66b19fa4be48 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -6195,6 +6195,26 @@ static bool is_arena_reg(struct bpf_verifier_env *env, int regno) return reg->type == PTR_TO_ARENA; } +/* Return false if @regno contains a pointer whose type isn't supported for + * atomic instruction @insn. + */ +static bool atomic_ptr_type_ok(struct bpf_verifier_env *env, int regno, + struct bpf_insn *insn) +{ + if (is_ctx_reg(env, regno)) + return false; + if (is_pkt_reg(env, regno)) + return false; + if (is_flow_key_reg(env, regno)) + return false; + if (is_sk_reg(env, regno)) + return false; + if (is_arena_reg(env, regno)) + return bpf_jit_supports_insn(insn, true); + + return true; +} + static u32 *reg2btf_ids[__BPF_REG_TYPE_MAX] = { #ifdef CONFIG_NET [PTR_TO_SOCKET] = &btf_sock_ids[BTF_SOCK_TYPE_SOCK], @@ -7652,11 +7672,7 @@ static int check_atomic(struct bpf_verifier_env *env, int insn_idx, struct bpf_i return -EACCES; } - if (is_ctx_reg(env, insn->dst_reg) || - is_pkt_reg(env, insn->dst_reg) || - is_flow_key_reg(env, insn->dst_reg) || - is_sk_reg(env, insn->dst_reg) || - (is_arena_reg(env, insn->dst_reg) && !bpf_jit_supports_insn(insn, true))) { + if (!atomic_ptr_type_ok(env, insn->dst_reg, insn)) { verbose(env, "BPF_ATOMIC stores into R%d %s is not allowed\n", insn->dst_reg, reg_type_str(env, reg_state(env, insn->dst_reg)->type));