diff mbox series

[iproute2-next,v2] tc: add support for plug qdisc

Message ID fe5c248b0eb19a2dd42bb1bff8a0c40c1e9e969f.1556640913.git.pabeni@redhat.com
State Accepted
Delegated to: David Ahern
Headers show
Series [iproute2-next,v2] tc: add support for plug qdisc | expand

Commit Message

Paolo Abeni April 30, 2019, 4:53 p.m. UTC 
sch_plug can be used to perform functional qdisc unit tests
controlling explicitly the queuing behaviour from user-space.

Plug support lacks since its introduction in 2012. This change
introduces basic support, to control the tc status.

v1 -> v2:
 - use the SPDX identifier

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 tc/Makefile |  1 +
 tc/q_plug.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 tc/q_plug.c

Comments

David Ahern May 4, 2019, 4:14 p.m. UTC | #1 
On 4/30/19 10:53 AM, Paolo Abeni wrote:
> sch_plug can be used to perform functional qdisc unit tests
> controlling explicitly the queuing behaviour from user-space.

Hi Paolo:
Do you have or are you planning to write unit tests?

> 
> Plug support lacks since its introduction in 2012. This change
> introduces basic support, to control the tc status.
> 
> v1 -> v2:
>  - use the SPDX identifier
> 
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
>  tc/Makefile |  1 +
>  tc/q_plug.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 77 insertions(+)
>  create mode 100644 tc/q_plug.c
> 

applied to iproute2-next.
Paolo Abeni May 6, 2019, 12:35 p.m. UTC | #2 
On Sat, 2019-05-04 at 10:14 -0600, David Ahern wrote:
> On 4/30/19 10:53 AM, Paolo Abeni wrote:
> > sch_plug can be used to perform functional qdisc unit tests
> > controlling explicitly the queuing behaviour from user-space.
> 
> Hi Paolo:
> Do you have or are you planning to write unit tests?

whoops, I must admit I was not aware of iproute2/testsuite.

Some kernel work is needed for a proper selftest, as sch_plug dump() is
currently missing.

I'll try to give that a spin when net-next will re-open

Thanks,

Paolo
diff mbox series

Patch

diff --git a/tc/Makefile b/tc/Makefile
index 2edaf2c8..1a305cf4 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -75,6 +75,7 @@  TCMODULES += f_matchall.o
 TCMODULES += q_cbs.o
 TCMODULES += q_etf.o
 TCMODULES += q_taprio.o
+TCMODULES += q_plug.o
 
 TCSO :=
 ifeq ($(TC_CONFIG_ATM),y)
diff --git a/tc/q_plug.c b/tc/q_plug.c
new file mode 100644
index 00000000..2c1c1a0b
--- /dev/null
+++ b/tc/q_plug.c
@@ -0,0 +1,76 @@ 
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * q_log.c		plug scheduler
+ *
+ * Copyright (C) 2019	Paolo Abeni <pabeni@redhat.com>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <string.h>
+
+#include "utils.h"
+#include "tc_util.h"
+
+static void explain(void)
+{
+	fprintf(stderr, "Usage: ... plug [block | release | release_indefinite | limit NUMBER]\n");
+}
+
+static int plug_parse_opt(struct qdisc_util *qu, int argc, char **argv,
+			  struct nlmsghdr *n, const char *dev)
+{
+	struct tc_plug_qopt opt = {};
+	int ok = 0;
+
+	while (argc > 0) {
+		if (strcmp(*argv, "block") == 0) {
+			opt.action = TCQ_PLUG_BUFFER;
+			ok++;
+		} else if (strcmp(*argv, "release") == 0) {
+			opt.action = TCQ_PLUG_RELEASE_ONE;
+			ok++;
+		} else if (strcmp(*argv, "release_indefinite") == 0) {
+			opt.action = TCQ_PLUG_RELEASE_INDEFINITE;
+			ok++;
+		} else if (strcmp(*argv, "limit") == 0) {
+			opt.action = TCQ_PLUG_LIMIT;
+			NEXT_ARG();
+			if (get_size(&opt.limit, *argv)) {
+				fprintf(stderr, "Illegal value for \"limit\": \"%s\"\n", *argv);
+				return -1;
+			}
+			ok++;
+		} else if (strcmp(*argv, "help") == 0) {
+			explain();
+			return -1;
+		} else {
+			fprintf(stderr, "%s: unknown parameter \"%s\"\n", qu->id, *argv);
+			explain();
+			return -1;
+		}
+		argc--; argv++;
+	}
+
+	if (ok)
+		addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
+	return 0;
+}
+
+static int plug_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
+{
+	/* dummy implementation as sch_plug does not implement a dump op */
+	return 0;
+}
+
+
+struct qdisc_util plug_qdisc_util = {
+	.id = "plug",
+	.parse_qopt = plug_parse_opt,
+	.print_qopt = plug_print_opt,
+};