xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle"

Browse Source 
This reverts commit 4d30956478.

The hooks android_rvh_nf_conn_alloc and android_rvh_nf_conn_free were
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 <vignesh1.s@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I069a798036056feadb2c933da42d405b7bf22cd4
This commit is contained in:
Greg Kroah-Hartman
2021-10-20 16:56:32 +02:00
parent 92ab2aeca5
commit d8fe0b1fc2
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/android/vendor_hooks.c
View File

@@ -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_nf_conn_alloc);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_nf_conn_free);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_arch_set_freq_scale);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_transaction_init);

6
include/trace/hooks/net.h
View File

@@ -18,12 +18,8 @@ DECLARE_HOOK(android_vh_ptype_head,
DECLARE_HOOK(android_vh_kfree_skb,
TP_PROTO(struct sk_buff *skb), TP_ARGS(skb));
struct nf_conn;
struct nf_conn; /* needed for CRC preservation */
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);
/* macro versions of hooks are no longer required */

3
net/netfilter/nf_conntrack_core.c
View File

@@ -1496,8 +1496,6 @@ __nf_conntrack_alloc(struct net *net,
nf_ct_zone_add(ct, zone);
trace_android_rvh_nf_conn_alloc(ct);
/* Because we use RCU lookups, we set ct_general.use to zero before
* this is inserted in any list.
*/
@@ -1530,7 +1528,6 @@ void nf_conntrack_free(struct nf_conn *ct)
nf_ct_ext_destroy(ct);
kmem_cache_free(nf_conntrack_cachep, ct);
smp_mb__before_atomic();
trace_android_rvh_nf_conn_free(ct);
atomic_dec(&net->ct.count);
}
EXPORT_SYMBOL_GPL(nf_conntrack_free);