From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00056.outbound.protection.outlook.com [40.107.0.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 519863B29E for ; Fri, 22 Dec 2017 02:58:11 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kmf+daIVoB0x9bdM6GS3cHl+u6Olyfy299d6TKgwS30=; b=dZOWGs/iYa1xhkpjl/r+nT80PmUOkqJIVO/0nO3vXceOiMpSzzNvWB/EUFgEA7NuMAa0PXg0CiMhWeUNZLiUiVNZvWbDRPprhTdHYq+lLfD6PG5T5DUTzIhEkQQKIw2PSJkj18fRKUOYjhGknY0X8VdfP9Pq8KuchNLs10N7xXk= Received: from AM0PR0702MB3730.eurprd07.prod.outlook.com (52.133.51.23) by AM0PR0702MB3636.eurprd07.prod.outlook.com (52.133.50.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.3; Fri, 22 Dec 2017 07:58:09 +0000 Received: from AM0PR0702MB3730.eurprd07.prod.outlook.com ([fe80::d1fe:f3ea:349d:cb9a]) by AM0PR0702MB3730.eurprd07.prod.outlook.com ([fe80::d1fe:f3ea:349d:cb9a%13]) with mapi id 15.20.0366.003; Fri, 22 Dec 2017 07:58:09 +0000 From: Kevin Darbyshire-Bryant To: Jonathan Morton CC: Andy Furniss , "Cake@lists.bufferbloat.net" Thread-Topic: [Cake] overheads or rate calculation changed? Thread-Index: AQHTeD9kTHg0L/CIjUSYhLop9ZdEVaNM/AuAgAHyiYCAABYiAA== Date: Fri, 22 Dec 2017 07:58:09 +0000 Message-ID: <32730842-8E7E-4D9E-BF63-AF320906BB7E@darbyshire-bryant.me.uk> References: <31d49a5d-02a2-3dc8-a455-52d453b83bdf@gmail.com> In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [2a02:c7f:1232:22b::dc83] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR0702MB3636; 6:3z2Rue7m+4/5BmqfDLIwhNg5RnYGmUXaSGRaPBNbTfgFaZcFSfhHUE0FWm1VQsr08a13Kk/a0vTGcIBxTNzKpMU4OVDCGiraslSDRD0Hvtfh+lp0Ojm4MQlQZzXN4qg+2QvtDC4+vaXEgN+U+9aqK071PecdCRVei7OP2yaoJwKNxm4PqmzwDtQjjed3+xwVrbUcUWLMNaeNPk/o/cDxQdmen4+nrYzJmgzCF5Fapj3jpR5JHyeaLPA+sHAIuDPp8p4cac1yqAdt2XMwClWB5N8sTSJgMDFRAWDQmoeJau56fqRCDkJ/UNobI5ME2HVpFTZCLoJEGSt1uTIrIST9RoTdUBvzIdw1327JaCL1ii8=; 5:rE/BKoSBxQnT08pB9UVRyEDpR9H1h/UY4TgqMbgRvdIhMNOK14t5nU3g+p8+FL4kT+oyxof0JdTDPxtRq/LQwHRw8oqeOthNZkNmDIwiiVj8gbh0ZCIUpnGbMLX4dq5fTuzvVacoXQSTx4rmcTCGj1FidTnhm8V8W5RoGy3TYK4=; 24:/28Sl01ewi8h27dYXqLrV9pQROjsfkXIc7DnVk0Kw//PxezxX2bIfDUzDDQyjJe9Coaxms+rjFJWMzNbRjqRMOSB3xmnsqDTzSj1MJyCHsc=; 7:v4cIc/M1qCaXkHqXPYOz5rMUi3A+okdLHS5mld2BHTcsi+HI4rNgK8eiS0Vbc1xorbmK19rgzuwkrCdyuXmVxI7v7CAE0O/t+iauxpoytLceVqkARSinUhEF5X/V+RSbFFSAgM7oUyo7pWaiQxCyIxgM5e9A8RYNk5/LvwNRcFOIJL2KLKKAUjJfMOhsZvZPxEGb37eO+bZqJPUFeT1kZ3+TJNDjqEITjuP6QydUo2Vub49ASaRu9kBy8vT+nzKb x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-correlation-id: d015655f-7c76-4792-6e92-08d54911be13 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020020)(7021020)(4534040)(7022020)(4602075)(4603075)(4627136)(201702281549075)(7023020)(5600026)(4604075)(3008031)(2017052603307)(7153060)(49563074); SRVR:AM0PR0702MB3636; x-ms-traffictypediagnostic: AM0PR0702MB3636: authentication-results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(166708455590820); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(102415395)(6040470)(2401047)(5005006)(8121501046)(3231023)(944501039)(10201501046)(93006095)(93001095)(3002001)(6041268)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(201703061421075)(201703061406153)(2016111802025)(6072148)(6043046)(201708071742011); SRVR:AM0PR0702MB3636; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM0PR0702MB3636; x-forefront-prvs: 05299D545B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(39830400003)(346002)(376002)(366004)(39380400002)(199004)(189003)(24454002)(54906003)(5660300001)(14454004)(8676002)(4326008)(3660700001)(229853002)(36756003)(99936001)(966005)(82746002)(53936002)(42882006)(6246003)(6916009)(39060400002)(2950100002)(81166006)(6306002)(106356001)(2900100001)(5250100002)(74482002)(575784001)(8936002)(6512007)(1411001)(316002)(6486002)(33656002)(86362001)(6436002)(81156014)(83716003)(478600001)(2906002)(305945005)(3280700002)(6116002)(102836004)(68736007)(7736002)(76176011)(6506007)(105586002)(25786009)(97736004)(59450400001)(53546011)(99286004)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0702MB3636; H:AM0PR0702MB3730.eurprd07.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: multipart/signed; boundary="Apple-Mail=_BA5B6CD8-BF09-4597-A1CE-09161BF010EE"; protocol="application/pgp-signature"; micalg=pgp-sha256 MIME-Version: 1.0 X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-Network-Message-Id: d015655f-7c76-4792-6e92-08d54911be13 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Dec 2017 07:58:09.3915 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0702MB3636 Subject: Re: [Cake] overheads or rate calculation changed? X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Dec 2017 07:58:11 -0000 --Apple-Mail=_BA5B6CD8-BF09-4597-A1CE-09161BF010EE Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 22 Dec 2017, at 06:38, Jonathan Morton = wrote: >=20 >> On 21 Dec, 2017, at 2:54 am, Andy Furniss = wrote: >>=20 >> refactor cake_advance_shaper and ack_filter >>=20 >> cake_advance_shaper now returns a modified len argument to >> reflect cake_overhead. >> skb_ack_filter variable replaced with ack >=20 > Fixed. At one point cake_advance_shaper() was still getting a packet = length with overhead correction already applied, and was then applying = it a second time. I=E2=80=99m confused. A diff between where cobalt was yesterday and now = this morning: diff --git a/sch_cake.c b/sch_cake.c index 021b215..49ecf5e 100644 --- a/sch_cake.c +++ b/sch_cake.c @@ -151,6 +151,7 @@ struct cake_host { u32 dsthost_tag; u16 srchost_refcnt; u16 dsthost_refcnt; + u32 pad; }; struct cake_heap_entry { @@ -1882,10 +1883,6 @@ retry: b->tin_ecn_mark +=3D !!flow->cvars.ecn_marked; qdisc_bstats_update(sch, skb); - len =3D cake_overhead(q, qdisc_pkt_len(skb)); - flow->deficit -=3D len; - b->tin_deficit -=3D len; - /* collect delay stats */ delay =3D now - cobalt_get_enqueue_time(skb); b->avge_delay =3D cake_ewma(b->avge_delay, delay, 8); @@ -1894,7 +1891,10 @@ retry: b->base_delay =3D cake_ewma(b->base_delay, delay, delay < b->base_delay ? 2 : 8); - cake_advance_shaper(q, b, len, now, false); + len =3D cake_advance_shaper(q, b, len, now, false); + flow->deficit -=3D len; + b->tin_deficit -=3D len; + if (q->time_next_packet > now && sch->q.qlen) { u64 next =3D min(q->time_next_packet, = q->failsafe_next_packet); #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) @@ -1959,7 +1959,7 @@ static void cake_set_rate(struct cake_tin_data *b, = u64 rate, u32 mtu, */ static const u64 MIN_RATE =3D 64; u64 rate_ns =3D 0; - u8 rate_shft =3D 0; + u8 rate_shft =3D 2; cobalt_time_t byte_target_ns; u32 byte_target =3D mtu; pad is back, and rate_shft =3D 2 in addition to the document overhead = stuff moving. Is this a bad merge? Which is correct? If it helps, this is a list of the commits that are in post pull cobalt = but not in pre pull cobalt. commit dd4054684a9850d41f267f03ce758980cc4997c4 Author: Jonathan Morton Date: Fri Dec 22 08:36:07 2017 +0200 Fix overhead accounting after Dave's refactor. commit 718114af963740564e7d014b5e0d56ccc7387713 Merge: 8052827 49776da Author: Jonathan Morton Date: Fri Dec 22 08:33:36 2017 +0200 Merge branch 'cobalt' of https://github.com/dtaht/sch_cake into = cobalt commit 80528271b0eef37064b04d213071faf56f3f01bb Author: Jonathan Morton Date: Fri Jul 21 15:18:56 2017 +0300 Improve ingress-mode failsafe behaviour under sustained prior load. commit 06b301f3a0c7719bddfba4e7f71dc437ad53b88c Author: Jonathan Morton Date: Fri Jul 21 15:07:34 2017 +0300 Add a failsafe to ingress mode, so it always delivers some packets = even at high drop rates. commit 2ed46bba1a97feb6ce728abbfbf6d18211317f33 Author: Jonathan Morton Date: Sat May 13 00:07:14 2017 +0300 Try to solve higher sparse latency in ingress mode when non-ECN bulk = flows are present. commit 79b9b76b5dc65e8f8d629bbe636443bf04a6b37f Author: Jonathan Morton Date: Sat May 6 00:50:07 2017 +0300 Rate variables in diffserv_*() shouldn't be 64-bit; this causes = difficulty with dividing them on 32-bit platforms. commit 3ab36e8d8431eb941ceb0608b739fa02a325de88 Author: Jonathan Morton Date: Sat May 6 00:39:31 2017 +0300 Properly initialise the policy array. commit 833c87c20f5de0165957326677334009d10aed37 Author: Jonathan Morton Date: Fri May 5 22:53:59 2017 +0300 Try to handle decaying flows and packet trains more efficiently. commit 8978b2487b6adbc4f17612e5e123125971eed4fa Author: Jonathan Morton Date: Fri May 5 18:02:45 2017 +0300 Proper fix for diffserv-llt mode. Cheers, Kevin D-B 012C ACB2 28C6 C53E 9775 9123 B3A2 389B 9DE2 334A --Apple-Mail=_BA5B6CD8-BF09-4597-A1CE-09161BF010EE Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="signature.asc" Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEASyssijGxT6XdZEjs6I4m53iM0oFAlo8uxAACgkQs6I4m53i M0pxvRAAy3OeqCSl1VBffyzn19bvyCiDhwbLYOwIWA/AGwZA8xiEf/hzzQAtsaTE 9rESOHeBhie2gcsPxEClsjWMSSihB0gtOje9v/ibEfgzoIey6jjcba2f/uaJwnY2 If9Bpr94MJpIZ8E9K7Is6V1mdBOqE3PopF1k20HBNqAYn6xEyUYPoydBGWgtZJUR 7Kg1ffM2lavoZ9ZfP2ilhnvWiS42vSIV2TDryGW0HzOxGrQs+kScVWv/Ga1vJOg3 sKKex8Z4iXmqbJ3bK5fi1kBVXVwUi8NL+2FRmeQaG6Ib5J2nvEvQt5QUG04JJpqN kaJb3qw+fuWj15eAKULpu3QzsHxt5rBtsmH5RBX0dMlXH/qBSczRcPWAoeWsiB6n UmMBq+HXz8rKh4lXyQPbEC7nlnVeBWk9krCqrxBxx50XjPixFBZSL1g8/t1uTjyx gn9UeIV2Qe60Ga0VEgv+8uJAV30Pew6wxwyIMSe7BkIsHZ3S7w3mkXCDaOr22BaY QHTUu9p4OgAo4AXYNSXpdiJROWEX4mLvQXnrkLoGZ+AT2LS7CCaKTu8BzdPeKJNi G9wLvXKdYJLhMznf/cqsbAyNO7cuTtH6r6QAMRW5JoPnNrnayesOTEGhOqyceBQ9 6ROLEaKUpk8zQb06GTzzcJNHzpWPiOZ0mkmpzU+LzzQqRyPSLmY= =uuzT -----END PGP SIGNATURE----- --Apple-Mail=_BA5B6CD8-BF09-4597-A1CE-09161BF010EE--