From patchwork Mon Aug 6 17:09:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousuk Seung X-Patchwork-Id: 954004 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="R8qmGl45"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41kkfk21G6z9ryt for ; Tue, 7 Aug 2018 03:10:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732553AbeHFTUF (ORCPT ); Mon, 6 Aug 2018 15:20:05 -0400 Received: from mail-ua0-f202.google.com ([209.85.217.202]:45291 "EHLO mail-ua0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728349AbeHFTUF (ORCPT ); Mon, 6 Aug 2018 15:20:05 -0400 Received: by mail-ua0-f202.google.com with SMTP id x17-v6so9201974uap.12 for ; Mon, 06 Aug 2018 10:10:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=3dvuBKCwolYtzLpEHBd6XN8+I6HNrqKzCn6wk4RtUgM=; b=R8qmGl457TT5OI6Uxp5Mhk3nai2rQ/T3fxuYFsPbTXca+E741q55g+8L2w8Kr4CjZq xO8qlp3XMKBSgmd+QNeqcJx4hidfllEyQ+/36sC5qgn0e7EafZYFZWkpk2ggs3tuK7qd vqD+7GhAhYJV85uFqDu8eSgEL5sT5B7Nw7lih95Ks9GKOiO+PDTXdwdLlMBJPT2uBO9C RpdPlaIm8T3565qiOX4JZ1UzTlwWc3wp38bn7vYaDf9gN9lo3E29OPAaEzchDqTfChGp JEUX1EmxDwU0MW3osZIFgBJtA7IaaJ+zEkitGCcLE7E452xRIgGplUG73NlMNJX40Td6 WmRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3dvuBKCwolYtzLpEHBd6XN8+I6HNrqKzCn6wk4RtUgM=; b=iiOOCuaq2YxyrSUZbi7UOdSmNzA1avGcRCUc96AsHm1zOAy8UzC0iH/5LTsB+EnZmR /VNs8EbFH2ET1fm4D98fk5lFKcjLMQVQMBgaSWmP0GIqH7vzr0tPX398FE4pcwDJJ2Ep E3X+257xAmUe8qsTFD+csAXhR2f18gCMkwL+qoi/bhUIuTj7RVyYOGi6fl/pO7+6G9Z8 Kt69xSuxMgBdIWScAYoti3RziMTUBojpnR0vK3bJFOTCdSLYm+NFHMNvRq6G6Dq6uIP3 EU3Jfz1UtbCU4t/+ZDZjG69c3yPjVp0D56A7JVjBdLmcBMDPOqEBSk/UhFQwQpovqpmZ N8IQ== X-Gm-Message-State: AOUpUlHA2u4RAd607pgf1qU6pEmr0FvWbyr4Ffrx5MrKFjntefQ+7O+W p38GbbNfweqgB4fcN+6VF1BFzSFNqy3bUD8xotiIn63IydmoN4HsutqyujAkQzMBTvLUPlHrAzQ ZSzyr5mFhHbaJoWUrsReszKz8ePpArC6ZeVfMIztbk3Qa7pUaUEzxbYe2TZjdMVwN X-Google-Smtp-Source: AAOMgpcFwvc0jujNdRskgUppUxat5MZsxcDogbExRQLStu05vB8/rEUyQFtTSr2tRRjwJZmRJ16VDGlEcEhf X-Received: by 2002:a1f:5647:: with SMTP id k68-v6mr9932633vkb.75.1533575403107; Mon, 06 Aug 2018 10:10:03 -0700 (PDT) Date: Mon, 6 Aug 2018 10:09:51 -0700 In-Reply-To: <20180806170953.164776-1-ysseung@google.com> Message-Id: <20180806170953.164776-2-ysseung@google.com> Mime-Version: 1.0 References: <20180806170953.164776-1-ysseung@google.com> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog Subject: [PATCH iproute2-next 1/3] tc: support conversions to or from 64 bit nanosecond-based time From: Yousuk Seung To: netdev@vger.kernel.org Cc: Stephen Hemminger , David Ahern , Michael McLennan , Priyaranjan Jha , Dave Taht , Yousuk Seung , Neal Cardwell Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dave Taht Using a 32 bit field to represent time in nanoseconds results in a maximum value of about 4.3 seconds, which is well below many observed delays in WiFi and LTE, and barely in the ballpark for a trip past the Earth's moon, Luna. Using 64 bit time fields in nanoseconds allows us to simulate network diameters of several hundred light-years. However, only conversions to and from ns, us, ms, and seconds are provided. Signed-off-by: Yousuk Seung Signed-off-by: Dave Taht Signed-off-by: Neal Cardwell --- tc/tc_core.h | 4 ++++ tc/tc_util.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tc/tc_util.h | 3 +++ 3 files changed, 62 insertions(+) diff --git a/tc/tc_core.h b/tc/tc_core.h index 1dfa9a4f773b..a0fe0923d171 100644 --- a/tc/tc_core.h +++ b/tc/tc_core.h @@ -7,6 +7,10 @@ #define TIME_UNITS_PER_SEC 1000000 +#define NSEC_PER_USEC 1000 +#define NSEC_PER_MSEC 1000000 +#define NSEC_PER_SEC 1000000000LL + enum link_layer { LINKLAYER_UNSPEC, LINKLAYER_ETHERNET, diff --git a/tc/tc_util.c b/tc/tc_util.c index d7578528a31b..c39c9046dcae 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -385,6 +385,61 @@ char *sprint_ticks(__u32 ticks, char *buf) return sprint_time(tc_core_tick2time(ticks), buf); } +/* 64 bit times are represented internally in nanoseconds */ +int get_time64(__s64 *time, const char *str) +{ + double nsec; + char *p; + + nsec = strtod(str, &p); + if (p == str) + return -1; + + if (*p) { + if (strcasecmp(p, "s") == 0 || + strcasecmp(p, "sec") == 0 || + strcasecmp(p, "secs") == 0) + nsec *= NSEC_PER_SEC; + else if (strcasecmp(p, "ms") == 0 || + strcasecmp(p, "msec") == 0 || + strcasecmp(p, "msecs") == 0) + nsec *= NSEC_PER_MSEC; + else if (strcasecmp(p, "us") == 0 || + strcasecmp(p, "usec") == 0 || + strcasecmp(p, "usecs") == 0) + nsec *= NSEC_PER_USEC; + else if (strcasecmp(p, "ns") == 0 || + strcasecmp(p, "nsec") == 0 || + strcasecmp(p, "nsecs") == 0) + nsec *= 1; + else + return -1; + } + + *time = nsec; + return 0; +} + +void print_time64(char *buf, int len, __s64 time) +{ + double nsec = time; + + if (time >= NSEC_PER_SEC) + snprintf(buf, len, "%.3fs", nsec/NSEC_PER_SEC); + else if (time >= NSEC_PER_MSEC) + snprintf(buf, len, "%.3fms", nsec/NSEC_PER_MSEC); + else if (time >= NSEC_PER_USEC) + snprintf(buf, len, "%.3fus", nsec/NSEC_PER_USEC); + else + snprintf(buf, len, "%lldns", time); +} + +char *sprint_time64(__s64 time, char *buf) +{ + print_time64(buf, SPRINT_BSIZE-1, time); + return buf; +} + int get_size(unsigned int *size, const char *str) { double sz; diff --git a/tc/tc_util.h b/tc/tc_util.h index 6632c4f9c528..87be951c622d 100644 --- a/tc/tc_util.h +++ b/tc/tc_util.h @@ -82,12 +82,14 @@ int get_percent_rate64(__u64 *rate, const char *str, const char *dev); int get_size(unsigned int *size, const char *str); int get_size_and_cell(unsigned int *size, int *cell_log, char *str); int get_time(unsigned int *time, const char *str); +int get_time64(__s64 *time, const char *str); int get_linklayer(unsigned int *val, const char *arg); void print_rate(char *buf, int len, __u64 rate); void print_size(char *buf, int len, __u32 size); void print_qdisc_handle(char *buf, int len, __u32 h); void print_time(char *buf, int len, __u32 time); +void print_time64(char *buf, int len, __s64 time); void print_linklayer(char *buf, int len, unsigned int linklayer); void print_devname(enum output_type type, int ifindex); @@ -96,6 +98,7 @@ char *sprint_size(__u32 size, char *buf); char *sprint_qdisc_handle(__u32 h, char *buf); char *sprint_tc_classid(__u32 h, char *buf); char *sprint_time(__u32 time, char *buf); +char *sprint_time64(__s64 time, char *buf); char *sprint_ticks(__u32 ticks, char *buf); char *sprint_linklayer(unsigned int linklayer, char *buf); From patchwork Mon Aug 6 17:09:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousuk Seung X-Patchwork-Id: 954005 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="B7SP0M4W"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41kkfn3xxhz9ryt for ; Tue, 7 Aug 2018 03:10:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732588AbeHFTUJ (ORCPT ); Mon, 6 Aug 2018 15:20:09 -0400 Received: from mail-ua0-f202.google.com ([209.85.217.202]:34500 "EHLO mail-ua0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728349AbeHFTUJ (ORCPT ); Mon, 6 Aug 2018 15:20:09 -0400 Received: by mail-ua0-f202.google.com with SMTP id n10-v6so9294770uao.1 for ; Mon, 06 Aug 2018 10:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=srn+SRc5D+5AzS9r1CVsg5P/W8n+cBs+GN7vDGpVZ28=; b=B7SP0M4W7lcuTS28t3y1z++BTokYhywz8RVkVlPEFkkhyAAPXVxG2oAXJXVOzOJcD9 BlDX9kM8Sv/u0PVc5eH/UiW5+Vf4hmkr1QHE0ENZNkMIWqLrQ9dJGZ4oO5fdPUrjvwOX jXTX8AU4ymAR9ZukUcYuhIW+qr1FZ8SZcDau5TYXKqaC0ewJKR48bC7eQOzeUoaGYNrW o9AupaGQglSo/WE4VSLZPsNm3/xLK+IvjxU2v6s7WfXOveeiV2rFXPz7f3Tg5fXP5szL ecGywZ0gbueXoSjBy8qc8MEEMrDoVinHR6kv7xuye9ao/g9BzlxYLgbVtMEC5Zp95UeN EzaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=srn+SRc5D+5AzS9r1CVsg5P/W8n+cBs+GN7vDGpVZ28=; b=LWSqbZUA11Yi9BnmAFO1diNUelU3772YlTArqb7YKl8VNQxg7nD01T86TbuR68P95J qrYJGEXrM8yVZoQgBOfshxQ4wB84NfPH76xnbfF8aFqGeLy/hep11ehyPKBBN3/MZPmg 7HRPbf9OGrcAvx6yvbN/l1o1lkvtMy34RhbpEF8RsHdhlnRiYf97zW/BNxR5/JlBRF+4 LvYyh7k3GW7UQPmuit1uLt//hRfh03tzhIKwEUmhKtbb/yPVei8cJt8zeuz2HaBbmQqT ByvF4ejIsMpP1jEw/jSe+AEWcmZmpDUyHXzLGWJioBk5+zIKcnQmSm5EHF29YCtR7Oc7 pu6Q== X-Gm-Message-State: AOUpUlHZ/PKqsfMTScdiZce26ppqDRSwgkm1DeGimBa7eLigmg+JucXQ CFMPFy8YvH9XJySJoCgb5otuniINT8RLTrLzNbdCMpBMcFyf/zp5aGfwLdKLTUzzX/Za7QMvsip UbkXpgcfMvM+Oy6lhQ3kyMUfGai5G3dXyv1IlgGAugg1yjbh7UPsi/NfAIGkhZrjI X-Google-Smtp-Source: AAOMgpcZPMtaScnRctpdsV2Wh+SXvDhPxawlYhqM3P87lMiK7LqUmScezbmEHlTaEfgCl8KPWi85x4ZVFdCQ X-Received: by 2002:a1f:ab48:: with SMTP id u69-v6mr9613499vke.70.1533575405993; Mon, 06 Aug 2018 10:10:05 -0700 (PDT) Date: Mon, 6 Aug 2018 10:09:52 -0700 In-Reply-To: <20180806170953.164776-1-ysseung@google.com> Message-Id: <20180806170953.164776-3-ysseung@google.com> Mime-Version: 1.0 References: <20180806170953.164776-1-ysseung@google.com> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog Subject: [PATCH iproute2-next 2/3] q_netem: support delivering packets in delayed time slots From: Yousuk Seung To: netdev@vger.kernel.org Cc: Stephen Hemminger , David Ahern , Michael McLennan , Priyaranjan Jha , Dave Taht , Yousuk Seung , Neal Cardwell Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dave Taht Slotting is a crude approximation of the behaviors of shared media such as cable, wifi, and LTE, which gather up a bunch of packets within a varying delay window and deliver them, relative to that, nearly all at once. It works within the existing loss, duplication, jitter and delay parameters of netem. Some amount of inherent latency must be specified, regardless. The new "slot" parameter specifies a minimum and maximum delay between transmission attempts. The "bytes" and "packets" parameters can be used to limit the amount of information transferred per slot. Examples of use: tc qdisc add dev eth0 root netem delay 200us \ slot 800us 10ms bytes 64k packets 42 A more correct example, using stacked netem instances and a packet limit to emulate a tail drop wifi queue with slots and variable packet delivery, with a 200Mbit isochronous underlying rate, and 20ms path delay: tc qdisc add dev eth0 root handle 1: netem delay 20ms rate 200mbit \ limit 10000 tc qdisc add dev eth0 parent 1:1 handle 10:1 netem delay 200us \ slot 800us 10ms bytes 64k packets 42 limit 512 Signed-off-by: Yousuk Seung Signed-off-by: Dave Taht Signed-off-by: Neal Cardwell --- man/man8/tc-netem.8 | 32 ++++++++++++++++++++++- tc/q_netem.c | 63 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/man/man8/tc-netem.8 b/man/man8/tc-netem.8 index f2cd86b6ed8a..8d485b026751 100644 --- a/man/man8/tc-netem.8 +++ b/man/man8/tc-netem.8 @@ -8,7 +8,8 @@ NetEm \- Network Emulator .I OPTIONS .IR OPTIONS " := [ " LIMIT " ] [ " DELAY " ] [ " LOSS \ -" ] [ " CORRUPT " ] [ " DUPLICATION " ] [ " REORDERING " ][ " RATE " ]" +" ] [ " CORRUPT " ] [ " DUPLICATION " ] [ " REORDERING " ] [ " RATE \ +" ] [ " SLOT " ]" .IR LIMIT " := " .B limit @@ -51,6 +52,14 @@ NetEm \- Network Emulator .B rate .IR RATE " [ " PACKETOVERHEAD " [ " CELLSIZE " [ " CELLOVERHEAD " ]]]]" +.IR SLOT " := " +.BR slot +.IR MIN_DELAY " [ " MAX_DELAY " ] [" +.BR packets +.IR PACKETS " ] [ " +.BR bytes +.IR BYTES " ]" + .SH DESCRIPTION NetEm is an enhancement of the Linux traffic control facilities @@ -162,6 +171,27 @@ granularity avoid a perfect shaping at a specific level. This will show up in an artificial packet compression (bursts). Another influence factor are network adapter buffers which can also add artificial delay. +.SS slot +defer delivering accumulated packets to within a slot, with each available slot +configured with a minimum delay to acquire, and an optional maximum delay. Slot +delays can be specified in nanoseconds, microseconds, milliseconds or seconds +(e.g. 800us). Values for the optional parameters +.I BYTES +will limit the number of bytes delivered per slot, and/or +.I PACKETS +will limit the number of packets delivered per slot. + +These slot options can provide a crude approximation of bursty MACs such as +DOCSIS, WiFi, and LTE. + +Note that slotting is limited by several factors: the kernel clock granularity, +as with a rate, and attempts to deliver many packets within a slot will be +smeared by the timer resolution, and by the underlying native bandwidth also. + +It is possible to combine slotting with a rate, in which case complex behaviors +where either the rate, or the slot limits on bytes or packets per slot, govern +the actual delivered rate. + .SH LIMITATIONS The main known limitation of Netem are related to timer granularity, since Linux is not a real-time operating system. diff --git a/tc/q_netem.c b/tc/q_netem.c index 9f9a9b3df255..f52a36b6c31c 100644 --- a/tc/q_netem.c +++ b/tc/q_netem.c @@ -40,7 +40,10 @@ static void explain(void) " [ loss gemodel PERCENT [R [1-H [1-K]]]\n" \ " [ ecn ]\n" \ " [ reorder PRECENT [CORRELATION] [ gap DISTANCE ]]\n" \ -" [ rate RATE [PACKETOVERHEAD] [CELLSIZE] [CELLOVERHEAD]]\n"); +" [ rate RATE [PACKETOVERHEAD] [CELLSIZE] [CELLOVERHEAD]]\n" \ +" [ slot MIN_DELAY [MAX_DELAY] [packets MAX_PACKETS]" \ +" [bytes MAX_BYTES]]\n" \ + ); } static void explain1(const char *arg) @@ -164,6 +167,7 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct tc_netem_gimodel gimodel; struct tc_netem_gemodel gemodel; struct tc_netem_rate rate = {}; + struct tc_netem_slot slot = {}; __s16 *dist_data = NULL; __u16 loss_type = NETEM_LOSS_UNSPEC; int present[__TCA_NETEM_MAX] = {}; @@ -412,6 +416,44 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, return -1; } } + } else if (matches(*argv, "slot") == 0) { + NEXT_ARG(); + present[TCA_NETEM_SLOT] = 1; + if (get_time64(&slot.min_delay, *argv)) { + explain1("slot min_delay"); + return -1; + } + if (NEXT_IS_NUMBER()) { + NEXT_ARG(); + if (get_time64(&slot.max_delay, *argv)) { + explain1("slot min_delay max_delay"); + return -1; + } + } + if (slot.max_delay < slot.min_delay) + slot.max_delay = slot.min_delay; + if (NEXT_ARG_OK() && + matches(*(argv+1), "packets") == 0) { + NEXT_ARG(); + if (!NEXT_ARG_OK() || + get_s32(&slot.max_packets, *(argv+1), 0)) { + explain1("slot packets"); + return -1; + } + NEXT_ARG(); + } + if (NEXT_ARG_OK() && + matches(*(argv+1), "bytes") == 0) { + unsigned int max_bytes; + NEXT_ARG(); + if (!NEXT_ARG_OK() || + get_size(&max_bytes, *(argv+1))) { + explain1("slot bytes"); + return -1; + } + slot.max_bytes = (int) max_bytes; + NEXT_ARG(); + } } else if (strcmp(*argv, "help") == 0) { explain(); return -1; @@ -472,6 +514,10 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, addattr_l(n, 1024, TCA_NETEM_CORRUPT, &corrupt, sizeof(corrupt)) < 0) return -1; + if (present[TCA_NETEM_SLOT] && + addattr_l(n, 1024, TCA_NETEM_SLOT, &slot, sizeof(slot)) < 0) + return -1; + if (loss_type != NETEM_LOSS_UNSPEC) { struct rtattr *start; @@ -526,6 +572,7 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) int *ecn = NULL; struct tc_netem_qopt qopt; const struct tc_netem_rate *rate = NULL; + const struct tc_netem_slot *slot = NULL; int len; __u64 rate64 = 0; @@ -586,6 +633,11 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) return -1; rate64 = rta_getattr_u64(tb[TCA_NETEM_RATE64]); } + if (tb[TCA_NETEM_SLOT]) { + if (RTA_PAYLOAD(tb[TCA_NETEM_SLOT]) < sizeof(*slot)) + return -1; + slot = RTA_DATA(tb[TCA_NETEM_SLOT]); + } } fprintf(f, "limit %d", qopt.limit); @@ -659,6 +711,15 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) fprintf(f, " celloverhead %d", rate->cell_overhead); } + if (slot) { + fprintf(f, " slot %s", sprint_time64(slot->min_delay, b1)); + fprintf(f, " %s", sprint_time64(slot->max_delay, b1)); + if(slot->max_packets) + fprintf(f, " packets %d", slot->max_packets); + if(slot->max_bytes) + fprintf(f, " bytes %d", slot->max_bytes); + } + if (ecn) fprintf(f, " ecn "); From patchwork Mon Aug 6 17:09:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousuk Seung X-Patchwork-Id: 954006 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="kIPoR0c4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41kkfp6pdmz9ryt for ; Tue, 7 Aug 2018 03:10:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732636AbeHFTUK (ORCPT ); Mon, 6 Aug 2018 15:20:10 -0400 Received: from mail-ua0-f202.google.com ([209.85.217.202]:43275 "EHLO mail-ua0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728349AbeHFTUK (ORCPT ); Mon, 6 Aug 2018 15:20:10 -0400 Received: by mail-ua0-f202.google.com with SMTP id k5-v6so9269674ual.10 for ; Mon, 06 Aug 2018 10:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ljAQgwRw5Vo3uIJuaUvqF9tL3y4yEO0DCpIHR7sc9pE=; b=kIPoR0c47hAyRwEXZAPAvfdc5QViJLHht1xwu/REHGqzaCEoRQMLQTZx1P9g560frx 3yaBweUpuJ/6mZNyWQjKHgF2jOlVMHGwvZ4rmxbnsvg+Pn/Q0cjqvxmuvM7dT1L/hXrb Dn3wESPsNl8BTCXsQWkTx3+vr7Q85f6Hdb6o+5rjibM1HUAnEMo9B0WwYB0qevtL27lf GJB47Al+EsV5XoIJNCQYqJQ3/U9+z3rqn6A2eNfcHncqBwKEuF1ti4ID4StOqxZmZ81R JG0xSBq0Z4aa2NU1u04hcNOUBIlP2YR90WvEarqEsqWGDDi0eGLGp8Fs/VWqdkGv2dhK hq/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ljAQgwRw5Vo3uIJuaUvqF9tL3y4yEO0DCpIHR7sc9pE=; b=YvjeLAHV/6lFXxfMG9G6LRNouu+cvtNVMXjg/bWYlL+vGCGMeinl/2y+NVNZK7o1Rj Hj1cLb7ba6B8EDAZeYXppL8XqypGJVi1hY4xLf0lfwcN/wYT8nyKfJku7eHThWug2YXv NwNm3mMqA2JVk6OMD9euArNLxCvUYqOFYd5YcFzxurMIFeGxtuDxA8sNK1s8rwApzDxp OPZbEK9oEAdf21URV4yOhi3Yln4veHCNBfy2R/OjGdbS4GuRMoE/N9/GyuxM9VmoC59b KNEjRUyYQP/W6zd274akbjqDZoRX/+cKcmGzHyLEga6TLux7NTeEi+BDIXTY5hWCs3yV YBFw== X-Gm-Message-State: AOUpUlHfF9cUm5NVdi2NL/uDVAbYpUIE2SULSRck0TZyVoPVNndOVrnK xpYV1Vhise/654AyBxK6f3zFNawkeYcwjM5auCGq3R1Ei2BO+k0FgkvLZAnbOEA2pMYq5BdoQ59 /I8292szsH6HtmG4QG7uWb7+SOcucX6B276Ye7SZtq3rVtIJxeCqfbORnGi/ChMDz X-Google-Smtp-Source: AAOMgpf+qQBr3UiNFwH7ep8bcnSTpPsuH0MAkFDCevQZHxBD69c1fMOJptgLYOVPkp8/utVkP5213+DQJgYX X-Received: by 2002:a1f:bd07:: with SMTP id n7-v6mr10232622vkf.11.1533575408885; Mon, 06 Aug 2018 10:10:08 -0700 (PDT) Date: Mon, 6 Aug 2018 10:09:53 -0700 In-Reply-To: <20180806170953.164776-1-ysseung@google.com> Message-Id: <20180806170953.164776-4-ysseung@google.com> Mime-Version: 1.0 References: <20180806170953.164776-1-ysseung@google.com> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog Subject: [PATCH iproute2-next 3/3] q_netem: slotting with non-uniform distribution From: Yousuk Seung To: netdev@vger.kernel.org Cc: Stephen Hemminger , David Ahern , Michael McLennan , Priyaranjan Jha , Yousuk Seung , Neal Cardwell , Dave Taht Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Extend slotting with support for non-uniform distributions. This is similar to netem's non-uniform distribution delay feature. Syntax: slot distribution DISTRIBUTION DELAY JITTER [packets MAX_PACKETS] \ [bytes MAX_BYTES] The syntax and use of the distribution table is the same as in the non-uniform distribution delay feature. A file DISTRIBUTION must be present in TC_LIB_DIR (e.g. /usr/lib/tc) containing numbers scaled by NETEM_DIST_SCALE. A random value x is selected from the table and it takes DELAY + ( x * JITTER ) as delay. Correlation between values is not supported. Examples: Normal distribution delay with mean = 800us and stdev = 100us. > tc qdisc add dev eth0 root netem slot distribution normal \ 800us 100us Optionally set the max slot size in bytes and/or packets. > tc qdisc add dev eth0 root netem slot distribution normal \ 800us 100us bytes 64k packets 42 Signed-off-by: Yousuk Seung Signed-off-by: Neal Cardwell Signed-off-by: Dave Taht --- man/man8/tc-netem.8 | 20 ++++++++---- tc/q_netem.c | 75 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 76 insertions(+), 19 deletions(-) diff --git a/man/man8/tc-netem.8 b/man/man8/tc-netem.8 index 8d485b026751..111109cf042f 100644 --- a/man/man8/tc-netem.8 +++ b/man/man8/tc-netem.8 @@ -53,9 +53,13 @@ NetEm \- Network Emulator .IR RATE " [ " PACKETOVERHEAD " [ " CELLSIZE " [ " CELLOVERHEAD " ]]]]" .IR SLOT " := " -.BR slot -.IR MIN_DELAY " [ " MAX_DELAY " ] [" -.BR packets +.BR slot " { " +.IR MIN_DELAY " [ " MAX_DELAY " ] |" +.br +.RB " " distribution " { "uniform " | " normal " | " pareto " | " paretonormal " | " +.IR FILE " } " DELAY " " JITTER " } " +.br +.RB " [ " packets .IR PACKETS " ] [ " .BR bytes .IR BYTES " ]" @@ -172,9 +176,13 @@ an artificial packet compression (bursts). Another influence factor are network adapter buffers which can also add artificial delay. .SS slot -defer delivering accumulated packets to within a slot, with each available slot -configured with a minimum delay to acquire, and an optional maximum delay. Slot -delays can be specified in nanoseconds, microseconds, milliseconds or seconds +defer delivering accumulated packets to within a slot. Each available slot can be +configured with a minimum delay to acquire, and an optional maximum delay. +Alternatively it can be configured with the distribution similar to +.BR distribution +for +.BR delay +option. Slot delays can be specified in nanoseconds, microseconds, milliseconds or seconds (e.g. 800us). Values for the optional parameters .I BYTES will limit the number of bytes delivered per slot, and/or diff --git a/tc/q_netem.c b/tc/q_netem.c index f52a36b6c31c..e655e1a82e12 100644 --- a/tc/q_netem.c +++ b/tc/q_netem.c @@ -43,7 +43,9 @@ static void explain(void) " [ rate RATE [PACKETOVERHEAD] [CELLSIZE] [CELLOVERHEAD]]\n" \ " [ slot MIN_DELAY [MAX_DELAY] [packets MAX_PACKETS]" \ " [bytes MAX_BYTES]]\n" \ - ); +" [ slot distribution" \ +" {uniform|normal|pareto|paretonormal|custom} DELAY JITTER" \ +" [packets MAX_PACKETS] [bytes MAX_BYTES]]\n"); } static void explain1(const char *arg) @@ -159,6 +161,7 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev) { int dist_size = 0; + int slot_dist_size = 0; struct rtattr *tail; struct tc_netem_qopt opt = { .limit = 1000 }; struct tc_netem_corr cor = {}; @@ -169,6 +172,7 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct tc_netem_rate rate = {}; struct tc_netem_slot slot = {}; __s16 *dist_data = NULL; + __s16 *slot_dist_data = NULL; __u16 loss_type = NETEM_LOSS_UNSPEC; int present[__TCA_NETEM_MAX] = {}; __u64 rate64 = 0; @@ -417,21 +421,53 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, } } } else if (matches(*argv, "slot") == 0) { - NEXT_ARG(); - present[TCA_NETEM_SLOT] = 1; - if (get_time64(&slot.min_delay, *argv)) { - explain1("slot min_delay"); - return -1; - } if (NEXT_IS_NUMBER()) { NEXT_ARG(); - if (get_time64(&slot.max_delay, *argv)) { - explain1("slot min_delay max_delay"); + present[TCA_NETEM_SLOT] = 1; + if (get_time64(&slot.min_delay, *argv)) { + explain1("slot min_delay"); + return -1; + } + if (NEXT_IS_NUMBER()) { + NEXT_ARG(); + if (get_time64(&slot.max_delay, *argv)) { + explain1("slot min_delay max_delay"); + return -1; + } + } + if (slot.max_delay < slot.min_delay) + slot.max_delay = slot.min_delay; + } else { + NEXT_ARG(); + if (strcmp(*argv, "distribution") == 0) { + present[TCA_NETEM_SLOT] = 1; + NEXT_ARG(); + slot_dist_data = calloc(sizeof(slot_dist_data[0]), MAX_DIST); + slot_dist_size = get_distribution(*argv, slot_dist_data, MAX_DIST); + if (slot_dist_size <= 0) { + free(slot_dist_data); + return -1; + } + NEXT_ARG(); + if (get_time64(&slot.dist_delay, *argv)) { + explain1("slot delay"); + return -1; + } + NEXT_ARG(); + if (get_time64(&slot.dist_jitter, *argv)) { + explain1("slot jitter"); + return -1; + } + if (slot.dist_jitter <= 0) { + fprintf(stderr, "Non-positive jitter\n"); + return -1; + } + } else { + fprintf(stderr, "Unknown slot parameter: %s\n", + *argv); return -1; } } - if (slot.max_delay < slot.min_delay) - slot.max_delay = slot.min_delay; if (NEXT_ARG_OK() && matches(*(argv+1), "packets") == 0) { NEXT_ARG(); @@ -558,6 +594,14 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv, return -1; free(dist_data); } + + if (slot_dist_data) { + if (addattr_l(n, MAX_DIST * sizeof(slot_dist_data[0]), + TCA_NETEM_SLOT_DIST, + slot_dist_data, slot_dist_size * sizeof(slot_dist_data[0])) < 0) + return -1; + free(slot_dist_data); + } tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; return 0; } @@ -712,8 +756,13 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) } if (slot) { - fprintf(f, " slot %s", sprint_time64(slot->min_delay, b1)); - fprintf(f, " %s", sprint_time64(slot->max_delay, b1)); + if (slot->dist_jitter > 0) { + fprintf(f, " slot distribution %s", sprint_time64(slot->dist_delay, b1)); + fprintf(f, " %s", sprint_time64(slot->dist_jitter, b1)); + } else { + fprintf(f, " slot %s", sprint_time64(slot->min_delay, b1)); + fprintf(f, " %s", sprint_time64(slot->max_delay, b1)); + } if(slot->max_packets) fprintf(f, " packets %d", slot->max_packets); if(slot->max_bytes)