Taprio qdisc fixes
Subsystems (4)
v2 cover Taprio qdisc fixes
Hi all,
I'm re-sending this series, now with the "net-next" prefix in the subject.
The only change from the previous version is in patch 3. As suggested by Cong Wang, it removes the !entry check within should_restart_cycle() since it is already checked by the caller. As a side effect, that function becomes a dummy wrapper on list_is_last() so we simply remove it and call list_is_last() instead.
Best regards,
Andre
Andre Guedes (5):
net: sched: taprio: Remove pointless variable assigment
net: sched: taprio: Refactor taprio_get_start_time()
net: sched: taprio: Remove should_restart_cycle()
net: sched: taprio: Fix taprio_peek()
net: sched: taprio: Fix taprio_dequeue()
net/sched/sch_taprio.c | 56 +++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/5 net: sched: taprio: Remove pointless variable assigment
This patch removes a pointless variable assigment in taprio_change(). The 'err' variable is not used from this assignment to the next one so this patch removes it.
--- net/sched/sch_taprio.c | 1 - 1 file changed, 1 deletion(-)
net/sched/sch_taprio.c +0 -1
@@ -651,7 +651,6 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,if (err <0 )return err; - err = -EINVAL ;if (tb[TCA_TAPRIO_ATTR_PRIOMAP ]) mqprio =nla_data (tb[TCA_TAPRIO_ATTR_PRIOMAP ]);
Signature · 1 line
2.21.0
PATCH v2 2/5 net: sched: taprio: Refactor taprio_get_start_time()
In reply to Andre GuedesThis patch does a code refactoring to taprio_get_start_time() function to improve readability and report error properly.
If 'base' time is later than 'now', the start time is equal to 'base' and taprio_get_start_time() is done. That's the natural case so we move that code to the beginning of the function. Also, if 'cycle' calculation is zero, something went really wrong with taprio and we should log that internal error properly.
--- net/sched/sch_taprio.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)
net/sched/sch_taprio.c +23 -14
@@ -539,7 +539,7 @@ static int taprio_parse_mqprio_opt(struct net_device *dev,return 0 ; } -static ktime_t taprio_get_start_time (struct Qdisc *sch) +static int taprio_get_start_time (struct Qdisc *sch,ktime_t *start) {struct taprio_sched *q =qdisc_priv (sch);struct sched_entry *entry;
@@ -547,27 +547,33 @@ static ktime_t taprio_get_start_time(struct Qdisc *sch)s64 n; base =ns_to_ktime (q->base_time); - cycle =0 ; + now = q->get_time (); + +if (ktime_after (base, now)) { + *start = base; +return 0 ; + }/* Calculate the cycle_time, by summing all the intervals. */ + cycle =0 ;list_for_each_entry (entry, &q->entries, list) cycle =ktime_add_ns (cycle, entry->interval); -if (!cycle) -return base; - - now = q->get_time (); - -if (ktime_after (base, now)) -return base; +/* The qdisc is expected to have at least one sched_entry. Moreover, +* any entry must have 'interval' > 0. Thus if the cycle time is zero, +* something went really wrong. In that case, we should warn about this +* inconsistent state and return error. +*/ +if (WARN_ON (!cycle)) +return -EFAULT ;/* Schedule the start time for the beginning of the next * cycle. */ n =div64_s64 (ktime_sub_ns (now, base), cycle); - -return ktime_add_ns (base, (n +1 ) * cycle); + *start =ktime_add_ns (base, (n +1 ) * cycle); +return 0 ; }static void taprio_start_sched (struct Qdisc *sch,ktime_t start)
@@ -716,9 +722,12 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt, }taprio_set_picos_per_byte (dev, q); - start =taprio_get_start_time (sch); -if (!start) -return 0 ; + + err =taprio_get_start_time (sch, &start); +if (err <0 ) { +NL_SET_ERR_MSG (extack,"Internal error: failed get start time" ); +return err; + }taprio_start_sched (sch, start);
Signature · 1 line
2.21.0
PATCH v2 3/5 net: sched: taprio: Remove should_restart_cycle()
In reply to Andre GuedesThe 'entry' argument from should_restart_cycle() cannot be NULL since it is already checked by the caller so the WARN_ON() within should_ restart_cycle() could be removed. By doing that, that function becomes a dummy wrapper on list_is_last() so this patch simply gets rid of it and call list_is_last() within advance_sched() instead.
--- net/sched/sch_taprio.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
net/sched/sch_taprio.c +1 -9
@@ -209,14 +209,6 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)return NULL ; } -static bool should_restart_cycle (const struct taprio_sched *q, -const struct sched_entry *entry) -{ -WARN_ON (!entry); - -return list_is_last (&entry->list, &q->entries); -} -static enum hrtimer_restart advance_sched (struct hrtimer *timer) { struct taprio_sched *q = container_of(timer, struct taprio_sched,
@@ -240,7 +232,7 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer) goto first_run; } -if (should_restart_cycle (q, entry)) +if (list_is_last (&entry->list, &q->entries)) next = list_first_entry(&q->entries, struct sched_entry, list);else
Signature · 1 line
2.21.0
PATCH v2 4/5 net: sched: taprio: Fix taprio_peek()
In reply to Andre GuedesWhile traversing taprio's children qdisc list, if the gate is closed for a given traffic class, we should continue traversing the list since the remaining qdiscs may have skb ready for transmission.
This patch also takes this opportunity and changes the function to use the TAPRIO_ALL_GATES_OPEN macro instead of the magic number '-1'.
--- net/sched/sch_taprio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sched/sch_taprio.c +2 -2
@@ -90,7 +90,7 @@ static struct sk_buff *taprio_peek(struct Qdisc *sch)rcu_read_lock (); entry =rcu_dereference (q->current_entry); - gate_mask = entry ? entry->gate_mask :-1 ; + gate_mask = entry ? entry->gate_mask :TAPRIO_ALL_GATES_OPEN ;rcu_read_unlock ();if (!gate_mask)
@@ -112,7 +112,7 @@ static struct sk_buff *taprio_peek(struct Qdisc *sch) tc =netdev_get_prio_tc_map (dev, prio);if (!(gate_mask &BIT (tc))) -return NULL ; +continue ;return skb; }
Signature · 1 line
2.21.0
PATCH v2 5/5 net: sched: taprio: Fix taprio_dequeue()
In reply to Andre GuedesIn case we don't have 'guard' or 'budget' to transmit the skb, we should continue traversing the qdisc list since the remaining guard/budget might be enough to transmit a skb from other children qdiscs.
--- net/sched/sch_taprio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sched/sch_taprio.c +2 -2
@@ -188,12 +188,12 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)*/ if (gate_mask !=TAPRIO_ALL_GATES_OPEN &&ktime_after (guard, entry->close_time)) -return NULL ; +continue ;/* ... and no budget. */ if (gate_mask !=TAPRIO_ALL_GATES_OPEN &&atomic_sub_return (len, &entry->budget) <0 ) -return NULL ; +continue ; skb = child->ops->dequeue (child);if (unlikely (!skb))
Signature · 1 line
2.21.0
David Miller
maintainerFrom: Andre Guedes <[email protected]>
Date: Tue, 23 Apr 2019 12:44:19 -0700
Quoted 7 lines
I'm re-sending this series, now with the "net-next" prefix in the subject.
The only change from the previous version is in patch 3. As suggested by Cong Wang, it removes the !entry check within
should_restart_cycle()since it is already checked by the caller. As a side effect, that function becomes a dummy wrapper onlist_is_last()so we simply remove it and calllist_is_last()instead.
Series applied, thanks.