From nobody Sat Feb 7 21:14:54 2026 Received: from out-184.mta0.migadu.com (out-184.mta0.migadu.com [91.218.175.184]) (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 8526A36CDF8 for ; Mon, 2 Feb 2026 14:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770043365; cv=none; b=SgN6zHJm7LtyF9k7KE8IP/uLpT1tuxRAvSolvbWSKUg2JRrU7vo/h3pA5yL+Col3C58BLbGlc4j4ua2/3vDDsRqbAWRmZ+jg2Op2uj0HT1mqkbpHB5ysgFkKRQQUrCZapaW1Uu1l1QdjNVRc34pGFd5pkKXTteBJAFP1v7Pseyw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770043365; c=relaxed/simple; bh=DOE7kaq+YsBgs3BwWvd+pFxQeWCaAg9/JVuTk9RVsb0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tB4pawMAYsz8u3Gt8i/PaRSQeIfvl/ukxZMKrV6xGCuE6XhaIhZypUNZ8IQKleqfRQ66fTsPRT5suHX2QNormQcfx1MGM6CskjGQoemxPDcxjKvGqS9yRGb/H75NgEmdIZuZDkSAuSwgbK/YBb1RHEePt/HnlMYF/3EvY7qrMLQ= 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=ZYUOd2vO; arc=none smtp.client-ip=91.218.175.184 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="ZYUOd2vO" 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=1770043359; 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=JDqAozipUsrJaKHI0sk8XceuK1Rr2jyBiEFvHQN2kjg=; b=ZYUOd2vOwXkSO4tMHv56WeHY/ygcnYI80DKn1bfNvNrn+q1Jk33WrLQmpRZ0U5ofod1jOb zZGZHLBWZAYYrpMfEwoyRLiKNlDbcFcUwaiGeN1hACt5Je3pRA6N6s8wJBWnC8oWxcYD/t /X3Zt5egCIv3hrAESEkpWuI0vwMry7k= 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 6/9] bpf: Add syscall common attributes support for btf_load Date: Mon, 2 Feb 2026 22:40:43 +0800 Message-ID: <20260202144046.30651-7-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" BPF_BTF_LOAD can now provide log parameters through both union bpf_attr and bpf_common_attr. Apply the same conflict and precedence rules as prog_load: - if both are provided and btf_log_buf/btf_log_size/btf_log_level match, use them; - if only one side provides a log buffer, use that one; - if both provide log buffers but differ, return -EINVAL. Signed-off-by: Leon Hwang --- include/linux/bpf_verifier.h | 3 ++- kernel/bpf/log.c | 18 ++++++++++++++++-- kernel/bpf/syscall.c | 3 ++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index b6e33ee82f63..1144657bbc2f 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -641,7 +641,8 @@ int bpf_prog_load_log_attr_init(struct bpf_log_attr *at= tr_log, union bpf_attr *a 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); + bpfptr_t uattr, u32 size, struct bpf_common_attr *attr_common, + bpfptr_t uattr_common, u32 size_common); 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/kernel/bpf/log.c b/kernel/bpf/log.c index 8ad88e4aa12c..db2716586f85 100644 --- a/kernel/bpf/log.c +++ b/kernel/bpf/log.c @@ -901,9 +901,23 @@ int bpf_prog_load_log_attr_init(struct bpf_log_attr *a= ttr_log, union bpf_attr *a } =20 int bpf_btf_load_log_attr_init(struct bpf_log_attr *attr_log, union bpf_at= tr *attr, - bpfptr_t uattr, u32 size) + bpfptr_t uattr, u32 size, struct bpf_common_attr *attr_common, + bpfptr_t uattr_common, u32 size_common) { - bpf_log_attr_init(attr_log, offsetof(union bpf_attr, btf_log_true_size), = uattr, size); + if (bpf_log_attrs_diff(attr_common, attr->btf_log_buf, attr->btf_log_size, + attr->btf_log_level)) + return -EINVAL; + + if (!attr->btf_log_buf && attr_common->log_buf) { + attr->btf_log_buf =3D attr_common->log_buf; + attr->btf_log_size =3D attr_common->log_size; + attr->btf_log_level =3D attr_common->log_level; + bpf_log_attr_init(attr_log, offsetof(struct bpf_common_attr, log_true_si= ze), + uattr_common, size_common); + } else { + bpf_log_attr_init(attr_log, offsetof(union bpf_attr, btf_log_true_size),= uattr, + size); + } return 0; } =20 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index b6e4ec641dc1..4a8933c1dd38 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -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_log_attr_init(&attr_log, &attr, uattr, size); + err =3D bpf_btf_load_log_attr_init(&attr_log, &attr, uattr, size, &attr_= common, + uattr_common, size_common); err =3D err ?: bpf_btf_load(&attr, uattr, &attr_log); break; case BPF_BTF_GET_FD_BY_ID: --=20 2.52.0