summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Vyatta/Qos/FairQueueCodel.pm62
-rw-r--r--lib/Vyatta/Qos/Match.pm113
-rw-r--r--lib/Vyatta/Qos/ShaperClass.pm27
-rw-r--r--lib/Vyatta/Qos/Shared.pm13
4 files changed, 184 insertions, 31 deletions
diff --git a/lib/Vyatta/Qos/FairQueueCodel.pm b/lib/Vyatta/Qos/FairQueueCodel.pm
new file mode 100644
index 0000000..980cbeb
--- /dev/null
+++ b/lib/Vyatta/Qos/FairQueueCodel.pm
@@ -0,0 +1,62 @@
+# This is a wrapper around fq_codel queue discipline
+#
+#
+# **** License ****
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# This code was originally developed by Vyatta, Inc.
+# Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc.
+# All Rights Reserved.
+# **** End License ****
+
+package Vyatta::Qos::FairQueueCodel;
+
+use strict;
+use warnings;
+
+require Vyatta::Config;
+
+# Fair Queue Codel
+# Uses fq_codel
+
+my %fields = (
+ _limit => undef,
+ _flows => undef,
+ _target => undef,
+ _interval => undef,
+ _quantum => undef,
+);
+
+sub new {
+ my ( $that, $config ) = @_;
+ my $class = ref($that) || $that;
+ my $self = {%fields};
+
+ $self->{_limit} = $config->returnValue('queue-limit');
+ $self->{_flows} = $config->returnValue('flows');
+ $self->{_target} = $config->returnValue('target');
+ $self->{_interval} = $config->returnValue('interval');
+ $self->{_quantum} = $config->returnValue('quantum');
+ return bless $self, $class;
+}
+
+sub commands {
+ my ( $self, $dev ) = @_;
+
+ print "qdisc add dev $dev root fq_codel";
+ print " limit $self->{_limit}" if ( $self->{_limit} );
+ print " flows $self->{_flows}" if ( $self->{_flows} );
+ print " target $self->{_target}" if ( $self->{_target} );
+ print " interval $self->{_interval}" if ( $self->{_interval} );
+ print " quantum $self->{_quantum}" if ( $self->{_quantum} );
+ print " noecn\n";
+}
+
+1;
diff --git a/lib/Vyatta/Qos/Match.pm b/lib/Vyatta/Qos/Match.pm
index c8078b6..2b22c30 100644
--- a/lib/Vyatta/Qos/Match.pm
+++ b/lib/Vyatta/Qos/Match.pm
@@ -26,7 +26,7 @@ sub getPort {
if ( $str =~ /^([0-9]+)|(0x[0-9a-fA-F]+)$/ ) {
die "$str is not a valid port number\n"
- if ( $str <= 0 || $str > 65535 );
+ if ( $str <= 0 || $str > 65535 );
return $str;
}
@@ -47,8 +47,8 @@ sub new {
# special case for match all
unless ($config) {
- $self->{'ether'} = { protocol => 'all' };
- return $self;
+ $self->{'ether'} = { protocol => 'all' };
+ return $self;
}
foreach my $af (qw(ip ipv6 ether)) {
@@ -88,7 +88,7 @@ sub new {
}
}
- # if the hash is empty then we didn't generate a match rule
+ # if the hash is empty then we didn't generate a match rule
# this usually means user left an uncompleted match in the config
my @keys = keys(%fields);
if ($#keys < 0) {
@@ -120,6 +120,82 @@ sub new {
return $self;
}
+sub small_ip_filter {
+ my ( $dev, $parent, $prio, $classid ) = @_;
+ my $protoip = "ip";
+ my $synack = 2; # hash table id, arbitrary number
+ $parent = sprintf("%x", $parent);
+ $classid = sprintf("%x", $classid);
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32\n";
+ # make a linked hash table
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip handle $synack: u32 divisor 1\n";
+ # tcp syn bit
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32 ht $synack:";
+ print " match u8 0x02 0x02 at 13";
+ print " flowid $parent:$classid\n";
+ # tcp ack bit
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32 ht $synack:";
+ print " match u8 0x10 0x10 at 13";
+ print " flowid $parent:$classid\n";
+ # ipv4/icmp
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32";
+ print " match ip protocol 1 0xff";
+ print " flowid $parent:$classid\n";
+ # ipv4/tcp, total len<256, tos=0x10 == minimum delay
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32";
+ print " match ip protocol 6 0xff";
+ print " match u16 0x0000 0xff00 at 2";
+ print " match ip tos 0x10 0xff";
+ print " flowid $parent:$classid\n";
+ # ipv4/tcp, total len<128, not fragmented
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip u32";
+ print " match ip protocol 6 0xff";
+ print " match u16 0x0000 0xff80 at 2";
+ print " match ip nofrag";
+ print " offset at 0 mask 0x0f00 shift 6 eat";
+ print " link $synack:\n";
+}
+
+sub small_ip6_filter {
+ my ( $dev, $parent, $prio, $classid ) = @_;
+ my $protoip6 = "ipv6";
+ my $synack6 = 3; # hash table id, arbitrary number
+ $parent = sprintf("%x", $parent);
+ $classid = sprintf("%x", $classid);
+ # setup base filter
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32\n";
+ # make a linked hash table
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 handle $synack6: u32 divisor 1\n";
+ # tcp syn bit
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32 ht $synack6: ";
+ print " match u8 0x02 0x02 at 13";
+ print " flowid $parent:$classid\n";
+ # tcp ack bit
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32 ht $synack6:";
+ print " match u8 0x10 0x10 at 13";
+ print " flowid $parent:$classid\n";
+ # ipv6/icmpv6
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32";
+ print " match ip6 protocol 58 0xff";
+ print " flowid $parent:$classid\n";
+ # ipv6/tcp, payload len<128, priority=0x10 == minimum delay
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32";
+ print " match ip6 protocol 6 0xff";
+ print " match u16 0x0000 0xff80 at 4";
+ print " match ip6 priority 0x10 0xff";
+ print " flowid $parent:$classid\n";
+ # ipv6/tcp, payload len<64, not fragmented since the next header is a tcp header
+ # this does not handle packets with other ipv6 extension headers that might be
+ # present between the ipv6 header and the tcp header
+ print "filter add dev $dev parent $parent: prior $prio protocol $protoip6 u32";
+ print " match ip6 protocol 6 0xff";
+ print " match u16 0x0000 0xffc0 at 4";
+ print " offset plus 40 eat";
+ print " link $synack6:\n";
+}
+
+
+
sub filter {
my ( $self, $dev, $parent, $classid, $prio, $dsmark, $police ) = @_;
@@ -134,9 +210,9 @@ sub filter {
next unless $ip && $$ip{dsfield};
printf "filter add dev %s parent %x: protocol %s prio %d",
- $dev, $parent, $ipver, $prio;
+ $dev, $parent, $ipver, $prio;
printf " handle %s tcindex classid %x:%x\n",
- $$ip{dsfield}, $parent, $classid;
+ $$ip{dsfield}, $parent, $classid;
$prio += 1;
}
@@ -148,12 +224,18 @@ sub filter {
my $p = $self->{$proto};
next unless $p;
+ if (defined($$p{small})) {
+ small_ip_filter($dev, $parent, $prio, $classid) if ($proto eq 'ip');
+ small_ip6_filter($dev, $parent, $prio, $classid) if ($proto eq 'ipv6');
+ next;
+ }
+
printf "filter add dev %s parent %x: prio %d", $dev, $parent, $prio;
if ( $proto eq 'ether' ) {
my $type = $$p{protocol};
$type = 'all' unless $type;
- print " protocol $type u32";
+ print " protocol $type u32";
if ( defined( $$p{src} ) || defined( $$p{dst} ) ) {
print " match ether src $$p{src}" if $$p{src};
print " match ether dst $$p{dst}" if $$p{dst};
@@ -211,8 +293,8 @@ sub filter {
}
}
- print " match mark $fwmark 0xff" if $fwmark;
- print " $police" if $police;
+ print " match mark $fwmark 0xff" if $fwmark;
+ print " $police" if $police;
printf " flowid %x:%x\n", $parent, $classid;
return;
}
@@ -221,18 +303,17 @@ sub filter {
my $vif = $self->{_vif};
if ( defined($vif) || defined($indev) ) {
printf "filter add dev %s parent %x: prio %d", $dev, $parent, $prio;
- print " protocol all basic";
- print " match meta\(rt_iif eq $indev\)" if $indev;
- print " match meta\(vlan mask 0xfff eq $vif\)" if $vif;
- print " match meta\(fwmark eq $fwmark\)" if $fwmark;
-
- print " $police" if $police;
+ print " protocol all basic";
+ print " match meta\(rt_iif eq $indev\)" if $indev;
+ print " match meta\(vlan mask 0xfff eq $vif\)" if $vif;
+ print " match meta\(fwmark eq $fwmark\)" if $fwmark;
+ print " $police" if $police;
printf " flowid %x:%x\n", $parent, $classid;
}
elsif ($fwmark) {
printf "filter add dev %s parent %x: prio %d", $dev, $parent, $prio;
printf " protocol all handle %d fw", $fwmark;
- print " $police" if $police;
+ print " $police" if $police;
printf " flowid %x:%x\n", $parent, $classid;
}
}
diff --git a/lib/Vyatta/Qos/ShaperClass.pm b/lib/Vyatta/Qos/ShaperClass.pm
index 4d3cf33..a7d9b22 100644
--- a/lib/Vyatta/Qos/ShaperClass.pm
+++ b/lib/Vyatta/Qos/ShaperClass.pm
@@ -51,7 +51,7 @@ sub new {
$self->{_qdisc} = $config->returnValue("queue-type");
$self->{_avgpkt} = $config->returnValue("packet-length");
$self->{_latency} = $config->returnValue("latency");
- $self->{_quantum} = $config->returnValue("quantum");
+ $self->{_quantum} = $config->returnValue("quantum");
$self->{dsmark} = getDsfield( $config->returnValue("set-dscp") );
my @matches = _getMatch("$level match");
@@ -94,7 +94,7 @@ sub _getPercentRate {
}
return ( $percent * $speed ) / 100.;
- }
+ }
return getRate($rate);
}
@@ -122,6 +122,14 @@ sub sfqQdisc {
print "\n";
}
+sub codelQdisc {
+ my ( $self, $dev, $rate ) = @_;
+
+ print "fq_codel";
+ print " limit $self->{_limit}" if ( $self->{_limit} );
+ print " noecn\n";
+}
+
sub sfqValidate {
my ( $self, $level ) = @_;
my $limit = $self->{_limit};
@@ -178,15 +186,15 @@ sub redQdisc {
sub redValidate {
my ( $self, $level, $rate ) = @_;
- my $limit = $self->{_limit}; # packets
- my $thresh = redQsize($rate); # bytes
+ my $limit = $self->{_limit}; # packets
+ my $thresh = redQsize($rate); # bytes
my $qmax = POSIX::ceil($thresh / AVGPKT); # packets
if ( defined($limit) && $limit < $qmax ) {
print STDERR "Configuration error in: $level\n";
printf STDERR
"The queue limit (%d) is too small, must be %d or more when using random-detect\n",
- $limit, $qmax;
+ $limit, $qmax;
exit 1;
}
@@ -194,16 +202,17 @@ sub redValidate {
my $minbw = ( 3 * AVGPKT * 8 ) / LATENCY;
print STDERR "Configuration error in: $level\n";
- printf STDERR
+ printf STDERR
"Random-detect queue type requires effective bandwidth of %d Kbit/sec or greater\n",
$minbw;
- exit 1;
+ exit 1;
}
}
my %qdiscOptions = (
'priority' => \&prioQdisc,
'fair-queue' => \&sfqQdisc,
+ 'fq-codel' => \&codelQdisc,
'random-detect' => \&redQdisc,
'drop-tail' => \&fifoQdisc,
);
@@ -264,7 +273,7 @@ sub gen_class {
# Hack to avoid kernel HTB message if quantum is small.
# Only occurs if link speed is high and offered bandwidth is small.
if ( defined($r2q) && !defined($quantum) && ($rate / 8) / $r2q < MINQUANTUM ) {
- $quantum = MINQUANTUM;
+ $quantum = MINQUANTUM;
}
printf "class add dev %s parent %x:1 classid %x:%x %s",
@@ -272,7 +281,7 @@ sub gen_class {
print " rate $rate" if ($rate);
print " ceil $ceil" if ($ceil);
- print " quantum $quantum" if ($quantum);
+ print " quantum $quantum" if ($quantum);
print " burst $self->{_burst}" if ( $self->{_burst} );
print " prio $self->{_priority}" if ( $self->{_priority} );
diff --git a/lib/Vyatta/Qos/Shared.pm b/lib/Vyatta/Qos/Shared.pm
index 2a0fc3d..2b13b04 100644
--- a/lib/Vyatta/Qos/Shared.pm
+++ b/lib/Vyatta/Qos/Shared.pm
@@ -28,21 +28,22 @@ our @EXPORT =
qw(find_policy interfaces_using get_policy_names list_policy %policies);
use base qw(Exporter);
-our %policies = (
+our %policies = (
'out' => {
'shaper-hfsc' => 'HFSCShaper',
'shaper' => 'TrafficShaper',
'fair-queue' => 'FairQueue',
+ 'fq-codel' => 'FairQueueCodel',
'rate-control' => 'RateLimiter',
'drop-tail' => 'DropTail',
'network-emulator' => 'NetworkEmulator',
'round-robin' => 'RoundRobin',
'priority-queue' => 'Priority',
'random-detect' => 'RandomDetect',
- },
+ },
'in' => {
'limiter' => 'TrafficLimiter',
- }
+ }
);
# find policy for name - also check for duplicates
@@ -106,12 +107,12 @@ sub get_policy_names {
$config->setLevel('traffic-policy');
- foreach my $direction ( @args ) {
+ foreach my $direction ( @args ) {
my @qos = grep { $policies{$direction}{$_} } $config->$listNodes();
foreach my $type (@qos) {
my @n = $config->$listNodes($type);
- push @names, @n;
- }
+ push @names, @n;
+ }
}
return @names;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 00:43:34 +0000