From patchwork Tue Jul 3 22:52:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesus Sanchez-Palencia X-Patchwork-Id: 938995 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=fail (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Kzz42YRCz9s29 for ; Wed, 4 Jul 2018 08:57:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932378AbeGCW5S (ORCPT ); Tue, 3 Jul 2018 18:57:18 -0400 Received: from mga17.intel.com ([192.55.52.151]:4267 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932163AbeGCW5R (ORCPT ); Tue, 3 Jul 2018 18:57:17 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 15:57:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,305,1526367600"; d="scan'208";a="52424164" Received: from darjeeling.jf.intel.com ([10.24.15.98]) by fmsmga008.fm.intel.com with ESMTP; 03 Jul 2018 15:57:16 -0700 From: Jesus Sanchez-Palencia To: netdev@vger.kernel.org Cc: jhs@mojatatu.com, kurt.kanzenbach@linutronix.de, xiyou.wangcong@gmail.com, jiri@resnulli.us, vinicius.gomes@intel.com, Jesus Sanchez-Palencia Subject: [PATCH v2 iproute2 1/2] uapi pkt_sched: Add etf info - DO NOT COMMIT Date: Tue, 3 Jul 2018 15:52:18 -0700 Message-Id: <20180703225219.25526-1-jesus.sanchez-palencia@intel.com> X-Mailer: git-send-email 2.18.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This should come from the next uapi headers update. Sending it now just as a convenience so anyone can build tc with etf and taprio support. Signed-off-by: Jesus Sanchez-Palencia --- include/uapi/linux/pkt_sched.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index 37b5096a..94911846 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -539,6 +539,7 @@ enum { TCA_NETEM_LATENCY64, TCA_NETEM_JITTER64, TCA_NETEM_SLOT, + TCA_NETEM_SLOT_DIST, __TCA_NETEM_MAX, }; @@ -581,6 +582,8 @@ struct tc_netem_slot { __s64 max_delay; __s32 max_packets; __s32 max_bytes; + __s64 dist_delay; /* nsec */ + __s64 dist_jitter; /* nsec */ }; enum { @@ -934,4 +937,22 @@ enum { #define TCA_CBS_MAX (__TCA_CBS_MAX - 1) + +/* ETF */ +struct tc_etf_qopt { + __s32 delta; + __s32 clockid; + __u32 flags; +#define TC_ETF_DEADLINE_MODE_ON BIT(0) +#define TC_ETF_OFFLOAD_ON BIT(1) +}; + +enum { + TCA_ETF_UNSPEC, + TCA_ETF_PARMS, + __TCA_ETF_MAX, +}; + +#define TCA_ETF_MAX (__TCA_ETF_MAX - 1) + #endif From patchwork Tue Jul 3 22:52:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesus Sanchez-Palencia X-Patchwork-Id: 938996 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=fail (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Kzz83fh7z9s29 for ; Wed, 4 Jul 2018 08:57:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753179AbeGCW5W (ORCPT ); Tue, 3 Jul 2018 18:57:22 -0400 Received: from mga17.intel.com ([192.55.52.151]:4267 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932313AbeGCW5R (ORCPT ); Tue, 3 Jul 2018 18:57:17 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 15:57:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,305,1526367600"; d="scan'208";a="52424169" Received: from darjeeling.jf.intel.com ([10.24.15.98]) by fmsmga008.fm.intel.com with ESMTP; 03 Jul 2018 15:57:17 -0700 From: Jesus Sanchez-Palencia To: netdev@vger.kernel.org Cc: jhs@mojatatu.com, kurt.kanzenbach@linutronix.de, xiyou.wangcong@gmail.com, jiri@resnulli.us, vinicius.gomes@intel.com, Jesus Sanchez-Palencia Subject: [PATCH v2 iproute2 2/2] tc: Add support for the ETF Qdisc Date: Tue, 3 Jul 2018 15:52:19 -0700 Message-Id: <20180703225219.25526-2-jesus.sanchez-palencia@intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180703225219.25526-1-jesus.sanchez-palencia@intel.com> References: <20180703225219.25526-1-jesus.sanchez-palencia@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vinicius Costa Gomes The "Earliest TxTime First" (ETF) queueing discipline allows precise control of the transmission time of packets by providing a sorted time-based scheduling of packets. The syntax is: tc qdisc add dev DEV parent NODE etf delta clockid [offload] [deadline_mode] Signed-off-by: Vinicius Costa Gomes Signed-off-by: Jesus Sanchez-Palencia --- tc/Makefile | 1 + tc/q_etf.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 tc/q_etf.c diff --git a/tc/Makefile b/tc/Makefile index dfd00267..4525c0fb 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -71,6 +71,7 @@ TCMODULES += q_clsact.o TCMODULES += e_bpf.o TCMODULES += f_matchall.o TCMODULES += q_cbs.o +TCMODULES += q_etf.o TCSO := ifeq ($(TC_CONFIG_ATM),y) diff --git a/tc/q_etf.c b/tc/q_etf.c new file mode 100644 index 00000000..5db1dd6f --- /dev/null +++ b/tc/q_etf.c @@ -0,0 +1,168 @@ +/* + * q_etf.c Earliest TxTime First (ETF). + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * Authors: Vinicius Costa Gomes + * Jesus Sanchez-Palencia + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "utils.h" +#include "tc_util.h" + +#define CLOCKID_INVALID (-1) +static void explain(void) +{ + fprintf(stderr, "Usage: ... etf delta NANOS clockid CLOCKID [offload] [deadline_mode]\n"); + fprintf(stderr, "CLOCKID must be a valid SYS-V id (i.e. CLOCK_TAI)\n"); +} + +static void explain1(const char *arg, const char *val) +{ + fprintf(stderr, "etf: illegal value for \"%s\": \"%s\"\n", arg, val); +} + +static void explain_clockid(const char *val) +{ + fprintf(stderr, "etf: illegal value for \"clockid\": \"%s\".\n", val); + fprintf(stderr, "It must be a valid SYS-V id (i.e. CLOCK_TAI)"); +} + +static int get_clockid(__s32 *val, const char *arg) +{ + const struct static_clockid { + const char *name; + clockid_t clockid; + } clockids_sysv[] = { + { "CLOCK_REALTIME", CLOCK_REALTIME }, + { "CLOCK_TAI", CLOCK_TAI }, + { "CLOCK_BOOTTIME", CLOCK_BOOTTIME }, + { "CLOCK_MONOTONIC", CLOCK_MONOTONIC }, + { NULL } + }; + + const struct static_clockid *c; + + for (c = clockids_sysv; c->name; c++) { + if (strncasecmp(c->name, arg, 25) == 0) { + *val = c->clockid; + + return 0; + } + } + + return -1; +} + + +static int etf_parse_opt(struct qdisc_util *qu, int argc, + char **argv, struct nlmsghdr *n, const char *dev) +{ + struct tc_etf_qopt opt = { + .clockid = CLOCKID_INVALID, + }; + struct rtattr *tail; + + while (argc > 0) { + if (matches(*argv, "offload") == 0) { + if (opt.flags & TC_ETF_OFFLOAD_ON) { + fprintf(stderr, "etf: duplicate \"offload\" specification\n"); + return -1; + } + + opt.flags |= TC_ETF_OFFLOAD_ON; + } else if (matches(*argv, "deadline_mode") == 0) { + if (opt.flags & TC_ETF_DEADLINE_MODE_ON) { + fprintf(stderr, "etf: duplicate \"deadline_mode\" specification\n"); + return -1; + } + + opt.flags |= TC_ETF_DEADLINE_MODE_ON; + } else if (matches(*argv, "delta") == 0) { + NEXT_ARG(); + if (opt.delta) { + fprintf(stderr, "etf: duplicate \"delta\" specification\n"); + return -1; + } + if (get_s32(&opt.delta, *argv, 0)) { + explain1("delta", *argv); + return -1; + } + } else if (matches(*argv, "clockid") == 0) { + NEXT_ARG(); + if (opt.clockid != CLOCKID_INVALID) { + fprintf(stderr, "etf: duplicate \"clockid\" specification\n"); + return -1; + } + if (get_clockid(&opt.clockid, *argv)) { + explain_clockid(*argv); + return -1; + } + } else if (strcmp(*argv, "help") == 0) { + explain(); + return -1; + } else { + fprintf(stderr, "etf: unknown parameter \"%s\"\n", *argv); + explain(); + return -1; + } + argc--; argv++; + } + + tail = NLMSG_TAIL(n); + addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); + addattr_l(n, 2024, TCA_ETF_PARMS, &opt, sizeof(opt)); + tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; + return 0; +} + +static int etf_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) +{ + struct rtattr *tb[TCA_ETF_MAX+1]; + struct tc_etf_qopt *qopt; + + if (opt == NULL) + return 0; + + parse_rtattr_nested(tb, TCA_ETF_MAX, opt); + + if (tb[TCA_ETF_PARMS] == NULL) + return -1; + + qopt = RTA_DATA(tb[TCA_ETF_PARMS]); + if (RTA_PAYLOAD(tb[TCA_ETF_PARMS]) < sizeof(*qopt)) + return -1; + + if (qopt->clockid == CLOCKID_INVALID) + print_string(PRINT_ANY, "clockid", "clockid %s ", "invalid"); + else + print_uint(PRINT_ANY, "clockid", "clockid %d ", qopt->clockid); + + print_uint(PRINT_ANY, "delta", "delta %d ", qopt->delta); + print_string(PRINT_ANY, "offload", "offload %s ", + (qopt->flags & TC_ETF_OFFLOAD_ON) ? "on" : "off"); + print_string(PRINT_ANY, "deadline_mode", "deadline_mode %s", + (qopt->flags & TC_ETF_DEADLINE_MODE_ON) ? "on" : "off"); + + return 0; +} + +struct qdisc_util etf_qdisc_util = { + .id = "etf", + .parse_qopt = etf_parse_opt, + .print_qopt = etf_print_opt, +};