net: sched: introduce ingress/egress block index attributes for qdisc

Introduce two new attributes to be used for qdisc creation and dumping.
One for ingress block, one for egress block. Introduce a set of ops that
qdisc which supports block sharing would implement.

Passing block indexes in qdisc change is not supported yet and it is
checked and forbidded.

In future, these attributes are to be reused for specifying block
indexes for classes as well. As of this moment however, it is not
supported so a check is in place to forbid it.

Suggested-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index bf5cc0a1d0f62d77b98d0c06e8722739f5a9c5fa..cfc19d0ba2addf4e48eb640bc832634422048d76 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -204,6 +204,13 @@ struct Qdisc_ops {
        int                     (*dump)(struct Qdisc *, struct sk_buff *);
        int                     (*dump_stats)(struct Qdisc *, struct gnet_dump *);
 
+       void                    (*ingress_block_set)(struct Qdisc *sch,
+                                                    u32 block_index);
+       void                    (*egress_block_set)(struct Qdisc *sch,
+                                                   u32 block_index);
+       u32                     (*ingress_block_get)(struct Qdisc *sch);
+       u32                     (*egress_block_get)(struct Qdisc *sch);
+
        struct module           *owner;
 };
 

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index da878f2e7c3958c5d91587847590cb1e03221553..9b15005955faaa244bfae5730a1cdcb3fd42b4a0 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -568,6 +568,8 @@ enum {
        TCA_DUMP_INVISIBLE,
        TCA_CHAIN,
        TCA_HW_OFFLOAD,
+       TCA_INGRESS_BLOCK,
+       TCA_EGRESS_BLOCK,
        __TCA_MAX
 };
 

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 7dffa9dce28b28e01c96f469f42618e3d910f714..d512f49ee83c29143c5aea7315c9d4f2304c71bf 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -791,6 +791,7 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
        unsigned char *b = skb_tail_pointer(skb);
        struct gnet_dump d;
        struct qdisc_size_table *stab;
+       u32 block_index;
        __u32 qlen;
 
        cond_resched();
@@ -807,6 +808,18 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid,
        tcm->tcm_info = refcount_read(&q->refcnt);
        if (nla_put_string(skb, TCA_KIND, q->ops->id))
                goto nla_put_failure;
+       if (q->ops->ingress_block_get) {
+               block_index = q->ops->ingress_block_get(q);
+               if (block_index &&
+                   nla_put_u32(skb, TCA_INGRESS_BLOCK, block_index))
+                       goto nla_put_failure;
+       }
+       if (q->ops->egress_block_get) {
+               block_index = q->ops->egress_block_get(q);
+               if (block_index &&
+                   nla_put_u32(skb, TCA_EGRESS_BLOCK, block_index))
+                       goto nla_put_failure;
+       }
        if (q->ops->dump && q->ops->dump(q, skb) < 0)
                goto nla_put_failure;
        if (nla_put_u8(skb, TCA_HW_OFFLOAD, !!(q->flags & TCQ_F_OFFLOADED)))
@@ -994,6 +1007,40 @@ skip:
        return err;
 }
 
+static int qdisc_block_indexes_set(struct Qdisc *sch, struct nlattr **tca,
+                                  struct netlink_ext_ack *extack)
+{
+       u32 block_index;
+
+       if (tca[TCA_INGRESS_BLOCK]) {
+               block_index = nla_get_u32(tca[TCA_INGRESS_BLOCK]);
+
+               if (!block_index) {
+                       NL_SET_ERR_MSG(extack, "Ingress block index cannot be 0");
+                       return -EINVAL;
+               }
+               if (!sch->ops->ingress_block_set) {
+                       NL_SET_ERR_MSG(extack, "Ingress block sharing is not supported");
+                       return -EOPNOTSUPP;
+               }
+               sch->ops->ingress_block_set(sch, block_index);
+       }
+       if (tca[TCA_EGRESS_BLOCK]) {
+               block_index = nla_get_u32(tca[TCA_EGRESS_BLOCK]);
+
+               if (!block_index) {
+                       NL_SET_ERR_MSG(extack, "Egress block index cannot be 0");
+                       return -EINVAL;
+               }
+               if (!sch->ops->egress_block_set) {
+                       NL_SET_ERR_MSG(extack, "Egress block sharing is not supported");
+                       return -EOPNOTSUPP;
+               }
+               sch->ops->egress_block_set(sch, block_index);
+       }
+       return 0;
+}
+
 /* lockdep annotation is needed for ingress; egress gets it only for name */
 static struct lock_class_key qdisc_tx_lock;
 static struct lock_class_key qdisc_rx_lock;
@@ -1088,6 +1135,10 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
                netdev_info(dev, "Caught tx_queue_len zero misconfig\n");
        }
 
+       err = qdisc_block_indexes_set(sch, tca, extack);
+       if (err)
+               goto err_out3;
+
        if (ops->init) {
                err = ops->init(sch, tca[TCA_OPTIONS], extack);
                if (err != 0)
@@ -1169,6 +1220,10 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca,
                        NL_SET_ERR_MSG(extack, "Change operation not supported by specified qdisc");
                        return -EINVAL;
                }
+               if (tca[TCA_INGRESS_BLOCK] || tca[TCA_EGRESS_BLOCK]) {
+                       NL_SET_ERR_MSG(extack, "Change of blocks is not supported");
+                       return -EOPNOTSUPP;
+               }
                err = sch->ops->change(sch, tca[TCA_OPTIONS], extack);
                if (err)
                        return err;
@@ -1894,6 +1949,11 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n,
                }
        }
 
+       if (tca[TCA_INGRESS_BLOCK] || tca[TCA_EGRESS_BLOCK]) {
+               NL_SET_ERR_MSG(extack, "Shared blocks are not supported for classes");
+               return -EOPNOTSUPP;
+       }
+
        new_cl = cl;
        err = -EOPNOTSUPP;
        if (cops->change)