From patchwork Thu Dec 2 12:37:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4882 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8Q5Q7Xz3wtT for ; Thu, 2 Dec 2021 12:37:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J4b8P2pgfz3hk; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J4b8P21YVz2ypP; Thu, 2 Dec 2021 12:37:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J4b8M4Yngz2xSB for ; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4J4b8M3Vs0z1X5; Thu, 2 Dec 2021 12:37:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=05Egxm8/JF3pGZcei3qiEEB8iWf1/CUBxbAalbZP+Wo=; b=8RWfFKoMig1LAOsTFcuuPXn4Cce1hk3oaxKAnzJWPN8IRKQTT1QiJdZAaUZKzIYFvFnT1N CFLSzpug5otZYhBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638448675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=05Egxm8/JF3pGZcei3qiEEB8iWf1/CUBxbAalbZP+Wo=; b=pEiqtoMzBIuamw5S0xT3UniklEv/lIfR2X9Hit6epftKLGvfGOZCkXDOcUcNVj2h70D7Cl 4Ec7lAJi8Og0RzXBI78g/1BGTdCwKY0WgTLnbOWJO0JwxmfEfnZ/pewxbG8MmiJ6QIKDLe 3dCdkdt7PqWKkbrKoqn7FUvW3YPe+u4zSJoRRtdNzAJ3wghqh/GD6eYUNthk7729GhAVCD xMInvx/qR0Ui/DaaF5rdbRCeGXIM2k+iHTJKgvWexVrAyFvgLNY3yhSMeD5oqV671G843n sM5eRRZbbfs9HToBr7N65Y5IzYt31HMU8Bq9deCXCccCNoVqE59m4OQNq/ujeA== From: Michael Tremer To: development@lists.ipfire.org Subject: [RFC PATCH 3/8] QoS: Replace fq_codel by CAKE Date: Thu, 2 Dec 2021 12:37:43 +0000 Message-Id: <20211202123748.2525617-3-michael.tremer@ipfire.org> In-Reply-To: <20211202123748.2525617-1-michael.tremer@ipfire.org> References: <20211202123748.2525617-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is just swappin the qdisc without any further configuration. Signed-off-by: Michael Tremer --- config/qos/makeqosscripts.pl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 3234ab366..442324b98 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -54,7 +54,7 @@ my $classfile = "/var/ipfire/qos/classes"; my $level7file = "/var/ipfire/qos/level7config"; my $portfile = "/var/ipfire/qos/portconfig"; my $tosfile = "/var/ipfire/qos/tosconfig"; -my $fqcodel_options = "limit 10240 quantum 1514"; +my @cake_options = (); # Define iptables MARKs my $QOS_INC_MASK = 0x0000ff00; @@ -200,7 +200,7 @@ foreach $classentry (sort @classes) if ($qossettings{'RED_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: cake @cake_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -371,7 +371,7 @@ foreach $classentry (sort @classes) if ($qossettings{'IMQ_DEV'} eq $classline[0]) { $qossettings{'DEVICE'} = $classline[0]; $qossettings{'CLASS'} = $classline[1]; - print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n"; + print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: cake @cake_options\n"; } } print "\n\t### FILTER TRAFFIC INTO CLASSES\n"; @@ -494,10 +494,7 @@ print </dev/null 2>&1 tc qdisc del dev $qossettings{'RED_DEV'} ingress >/dev/null 2>&1 - tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1 - tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 - tc qdisc del dev $qossettings{'IMQ_DEV'} ingress >/dev/null 2>&1 - tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1 + INTERFACE="$qossettings{'RED_DEV'}" ACTION="add" /lib/udev/network-aqm &>/dev/null # STOP IMQ-DEVICE ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 ip link del $qossettings{'IMQ_DEV'} >/dev/null 2>&1