1 files changed, 15 insertions, 1 deletions

diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
index 1ac1fc520e6a..4879f6395c7e 100644
--- a/tools/bpf/bpftool/main.c
+++ b/tools/bpf/bpftool/main.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include <bpf.h>
+#include <libbpf.h>
 
 #include "main.h"
 
@@ -25,6 +26,7 @@ bool pretty_output;
 bool json_output;
 bool show_pinned;
 bool block_mount;
+bool verifier_logs;
 int bpf_flags;
 struct pinned_obj_table prog_table;
 struct pinned_obj_table map_table;
@@ -77,6 +79,13 @@ static int do_version(int argc, char **argv)
         return 0;
 }
 
+static int __printf(2, 0)
+print_all_levels(__maybe_unused enum libbpf_print_level level,
+                 const char *format, va_list args)
+{
+        return vfprintf(stderr, format, args);
+}
+
 int cmd_select(const struct cmd *cmds, int argc, char **argv,
                int (*help)(int argc, char **argv))
 {
@@ -317,6 +326,7 @@ int main(int argc, char **argv)
                 { "bpffs",      no_argument,    NULL,   'f' },
                 { "mapcompat",  no_argument,    NULL,   'm' },
                 { "nomount",    no_argument,    NULL,   'n' },
+                { "debug",      no_argument,    NULL,   'd' },
                 { 0 }
         };
         int opt, ret;
@@ -332,7 +342,7 @@ int main(int argc, char **argv)
         hash_init(map_table.table);
 
         opterr = 0;
-        while ((opt = getopt_long(argc, argv, "Vhpjfmn",
+        while ((opt = getopt_long(argc, argv, "Vhpjfmnd",
                                   options, NULL)) >= 0) {
                 switch (opt) {
                 case 'V':
@@ -362,6 +372,10 @@ int main(int argc, char **argv)
                 case 'n':
                         block_mount = true;
                         break;
+                case 'd':
+                        libbpf_set_print(print_all_levels);
+                        verifier_logs = true;
+                        break;
                 default:
                         p_err("unrecognized option '%s'", argv[optind - 1]);
                         if (json_output)