From f966514ece78a211b2647e082fa9b85d000bc170 Mon Sep 17 00:00:00 2001 From: Sooyong Suk Date: Mon, 15 Jul 2024 15:03:23 +0900 Subject: [PATCH] ANDROID: madvise: add vendor hook to bypass process madvise We'd like to let custom vendor module does madvise instead and bypass original madvise. Bug: 351175506 Change-Id: I93aef1b34f38b548c9be33c4b34f5d4eb00407dc Signed-off-by: Sooyong Suk --- drivers/android/vendor_hooks.c | 2 ++ include/trace/hooks/madvise.h | 17 +++++++++++++++++ mm/madvise.c | 7 +++++++ 3 files changed, 26 insertions(+) create mode 100644 include/trace/hooks/madvise.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index b4d6efe84d3d..c1c7dc70e0f8 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -63,6 +63,7 @@ #include #include #include +#include #include @@ -329,3 +330,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_warn_alloc_show_mem_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_use_vm_swappiness); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_tune_scan_control); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_signal); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_process_madvise_bypass); diff --git a/include/trace/hooks/madvise.h b/include/trace/hooks/madvise.h new file mode 100644 index 000000000000..f899a085fa5c --- /dev/null +++ b/include/trace/hooks/madvise.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM madvise +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH trace/hooks +#if !defined(_TRACE_HOOK_MADVISE_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_MADVISE_H +#include + +DECLARE_RESTRICTED_HOOK(android_rvh_process_madvise_bypass, + TP_PROTO(int pidfd, const struct iovec __user *vec, size_t vlen, + int behavior, unsigned int flags, ssize_t *ret, bool *bypass), + TP_ARGS(pidfd, vec, vlen, behavior, flags, ret, bypass), 1); + +#endif + +#include diff --git a/mm/madvise.c b/mm/madvise.c index 11d7861a429b..c081e3e92749 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -1490,6 +1491,12 @@ SYSCALL_DEFINE5(process_madvise, int, pidfd, const struct iovec __user *, vec, struct mm_struct *mm; size_t total_len; unsigned int f_flags; + bool bypass = false; + + trace_android_rvh_process_madvise_bypass(pidfd, vec, + vlen, behavior, flags, &ret, &bypass); + if (bypass) + return ret; if (flags != 0) { ret = -EINVAL;