> > enum
> > {
> > - TCA_PRIO_UNPSEC,
> > - TCA_PRIO_TEST,
>
>
> You misunderstood me. You can work on top of my compat
> attribute patches, but the example code should not have to go
> in to apply your patch.
Ok. I'll fix my patches.
> > diff --git a/net/sched/Kconfig b/net/sched/Kconfig index
> > 475df84..7f14fa6 100644
> > --- a/net/sched/Kconfig
> > +++ b/net/sched/Kconfig
> > @@ -102,8 +102,16 @@ config NET_SCH_ATM
> > To compile this code as a module, choose M here: the
> > module will be called sch_atm.
> >
> > +config NET_SCH_BANDS
> > + bool "Multi Band Queueing (PRIO and RR)"
>
> This options seems useless. Its not used *anywhere* except
> for dependencies.
I was trying to group the multiqueue qdiscs together with this. But I
can see just having the multiqueue option for scheduling will cover
this. I'll remove this.
> > +config NET_SCH_BANDS_MQ
> > + bool "Multiple hardware queue support"
> > + depends on NET_SCH_BANDS
>
>
> OK, again:
>
> Introduce NET_SCH_RR. NET_SCH_RR selects NET_SCH_PRIO.
> Nothing at all changes for NET_SCH_PRIO itself. Additionally
> introduce a boolean NET_SCH_MULTIQUEUE. No dependencies at
> all. Use NET_SCH_MULTIQUEUE to guard the multiqueue code in
> sch_prio.c.
> Your current code doesn't even have any ifdefs anymore
> though, so this might not be needed at all.
>
> Additionally you could later introduce E1000_MULTIQUEUE and
> have that select NET_SCH_MULTIQUEUE.
I'll clean this up. Thanks for the persistance. :)
> > diff --git a/net/sched/sch_generic.c
> b/net/sched/sch_generic.c index
> > 9461e8a..203d5c4 100644
> > --- a/net/sched/sch_generic.c
> > +++ b/net/sched/sch_generic.c
> > @@ -168,7 +168,8 @@ static inline int qdisc_restart(struct
> net_device *dev)
> > spin_unlock(&dev->queue_lock);
> >
> > ret = NETDEV_TX_BUSY;
> > - if (!netif_queue_stopped(dev))
> > + if (!netif_queue_stopped(dev) &&
> > + !netif_subqueue_stopped(dev, skb->queue_mapping))
> > /* churn baby churn .. */
> > ret = dev_hard_start_xmit(skb, dev);
>
> I'll try again - please move this to patch 2/3.
I'm sorry; I misread your original comment about this. I'll move the
change (although this disappears with Jamal's and KK's qdisc_restart()
cleanup).
> > diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index
> > 40a13e8..8a716f0 100644
> > --- a/net/sched/sch_prio.c
> > +++ b/net/sched/sch_prio.c
> > @@ -40,9 +40,11 @@
> > struct prio_sched_data
> > {
> > int bands;
> > + int curband; /* for round-robin */
> > struct tcf_proto *filter_list;
> > u8 prio2band[TC_PRIO_MAX+1];
> > struct Qdisc *queues[TCQ_PRIO_BANDS];
> > + unsigned char mq;
> > };
> >
> >
> > @@ -70,14 +72,28 @@ prio_classify(struct sk_buff *skb, struct Qdisc
> > *sch, int *qerr) #endif
> > if (TC_H_MAJ(band))
> > band = 0;
> > + if (q->mq)
> > + skb->queue_mapping =
> > +
> q->prio2band[band&TC_PRIO_MAX];
> > + else
> > + skb->queue_mapping = 0;
>
>
> Might look cleaner if you have one central point where
> queue_mapping is set and the band is returned.
I'll see how easy it'll be to condense this; because the queue being
selected in the qdisc can be different based on a few different things,
I'm not sure how easy it'll be to assign this in one spot. I'll play
around with it and see what I can come up with.
> > + /* If we're multiqueue, make sure the number of incoming bands
> > + * matches the number of queues on the device we're
> associating with.
> > + */
> > + if (tb[TCA_PRIO_MQ - 1])
> > + q->mq = *(unsigned char *)RTA_DATA(tb[TCA_PRIO_MQ - 1]);
>
>
> If you're using it as a flag, please use RTA_GET_FLAG(),
> otherwise RTA_GET_U8.
Will do. Thanks.
> > + if (q->mq && (qopt->bands != sch->dev->egress_subqueue_count))
> > + return -EINVAL;
> >
> > sch_tree_lock(sch);
> > q->bands = qopt->bands;
> > @@ -280,7 +342,7 @@ static int prio_dump(struct Qdisc *sch,
> struct sk_buff *skb)
> > memcpy(&opt.priomap, q->prio2band, TC_PRIO_MAX+1);
> >
> > nest = RTA_NEST_COMPAT(skb, TCA_OPTIONS, sizeof(opt), &opt);
> > - RTA_PUT_U32(skb, TCA_PRIO_TEST, 321);
> > + RTA_PUT_U8(skb, TCA_PRIO_MQ, q->mq);
>
>
> And RTA_PUT_FLAG. Now that I think of it, does it even makes
> sense to have a prio private flag for this instead of a qdisc
> global one?
There currently aren't any other qdiscs that are natural fits for
multiqueue that I can see. I can see the benefit though of having this
as a global flag in the qdisc API; let me check it out, and if it makes
sense, I can move it.
> > static int __init prio_module_init(void) {
> > - return register_qdisc(&prio_qdisc_ops);
> > + register_qdisc(&prio_qdisc_ops);
> > + register_qdisc(&rr_qdisc_ops);
>
> Proper error handling please.
Will do.
Thanks,
-PJ Waskiewicz
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
