bpftool: Refactor kernel config reading into common helper

Extract the kernel configuration file parsing logic from feature.c into
a new read_kernel_config() function in common.c. This includes:

1. Moving the config file handling and option parsing code
2. Adding required headers and struct definition
3. Keeping all existing functionality

The refactoring enables sharing this logic with other components while
maintaining current behavior. This will be used by subsequent patches
that need to check kernel config options.

Signed-off-by: Yuan Chen <chenyuan@kylinos.cn>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Quentin Monnet <qmo@kernel.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/bpf/20250829061107.23905-2-chenyuan_fl@163.com

diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index b07317d2842fe81b7690830c417d04b26ad0d84b..e8daf963ecef4d46374c4066fe840b5ef18b030b 100644 (file)
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -21,6 +21,7 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/vfs.h>
+#include <sys/utsname.h>
 
 #include <linux/filter.h>
 #include <linux/limits.h>
@@ -31,6 +32,7 @@
 #include <bpf/hashmap.h>
 #include <bpf/libbpf.h> /* libbpf_num_possible_cpus */
 #include <bpf/btf.h>
+#include <zlib.h>
 
 #include "main.h"
 
@@ -1208,3 +1210,94 @@ int pathname_concat(char *buf, int buf_sz, const char *path,
 
        return 0;
 }
+
+static bool read_next_kernel_config_option(gzFile file, char *buf, size_t n,
+                                          char **value)
+{
+       char *sep;
+
+       while (gzgets(file, buf, n)) {
+               if (strncmp(buf, "CONFIG_", 7))
+                       continue;
+
+               sep = strchr(buf, '=');
+               if (!sep)
+                       continue;
+
+               /* Trim ending '\n' */
+               buf[strlen(buf) - 1] = '\0';
+
+               /* Split on '=' and ensure that a value is present. */
+               *sep = '\0';
+               if (!sep[1])
+                       continue;
+
+               *value = sep + 1;
+               return true;
+       }
+
+       return false;
+}
+
+int read_kernel_config(const struct kernel_config_option *requested_options,
+                      size_t num_options, char **out_values,
+                      const char *define_prefix)
+{
+       struct utsname utsn;
+       char path[PATH_MAX];
+       gzFile file = NULL;
+       char buf[4096];
+       char *value;
+       size_t i;
+       int ret = 0;
+
+       if (!requested_options || !out_values || num_options == 0)
+               return -1;
+
+       if (!uname(&utsn)) {
+               snprintf(path, sizeof(path), "/boot/config-%s", utsn.release);
+
+               /* gzopen also accepts uncompressed files. */
+               file = gzopen(path, "r");
+       }
+
+       if (!file) {
+               /* Some distributions build with CONFIG_IKCONFIG=y and put the
+                * config file at /proc/config.gz.
+                */
+               file = gzopen("/proc/config.gz", "r");
+       }
+
+       if (!file) {
+               p_info("skipping kernel config, can't open file: %s",
+                       strerror(errno));
+               return -1;
+       }
+
+       if (!gzgets(file, buf, sizeof(buf)) || !gzgets(file, buf, sizeof(buf))) {
+               p_info("skipping kernel config, can't read from file: %s",
+                       strerror(errno));
+               ret = -1;
+               goto end_parse;
+       }
+
+       if (strcmp(buf, "# Automatically generated file; DO NOT EDIT.\n")) {
+               p_info("skipping kernel config, can't find correct file");
+               ret = -1;
+               goto end_parse;
+       }
+
+       while (read_next_kernel_config_option(file, buf, sizeof(buf), &value)) {
+               for (i = 0; i < num_options; i++) {
+                       if ((define_prefix && !requested_options[i].macro_dump) ||
+                            out_values[i] || strcmp(buf, requested_options[i].name))
+                               continue;
+
+                       out_values[i] = strdup(value);
+               }
+       }
+
+end_parse:
+       gzclose(file);
+       return ret;
+}

diff --git a/tools/bpf/bpftool/feature.c b/tools/bpf/bpftool/feature.c
index 24fecdf8e430780267a21aebd90dc07fc4d83e9d..0f6070a0c8e71755e8922d269f1bdcbc3ed540d9 100644 (file)
--- a/tools/bpf/bpftool/feature.c
+++ b/tools/bpf/bpftool/feature.c
@@ -10,7 +10,6 @@
 #ifdef USE_LIBCAP
 #include <sys/capability.h>
 #endif
