@@ -923,6 +923,7 @@ enum tc_setup_type {
TC_SETUP_QDISC_TBF,
TC_SETUP_QDISC_FIFO,
TC_SETUP_QDISC_HTB,
+ TC_SETUP_PREEMPT,
};
/* These structures hold the attributes of bpf state that are being passed
@@ -178,6 +178,10 @@ struct tc_taprio_qopt_offload {
struct tc_taprio_sched_entry entries[];
};
+struct tc_preempt_qopt_offload {
+ u32 preemptible_queues;
+};
+
/* Reference counting */
struct tc_taprio_qopt_offload *taprio_offload_get(struct tc_taprio_qopt_offload
*offload);
@@ -1241,6 +1241,7 @@ enum {
TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */
TCA_TAPRIO_ATTR_FLAGS, /* u32 */
TCA_TAPRIO_ATTR_TXTIME_DELAY, /* u32 */
+ TCA_TAPRIO_ATTR_PREEMPT_TCS, /* u32 */
__TCA_TAPRIO_ATTR_MAX,
};
@@ -64,6 +64,7 @@ struct taprio_sched {
struct Qdisc **qdiscs;
struct Qdisc *root;
u32 flags;
+ u32 preemptible_tcs;
enum tk_offsets tk_offset;
int clockid;
atomic64_t picos_per_byte; /* Using picoseconds because for 10Gbps+
@@ -786,6 +787,7 @@ static const struct nla_policy taprio_policy[TCA_TAPRIO_ATTR_MAX + 1] = {
[TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION] = { .type = NLA_S64 },
[TCA_TAPRIO_ATTR_FLAGS] = { .type = NLA_U32 },
[TCA_TAPRIO_ATTR_TXTIME_DELAY] = { .type = NLA_U32 },
+ [TCA_TAPRIO_ATTR_PREEMPT_TCS] = { .type = NLA_U32 },
};
static int fill_sched_entry(struct taprio_sched *q, struct nlattr **tb,
@@ -1284,6 +1286,7 @@ static int taprio_disable_offload(struct net_device *dev,
struct netlink_ext_ack *extack)
{
const struct net_device_ops *ops = dev->netdev_ops;
+ struct tc_preempt_qopt_offload preempt = { };
struct tc_taprio_qopt_offload *offload;
int err;
@@ -1302,13 +1305,15 @@ static int taprio_disable_offload(struct net_device *dev,
offload->enable = 0;
err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_TAPRIO, offload);
- if (err < 0) {
+ if (err < 0)
NL_SET_ERR_MSG(extack,
- "Device failed to disable offload");
- goto out;
- }
+ "Device failed to disable taprio offload");
+
+ err = ops->ndo_setup_tc(dev, TC_SETUP_PREEMPT, &preempt);
+ if (err < 0)
+ NL_SET_ERR_MSG(extack,
+ "Device failed to disable frame preemption offload");
-out:
taprio_offload_free(offload);
return err;
@@ -1525,6 +1530,29 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
mqprio->prio_tc_map[i]);
}
+ /* It's valid to enable frame preemption without any kind of
+ * offloading being enabled, so keep it separated.
+ */
+ if (tb[TCA_TAPRIO_ATTR_PREEMPT_TCS]) {
+ u32 preempt = nla_get_u32(tb[TCA_TAPRIO_ATTR_PREEMPT_TCS]);
+ struct tc_preempt_qopt_offload qopt = { };
+
+ if (preempt == U32_MAX) {
+ NL_SET_ERR_MSG(extack, "At least one queue must be not be preemptible");
+ err = -EINVAL;
+ goto free_sched;
+ }
+
+ qopt.preemptible_queues = tc_map_to_queue_mask(dev, preempt);
+
+ err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_PREEMPT,
+ &qopt);
+ if (err)
+ goto free_sched;
+
+ q->preemptible_tcs = preempt;
+ }
+
if (FULL_OFFLOAD_IS_ENABLED(q->flags))
err = taprio_enable_offload(dev, q, new_admin, extack);
else
@@ -1681,6 +1709,7 @@ static int taprio_init(struct Qdisc *sch, struct nlattr *opt,
*/
q->clockid = -1;
q->flags = TAPRIO_FLAGS_INVALID;
+ q->preemptible_tcs = U32_MAX;
spin_lock(&taprio_list_lock);
list_add(&q->taprio_list, &taprio_list);
@@ -1899,6 +1928,10 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
if (q->flags && nla_put_u32(skb, TCA_TAPRIO_ATTR_FLAGS, q->flags))
goto options_error;
+ if (q->preemptible_tcs != U32_MAX &&
+ nla_put_u32(skb, TCA_TAPRIO_ATTR_PREEMPT_TCS, q->preemptible_tcs))
+ goto options_error;
+
if (q->txtime_delay &&
nla_put_u32(skb, TCA_TAPRIO_ATTR_TXTIME_DELAY, q->txtime_delay))
goto options_error;
Adds a way to configure which traffic classes are marked as preemptible and which are marked as express. Even if frame preemption is not a "real" offload, because it can't be executed purely in software, having this information near where the mapping of traffic classes to queues is specified, makes it, hopefully, easier to use. taprio will receive the information of which traffic classes are marked as express/preemptible, and when offloading frame preemption to the driver will convert the information, so the driver receives which queues are marked as express/preemptible. Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> --- include/linux/netdevice.h | 1 + include/net/pkt_sched.h | 4 ++++ include/uapi/linux/pkt_sched.h | 1 + net/sched/sch_taprio.c | 43 ++++++++++++++++++++++++++++++---- 4 files changed, 44 insertions(+), 5 deletions(-)