@@ -28,25 +28,42 @@ struct mqprio_sched {
};
static int mqprio_validate_queue_counts(struct net_device *dev,
- const struct tc_mqprio_qopt *qopt)
+ const struct tc_mqprio_qopt *qopt,
+ struct netlink_ext_ack *extack)
{
int i, j;
for (i = 0; i < qopt->num_tc; i++) {
unsigned int last = qopt->offset[i] + qopt->count[i];
+ if (!qopt->count[i]) {
+ NL_SET_ERR_MSG_FMT_MOD(extack, "No queues for TC %d",
+ i);
+ return -EINVAL;
+ }
+
/* Verify the queue count is in tx range being equal to the
* real_num_tx_queues indicates the last queue is in use.
*/
if (qopt->offset[i] >= dev->real_num_tx_queues ||
- !qopt->count[i] ||
- last > dev->real_num_tx_queues)
+ last > dev->real_num_tx_queues) {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Queues %d:%d for TC %d exceed the %d TX queues available",
+ qopt->count[i], qopt->offset[i],
+ i, dev->real_num_tx_queues);
return -EINVAL;
+ }
/* Verify that the offset and counts do not overlap */
for (j = i + 1; j < qopt->num_tc; j++) {
- if (last > qopt->offset[j])
+ if (last > qopt->offset[j]) {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Queues %d:%d for TC %d overlap with last TX queue %d for TC %d",
+ qopt->count[j],
+ qopt->offset[j],
+ j, last, i);
return -EINVAL;
+ }
}
}
@@ -54,7 +71,8 @@ static int mqprio_validate_queue_counts(struct net_device *dev,
}
static int mqprio_enable_offload(struct Qdisc *sch,
- const struct tc_mqprio_qopt *qopt)
+ const struct tc_mqprio_qopt *qopt,
+ struct netlink_ext_ack *extack)
{
struct tc_mqprio_qopt_offload mqprio = {.qopt = *qopt};
struct mqprio_sched *priv = qdisc_priv(sch);
@@ -66,7 +84,7 @@ static int mqprio_enable_offload(struct Qdisc *sch,
&caps, sizeof(caps));
if (caps.validate_queue_counts) {
- err = mqprio_validate_queue_counts(dev, qopt);
+ err = mqprio_validate_queue_counts(dev, qopt, extack);
if (err)
return err;
}
@@ -138,7 +156,9 @@ static void mqprio_destroy(struct Qdisc *sch)
netdev_set_num_tc(dev, 0);
}
-static int mqprio_parse_opt(struct net_device *dev, struct tc_mqprio_qopt *qopt)
+static int mqprio_parse_opt(struct net_device *dev,
+ struct tc_mqprio_qopt *qopt,
+ struct netlink_ext_ack *extack)
{
int i;
@@ -167,7 +187,7 @@ static int mqprio_parse_opt(struct net_device *dev, struct tc_mqprio_qopt *qopt)
if (qopt->hw)
return dev->netdev_ops->ndo_setup_tc ? 0 : -EINVAL;
- return mqprio_validate_queue_counts(dev, qopt);
+ return mqprio_validate_queue_counts(dev, qopt, extack);
}
static const struct nla_policy mqprio_policy[TCA_MQPRIO_MAX + 1] = {
@@ -280,7 +300,7 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt,
return -EINVAL;
qopt = nla_data(opt);
- if (mqprio_parse_opt(dev, qopt))
+ if (mqprio_parse_opt(dev, qopt, extack))
return -EINVAL;
len = nla_len(opt) - NLA_ALIGN(sizeof(*qopt));
@@ -314,7 +334,7 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt,
* supplied and verified mapping
*/
if (qopt->hw) {
- err = mqprio_enable_offload(sch, qopt);
+ err = mqprio_enable_offload(sch, qopt, extack);
if (err)
return err;
} else {