From 63e7148b272922a309b7d8e357f18f1f9411357f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 20 Oct 2021 17:19:59 +0200
Subject: [PATCH] Revert "ANDROID: user: Add vendor hook to user for GKI
 purpose"

This reverts commit c9b8fa644f45e9c99da85d8947f6c7e06771f205.

The hooks android_vh_alloc_uid and android_vh_free_user are not used by
any vendor, so remove them to help with merge issues with future LTS
releases.

If this is needed by any real user, it can easily be reverted to add it
back and then the symbol should be added to the abi list at the same
time to prevent it from being removed again later.

Bug: 203756332
Bug: 187458531
Cc: heshuai1 <heshuai1@xiaomi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2aa3f95ab52c2d81eb790ba8b64b864f8189222b
---
 drivers/android/vendor_hooks.c |  3 ---
 include/trace/hooks/user.h     | 23 -----------------------
 kernel/user.c                  |  4 ----
 3 files changed, 30 deletions(-)
 delete mode 100644 include/trace/hooks/user.h

diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index 6b9285029545..63a06d02a9a1 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -60,7 +60,6 @@
 #include <trace/hooks/v4l2core.h>
 #include <trace/hooks/v4l2mc.h>
 #include <trace/hooks/scmi.h>
-#include <trace/hooks/user.h>
 #include <trace/hooks/cpuidle_psci.h>
 #include <trace/hooks/fips140.h>
 #include <trace/hooks/remoteproc.h>
@@ -355,8 +354,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_v4l2subdev_set_frame_interval);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_v4l2subdev_set_frame_interval);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_scmi_timeout_sync);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_new_ilb);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_uid);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_user);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_qos_add_request);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_qos_update_request);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_qos_remove_request);
diff --git a/include/trace/hooks/user.h b/include/trace/hooks/user.h
deleted file mode 100644
index b5b507ccd9c2..000000000000
--- a/include/trace/hooks/user.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM user
-#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH trace/hooks
-#if !defined(_TRACE_HOOK_USER_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_HOOK_USER_H
-#include <linux/tracepoint.h>
-#include <trace/hooks/vendor_hooks.h>
-
-struct user_struct;
-DECLARE_HOOK(android_vh_alloc_uid,
-	TP_PROTO(struct user_struct *user),
-	TP_ARGS(user));
-
-DECLARE_HOOK(android_vh_free_user,
-	TP_PROTO(struct user_struct *up),
-	TP_ARGS(up));
-
-#endif /* _TRACE_HOOK_USER_H */
-/* This part must be outside protection */
-#include <trace/define_trace.h>
-
diff --git a/kernel/user.c b/kernel/user.c
index 83adc37251fa..ab445fcc07aa 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -20,8 +20,6 @@
 #include <linux/user_namespace.h>
 #include <linux/proc_ns.h>
 
-#include <trace/hooks/user.h>
-
 /*
  * userns count is 1 for root user, 1 for init_uts_ns,
  * and 1 for... ?
@@ -141,7 +139,6 @@ static struct user_struct *uid_hash_find(kuid_t uid, struct hlist_head *hashent)
 static void free_user(struct user_struct *up, unsigned long flags)
 	__releases(&uidhash_lock)
 {
-	trace_android_vh_free_user(up);
 	uid_hash_remove(up);
 	spin_unlock_irqrestore(&uidhash_lock, flags);
 	kmem_cache_free(uid_cachep, up);
@@ -193,7 +190,6 @@ struct user_struct *alloc_uid(kuid_t uid)
 
 		new->uid = uid;
 		refcount_set(&new->__count, 1);
-		trace_android_vh_alloc_uid(new);
 		ratelimit_state_init(&new->ratelimit, HZ, 100);
 		ratelimit_set_flags(&new->ratelimit, RATELIMIT_MSG_ON_RELEASE);