Patch "bpf, btf: Warn but return no error for NULL btf from __register_btf_kfunc_id_set()" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    bpf, btf: Warn but return no error for NULL btf from __register_btf_kfunc_id_set()

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     bpf-btf-warn-but-return-no-error-for-null-btf-from-_.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit d81e84be3d99f41869ab77db2b1c224fe972bb36
Author: SeongJae Park <sj@xxxxxxxxxx>
Date:   Sat Jul 1 17:14:47 2023 +0000

    bpf, btf: Warn but return no error for NULL btf from __register_btf_kfunc_id_set()
    
    [ Upstream commit 3de4d22cc9ac7c9f38e10edcf54f9a8891a9c2aa ]
    
    __register_btf_kfunc_id_set() assumes .BTF to be part of the module's .ko
    file if CONFIG_DEBUG_INFO_BTF is enabled. If that's not the case, the
    function prints an error message and return an error. As a result, such
    modules cannot be loaded.
    
    However, the section could be stripped out during a build process. It would
    be better to let the modules loaded, because their basic functionalities
    have no problem [0], though the BTF functionalities will not be supported.
    Make the function to lower the level of the message from error to warn, and
    return no error.
    
      [0] https://lore.kernel.org/bpf/20220219082037.ow2kbq5brktf4f2u@apollo.legion
    
    Fixes: c446fdacb10d ("bpf: fix register_btf_kfunc_id_set for !CONFIG_DEBUG_INFO_BTF")
    Reported-by: Alexander Egorenkov <Alexander.Egorenkov@xxxxxxx>
    Suggested-by: Kumar Kartikeya Dwivedi <memxor@xxxxxxxxx>
    Signed-off-by: SeongJae Park <sj@xxxxxxxxxx>
    Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/87y228q66f.fsf@xxxxxxxxxxxxxxxxxxxx
    Link: https://lore.kernel.org/bpf/20220219082037.ow2kbq5brktf4f2u@apollo.legion
    Link: https://lore.kernel.org/bpf/20230701171447.56464-1-sj@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 8220caa488c54..fb78bb26786fc 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -7469,10 +7469,8 @@ int register_btf_kfunc_id_set(enum bpf_prog_type prog_type,
 			pr_err("missing vmlinux BTF, cannot register kfuncs\n");
 			return -ENOENT;
 		}
-		if (kset->owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)) {
-			pr_err("missing module 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 (IS_ERR(btf))



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux