QoS: Use Intermediate Functional Block

This is an alternative implementation to the Intermediate Queuing
Device (IMQ) which is an out-of-tree kernel patch and has been
criticised for being slow, especially with mutliple processors.

IFB is part of the mainline kernel and a lot less code.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 053b32161b6399abac588fac316f679de4fdde86..b25aad93a585a90469fc47a7c50aef35589fa519 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -406,10 +406,20 @@ print <<END
        ### $qossettings{'IMQ_DEV'}
        ###
 
+       tc qdisc del dev $qossettings{'RED_DEV'} root
+       tc qdisc del dev $qossettings{'RED_DEV'} ingress
+       tc qdisc add dev $qossettings{'RED_DEV'} handle ffff: ingress
+
        ### BRING UP $qossettings{'IMQ_DEV'}
-       modprobe imq numdevs=1 numqueues=\$(grep -c "^processor" /proc/cpuinfo || echo 1)
+       if [ ! -d "/sys/class/net/$qossettings{'IMQ_DEV'}" ]; then
+               ip link add name $qossettings{'IMQ_DEV'} type ifb
+       fi
+
        ip link set $qossettings{'IMQ_DEV'} up
 
+       tc filter add dev $qossettings{'RED_DEV'} parent ffff: protocol all u32 match u32 0 0 \\
+               action mirred egress redirect dev $qossettings{'IMQ_DEV'}
+
        ### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
        tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
        tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'}
@@ -510,7 +520,6 @@ print <<END
        iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN
        iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN
        iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN
-       iptables -t mangle -A POSTROUTING -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0
        iptables -t mangle -I FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
        iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
 
@@ -527,7 +536,6 @@ print <<END
        iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN
        iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN
        iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN
-       iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
        iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
        iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
 
@@ -688,16 +696,14 @@ print <<END
        tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1
        # STOP IMQ-DEVICE
        ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1
+
+       # REMOVE & FLUSH CHAINS
        iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN >/dev/null 2>&1
        iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN >/dev/null 2>&1
        iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN >/dev/null 2>&1
        iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN >/dev/null 2>&1
        iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN >/dev/null 2>&1
        iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN >/dev/null 2>&1
-       iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
-       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0  >/dev/null 2>&1
-       # rmmod imq # this crash on 2.6.25.xx
-       # REMOVE & FLUSH CHAINS
        iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1
        iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
        iptables -t mangle --flush  QOS-OUT >/dev/null 2>&1