Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a33c4a26 authored by Yang Yingliang's avatar Yang Yingliang Committed by David S. Miller
Browse files

net_sched: tbf: support of 64bit rates 



With psched_ratecfg_precompute(), tbf can deal with 64bit rates.
Add two new attributes so that tc can use them to break the 32bit
limit.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Suggested-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 51f3773b

include/uapi/linux/pkt_sched.h

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ enum { 
	TCA_TBF_PARMS,

	TCA_TBF_RTAB,

	TCA_TBF_PTAB,

	TCA_TBF_RATE64,

	TCA_TBF_PRATE64,

	__TCA_TBF_MAX,

};

net/sched/sch_tbf.c

+18 −4
Original line number Diff line number Diff line
@@ -266,20 +266,23 @@ static const struct nla_policy tbf_policy[TCA_TBF_MAX + 1] = { 
	[TCA_TBF_PARMS]	= { .len = sizeof(struct tc_tbf_qopt) },

	[TCA_TBF_RTAB]	= { .type = NLA_BINARY, .len = TC_RTAB_SIZE },

	[TCA_TBF_PTAB]	= { .type = NLA_BINARY, .len = TC_RTAB_SIZE },

	[TCA_TBF_RATE64]	= { .type = NLA_U64 },

	[TCA_TBF_PRATE64]	= { .type = NLA_U64 },

};



static int tbf_change(struct Qdisc *sch, struct nlattr *opt)

{

	int err;

	struct tbf_sched_data *q = qdisc_priv(sch);

	struct nlattr *tb[TCA_TBF_PTAB + 1];

	struct nlattr *tb[TCA_TBF_MAX + 1];

	struct tc_tbf_qopt *qopt;

	struct qdisc_rate_table *rtab = NULL;

	struct qdisc_rate_table *ptab = NULL;

	struct Qdisc *child = NULL;

	int max_size, n;

	u64 rate64 = 0, prate64 = 0;



	err = nla_parse_nested(tb, TCA_TBF_PTAB, opt, tbf_policy);

	err = nla_parse_nested(tb, TCA_TBF_MAX, opt, tbf_policy);

	if (err < 0)

		return err;
@@ -341,9 +344,13 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt) 
	q->tokens = q->buffer;

	q->ptokens = q->mtu;



	psched_ratecfg_precompute(&q->rate, &rtab->rate, 0);

	if (tb[TCA_TBF_RATE64])

		rate64 = nla_get_u64(tb[TCA_TBF_RATE64]);

	psched_ratecfg_precompute(&q->rate, &rtab->rate, rate64);

	if (ptab) {

		psched_ratecfg_precompute(&q->peak, &ptab->rate, 0);

		if (tb[TCA_TBF_PRATE64])

			prate64 = nla_get_u64(tb[TCA_TBF_PRATE64]);

		psched_ratecfg_precompute(&q->peak, &ptab->rate, prate64);

		q->peak_present = true;

	} else {

		q->peak_present = false;
@@ -402,6 +409,13 @@ static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb) 
	opt.buffer = PSCHED_NS2TICKS(q->buffer);

	if (nla_put(skb, TCA_TBF_PARMS, sizeof(opt), &opt))

		goto nla_put_failure;

	if (q->rate.rate_bytes_ps >= (1ULL << 32) &&

	    nla_put_u64(skb, TCA_TBF_RATE64, q->rate.rate_bytes_ps))

		goto nla_put_failure;

	if (q->peak_present &&

	    q->peak.rate_bytes_ps >= (1ULL << 32) &&

	    nla_put_u64(skb, TCA_TBF_PRATE64, q->peak.rate_bytes_ps))

		goto nla_put_failure;



	nla_nest_end(skb, nest);

	return skb->len;