瀏覽代碼

tools: bpftool: remember to close the libbpf object after prog load

Remembering to close all descriptors and free memory may not seem
important in a user space tool like bpftool, but if we were to run
in batch mode the consumed resources start to add up quickly.  Make
sure program load closes the libbpf object (which unloads and frees
it).

Fixes: 49a086c201a9 ("bpftool: implement prog load command")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Jakub Kicinski 7 年之前
父節點
當前提交
bfee71fb73
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      tools/bpf/bpftool/prog.c

+ 7 - 1
tools/bpf/bpftool/prog.c

@@ -695,12 +695,18 @@ static int do_load(int argc, char **argv)
 	}
 	}
 
 
 	if (do_pin_fd(prog_fd, argv[1]))
 	if (do_pin_fd(prog_fd, argv[1]))
-		return -1;
+		goto err_close_obj;
 
 
 	if (json_output)
 	if (json_output)
 		jsonw_null(json_wtr);
 		jsonw_null(json_wtr);
 
 
+	bpf_object__close(obj);
+
 	return 0;
 	return 0;
+
+err_close_obj:
+	bpf_object__close(obj);
+	return -1;
 }
 }
 
 
 static int do_help(int argc, char **argv)
 static int do_help(int argc, char **argv)