From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) (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 93CB736212D for ; Wed, 8 Apr 2026 06:21:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.193 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775629293; cv=none; b=fmRIIp9dzyP6eHhwekHpyyKlZ9ayX2mFTw+vgr3zg2NvbsA+Xw7Ut1Ued14k7M37s15Dg09TLV7Va3KR0Kzx11YagzLZZ7ZWa17UJMtH/ZX7YS8zrPblPrIintNKDhj35ZoFe1YzMC/V+DozFM2knxtxMTxJ3gSe0pnW3VZQD9Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775629293; c=relaxed/simple; bh=g6iPd9ATB3hMw2AbhUnAxLoFbKhETQcJ+0N+xSs+iyU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hiv4xkrNI+bwkYQ1P7Uh4uNVtLsei4mzkI05VIBL/ldURN6ux9HqDGi5vM3hddrCYu8eFjUzOpp3d3D1EUs3OujBcM1Pa5+Deo9W+/0Nk6qtylovIqgpco1z69oI19+eJ/6cyZwFFNrfvH3A1GPf8AC1DXjgjYQNuewohgG4xUc= 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=eAz5/czw; arc=none smtp.client-ip=209.85.210.193 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="eAz5/czw" Received: by mail-pf1-f193.google.com with SMTP id d2e1a72fcca58-82d0b68837aso2480868b3a.2 for ; Tue, 07 Apr 2026 23:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775629292; x=1776234092; 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=qDTY5WrNSh8QrJOXxdvhaX13ggf9iBqI3yFnGFwM5a0=; b=eAz5/czwApn/CKYYclKShyJSo+MCWX4aUkNk1FiYZraLl7dyhrtQJXQtMp91RI8i3k orvDVSfCVX7TuqZ06rL0XM/vJVpPOWg7epswCgnHCfOJ7w0uDbJbCRprIepEBcQpZp4F +3GSMP7YXVIuryvkrP3oA4UM//yBIGz81MAVLAKnR0yZKpPLBBUiEDTPJXJ9hR7TNTHf AceGWoiYSGEYrU4wuZ4x2xyuCeS14piHAgCwPycCk7xL1lR7hDN/KieKc07GVb74DVx7 SaqXvJswg1ecqCUqs1IchUNXr39C/ufktvvWbE9OUKGpGZwYzIVytGTWwoyl+cGybiTc kgUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775629292; x=1776234092; 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=qDTY5WrNSh8QrJOXxdvhaX13ggf9iBqI3yFnGFwM5a0=; b=kwSDgAnHspKiPH0Tb3Ajn8Ky1oGQupsKUDRP8MEKK7OuBy6X/7fnfEYcXmIRj+Q1tJ dU0JjE4v6vrr9V2oh52WgL2vg/I5HvdD4BCCDJep8T+TTA4BAORvOp9MDD/3wbz7brVl LxTxUQf1vqHs9ocDTzgQFOPBpi8bVZ9THBFtA853Nhi1JLKXPVYEFqIfh3KwVzNth6Sg 8RDdlcnW5fuC4vmDOTJyvRfk6MmRZKlMWY/zM4WuSq3YapcbGIvPLjEcVLfod5Uwv+XV qlEYtYWLqQQTXaKX/Aekx9Qy7BLfzBJNddeIN3OXMKuwkCXMru/aZscfYSHA0Hn3d1u0 V5lg== X-Forwarded-Encrypted: i=1; AJvYcCVfJ9UGv5y6+0bCt/VBRbAXr09/xPP1FPzfUnrEdBlkJgWiXfffk8mryc6+paHTnKVyVBqI9bBsc80Luik=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/7wVsZp+MzpXdz/3ljxxQVYc9wqn1DuIsZpudtgDZLammqCHF KRGRai3OPPxRdvG8wiryOHq+vDi/d+ElJibaEUWEkomVEU5flJCQWZXk X-Gm-Gg: AeBDiestXLr8Re9ZKmdTWxo8nkLVQnu9/wrTxJ58GSAUCM49c75Sgk3vh4OGXh2nP1T RJHhbaZwZhQGc6AezjPAxmwxo2esyRraSe1c/nrhHJ+A2tNUMrqZ1VNBYAleW6aPqaT3f3sUXIK DTga1pCc0nndwBJJay8RZZkTtFKci0Wd0CjNSDPNssXT/I/BN9II6yMKm6Cn7qbHcoSRBNg8AKT zqXm1ueE6ERDI6CeGM01ZtZvTqt2isycYcsnaKxrhlmr+0lBLvS8htLrNFKHhWQg9gPP+CEutj+ Jbq+x0p1SXSIsRrBLnmTLn+LPG0sGxYEYNfLIGKFyZSW84IUPMc5MeIfTvWeyeffu8CZdxQ9KHa 9YRjrCzGkLtT8tpNMyAGelVenmbzM90diY7TZ1GFc2U5qpVIhoFXr/QA3/8QIuutjRXA5a5Wf/Y tEJP5XRg2h9+7wB1gxbkWl X-Received: by 2002:a05:6a00:ab84:b0:82c:225e:63c5 with SMTP id d2e1a72fcca58-82d0da4cdf1mr18748819b3a.18.1775629291883; Tue, 07 Apr 2026 23:21:31 -0700 (PDT) Received: from 7940hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b60199sm17827638b3a.25.2026.04.07.23.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 23:21:31 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: ast@kernel.org Cc: daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, memxor@gmail.com, song@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org, shuah@kernel.org, emil@etsalapatis.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v2 1/3] bpf: add missing fsession to the verifier log Date: Wed, 8 Apr 2026 14:21:07 +0800 Message-ID: <20260408062109.386083-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408062109.386083-1-dongml2@chinatelecom.cn> References: <20260408062109.386083-1-dongml2@chinatelecom.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The fsession attach type is missed in the verifier log in check_get_func_ip(), bpf_check_attach_target() and check_attach_btf_id(). Update them to make the verifier log proper. Meanwhile, update the corresponding selftests. Signed-off-by: Menglong Dong Acked-by: Leon Hwang --- v2: - add a missing FSESSION in bpf_check_attach_target() --- kernel/bpf/verifier.c | 10 +++++----- tools/testing/selftests/bpf/prog_tests/exceptions.c | 8 ++++---- tools/testing/selftests/bpf/verifier/sleepable.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 594260c1f382..beb660b4c3ec 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -11757,7 +11757,7 @@ static int check_get_func_ip(struct bpf_verifier_env *env) if (type == BPF_PROG_TYPE_TRACING) { if (!bpf_prog_has_trampoline(env->prog)) { - verbose(env, "func %s#%d supported only for fentry/fexit/fmod_ret programs\n", + verbose(env, "func %s#%d supported only for fentry/fexit/fsession/fmod_ret programs\n", func_id_name(func_id), func_id); return -ENOTSUPP; } @@ -25561,7 +25561,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, btf = tgt_prog ? tgt_prog->aux->btf : prog->aux->attach_btf; if (!btf) { bpf_log(log, - "FENTRY/FEXIT program can only be attached to another program annotated with BTF\n"); + "FENTRY/FEXIT/FSESSION program can only be attached to another program annotated with BTF\n"); return -EINVAL; } t = btf_type_by_id(btf, btf_id); @@ -25597,7 +25597,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, if (aux->func && aux->func[subprog]->aux->exception_cb) { bpf_log(log, "%s programs cannot attach to exception callback\n", - prog_extension ? "Extension" : "FENTRY/FEXIT"); + prog_extension ? "Extension" : "FENTRY/FEXIT/FSESSION"); return -EINVAL; } conservative = aux->func_info_aux[subprog].unreliable; @@ -25686,7 +25686,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, case BPF_TRACE_RAW_TP: if (tgt_prog) { bpf_log(log, - "Only FENTRY/FEXIT progs are attachable to another BPF prog\n"); + "Only FENTRY/FEXIT/FSESSION progs are attachable to another BPF prog\n"); return -EINVAL; } if (!btf_type_is_typedef(t)) { @@ -25952,7 +25952,7 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) } if (prog->sleepable && !can_be_sleepable(prog)) { - verbose(env, "Only fentry/fexit/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable\n"); + verbose(env, "Only fentry/fexit/fsession/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable\n"); return -EINVAL; } diff --git a/tools/testing/selftests/bpf/prog_tests/exceptions.c b/tools/testing/selftests/bpf/prog_tests/exceptions.c index 84ab73e08b0e..94a62fcd4543 100644 --- a/tools/testing/selftests/bpf/prog_tests/exceptions.c +++ b/tools/testing/selftests/bpf/prog_tests/exceptions.c @@ -128,7 +128,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "FENTRY/FEXIT/FSESSION programs cannot attach to exception callback", 0); if (test__start_subtest("throwing fentry -> exception_cb")) RUN_EXT(-EINVAL, true, ({ @@ -138,7 +138,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "FENTRY/FEXIT/FSESSION programs cannot attach to exception callback", 0); if (test__start_subtest("non-throwing fexit -> exception_cb")) RUN_EXT(-EINVAL, true, ({ @@ -148,7 +148,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "FENTRY/FEXIT/FSESSION programs cannot attach to exception callback", 0); if (test__start_subtest("throwing fexit -> exception_cb")) RUN_EXT(-EINVAL, true, ({ @@ -158,7 +158,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "FENTRY/FEXIT/FSESSION programs cannot attach to exception callback", 0); if (test__start_subtest("throwing extension (with custom cb) -> exception_cb")) RUN_EXT(-EINVAL, true, ({ diff --git a/tools/testing/selftests/bpf/verifier/sleepable.c b/tools/testing/selftests/bpf/verifier/sleepable.c index 1f0d2bdc673f..c2b7f5ebf168 100644 --- a/tools/testing/selftests/bpf/verifier/sleepable.c +++ b/tools/testing/selftests/bpf/verifier/sleepable.c @@ -85,7 +85,7 @@ .expected_attach_type = BPF_TRACE_RAW_TP, .kfunc = "sched_switch", .result = REJECT, - .errstr = "Only fentry/fexit/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable", + .errstr = "Only fentry/fexit/fsession/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable", .flags = BPF_F_SLEEPABLE, .runs = -1, }, -- 2.53.0