Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 98BC427B335 for ; Sun, 1 Feb 2026 03:16:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769915783; cv=none; b=k4KYRelqvOAbfdvYQOYaOTC3VOQSHO08Y4if4fT1DxMTTGZp3Vr16MrIa6J/4qs5O/5dSYu8JGD7aiXlul4tMCAr/s6f/Uu0hWHFDkZYSN137o3D+FnsCL3KNp7gPc3zfj7wmWKoGmKZdUVGYcy7qzSXXdZpHZmp/8SQ773BbL4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769915783; c=relaxed/simple; bh=uUL3+hIqzzN4FF56+RZlxBho1NEz93n03uZmaBVx188=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SLPGK2YCtvouv+K+Ol2B5CyRHVaZlWwb5jyld6a4BaTZ6+nzSU96QrF9XK3Jvo4GyQK0bDfDzJ9Zl/wFIxFzuOWUHSE9uNX3GpWOE1Z5Ds3MmoMWRVk5UvWJI2XlwozfWOAbGPFpm+iUcU7g9tskz6tDgxZAJEgWXgMAOzdEkZE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Y5ht4EZm; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Y5ht4EZm" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-823210d1d8eso1716968b3a.1 for ; Sat, 31 Jan 2026 19:16:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769915781; x=1770520581; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=32rXQW4BVZZQ4FbVA0RQJRaOaveBTs70Lc0Lq+KuBq8=; b=Y5ht4EZmA54Ut68q0sA1S71vHaQkGq7ry7LSRa8y/SHeaE2e3V+xe9KtzutxZJfD+F czxucIw7KK0Ug50P3KK7aX7+DAu7GzKSRk+3+LN1KezFB4NTtZSde7TUVEgw5TmhORn5 IE9LkaTqwwiX1w+0aQRRkwxTEZXN/qKATkDymLG0YGc7uX8o7GTSqvRG45XQFW4snjoI l69qrbNhOqDijRiBk01dfyNn83HHjQoT3b02RmwDbRtAvk8/Sm6HBHiGe4iheGXV9iZg rIKAGft9ivhgfBXpJrosp+t5Px8LvvmQb/M2S34KTThwx5+ZQBqT8O5A9exSmMClAUCh xk2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769915781; x=1770520581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=32rXQW4BVZZQ4FbVA0RQJRaOaveBTs70Lc0Lq+KuBq8=; b=fMv2M7z20CwH9Dgwfa8htV89rwllIBu0bX+X0Posa2h7CcP7PE9nF+cQq31nFsbUWs P/7yNL/yrT527PM5aY544UEAHuZkjPbVHGBtLsgZeYh4baAHwnGmxD8Vc5kA0Um8FXjD 6b5K1brrydfyczs8v8z3I9HyHb9rRNCDLTBegb33DPrW3A8tgUNAsS7hGkh1xiaIDSfp z7sG5i/Qqchy7ICx3jT4xpa13kWJHySj/P3alHk6vqW+PIBV96t+HferzbVgo2mU3DUA qTm3H9Zj5l1C5IieElkL+/CtCeuxXS+6wwPqrS2flLJCQUAVQ/9jeTCXFZu/C4q+UJ/G rJdg== X-Forwarded-Encrypted: i=1; AJvYcCWuU2WFQifc3DnkzsCOa9UlIcLyCnqbEf0FRDpsyw4+rPncLBpKUrQNQIcC75ripaJaYYY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0jSbMKQ3U9PqBCei39argxQkC/G9kCY9dzA/+HPnvUJ89ZmXS Tulp4IwB5zD4gWShgUHhphrZ9j3ZKuML6JYg3j+dpcQjrqoY8t9wv3+9 X-Gm-Gg: AZuq6aJSMSwZ7Np32j2mSYK+a+2ZrNMSjrC/ApqAnfXZBvJWVjrvR33eBaRRjEdls/o fHRjN6j7WeAOXUs/MArpBMLtYcRgANpn+QGxRVqwzVQHE+kdB38JIe6OUmt6i8tyVajlhB+zic+ b4UlhmuqVfkgt4akGMzP1ewYknlES213z65bGdusqzIqX3YxsSK1eOS3bO9YIRyPtlXygAnuMZN PRMcgRH2JtsXlLgWrWQUjEhR+fhh6HpXnYKWOQbfOB0Q/wL61O5ybIBMEqoxJ0fkSM8rwj92g5+ XVuvxSDw3vks7fHPhcPQeVrfTPbWJso3K0+WdCi1j8vhj0DV8NizFsY8KzPPOr4iJ2/vmWyamLc pCs2fslfG9KNnKwTs9q5aSjbB607SAvnP6VwNmq+hZM5EjzzSNr1B0tUZ+KlGOjPumP2CU+OqEc /lU7lwiYEdrD6Kc1iJz30yHuDetR4Gr+SE742v015ARg== X-Received: by 2002:a05:6a00:12d9:b0:7e8:4471:ae55 with SMTP id d2e1a72fcca58-823aa6ec46cmr7512905b3a.33.1769915780635; Sat, 31 Jan 2026 19:16:20 -0800 (PST) Received: from localhost.localdomain ([113.218.252.120]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82379b6b2bdsm11810818b3a.30.2026.01.31.19.16.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 31 Jan 2026 19:16:20 -0800 (PST) From: chengkaitao To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, yangfeng@kylinos.cn Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Chengkaitao Subject: [PATCH v2 1/3] bpf/verifier: allow calling bpf_kptr_xchg while holding a lock Date: Sun, 1 Feb 2026 11:16:05 +0800 Message-ID: <20260201031607.32940-2-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260201031607.32940-1-pilgrimtao@gmail.com> References: <20260201031607.32940-1-pilgrimtao@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chengkaitao For the following scenario: struct tree_node { struct bpf_rb_node node; struct request __kptr *req; u64 key; }; struct bpf_rb_root tree_root __contains(tree_node, node); struct bpf_spin_lock tree_lock; If we need to traverse all nodes in the rbtree, retrieve the __kptr pointer from each node, and read kernel data from the referenced object, using bpf_kptr_xchg appears unavoidable. This patch skips the BPF verifier checks for bpf_kptr_xchg when called while holding a lock. Signed-off-by: Chengkaitao --- kernel/bpf/verifier.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 3135643d5695..05a6a6606b6c 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -20387,7 +20387,8 @@ static int do_check_insn(struct bpf_verifier_env *env, bool *do_print_state) if (env->cur_state->active_locks) { if ((insn->src_reg == BPF_REG_0 && - insn->imm != BPF_FUNC_spin_unlock) || + insn->imm != BPF_FUNC_spin_unlock && + insn->imm != BPF_FUNC_kptr_xchg) || (insn->src_reg == BPF_PSEUDO_KFUNC_CALL && (insn->off != 0 || !kfunc_spin_allowed(insn->imm)))) { verbose(env, -- 2.50.1 (Apple Git-155)