libbpf-tools: update hardirqs for libbpf 1.0

Switch to libbpf 1.0 mode and adapt libbpf API usage accordingly.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

diff --git a/libbpf-tools/hardirqs.c b/libbpf-tools/hardirqs.c
index b97b2e0e1079cb3f7db183ab7a79824b30774472..ee2bc5a3f9350f34e61faef1c3e2e73defd335aa 100644 (file)
--- a/libbpf-tools/hardirqs.c
+++ b/libbpf-tools/hardirqs.c
@@ -186,14 +186,9 @@ int main(int argc, char **argv)
                return 1;
        }
 
+       libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
        libbpf_set_print(libbpf_print_fn);
 
-       err = bump_memlock_rlimit();
-       if (err) {
-               fprintf(stderr, "failed to increase rlimit: %d\n", err);
-               return 1;
-       }
-
        obj = hardirqs_bpf__open();
        if (!obj) {
                fprintf(stderr, "failed to open BPF object\n");
@@ -213,30 +208,27 @@ int main(int argc, char **argv)
        }
 
        if (env.count) {
-               obj->links.handle__irq_handler =
-                       bpf_program__attach(obj->progs.handle__irq_handler);
-               err = libbpf_get_error(obj->links.handle__irq_handler);
-               if (err) {
+               obj->links.handle__irq_handler = bpf_program__attach(obj->progs.handle__irq_handler);
+               if (!obj->links.handle__irq_handler) {
+                       err = -errno;
                        fprintf(stderr,
                                "failed to attach irq/irq_handler_entry: %s\n",
-                               strerror(err));
+                               strerror(-err));
                }
        } else {
-               obj->links.irq_handler_entry =
-                       bpf_program__attach(obj->progs.irq_handler_entry);
-               err = libbpf_get_error(obj->links.irq_handler_entry);
-               if (err) {
+               obj->links.irq_handler_entry = bpf_program__attach(obj->progs.irq_handler_entry);
+               if (!obj->links.irq_handler_entry) {
+                       err = -errno;
                        fprintf(stderr,
                                "failed to attach irq_handler_entry: %s\n",
-                               strerror(err));
+                               strerror(-err));
                }
-               obj->links.irq_handler_exit_exit =
-                       bpf_program__attach(obj->progs.irq_handler_exit_exit);
-               err = libbpf_get_error(obj->links.irq_handler_exit_exit);
-               if (err) {
+               obj->links.irq_handler_exit_exit = bpf_program__attach(obj->progs.irq_handler_exit_exit);
+               if (!obj->links.irq_handler_exit_exit) {
+                       err = -errno;
                        fprintf(stderr,
                                "failed to attach irq_handler_exit: %s\n",
-                               strerror(err));
+                               strerror(-err));
                }
        }