From nobody Wed Feb 11 12:31:45 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C77BC77B61 for ; Fri, 7 Apr 2023 08:47:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240421AbjDGIrd (ORCPT ); Fri, 7 Apr 2023 04:47:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240332AbjDGIrY (ORCPT ); Fri, 7 Apr 2023 04:47:24 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6F15A24A for ; Fri, 7 Apr 2023 01:46:53 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id b5-20020a17090a6e0500b0023f32869993so930422pjk.1 for ; Fri, 07 Apr 2023 01:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1680857213; 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=FVi0AWiu1zAkxzg8zSlzsBAWbtMyPsv5tFRVM1WnV2A=; b=YjtReY6YH5PgBWUNe8+Zz4g/S7AxXP6Ok/jQUc4jyUj8R+tDpnsYdLbh8/iMw2v+Jv P23WAr2SOl8H6ECcKcyL7BfAoR+jwoW5qbOL9VtenUVOu/XpVntsOtakSPjqNpj9SBfI 2btr4MW/LNfAmx4og6Fbif4/zshs0ZWo3bs8VJT4aeAh9+Z/rTf6LQ/Ewh8uNxiIyqh8 /NvMpNeaBAFmvi635Gy7rT3iNd7KLX9AbDcfGQkw/CyU8p55KmHTE/GF27WcJebT51A3 xWjGoGrkccsgK0wUmabcpFmK6SbB7An3As2nt521xR37SML4gDfm6L2iCFCySbEIU8HK KQTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680857213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FVi0AWiu1zAkxzg8zSlzsBAWbtMyPsv5tFRVM1WnV2A=; b=gOWhKNERTgHw1Ep5mGS5Qy0qkQWHCQaRl7PzJJ/GfraLl48Stq5lqaEoW1rVjadr55 2c8ZcOIWRF4Z2sJMVYzy2nEqAMckB/LdNRx7Gs496Y47iQGMRUSEphFcJhWkqF0vncg9 NxYJ8KWZ+thTE+yDPAzgtZ0+Z+jUIUDv0T9OUIUpve0s9IRG28wsYlnK3uI1u7RMIMMC cf4dom01B1HYyOB8LIr1ldmTYSsdMC4RxdgrUFOztJoZd6+uKFvatLQKMQhOamAhesl0 5a7mS+HrGUfp8y4UKae15v6y+Lt3pO1GTF6X0ZxFDnav3xVT25Rx0GJ3me75Pj7XHn8Q 53+g== X-Gm-Message-State: AAQBX9e7nsiGsQP2HlLjZAnGFsjZQeDZ8fYk7tZyW08XNEQ9RGGaKGEg WUwvq0gypOk11iNo3hY8QrAuyg== X-Google-Smtp-Source: AKy350bzeTj5bfaWlrevCPwRsEkQ42Pd5eqaKyCwfP9XiQJ2/nx1laJP+4SSVAhR8jdFnKHsZw+QhA== X-Received: by 2002:a17:90b:4a0a:b0:23b:3d6e:1ed with SMTP id kk10-20020a17090b4a0a00b0023b3d6e01edmr1732441pjb.13.1680857213186; Fri, 07 Apr 2023 01:46:53 -0700 (PDT) Received: from C02F52LSML85.bytedance.net ([139.177.225.238]) by smtp.gmail.com with ESMTPSA id s13-20020a17090a5d0d00b0023b3d80c76csm2333676pji.4.2023.04.07.01.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 01:46:52 -0700 (PDT) From: Feng zhou To: martin.lau@linux.dev, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mykolal@fb.com, shuah@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, yangzhenze@bytedance.com, wangdongdong.6@bytedance.com, zhouchengming@bytedance.com, zhoufeng.zf@bytedance.com Subject: [PATCH v2 1/2] bpf/btf: Fix is_int_ptr() Date: Fri, 7 Apr 2023 16:46:07 +0800 Message-Id: <20230407084608.62296-2-zhoufeng.zf@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230407084608.62296-1-zhoufeng.zf@bytedance.com> References: <20230407084608.62296-1-zhoufeng.zf@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Feng Zhou When tracing a kernel function with arg type is u32*, btf_ctx_access() would report error: arg2 type INT is not a struct. The commit bb6728d75611 ("bpf: Allow access to int pointer arguments in tracing programs") added support for int pointer, but don't skip modifiers before checking it's type. This patch fixes it. Fixes: bb6728d75611 ("bpf: Allow access to int pointer arguments in tracing= programs") Co-developed-by: Chengming Zhou Signed-off-by: Chengming Zhou Signed-off-by: Feng Zhou --- kernel/bpf/btf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 593c45a294d0..17c65de1e48b 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -5913,9 +5913,8 @@ static bool is_int_ptr(struct btf *btf, const struct = btf_type *t) /* t comes in already as a pointer */ t =3D btf_type_by_id(btf, t->type); =20 - /* allow const */ - if (BTF_INFO_KIND(t->info) =3D=3D BTF_KIND_CONST) - t =3D btf_type_by_id(btf, t->type); + /* skip modifiers */ + t =3D btf_type_skip_modifiers(btf, t->type, NULL); =20 return btf_type_is_int(t); } --=20 2.20.1 From nobody Wed Feb 11 12:31:45 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CB4AC77B61 for ; Fri, 7 Apr 2023 08:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240490AbjDGIri (ORCPT ); Fri, 7 Apr 2023 04:47:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240393AbjDGIrZ (ORCPT ); Fri, 7 Apr 2023 04:47:25 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C4EA9748 for ; Fri, 7 Apr 2023 01:47:02 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id q15-20020a17090a2dcf00b0023efab0e3bfso882420pjm.3 for ; Fri, 07 Apr 2023 01:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1680857222; 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=Vmjzgy6aRksKW2xHyWe1W6xO2vj0DerqrAUjE2I1iOw=; b=D7NDS8dKRGJ65goddWwG9CqMSD3PDMJMp6enwZTFKi+nO6FFMuwSsw3m2T1n4vkPTp HkBrY14lcDLfUQfG6oOO3I3J/ATOHIxtuQwDTK8NSbPMlyOWnMaCSSfM/reVGS3C4ttc bzPXlQzGp4stv7e6glHHV8KwpORktD/97cn9Wzm/gqXlf+gh/gRLJ+Dw1RN1j6q1cCve X+wDp9Sdrju9gE1WCxz+tzrYRLE15l8MnNSwbycno2B7aahP8IQTXhUgvNkjHqf0tijZ qR98ylGmO1iEGInPNMoNvnt6B1+mz36qWZrtzVjSoKkAP29j064oU6uTrzrR9RJBVFTF PXRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680857222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vmjzgy6aRksKW2xHyWe1W6xO2vj0DerqrAUjE2I1iOw=; b=sDUUj0erBNKV3Ug15kBqRWP5PG0nSLwcDQvGRoHzA885XRa67Rl4iGCubuh7btWD2L DtDVOdm103ty01wRtkn/FWW5xm1zO3EunYrrvqK7EFc/vL8qwQVy3TK1AVhywzBPjbA1 7Z9AqdEJWp7rrP18/zd+LLOtM9UNbgGx8X16B12YJnA9M4adVjYW3ylnwkrjtVpLkpHA j4qA7rZojO9IuaqS7bKbpC9vVmUCirxkGt2rBsdE2RanhW8kIABLgdi5ZB9+/aeSeyI0 vHjmw4FO8n72iP7lQPb2owzNTIWCW+XlF6ciLNb0ptWaepfcjEW29uNYTsmA+HPiL3X4 Jlbw== X-Gm-Message-State: AAQBX9fqAhXbxzHUOyPNmhUlAt2cXYP59h/P2FUn3uzTRrqT0f9LGOoF uEtX0T0De6eNgvs7SDjk7cWyAw== X-Google-Smtp-Source: AKy350ak8Z2sVLnknesb8rdNJcheWrbfZoigZ/kr+Zq60kGlUKezCUKJy/ma6QUMi7cvv7oDlZUXOg== X-Received: by 2002:a17:90b:1bd1:b0:23c:fef0:d441 with SMTP id oa17-20020a17090b1bd100b0023cfef0d441mr1578447pjb.33.1680857221702; Fri, 07 Apr 2023 01:47:01 -0700 (PDT) Received: from C02F52LSML85.bytedance.net ([139.177.225.238]) by smtp.gmail.com with ESMTPSA id s13-20020a17090a5d0d00b0023b3d80c76csm2333676pji.4.2023.04.07.01.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 01:47:01 -0700 (PDT) From: Feng zhou To: martin.lau@linux.dev, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, mykolal@fb.com, shuah@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, yangzhenze@bytedance.com, wangdongdong.6@bytedance.com, zhouchengming@bytedance.com, zhoufeng.zf@bytedance.com Subject: [PATCH v2 2/2] selftests/bpf: Add test to access u32 ptr argument in tracing program Date: Fri, 7 Apr 2023 16:46:08 +0800 Message-Id: <20230407084608.62296-3-zhoufeng.zf@bytedance.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20230407084608.62296-1-zhoufeng.zf@bytedance.com> References: <20230407084608.62296-1-zhoufeng.zf@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Feng Zhou Adding verifier test for accessing u32 pointer argument in tracing programs. The test program loads 1nd argument of bpf_fentry_test9 function which is u32 pointer and checks that verifier allows that. Co-developed-by: Chengming Zhou Signed-off-by: Chengming Zhou Signed-off-by: Feng Zhou --- net/bpf/test_run.c | 8 +++++++- .../testing/selftests/bpf/verifier/btf_ctx_access.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index f1652f5fbd2e..68bdfc041a7b 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -541,6 +541,11 @@ int noinline bpf_fentry_test8(struct bpf_fentry_test_t= *arg) return (long)arg->a; } =20 +__bpf_kfunc u32 bpf_fentry_test9(u32 *a) +{ + return *a; +} + __bpf_kfunc int bpf_modify_return_test(int a, int *b) { *b +=3D 1; @@ -855,7 +860,8 @@ int bpf_prog_test_run_tracing(struct bpf_prog *prog, bpf_fentry_test5(11, (void *)12, 13, 14, 15) !=3D 65 || bpf_fentry_test6(16, (void *)17, 18, 19, (void *)20, 21) !=3D 111 || bpf_fentry_test7((struct bpf_fentry_test_t *)0) !=3D 0 || - bpf_fentry_test8(&arg) !=3D 0) + bpf_fentry_test8(&arg) !=3D 0 || + bpf_fentry_test9(&retval) !=3D 0) goto out; break; case BPF_MODIFY_RETURN: diff --git a/tools/testing/selftests/bpf/verifier/btf_ctx_access.c b/tools/= testing/selftests/bpf/verifier/btf_ctx_access.c index 6340db6b46dc..0484d3de040d 100644 --- a/tools/testing/selftests/bpf/verifier/btf_ctx_access.c +++ b/tools/testing/selftests/bpf/verifier/btf_ctx_access.c @@ -10,3 +10,16 @@ .expected_attach_type =3D BPF_TRACE_FENTRY, .kfunc =3D "bpf_modify_return_test", }, + +{ + "btf_ctx_access u32 pointer accept", + .insns =3D { + BPF_LDX_MEM(BPF_W, BPF_REG_2, BPF_REG_1, 0), /* load 1nd argument value (= u32 pointer) */ + BPF_MOV64_IMM(BPF_REG_0, 0), + BPF_EXIT_INSN(), + }, + .result =3D ACCEPT, + .prog_type =3D BPF_PROG_TYPE_TRACING, + .expected_attach_type =3D BPF_TRACE_FENTRY, + .kfunc =3D "bpf_fentry_test9", +}, --=20 2.20.1