mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-07 10:29:52 +00:00
92c6f8c577
The commitcdd30ebb1b("module: Convert symbol namespace to string literal") makes the grammar of MODULE_IMPORT_NS and EXPORT_SYMBOL_NS different between the stable branches and the mainline. But when the commit955f9ede52("bpf: Add namespace to BPF internal symbols") was backported from mainline, only EXPORT_SYMBOL_NS instances are adapted, leaving the MODULE_IMPORT_NS instance with the "new" grammar and causing the module fails to build: ERROR: modpost: module bpf_preload uses symbol bpf_link_get_from_fd from namespace BPF_INTERNAL, but does not import it. ERROR: modpost: module bpf_preload uses symbol kern_sys_bpf from namespace BPF_INTERNAL, but does not import it. Reported-by: Mingcong Bai <jeffbai@aosc.io> Reported-by: Alex Davis <alex47794@gmail.com> Closes: https://lore.kernel.org/all/CADiockBKBQTVqjA5G+RJ9LBwnEnZ8o0odYnL=LBZ_7QN=_SZ7A@mail.gmail.com/ Fixes:955f9ede52("bpf: Add namespace to BPF internal symbols") Signed-off-by: Xi Ruoyao <xry111@xry111.site> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
94 lines
2.0 KiB
C
94 lines
2.0 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include "bpf_preload.h"
|
|
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
|
#include "iterators/iterators.lskel-little-endian.h"
|
|
#else
|
|
#include "iterators/iterators.lskel-big-endian.h"
|
|
#endif
|
|
|
|
static struct bpf_link *maps_link, *progs_link;
|
|
static struct iterators_bpf *skel;
|
|
|
|
static void free_links_and_skel(void)
|
|
{
|
|
if (!IS_ERR_OR_NULL(maps_link))
|
|
bpf_link_put(maps_link);
|
|
if (!IS_ERR_OR_NULL(progs_link))
|
|
bpf_link_put(progs_link);
|
|
iterators_bpf__destroy(skel);
|
|
}
|
|
|
|
static int preload(struct bpf_preload_info *obj)
|
|
{
|
|
strscpy(obj[0].link_name, "maps.debug", sizeof(obj[0].link_name));
|
|
obj[0].link = maps_link;
|
|
strscpy(obj[1].link_name, "progs.debug", sizeof(obj[1].link_name));
|
|
obj[1].link = progs_link;
|
|
return 0;
|
|
}
|
|
|
|
static struct bpf_preload_ops ops = {
|
|
.preload = preload,
|
|
.owner = THIS_MODULE,
|
|
};
|
|
|
|
static int load_skel(void)
|
|
{
|
|
int err;
|
|
|
|
skel = iterators_bpf__open();
|
|
if (!skel)
|
|
return -ENOMEM;
|
|
err = iterators_bpf__load(skel);
|
|
if (err)
|
|
goto out;
|
|
err = iterators_bpf__attach(skel);
|
|
if (err)
|
|
goto out;
|
|
maps_link = bpf_link_get_from_fd(skel->links.dump_bpf_map_fd);
|
|
if (IS_ERR(maps_link)) {
|
|
err = PTR_ERR(maps_link);
|
|
goto out;
|
|
}
|
|
progs_link = bpf_link_get_from_fd(skel->links.dump_bpf_prog_fd);
|
|
if (IS_ERR(progs_link)) {
|
|
err = PTR_ERR(progs_link);
|
|
goto out;
|
|
}
|
|
/* Avoid taking over stdin/stdout/stderr of init process. Zeroing out
|
|
* makes skel_closenz() a no-op later in iterators_bpf__destroy().
|
|
*/
|
|
close_fd(skel->links.dump_bpf_map_fd);
|
|
skel->links.dump_bpf_map_fd = 0;
|
|
close_fd(skel->links.dump_bpf_prog_fd);
|
|
skel->links.dump_bpf_prog_fd = 0;
|
|
return 0;
|
|
out:
|
|
free_links_and_skel();
|
|
return err;
|
|
}
|
|
|
|
static int __init load(void)
|
|
{
|
|
int err;
|
|
|
|
err = load_skel();
|
|
if (err)
|
|
return err;
|
|
bpf_preload_ops = &ops;
|
|
return err;
|
|
}
|
|
|
|
static void __exit fini(void)
|
|
{
|
|
bpf_preload_ops = NULL;
|
|
free_links_and_skel();
|
|
}
|
|
late_initcall(load);
|
|
module_exit(fini);
|
|
MODULE_IMPORT_NS(BPF_INTERNAL);
|
|
MODULE_LICENSE("GPL");
|