Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 4088D441042 for ; Fri, 27 Feb 2026 15:46:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772207185; cv=none; b=tpj98hlwx18VPBqmSM2ogvc85A1gDK5/LABt6yekxIH+oCdWQqFB8pnM8UWgoaUgI42O0JDTtIonVpuPY+RbQ5Oa7J6SaytNWBaOolrMDRL38p9WDmaT9PlCfmUyTWMVLnI650AhBqBKTScRpMUjZfCH9FPqPh++IuhewqE63yI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772207185; c=relaxed/simple; bh=yDNo/s93lBFyToErP/wki4LpSW8EwVlUr2WqPB34oWE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZSCDRO3vAIZvpni9VseN9ywd3mt40nrdaqpiu4Td09KyCs5I7eedsNLa5uua+mjD5AmFmQre/qtn18qxlapy1ym7uyb9ybWtVCVimdR+rrDMx3/U5MoTUqSiOADWJuHnvpIz+O13v5SlHK+kP9y76w7u67JgW5xr7odUo9Isznw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com; spf=pass smtp.mailfrom=etsalapatis.com; dkim=pass (2048-bit key) header.d=etsalapatis-com.20230601.gappssmtp.com header.i=@etsalapatis-com.20230601.gappssmtp.com header.b=AIlKdwQj; arc=none smtp.client-ip=209.85.222.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=etsalapatis-com.20230601.gappssmtp.com header.i=@etsalapatis-com.20230601.gappssmtp.com header.b="AIlKdwQj" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-8cb38e86cf2so225953485a.1 for ; Fri, 27 Feb 2026 07:46:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=etsalapatis-com.20230601.gappssmtp.com; s=20230601; t=1772207183; x=1772811983; 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=ycFQg5QJINHuOrmydHV79ValJBhtiQNUVTIfioie238=; b=AIlKdwQje18IvT4VdnGUBkz60JgYp/687k+qYRtc0p76tDm8pHQY2LxgmvvsohiG/Y 5y+AjVaMCsg2wWCPcK7ItPAwwxizEttfl6hk/MhgemQp9M/v29AN+I9ZPbUVvXTRG23v SutJSQ//a9OFDeRoyWjGStQX+C0tXcl9I3G/mBxtEtJZKUb+5U1IzUtlllc2d0QSu601 HLb3Yi1i4n7Ds1KGOygDcHYSrUltZc6EFPGGy9vxmVi/lhQGDWGH0rvhGuuRlrgYbVM4 N0u1VG7Kf0g6qy6q6zfDY0oCKVP8aloABIaVvWjypmaaedy9zd2qrHwiOGHdXsjlnNjB bNxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772207183; x=1772811983; 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=ycFQg5QJINHuOrmydHV79ValJBhtiQNUVTIfioie238=; b=Enms93AT3evyQDq1WWtZdHk2yLg0GdjNRj4b7F067kLA9FAqmhSze9BZ0lIW7PCY0a ztUxxksncyOBZdLPh6RaYwSSKH3Jv2UDXMMtndilDZ351CQIT3B/sBrDvQcB/ulzcASj f9/Nx8cXJkbIildARfQUyLFaRwYyGKJ3t4+AZB38B3b4qoZM8oQedGHiys7Jp7j0SD2Y 79GWXof3UiHJEoq+7Ymr8dV8kYXCU3Gbd6J1KKKDy5+1xCaeZGJdVMduGXex0ShF6LYs xyDb9MZW+oOL/Cfv+0asUAs1cn/RZe5Id6UK6HYiabws9MAI+D+BrdmRvm2BRjvlQYWR rEgA== X-Gm-Message-State: AOJu0Yx3Ls7oAky45b5UGz9KD8z9tUerLJ0fr7UC3dXgLKp1dReyPdSu 431sEEC2gBeZC3TKBqKFX4ocEUuzc8YgltX5dBvcIxi/zBuY0qsjcIY5Du8OnrSuvklKxNHIV+Y WajMDSho= X-Gm-Gg: ATEYQzzuJkquOcYdiv7whY5exZLXKM39XtvphyLKov+JUPQvMGV/zGPbBVOsbBbj7em ac/RoxMzv9wKEkwNPCp0geQB//n5qk2jIBE4Q13Dgcngh8nwQ+RPZlYvtb/IbJVuIv6UW0aHM+C 7MdhEMEXqjPjYIvGJVXBT9WWnZ958+MOcnRdGDEjsoZY/9Hq1hQq0XHGvDIlX6BGOgGdsF3ZNfc HEGjXkW9Gp+Yns13TSZb6tVksaOyYPHYbvkHe2vSe0kDrYbSBbEl/GR2sBqX9BiC6rhnCH4OiNv +/6MKxUpxdk/wLagAFq3Dwx+0760W5eK0PocpFL3MZku2NcXwvedxbLYhxNrxu5n9Vzt9GfxaSs w6Eo4szOcbnRgmBC8gdXl61ewHkBK9zaWSWEPjmrs1NxKRMonf46Jd6K3ZJOjdde+KBCvkWfqpl XukJulCE7orDa4KVrT33XsVQ== X-Received: by 2002:a05:620a:25cb:b0:8c6:f414:3ba8 with SMTP id af79cd13be357-8cbc8e03192mr444093385a.49.1772207182995; Fri, 27 Feb 2026 07:46:22 -0800 (PST) Received: from boreas.. ([140.174.219.137]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cbbf652bb6sm544180385a.4.2026.02.27.07.46.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 07:46:22 -0800 (PST) From: Emil Tsalapatis To: bpf@vger.kernel.org Cc: andrii@kernel.org, ast@kernel.org, daniel@iogearbox.net, eddyz87@gmail.com, martin.lau@kernel.org, memxor@gmail.com, song@kernel.org, yonghong.song@linux.dev, Emil Tsalapatis Subject: [PATCH bpf-next v5 5/5] selftests: bpf: Add tests for void global subprogs Date: Fri, 27 Feb 2026 10:46:16 -0500 Message-ID: <20260227154616.6846-6-emil@etsalapatis.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260227154616.6846-1-emil@etsalapatis.com> References: <20260227154616.6846-1-emil@etsalapatis.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add additional testing for void global functions. The tests ensure that calls to void global functions properly keep R0 invalid. Also make sure that exception callbacks still require a return value. Signed-off-by: Emil Tsalapatis --- .../selftests/bpf/prog_tests/exceptions.c | 1 + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 24 +++++++++++++ .../testing/selftests/bpf/progs/exceptions.c | 14 ++++++++ .../selftests/bpf/progs/exceptions_fail.c | 35 +++++++++++++++++-- .../bpf/progs/freplace_int_with_void.c | 14 ++++++++ .../selftests/bpf/progs/freplace_void.c | 12 +++++++ .../bpf/progs/verifier_global_subprogs.c | 19 ++++++++++ 7 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/freplace_int_with_void.c create mode 100644 tools/testing/selftests/bpf/progs/freplace_void.c diff --git a/tools/testing/selftests/bpf/prog_tests/exceptions.c b/tools/testing/selftests/bpf/prog_tests/exceptions.c index 516f4a13013c..84ab73e08b0e 100644 --- a/tools/testing/selftests/bpf/prog_tests/exceptions.c +++ b/tools/testing/selftests/bpf/prog_tests/exceptions.c @@ -83,6 +83,7 @@ static void test_exceptions_success(void) RUN_SUCCESS(exception_assert_range_with, 1); RUN_SUCCESS(exception_bad_assert_range, 0); RUN_SUCCESS(exception_bad_assert_range_with, 10); + RUN_SUCCESS(exception_throw_from_void_global, 11); #define RUN_EXT(load_ret, attach_err, expr, msg, after_link) \ { \ diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c index f29fc789c14b..23d933f1aec6 100644 --- a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +++ b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c @@ -347,6 +347,17 @@ static void test_func_sockmap_update(void) prog_name, false, NULL); } +static void test_func_replace_void(void) +{ + const char *prog_name[] = { + "freplace/foo", + }; + test_fexit_bpf2bpf_common("./freplace_void.bpf.o", + "./test_global_func7.bpf.o", + ARRAY_SIZE(prog_name), + prog_name, false, NULL); +} + static void test_obj_load_failure_common(const char *obj_file, const char *target_obj_file, const char *exp_msg) @@ -432,6 +443,15 @@ static void test_func_replace_global_func(void) prog_name, false, NULL); } +static void test_func_replace_int_with_void(void) +{ + /* Make sure we can't freplace with the wrong type */ + test_obj_load_failure_common("freplace_int_with_void.bpf.o", + "./test_global_func2.bpf.o", + "Return type UNKNOWN of test_freplace_int_with_void()" + " doesn't match type INT of global_func2()"); +} + static int find_prog_btf_id(const char *name, __u32 attach_prog_fd) { struct bpf_prog_info info = {}; @@ -597,4 +617,8 @@ void serial_test_fexit_bpf2bpf(void) test_fentry_to_cgroup_bpf(); if (test__start_subtest("func_replace_progmap")) test_func_replace_progmap(); + if (test__start_subtest("freplace_int_with_void")) + test_func_replace_int_with_void(); + if (test__start_subtest("freplace_void")) + test_func_replace_void(); } diff --git a/tools/testing/selftests/bpf/progs/exceptions.c b/tools/testing/selftests/bpf/progs/exceptions.c index f09cd14d8e04..4206f59d7b86 100644 --- a/tools/testing/selftests/bpf/progs/exceptions.c +++ b/tools/testing/selftests/bpf/progs/exceptions.c @@ -109,6 +109,20 @@ int exception_tail_call(struct __sk_buff *ctx) { return ret + 8; } +__weak +void throw_11(void) +{ + bpf_throw(11); +} + +SEC("tc") +int exception_throw_from_void_global(struct __sk_buff *ctx) +{ + throw_11(); + + return 0; +} + __noinline int exception_ext_global(struct __sk_buff *ctx) { volatile int ret = 0; diff --git a/tools/testing/selftests/bpf/progs/exceptions_fail.c b/tools/testing/selftests/bpf/progs/exceptions_fail.c index d28ecc4ee2d0..275ad6fe4a04 100644 --- a/tools/testing/selftests/bpf/progs/exceptions_fail.c +++ b/tools/testing/selftests/bpf/progs/exceptions_fail.c @@ -29,11 +29,15 @@ struct { private(A) struct bpf_spin_lock lock; private(A) struct bpf_rb_root rbtree __contains(foo, node); -__noinline void *exception_cb_bad_ret_type(u64 cookie) +__noinline void *exception_cb_bad_ret_type1(u64 cookie) { return NULL; } +__noinline void exception_cb_bad_ret_type2(u64 cookie) +{ +} + __noinline int exception_cb_bad_arg_0(void) { return 0; @@ -50,8 +54,8 @@ __noinline int exception_cb_ok_arg_small(int a) } SEC("?tc") -__exception_cb(exception_cb_bad_ret_type) -__failure __msg("Global function exception_cb_bad_ret_type() return value not void or scalar.") +__exception_cb(exception_cb_bad_ret_type1) +__failure __msg("Global function exception_cb_bad_ret_type1() return value not void or scalar.") int reject_exception_cb_type_1(struct __sk_buff *ctx) { bpf_throw(0); @@ -85,6 +89,15 @@ int reject_exception_cb_type_4(struct __sk_buff *ctx) return 0; } +SEC("?tc") +__exception_cb(exception_cb_bad_ret_type2) +__failure __msg("exception cb cannot return void") +int reject_exception_cb_type_5(struct __sk_buff *ctx) +{ + bpf_throw(0); + return 0; +} + __noinline static int timer_cb(void *map, int *key, struct bpf_timer *timer) { @@ -346,4 +359,20 @@ int reject_exception_throw_cb_diff(struct __sk_buff *ctx) return 0; } +__weak +void foo(void) +{ + bpf_throw(1); +} + +SEC("?fentry/bpf_check") +__failure __msg("At program exit the register R1 has smin=1 smax=1 should") +int reject_out_of_range_global_throw(struct __sk_buff *skb) +{ + foo(); + + return 0; +} + + char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/progs/freplace_int_with_void.c b/tools/testing/selftests/bpf/progs/freplace_int_with_void.c new file mode 100644 index 000000000000..8b6f5776cf0f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/freplace_int_with_void.c @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include + +volatile int data; + +SEC("freplace/global_func2") +void test_freplace_int_with_void(struct __sk_buff *skb) +{ + data = 1; +} + +char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/progs/freplace_void.c b/tools/testing/selftests/bpf/progs/freplace_void.c new file mode 100644 index 000000000000..cfa4af00991d --- /dev/null +++ b/tools/testing/selftests/bpf/progs/freplace_void.c @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include + +volatile int data; + +SEC("freplace/foo") +void test_freplace_void(struct __sk_buff *skb) +{ +} + +char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/progs/verifier_global_subprogs.c b/tools/testing/selftests/bpf/progs/verifier_global_subprogs.c index 20904cd2baa2..f02012a2fbaa 100644 --- a/tools/testing/selftests/bpf/progs/verifier_global_subprogs.c +++ b/tools/testing/selftests/bpf/progs/verifier_global_subprogs.c @@ -388,4 +388,23 @@ int arg_tag_dynptr(struct xdp_md *ctx) return subprog_dynptr(&dptr); } +__weak +void foo(void) +{ +} + +SEC("?tc") +__failure __msg("R0 !read_ok") +int return_from_void_global(struct __sk_buff *skb) +{ + foo(); + + asm volatile( + "r1 = r0;" + ::: + ); + + return 0; +} + char _license[] SEC("license") = "GPL"; -- 2.49.0