Upgrade to LLVM 14, introduce clang-format

.semaphore/semaphore.yml

@@ -52,7 +52,7 @@ blocks:
           - ( export GOARCH=arm64; go build ./... && for p in $(go list ./...) ; do go test -c $p || exit ; done )
           - make clean
           - make container-all
-          - git diff --exit-code || { echo "generated files are not up to date" >&2; false; }
+          - git diff --exit-code || { echo "found unformatted source files, or generated files are not up to date, run 'make'" >&2; false; }
           - pushd ./examples
           - go build -v -o "$(mktemp -d)" ./...
           - popd

Makefile

@@ -1,8 +1,8 @@
 # The development version of clang is distributed as the 'clang' binary,
 # while stable/released versions have a version number attached.
 # Pin the default clang to a stable version.
-CLANG ?= clang-13
-STRIP ?= llvm-strip-13
+CLANG ?= clang-14
+STRIP ?= llvm-strip-14
 CFLAGS := -O2 -g -Wall -Werror $(CFLAGS)
 
 # Obtain an absolute path to the directory of the 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
 

examples/cgroup_skb/cgroup_skb.c

@@ -1,28 +1,27 @@
 // +build ignore
 
-#include "common.h"
 #include "bpf_helpers.h"
 
 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;
 }

examples/headers/bpf_helpers.h

@@ -8,6 +8,7 @@
  * in advance since bpf_helper_defs.h uses such types
  * as __u64.
  */
+#include "common.h"
 #include "bpf_helper_defs.h"
 
 #define __uint(name, val) int (*name)[val]

examples/kprobe/kprobe.c

@@ -1,28 +1,27 @@
 // +build ignore
 
-#include "common.h"
 #include "bpf_helpers.h"
 
 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;
 }

examples/kprobepin/kprobe_pin.c

@@ -1,6 +1,5 @@
 // +build ignore
 
-#include "common.h"
 #include "bpf_helpers.h"
 
 char __license[] SEC("license") = "Dual MIT/GPL";

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);
 }
-

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

testdata/docker/Dockerfile

@@ -17,7 +17,8 @@ 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-13 llvm-13 && \
+    clang-14 llvm-14 && \
     rm -rf /var/lib/apt/lists/*

testdata/docker/VERSION

@@ -1 +1 @@
-1637058444
+1648566014

testdata/docker/llvm.list

@@ -9,11 +9,5 @@ deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-7 main
 deb http://apt.llvm.org/buster/ llvm-toolchain-buster-9 main
 deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-9 main
 
-deb http://apt.llvm.org/buster/ llvm-toolchain-buster-11 main
-deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-11 main
-
-deb http://apt.llvm.org/buster/ llvm-toolchain-buster-12 main
-deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-12 main
-
-deb http://apt.llvm.org/buster/ llvm-toolchain-buster-13 main
-deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-13 main
+deb http://apt.llvm.org/buster/ llvm-toolchain-buster-14 main
+deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-14 main

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

testdata/loader-eb.elf

@@ -1 +1 @@
-loader-clang-13-eb.elf
+loader-clang-14-eb.elf

testdata/loader-el.elf

@@ -1 +1 @@
-loader-clang-13-el.elf
+loader-clang-14-el.elf

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 {

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