anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: vendor_hooks: Add hooks to tcp/udp send/recv msg functions."

Browse Source 
This reverts commit e4e3aadd01.

The hooks android_rvh_tcp_sendmsg_locked, android_rvh_tcp_recvmsg,
android_rvh_udp_sendmsg, android_rvh_udp_recvmsg, and
android_rvh_tcp_recvmsg_stat, are not used by any vendor, so remove it
to help with merge issues with future LTS releases.

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

Bug: 190523684
Bug: 203756332
Cc: Liangliang Li <liliangliang@vivo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id562bc858612e059b1605655128783042740ff8a
This commit is contained in:
Greg Kroah-Hartman
2022-09-27 11:48:37 +02:00
parent 8c09081fc0
commit b80df8c286
4 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/android/vendor_hooks.c
View File

@@ -103,7 +103,6 @@
#include <trace/hooks/dmabuf.h>
#include <trace/hooks/mmc.h>
#include <trace/hooks/evdev.h>
#include <trace/hooks/ipv4.h>
#include <trace/hooks/signal.h>
#include <trace/hooks/cfg80211.h>
@@ -330,11 +329,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mmap_region);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_try_to_unmap_one);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_node_memcgs);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mmc_sdio_pm_flag_set);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_sendmsg_locked);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_recvmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_udp_sendmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_udp_recvmsg);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_tcp_recvmsg_stat);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_tune_scan_type);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_tune_swappiness);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_partial_init);

36
include/trace/hooks/ipv4.h
View File

@@ -1,36 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM ipv4
#define TRACE_INCLUDE_PATH trace/hooks
#if !defined(_TRACE_HOOK_IPV4_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_HOOK_IPV4_H
#include <linux/tracepoint.h>
#include <trace/hooks/vendor_hooks.h>
struct sock;
DECLARE_RESTRICTED_HOOK(android_rvh_tcp_sendmsg_locked,
TP_PROTO(struct sock *sk, int size),
TP_ARGS(sk, size), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_tcp_recvmsg,
TP_PROTO(struct sock *sk),
TP_ARGS(sk), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_udp_sendmsg,
TP_PROTO(struct sock *sk),
TP_ARGS(sk), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_udp_recvmsg,
TP_PROTO(struct sock *sk),
TP_ARGS(sk), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_tcp_recvmsg_stat,
TP_PROTO(struct sock *sk, int size),
TP_ARGS(sk, size), 1);
#endif /* _TRACE_HOOK_IPV4_H */
/* This part must be outside protection */
#include <trace/define_trace.h>

5
net/ipv4/tcp.c
View File

@@ -281,8 +281,6 @@
#include <asm/ioctls.h>
#include <net/busy_poll.h>
#include <trace/hooks/ipv4.h>
/* Track pending CMSGs. */
enum {
TCP_CMSG_INQ = 1,
@@ -1211,7 +1209,6 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size)
bool zc = false;
long timeo;
trace_android_rvh_tcp_sendmsg_locked(sk, size);
flags = msg->msg_flags;
if (flags & MSG_ZEROCOPY && size && sock_flag(sk, SOCK_ZEROCOPY)) {
@@ -2519,7 +2516,6 @@ found_fin_ok:
break;
} while (len > 0);
trace_android_rvh_tcp_recvmsg_stat(sk, copied);
/* According to UNIX98, msg_name/msg_namelen are ignored
* on connected socket. I was just happy when found this 8) --ANK
*/
@@ -2548,7 +2544,6 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
if (unlikely(flags & MSG_ERRQUEUE))
return inet_recv_error(sk, msg, len, addr_len);
trace_android_rvh_tcp_recvmsg(sk);
if (sk_can_busy_loop(sk) &&
skb_queue_empty_lockless(&sk->sk_receive_queue) &&

3
net/ipv4/udp.c
View File

@@ -116,7 +116,6 @@
#if IS_ENABLED(CONFIG_IPV6)
#include <net/ipv6_stubs.h>
#endif
#include <trace/hooks/ipv4.h>
struct udp_table udp_table __read_mostly;
EXPORT_SYMBOL(udp_table);
@@ -1069,7 +1068,6 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
if (msg->msg_flags & MSG_OOB) /* Mirror BSD error message compatibility */
return -EOPNOTSUPP;
trace_android_rvh_udp_sendmsg(sk);
getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;
@@ -1864,7 +1862,6 @@ try_again:
skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
if (!skb)
return err;
trace_android_rvh_udp_recvmsg(sk);
ulen = udp_skb_len(skb);
copied = len;