>
+
+ <% if [ "${cake_active:-0}" -gt 0 ] 2>/dev/null; then printf 'Active'; else printf 'Configured — restart QoS to activate'; fi %>
+
+
diff --git a/package/qos-gargoyle/Makefile b/package/qos-gargoyle/Makefile
index b9199fc22..fca22a5bd 100644
--- a/package/qos-gargoyle/Makefile
+++ b/package/qos-gargoyle/Makefile
@@ -16,7 +16,7 @@ define Package/qos-gargoyle
SECTION:=net
CATEGORY:=Network
TITLE:=A set of QoS scripts designed for use with Gargoyle Web Interface
- DEPENDS:=+tc +ip +kmod-ifb +kmod-sched +kmod-sched-connmark +kmod-sched-prio +gargoyle-firewall-util
+ DEPENDS:=+tc +ip +kmod-ifb +kmod-sched +kmod-sched-connmark +kmod-sched-prio +kmod-sched-cake +gargoyle-firewall-util
MAINTAINER:=Eric Bishop
endef
diff --git a/package/qos-gargoyle/files/qos_gargoyle.init b/package/qos-gargoyle/files/qos_gargoyle.init
index 883bf30dc..952ed5994 100755
--- a/package/qos-gargoyle/files/qos_gargoyle.init
+++ b/package/qos-gargoyle/files/qos_gargoyle.init
@@ -389,6 +389,19 @@ initialize_qos()
$echo_off
if [ $total_upload_bandwidth -ge 0 ] ; then
+ cake_enabled_ul=$(uci get qos_gargoyle.upload.cake_enabled 2>/dev/null)
+ if [ "$cake_enabled_ul" = "1" ] ; then
+ ul_overhead=$(uci get qos_gargoyle.upload.cake_overhead 2>/dev/null)
+ cake_ul_opts="bandwidth ${total_upload_bandwidth}kbit diffserv4 nat"
+ [ "$ul_overhead" = "pppoe" ] && cake_ul_opts="$cake_ul_opts pppoe-ptm"
+ [ "$ul_overhead" = "vdsl" ] && cake_ul_opts="$cake_ul_opts atm overhead 32"
+ [ "$ul_overhead" = "ethernet" ] && cake_ul_opts="$cake_ul_opts overhead 18"
+ tc qdisc del dev $qos_interface root 2>/dev/null
+ $echo_on
+ tc qdisc add dev $qos_interface root cake $cake_ul_opts
+ $echo_off
+ fi
+ if [ "$cake_enabled_ul" != "1" ] ; then
#load upload classes
upload_class_list=$(load_all_config_sections "$config_file_name" "upload_class")
for uclass_name in $upload_class_list ; do
@@ -479,7 +492,7 @@ initialize_qos()
#of the bandwidth allocated to this class. To impliment per IP sharing of the class we use the flow classifier
#and the 'nfct-src' on the upload side and 'dst' on the download side. I found a nice man page here
#https://arndtroide.homelinux.org/cgi-bin/man/man2html?tc-sfq+8
-
+
#Add the leaf class
tc class add dev $qos_interface parent 1:1 classid 1:$next_class_index hfsc ls m2 ${m2}Mbit $ll_str $ul_str
#Add the qdisc to the leaf class, assuming average packet at 250 bytes.
@@ -537,19 +550,36 @@ initialize_qos()
# save current mark to connmark at end of chain
nft add rule inet fw4 mangle_qos_egress ct mark set ct mark \& $upload_mask_inv \| mark \& $upload_mask
+ fi
fi
#Only if both upload and download QoS are enabled can we enable Gargoyle active QoS monitor
if [ $total_download_bandwidth -eq 0 ] || [ $total_upload_bandwidth -eq 0 ] ; then
- qos_monenabled = "false" ;
+ qos_monenabled="false"
fi
if [ $total_download_bandwidth -ge 0 ] ; then
# Set up the Intermediate Functional block (IFB0) for ingress
ip link set $qos_ifb up
+ cake_enabled_dl=$(uci get qos_gargoyle.download.cake_enabled 2>/dev/null)
+ if [ "$cake_enabled_dl" = "1" ] ; then
+ dl_overhead=$(uci get qos_gargoyle.download.cake_overhead 2>/dev/null)
+ cake_dl_opts="bandwidth ${total_download_bandwidth}kbit diffserv4 nat ingress"
+ [ "$dl_overhead" = "pppoe" ] && cake_dl_opts="$cake_dl_opts pppoe-ptm"
+ [ "$dl_overhead" = "vdsl" ] && cake_dl_opts="$cake_dl_opts atm overhead 32"
+ [ "$dl_overhead" = "ethernet" ] && cake_dl_opts="$cake_dl_opts overhead 18"
+ tc qdisc del dev $qos_ifb root 2>/dev/null
+ $echo_on
+ tc qdisc add dev $qos_ifb root cake $cake_dl_opts
+ tc qdisc add dev $qos_interface handle ffff: ingress 2>/dev/null
+ tc filter add dev $qos_interface parent ffff: protocol ip u32 match u8 0 0 action mirred egress redirect dev $qos_ifb flowid ffff:1
+ tc filter add dev $qos_interface parent ffff: protocol ipv6 u32 match u8 0 0 action mirred egress redirect dev $qos_ifb flowid ffff:1
+ $echo_off
+ fi
+ if [ "$cake_enabled_dl" != "1" ] ; then
# Attach ingress queuing discipline to IFB0 with temporary default
tc qdisc add dev $qos_ifb root handle 1:0 hfsc default 1
@@ -575,7 +605,7 @@ initialize_qos()
if [ -z "$max_bandwidth" ] ; then
max_bandwidth="-1"
fi
-
+
classdef="$percent_bandwidth $max_bandwidth $min_bandwidth $minRTT"
eval $dclass_name=\"\$classdef\" #"#comment quote here so formatting in editor isn't FUBAR
done
@@ -600,8 +630,8 @@ initialize_qos()
#The Gargoyle ACC switches from optimum WAN utilization mode to minimum RTT mode
#when it detects a class has become active that includes a two part service curve.
- #So to trigger this behaviour we create two parts curves when minRTT is set.
-
+ #So to trigger this behaviour we create two parts curves when minRTT is set.
+
#Calculations for the delay parameter. Assuming PKT is the packet size the best we
#could possibly do is PKT/total_download_bandwidth. If we do nothing we get the
#worst delay of PKT/$m2 (the class bandwidth). Since this class has minRTT set we
@@ -645,7 +675,7 @@ initialize_qos()
tc class add dev $qos_ifb parent 1:1 classid 1:$next_class_index hfsc $rt_str $ll_str $ul_str
#Assume average download packet size is 250 bytes.
- tc qdisc add dev $qos_ifb parent 1:$next_class_index handle $next_class_index:1 sfq headdrop limit $(($tbw/250)) $sfq_depth divisor 256
+ tc qdisc add dev $qos_ifb parent 1:$next_class_index handle $next_class_index:1 sfq headdrop limit $(($tbw/250)) $sfq_depth divisor 256
tc filter add dev $qos_ifb parent 1:0 prio $next_class_prio protocol ip handle $next_classid/$download_mask fw flowid 1:$next_class_index
tc filter add dev $qos_ifb parent 1:0 prio $(($next_class_prio+1)) protocol ipv6 handle $next_classid/$download_mask fw flowid 1:$next_class_index
tc filter add dev $qos_ifb parent $next_class_index: handle 1 flow divisor 256 map key dst and 0xff
@@ -698,10 +728,11 @@ initialize_qos()
nft add rule inet fw4 mangle_qos_ingress ct mark set ct mark \& $download_mask_inv \| mark \& $download_mask
$echo_off
+ fi
fi
#Enable Gargoyle active QoS monitor
- if [ $total_upload_bandwidth -ge 0 ] && [ $total_download_bandwidth -ge 0 ] && [ "$qos_monenabled" = "true" ] ; then
+ if [ $total_upload_bandwidth -ge 0 ] && [ $total_download_bandwidth -ge 0 ] && [ "$qos_monenabled" = "true" ] && [ "$(uci get qos_gargoyle.download.cake_enabled 2>/dev/null)" != "1" ] ; then
$echo_on
#if the user specified a ping target then use that otherwise use the gateway.
@@ -714,27 +745,27 @@ initialize_qos()
if [ -z "$ptarget_ip" ] ; then
#ip of potential gateway
target=$(echo "$t" | awk '{ print $1 ; }')
- target_is_local=$(echo "$target" | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.|0\.0\.0\.0|127\.|255\.)')
+ target_is_local=$(echo "$target" | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.|0\.0\.0\.0|127\.|255\.)')
# round or rather ceil() time up to nearest millisecond since bash doesn't like working with decimals
time=$(echo "$t" | awk ' { print $3 ; }' | sed 's/\..*$//g')
time=$(( $time + 1 ))
-
+
if [ -z "$target_is_local" ] || [ "$time" -gt 5 ] ; then
ptarget_ip="$target"
fi
fi
done
IFS="$old_ifs"
-
+
#in case ping target is still not defined use default gateway
if [ -z "$ptarget_ip" ] ; then
ptarget_ip=$(gargoyle_header_footer -i gargoyle | sed -n 's/.*currentWanGateway.*"\(.*\)".*/\1/p')
fi
fi
-
+
#Ping responses from the ping target never go to ingress QoS (so their MARK isn't overwritten).
if [ "$(ip_family $ptarget_ip)" == "ipv4" ] ; then
nft insert rule inet fw4 mangle_qos_ingress icmp type echo-reply ip saddr $ptarget_ip return
@@ -834,9 +865,9 @@ define_interface()
get_current_qosmon_state()
{
# If we are coming from hotplug, we may be in the middle of an ifupdate where we could
- # skip the initial unloading and measurement of the link. This saves us a 15s dropout if we
+ # skip the initial unloading and measurement of the link. This saves us a 15s dropout if we
# don't need one
-
+
# Find the current qosmon target ping IP
qmoncurrenttarget="$(ps | grep [q]osmon | awk '
{
@@ -880,8 +911,8 @@ stop()
[ -e $bwmonscript ] && $bwmonscript "stop"
$echo_on
- #Delete the qdiscs we hung on the devices
- for iface in $(tc qdisc show | grep hfsc | awk '{print $5}'); do
+ #Delete the qdiscs we hung on the devices (hfsc or cake)
+ for iface in $(tc qdisc show | grep -E 'hfsc|cake' | awk '{print $5}'); do
tc qdisc del dev "$iface" root 2>/dev/null
tc qdisc del dev "$iface" ingress 2>/dev/null
done
@@ -908,7 +939,7 @@ start()
#This script is called by a hotplug event. If the WAN comes
#up fast we could end up trying to run qos_gargoyle while the
#boot is still in progress which causes issues in low memory
- #routers. To avoid this we check to see if rcS is still running
+ #routers. To avoid this we check to see if rcS is still running
#or not. If it is we wait until it completes or 60 seconds.
cnt=0
while ps | grep '[//]rcS S boot' >/dev/null
diff --git a/targets/mediatek/profiles/filogic/config b/targets/mediatek/profiles/filogic/config
index 4d33114a2..d1a20094a 100644
--- a/targets/mediatek/profiles/filogic/config
+++ b/targets/mediatek/profiles/filogic/config
@@ -3770,7 +3770,7 @@ CONFIG_PACKAGE_kmod-sched=m
# CONFIG_PACKAGE_kmod-sched-act-sample is not set
# CONFIG_PACKAGE_kmod-sched-act-vlan is not set
# CONFIG_PACKAGE_kmod-sched-bpf is not set
-# CONFIG_PACKAGE_kmod-sched-cake is not set
+CONFIG_PACKAGE_kmod-sched-cake=m
CONFIG_PACKAGE_kmod-sched-connmark=m
CONFIG_PACKAGE_kmod-sched-core=m
# CONFIG_PACKAGE_kmod-sched-ctinfo is not set