From nobody Sat Feb 7 21:14:44 2026 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) (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 55897365A0E for ; Mon, 2 Feb 2026 14:42:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770043340; cv=none; b=c10ROMDjuWK40PTimnmlg/VT01JbK9uJimPMawnuZWGiO9REDFaLG9O/dhritWRDgPTSNiN+83X4Y4rETUm/JuxUsWTWO1SGcVmLRgSKdCly4vzZaRlLikGJ8KM/K3ai3DhchaX2Zhrvzbs/qZIgEz+CVry50JkjrXirZr788vM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770043340; c=relaxed/simple; bh=3ChsNWAqV8MktW4tyaP0Zkt+9t7zXMpOzUlFnUjhdUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gJAu3F0G4cSFP4zufVFUzMqBkmCUjLfH8LsS8HFcvfsqo7lwC8eq0UkA8pAfJ8rZv+pM6i7ht+RtBzqg6UsKWo8mBKjWz6hB17oqzMCkiL7JGpCGOaSo3RRi//7yZXKjphTDJus2e78jjemL3YDYFFdGSon0luCLk35brE0jhbk= 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=iRFSeIxd; arc=none smtp.client-ip=91.218.175.189 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="iRFSeIxd" 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=1770043336; 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=Id+KPzio2AzA7uwtB8ekwVVfFvWj/yod8A4FNHhFK7c=; b=iRFSeIxdP/VtTc3JUtAOB8E6ciP5HbTra+Jf0bEkIldqsVF3/bIJXtm0n+8hkpl0usWL9y 1qYxB3Y5pDC+pY35bumKXT6bpfI3fWLXwyg++ENxYc2YUrTqs+xR0h+bm7zmaWaAmPPd3U GkJP6Sw7kch7QEy8+IG/RdLlmaSrMVg= From: Leon Hwang To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan , Christian Brauner , Seth Forshee , Yuichiro Tsuji , Andrey Albershteyn , Leon Hwang , Willem de Bruijn , Jason Xing , Tao Chen , Mykyta Yatsenko , Kumar Kartikeya Dwivedi , Anton Protopopov , Amery Hung , Rong Tao , linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, linux-kselftest@vger.kernel.org, kernel-patches-bot@fb.com Subject: [PATCH bpf-next v9 5/9] bpf: Refactor reporting btf_log_true_size for btf_load Date: Mon, 2 Feb 2026 22:40:42 +0800 Message-ID: <20260202144046.30651-6-leon.hwang@linux.dev> In-Reply-To: <20260202144046.30651-1-leon.hwang@linux.dev> References: <20260202144046.30651-1-leon.hwang@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" In the next commit, it will be able to report logs via extended common attributes, which will report 'log_true_size' via the extended common attributes meanwhile. Therefore, refactor the way of 'btf_log_true_size' reporting in order to report 'log_true_size' via the extended common attributes easily. Signed-off-by: Leon Hwang --- include/linux/bpf_verifier.h | 2 ++ include/linux/btf.h | 3 ++- kernel/bpf/btf.c | 26 ++++++-------------------- kernel/bpf/log.c | 7 +++++++ kernel/bpf/syscall.c | 7 ++++--- 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index 0d106fddbbc5..b6e33ee82f63 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -640,6 +640,8 @@ struct bpf_log_attr { int bpf_prog_load_log_attr_init(struct bpf_log_attr *attr_log, union bpf_a= ttr *attr, bpfptr_t uattr, u32 size, struct bpf_common_attr *attr_common, bpfptr_t uattr_common, u32 size_common); +int bpf_btf_load_log_attr_init(struct bpf_log_attr *attr_log, union bpf_at= tr *attr, + bpfptr_t uattr, u32 size); int bpf_log_attr_finalize(struct bpf_log_attr *attr, struct bpf_verifier_l= og *log); =20 #define BPF_MAX_SUBPROGS 256 diff --git a/include/linux/btf.h b/include/linux/btf.h index 48108471c5b1..f64d87315c5f 100644 --- a/include/linux/btf.h +++ b/include/linux/btf.h @@ -145,7 +145,8 @@ const char *btf_get_name(const struct btf *btf); void btf_get(struct btf *btf); void btf_put(struct btf *btf); const struct btf_header *btf_header(const struct btf *btf); -int btf_new_fd(const union bpf_attr *attr, bpfptr_t uattr, u32 uattr_sz); +struct bpf_log_attr; +int btf_new_fd(const union bpf_attr *attr, bpfptr_t uattr, struct bpf_log_= attr *attr_log); struct btf *btf_get_by_fd(int fd); int btf_get_info_by_fd(const struct btf *btf, const union bpf_attr *attr, diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 8959f3bc1e92..753db6408c71 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -5856,22 +5856,8 @@ static int btf_check_type_tags(struct btf_verifier_e= nv *env, return 0; } =20 -static int finalize_log(struct bpf_verifier_log *log, bpfptr_t uattr, u32 = uattr_size) -{ - u32 log_true_size; - int err; - - err =3D bpf_vlog_finalize(log, &log_true_size); - - if (uattr_size >=3D offsetofend(union bpf_attr, btf_log_true_size) && - copy_to_bpfptr_offset(uattr, offsetof(union bpf_attr, btf_log_true_si= ze), - &log_true_size, sizeof(log_true_size))) - err =3D -EFAULT; - - return err; -} - -static struct btf *btf_parse(const union bpf_attr *attr, bpfptr_t uattr, u= 32 uattr_size) +static struct btf *btf_parse(const union bpf_attr *attr, bpfptr_t uattr, + struct bpf_log_attr *attr_log) { bpfptr_t btf_data =3D make_bpfptr(attr->btf, uattr.is_kernel); char __user *log_ubuf =3D u64_to_user_ptr(attr->btf_log_buf); @@ -5953,7 +5939,7 @@ static struct btf *btf_parse(const union bpf_attr *at= tr, bpfptr_t uattr, u32 uat } } =20 - err =3D finalize_log(&env->log, uattr, uattr_size); + err =3D bpf_log_attr_finalize(attr_log, &env->log); if (err) goto errout_free; =20 @@ -5965,7 +5951,7 @@ static struct btf *btf_parse(const union bpf_attr *at= tr, bpfptr_t uattr, u32 uat btf_free_struct_meta_tab(btf); errout: /* overwrite err with -ENOSPC or -EFAULT */ - ret =3D finalize_log(&env->log, uattr, uattr_size); + ret =3D bpf_log_attr_finalize(attr_log, &env->log); if (ret) err =3D ret; errout_free: @@ -8136,12 +8122,12 @@ static int __btf_new_fd(struct btf *btf) return anon_inode_getfd("btf", &btf_fops, btf, O_RDONLY | O_CLOEXEC); } =20 -int btf_new_fd(const union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) +int btf_new_fd(const union bpf_attr *attr, bpfptr_t uattr, struct bpf_log_= attr *attr_log) { struct btf *btf; int ret; =20 - btf =3D btf_parse(attr, uattr, uattr_size); + btf =3D btf_parse(attr, uattr, attr_log); if (IS_ERR(btf)) return PTR_ERR(btf); =20 diff --git a/kernel/bpf/log.c b/kernel/bpf/log.c index 345005ba98dd..8ad88e4aa12c 100644 --- a/kernel/bpf/log.c +++ b/kernel/bpf/log.c @@ -900,6 +900,13 @@ int bpf_prog_load_log_attr_init(struct bpf_log_attr *a= ttr_log, union bpf_attr *a return 0; } =20 +int bpf_btf_load_log_attr_init(struct bpf_log_attr *attr_log, union bpf_at= tr *attr, + bpfptr_t uattr, u32 size) +{ + bpf_log_attr_init(attr_log, offsetof(union bpf_attr, btf_log_true_size), = uattr, size); + return 0; +} + int bpf_log_attr_finalize(struct bpf_log_attr *attr, struct bpf_verifier_l= og *log) { u32 log_true_size; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 7125ea445c6c..b6e4ec641dc1 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -5438,7 +5438,7 @@ static int bpf_obj_get_info_by_fd(const union bpf_att= r *attr, =20 #define BPF_BTF_LOAD_LAST_FIELD btf_token_fd =20 -static int bpf_btf_load(const union bpf_attr *attr, bpfptr_t uattr, __u32 = uattr_size) +static int bpf_btf_load(const union bpf_attr *attr, bpfptr_t uattr, struct= bpf_log_attr *attr_log) { struct bpf_token *token =3D NULL; =20 @@ -5465,7 +5465,7 @@ static int bpf_btf_load(const union bpf_attr *attr, b= pfptr_t uattr, __u32 uattr_ =20 bpf_token_put(token); =20 - return btf_new_fd(attr, uattr, uattr_size); + return btf_new_fd(attr, uattr, attr_log); } =20 #define BPF_BTF_GET_FD_BY_ID_LAST_FIELD fd_by_id_token_fd @@ -6279,7 +6279,8 @@ static int __sys_bpf(enum bpf_cmd cmd, bpfptr_t uattr= , unsigned int size, err =3D bpf_raw_tracepoint_open(&attr); break; case BPF_BTF_LOAD: - err =3D bpf_btf_load(&attr, uattr, size); + err =3D bpf_btf_load_log_attr_init(&attr_log, &attr, uattr, size); + err =3D err ?: bpf_btf_load(&attr, uattr, &attr_log); break; case BPF_BTF_GET_FD_BY_ID: err =3D bpf_btf_get_fd_by_id(&attr); --=20 2.52.0