taprio: calculate cycle_time when schedule is installed (037be037) · Commits · 戴 / test

net/sched/sch_taprio.c

+11 −18

Original line number	Diff line number	Diff line
		@@ -108,22 +108,6 @@ static void switch_schedules(struct taprio_sched *q,
		*admin = NULL;
		}

		static ktime_t get_cycle_time(struct sched_gate_list *sched)
		{
		struct sched_entry *entry;
		ktime_t cycle = 0;

		if (sched->cycle_time != 0)
		return sched->cycle_time;

		list_for_each_entry(entry, &sched->entries, list)
		cycle = ktime_add_ns(cycle, entry->interval);

		sched->cycle_time = cycle;

		return cycle;
		}

		static int taprio_enqueue(struct sk_buff skb, struct Qdisc sch,
		struct sk_buff **to_free)
		{
		@@ -524,6 +508,15 @@ static int parse_taprio_schedule(struct nlattr **tb,
		if (err < 0)
		return err;

		if (!new->cycle_time) {
		struct sched_entry *entry;
		ktime_t cycle = 0;

		list_for_each_entry(entry, &new->entries, list)
		cycle = ktime_add_ns(cycle, entry->interval);
		new->cycle_time = cycle;
		}

		return 0;
		}

		@@ -605,7 +598,7 @@ static int taprio_get_start_time(struct Qdisc *sch,
		return 0;
		}

		cycle = get_cycle_time(sched);
		cycle = sched->cycle_time;

		/* 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,
		@@ -632,7 +625,7 @@ static void setup_first_close_time(struct taprio_sched *q,
		first = list_first_entry(&sched->entries,
		struct sched_entry, list);

		cycle = get_cycle_time(sched);
		cycle = sched->cycle_time;

		/* FIXME: find a better place to do this */
		sched->cycle_close_time = ktime_add_ns(base, cycle);