From patchwork Mon Oct 4 17:52:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4760 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 4HNSx5053Sz3xCR for ; Mon, 4 Oct 2021 17:52:57 +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 4HNSx1566Qz35q; Mon, 4 Oct 2021 17:52:53 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HNSx1308Mz32Kb; Mon, 4 Oct 2021 17:52:53 +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 4HNSx00k7Mz2xd1 for ; Mon, 4 Oct 2021 17:52:52 +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 4HNSwz6fPGz131; Mon, 4 Oct 2021 17:52:51 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1633369972; 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=rmIkiq5RKPrcu8Vb3YTeL74kfA764H0lziRz1K8QUNI=; b=vQ1ekYeglcfic3+j0ikciGkHn5mrkIxCAz7XZp+EGg1EVMJLfUDi/45XI1THHCCcQJV/jE N5W20A5196RfPgCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1633369972; 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=rmIkiq5RKPrcu8Vb3YTeL74kfA764H0lziRz1K8QUNI=; b=WMrBJxTEOryMeNyjNYnmnEN9I4tkL0zB5R09WqNPEGqFKUv/+oR1OQ06Tr4WTwd13U2Khi IdLLSjeKYhdY3nvcJ0Z9M1c/dkw1Su6X6kkyvZQOtAbhbcIXU4MK0T8iPKnh0sNxH7nC0L ZKBBKzW2g5Bc7TdWQfYhfwuo2UqCU7JyxsPVpCt2NDjd0Lq7AFaYoUqj7teDBPYnh3K/fi sj9xNcPL7R/a3f19e63JJBPP8EnP/S3vk0wvyi+SXPte0zJ/zgdTjCAYEYf1mWlf0wNo1r 5RXQHDHTSgcdO0kTk8SQhHv0PCARf2GQ9nRUdGwqInyjFv0diecR/ExLm8W6Pw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/6] QoS: Drop support for hardcoded ACK rules Date: Mon, 4 Oct 2021 18:52:20 +0100 Message-Id: <20211004175222.9208-4-michael.tremer@ipfire.org> In-Reply-To: <20211004175222.9208-1-michael.tremer@ipfire.org> References: <20211004175222.9208-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 feature has to go in order to take advantage of CONNMARK which will drastically decrease CPU load when passing packets. We no longer will see every packet in the QOS-INC chain in order to change classification of that packet. It is also party counter-intuitive to have parts of one connection in one class and the corresponding ACK packets in another. Signed-off-by: Michael Tremer --- config/qos/makeqosscripts.pl | 27 --------------------------- html/cgi-bin/qos.cgi | 22 ++-------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 5bdd5b811..230dc3265 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -72,7 +72,6 @@ $qossettings{'DEF_OUT_SPD'} = ''; $qossettings{'DEF_INC_SPD'} = ''; $qossettings{'DEFCLASS_INC'} = ''; $qossettings{'DEFCLASS_OUT'} = ''; -$qossettings{'ACK'} = ''; $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`; $qossettings{'IMQ_DEV'} = 'imq0'; $qossettings{'TOS'} = ''; @@ -80,7 +79,6 @@ $qossettings{'VALID'} = 'yes'; &General::readhash("${General::swroot}/qos/settings", \%qossettings); -my $ACK_MARK = ($qossettings{'ACK'} << $QOS_OUT_SHIFT) . "/$QOS_OUT_MASK"; my $DEF_OUT_MARK = ($qossettings{'DEFCLASS_OUT'} << $QOS_OUT_SHIFT) . "/$QOS_OUT_MASK"; my $DEF_INC_MARK = ($qossettings{'DEFCLASS_INC'} << $QOS_INC_SHIFT) . "/$QOS_INC_MASK"; @@ -224,31 +222,6 @@ print < @@ -668,7 +666,6 @@ END
$Lang::tr{'downlink std class'}: $qossettings{'DEFCLASS_INC'}
$Lang::tr{'uplink std class'}: $qossettings{'DEFCLASS_OUT'} -
ACKs: $qossettings{'ACK'}
@@ -692,7 +689,7 @@ if ( ($qossettings{'OUT_SPD'} eq '') || ($qossettings{'INC_SPD'} eq '') ) { exit } -if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq '') || ($qossettings{'ACK'} eq '') ) { +if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq '') ) { &changedefclasses(); &Header::closebigbox(); &Header::closepage(); @@ -742,21 +739,6 @@ END else { print "\n"; } } print <  - -
- -
$Lang::tr{'enter ack class'} -
ACKs: