tools/tcpcong: Reduce code redundancy

1: Ports that do not meet the conditions in function "entry_state_update_func" will not be stored in the "start_ipv4" or "start_ipv6", and the "ret_state_update_func" function will not obtain values, so there is no need to perform port filtering again. 2: Sock_store can be directly deleted in function "ret_func". Signed-off-by: Feng Yang <[email protected]>
iovisor · Oct 21, 2024 · 0d5dcf4 · 0d5dcf4
1 parent 321f8b1
commit 0d5dcf4
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/tools/tcpcong.py b/tools/tcpcong.py
@@ -199,7 +199,6 @@
 {
     u64 ts, ts1;
     u16 family, last_cong_state;
-    u16 dport = 0, lport = 0;
     u32 tid = bpf_get_current_pid_tgid();
     process_key_t key = {0};
     bpf_get_current_comm(&key.comm, sizeof(key.comm));
@@ -216,16 +215,12 @@
     if (family == AF_INET) {
         ipv4_flow_val_t *val4 = start_ipv4.lookup(&key);
         if (val4 == 0) {
-            SOCK_STORE_DEL
             return 0; //missed
         }
         ipv4_flow_key_t keyv4 = {0};
         bpf_probe_read_kernel(&keyv4, sizeof(ipv4_flow_key_t),
             &(val4->ipv4_key));
-        dport = keyv4.dport;
-        lport = keyv4.lport;
-        FILTER_LPORT
-        FILTER_DPORT
+
         datap = ipv4_stat.lookup(&keyv4);
         if (datap == 0) {
             data.last_ts = bpf_ktime_get_ns();
@@ -246,16 +241,12 @@
     } else if (family == AF_INET6) {
         ipv6_flow_val_t *val6 = start_ipv6.lookup(&key);
         if (val6 == 0) {
-            SOCK_STORE_DEL
             return 0; //missed
         }
         ipv6_flow_key_t keyv6 = {0};
         bpf_probe_read_kernel(&keyv6, sizeof(ipv6_flow_key_t),
             &(val6->ipv6_key));
-        dport = keyv6.dport;
-        lport = keyv6.lport;
-        FILTER_LPORT
-        FILTER_DPORT
+
         datap = ipv6_stat.lookup(&keyv6);
         if (datap == 0) {
             data.last_ts = bpf_ktime_get_ns();
@@ -274,7 +265,7 @@
         }
         start_ipv6.delete(&key);
     }
-    SOCK_STORE_DEL
+
     return 0;
 }
 """
@@ -366,6 +357,7 @@
         return 0; //miss the entry
     }
     struct sock *sk = *sockpp;
+    SOCK_STORE_DEL
     return ret_state_update_func(sk);
 }
 """