mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

qosmngr: add support for upstream policing on dg400prime

Browse source
This commit is contained in:
Rahul 2020-10-12 22:32:39 +05:30
parent fdc882b6e0
commit 54cc458a2d
1 changed files with 68 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
qosmngr/files/lib/qos/broadcom.sh
View file

@ -449,12 +449,34 @@ handle_iptables_rules() {
fi fi
} }
assign_policer_to_port() {
local ifname="$1"
local pindex="$2"
local portorder="$(db -q get hw.board.ethernetPortOrder)"
local wanport="$(db -q get hw.board.ethernetWanPort)"
local i=0
for port in $portorder; do
if [ "$ifname" == "$port" ]; then
if [ "$wanport" == "$port" ]; then
bs /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
else
bs /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
fi
break
fi
i=$((i + 1))
done
}
handle_policer_rules() { handle_policer_rules() {
local c_sec=$1 local c_sec=$1
local policer_name local policer_name
local ifname local ifname
local pname local pname
local pindex=-1 local pindex=-1
local ingress_rate=0
local in_burst_size=0
config_get policer_name "$c_sec" "policer" config_get policer_name "$c_sec" "policer"
if [ -z "$policer_name" ];then if [ -z "$policer_name" ];then
@ -480,6 +502,8 @@ handle_policer_rules() {
pname="$(uci -q get qos.@policer[$i].name)" pname="$(uci -q get qos.@policer[$i].name)"
if [ "$policer_name" == "$pname" ]; then if [ "$policer_name" == "$pname" ]; then
pindex=$i pindex=$i
ingress_rate=$(uci -q get qos.@policer[$i].committed_rate)
in_burst_rate=$(uci -q get qos.@policer[$i].committed_burst_size)
break break
fi fi
i=$((i + 1)) i=$((i + 1))
@ -490,21 +514,34 @@ handle_policer_rules() {
return return
fi fi
local portorder="$(db -q get hw.board.ethernetPortOrder)" # The policer object is not available on non BCM968* chips
local wanport="$(db -q get hw.board.ethernetWanPort)" if [ $is_bcm968 -eq 1 ]; then
assign_policer_to_port $ifname $pindex
else
config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
fi
i=0 }
for port in $portorder; do
if [ "$ifname" == "$port" ]; then config_ingress_rate_limit() {
if [ "$wanport" == "$port" ]; then local ifname="$1"
bs /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}} local ingress_rate=$2
else local in_burst_size=$3
bs /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
fi # Unit in uci file is in bps while that accepted by ethswctl is kbits
break if [ $ingress_rate -lt 1000 ]; then
fi return
i=$((i + 1)) fi
done
ingress_rate=$((ingress_rate / 1000))
if [ $in_burst_size -eq 0 ]; then
in_burst_size=$ingress_rate
else
in_burst_size=$((in_burst_size / 1000))
fi
ethswctl -c rxratectrl -n 1 -p $ifname -x $ingress_rate -y $in_burst_size
} }
#function to handle a classify section #function to handle a classify section
@ -583,6 +620,16 @@ configure_queue() {
} }
configure_policer() { configure_policer() {
# The policer object is not available on non BCM968* chips, just clean up
# the old config if any and return
if [ $is_bcm968 -eq 0 ]; then
for intf in $(db get hw.board.ethernetPortOrder); do
# setting rate and burst size to 0 disables rate limiting
ethswctl -c rxratectrl -n 1 -p $intf -x 0 -y 0
done
return
fi
# Delete policer # Delete policer
local i=0 local i=0
local max_p_inst=0 local max_p_inst=0
@ -616,6 +663,12 @@ configure_qos() {
reload_qos() { reload_qos() {
local service_name="$1" local service_name="$1"
local cpu_model="$(grep Hardware /proc/cpuinfo | awk '{print$NF}')"
case $cpu_model in
BCM968*) is_bcm968=1 ;;
esac
if [ -z "$service_name" ]; then if [ -z "$service_name" ]; then
configure_qos configure_qos
elif [ "$service_name" == "shaper" ]; then elif [ "$service_name" == "shaper" ]; then
@ -842,6 +895,7 @@ read_queue_stats() {
itf="$1" itf="$1"
q_idx="$2" q_idx="$2"
local cpu_model="$(grep Hardware /proc/cpuinfo | awk '{print$NF}')" local cpu_model="$(grep Hardware /proc/cpuinfo | awk '{print$NF}')"
case $cpu_model in case $cpu_model in
BCM968*) is_bcm968=1 ;; BCM968*) is_bcm968=1 ;;
esac esac