From 5ea45f742edd90f0bbf77fb3f36a68e1c299a6ff Mon Sep 17 00:00:00 2001
From: Wenhao Liao <wenhao.liao@vivo.corp-partner.google.com>
Date: Thu, 6 Jun 2024 11:04:11 +0800
Subject: [PATCH] ANDROID: GKI: Export tracepoint tcp_retransmit_skb

Export tracepoint tcp_retransmit_skb to collect the retransmission rate
of specific tcp streams and adjust the network policy. Also, update the
symbol list accordingly.

2 function symbol(s) added
  'int __traceiter_tcp_retransmit_skb(void*, const struct sock*, const struct sk_buff*)'
  'void skb_orphan_partial(struct sk_buff*)'

1 variable symbol(s) added
  'struct tracepoint __tracepoint_tcp_retransmit_skb'

Bug: 344697033
Bug: 424394849
Change-Id: Ic2f9a9b31c2cbdf2a59bf3ba13805dfba5036cf5
Signed-off-by: Lei Zhang <lei.zhang.rj@vivo.com>
Signed-off-by: Wenhao Liao <wenhao.liao@vivo.corp-partner.google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Signed-off-by: Yanxiao Guo <yanxiao.guo@vivo.corp-partner.google.com>
---
 android/abi_gki_aarch64.stg  | 37 ++++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_vivo |  3 +++
 net/core/net-traces.c        |  1 +
 3 files changed, 41 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 3bdf4a743267..ef50c3327312 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -327073,6 +327073,13 @@ function {
   parameter_id: 0x191de370
   parameter_id: 0x3e10b518
 }
+function {
+  id: 0x9b41a786
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x3861403d
+  parameter_id: 0x3e6396e0
+}
 function {
   id: 0x9b41b1a1
   return_type_id: 0x6720d32f
@@ -351525,6 +351532,15 @@ elf_symbol {
   type_id: 0x9bd458e9
   full_name: "__traceiter_task_rename"
 }
+elf_symbol {
+  id: 0x59a320d1
+  name: "__traceiter_tcp_retransmit_skb"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x848a5532
+  type_id: 0x9b41a786
+  full_name: "__traceiter_tcp_retransmit_skb"
+}
 elf_symbol {
   id: 0x961fbab2
   name: "__traceiter_workqueue_execute_end"
@@ -356781,6 +356797,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_task_rename"
 }
+elf_symbol {
+  id: 0x4c9e8f73
+  name: "__tracepoint_tcp_retransmit_skb"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xe47aeb12
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_tcp_retransmit_skb"
+}
 elf_symbol {
   id: 0x1a51f8cc
   name: "__tracepoint_workqueue_execute_end"
@@ -403623,6 +403648,15 @@ elf_symbol {
   type_id: 0x17dc60ac
   full_name: "skb_free_datagram"
 }
+elf_symbol {
+  id: 0xf49fd863
+  name: "skb_orphan_partial"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe115fbcc
+  type_id: 0x11cb8bd5
+  full_name: "skb_orphan_partial"
+}
 elf_symbol {
   id: 0x778992cc
   name: "skb_page_frag_refill"
@@ -419991,6 +420025,7 @@ interface {
   symbol_id: 0x313b4348
   symbol_id: 0xcac5a7d5
   symbol_id: 0x2dc83a86
+  symbol_id: 0x59a320d1
   symbol_id: 0x961fbab2
   symbol_id: 0x09f12012
   symbol_id: 0xb3150ce0
@@ -420575,6 +420610,7 @@ interface {
   symbol_id: 0x9deae602
   symbol_id: 0xe91cdbb3
   symbol_id: 0x4f1ffabc
+  symbol_id: 0x4c9e8f73
   symbol_id: 0x1a51f8cc
   symbol_id: 0x20843be8
   symbol_id: 0xc9969dba
@@ -425778,6 +425814,7 @@ interface {
   symbol_id: 0x236e8eb5
   symbol_id: 0xd1a5a209
   symbol_id: 0xca7402ca
+  symbol_id: 0xf49fd863
   symbol_id: 0x778992cc
   symbol_id: 0x0e0dc50e
   symbol_id: 0x90d072a5
diff --git a/android/abi_gki_aarch64_vivo b/android/abi_gki_aarch64_vivo
index df8f6e99fbd1..9584749809e8 100644
--- a/android/abi_gki_aarch64_vivo
+++ b/android/abi_gki_aarch64_vivo
@@ -489,6 +489,7 @@
   __traceiter_sched_switch
   __traceiter_suspend_resume
   __traceiter_sys_exit
+  __traceiter_tcp_retransmit_skb
   __traceiter_workqueue_execute_start
   __traceiter_xdp_exception
   __tracepoint_android_rvh_account_irq
@@ -694,6 +695,7 @@
   __tracepoint_sched_switch
   __tracepoint_suspend_resume
   __tracepoint_sys_exit
+  __tracepoint_tcp_retransmit_skb
   __tracepoint_workqueue_execute_start
   __tracepoint_xdp_exception
   __tty_alloc_driver
@@ -4131,6 +4133,7 @@
   skb_dequeue_tail
   skb_ensure_writable
   skb_free_datagram
+  skb_orphan_partial
   skb_page_frag_refill
   skb_partial_csum_set
   skb_pull
diff --git a/net/core/net-traces.c b/net/core/net-traces.c
index ed7d56d17665..aa67130f113c 100644
--- a/net/core/net-traces.c
+++ b/net/core/net-traces.c
@@ -66,3 +66,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(net_dev_xmit);
 EXPORT_TRACEPOINT_SYMBOL_GPL(netif_receive_skb);
 EXPORT_TRACEPOINT_SYMBOL_GPL(netif_rx);
 
+EXPORT_TRACEPOINT_SYMBOL_GPL(tcp_retransmit_skb);