-#include <sys/utsname.h>
 #include <sys/vfs.h>
 
 #include <linux/filter.h>
@@ -18,7 +17,6 @@
 
 #include <bpf/bpf.h>
 #include <bpf/libbpf.h>
-#include <zlib.h>
 
 #include "main.h"
 
@@ -327,40 +325,9 @@ static void probe_jit_limit(void)
        }
 }
 
-static bool read_next_kernel_config_option(gzFile file, char *buf, size_t n,
-                                          char **value)
-{
-       char *sep;
-
-       while (gzgets(file, buf, n)) {
-               if (strncmp(buf, "CONFIG_", 7))
-                       continue;
-
-               sep = strchr(buf, '=');
-               if (!sep)
-                       continue;
-
-               /* Trim ending '\n' */
-               buf[strlen(buf) - 1] = '\0';
-
-               /* Split on '=' and ensure that a value is present. */
-               *sep = '\0';
-               if (!sep[1])
-                       continue;
-
-               *value = sep + 1;
-               return true;
-       }
-
-       return false;
-}
-
 static void probe_kernel_image_config(const char *define_prefix)
 {
-       static const struct {
-               const char * const name;
-               bool macro_dump;
-       } options[] = {
+       struct kernel_config_option options[] = {
                /* Enable BPF */
                { "CONFIG_BPF", },
                /* Enable bpf() syscall */
@@ -435,52 +402,11 @@ static void probe_kernel_image_config(const char *define_prefix)
                { "CONFIG_HZ", true, }
        };
        char *values[ARRAY_SIZE(options)] = { };
-       struct utsname utsn;
-       char path[PATH_MAX];
-       gzFile file = NULL;
-       char buf[4096];
-       char *value;
        size_t i;
 
-       if (!uname(&utsn)) {
-               snprintf(path, sizeof(path), "/boot/config-%s", utsn.release);
-
-               /* gzopen also accepts uncompressed files. */
-               file = gzopen(path, "r");
-       }
-
-       if (!file) {
-               /* Some distributions build with CONFIG_IKCONFIG=y and put the
-                * config file at /proc/config.gz.
-                */
-               file = gzopen("/proc/config.gz", "r");
-       }
-       if (!file) {
-               p_info("skipping kernel config, can't open file: %s",
-                      strerror(errno));
-               goto end_parse;
-       }
-       /* Sanity checks */
-       if (!gzgets(file, buf, sizeof(buf)) ||
-           !gzgets(file, buf, sizeof(buf))) {
-               p_info("skipping kernel config, can't read from file: %s",
-                      strerror(errno));
-               goto end_parse;
-       }
-       if (strcmp(buf, "# Automatically generated file; DO NOT EDIT.\n")) {
-               p_info("skipping kernel config, can't find correct file");
-               goto end_parse;
-       }
-
-       while (read_next_kernel_config_option(file, buf, sizeof(buf), &value)) {
-               for (i = 0; i < ARRAY_SIZE(options); i++) {
-                       if ((define_prefix && !options[i].macro_dump) ||
-                           values[i] || strcmp(buf, options[i].name))
-                               continue;
-
-                       values[i] = strdup(value);
-               }
-       }
+       if (read_kernel_config(options, ARRAY_SIZE(options), values,
+                              define_prefix))
+               return;
 
        for (i = 0; i < ARRAY_SIZE(options); i++) {
                if (define_prefix && !options[i].macro_dump)
@@ -488,10 +414,6 @@ static void probe_kernel_image_config(const char *define_prefix)
                print_kernel_option(options[i].name, values[i], define_prefix);
                free(values[i]);
        }
-
-end_parse:
-       if (file)
-               gzclose(file);
 }
 
 static bool probe_bpf_syscall(const char *define_prefix)

diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
index a2bb0714b3d6cfd965fa4bd31d6c1fd15f48b826..374cac2a8c66ca1b156bfb9015e047b4840044a2 100644 (file)
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@ -275,4 +275,13 @@ int pathname_concat(char *buf, int buf_sz, const char *path,
 /* print netfilter bpf_link info */
 void netfilter_dump_plain(const struct bpf_link_info *info);
 void netfilter_dump_json(const struct bpf_link_info *info, json_writer_t *wtr);
+
+struct kernel_config_option {
+       const char *name;
+       bool macro_dump;
+};
+
+int read_kernel_config(const struct kernel_config_option *requested_options,
+                      size_t num_options, char **out_values,
+                      const char *define_prefix);
 #endif