Commit 710fb396 authored by Alexander Aring's avatar Alexander Aring Committed by David S. Miller
Browse files

net: sch: sch_cbs: add extack support 



This patch adds extack support for the cbs qdisc implementation by
adding NL_SET_ERR_MSG in validation of user input.
Also it serves to illustrate a use case of how the infrastructure ops
api changes are to be used by individual qdiscs.

Cc: David Ahern <dsahern@gmail.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarAlexander Aring <aring@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62a6de62

net/sched/sch_cbs.c

+16 −7
Original line number Original line Diff line number Diff line
@@ -219,14 +219,17 @@ static void cbs_disable_offload(struct net_device *dev, 
}

}





static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,

static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,

			      const struct tc_cbs_qopt *opt)

			      const struct tc_cbs_qopt *opt,

			      struct netlink_ext_ack *extack)

{

{

	const struct net_device_ops *ops = dev->netdev_ops;

	const struct net_device_ops *ops = dev->netdev_ops;

	struct tc_cbs_qopt_offload cbs = { };

	struct tc_cbs_qopt_offload cbs = { };

	int err;

	int err;





	if (!ops->ndo_setup_tc)

	if (!ops->ndo_setup_tc) {

		NL_SET_ERR_MSG(extack, "Specified device does not support cbs offload");

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;

	}





	cbs.queue = q->queue;

	cbs.queue = q->queue;
@@ -237,8 +240,10 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q, 
	cbs.sendslope = opt->sendslope;

	cbs.sendslope = opt->sendslope;





	err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);

	err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);

	if (err < 0)

	if (err < 0) {

		NL_SET_ERR_MSG(extack, "Specified device failed to setup cbs hardware offload");

		return err;

		return err;

	}





	q->enqueue = cbs_enqueue_offload;

	q->enqueue = cbs_enqueue_offload;

	q->dequeue = cbs_dequeue_offload;

	q->dequeue = cbs_dequeue_offload;
@@ -255,12 +260,14 @@ static int cbs_change(struct Qdisc *sch, struct nlattr *opt, 
	struct tc_cbs_qopt *qopt;

	struct tc_cbs_qopt *qopt;

	int err;

	int err;





	err = nla_parse_nested(tb, TCA_CBS_MAX, opt, cbs_policy, NULL);

	err = nla_parse_nested(tb, TCA_CBS_MAX, opt, cbs_policy, extack);

	if (err < 0)

	if (err < 0)

		return err;

		return err;





	if (!tb[TCA_CBS_PARMS])

	if (!tb[TCA_CBS_PARMS]) {

		NL_SET_ERR_MSG(extack, "Missing CBS parameter which are mandatory");

		return -EINVAL;

		return -EINVAL;

	}





	qopt = nla_data(tb[TCA_CBS_PARMS]);

	qopt = nla_data(tb[TCA_CBS_PARMS]);
@@ -277,7 +284,7 @@ static int cbs_change(struct Qdisc *sch, struct nlattr *opt, 




		cbs_disable_offload(dev, q);

		cbs_disable_offload(dev, q);

	} else {

	} else {

		err = cbs_enable_offload(dev, q, qopt);

		err = cbs_enable_offload(dev, q, qopt, extack);

		if (err < 0)

		if (err < 0)

			return err;

			return err;

	}

	}
@@ -298,8 +305,10 @@ static int cbs_init(struct Qdisc *sch, struct nlattr *opt, 
	struct cbs_sched_data *q = qdisc_priv(sch);

	struct cbs_sched_data *q = qdisc_priv(sch);

	struct net_device *dev = qdisc_dev(sch);

	struct net_device *dev = qdisc_dev(sch);





	if (!opt)

	if (!opt) {

		NL_SET_ERR_MSG(extack, "Missing CBS qdisc options  which are mandatory");

		return -EINVAL;

		return -EINVAL;

	}





	q->queue = sch->dev_queue - netdev_get_tx_queue(dev, 0);

	q->queue = sch->dev_queue - netdev_get_tx_queue(dev, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE