NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: remove the android_vh_kfree_skb tracehook

Browse source 
The network stack already provides a built-in skb tracepoint that can be
used for tracing the lifecycle of a skb, no need to add an
android-specific one as well, that just duplicates the same logic and
causes merge conflicts with upstream changes.

Bug: 163716381
Cc: Bae Soukjin <soukjin.bae@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie1770c59d3e70d9a47e93b645134ae85630f240a
This commit is contained in:
Greg Kroah-Hartman 2022-01-14 07:30:49 +01:00
parent 267e37791d
commit c1e292ea7c
4 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/android/vendor_hooks.c
View file

@ -145,7 +145,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_setup_dma_ops);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_iovad_alloc_iova);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_iommu_iovad_free_iova);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ptype_head);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_kfree_skb);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_timer_calc_index);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_allow_domain_state);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_cpuidle_psci_enter);

3
include/trace/hooks/net.h
View file

@ -11,12 +11,9 @@
struct packet_type;
struct list_head;
struct sk_buff;
DECLARE_HOOK(android_vh_ptype_head,
TP_PROTO(const struct packet_type *pt, struct list_head *vendor_pt),
TP_ARGS(pt, vendor_pt));
DECLARE_HOOK(android_vh_kfree_skb,
TP_PROTO(struct sk_buff *skb), TP_ARGS(skb));
/* macro versions of hooks are no longer required */

1
net/core/skbuff.c
View file

@ -771,7 +771,6 @@ void kfree_skb(struct sk_buff *skb)
if (!skb_unref(skb))
return;
trace_android_vh_kfree_skb(skb);
trace_kfree_skb(skb, __builtin_return_address(0));
__kfree_skb(skb);
}

1
net/ipv4/tcp_input.c
View file

@ -4685,7 +4685,6 @@ static bool tcp_ooo_try_coalesce(struct sock *sk,
static void tcp_drop(struct sock *sk, struct sk_buff *skb)
{
trace_android_vh_kfree_skb(skb);
sk_drops_add(sk, skb);
__kfree_skb(skb);
}