From nobody Sun Feb 8 20:29:25 2026 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7D23363C51 for ; Fri, 9 Jan 2026 18:50:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767984603; cv=none; b=TWOaq51lNKmyTcqZo9DcgWIHz29faLcxhkuJ6q4RodVlA+5fwYLyY8GV12k2Nh4mf+fcu4QMwA82+pc9ln4mtkPkEijkRrLU4MkA24wTsBKi2vAyRBKxJcl3ebXE1BaF7mcOWoRNkA/6c8GcE5KNWCIPaW8MXaXF3F2moBebJ3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767984603; c=relaxed/simple; bh=8eSshO1eAOsEMUxdr2w5QGMdIYA7dLiw/OcQBesd5/U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kmy9m2zbAWJ58bf7yfKrkTn4mukYMqP2X+ej0IdzDolHuOjJ1sh6LUP2vXsWJUGMSneHfigEIZ3yldqklU8xQP5zTiM/E3J/j/lrCh5obSYNxbPGBU/1ujcPYcM8SUGXHC8tAusmhzigLh8t+ARQnQIRJSoHWAobuBbL7pScYtc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=n/fZFnxS; arc=none smtp.client-ip=95.215.58.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="n/fZFnxS" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1767984600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lP187HHORxCqW3ZV85vL90K/5kjNWhV4Lm6JMbrSvQg=; b=n/fZFnxS0ncYeW7cnsRaRFSKZueQKsb8B2CZaVnXe3X30Y1qXnPes+lMTkrwHwFwio8szm An1bR5V+pyZN7z+K3/8tCw/PyzvGvXa/56cGcEoKfUbOPkk/jKni66Q9if3dcE8byNzfzm FmWV1jMSP2HKPsuLeYEZ+EzlBNmILmk= From: Ihor Solodrai To: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau , Eduard Zingerman Cc: Mykyta Yatsenko , Tejun Heo , Alan Maguire , Benjamin Tissoires , Jiri Kosina , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, sched-ext@lists.linux.dev Subject: [PATCH bpf-next v1 09/10] bpf: Add bpf_stream_vprintk with KF_IMPLICIT_ARGS Date: Fri, 9 Jan 2026 10:48:51 -0800 Message-ID: <20260109184852.1089786-10-ihor.solodrai@linux.dev> In-Reply-To: <20260109184852.1089786-1-ihor.solodrai@linux.dev> References: <20260109184852.1089786-1-ihor.solodrai@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Implement bpf_stream_vprintk with an implicit bpf_prog_aux argument, and change bpf_stream_vprintk_impl to call the new kfunc. Update the selftests to use the new API with implicit argument. bpf_stream_vprintk macro is changed to use the new bpf_stream_vprintk kfunc, and the extern definition of bpf_stream_vprintk_impl is replaced accordingly. Signed-off-by: Ihor Solodrai --- kernel/bpf/helpers.c | 1 + kernel/bpf/stream.c | 11 ++++++++--- tools/lib/bpf/bpf_helpers.h | 6 +++--- tools/testing/selftests/bpf/progs/stream_fail.c | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 2e01973f2c18..b35b78c08583 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -4558,6 +4558,7 @@ BTF_ID_FLAGS(func, bpf_strncasestr); #if defined(CONFIG_BPF_LSM) && defined(CONFIG_CGROUPS) BTF_ID_FLAGS(func, bpf_cgroup_read_xattr, KF_RCU) #endif +BTF_ID_FLAGS(func, bpf_stream_vprintk, KF_IMPLICIT_ARGS) BTF_ID_FLAGS(func, bpf_stream_vprintk_impl) BTF_ID_FLAGS(func, bpf_task_work_schedule_signal, KF_IMPLICIT_ARGS) BTF_ID_FLAGS(func, bpf_task_work_schedule_signal_impl) diff --git a/kernel/bpf/stream.c b/kernel/bpf/stream.c index 0b6bc3f30335..4e4713d9c771 100644 --- a/kernel/bpf/stream.c +++ b/kernel/bpf/stream.c @@ -212,14 +212,13 @@ __bpf_kfunc_start_defs(); * Avoid using enum bpf_stream_id so that kfunc users don't have to pull i= n the * enum in headers. */ -__bpf_kfunc int bpf_stream_vprintk_impl(int stream_id, const char *fmt__st= r, const void *args, - u32 len__sz, void *aux__prog) +__bpf_kfunc int bpf_stream_vprintk(int stream_id, const char *fmt__str, co= nst void *args, + u32 len__sz, struct bpf_prog_aux *aux) { struct bpf_bprintf_data data =3D { .get_bin_args =3D true, .get_buf =3D true, }; - struct bpf_prog_aux *aux =3D aux__prog; u32 fmt_size =3D strlen(fmt__str) + 1; struct bpf_stream *stream; u32 data_len =3D len__sz; @@ -246,6 +245,12 @@ __bpf_kfunc int bpf_stream_vprintk_impl(int stream_id,= const char *fmt__str, con return ret; } =20 +__bpf_kfunc int bpf_stream_vprintk_impl(int stream_id, const char *fmt__st= r, const void *args, + u32 len__sz, void *aux__prog) +{ + return bpf_stream_vprintk(stream_id, fmt__str, args, len__sz, aux__prog); +} + __bpf_kfunc_end_defs(); =20 /* Added kfunc to common_btf_ids */ diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h index d4e4e388e625..c145da05a67c 100644 --- a/tools/lib/bpf/bpf_helpers.h +++ b/tools/lib/bpf/bpf_helpers.h @@ -315,8 +315,8 @@ enum libbpf_tristate { ___param, sizeof(___param)); \ }) =20 -extern int bpf_stream_vprintk_impl(int stream_id, const char *fmt__str, co= nst void *args, - __u32 len__sz, void *aux__prog) __weak __ksym; +extern int bpf_stream_vprintk(int stream_id, const char *fmt__str, const v= oid *args, + __u32 len__sz) __weak __ksym; =20 #define bpf_stream_printk(stream_id, fmt, args...) \ ({ \ @@ -328,7 +328,7 @@ extern int bpf_stream_vprintk_impl(int stream_id, const= char *fmt__str, const vo ___bpf_fill(___param, args); \ _Pragma("GCC diagnostic pop") \ \ - bpf_stream_vprintk_impl(stream_id, ___fmt, ___param, sizeof(___param), NU= LL); \ + bpf_stream_vprintk(stream_id, ___fmt, ___param, sizeof(___param)); \ }) =20 /* Use __bpf_printk when bpf_printk call has 3 or fewer fmt args diff --git a/tools/testing/selftests/bpf/progs/stream_fail.c b/tools/testin= g/selftests/bpf/progs/stream_fail.c index 3662515f0107..8e8249f3521c 100644 --- a/tools/testing/selftests/bpf/progs/stream_fail.c +++ b/tools/testing/selftests/bpf/progs/stream_fail.c @@ -10,7 +10,7 @@ SEC("syscall") __failure __msg("Possibly NULL pointer passed") int stream_vprintk_null_arg(void *ctx) { - bpf_stream_vprintk_impl(BPF_STDOUT, "", NULL, 0, NULL); + bpf_stream_vprintk(BPF_STDOUT, "", NULL, 0); return 0; } =20 @@ -18,7 +18,7 @@ SEC("syscall") __failure __msg("R3 type=3Dscalar expected=3D") int stream_vprintk_scalar_arg(void *ctx) { - bpf_stream_vprintk_impl(BPF_STDOUT, "", (void *)46, 0, NULL); + bpf_stream_vprintk(BPF_STDOUT, "", (void *)46, 0); return 0; } =20 @@ -26,7 +26,7 @@ SEC("syscall") __failure __msg("arg#1 doesn't point to a const string") int stream_vprintk_string_arg(void *ctx) { - bpf_stream_vprintk_impl(BPF_STDOUT, ctx, NULL, 0, NULL); + bpf_stream_vprintk(BPF_STDOUT, ctx, NULL, 0); return 0; } =20 --=20 2.52.0