From nobody Sat Feb 7 21:14:53 2026 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (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 D9A9E3659F4 for ; Mon, 2 Feb 2026 14:42:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770043330; cv=none; b=YZb7uJDO1LxaovUL9yTSMwBJx324tpa63bdWTn3srQoFno8NKV5U/rDAs8iRNhWa2kLwoNIzNLIwo7xLiYQR0jaXYS6ySl32PzAiOpwY6CziJjzk3wuDoO6tYtBoVt2wLU/A2SVeZy5LJW5hsLyCXZEZrtfuFiXtLBeRuasBs28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770043330; c=relaxed/simple; bh=2y0OYhFd00JT4fqJ7xOW3+N3GZskK/O/58Ra1R2Dofg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wqm/HCRV0xgU0tVKjJAgepo0Tf8pB5w22pDzkLzhRlPh44RLntL9t6HEN2TukFjM6qzlku5nH7Y9+5lCH+buzkhst3pduliolBtRnrvu/hoVw9CoyLF3D2XSVlOt4+gjIdAx/hh21AWRVMnDasc+Oq6/vqVXq/YyvFivLJ7uF4Q= 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=A5Hy1nmO; arc=none smtp.client-ip=91.218.175.185 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="A5Hy1nmO" 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=1770043326; 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=tld7ROmAyVXWaOhOfuRbQu/FqLENM5A62rTK6vgYo1c=; b=A5Hy1nmOsxosHhLcdOHZTH+IG29NSbdsOUPBglUYFlSH2jNgtZvhWFC/Sfb8BMwl3aWQuC K3oQgwf3/eFycT4bLykFdYUYhBOgV/5Db5GcEEqjI2d/YKp+lEo5QMvC7xhvC3xXv8iIJY +DXDo18xyxA663tFcTT8teldFDOyCOg= 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 4/9] bpf: Add syscall common attributes support for prog_load Date: Mon, 2 Feb 2026 22:40:41 +0800 Message-ID: <20260202144046.30651-5-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_PROG_LOAD can now provide log parameters through both union bpf_attr and struct bpf_common_attr. Define clear conflict and precedence rules: - if both are provided and log_buf/log_size/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 | 24 ++++++++++++++++++++++-- kernel/bpf/syscall.c | 3 ++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index c805b85b6f7a..0d106fddbbc5 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -638,7 +638,8 @@ struct bpf_log_attr { }; =20 int bpf_prog_load_log_attr_init(struct bpf_log_attr *attr_log, union bpf_a= ttr *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 ff579fcba36f..345005ba98dd 100644 --- a/kernel/bpf/log.c +++ b/kernel/bpf/log.c @@ -873,10 +873,30 @@ static void bpf_log_attr_init(struct bpf_log_attr *at= tr_log, int offsetof_true_s attr_log->uattr =3D uattr; } =20 +static bool bpf_log_attrs_diff(struct bpf_common_attr *common, u64 log_buf= , u32 log_size, + u32 log_level) +{ + return log_buf && common->log_buf && (log_buf !=3D common->log_buf || + log_size !=3D common->log_size || + log_level !=3D common->log_level); +} + int bpf_prog_load_log_attr_init(struct bpf_log_attr *attr_log, union bpf_a= ttr *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, log_true_size), uatt= r, size); + if (bpf_log_attrs_diff(attr_common, attr->log_buf, attr->log_size, attr->= log_level)) + return -EINVAL; + + if (!attr->log_buf && attr_common->log_buf) { + attr->log_buf =3D attr_common->log_buf; + attr->log_size =3D attr_common->log_size; + attr->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, log_true_size), uat= tr, size); + } return 0; } =20 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index e81199361241..7125ea445c6c 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -6232,7 +6232,8 @@ static int __sys_bpf(enum bpf_cmd cmd, bpfptr_t uattr= , unsigned int size, err =3D map_freeze(&attr); break; case BPF_PROG_LOAD: - err =3D bpf_prog_load_log_attr_init(&attr_log, &attr, uattr, size); + err =3D bpf_prog_load_log_attr_init(&attr_log, &attr, uattr, size, &attr= _common, + uattr_common, size_common); err =3D err ?: bpf_prog_load(&attr, uattr, &attr_log); break; case BPF_OBJ_PIN: --=20 2.52.0