From patchwork Thu Feb 8 06:24:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13549350 X-Patchwork-Delegate: bpf@iogearbox.net 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 4CCC9679FB; Thu, 8 Feb 2024 06:24:42 +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=1707373483; cv=none; b=ZCmNYaAE/0NveQ+Zm+5diav9BeH2F1gIl+cvaenbVsOAvmLJtITtP9llaLgc8Y+DvTYHTSQvw5Aas/9v4hd9dSv63uwZhoeeURo09uicffpDIMbdeQpqHfERB5PmtofHOHEZTYVvBMuVTLab/Ihdo1sqHoLmgZ0tOFJJKbxf4/c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707373483; c=relaxed/simple; bh=RFeny4ZUl0eS17R5u69ID8qapypZPhOnIb2FcT6MSWc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eLDULueqWDDriywD895VGaab0FhqyqdNJqTDl9SduqtNOLZK5UuWecCtlLRC4DYsIBMWess2EKS2NHnlGni236V/yFHXBZeni8sa7iMHvRQbFDBFbK3gT5En+h5Dle8+gmqe3JnYeZ6fDPBhI52K91G8lCdkj5mFyt7kMEQrMYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uHmnP63N; 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="uHmnP63N" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 296F9C43394; Thu, 8 Feb 2024 06:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707373482; bh=RFeny4ZUl0eS17R5u69ID8qapypZPhOnIb2FcT6MSWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uHmnP63NsRW0HWhSX9sLhtT7Xv0BiOk1sRoOmscQUcT83kD2Iivw8gwKKTMlzcVDy XsZ9YusT0BoLAsOuhCkdVk7tyUWMEQwABlERokivHVyNadCCjd9uAKM8CgiGAxliCR RibKQrqgCbfS4wHtYromysDZk3dTIr7Scw8OPR79dH6eKvRkxCO8XT61B6cDMSSW2z YZXh4SiyAfKFAv75PnOqCONF0saAzrdYE4dwEVXTSQkfcl3eb6Xmy+PBDJNZfX6LOg y4BBs5rrWmGd7RBEGd/8BzlMqkZYQUx+OICIX9G3q7KBwZLGZ8EpIdobK9NG5j82pU XokYzUsl0ALDg== 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 v5 1/3] bpf, btf: Fix return value of register_btf_id_dtor_kfuncs Date: Thu, 8 Feb 2024 14:24:21 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Geliang Tang The same as __register_btf_kfunc_id_set(), to let the modules with stripped btf section loaded, this patch changes the return value of register_btf_id_dtor_kfuncs() too from -ENOENT to 0 when btf is NULL. Signed-off-by: Geliang Tang --- kernel/bpf/btf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index f7725cb6e564..16eb937eca46 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8219,10 +8219,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_c 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; - } + if (owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)) + pr_warn("missing module BTF, cannot register dtor kfuncs\n"); return 0; } if (IS_ERR(btf))