* [PATCH iproute2-next] tc: add support for plug qdisc
@ 2019-04-24 16:29 Paolo Abeni
2019-04-24 20:47 ` Stephen Hemminger
2019-04-24 20:49 ` Stephen Hemminger
0 siblings, 2 replies; 6+ messages in thread
From: Paolo Abeni @ 2019-04-24 16:29 UTC (permalink / raw)
To: stephen; +Cc: netdev
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.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
tc/Makefile | 1 +
tc/q_plug.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+)
create mode 100644 tc/q_plug.c
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..53d977b1
--- /dev/null
+++ b/tc/q_plug.c
@@ -0,0 +1,81 @@
+/*
+ * q_log.c plug scheduler
+ *
+ * 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: 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,
+};
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH iproute2-next] tc: add support for plug qdisc
2019-04-24 16:29 [PATCH iproute2-next] tc: add support for plug qdisc Paolo Abeni
@ 2019-04-24 20:47 ` Stephen Hemminger
2019-04-24 20:49 ` Stephen Hemminger
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Hemminger @ 2019-04-24 20:47 UTC (permalink / raw)
To: Paolo Abeni; +Cc: netdev
On Wed, 24 Apr 2019 18:29:39 +0200
Paolo Abeni <pabeni@redhat.com> wrote:
> @@ -0,0 +1,81 @@
> +/*
> + * q_log.c plug scheduler
> + *
> + * 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: Paolo Abeni, <pabeni@redhat.com>
Please don't add any more GPL boilerplate.
Why not use SPDX instead.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH iproute2-next] tc: add support for plug qdisc
2019-04-24 16:29 [PATCH iproute2-next] tc: add support for plug qdisc Paolo Abeni
2019-04-24 20:47 ` Stephen Hemminger
@ 2019-04-24 20:49 ` Stephen Hemminger
2019-04-26 8:47 ` Paolo Abeni
1 sibling, 1 reply; 6+ messages in thread
From: Stephen Hemminger @ 2019-04-24 20:49 UTC (permalink / raw)
To: Paolo Abeni; +Cc: netdev
On Wed, 24 Apr 2019 18:29:39 +0200
Paolo Abeni <pabeni@redhat.com> wrote:
> +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;
> +}
> +
All qdisc must dump their state in same form as the parse option.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH iproute2-next] tc: add support for plug qdisc
2019-04-24 20:49 ` Stephen Hemminger
@ 2019-04-26 8:47 ` Paolo Abeni
2019-04-29 17:16 ` Stephen Hemminger
0 siblings, 1 reply; 6+ messages in thread
From: Paolo Abeni @ 2019-04-26 8:47 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Hi,
On Wed, 2019-04-24 at 13:49 -0700, Stephen Hemminger wrote:
> On Wed, 24 Apr 2019 18:29:39 +0200
> Paolo Abeni <pabeni@redhat.com> wrote:
>
> > +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;
> > +}
> > +
>
> All qdisc must dump their state in same form as the parse option.
Thank you for the feedback.
The problem here is that the sch_plug qdisc does not implement the
dump() qdisc_op, so this callback has nothing to dump.
Must I patch sch_plug first?
Thanks,
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH iproute2-next] tc: add support for plug qdisc
2019-04-26 8:47 ` Paolo Abeni
@ 2019-04-29 17:16 ` Stephen Hemminger
2019-04-30 15:00 ` Paolo Abeni
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Hemminger @ 2019-04-29 17:16 UTC (permalink / raw)
To: Paolo Abeni; +Cc: netdev
On Fri, 26 Apr 2019 10:47:52 +0200
Paolo Abeni <pabeni@redhat.com> wrote:
> Hi,
>
> On Wed, 2019-04-24 at 13:49 -0700, Stephen Hemminger wrote:
> > On Wed, 24 Apr 2019 18:29:39 +0200
> > Paolo Abeni <pabeni@redhat.com> wrote:
> >
> > > +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;
> > > +}
> > > +
> >
> > All qdisc must dump their state in same form as the parse option.
>
> Thank you for the feedback.
>
> The problem here is that the sch_plug qdisc does not implement the
> dump() qdisc_op, so this callback has nothing to dump.
>
> Must I patch sch_plug first?
>
> Thanks,
>
> Paolo
>
OK, lets put the patch in as is for now. And then fix the kernel, then add print?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH iproute2-next] tc: add support for plug qdisc
2019-04-29 17:16 ` Stephen Hemminger
@ 2019-04-30 15:00 ` Paolo Abeni
0 siblings, 0 replies; 6+ messages in thread
From: Paolo Abeni @ 2019-04-30 15:00 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
On Mon, 2019-04-29 at 10:16 -0700, Stephen Hemminger wrote:
> On Fri, 26 Apr 2019 10:47:52 +0200
> Paolo Abeni <pabeni@redhat.com> wrote:
> > The problem here is that the sch_plug qdisc does not implement the
> > dump() qdisc_op, so this callback has nothing to dump.
> >
> > Must I patch sch_plug first?
> >
> > Thanks,
> >
> > Paolo
> >
>
> OK, lets put the patch in as is for now. And then fix the kernel, then add print?
Sounds good to me. I'll send soon a v2 with the SPDX.
Thanks,
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-04-30 15:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-24 16:29 [PATCH iproute2-next] tc: add support for plug qdisc Paolo Abeni
2019-04-24 20:47 ` Stephen Hemminger
2019-04-24 20:49 ` Stephen Hemminger
2019-04-26 8:47 ` Paolo Abeni
2019-04-29 17:16 ` Stephen Hemminger
2019-04-30 15:00 ` Paolo Abeni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).