From nobody Sun Sep 8 00:25:13 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4A2FD4E1D5; Sat, 3 Feb 2024 07:52:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706946744; cv=none; b=J8LMFm3feTEZKVloRECRsdWFt0clR0M68Cy9zRiGu/RssJyPFzrBeYrNDIRknEcq4pSSwZAbxSIgdFh4LMdiqIvKqqttWGCwzsEp12EstIRQYFEhD4lRQjCs2vKyYLCemXJEnF0CCw7kBRKoDGi+9CPlWH/9OfPCwU8Rzr5bxro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706946744; c=relaxed/simple; bh=ovbEnLmZSuIL7RZ1CQqKF2Cqdi1QnymtDtpeGGF8zBk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KcZId0vwkCmmoOwL7qGPP0V3oHZz5HmtcO8hKDU3AlHjYh3lbkJHgBJbGsSOUAvFdBCvvMRvDADnzS9GC83vdRJPFOoBc9h7tmMI46YJpJTR8YGGag076jE0m1wDaADHDr5Dqkx+AaJ+Iyu/GpNSVSI/56cdvq0fN3jaAiFgpR4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vjj65yit; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Vjj65yit" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07222C433B1; Sat, 3 Feb 2024 07:52:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706946743; bh=ovbEnLmZSuIL7RZ1CQqKF2Cqdi1QnymtDtpeGGF8zBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vjj65yitptlNB0KFh+lI5o98aCnqL76F+Pxob++oVhRWWuPdw1FqEahQacyIjEkZ+ ZrT2El+USULCVzFkCY1dHSekvmqU5B6ZQwZarCJPiAdN7neX5V2GymUcQR+/szMvZ2 Go1tjcQfdCyIvmxLD66imkdGie0sDmJEddb4S2G18UFtiRQ0xKnBSE/URxSrnXD0XW HyuspJ+vp2evVdjaeAkgNTuRtPSFqVv9RmN0CQzNUpKVQY+eg8sXdr5O4fC10gNp2U 6jkiTIS0r+5Z7aNrs/X0WOIoqiH4fYRITuYB29su6pgLkBarPCC6GZVmxDWKLLB/YM hZZlk2RWJJk4A== From: Geliang Tang To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , Matthieu Baerts , Eduard Zingerman , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa Cc: Geliang Tang , bpf@vger.kernel.org, mptcp@lists.linux.dev Subject: [PATCH bpf-next v2 1/2] bpf, btf: Add register_check_missing_btf helper Date: Sat, 3 Feb 2024 15:51:04 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch extracts duplicate code on error path when btf_get_module_btf() returns NULL from the functions __register_btf_kfunc_id_set() and register_btf_id_dtor_kfuncs() into a new helper named register_check_missing_btf() to check CONFIG_DEBUG_INFO_BTF, CONFIG_DEBUG_INFO_BTF_MODULES and CONFIG_MODULE_ALLOW_BTF_MISMATCH in it. Signed-off-by: Geliang Tang --- kernel/bpf/btf.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index f7725cb6e564..1ebe26a3a7a5 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -7738,6 +7738,24 @@ static struct btf *btf_get_module_btf(const struct m= odule *module) return btf; } =20 +static int register_check_missing_btf(const struct module *module, const c= har *msg) +{ + if (!module && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) { + pr_err("missing vmlinux BTF, cannot register %s\n", msg); + return -ENOENT; + } + if (module && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)) { + if (IS_ENABLED(CONFIG_MODULE_ALLOW_BTF_MISMATCH)) { + pr_warn("allow module %s BTF mismatch, skip register %s\n", + module->name, msg); + return 0; + } + pr_err("missing module %s BTF, cannot register %s\n", module->name, msg); + return -ENOENT; + } + return 0; +} + BPF_CALL_4(bpf_btf_find_by_name_kind, char *, name, int, name_sz, u32, kin= d, int, flags) { struct btf *btf =3D NULL; @@ -8098,15 +8116,8 @@ static int __register_btf_kfunc_id_set(enum btf_kfun= c_hook hook, int ret, i; =20 btf =3D btf_get_module_btf(kset->owner); - if (!btf) { - if (!kset->owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) { - pr_err("missing vmlinux BTF, cannot register kfuncs\n"); - return -ENOENT; - } - if (kset->owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)) - pr_warn("missing module BTF, cannot register kfuncs\n"); - return 0; - } + if (!btf) + return register_check_missing_btf(kset->owner, "kfuncs"); if (IS_ERR(btf)) return PTR_ERR(btf); =20 @@ -8214,17 +8225,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_= dtor_kfunc *dtors, u32 add_c int ret; =20 btf =3D btf_get_module_btf(owner); - if (!btf) { - if (!owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF)) { - pr_err("missing vmlinux BTF, cannot register dtor kfuncs\n"); - return -ENOENT; - } - if (owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)) { - pr_err("missing module BTF, cannot register dtor kfuncs\n"); - return -ENOENT; - } - return 0; - } + if (!btf) + return register_check_missing_btf(owner, "dtor kfuncs"); if (IS_ERR(btf)) return PTR_ERR(btf); =20 --=20 2.40.1 From nobody Sun Sep 8 00:25:13 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 934BB4F5F2; Sat, 3 Feb 2024 07:52:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706946748; cv=none; b=p4T4MLdoaXOeJsZyRgOCMXnthCwBGEGUdP7uwKK7/Ucfa5oRwWEBaBCob13M8MSImRCC+3wv6hdYpvYSCkr5lD5Y9ELilr7i1pJXMa9VXDzXpRlNTd7WKPcMCLj75yAoqmWCNMmH4160d40HIzh18nStg/6aeef+mgnm+QZ1j4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706946748; c=relaxed/simple; bh=tubG1HyOYJGAazL3WH03ZP+gr9zYK5KpA1aInrqnFuI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RkBmMtWSaDuEM/zLqnsaz4cFwIychvL4710Pth0lyZNsiZKceyLma9NrOoQHUYyzMAlqF4kMdx4+aNKHsweYekA4MLj3wqTk8e05ThAVpi4KlrwLvndz3EuTgNMYyN0mOY4d1XguFFwogR1o18Fi8a5+/gdIwWFaUVTA/SWlsFo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FhgNtDru; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FhgNtDru" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82DD4C43394; Sat, 3 Feb 2024 07:52:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706946748; bh=tubG1HyOYJGAazL3WH03ZP+gr9zYK5KpA1aInrqnFuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FhgNtDruvqN6TQ5sehgobhk95Tn1wfR3gexy0GxrSQXmsiYh9o2tQ+ankxOxso5UA +sAuANSZIveZZUoYb/NV5nD5J1IAqFUsTmIGoBXNeAbX7vqMab75SJMXvuOQIdZhIL aZ+E0NuXyf8RgvZnQJrDZkioaifn6WmPXnHE9D1x4kVjUtSYZQZZQeHyF5QY0Eh+Lc 1R42ZHx6qONAhptnzj5tcfQt6NPD54EzXuhEoZV6mQFMPaNgzQPIY9TUumYyGwFn7q CgORLobaIHXXTS+6rF+uUD0kep/+T3DqlIYuj6f08s62Up+OGDO7Cz09ax/RZFfrOh oBobLO7NsVOWA== From: Geliang Tang To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , Matthieu Baerts , Eduard Zingerman , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa Cc: Geliang Tang , bpf@vger.kernel.org, mptcp@lists.linux.dev Subject: [PATCH bpf-next v2 2/2] bpf, btf: Check btf for register_bpf_struct_ops Date: Sat, 3 Feb 2024 15:51:05 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Similar to the handling in the functions __register_btf_kfunc_id_set() and register_btf_id_dtor_kfuncs(), this patch uses the newly added helper register_check_missing_btf() and IS_ERR() to check the return value of btf_get_module_btf(). Signed-off-by: Geliang Tang --- kernel/bpf/btf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 1ebe26a3a7a5..2d99f85adc82 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8889,7 +8889,9 @@ int __register_bpf_struct_ops(struct bpf_struct_ops *= st_ops) =20 btf =3D btf_get_module_btf(st_ops->owner); if (!btf) - return -EINVAL; + return register_check_missing_btf(st_ops->owner, "structs"); + if (IS_ERR(btf)) + return PTR_ERR(btf); =20 log =3D kzalloc(sizeof(*log), GFP_KERNEL | __GFP_NOWARN); if (!log) { --=20 2.40.1