fix(scap_engine_bpf): enable _64BIT_ARGS_SINGLE_REGISTER on ARM64

driver/ppm_fillers.c

@@ -3559,19 +3559,15 @@ int f_sys_pread64_e(struct event_filler_arguments *args)
 
 	return add_sentinel(args);
 }
-#endif /* _64BIT_ARGS_SINGLE_REGISTER */
 
-#ifndef _64BIT_ARGS_SINGLE_REGISTER
 int f_sys_pwrite64_e(struct event_filler_arguments *args)
 {
 	unsigned long val;
 	unsigned long size;
 	int res;
-#ifndef _64BIT_ARGS_SINGLE_REGISTER
 	unsigned long pos0;
 	unsigned long pos1;
 	uint64_t pos64;
-#endif
 
 	/*
 	 * fd
@@ -3594,32 +3590,63 @@ int f_sys_pwrite64_e(struct event_filler_arguments *args)
 	 * NOTE: this is a 64bit value, which means that on 32bit systems it uses two
 	 * separate registers that we need to merge.
 	 */
-#ifdef _64BIT_ARGS_SINGLE_REGISTER
-	syscall_get_arguments_deprecated(current, args->regs, 3, 1, &val);
-	res = val_to_ring(args, val, 0, false, 0);
-	if (unlikely(res != PPM_SUCCESS))
-		return res;
-#else
- #if defined CONFIG_X86
+#if defined CONFIG_X86
 	syscall_get_arguments_deprecated(current, args->regs, 3, 1, &pos0);
 	syscall_get_arguments_deprecated(current, args->regs, 4, 1, &pos1);
- #elif defined CONFIG_ARM && CONFIG_AEABI
+#elif defined CONFIG_ARM && CONFIG_AEABI
 	syscall_get_arguments_deprecated(current, args->regs, 4, 1, &pos0);
 	syscall_get_arguments_deprecated(current, args->regs, 5, 1, &pos1);
- #else
+#else
   #error This architecture/abi not yet supported
- #endif
+#endif
 
 	pos64 = merge_64(pos1, pos0);
 
 	res = val_to_ring(args, pos64, 0, false, 0);
 	if (unlikely(res != PPM_SUCCESS))
 		return res;
-#endif
 
 	return add_sentinel(args);
 }
-#endif
+
+int f_sys_preadv64_e(struct event_filler_arguments *args)
+{
+	unsigned long val;
+	int res;
+	unsigned long pos0;
+	unsigned long pos1;
+	uint64_t pos64;
+
+	/*
+	 * fd
+	 */
+	syscall_get_arguments_deprecated(current, args->regs, 0, 1, &val);
+	res = val_to_ring(args, val, 0, false, 0);
+	if (unlikely(res != PPM_SUCCESS))
+		return res;
+
+	/*
+	 * pos
+	 */
+
+	/*
+	 * Note that in preadv and pwritev have NO 64-bit arguments in the
+	 * syscall (despite having one in the userspace API), so no alignment
+	 * requirements apply here. For an overly-detailed discussion about
+	 * this, see https://lwn.net/Articles/311630/
+	 */
+	syscall_get_arguments_deprecated(current, args->regs, 3, 1, &pos0);
+	syscall_get_arguments_deprecated(current, args->regs, 4, 1, &pos1);
+
+	pos64 = merge_64(pos1, pos0);
+
+	res = val_to_ring(args, pos64, 0, false, 0);
+	if (unlikely(res != PPM_SUCCESS))
+		return res;
+
+	return add_sentinel(args);
+}
+#endif /* _64BIT_ARGS_SINGLE_REGISTER */
 
 int f_sys_readv_preadv_x(struct event_filler_arguments *args)
 {
@@ -3754,46 +3781,6 @@ int f_sys_writev_pwritev_x(struct event_filler_arguments *args)
 	return add_sentinel(args);
 }
 
-#ifndef _64BIT_ARGS_SINGLE_REGISTER
-int f_sys_preadv64_e(struct event_filler_arguments *args)
-{
-	unsigned long val;
-	int res;
-	unsigned long pos0;
-	unsigned long pos1;
-	uint64_t pos64;
-
-	/*
-	 * fd
-	 */
-	syscall_get_arguments_deprecated(current, args->regs, 0, 1, &val);
-	res = val_to_ring(args, val, 0, false, 0);
-	if (unlikely(res != PPM_SUCCESS))
-		return res;
-
-	/*
-	 * pos
-	 */
-
-	/*
-	 * Note that in preadv and pwritev have NO 64-bit arguments in the
-	 * syscall (despite having one in the userspace API), so no alignment
-	 * requirements apply here. For an overly-detailed discussion about
-	 * this, see https://lwn.net/Articles/311630/
-	 */
-	syscall_get_arguments_deprecated(current, args->regs, 3, 1, &pos0);
-	syscall_get_arguments_deprecated(current, args->regs, 4, 1, &pos1);
-
-	pos64 = merge_64(pos1, pos0);
-
-	res = val_to_ring(args, pos64, 0, false, 0);
-	if (unlikely(res != PPM_SUCCESS))
-		return res;
-
-	return add_sentinel(args);
-}
-#endif /* _64BIT_ARGS_SINGLE_REGISTER */
-
 int f_sys_pwritev_e(struct event_filler_arguments *args)
 {
 	unsigned long val;
@@ -3867,7 +3854,7 @@ int f_sys_pwritev_e(struct event_filler_arguments *args)
 	res = val_to_ring(args, pos64, 0, false, 0);
 	if (unlikely(res != PPM_SUCCESS))
 		return res;
-#endif
+#endif /* _64BIT_ARGS_SINGLE_REGISTER */
 
 	return add_sentinel(args);
 }

driver/ppm_fillers.h

@@ -19,11 +19,11 @@ or GPL2.txt for full copies of the license.
  */
 #ifdef __KERNEL__
 #ifdef CONFIG_64BIT
-#define _64BIT_ARGS_SINGLE_REGISTER
+	#define _64BIT_ARGS_SINGLE_REGISTER
 #endif /* CONFIG_64BIT */
 #else
-#ifdef __x86_64__
-#define _64BIT_ARGS_SINGLE_REGISTER
+#if defined(__x86_64__) || defined(__aarch64__)
+	#define _64BIT_ARGS_SINGLE_REGISTER
 #endif /* __x86_64__ */
 #endif /* __KERNEL__ */