From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: Re: [patch iproute2 net-next v11 4/4] tc: implement ingress/egress block index attributes for qdiscs Date: Fri, 19 Jan 2018 12:53:18 -0800 Message-ID: <67566512-b9d8-cd18-1f0e-fe64009f2bfd@gmail.com> References: <20180117104657.8605-1-jiri@resnulli.us> <20180117104817.8702-4-jiri@resnulli.us> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, mlxsw@mellanox.com, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com, michael.chan@broadcom.com, ganeshgr@chelsio.com, saeedm@mellanox.com, matanb@mellanox.com, leonro@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, simon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com, john.hurley@netronome.com, alexander.h.duyck@intel.com, ogerlitz@mellanox.com, john.fastabend@gmail.com, daniel@iogearbox.net To: Jiri Pirko , netdev@vger.kernel.org Return-path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:40900 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752938AbeASUxU (ORCPT ); Fri, 19 Jan 2018 15:53:20 -0500 Received: by mail-pf0-f196.google.com with SMTP id i66so2220823pfd.7 for ; Fri, 19 Jan 2018 12:53:20 -0800 (PST) In-Reply-To: <20180117104817.8702-4-jiri@resnulli.us> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: On 1/17/18 2:48 AM, Jiri Pirko wrote: > diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c > index 3f91558..9f06d37 100644 > --- a/tc/tc_qdisc.c > +++ b/tc/tc_qdisc.c > @@ -31,6 +31,7 @@ static int usage(void) > fprintf(stderr, " [ handle QHANDLE ] [ root | ingress | clsact | parent CLASSID ]\n"); > fprintf(stderr, " [ estimator INTERVAL TIME_CONSTANT ]\n"); > fprintf(stderr, " [ stab [ help | STAB_OPTIONS] ]\n"); > + fprintf(stderr, " [ ingress_block BLOCK_INDEX ] [ egress_block BLOCK_INDEX ]\n"); > fprintf(stderr, " [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n"); > fprintf(stderr, "\n"); > fprintf(stderr, " tc qdisc show [ dev STRING ] [ ingress | clsact ] [ invisible ]\n"); > @@ -61,6 +62,8 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv) > .n.nlmsg_type = cmd, > .t.tcm_family = AF_UNSPEC, > }; > + __u32 ingress_block = 0; > + __u32 egress_block = 0; > > while (argc > 0) { > if (strcmp(*argv, "dev") == 0) { > @@ -121,6 +124,14 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv) > if (parse_size_table(&argc, &argv, &stab.szopts) < 0) > return -1; > continue; > + } else if (matches(*argv, "ingress_block") == 0) { > + NEXT_ARG(); > + if (get_u32(&ingress_block, *argv, 0) || !ingress_block) > + invarg("invalid ingress block index value", *argv); > + } else if (matches(*argv, "egress_block") == 0) { > + NEXT_ARG(); > + if (get_u32(&egress_block, *argv, 0) || !egress_block) > + invarg("invalid egress block index value", *argv); > } else if (matches(*argv, "help") == 0) { > usage(); > } else { > @@ -138,6 +149,13 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv) > if (est.ewma_log) > addattr_l(&req.n, sizeof(req), TCA_RATE, &est, sizeof(est)); > > + if (ingress_block) > + addattr32(&req.n, sizeof(req), > + TCA_INGRESS_BLOCK, ingress_block); > + if (egress_block) > + addattr32(&req.n, sizeof(req), > + TCA_EGRESS_BLOCK, egress_block); > + > if (q) { > if (q->parse_qopt) { > if (q->parse_qopt(q, argc, argv, &req.n, d)) > @@ -270,6 +288,24 @@ int print_qdisc(const struct sockaddr_nl *who, > (rta_getattr_u8(tb[TCA_HW_OFFLOAD]))) > print_bool(PRINT_ANY, "offloaded", "offloaded ", true); > > + if (tb[TCA_INGRESS_BLOCK] && > + RTA_PAYLOAD(tb[TCA_INGRESS_BLOCK]) >= sizeof(__u32)) { same comment here and below about >=. you expect a u32 so require the size to be sizeof u32. > + __u32 block = rta_getattr_u32(tb[TCA_INGRESS_BLOCK]); > + > + if (block) > + print_uint(PRINT_ANY, "ingress_block", > + "ingress_block %u ", block); > + } > + > + if (tb[TCA_EGRESS_BLOCK] && > + RTA_PAYLOAD(tb[TCA_EGRESS_BLOCK]) >= sizeof(__u32)) { > + __u32 block = rta_getattr_u32(tb[TCA_EGRESS_BLOCK]); > + > + if (block) > + print_uint(PRINT_ANY, "egress_block", > + "egress_block %u ", block); > + } > + > /* pfifo_fast is generic enough to warrant the hardcoding --JHS */ > if (strcmp("pfifo_fast", RTA_DATA(tb[TCA_KIND])) == 0) > q = get_qdisc_kind("prio"); >