fix(bpf): try to fix Linux 6.1 with clang 20+

hack3ric · hack3ric · commit 9d7c3631e861 · 2025-11-19T21:08:12.000+08:00
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -179,7 +179,7 @@ jobs:
           done
           cd out
           mkdir expect-fail
-          mv mimic-compat-6.1-clang-20 mimic-compat-6.6-clang-20 expect-fail/
+          # insert expected fail combination here
       - name: Upload executable
         uses: actions/upload-artifact@v4
         with:
diff --git a/bpf/main.c b/bpf/main.c
@@ -60,7 +60,7 @@ int store_packet(struct __sk_buff* skb, __u32 pkt_off, struct conn_tuple* key, i
   }
   if (has_remainder) {
     offset = i * SEGMENT_SIZE;
-#if defined(MIMIC_COMPAT_LINUX_6_1) || defined(MIMIC_COMPAT_LINUX_6_6)
+#if (defined(MIMIC_COMPAT_LINUX_6_1) || defined(MIMIC_COMPAT_LINUX_6_6)) && __clang_major__ < 20
     __u32 copy_len = data_len - offset;
 #else
     __u32 copy_len = data_len % SEGMENT_SIZE;

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ int store_packet(struct __sk_buff* skb, __u32 pkt_off, struct conn_tuple* key, i`
`60`	`60`	`}`
`61`	`61`	`if (has_remainder) {`
`62`	`62`	`offset = i * SEGMENT_SIZE;`
`63`		`-#if defined(MIMIC_COMPAT_LINUX_6_1) \|\| defined(MIMIC_COMPAT_LINUX_6_6)`
	`63`	`+#if (defined(MIMIC_COMPAT_LINUX_6_1) \|\| defined(MIMIC_COMPAT_LINUX_6_6)) && __clang_major__ < 20`
`64`	`64`	`__u32 copy_len = data_len - offset;`
`65`	`65`	`#else`
`66`	`66`	`__u32 copy_len = data_len % SEGMENT_SIZE;`