From 92ab2aeca5aee77423736ffef6b3c5022b206adc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2021 16:06:41 +0200 Subject: [PATCH] Revert "ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle" This reverts commit 0ed7424fa0cc7253718f29972af0a7362bc4a961. The hooks android_rvh_sk_alloc and android_rvh_sk_free 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: 171013716 Cc: Vignesh Saravanaperumal Signed-off-by: Greg Kroah-Hartman Change-Id: I5fa860e75a0640bc02d1dffeb556497badd6f3bf --- drivers/android/vendor_hooks.c | 2 -- include/trace/hooks/net.h | 6 +----- net/core/sock.c | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index d86c973aa04c..8d79781cd6a4 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -89,8 +89,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_prepare_prio_fork); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_finish_prio_fork); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_user_nice); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_setscheduler); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sk_alloc); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sk_free); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_nf_conn_alloc); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_nf_conn_free); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_arch_set_freq_scale); diff --git a/include/trace/hooks/net.h b/include/trace/hooks/net.h index 6715aa4eb668..6296d57d4b2a 100644 --- a/include/trace/hooks/net.h +++ b/include/trace/hooks/net.h @@ -19,15 +19,11 @@ DECLARE_HOOK(android_vh_kfree_skb, TP_PROTO(struct sk_buff *skb), TP_ARGS(skb)); struct nf_conn; -struct sock; +struct sock; /* needed for CRC preservation */ DECLARE_RESTRICTED_HOOK(android_rvh_nf_conn_alloc, TP_PROTO(struct nf_conn *nf_conn), TP_ARGS(nf_conn), 1); DECLARE_RESTRICTED_HOOK(android_rvh_nf_conn_free, TP_PROTO(struct nf_conn *nf_conn), TP_ARGS(nf_conn), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_sk_alloc, - TP_PROTO(struct sock *sock), TP_ARGS(sock), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_sk_free, - TP_PROTO(struct sock *sock), TP_ARGS(sock), 1); /* macro versions of hooks are no longer required */ diff --git a/net/core/sock.c b/net/core/sock.c index 4f9409db11dc..059605a3ec4e 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -136,7 +136,6 @@ #include #include -#include #include #include @@ -1696,8 +1695,6 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority, if (security_sk_alloc(sk, family, priority)) goto out_free; - trace_android_rvh_sk_alloc(sk); - if (!try_module_get(prot->owner)) goto out_free_sec; sk_tx_queue_clear(sk); @@ -1707,7 +1704,6 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority, out_free_sec: security_sk_free(sk); - trace_android_rvh_sk_free(sk); out_free: if (slab != NULL) kmem_cache_free(slab, sk); @@ -1727,7 +1723,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk) cgroup_sk_free(&sk->sk_cgrp_data); mem_cgroup_sk_free(sk); security_sk_free(sk); - trace_android_rvh_sk_free(sk); if (slab != NULL) kmem_cache_free(slab, sk); else