Makefile: add 'format' target for calling clang-format

This commit adds the clang-format make target, runs it on the whole repository and rebuilds all testdata and example ELFs. Signed-off-by: Timo Beckers <timo@isovalent.com>
holyspectral · Mar 29, 2022 · 4fa3ebc · 4fa3ebc
1 parent 4bf2043
commit 4fa3ebc
Show file tree

Hide file tree

Showing 65 changed files with 61 additions and 55 deletions.
diff --git a/Makefile b/Makefile
@@ -62,7 +62,10 @@ clean:
 	-$(RM) testdata/*.elf
 	-$(RM) internal/btf/testdata/*.elf
 
-all: $(addsuffix -el.elf,$(TARGETS)) $(addsuffix -eb.elf,$(TARGETS)) generate
+format:
+	find . -type f -name "*.c" | xargs clang-format -i
+
+all: format $(addsuffix -el.elf,$(TARGETS)) $(addsuffix -eb.elf,$(TARGETS)) generate
 	ln -srf testdata/loader-$(CLANG)-el.elf testdata/loader-el.elf
 	ln -srf testdata/loader-$(CLANG)-eb.elf testdata/loader-eb.elf
 

diff --git a/cmd/bpf2go/test/test_bpfeb.o b/cmd/bpf2go/test/test_bpfeb.o
diff --git a/cmd/bpf2go/test/test_bpfel.o b/cmd/bpf2go/test/test_bpfel.o
diff --git a/examples/cgroup_skb/bpf_bpfeb.o b/examples/cgroup_skb/bpf_bpfeb.o
diff --git a/examples/cgroup_skb/bpf_bpfel.o b/examples/cgroup_skb/bpf_bpfel.o
diff --git a/examples/cgroup_skb/cgroup_skb.c b/examples/cgroup_skb/cgroup_skb.c
@@ -5,23 +5,23 @@
 char __license[] SEC("license") = "Dual MIT/GPL";
 
 struct bpf_map_def SEC("maps") pkt_count = {
-    .type = BPF_MAP_TYPE_ARRAY,
-    .key_size = sizeof(u32),
-    .value_size = sizeof(u64),
-    .max_entries = 1,
+	.type        = BPF_MAP_TYPE_ARRAY,
+	.key_size    = sizeof(u32),
+	.value_size  = sizeof(u64),
+	.max_entries = 1,
 };
 
 SEC("cgroup_skb/egress")
 int count_egress_packets(struct __sk_buff *skb) {
-    u32 key = 0;
-    u64 init_val = 1;
+	u32 key      = 0;
+	u64 init_val = 1;
 
-    u64 *count = bpf_map_lookup_elem(&pkt_count, &key);
-    if (!count) {
-        bpf_map_update_elem(&pkt_count, &key, &init_val, BPF_ANY);
-        return 1;
-    }
-    __sync_fetch_and_add(count, 1);
+	u64 *count = bpf_map_lookup_elem(&pkt_count, &key);
+	if (!count) {
+		bpf_map_update_elem(&pkt_count, &key, &init_val, BPF_ANY);
+		return 1;
+	}
+	__sync_fetch_and_add(count, 1);
 
-  return 1;
+	return 1;
 }
diff --git a/examples/fentry/bpf_bpfeb.o b/examples/fentry/bpf_bpfeb.o
diff --git a/examples/fentry/bpf_bpfel.o b/examples/fentry/bpf_bpfel.o
diff --git a/examples/kprobe/bpf_bpfeb.o b/examples/kprobe/bpf_bpfeb.o
diff --git a/examples/kprobe/bpf_bpfel.o b/examples/kprobe/bpf_bpfel.o
diff --git a/examples/kprobe/kprobe.c b/examples/kprobe/kprobe.c
@@ -5,23 +5,23 @@
 char __license[] SEC("license") = "Dual MIT/GPL";
 
 struct bpf_map_def SEC("maps") kprobe_map = {
-    .type = BPF_MAP_TYPE_ARRAY,
-    .key_size = sizeof(u32),
-    .value_size = sizeof(u64),
-    .max_entries = 1,
+	.type        = BPF_MAP_TYPE_ARRAY,
+	.key_size    = sizeof(u32),
+	.value_size  = sizeof(u64),
+	.max_entries = 1,
 };
 
 SEC("kprobe/sys_execve")
 int kprobe_execve() {
-    u32 key = 0;
-    u64 initval = 1, *valp;
+	u32 key     = 0;
+	u64 initval = 1, *valp;
 
-    valp = bpf_map_lookup_elem(&kprobe_map, &key);
-    if (!valp) {
-        bpf_map_update_elem(&kprobe_map, &key, &initval, BPF_ANY);
-        return 0;
-    }
-    __sync_fetch_and_add(valp, 1);
+	valp = bpf_map_lookup_elem(&kprobe_map, &key);
+	if (!valp) {
+		bpf_map_update_elem(&kprobe_map, &key, &initval, BPF_ANY);
+		return 0;
+	}
+	__sync_fetch_and_add(valp, 1);
 
-    return 0;
+	return 0;
 }
diff --git a/examples/kprobe_percpu/bpf_bpfeb.o b/examples/kprobe_percpu/bpf_bpfeb.o
diff --git a/examples/kprobe_percpu/bpf_bpfel.o b/examples/kprobe_percpu/bpf_bpfel.o
diff --git a/examples/kprobepin/bpf_bpfeb.o b/examples/kprobepin/bpf_bpfeb.o
diff --git a/examples/kprobepin/bpf_bpfel.o b/examples/kprobepin/bpf_bpfel.o
diff --git a/examples/ringbuffer/bpf_bpfeb.o b/examples/ringbuffer/bpf_bpfeb.o
diff --git a/examples/ringbuffer/bpf_bpfel.o b/examples/ringbuffer/bpf_bpfel.o
diff --git a/examples/tracepoint_in_c/bpf_bpfeb.o b/examples/tracepoint_in_c/bpf_bpfeb.o
diff --git a/examples/tracepoint_in_c/bpf_bpfel.o b/examples/tracepoint_in_c/bpf_bpfel.o
diff --git a/examples/uretprobe/bpf_bpfel_x86.o b/examples/uretprobe/bpf_bpfel_x86.o
diff --git a/internal/btf/testdata/relocs-eb.elf b/internal/btf/testdata/relocs-eb.elf
diff --git a/internal/btf/testdata/relocs-el.elf b/internal/btf/testdata/relocs-el.elf
diff --git a/internal/btf/testdata/relocs.c b/internal/btf/testdata/relocs.c
@@ -238,4 +238,3 @@ __section("socket_filter/err_ambiguous") int err_ambiguous() {
 __section("socket_filter/err_ambiguous_flavour") int err_ambiguous_flavour() {
 	return bpf_core_type_id_kernel(struct ambiguous___flavour);
 }
-
diff --git a/internal/btf/testdata/relocs_read-eb.elf b/internal/btf/testdata/relocs_read-eb.elf
diff --git a/internal/btf/testdata/relocs_read-el.elf b/internal/btf/testdata/relocs_read-el.elf
diff --git a/internal/btf/testdata/relocs_read_tgt-eb.elf b/internal/btf/testdata/relocs_read_tgt-eb.elf
diff --git a/internal/btf/testdata/relocs_read_tgt-el.elf b/internal/btf/testdata/relocs_read_tgt-el.elf
diff --git a/testdata/btf_map_init-eb.elf b/testdata/btf_map_init-eb.elf
diff --git a/testdata/btf_map_init-el.elf b/testdata/btf_map_init-el.elf
diff --git a/testdata/btf_map_init.c b/testdata/btf_map_init.c
@@ -13,21 +13,22 @@ struct {
 	__uint(type, BPF_MAP_TYPE_PROG_ARRAY);
 	__uint(key_size, sizeof(uint32_t));
 	__uint(max_entries, 2);
-	__array(values, int ());
+	__array(values, int());
 } prog_array_init __section(".maps") = {
-	.values = {
-    // Skip index 0 to exercise empty array slots.
-		[1] = &tail_1,
-	},
+	.values =
+		{
+			// Skip index 0 to exercise empty array slots.
+			[1] = &tail_1,
+		},
 };
 
 int __section("socket/main") tail_main(void *ctx) {
-  // If prog_array_init is correctly populated, the tail call
-  // will succeed and the program will continue in tail_1 and
-  // not return here.
-  tail_call(ctx, &prog_array_init, 1);
+	// If prog_array_init is correctly populated, the tail call
+	// will succeed and the program will continue in tail_1 and
+	// not return here.
+	tail_call(ctx, &prog_array_init, 1);
 
-  return 0;
+	return 0;
 }
 
 // Inner map with a single possible entry.
@@ -46,10 +47,11 @@ struct {
 	__uint(value_size, sizeof(uint32_t));
 	__array(values, typeof(inner_map));
 } outer_map_init __section(".maps") = {
-	.values = {
-		// Skip index 0 to exercise empty array slots.
-		[1] = &inner_map,
-	},
+	.values =
+		{
+			// Skip index 0 to exercise empty array slots.
+			[1] = &inner_map,
+		},
 };
 
 #else

diff --git a/testdata/docker/Dockerfile b/testdata/docker/Dockerfile
@@ -17,6 +17,7 @@ COPY llvm.list /etc/apt/sources.list.d
 RUN apt-get update && \
     apt-get -y --no-install-recommends install \
     make git \
+    clang-format \
     clang-7 llvm-7 \
     clang-9 llvm-9 \
     clang-14 llvm-14 && \

diff --git a/testdata/docker/VERSION b/testdata/docker/VERSION
@@ -1 +1 @@
-1637058444
+1648566014
diff --git a/testdata/freplace-eb.elf b/testdata/freplace-eb.elf
diff --git a/testdata/freplace-el.elf b/testdata/freplace-el.elf
diff --git a/testdata/fwd_decl-eb.elf b/testdata/fwd_decl-eb.elf
diff --git a/testdata/fwd_decl-el.elf b/testdata/fwd_decl-el.elf
diff --git a/testdata/invalid_btf_map_init-eb.elf b/testdata/invalid_btf_map_init-eb.elf
diff --git a/testdata/invalid_btf_map_init-el.elf b/testdata/invalid_btf_map_init-el.elf
diff --git a/testdata/invalid_map-eb.elf b/testdata/invalid_map-eb.elf
diff --git a/testdata/invalid_map-el.elf b/testdata/invalid_map-el.elf
diff --git a/testdata/invalid_map_static-eb.elf b/testdata/invalid_map_static-eb.elf
diff --git a/testdata/invalid_map_static-el.elf b/testdata/invalid_map_static-el.elf
diff --git a/testdata/iproute2_map_compat-eb.elf b/testdata/iproute2_map_compat-eb.elf
diff --git a/testdata/iproute2_map_compat-el.elf b/testdata/iproute2_map_compat-el.elf
diff --git a/testdata/iproute2_map_compat.c b/testdata/iproute2_map_compat.c
@@ -2,7 +2,7 @@
 
 #include "common.h"
 
-#define PIN_GLOBAL_NS	2
+#define PIN_GLOBAL_NS 2
 
 // bpf_elf_map is a custom BPF map definition used by iproute2.
 // It contains the id, pinning, inner_id and inner_idx fields

diff --git a/testdata/loader-clang-13-eb.elf b/testdata/loader-clang-13-eb.elf
diff --git a/testdata/loader-clang-13-el.elf b/testdata/loader-clang-13-el.elf
diff --git a/testdata/loader-clang-14-eb.elf b/testdata/loader-clang-14-eb.elf
diff --git a/testdata/loader-clang-14-el.elf b/testdata/loader-clang-14-el.elf
diff --git a/testdata/loader-clang-7-eb.elf b/testdata/loader-clang-7-eb.elf
diff --git a/testdata/loader-clang-7-el.elf b/testdata/loader-clang-7-el.elf
diff --git a/testdata/loader-clang-9-eb.elf b/testdata/loader-clang-9-eb.elf
diff --git a/testdata/loader-clang-9-el.elf b/testdata/loader-clang-9-el.elf
diff --git a/testdata/loader-eb.elf b/testdata/loader-eb.elf
@@ -1 +1 @@
-loader-clang-13-eb.elf
+loader-clang-14-eb.elf
diff --git a/testdata/loader-el.elf b/testdata/loader-el.elf
@@ -1 +1 @@
-loader-clang-13-el.elf
+loader-clang-14-el.elf
diff --git a/testdata/loader.c b/testdata/loader.c
@@ -51,12 +51,13 @@ struct {
 	__uint(type, BPF_MAP_TYPE_ARRAY_OF_MAPS);
 	__uint(key_size, sizeof(uint32_t));
 	__uint(max_entries, 1);
-	__array(values, struct {
-		__uint(type, BPF_MAP_TYPE_HASH);
-		__uint(max_entries, 1);
-		__type(key, uint32_t);
-		__type(value, uint32_t);
-	});
+	__array(
+		values, struct {
+			__uint(type, BPF_MAP_TYPE_HASH);
+			__uint(max_entries, 1);
+			__type(key, uint32_t);
+			__type(value, uint32_t);
+		});
 } btf_outer_map_anon __section(".maps");
 
 struct {

diff --git a/testdata/map_spin_lock-eb.elf b/testdata/map_spin_lock-eb.elf
diff --git a/testdata/map_spin_lock-el.elf b/testdata/map_spin_lock-el.elf
diff --git a/testdata/map_spin_lock.c b/testdata/map_spin_lock.c
@@ -3,12 +3,12 @@
 #include "common.h"
 
 struct bpf_spin_lock {
-	uint32_t	val;
+	uint32_t val;
 };
 
 struct hash_elem {
-    int cnt;
-    struct bpf_spin_lock lock;
+	int cnt;
+	struct bpf_spin_lock lock;
 };
 
 #if __clang_major__ >= 9

diff --git a/testdata/raw_tracepoint-eb.elf b/testdata/raw_tracepoint-eb.elf
diff --git a/testdata/raw_tracepoint-el.elf b/testdata/raw_tracepoint-el.elf
diff --git a/testdata/strings-eb.elf b/testdata/strings-eb.elf
diff --git a/testdata/strings-el.elf b/testdata/strings-el.elf
diff --git a/testdata/subprog_reloc-eb.elf b/testdata/subprog_reloc-eb.elf
diff --git a/testdata/subprog_reloc-el.elf b/testdata/subprog_reloc-el.elf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -238,4 +238,3 @@ __section("socket_filter/err_ambiguous") int err_ambiguous() {
		__section("socket_filter/err_ambiguous_flavour") int err_ambiguous_flavour() {
		return bpf_core_type_id_kernel(struct ambiguous___flavour);
		}