Commit 09e31cf0 authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by David S. Miller
Browse files

taprio: Fix using wrong queues in gate mask 



Since commit 9c66d156 ("taprio: Add support for hardware
offloading") there's a bit of inconsistency when offloading schedules
to the hardware:

In software mode, the gate masks are specified in terms of traffic
classes, so if say "sched-entry S 03 20000", it means that the traffic
classes 0 and 1 are open for 20us; when taprio is offloaded to
hardware, the gate masks are specified in terms of hardware queues.

The idea here is to fix hardware offloading, so schedules in hardware
and software mode have the same behavior. What's needed to do is to
map traffic classes to queues when applying the offload to the driver.

Fixes: 9c66d156 ("taprio: Add support for hardware offloading")
Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fd99b5d

net/sched/sch_taprio.c

+24 −6
Original line number Diff line number Diff line
@@ -1176,9 +1176,27 @@ static void taprio_offload_config_changed(struct taprio_sched *q) 
	spin_unlock(&q->current_entry_lock);

}



static void taprio_sched_to_offload(struct taprio_sched *q,

static u32 tc_map_to_queue_mask(struct net_device *dev, u32 tc_mask)

{

	u32 i, queue_mask = 0;



	for (i = 0; i < dev->num_tc; i++) {

		u32 offset, count;



		if (!(tc_mask & BIT(i)))

			continue;



		offset = dev->tc_to_txq[i].offset;

		count = dev->tc_to_txq[i].count;



		queue_mask |= GENMASK(offset + count - 1, offset);

	}



	return queue_mask;

}



static void taprio_sched_to_offload(struct net_device *dev,

				    struct sched_gate_list *sched,

				    const struct tc_mqprio_qopt *mqprio,

				    struct tc_taprio_qopt_offload *offload)

{

	struct sched_entry *entry;
@@ -1193,7 +1211,8 @@ static void taprio_sched_to_offload(struct taprio_sched *q, 


		e->command = entry->command;

		e->interval = entry->interval;

		e->gate_mask = entry->gate_mask;

		e->gate_mask = tc_map_to_queue_mask(dev, entry->gate_mask);



		i++;

	}
@@ -1201,7 +1220,6 @@ static void taprio_sched_to_offload(struct taprio_sched *q, 
}



static int taprio_enable_offload(struct net_device *dev,

				 struct tc_mqprio_qopt *mqprio,

				 struct taprio_sched *q,

				 struct sched_gate_list *sched,

				 struct netlink_ext_ack *extack)
@@ -1223,7 +1241,7 @@ static int taprio_enable_offload(struct net_device *dev, 
		return -ENOMEM;

	}

	offload->enable = 1;

	taprio_sched_to_offload(q, sched, mqprio, offload);

	taprio_sched_to_offload(dev, sched, offload);



	err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_TAPRIO, offload);

	if (err < 0) {
@@ -1485,7 +1503,7 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt, 
	}



	if (FULL_OFFLOAD_IS_ENABLED(q->flags))

		err = taprio_enable_offload(dev, mqprio, q, new_admin, extack);

		err = taprio_enable_offload(dev, q, new_admin, extack);

	else

		err = taprio_disable_offload(dev, q, extack);

	if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE