!23 [sync] PR-20: fix offline packets block

From: @openeuler-sync-bot 
Reviewed-by: @nlgwcy 
Signed-off-by: @nlgwcy

0004-fix-offline-packets-block.patch

@@ -0,0 +1,95 @@
+From b928100cf448012a54b95fe1a983c7ff7a0c8823 Mon Sep 17 00:00:00 2001
+From: JofDiamonds <kwb0523@163.com>
+Date: Fri, 19 May 2023 18:28:09 +0800
+Subject: [PATCH] fix offline packets block
+
+---
+ bpf/bwm_tc.c | 15 ++++++++++-----
+ bpf/bwm_tc.h |  6 ++++++
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/bpf/bwm_tc.c b/bpf/bwm_tc.c
+index 286783a..d04d454 100644
+--- a/bpf/bwm_tc.c
++++ b/bpf/bwm_tc.c
+@@ -68,12 +68,13 @@ static void bwm_online(const struct __sk_buff *skb, struct edt_throttle *throttl
+ 	__sync_fetch_and_add(&throttle->stats.online_pkts, 1);
+ }
+ 
+-static void bwm_offline(struct __sk_buff *skb, struct edt_throttle *throttle)
++static int bwm_offline(struct __sk_buff *skb, struct edt_throttle *throttle)
+ {
+ 	unsigned long long t_cur;
+ 	unsigned long long t_send;
+ 	unsigned long long t_delay;
+ 	unsigned long long t_next;
++	unsigned long long t_last = throttle->t_last;
+ 
+ 	__sync_fetch_and_add(&throttle->tx_bytes, skb->len);
+ 	__sync_fetch_and_add(&throttle->stats.offline_pkts, 1);
+@@ -85,17 +86,20 @@ static void bwm_offline(struct __sk_buff *skb, struct edt_throttle *throttle)
+ 	if (t_send < t_cur)
+ 		t_send = t_cur;
+ 
++	if ((skb->sk) && (bpf_tcp_sock(skb->sk) == NULL) && (t_last > t_cur) && ((t_last - t_cur) > MAX_DELAY_STAMP))
++		return TC_ACT_SHOT;
++
+ 	t_delay = skb->len * NSEC_PER_SEC / throttle->rate;
+ 	t_next = throttle->t_last + t_delay;
+ 
+ 	if (t_next <= t_send) {
+ 		throttle->t_last = t_send;
+-		return;
++		return TC_ACT_OK;
+ 	}
+ 
+ 	skb->tstamp = t_next;
+ 	throttle->t_last = t_next;
+-	return;
++	return TC_ACT_OK;
+ }
+ 
+ 
+@@ -141,6 +145,7 @@ int bwm_tc(struct __sk_buff *skb)
+ 	struct edt_throttle_cfg * cfg = NULL;
+ 	unsigned int map_index = 0;
+ 	unsigned int priority_index = 0;
++	int ret = TC_ACT_OK;
+ 
+ 	cfg = bpf_map_lookup_elem(&throttle_cfg, &map_index);
+ 	if (cfg == NULL)
+@@ -161,12 +166,12 @@ int bwm_tc(struct __sk_buff *skb)
+ 	if (skb->priority != OFFLINE_PRIO)
+ 		bwm_online(skb_con, throttle);
+ 	else
+-		bwm_offline(skb, throttle);
++		ret = bwm_offline(skb, throttle);
+ 
+ 	adjust_rate(cfg_con, throttle);
+ 
+ 	bpf_printk("[tc.c]prio=%u\n", skb->priority);
+-	return TC_ACT_OK;
++	return ret;
+ }
+ 
+ char _license[] SEC("license") = "GPL";
+diff --git a/bpf/bwm_tc.h b/bpf/bwm_tc.h
+index ff60f66..5f5ee8a 100644
+--- a/bpf/bwm_tc.h
++++ b/bpf/bwm_tc.h
+@@ -14,6 +14,12 @@
+ #define NSEC_PER_SEC (1000000000ULL)
+ #define NSEC_PER_MSEC (1000000ULL) // NSEC_PER_MSEC * 10 = 1s
+ 
++/*
++ * NSEC_PER_MSEC * 10 = 10s, when the offline packets overstocked exceeds this value,
++ * actively discarding non tcp packets.
++*/
++#define MAX_DELAY_STAMP (10000000000ULL)
++
+ #define DEFAULT_LOW_BANDWIDTH	(20LL * 1024 * 1024)
+ #define DEFAULT_HIGH_BANDWIDTH	(1LL * 1024 * 1024 * 1024)
+ #define DEFAULT_WATERLINE	(20LL * 1024 * 1024)
+-- 
+2.33.0
+

README.md

@@ -315,9 +315,10 @@ echo '{
 esac
 ```
 
-## 注意事项
+## 约束限制
 
 1. 命令行接口和proc文件接口在设置离线业务带宽和在线业务水线上存在不同步的问题，通过proc文件接口设置的结果可以用命令行接口查询到，而通过命令行设置的结果不可以通过proc文件接口查询到。
+2. 实际使用过程中，带宽限速有可能造成协议栈内存积压，此时依赖传输层协议自行反压，对于udp等无反压机制的协议场景，可能出现丢包、ENOBUFS、限速有偏差等问题。
 
 ## 参与贡献
 

oncn-bwm.spec

@@ -1,6 +1,6 @@
 Name:       oncn-bwm
 Version:    1.1
-Release:    3
+Release:    4
 Summary:    Pod bandwidth management in mixed deployment scenarios of online and offline services
 License:    GPL-2.0
 URL:        https://gitee.com/src-openeuler/oncn-bwm
@@ -17,6 +17,7 @@ Requires: libboundscheck
 Patch9001:    0001-adapt-libbpf-0.8.1.patch
 Patch9002:    0002-clean-code-and-use-securec-function.patch
 Patch9003:    0003-add-proc-file-interface.patch
+Patch9004:    0004-fix-offline-packets-block.patch
 
 %description
 Pod bandwidth management in mixed deployment scenarios of online and offline services
@@ -111,6 +112,9 @@ depmod -a
 
 
 %changelog
+* Sat May 20 2023 JofDiamonds <kwb0523@163.com> - 1.1-4
+- fix offline packets block
+
 * Fri May 19 2023 JofDiamonds <kwb0523@163.com> - 1.1-3
 - adapt libbpf-0.8.1: prog_load_xattr will deprecated and use another way to load bpf prog