sch_htb: Allow HTB quantum parameter in offload mode

The current implementation of HTB offload returns the EINVAL error for
quantum parameter. This patch removes the error returning checks for
'quantum' parameter and populates its value to tc_htb_qopt_offload
structure such that driver can use the same.

Add quantum parameter check in mlx5 driver, as mlx5 devices are not capable
of supporting the quantum parameter when htb offload is used. Report error
if quantum parameter is set to a non-default value.

Signed-off-by: Naveen Mamindlapalli <naveenm@marvell.com>
Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
index 1874c2f..244bc15 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
@@ -379,9 +379,9 @@ int mlx5e_htb_setup_tc(struct mlx5e_priv *priv, struct tc_htb_qopt_offload *htb_
        if (!htb && htb_qopt->command != TC_HTB_CREATE)
                return -EINVAL;
 
-       if (htb_qopt->prio) {
+       if (htb_qopt->prio || htb_qopt->quantum) {
                NL_SET_ERR_MSG_MOD(htb_qopt->extack,
-                                  "prio parameter is not supported by device with HTB offload enabled.");
+                                  "prio and quantum parameters are not supported by device with HTB offload enabled.");
                return -EOPNOTSUPP;
        }
 

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index a2ea45c..139cd09 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -866,6 +866,7 @@ struct tc_htb_qopt_offload {
        u32 parent_classid;
        u16 classid;
        u16 qid;
+       u32 quantum;
        u64 rate;
        u64 ceil;
        u8 prio;

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 325c290..333800a 100644 (file)
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1810,10 +1810,6 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
                        NL_SET_ERR_MSG(extack, "HTB offload doesn't support the mpu parameter");
                        goto failure;
                }
-               if (hopt->quantum) {
-                       NL_SET_ERR_MSG(extack, "HTB offload doesn't support the quantum parameter");
-                       goto failure;
-               }
        }
 
        /* Keeping backward compatible with rate_table based iproute2 tc */
@@ -1910,6 +1906,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
                                .rate = max_t(u64, hopt->rate.rate, rate64),
                                .ceil = max_t(u64, hopt->ceil.rate, ceil64),
                                .prio = hopt->prio,
+                               .quantum = hopt->quantum,
                                .extack = extack,
                        };
                        err = htb_offload(dev, &offload_opt);
@@ -1931,6 +1928,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
                                .rate = max_t(u64, hopt->rate.rate, rate64),
                                .ceil = max_t(u64, hopt->ceil.rate, ceil64),
                                .prio = hopt->prio,
+                               .quantum = hopt->quantum,
                                .extack = extack,
                        };
                        err = htb_offload(dev, &offload_opt);
@@ -2017,6 +2015,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid,
                                .rate = max_t(u64, hopt->rate.rate, rate64),
                                .ceil = max_t(u64, hopt->ceil.rate, ceil64),
                                .prio = hopt->prio,
+                               .quantum = hopt->quantum,
                                .extack = extack,
                        };
                        err = htb_offload(dev, &offload_opt);