From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0074.outbound.protection.outlook.com [104.47.1.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id AA7AF3B260 for ; Wed, 28 Sep 2016 00:38:22 -0400 (EDT) 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=Skaz2+bUAPvVjXuvR58+soiPseieM7Ika7AEzn9Xz+0=; b=SVD7zAc9jNDuVVuwwXbK3fIRuxiyertwMGffZaeSL5tPqDTpofVE1nWcM48DmnKLEPwRi61NjLN2KAyZhaG+7+oRfMbpfq04Mdw5VCuyGPOz/b1BVSbc17VWQsTezdH8hy+xcap7Efs3j0+Rdv4fQfqaafzf0n2aGvdP5yVUTMs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from [10.102.24.2] (109.159.227.69) by AMXPR07MB118.eurprd07.prod.outlook.com (10.242.70.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5; Wed, 28 Sep 2016 04:38:20 +0000 To: References: <3a99770e-6350-471f-72b6-b209d7d77d75@darbyshire-bryant.me.uk> <83b95479-c1f5-3589-912c-abe427805449@gmail.com> <43fa53d7-6180-09fe-9581-29d7dedba3d9@darbyshire-bryant.me.uk> <25bd19bb-b5c7-fd68-62c9-b8e67590ab44@gmail.com> From: Kevin Darbyshire-Bryant Message-ID: Date: Wed, 28 Sep 2016 05:38:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <25bd19bb-b5c7-fd68-62c9-b8e67590ab44@gmail.com> Content-Type: multipart/mixed; boundary="------------E8EDEBD617960796C74EA697" X-Originating-IP: [109.159.227.69] X-ClientProxiedBy: DB5PR08CA0054.eurprd08.prod.outlook.com (10.166.166.150) To AMXPR07MB118.eurprd07.prod.outlook.com (10.242.70.144) X-MS-Office365-Filtering-Correlation-Id: d6040db2-a7eb-43bf-6b80-08d3e759466e X-Microsoft-Exchange-Diagnostics: 1; AMXPR07MB118; 2:FGPnXdD/kuKvIksk0GI7X+C/fqBXMMEN0retnuDgSa6/YAPAdsEm6dyMp6TeoyrS+s87Acslvpju3VLzvr9LEHuGP+Y/dI9DSlcpiJDkX8brN+V2fXhFXv8O0rsgocDtc6dmwMUYrHc8Te1sRapMkH71zrqgJUF0xD2lV35sTItzTCx4OGM416D2qzva1tt8; 3:eqeLXwSaJRKb4JegcXN1/szzLEyIb1fzBxW/ci4Y5kgQGKQDB4+n0J+PZ5g25i0F2I7ldjKBkXsC0dGgbqB++VXsIAJziQ/RUwHOZ2sYEv04cSWlDOEGTqwuaj2PbtyN; 25:U+w2aNRtnSz/ic8IURwGuZHXpwlcCJKkIvThtkHcX0lhA57zX2vLPomGOD5y+Q5IXV+gvs643uzjSVFz70PDSOkrHbhfF1wIMxhfd3BmYrN838fHPDe5B0sgPoViG55TFLEshPWjf3fCqJHaUBxyRmUETqLL14ZUhB9ipONHXuQixoiWt4wsQCu7DFymtl2ZkV4BnsxWdqflZqPYGhBE/XFAf/iSfF60sFdqgNPr405wYtFzahZZWNScgnF7QoM7fgvFKREzRKGhAmRjtNtRFdr8juA4r0m7sbB217iJXuIW3OgyQ6GIWe95DL9rQdR1/unZpCY9QoTx+L4J+NBqCcXw7DIDeK+IWR2KuMIaiGf5rUf7upZMBLqz5CqarPFhu4W61XOgXfRevw8PezFSceqGDQ0tdmld//JWX19smKw9Ygz5xT7aK8jjeZGuAR0T/DDtUSf+A/TZP33m5HD8Y80gNlNC2aj37GAgRe+OvziNVikLxDQ6AXNj62Vd6985 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AMXPR07MB118; X-Microsoft-Exchange-Diagnostics: 1; AMXPR07MB118; 31:XzV8OrQArInTRUpI97A0VepEA1AJg9eMjizbrx8TkGY0FoQ8HNbVpsv0p9PxtbBmdWzGY5+N7tCcGGkiXB7ftCUsTplHWfeUHYJ77U6Dckm8qsf65oJprXPY4PcMhAn31IB661MKPAM3jONIQ60FmaCQX3GiFh75ZI26A61PEYVGOHVMO0A2mSVEDNZPiDgnrp9b78luy7viPiR7OcPoZ8ID4ARmPaehMkBocKC2QzBOUEM1hkgbsNXi5YW7iKv2; 4:1//+tEI7WZk8x1krDRm5xJLI0H+Cim1ThnfqOwTzn6c9m6rP0GGC2C6fq6lkvWSXAkXPuDeoDFSghytyvGAaX2uj1Opk1hED1TYKigp2AiZnM7yhHAGHmc7SfnuK+AY/RcNTfbNWxq4WHkQ1p/iKAmwUX1xdoAgfuux15SKKgRjDW5TX4KCjt7mx8F3Lp+e3raCQSAC/koeWFrZDxFZ5NYHpq7sNUTGtz84jw2PhQMoQGrhFP6+K+wWHFJsZgsu2vBuUHK3vrRGu39WCwawtziPcBaxrs/ewqmv930J5xLhrxKOzgK1JPsAmQTzYi0y+VcYlbuSBMyvlcazTDouuc68WuO3dPtU4nSUvlwUHV7j1LBd9+LdfNKO066xgN+uteQi0068xuDn2bQjjXxgJUSI7uvTS0yzBQ1+mXoM4eaXbdOl8Z/9hKOTgCbBcspyMkolD5n+lutbouXfjKgyUPWM+SJ7X9zQ5NqkgheEV+yc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(166708455590820); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(102415321)(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6043046)(6042046); SRVR:AMXPR07MB118; BCL:0; PCL:0; RULEID:; SRVR:AMXPR07MB118; X-Forefront-PRVS: 0079056367 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6049001)(6009001)(7916002)(199003)(189002)(24454002)(7846002)(2906002)(50986999)(54356999)(76176999)(74482002)(77096005)(15975445007)(19580395003)(107886002)(4001350100001)(2351001)(189998001)(450100001)(105586002)(512874002)(101416001)(97736004)(42186005)(31686004)(83506001)(65826007)(4610100001)(33646002)(36756003)(5660300001)(5890100001)(81156014)(8676002)(81166006)(5000100001)(93886004)(92566002)(586003)(84326002)(2476003)(65806001)(65956001)(106356001)(64126003)(68736007)(66066001)(6116002)(568964002)(7736002)(110136003)(270700001)(3846002)(86362001)(2950100002)(42882006)(31696002)(305945005)(345774005)(6916009); DIR:OUT; SFP:1101; SCL:1; SRVR:AMXPR07MB118; H:[10.102.24.2]; 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) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AMXPR07MB118; 23:ZLk7LCrza87ksKRlNhEwsD/EJNnIgilONG0N+lCRE+?= =?us-ascii?Q?Ij4sgSXTH4X9yeefAwwcMnZSk4Gwrakqhrg51kSzUIZNF4Oww25ilgYmME42?= =?us-ascii?Q?AZAiFZqNyTrWZ0PHnKO+RpsTh8J4I4YG9PTrPcX6YOHBxBo/weqQZ4+XXPMB?= =?us-ascii?Q?leP9RLOPd9108rcXEb2ZD0MxSHUqEZHr2Aom+ba6Ew8DbAphtG9ro1avJo8p?= =?us-ascii?Q?T8iR1YKnvoEGfU1i70aej8YZPMOEe8NNJ3EgLRAs6yk/WYAJTIMKd0/C9Rsf?= =?us-ascii?Q?W9Z7y/Jyb3hC/7kEjg7BN+r5wPcq3xWaTyw8JPjOV+0gtwDFdlUn8RJfJVNd?= =?us-ascii?Q?/e0GDsYF72Z7nEYlRdD5WZJd3FXwmSFh3360XeHC8bGdAodC+3xtuIHJh1oS?= =?us-ascii?Q?nYPhtRj/gGhVjEEwTvBK1eaEHb9yGTPQux1WwbyRenRogjoQpWstT9wcIDOz?= =?us-ascii?Q?v/R13OmoPLVWRuX5khRXTjr4bwqisoKo+vnuR9o/EbLn/+ntSgiPkHoqDqgv?= =?us-ascii?Q?lGyseMDg5sA9AQNvDYiU8lMr0o5RaXjhzN6+0b0q8lhFG9Oi4ETjkGc5nsDc?= =?us-ascii?Q?Ty92KCIm0F1Y9+h8CLz59ggT38nekBxT0hA4B9rqbqmpixT5HJHlGEtWtICA?= =?us-ascii?Q?lt7ck09DdYhjolIYdfNJj9A569fZxGscv9O5bImhBZicAhYVeJ7YPJapSv6N?= =?us-ascii?Q?w5c1jMUWbV9op/iolKabRwu8JVkGEarnppMYAwm+x8xlpxTDzo5t7RKw5qOs?= =?us-ascii?Q?u3nVFniN21uUFjQ+eB0HYUsbusFQ3h9hPjHMhUnOVBiWacCyGSz8NBPBECWu?= =?us-ascii?Q?o2JXOudYWOPY+XuZydlLkQ6yuyj1EdpT5NyNGhH+JxQDi7dHIELLBXiIOncb?= =?us-ascii?Q?e0QguAiOuoGMUZRyUPEa9yWa9+rQo8uDqNwLSSCLLw1e8XuHLfANHF49NC7a?= =?us-ascii?Q?aFxga8VjAvEWN8XXAAXjsjeTH7fGwJot7lOqP0nPQma0WuzKa2jJXl1q/8rk?= =?us-ascii?Q?41nAKqariBEE4X+18jJDlxom+xl0jx64olOVylGAdTtkERzfnVmaVy82R5Eb?= =?us-ascii?Q?nHtbihIEpaidpGwr91QazeCBLbHSUoZ8mGIGgkEicxuGxZZl1Ostls4HrwZA?= =?us-ascii?Q?MCsNw51OUyXWaW8W07lt5IEqySbdBZDlP5j1BJUdKpB+f3L1aVxQXezNWrWf?= =?us-ascii?Q?TZqQ85MlFl8+RoK+CbzqglZ1AzZnei/nMeoXemJ7Ja3wzgkPlTLgPh7go6VR?= =?us-ascii?Q?O6FRpMyc7HCYSvQCngj95eg/dGYpaOh9V62ppTKA1lerdn8tbMHAjTxkXxfo?= =?us-ascii?Q?SEo6D07XrGoklgJgJsYhfUnobiBihIpNSkARg4FGxP8NpuCxYk2bAEKMq2nI?= =?us-ascii?Q?uZ01J9vZd7ge1PzoTlQM2ltJ5g8VKZ9n5jlPOJq0l+pMaHcaM6jGznF2+7Bi?= =?us-ascii?Q?xGFMZaW7HVzem6lJpIk4LwzHntJShDZJVitlz7aokPcEXC3xcBDVoTqlmv6P?= =?us-ascii?Q?XKPjBsWHcowkm/GkX1Tft8hgWCbFSV+U6LaB53Fxrr/TBVhFC1iIVU?= X-Microsoft-Exchange-Diagnostics: 1; AMXPR07MB118; 6:mvHICLi4UFEXn8sxiwuojbaiHG1RrsAegHMpvY0eQ1/TwEsOgeRMD6Y1WPam8x8YVZReQnCb0MiYbkHsQL2aahEFg6tlC6ED3Y9bluGnuB8GE9vvF81X95bFEMCTWn8rTeQEHapf7R6GA2HeJmxMXJkVCHGm2vxob07ZMTjIsCVwQaIZsr01hsa4qEpyHhhkUkrQIaU/1UgQEkI0A7VgGl1KeFeqv/9ULfG/NzinawqWsYaDyDhEDxI+9TcRGASiiBbxIKVL0zNF7MyMCNpKBfuyXjpTnJgyCqzsA9dLSOTQo2Lu54HxGmvm8bGx8nhx; 5:/OqXvXQt1Twx87/W2CsaBuTTLLB6siTK9DaaL1/wPr4+wUv6Fm4OTj+ZP0xvFXdG+Yiljy2yCuxobzjdU9FkHprxkuxhNL8G4tb7GRHAOcQbvNi9csEvaqvq1ct7NJKOikvZyUpLbGUZSGwG1ozv8g==; 24:Vx9vHeBy2VVegg9lkkSqldwIPgLJ1XpgwcZKUuS6YK5yz0sSP26h+uX2tccF/VqWF+bBLaeQ9JVvD5sfNhmm/guroIy/dRaOA8b6DyPHHUw=; 7:rhCmPLn3bactGows/C/I/jgP2f/PpEETG4RgMCH5OMKTzlUFPQ2IslIOUXxa3BVBf6EQaRNiVuPjOAAfN+n7MwxPmKtFPf6FhwM7pPqqmyml3U/N1DCKSL3bqZJeGR2AQyz0viTTezqgxV2Wqk6lfP8ZBFWn68BlrJf06Bgz7ukT1D9/dTV1vfrUTvapOUrqO854ikPKVapeFnk6Mq9SyP9XsojQ6x55V4pVPPN9sUxHAp+6ObrnKTNCK3DxpTZgI1N4zqzsYaz0DZqJxs3Ae6UAk3nGWfSVL4abU0COKTOOzFWNafSYfbqu8bRkLWth SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2016 04:38:20.8069 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMXPR07MB118 Subject: Re: [Cake] de-natting & host fairness 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: Wed, 28 Sep 2016 04:38:23 -0000 --------------E8EDEBD617960796C74EA697 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit On 27/09/16 21:40, Noah Causin wrote: > Thank you for all your help. > > The de-nat with dual-flow isolation works great. I tested it > simultaneously with two separate virtual machines, one running a Flent > 50 flows download test and the other running a Flent 8 flows download > test. Throughput was even between the machines, and the latency was great. > > Noah Causin A new tc patch for when you update to Jonathan's re-working of things found at https://github.com/dtaht/sch_cake/commits/cobalt I'll try to push this into LEDE properly in a few days unless somebody finds a nasty lurking :-) Kevin --------------E8EDEBD617960796C74EA697 Content-Type: text/x-patch; name="950-add-cake-to-tc.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="950-add-cake-to-tc.patch" --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h @@ -850,4 +850,57 @@ struct tc_pie_xstats { __u32 maxq; /* maximum queue size */ __u32 ecn_mark; /* packets marked with ecn*/ }; + +/* CAKE */ +enum { + TCA_CAKE_UNSPEC, + TCA_CAKE_BASE_RATE, + TCA_CAKE_DIFFSERV_MODE, + TCA_CAKE_ATM, + TCA_CAKE_FLOW_MODE, + TCA_CAKE_OVERHEAD, + TCA_CAKE_RTT, + TCA_CAKE_TARGET, + TCA_CAKE_AUTORATE, + TCA_CAKE_MEMORY, + TCA_CAKE_NAT, + __TCA_CAKE_MAX +}; +#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1) + +struct tc_cake_traffic_stats { + __u32 packets; + __u32 link_ms; + __u64 bytes; +}; + +#define TC_CAKE_MAX_TINS (8) +struct tc_cake_xstats { + __u16 version; /* == 4, increments when struct extended */ + __u8 max_tins; /* == TC_CAKE_MAX_TINS */ + __u8 tin_cnt; /* <= TC_CAKE_MAX_TINS */ + + __u32 threshold_rate [TC_CAKE_MAX_TINS]; + __u32 target_us [TC_CAKE_MAX_TINS]; + struct tc_cake_traffic_stats sent [TC_CAKE_MAX_TINS]; + struct tc_cake_traffic_stats dropped [TC_CAKE_MAX_TINS]; + struct tc_cake_traffic_stats ecn_marked[TC_CAKE_MAX_TINS]; + struct tc_cake_traffic_stats backlog [TC_CAKE_MAX_TINS]; + __u32 interval_us [TC_CAKE_MAX_TINS]; + __u32 way_indirect_hits[TC_CAKE_MAX_TINS]; + __u32 way_misses [TC_CAKE_MAX_TINS]; + __u32 way_collisions [TC_CAKE_MAX_TINS]; + __u32 peak_delay_us [TC_CAKE_MAX_TINS]; /* ~= delay to bulk flows */ + __u32 avge_delay_us [TC_CAKE_MAX_TINS]; + __u32 base_delay_us [TC_CAKE_MAX_TINS]; /* ~= delay to sparse flows */ + __u16 sparse_flows [TC_CAKE_MAX_TINS]; + __u16 bulk_flows [TC_CAKE_MAX_TINS]; + __u16 unresponse_flows [TC_CAKE_MAX_TINS]; /* v4 - was u32 last_len */ + __u16 spare [TC_CAKE_MAX_TINS]; /* v4 - split last_len */ + __u32 max_skblen [TC_CAKE_MAX_TINS]; + __u32 capacity_estimate; /* version 2 */ + __u32 memory_limit; /* version 3 */ + __u32 memory_used; /* version 3 */ +}; + #endif --- a/tc/Makefile +++ b/tc/Makefile @@ -63,6 +63,7 @@ TCMODULES += q_codel.o TCMODULES += q_fq_codel.o TCMODULES += q_fq.o TCMODULES += q_pie.o +TCMODULES += q_cake.o TCMODULES += q_hhf.o TCMODULES += e_bpf.o --- /dev/null +++ b/tc/q_cake.c @@ -0,0 +1,641 @@ +/* + * Common Applications Kept Enhanced -- CAKE + * + * Copyright (C) 2014-2015 Jonathan Morton + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * Alternatively, provided that this notice is retained in full, this + * software may be distributed under the terms of the GNU General + * Public License ("GPL") version 2, in which case the provisions of the + * GPL apply INSTEAD OF those given above. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "utils.h" +#include "tc_util.h" + +static void explain(void) +{ + fprintf(stderr, "Usage: ... cake [ bandwidth RATE | unlimited* | autorate_ingress ]\n" + " [ rtt TIME | datacentre | lan | metro | regional | internet* | oceanic | satellite | interplanetary ]\n" + " [ besteffort | precedence | diffserv8 | diffserv4* ]\n" + " [ flowblind | srchost | dsthost | hosts | flows* | dual-srchost | dual-dsthost | triple-isolate ] [ nat | nonat* ]\n" + " [ ptm | atm | noatm* ] [ overhead N | conservative | raw* ]\n" + " [ memlimit LIMIT ]\n" + " (* marks defaults)\n"); +} + +static int cake_parse_opt(struct qdisc_util *qu, int argc, char **argv, + struct nlmsghdr *n) +{ + int unlimited = 0; + unsigned bandwidth = 0; + unsigned interval = 0; + unsigned target = 0; + unsigned diffserv = 0; + unsigned memlimit = 0; + int overhead = 0; + bool overhead_set = false; + int flowmode = -1; + int nat = -1; + int atm = -1; + int autorate = -1; + struct rtattr *tail; + + while (argc > 0) { + if (strcmp(*argv, "bandwidth") == 0) { + NEXT_ARG(); + if (get_rate(&bandwidth, *argv)) { + fprintf(stderr, "Illegal \"bandwidth\"\n"); + return -1; + } + unlimited = 0; + autorate = 0; + } else if (strcmp(*argv, "unlimited") == 0) { + bandwidth = 0; + unlimited = 1; + autorate = 0; + } else if (strcmp(*argv, "autorate_ingress") == 0) { + autorate = 1; + + } else if (strcmp(*argv, "rtt") == 0) { + NEXT_ARG(); + if (get_time(&interval, *argv)) { + fprintf(stderr, "Illegal \"rtt\"\n"); + return -1; + } + target = interval / 20; + if(!target) + target = 1; + } else if (strcmp(*argv, "datacentre") == 0) { + interval = 100; + target = 5; + } else if (strcmp(*argv, "lan") == 0) { + interval = 1000; + target = 50; + } else if (strcmp(*argv, "metro") == 0) { + interval = 10000; + target = 500; + } else if (strcmp(*argv, "regional") == 0) { + interval = 30000; + target = 1500; + } else if (strcmp(*argv, "internet") == 0) { + interval = 100000; + target = 5000; + } else if (strcmp(*argv, "oceanic") == 0) { + interval = 300000; + target = 15000; + } else if (strcmp(*argv, "satellite") == 0) { + interval = 1000000; + target = 50000; + } else if (strcmp(*argv, "interplanetary") == 0) { + interval = 3600000000U; + target = 5000; + + } else if (strcmp(*argv, "besteffort") == 0) { + diffserv = 1; + } else if (strcmp(*argv, "precedence") == 0) { + diffserv = 2; + } else if (strcmp(*argv, "diffserv8") == 0) { + diffserv = 3; + } else if (strcmp(*argv, "diffserv4") == 0) { + diffserv = 4; + } else if (strcmp(*argv, "diffserv") == 0) { + diffserv = 4; + } else if (strcmp(*argv, "diffserv-llt") == 0) { + diffserv = 5; + + } else if (strcmp(*argv, "flowblind") == 0) { + flowmode = 0; + } else if (strcmp(*argv, "srchost") == 0) { + flowmode = 1; + } else if (strcmp(*argv, "dsthost") == 0) { + flowmode = 2; + } else if (strcmp(*argv, "hosts") == 0) { + flowmode = 3; + } else if (strcmp(*argv, "flows") == 0) { + flowmode = 4; + } else if (strcmp(*argv, "dual-srchost") == 0) { + flowmode = 5; + } else if (strcmp(*argv, "dual-dsthost") == 0) { + flowmode = 6; + } else if (strcmp(*argv, "triple-isolate") == 0) { + flowmode = 7; + + } else if (strcmp(*argv, "nat") == 0) { + nat = 1; + } else if (strcmp(*argv, "nonat") == 0) { + nat = 0; + + } else if (strcmp(*argv, "ptm") == 0) { + atm = 2; + } else if (strcmp(*argv, "atm") == 0) { + atm = 1; + } else if (strcmp(*argv, "noatm") == 0) { + atm = 0; + + } else if (strcmp(*argv, "raw") == 0) { + atm = 0; + overhead = 0; + overhead_set = true; + } else if (strcmp(*argv, "conservative") == 0) { + /* + * Deliberately over-estimate overhead: + * one whole ATM cell plus ATM framing. + * A safe choice if the actual overhead is unknown. + */ + atm = 1; + overhead = 48; + overhead_set = true; + + /* + * DOCSIS overhead figures courtesy of Greg White @ CableLabs. + * The "-ip" versions include the Ethernet frame header, in case + * you are shaping an IP interface instead of an Ethernet one. + */ + } else if (strcmp(*argv, "docsis-downstream-ip") == 0) { + atm = 0; + overhead += 35; + overhead_set = true; + } else if (strcmp(*argv, "docsis-downstream") == 0) { + atm = 0; + overhead += 35 - 14; + overhead_set = true; + } else if (strcmp(*argv, "docsis-upstream-ip") == 0) { + atm = 0; + overhead += 28; + overhead_set = true; + } else if (strcmp(*argv, "docsis-upstream") == 0) { + atm = 0; + overhead += 28 - 14; + overhead_set = true; + + /* Various ADSL framing schemes, all over ATM cells */ + } else if (strcmp(*argv, "ipoa-vcmux") == 0) { + atm = 1; + overhead += 8; + overhead_set = true; + } else if (strcmp(*argv, "ipoa-llcsnap") == 0) { + atm = 1; + overhead += 16; + overhead_set = true; + } else if (strcmp(*argv, "bridged-vcmux") == 0) { + atm = 1; + overhead += 24; + overhead_set = true; + } else if (strcmp(*argv, "bridged-llcsnap") == 0) { + atm = 1; + overhead += 32; + overhead_set = true; + } else if (strcmp(*argv, "pppoa-vcmux") == 0) { + atm = 1; + overhead += 10; + overhead_set = true; + } else if (strcmp(*argv, "pppoa-llc") == 0) { + atm = 1; + overhead += 14; + overhead_set = true; + } else if (strcmp(*argv, "pppoe-vcmux") == 0) { + atm = 1; + overhead += 32; + overhead_set = true; + } else if (strcmp(*argv, "pppoe-llcsnap") == 0) { + atm = 1; + overhead += 40; + overhead_set = true; + + /* Typical VDSL2 framing schemes, both over PTM */ + /* PTM has 64b/65b coding which absorbs some bandwidth */ + } else if (strcmp(*argv, "pppoe-ptm") == 0) { + atm = 2; + overhead += 27; + } else if (strcmp(*argv, "bridged-ptm") == 0) { + atm = 2; + overhead += 19; + + } else if (strcmp(*argv, "via-ethernet") == 0) { + /* + * The above overheads are relative to an IP packet, + * but Linux includes Ethernet framing overhead already + * if we are shaping an Ethernet interface rather than + * an IP interface. + */ + overhead -= 14; + overhead_set = true; + + /* Additional Ethernet-related overheads used by some ISPs */ + } else if (strcmp(*argv, "ether-phy") == 0) { + /* ethernet pre-amble & interframe gap 20 bytes + * Linux will have already accounted for MACs & frame type 14 bytes + * you probably want to add an FCS as well*/ + overhead += 20; + overhead_set = true; + } else if (strcmp(*argv, "ether-all") == 0) { + /* ethernet pre-amble & interframe gap & FCS + * Linux will have already accounted for MACs & frame type 14 bytes + * you may need to add vlan tag*/ + overhead += 24; + overhead_set = true; + + } else if (strcmp(*argv, "ether-fcs") == 0) { + /* Frame Check Sequence */ + /* we ignore the minimum frame size, because IP packets usually meet it */ + overhead += 4; + overhead_set = true; + } else if (strcmp(*argv, "ether-vlan") == 0) { + /* 802.1q VLAN tag - may be repeated */ + overhead += 4; + overhead_set = true; + + } else if (strcmp(*argv, "overhead") == 0) { + char* p = NULL; + NEXT_ARG(); + overhead = strtol(*argv, &p, 10); + if(!p || *p || !*argv || overhead < -64 || overhead > 256) { + fprintf(stderr, "Illegal \"overhead\", valid range is -64 to 256\\n"); + return -1; + } + overhead_set = true; + + } else if (strcmp(*argv, "memlimit") == 0) { + NEXT_ARG(); + if(get_size(&memlimit, *argv)) { + fprintf(stderr, "Illegal value for \"memlimit\": \"%s\"\n", *argv); + return -1; + } + + } else if (strcmp(*argv, "help") == 0) { + explain(); + return -1; + } else { + fprintf(stderr, "What is \"%s\"?\n", *argv); + explain(); + return -1; + } + argc--; argv++; + } + + tail = NLMSG_TAIL(n); + addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); + if (bandwidth || unlimited) + addattr_l(n, 1024, TCA_CAKE_BASE_RATE, &bandwidth, sizeof(bandwidth)); + if (diffserv) + addattr_l(n, 1024, TCA_CAKE_DIFFSERV_MODE, &diffserv, sizeof(diffserv)); + if (atm != -1) + addattr_l(n, 1024, TCA_CAKE_ATM, &atm, sizeof(atm)); + if (flowmode != -1) + addattr_l(n, 1024, TCA_CAKE_FLOW_MODE, &flowmode, sizeof(flowmode)); + if (overhead_set) + addattr_l(n, 1024, TCA_CAKE_OVERHEAD, &overhead, sizeof(overhead)); + if (interval) + addattr_l(n, 1024, TCA_CAKE_RTT, &interval, sizeof(interval)); + if (target) + addattr_l(n, 1024, TCA_CAKE_TARGET, &target, sizeof(target)); + if (autorate != -1) + addattr_l(n, 1024, TCA_CAKE_AUTORATE, &autorate, sizeof(autorate)); + if (memlimit) + addattr_l(n, 1024, TCA_CAKE_MEMORY, &memlimit, sizeof(memlimit)); + if (nat != -1) + addattr_l(n, 1024, TCA_CAKE_NAT, &nat, sizeof(nat)); + + tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; + return 0; +} + + +static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) +{ + struct rtattr *tb[TCA_CAKE_MAX + 1]; + unsigned bandwidth = 0; + unsigned diffserv = 0; + unsigned flowmode = 0; + unsigned interval = 0; + unsigned memlimit = 0; + int overhead = 0; + int atm = 0; + int nat = 0; + int autorate = 0; + SPRINT_BUF(b1); + SPRINT_BUF(b2); + + if (opt == NULL) + return 0; + + parse_rtattr_nested(tb, TCA_CAKE_MAX, opt); + + if (tb[TCA_CAKE_BASE_RATE] && + RTA_PAYLOAD(tb[TCA_CAKE_BASE_RATE]) >= sizeof(__u32)) { + bandwidth = rta_getattr_u32(tb[TCA_CAKE_BASE_RATE]); + if(bandwidth) + fprintf(f, "bandwidth %s ", sprint_rate(bandwidth, b1)); + else + fprintf(f, "unlimited "); + } + if (tb[TCA_CAKE_AUTORATE] && + RTA_PAYLOAD(tb[TCA_CAKE_AUTORATE]) >= sizeof(__u32)) { + autorate = rta_getattr_u32(tb[TCA_CAKE_AUTORATE]); + if(autorate == 1) + fprintf(f, "autorate_ingress "); + else if(autorate) + fprintf(f, "(?autorate?) "); + } + if (tb[TCA_CAKE_DIFFSERV_MODE] && + RTA_PAYLOAD(tb[TCA_CAKE_DIFFSERV_MODE]) >= sizeof(__u32)) { + diffserv = rta_getattr_u32(tb[TCA_CAKE_DIFFSERV_MODE]); + switch(diffserv) { + case 1: + fprintf(f, "besteffort "); + break; + case 2: + fprintf(f, "precedence "); + break; + case 3: + fprintf(f, "diffserv8 "); + break; + case 4: + fprintf(f, "diffserv4 "); + break; + case 5: + fprintf(f, "diffserv-llt "); + break; + default: + fprintf(f, "(?diffserv?) "); + break; + }; + } + if (tb[TCA_CAKE_FLOW_MODE] && + RTA_PAYLOAD(tb[TCA_CAKE_FLOW_MODE]) >= sizeof(__u32)) { + flowmode = rta_getattr_u32(tb[TCA_CAKE_FLOW_MODE]); + nat = !!(flowmode & 64); + flowmode &= ~64; + switch(flowmode) { + case 0: + fprintf(f, "flowblind "); + break; + case 1: + fprintf(f, "srchost "); + break; + case 2: + fprintf(f, "dsthost "); + break; + case 3: + fprintf(f, "hosts "); + break; + case 4: + fprintf(f, "flows "); + break; + case 5: + fprintf(f, "dual-srchost "); + break; + case 6: + fprintf(f, "dual-dsthost "); + break; + case 7: + fprintf(f, "triple-isolate "); + break; + default: + fprintf(f, "(?flowmode?) "); + break; + }; + + if(nat) + fprintf(f, "nat "); + } + if (tb[TCA_CAKE_ATM] && + RTA_PAYLOAD(tb[TCA_CAKE_ATM]) >= sizeof(__u32)) { + atm = rta_getattr_u32(tb[TCA_CAKE_ATM]); + } + if (tb[TCA_CAKE_OVERHEAD] && + RTA_PAYLOAD(tb[TCA_CAKE_OVERHEAD]) >= sizeof(__u32)) { + overhead = rta_getattr_u32(tb[TCA_CAKE_OVERHEAD]); + } + if (tb[TCA_CAKE_RTT] && + RTA_PAYLOAD(tb[TCA_CAKE_RTT]) >= sizeof(__u32)) { + interval = rta_getattr_u32(tb[TCA_CAKE_RTT]); + } + + if (interval) + fprintf(f, "rtt %s ", sprint_time(interval, b2)); + + if (atm == 1) + fprintf(f, "atm "); + else if (atm == 2) + fprintf(f, "ptm "); + else if (overhead) + fprintf(f, "noatm "); + + if (overhead || atm) + fprintf(f, "overhead %d ", overhead); + + if (!atm && !overhead) + fprintf(f, "raw "); + + if (memlimit) + fprintf(f, "memlimit %s", sprint_size(memlimit, b1)); + + return 0; +} + +static int cake_print_xstats(struct qdisc_util *qu, FILE *f, + struct rtattr *xstats) +{ + /* fq_codel stats format borrowed */ + struct tc_fq_codel_xstats *st; + struct tc_cake_xstats *stnc; + SPRINT_BUF(b1); + SPRINT_BUF(b2); + + if (xstats == NULL) + return 0; + + if (RTA_PAYLOAD(xstats) < sizeof(st->type)) + return -1; + + st = RTA_DATA(xstats); + stnc = RTA_DATA(xstats); + + if (st->type == TCA_FQ_CODEL_XSTATS_QDISC && RTA_PAYLOAD(xstats) >= sizeof(*st)) { + fprintf(f, " maxpacket %u drop_overlimit %u new_flow_count %u ecn_mark %u", + st->qdisc_stats.maxpacket, + st->qdisc_stats.drop_overlimit, + st->qdisc_stats.new_flow_count, + st->qdisc_stats.ecn_mark); + fprintf(f, "\n new_flows_len %u old_flows_len %u", + st->qdisc_stats.new_flows_len, + st->qdisc_stats.old_flows_len); + } else if (st->type == TCA_FQ_CODEL_XSTATS_CLASS && RTA_PAYLOAD(xstats) >= sizeof(*st)) { + fprintf(f, " deficit %d count %u lastcount %u ldelay %s", + st->class_stats.deficit, + st->class_stats.count, + st->class_stats.lastcount, + sprint_time(st->class_stats.ldelay, b1)); + if (st->class_stats.dropping) { + fprintf(f, " dropping"); + if (st->class_stats.drop_next < 0) + fprintf(f, " drop_next -%s", + sprint_time(-st->class_stats.drop_next, b1)); + else + fprintf(f, " drop_next %s", + sprint_time(st->class_stats.drop_next, b1)); + } + } else if (stnc->version >= 1 && stnc->version < 0xFF + && stnc->max_tins == TC_CAKE_MAX_TINS + && RTA_PAYLOAD(xstats) >= offsetof(struct tc_cake_xstats, capacity_estimate)) + { + int i; + + if(stnc->version >= 3) + fprintf(f, " memory used: %s of %s\n", sprint_size(stnc->memory_used, b1), sprint_size(stnc->memory_limit, b2)); + + if(stnc->version >= 2) + fprintf(f, " capacity estimate: %s\n", sprint_rate(stnc->capacity_estimate, b1)); + + switch(stnc->tin_cnt) { + case 4: + fprintf(f, " Bulk Best Effort Video Voice\n"); + break; + + case 5: + fprintf(f, " Low Loss Best Effort Low Delay Bulk Net Control\n"); + break; + + default: + fprintf(f, " "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, " Tin %u", i); + fprintf(f, "\n"); + }; + + fprintf(f, " thresh "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12s", sprint_rate(stnc->threshold_rate[i], b1)); + fprintf(f, "\n"); + + fprintf(f, " target "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12s", sprint_time(stnc->target_us[i], b1)); + fprintf(f, "\n"); + + fprintf(f, " interval"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12s", sprint_time(stnc->interval_us[i], b1)); + fprintf(f, "\n"); + + fprintf(f, " pk_delay"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12s", sprint_time(stnc->peak_delay_us[i], b1)); + fprintf(f, "\n"); + + fprintf(f, " av_delay"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12s", sprint_time(stnc->avge_delay_us[i], b1)); + fprintf(f, "\n"); + + fprintf(f, " sp_delay"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12s", sprint_time(stnc->base_delay_us[i], b1)); + fprintf(f, "\n"); + + fprintf(f, " pkts "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->sent[i].packets); + fprintf(f, "\n"); + + fprintf(f, " bytes "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12llu", stnc->sent[i].bytes); + fprintf(f, "\n"); + + fprintf(f, " way_inds"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->way_indirect_hits[i]); + fprintf(f, "\n"); + + fprintf(f, " way_miss"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->way_misses[i]); + fprintf(f, "\n"); + + fprintf(f, " way_cols"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->way_collisions[i]); + fprintf(f, "\n"); + + fprintf(f, " drops "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->dropped[i].packets); + fprintf(f, "\n"); + + fprintf(f, " marks "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->ecn_marked[i].packets); + fprintf(f, "\n"); + + fprintf(f, " sp_flows"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->sparse_flows[i]); + fprintf(f, "\n"); + + fprintf(f, " bk_flows"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->bulk_flows[i]); + fprintf(f, "\n"); + + if(stnc->version >= 4) { + fprintf(f, " un_flows"); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->unresponse_flows[i]); + fprintf(f, "\n"); + } + + fprintf(f, " max_len "); + for(i=0; i < stnc->tin_cnt; i++) + fprintf(f, "%12u", stnc->max_skblen[i]); + fprintf(f, "\n"); + } else { + return -1; + } + return 0; +} + +struct qdisc_util cake_qdisc_util = { + .id = "cake", + .parse_qopt = cake_parse_opt, + .print_qopt = cake_print_opt, + .print_xstats = cake_print_xstats, +}; --------------E8EDEBD617960796C74EA697--