Merge pull request #1 from tzachiabo/patch-1

fixed bpf probe build on kernel >= 6.2
kinvolk · Oct 3, 2023 · 315f24d · 315f24d
2 parents 79ac5bb + 781914c
commit 315f24d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/driver/bpf/fillers.h b/driver/bpf/fillers.h
@@ -851,8 +851,13 @@ static __always_inline unsigned long bpf_get_mm_counter(struct mm_struct *mm,
 							int member)
 {
 	long val;
-
+
+// See 6.2 kernel commit: https://github.com/torvalds/linux/commit/f1a7941243c102a44e8847e3b94ff4ff3ec56f25
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
 	bpf_probe_read(&val, sizeof(val), &mm->rss_stat.count[member]);
+#else
+	bpf_probe_read_kernel(&val, sizeof(val), &mm->rss_stat[member].count);
+#endif
 	if (val < 0)
 		val = 0;