* [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue().
@ 2008-07-03 7:05 David Miller
[not found] ` <20080703.000521.13130101.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2008-07-03 11:27 ` Tomas Winkler
0 siblings, 2 replies; 6+ messages in thread
From: David Miller @ 2008-07-03 7:05 UTC (permalink / raw)
To: netdev-u79uwXL29TY76Z2rM5mHXA
Cc: vinay-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8,
krkumar2-xthvdsQ13ZrQT0dZR+AlfA, mchan-dY08KVG/lbpWk0Htik3J/w,
Matheos.Worku-UdXhSnd/wVw, linux-wireless-u79uwXL29TY76Z2rM5mHXA
Unfortunately it temporarily loses some features, such
as packet dropping (easy to add) and requeueing (harder).
But it is so much incredibly simpler now.
Signed-off-by: David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
---
net/mac80211/ieee80211_i.h | 6 +
net/mac80211/main.c | 16 +--
net/mac80211/wme.c | 531 ++------------------------------------------
net/mac80211/wme.h | 19 +--
4 files changed, 34 insertions(+), 538 deletions(-)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index af352c0..0ecc0c0 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -25,6 +25,7 @@
#include <linux/etherdevice.h>
#include <net/wireless.h>
#include <net/iw_handler.h>
+#include <net/mac80211.h>
#include "key.h"
#include "sta_info.h"
@@ -542,6 +543,9 @@ enum {
IEEE80211_ADDBA_MSG = 4,
};
+/* maximum number of hardware queues we support. */
+#define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
+
struct ieee80211_local {
/* embed the driver visible part.
* don't cast (use the static inlines below), but we keep
@@ -550,6 +554,8 @@ struct ieee80211_local {
const struct ieee80211_ops *ops;
+ unsigned long queue_pool[BITS_TO_LONGS(QD_MAX_QUEUES)];
+
struct net_device *mdev; /* wmaster# - "master" 802.11 device */
int open_count;
int monitors, cooked_mntrs;
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index c4d36fe..b78b56e 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -684,7 +684,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
/* No need to requeue the packets in the agg queue, since we
* held the tx lock: no packet could be enqueued to the newly
* allocated queue */
- ieee80211_ht_agg_queue_remove(local, sta, tid, 0);
+ ieee80211_ht_agg_queue_remove(local, sta, tid);
#ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "BA request denied - HW unavailable for"
" tid %d\n", tid);
@@ -693,8 +693,6 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
goto err_unlock_queue;
}
- /* Will put all the packets in the new SW queue */
- ieee80211_requeue(local, ieee802_1d_to_ac[tid]);
unlock_all_queues_bh(local->mdev);
spin_unlock_bh(&sta->lock);
@@ -883,7 +881,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid)
dev_queue = netdev_get_tx_queue(local->mdev, 0);
spin_lock_bh(&dev_queue->lock);
/* remove the queue for this aggregation */
- ieee80211_ht_agg_queue_remove(local, sta, tid, 1);
+ ieee80211_ht_agg_queue_remove(local, sta, tid);
spin_unlock_bh(&dev_queue->lock);
/* we just requeued the all the frames that were in the removed
@@ -1900,19 +1898,10 @@ static int __init ieee80211_init(void)
if (ret)
goto out;
- ret = ieee80211_wme_register();
- if (ret) {
- printk(KERN_DEBUG "ieee80211_init: failed to "
- "initialize WME (err=%d)\n", ret);
- goto out_cleanup_pid;
- }
-
ieee80211_debugfs_netdev_init();
return 0;
- out_cleanup_pid:
- rc80211_pid_exit();
out:
return ret;
}
@@ -1930,7 +1919,6 @@ static void __exit ieee80211_exit(void)
if (mesh_allocated)
ieee80211s_stop();
- ieee80211_wme_unregister();
ieee80211_debugfs_netdev_exit();
}
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 42b1fbf..3bbee5a 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -18,8 +18,6 @@
#include "ieee80211_i.h"
#include "wme.h"
-/* maximum number of hardware queues we support. */
-#define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
/* current number of hardware queues we support. */
#define QD_NUM(hw) ((hw)->queues + (hw)->ampdu_queues)
@@ -29,32 +27,14 @@
*/
const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
-struct ieee80211_sched_data
-{
- unsigned long qdisc_pool[BITS_TO_LONGS(QD_MAX_QUEUES)];
- struct tcf_proto *filter_list;
- struct Qdisc *queues[QD_MAX_QUEUES];
- struct sk_buff_head requeued[QD_MAX_QUEUES];
-};
-
static const char llc_ip_hdr[8] = {0xAA, 0xAA, 0x3, 0, 0, 0, 0x08, 0};
/* given a data frame determine the 802.1p/1d tag to use */
-static inline unsigned classify_1d(struct sk_buff *skb, struct Qdisc *qd)
+static inline unsigned classify_1d(struct sk_buff *skb, struct net_device *dev)
{
struct iphdr *ip;
- int dscp;
int offset;
-
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct tcf_result res = { -1, 0 };
-
- /* if there is a user set filter list, call out to that */
- if (q->filter_list) {
- tc_classify(skb, q->filter_list, &res);
- if (res.class != -1)
- return res.class;
- }
+ int dscp;
/* skb->priority values from 256->263 are magic values to
* directly indicate a specific 802.1d priority.
@@ -99,11 +79,10 @@ static inline int wme_downgrade_ac(struct sk_buff *skb)
}
-/* positive return value indicates which queue to use
- * negative return value indicates to drop the frame */
-static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
+/* positive return value indicates which queue to use */
+static u16 classify80211(struct sk_buff *skb, struct net_device *dev)
{
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
+ struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
if (!ieee80211_is_data(hdr->frame_control)) {
@@ -123,14 +102,12 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
/* use the data classifier to determine what 802.1d tag the
* data frame has */
- skb->priority = classify_1d(skb, qd);
+ skb->priority = classify_1d(skb, dev);
/* in case we are a client verify acm is not set for this ac */
while (unlikely(local->wmm_acm & BIT(skb->priority))) {
- if (wme_downgrade_ac(skb)) {
- /* No AC with lower priority has acm=0, drop packet. */
- return -1;
- }
+ if (wme_downgrade_ac(skb))
+ return 0;
}
/* look up which queue to use for frames with this 1d tag */
@@ -138,40 +115,17 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
}
-static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
+static u16 ieee80211_select_queue(struct net_device *dev,
+ struct sk_buff *skb)
{
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
- struct Qdisc *qdisc;
+ struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
struct sta_info *sta;
- int err, queue;
+ u16 queue;
u8 tid;
- if (info->flags & IEEE80211_TX_CTL_REQUEUE) {
- queue = skb_get_queue_mapping(skb);
- rcu_read_lock();
- sta = sta_info_get(local, hdr->addr1);
- tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
- if (sta) {
- int ampdu_queue = sta->tid_to_tx_q[tid];
- if ((ampdu_queue < QD_NUM(hw)) &&
- test_bit(ampdu_queue, q->qdisc_pool)) {
- queue = ampdu_queue;
- info->flags |= IEEE80211_TX_CTL_AMPDU;
- } else {
- info->flags &= ~IEEE80211_TX_CTL_AMPDU;
- }
- }
- rcu_read_unlock();
- skb_queue_tail(&q->requeued[queue], skb);
- qd->q.qlen++;
- return 0;
- }
-
- queue = classify80211(skb, qd);
+ queue = classify80211(skb, dev);
if (unlikely(queue >= local->hw.queues))
queue = local->hw.queues - 1;
@@ -193,436 +147,32 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
sta = sta_info_get(local, hdr->addr1);
if (sta) {
- int ampdu_queue = sta->tid_to_tx_q[tid];
- if ((ampdu_queue < QD_NUM(hw)) &&
- test_bit(ampdu_queue, q->qdisc_pool)) {
- queue = ampdu_queue;
- info->flags |= IEEE80211_TX_CTL_AMPDU;
- } else {
- info->flags &= ~IEEE80211_TX_CTL_AMPDU;
- }
+ queue = sta->tid_to_tx_q[tid];
+ info->flags |= IEEE80211_TX_CTL_AMPDU;
}
rcu_read_unlock();
}
- if (unlikely(queue < 0)) {
- kfree_skb(skb);
- err = NET_XMIT_DROP;
- } else {
- tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
- skb_set_queue_mapping(skb, queue);
- qdisc = q->queues[queue];
- err = qdisc->enqueue(skb, qdisc);
- if (err == NET_XMIT_SUCCESS) {
- qd->q.qlen++;
- qd->bstats.bytes += skb->len;
- qd->bstats.packets++;
- return NET_XMIT_SUCCESS;
- }
- }
- qd->qstats.drops++;
- return err;
-}
-
-
-/* TODO: clean up the cases where master_hard_start_xmit
- * returns non 0 - it shouldn't ever do that. Once done we
- * can remove this function */
-static int wme_qdiscop_requeue(struct sk_buff *skb, struct Qdisc* qd)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct Qdisc *qdisc;
- int err;
-
- /* we recorded which queue to use earlier! */
- qdisc = q->queues[skb_get_queue_mapping(skb)];
-
- if ((err = qdisc->ops->requeue(skb, qdisc)) == 0) {
- qd->q.qlen++;
- return 0;
- }
- qd->qstats.drops++;
- return err;
-}
-
-
-static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct net_device *dev = qdisc_dev(qd);
- struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- struct sk_buff *skb;
- struct Qdisc *qdisc;
- int queue;
-
- /* check all the h/w queues in numeric/priority order */
- for (queue = 0; queue < QD_NUM(hw); queue++) {
- /* see if there is room in this hardware queue */
- if (__netif_subqueue_stopped(local->mdev, queue) ||
- !test_bit(queue, q->qdisc_pool))
- continue;
-
- /* there is space - try and get a frame */
- skb = skb_dequeue(&q->requeued[queue]);
- if (skb) {
- qd->q.qlen--;
- return skb;
- }
-
- qdisc = q->queues[queue];
- skb = qdisc->dequeue(qdisc);
- if (skb) {
- qd->q.qlen--;
- return skb;
- }
- }
- /* returning a NULL here when all the h/w queues are full means we
- * never need to call netif_stop_queue in the driver */
- return NULL;
-}
-
-
-static void wme_qdiscop_reset(struct Qdisc* qd)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- int queue;
-
- /* QUESTION: should we have some hardware flush functionality here? */
-
- for (queue = 0; queue < QD_NUM(hw); queue++) {
- skb_queue_purge(&q->requeued[queue]);
- qdisc_reset(q->queues[queue]);
- }
- qd->q.qlen = 0;
-}
-
-
-static void wme_qdiscop_destroy(struct Qdisc* qd)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- int queue;
-
- tcf_destroy_chain(q->filter_list);
- q->filter_list = NULL;
-
- for (queue = 0; queue < QD_NUM(hw); queue++) {
- skb_queue_purge(&q->requeued[queue]);
- qdisc_destroy(q->queues[queue]);
- q->queues[queue] = &noop_qdisc;
- }
-}
-
-
-/* called whenever parameters are updated on existing qdisc */
-static int wme_qdiscop_tune(struct Qdisc *qd, struct nlattr *opt)
-{
- return 0;
-}
-
-
-/* called during initial creation of qdisc on device */
-static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct net_device *dev = qdisc_dev(qd);
- struct ieee80211_local *local;
- struct ieee80211_hw *hw;
- int err = 0, i;
-
- /* check that device is a mac80211 device */
- if (!dev->ieee80211_ptr ||
- dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)
- return -EINVAL;
-
- local = wdev_priv(dev->ieee80211_ptr);
- hw = &local->hw;
-
- /* only allow on master dev */
- if (dev != local->mdev)
- return -EINVAL;
-
- /* ensure that we are root qdisc */
- if (qd->parent != TC_H_ROOT)
- return -EINVAL;
-
- if (qd->flags & TCQ_F_INGRESS)
- return -EINVAL;
-
- /* if options were passed in, set them */
- if (opt)
- err = wme_qdiscop_tune(qd, opt);
-
- /* create child queues */
- for (i = 0; i < QD_NUM(hw); i++) {
- skb_queue_head_init(&q->requeued[i]);
- q->queues[i] = qdisc_create_dflt(qdisc_dev(qd), qd->dev_queue,
- &pfifo_qdisc_ops,
- qd->handle);
- if (!q->queues[i]) {
- q->queues[i] = &noop_qdisc;
- printk(KERN_ERR "%s child qdisc %i creation failed\n",
- dev->name, i);
- }
- }
-
- /* non-aggregation queues: reserve/mark as used */
- for (i = 0; i < local->hw.queues; i++)
- set_bit(i, q->qdisc_pool);
-
- return err;
-}
-
-static int wme_qdiscop_dump(struct Qdisc *qd, struct sk_buff *skb)
-{
- return -1;
-}
-
-
-static int wme_classop_graft(struct Qdisc *qd, unsigned long arg,
- struct Qdisc *new, struct Qdisc **old)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- unsigned long queue = arg - 1;
-
- if (queue >= QD_NUM(hw))
- return -EINVAL;
-
- if (!new)
- new = &noop_qdisc;
-
- sch_tree_lock(qd);
- *old = q->queues[queue];
- q->queues[queue] = new;
- qdisc_reset(*old);
- sch_tree_unlock(qd);
-
- return 0;
-}
-
-
-static struct Qdisc *
-wme_classop_leaf(struct Qdisc *qd, unsigned long arg)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- unsigned long queue = arg - 1;
-
- if (queue >= QD_NUM(hw))
- return NULL;
-
- return q->queues[queue];
-}
-
-
-static unsigned long wme_classop_get(struct Qdisc *qd, u32 classid)
-{
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- unsigned long queue = TC_H_MIN(classid);
-
- if (queue - 1 >= QD_NUM(hw))
- return 0;
-
return queue;
}
-
-static unsigned long wme_classop_bind(struct Qdisc *qd, unsigned long parent,
- u32 classid)
-{
- return wme_classop_get(qd, classid);
-}
-
-
-static void wme_classop_put(struct Qdisc *q, unsigned long cl)
-{
-}
-
-
-static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent,
- struct nlattr **tca, unsigned long *arg)
-{
- unsigned long cl = *arg;
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
-
- if (cl - 1 > QD_NUM(hw))
- return -ENOENT;
-
- /* TODO: put code to program hardware queue parameters here,
- * to allow programming from tc command line */
-
- return 0;
-}
-
-
-/* we don't support deleting hardware queues
- * when we add WMM-SA support - TSPECs may be deleted here */
-static int wme_classop_delete(struct Qdisc *qd, unsigned long cl)
-{
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
-
- if (cl - 1 > QD_NUM(hw))
- return -ENOENT;
- return 0;
-}
-
-
-static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl,
- struct sk_buff *skb, struct tcmsg *tcm)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
-
- if (cl - 1 > QD_NUM(hw))
- return -ENOENT;
- tcm->tcm_handle = TC_H_MIN(cl);
- tcm->tcm_parent = qd->handle;
- tcm->tcm_info = q->queues[cl-1]->handle; /* do we need this? */
- return 0;
-}
-
-
-static void wme_classop_walk(struct Qdisc *qd, struct qdisc_walker *arg)
-{
- struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
- struct ieee80211_hw *hw = &local->hw;
- int queue;
-
- if (arg->stop)
- return;
-
- for (queue = 0; queue < QD_NUM(hw); queue++) {
- if (arg->count < arg->skip) {
- arg->count++;
- continue;
- }
- /* we should return classids for our internal queues here
- * as well as the external ones */
- if (arg->fn(qd, queue+1, arg) < 0) {
- arg->stop = 1;
- break;
- }
- arg->count++;
- }
-}
-
-
-static struct tcf_proto ** wme_classop_find_tcf(struct Qdisc *qd,
- unsigned long cl)
-{
- struct ieee80211_sched_data *q = qdisc_priv(qd);
-
- if (cl)
- return NULL;
-
- return &q->filter_list;
-}
-
-
-/* this qdisc is classful (i.e. has classes, some of which may have leaf qdiscs attached)
- * - these are the operations on the classes */
-static const struct Qdisc_class_ops class_ops =
-{
- .graft = wme_classop_graft,
- .leaf = wme_classop_leaf,
-
- .get = wme_classop_get,
- .put = wme_classop_put,
- .change = wme_classop_change,
- .delete = wme_classop_delete,
- .walk = wme_classop_walk,
-
- .tcf_chain = wme_classop_find_tcf,
- .bind_tcf = wme_classop_bind,
- .unbind_tcf = wme_classop_put,
-
- .dump = wme_classop_dump_class,
-};
-
-
-/* queueing discipline operations */
-static struct Qdisc_ops wme_qdisc_ops __read_mostly =
-{
- .next = NULL,
- .cl_ops = &class_ops,
- .id = "ieee80211",
- .priv_size = sizeof(struct ieee80211_sched_data),
-
- .enqueue = wme_qdiscop_enqueue,
- .dequeue = wme_qdiscop_dequeue,
- .requeue = wme_qdiscop_requeue,
- .drop = NULL, /* drop not needed since we are always the root qdisc */
-
- .init = wme_qdiscop_init,
- .reset = wme_qdiscop_reset,
- .destroy = wme_qdiscop_destroy,
- .change = wme_qdiscop_tune,
-
- .dump = wme_qdiscop_dump,
-};
-
-
void ieee80211_install_qdisc(struct net_device *dev)
{
- struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
- struct Qdisc *qdisc;
-
- qdisc = qdisc_create_dflt(dev, txq,
- &wme_qdisc_ops, TC_H_ROOT);
- if (!qdisc) {
- printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
- return;
- }
-
- /* same handle as would be allocated by qdisc_alloc_handle() */
- qdisc->handle = 0x80010000;
-
- qdisc_lock_tree(dev);
- list_add_tail(&qdisc->list, &txq->qdisc_list);
- txq->qdisc_sleeping = qdisc;
- qdisc_unlock_tree(dev);
+ dev->select_queue = ieee80211_select_queue;
}
int ieee80211_qdisc_installed(struct net_device *dev)
{
- struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
-
- return txq->qdisc_sleeping->ops == &wme_qdisc_ops;
-}
-
-
-int ieee80211_wme_register(void)
-{
- return register_qdisc(&wme_qdisc_ops);
-}
-
-
-void ieee80211_wme_unregister(void)
-{
- unregister_qdisc(&wme_qdisc_ops);
+ return dev->select_queue == ieee80211_select_queue;
}
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
struct sta_info *sta, u16 tid)
{
- int i;
- struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
- struct ieee80211_sched_data *q =
- qdisc_priv(txq->qdisc_sleeping);
DECLARE_MAC_BUF(mac);
+ int i;
/* prepare the filter and save it for the SW queue
* matching the received HW queue */
@@ -632,7 +182,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
/* try to get a Qdisc from the pool */
for (i = local->hw.queues; i < QD_NUM(&local->hw); i++)
- if (!test_and_set_bit(i, q->qdisc_pool)) {
+ if (!test_and_set_bit(i, local->queue_pool)) {
ieee80211_stop_queue(local_to_hw(local), i);
sta->tid_to_tx_q[tid] = i;
@@ -643,9 +193,8 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
#ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit())
printk(KERN_DEBUG "allocated aggregation queue"
- " %d tid %d addr %s pool=0x%lX\n",
- i, tid, print_mac(mac, sta->addr),
- q->qdisc_pool[0]);
+ " %d tid %d addr %s\n",
+ i, tid, print_mac(mac, sta->addr));
#endif /* CONFIG_MAC80211_HT_DEBUG */
return 0;
}
@@ -657,44 +206,12 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
* the caller needs to hold netdev_get_tx_queue(local->mdev, X)->lock
*/
void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
- struct sta_info *sta, u16 tid,
- u8 requeue)
+ struct sta_info *sta, u16 tid)
{
struct ieee80211_hw *hw = &local->hw;
- struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
- struct ieee80211_sched_data *q =
- qdisc_priv(txq->qdisc_sleeping);
int agg_queue = sta->tid_to_tx_q[tid];
/* return the qdisc to the pool */
- clear_bit(agg_queue, q->qdisc_pool);
+ clear_bit(agg_queue, local->queue_pool);
sta->tid_to_tx_q[tid] = QD_NUM(hw);
-
- if (requeue)
- ieee80211_requeue(local, agg_queue);
- else
- q->queues[agg_queue]->ops->reset(q->queues[agg_queue]);
-}
-
-void ieee80211_requeue(struct ieee80211_local *local, int queue)
-{
- struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
- struct Qdisc *root_qd = txq->qdisc_sleeping;
- struct ieee80211_sched_data *q = qdisc_priv(root_qd);
- struct Qdisc *qdisc = q->queues[queue];
- struct sk_buff *skb = NULL;
- u32 len;
-
- if (!qdisc || !qdisc->dequeue)
- return;
-
- printk(KERN_DEBUG "requeue: qlen = %d\n", qdisc->q.qlen);
- for (len = qdisc->q.qlen; len > 0; len--) {
- skb = qdisc->dequeue(qdisc);
- root_qd->q.qlen--;
- /* packet will be classified again and */
- /* skb->packet_data->queue will be overridden if needed */
- if (skb)
- wme_qdiscop_enqueue(skb, root_qd);
- }
}
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index bbdb533..c79be0e 100644
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -37,11 +37,7 @@ int ieee80211_qdisc_installed(struct net_device *dev);
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
struct sta_info *sta, u16 tid);
void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
- struct sta_info *sta, u16 tid,
- u8 requeue);
-void ieee80211_requeue(struct ieee80211_local *local, int queue);
-int ieee80211_wme_register(void);
-void ieee80211_wme_unregister(void);
+ struct sta_info *sta, u16 tid);
#else
static inline void ieee80211_install_qdisc(struct net_device *dev)
{
@@ -56,18 +52,7 @@ static inline int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
return -EAGAIN;
}
static inline void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
- struct sta_info *sta, u16 tid,
- u8 requeue)
-{
-}
-static inline void ieee80211_requeue(struct ieee80211_local *local, int queue)
-{
-}
-static inline int ieee80211_wme_register(void)
-{
- return 0;
-}
-static inline void ieee80211_wme_unregister(void)
+ struct sta_info *sta, u16 tid)
{
}
#endif /* CONFIG_NET_SCHED */
--
1.5.6
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue().
[not found] ` <20080703.000521.13130101.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
@ 2008-07-03 9:14 ` Johannes Berg
2008-07-03 10:23 ` Johannes Berg
1 sibling, 0 replies; 6+ messages in thread
From: Johannes Berg @ 2008-07-03 9:14 UTC (permalink / raw)
To: David Miller
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
vinay-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8,
krkumar2-xthvdsQ13ZrQT0dZR+AlfA, mchan-dY08KVG/lbpWk0Htik3J/w,
Matheos.Worku-UdXhSnd/wVw, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
Ron Rindjunksi
[-- Attachment #1: Type: text/plain, Size: 25012 bytes --]
On Thu, 2008-07-03 at 00:05 -0700, David Miller wrote:
> Unfortunately it temporarily loses some features, such
> as packet dropping (easy to add) and requeueing (harder).
>
> But it is so much incredibly simpler now.
Way cool. I don't think we actually need requeue, afaik that's just
because of hardware trying to reject packets (which we're removing and
handling independently) and because of TX-aggregation queues which won't
matter because we use select_queue now.
Ron, can you take a look at that? I think it should be fine as-is. Best
also check out the git tree
(git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-tx-2.6.git) and
look at the resulting code.
I'll also get rid of the dependency on NET_SCHED and fix up the code a
bit.
> Signed-off-by: David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
> ---
> net/mac80211/ieee80211_i.h | 6 +
> net/mac80211/main.c | 16 +--
> net/mac80211/wme.c | 531 ++------------------------------------------
> net/mac80211/wme.h | 19 +--
> 4 files changed, 34 insertions(+), 538 deletions(-)
>
> diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
> index af352c0..0ecc0c0 100644
> --- a/net/mac80211/ieee80211_i.h
> +++ b/net/mac80211/ieee80211_i.h
> @@ -25,6 +25,7 @@
> #include <linux/etherdevice.h>
> #include <net/wireless.h>
> #include <net/iw_handler.h>
> +#include <net/mac80211.h>
> #include "key.h"
> #include "sta_info.h"
>
> @@ -542,6 +543,9 @@ enum {
> IEEE80211_ADDBA_MSG = 4,
> };
>
> +/* maximum number of hardware queues we support. */
> +#define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
> +
> struct ieee80211_local {
> /* embed the driver visible part.
> * don't cast (use the static inlines below), but we keep
> @@ -550,6 +554,8 @@ struct ieee80211_local {
>
> const struct ieee80211_ops *ops;
>
> + unsigned long queue_pool[BITS_TO_LONGS(QD_MAX_QUEUES)];
> +
> struct net_device *mdev; /* wmaster# - "master" 802.11 device */
> int open_count;
> int monitors, cooked_mntrs;
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
> index c4d36fe..b78b56e 100644
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -684,7 +684,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
> /* No need to requeue the packets in the agg queue, since we
> * held the tx lock: no packet could be enqueued to the newly
> * allocated queue */
> - ieee80211_ht_agg_queue_remove(local, sta, tid, 0);
> + ieee80211_ht_agg_queue_remove(local, sta, tid);
> #ifdef CONFIG_MAC80211_HT_DEBUG
> printk(KERN_DEBUG "BA request denied - HW unavailable for"
> " tid %d\n", tid);
> @@ -693,8 +693,6 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
> goto err_unlock_queue;
> }
>
> - /* Will put all the packets in the new SW queue */
> - ieee80211_requeue(local, ieee802_1d_to_ac[tid]);
> unlock_all_queues_bh(local->mdev);
> spin_unlock_bh(&sta->lock);
>
> @@ -883,7 +881,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid)
> dev_queue = netdev_get_tx_queue(local->mdev, 0);
> spin_lock_bh(&dev_queue->lock);
> /* remove the queue for this aggregation */
> - ieee80211_ht_agg_queue_remove(local, sta, tid, 1);
> + ieee80211_ht_agg_queue_remove(local, sta, tid);
> spin_unlock_bh(&dev_queue->lock);
>
> /* we just requeued the all the frames that were in the removed
> @@ -1900,19 +1898,10 @@ static int __init ieee80211_init(void)
> if (ret)
> goto out;
>
> - ret = ieee80211_wme_register();
> - if (ret) {
> - printk(KERN_DEBUG "ieee80211_init: failed to "
> - "initialize WME (err=%d)\n", ret);
> - goto out_cleanup_pid;
> - }
> -
> ieee80211_debugfs_netdev_init();
>
> return 0;
>
> - out_cleanup_pid:
> - rc80211_pid_exit();
> out:
> return ret;
> }
> @@ -1930,7 +1919,6 @@ static void __exit ieee80211_exit(void)
> if (mesh_allocated)
> ieee80211s_stop();
>
> - ieee80211_wme_unregister();
> ieee80211_debugfs_netdev_exit();
> }
>
> diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
> index 42b1fbf..3bbee5a 100644
> --- a/net/mac80211/wme.c
> +++ b/net/mac80211/wme.c
> @@ -18,8 +18,6 @@
> #include "ieee80211_i.h"
> #include "wme.h"
>
> -/* maximum number of hardware queues we support. */
> -#define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
> /* current number of hardware queues we support. */
> #define QD_NUM(hw) ((hw)->queues + (hw)->ampdu_queues)
>
> @@ -29,32 +27,14 @@
> */
> const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
>
> -struct ieee80211_sched_data
> -{
> - unsigned long qdisc_pool[BITS_TO_LONGS(QD_MAX_QUEUES)];
> - struct tcf_proto *filter_list;
> - struct Qdisc *queues[QD_MAX_QUEUES];
> - struct sk_buff_head requeued[QD_MAX_QUEUES];
> -};
> -
> static const char llc_ip_hdr[8] = {0xAA, 0xAA, 0x3, 0, 0, 0, 0x08, 0};
>
> /* given a data frame determine the 802.1p/1d tag to use */
> -static inline unsigned classify_1d(struct sk_buff *skb, struct Qdisc *qd)
> +static inline unsigned classify_1d(struct sk_buff *skb, struct net_device *dev)
> {
> struct iphdr *ip;
> - int dscp;
> int offset;
> -
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct tcf_result res = { -1, 0 };
> -
> - /* if there is a user set filter list, call out to that */
> - if (q->filter_list) {
> - tc_classify(skb, q->filter_list, &res);
> - if (res.class != -1)
> - return res.class;
> - }
> + int dscp;
>
> /* skb->priority values from 256->263 are magic values to
> * directly indicate a specific 802.1d priority.
> @@ -99,11 +79,10 @@ static inline int wme_downgrade_ac(struct sk_buff *skb)
> }
>
>
> -/* positive return value indicates which queue to use
> - * negative return value indicates to drop the frame */
> -static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
> +/* positive return value indicates which queue to use */
> +static u16 classify80211(struct sk_buff *skb, struct net_device *dev)
> {
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
>
> if (!ieee80211_is_data(hdr->frame_control)) {
> @@ -123,14 +102,12 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
>
> /* use the data classifier to determine what 802.1d tag the
> * data frame has */
> - skb->priority = classify_1d(skb, qd);
> + skb->priority = classify_1d(skb, dev);
>
> /* in case we are a client verify acm is not set for this ac */
> while (unlikely(local->wmm_acm & BIT(skb->priority))) {
> - if (wme_downgrade_ac(skb)) {
> - /* No AC with lower priority has acm=0, drop packet. */
> - return -1;
> - }
> + if (wme_downgrade_ac(skb))
> + return 0;
> }
>
> /* look up which queue to use for frames with this 1d tag */
> @@ -138,40 +115,17 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
> }
>
>
> -static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
> +static u16 ieee80211_select_queue(struct net_device *dev,
> + struct sk_buff *skb)
> {
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
> - struct Qdisc *qdisc;
> + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> struct sta_info *sta;
> - int err, queue;
> + u16 queue;
> u8 tid;
>
> - if (info->flags & IEEE80211_TX_CTL_REQUEUE) {
> - queue = skb_get_queue_mapping(skb);
> - rcu_read_lock();
> - sta = sta_info_get(local, hdr->addr1);
> - tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
> - if (sta) {
> - int ampdu_queue = sta->tid_to_tx_q[tid];
> - if ((ampdu_queue < QD_NUM(hw)) &&
> - test_bit(ampdu_queue, q->qdisc_pool)) {
> - queue = ampdu_queue;
> - info->flags |= IEEE80211_TX_CTL_AMPDU;
> - } else {
> - info->flags &= ~IEEE80211_TX_CTL_AMPDU;
> - }
> - }
> - rcu_read_unlock();
> - skb_queue_tail(&q->requeued[queue], skb);
> - qd->q.qlen++;
> - return 0;
> - }
> -
> - queue = classify80211(skb, qd);
> + queue = classify80211(skb, dev);
>
> if (unlikely(queue >= local->hw.queues))
> queue = local->hw.queues - 1;
> @@ -193,436 +147,32 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
>
> sta = sta_info_get(local, hdr->addr1);
> if (sta) {
> - int ampdu_queue = sta->tid_to_tx_q[tid];
> - if ((ampdu_queue < QD_NUM(hw)) &&
> - test_bit(ampdu_queue, q->qdisc_pool)) {
> - queue = ampdu_queue;
> - info->flags |= IEEE80211_TX_CTL_AMPDU;
> - } else {
> - info->flags &= ~IEEE80211_TX_CTL_AMPDU;
> - }
> + queue = sta->tid_to_tx_q[tid];
> + info->flags |= IEEE80211_TX_CTL_AMPDU;
> }
>
> rcu_read_unlock();
> }
>
> - if (unlikely(queue < 0)) {
> - kfree_skb(skb);
> - err = NET_XMIT_DROP;
> - } else {
> - tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
> - skb_set_queue_mapping(skb, queue);
> - qdisc = q->queues[queue];
> - err = qdisc->enqueue(skb, qdisc);
> - if (err == NET_XMIT_SUCCESS) {
> - qd->q.qlen++;
> - qd->bstats.bytes += skb->len;
> - qd->bstats.packets++;
> - return NET_XMIT_SUCCESS;
> - }
> - }
> - qd->qstats.drops++;
> - return err;
> -}
> -
> -
> -/* TODO: clean up the cases where master_hard_start_xmit
> - * returns non 0 - it shouldn't ever do that. Once done we
> - * can remove this function */
> -static int wme_qdiscop_requeue(struct sk_buff *skb, struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct Qdisc *qdisc;
> - int err;
> -
> - /* we recorded which queue to use earlier! */
> - qdisc = q->queues[skb_get_queue_mapping(skb)];
> -
> - if ((err = qdisc->ops->requeue(skb, qdisc)) == 0) {
> - qd->q.qlen++;
> - return 0;
> - }
> - qd->qstats.drops++;
> - return err;
> -}
> -
> -
> -static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct net_device *dev = qdisc_dev(qd);
> - struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - struct sk_buff *skb;
> - struct Qdisc *qdisc;
> - int queue;
> -
> - /* check all the h/w queues in numeric/priority order */
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - /* see if there is room in this hardware queue */
> - if (__netif_subqueue_stopped(local->mdev, queue) ||
> - !test_bit(queue, q->qdisc_pool))
> - continue;
> -
> - /* there is space - try and get a frame */
> - skb = skb_dequeue(&q->requeued[queue]);
> - if (skb) {
> - qd->q.qlen--;
> - return skb;
> - }
> -
> - qdisc = q->queues[queue];
> - skb = qdisc->dequeue(qdisc);
> - if (skb) {
> - qd->q.qlen--;
> - return skb;
> - }
> - }
> - /* returning a NULL here when all the h/w queues are full means we
> - * never need to call netif_stop_queue in the driver */
> - return NULL;
> -}
> -
> -
> -static void wme_qdiscop_reset(struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - int queue;
> -
> - /* QUESTION: should we have some hardware flush functionality here? */
> -
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - skb_queue_purge(&q->requeued[queue]);
> - qdisc_reset(q->queues[queue]);
> - }
> - qd->q.qlen = 0;
> -}
> -
> -
> -static void wme_qdiscop_destroy(struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - int queue;
> -
> - tcf_destroy_chain(q->filter_list);
> - q->filter_list = NULL;
> -
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - skb_queue_purge(&q->requeued[queue]);
> - qdisc_destroy(q->queues[queue]);
> - q->queues[queue] = &noop_qdisc;
> - }
> -}
> -
> -
> -/* called whenever parameters are updated on existing qdisc */
> -static int wme_qdiscop_tune(struct Qdisc *qd, struct nlattr *opt)
> -{
> - return 0;
> -}
> -
> -
> -/* called during initial creation of qdisc on device */
> -static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct net_device *dev = qdisc_dev(qd);
> - struct ieee80211_local *local;
> - struct ieee80211_hw *hw;
> - int err = 0, i;
> -
> - /* check that device is a mac80211 device */
> - if (!dev->ieee80211_ptr ||
> - dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)
> - return -EINVAL;
> -
> - local = wdev_priv(dev->ieee80211_ptr);
> - hw = &local->hw;
> -
> - /* only allow on master dev */
> - if (dev != local->mdev)
> - return -EINVAL;
> -
> - /* ensure that we are root qdisc */
> - if (qd->parent != TC_H_ROOT)
> - return -EINVAL;
> -
> - if (qd->flags & TCQ_F_INGRESS)
> - return -EINVAL;
> -
> - /* if options were passed in, set them */
> - if (opt)
> - err = wme_qdiscop_tune(qd, opt);
> -
> - /* create child queues */
> - for (i = 0; i < QD_NUM(hw); i++) {
> - skb_queue_head_init(&q->requeued[i]);
> - q->queues[i] = qdisc_create_dflt(qdisc_dev(qd), qd->dev_queue,
> - &pfifo_qdisc_ops,
> - qd->handle);
> - if (!q->queues[i]) {
> - q->queues[i] = &noop_qdisc;
> - printk(KERN_ERR "%s child qdisc %i creation failed\n",
> - dev->name, i);
> - }
> - }
> -
> - /* non-aggregation queues: reserve/mark as used */
> - for (i = 0; i < local->hw.queues; i++)
> - set_bit(i, q->qdisc_pool);
> -
> - return err;
> -}
> -
> -static int wme_qdiscop_dump(struct Qdisc *qd, struct sk_buff *skb)
> -{
> - return -1;
> -}
> -
> -
> -static int wme_classop_graft(struct Qdisc *qd, unsigned long arg,
> - struct Qdisc *new, struct Qdisc **old)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - unsigned long queue = arg - 1;
> -
> - if (queue >= QD_NUM(hw))
> - return -EINVAL;
> -
> - if (!new)
> - new = &noop_qdisc;
> -
> - sch_tree_lock(qd);
> - *old = q->queues[queue];
> - q->queues[queue] = new;
> - qdisc_reset(*old);
> - sch_tree_unlock(qd);
> -
> - return 0;
> -}
> -
> -
> -static struct Qdisc *
> -wme_classop_leaf(struct Qdisc *qd, unsigned long arg)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - unsigned long queue = arg - 1;
> -
> - if (queue >= QD_NUM(hw))
> - return NULL;
> -
> - return q->queues[queue];
> -}
> -
> -
> -static unsigned long wme_classop_get(struct Qdisc *qd, u32 classid)
> -{
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - unsigned long queue = TC_H_MIN(classid);
> -
> - if (queue - 1 >= QD_NUM(hw))
> - return 0;
> -
> return queue;
> }
>
> -
> -static unsigned long wme_classop_bind(struct Qdisc *qd, unsigned long parent,
> - u32 classid)
> -{
> - return wme_classop_get(qd, classid);
> -}
> -
> -
> -static void wme_classop_put(struct Qdisc *q, unsigned long cl)
> -{
> -}
> -
> -
> -static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent,
> - struct nlattr **tca, unsigned long *arg)
> -{
> - unsigned long cl = *arg;
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> -
> - if (cl - 1 > QD_NUM(hw))
> - return -ENOENT;
> -
> - /* TODO: put code to program hardware queue parameters here,
> - * to allow programming from tc command line */
> -
> - return 0;
> -}
> -
> -
> -/* we don't support deleting hardware queues
> - * when we add WMM-SA support - TSPECs may be deleted here */
> -static int wme_classop_delete(struct Qdisc *qd, unsigned long cl)
> -{
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> -
> - if (cl - 1 > QD_NUM(hw))
> - return -ENOENT;
> - return 0;
> -}
> -
> -
> -static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl,
> - struct sk_buff *skb, struct tcmsg *tcm)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> -
> - if (cl - 1 > QD_NUM(hw))
> - return -ENOENT;
> - tcm->tcm_handle = TC_H_MIN(cl);
> - tcm->tcm_parent = qd->handle;
> - tcm->tcm_info = q->queues[cl-1]->handle; /* do we need this? */
> - return 0;
> -}
> -
> -
> -static void wme_classop_walk(struct Qdisc *qd, struct qdisc_walker *arg)
> -{
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - int queue;
> -
> - if (arg->stop)
> - return;
> -
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - if (arg->count < arg->skip) {
> - arg->count++;
> - continue;
> - }
> - /* we should return classids for our internal queues here
> - * as well as the external ones */
> - if (arg->fn(qd, queue+1, arg) < 0) {
> - arg->stop = 1;
> - break;
> - }
> - arg->count++;
> - }
> -}
> -
> -
> -static struct tcf_proto ** wme_classop_find_tcf(struct Qdisc *qd,
> - unsigned long cl)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> -
> - if (cl)
> - return NULL;
> -
> - return &q->filter_list;
> -}
> -
> -
> -/* this qdisc is classful (i.e. has classes, some of which may have leaf qdiscs attached)
> - * - these are the operations on the classes */
> -static const struct Qdisc_class_ops class_ops =
> -{
> - .graft = wme_classop_graft,
> - .leaf = wme_classop_leaf,
> -
> - .get = wme_classop_get,
> - .put = wme_classop_put,
> - .change = wme_classop_change,
> - .delete = wme_classop_delete,
> - .walk = wme_classop_walk,
> -
> - .tcf_chain = wme_classop_find_tcf,
> - .bind_tcf = wme_classop_bind,
> - .unbind_tcf = wme_classop_put,
> -
> - .dump = wme_classop_dump_class,
> -};
> -
> -
> -/* queueing discipline operations */
> -static struct Qdisc_ops wme_qdisc_ops __read_mostly =
> -{
> - .next = NULL,
> - .cl_ops = &class_ops,
> - .id = "ieee80211",
> - .priv_size = sizeof(struct ieee80211_sched_data),
> -
> - .enqueue = wme_qdiscop_enqueue,
> - .dequeue = wme_qdiscop_dequeue,
> - .requeue = wme_qdiscop_requeue,
> - .drop = NULL, /* drop not needed since we are always the root qdisc */
> -
> - .init = wme_qdiscop_init,
> - .reset = wme_qdiscop_reset,
> - .destroy = wme_qdiscop_destroy,
> - .change = wme_qdiscop_tune,
> -
> - .dump = wme_qdiscop_dump,
> -};
> -
> -
> void ieee80211_install_qdisc(struct net_device *dev)
> {
> - struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
> - struct Qdisc *qdisc;
> -
> - qdisc = qdisc_create_dflt(dev, txq,
> - &wme_qdisc_ops, TC_H_ROOT);
> - if (!qdisc) {
> - printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
> - return;
> - }
> -
> - /* same handle as would be allocated by qdisc_alloc_handle() */
> - qdisc->handle = 0x80010000;
> -
> - qdisc_lock_tree(dev);
> - list_add_tail(&qdisc->list, &txq->qdisc_list);
> - txq->qdisc_sleeping = qdisc;
> - qdisc_unlock_tree(dev);
> + dev->select_queue = ieee80211_select_queue;
> }
>
>
> int ieee80211_qdisc_installed(struct net_device *dev)
> {
> - struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
> -
> - return txq->qdisc_sleeping->ops == &wme_qdisc_ops;
> -}
> -
> -
> -int ieee80211_wme_register(void)
> -{
> - return register_qdisc(&wme_qdisc_ops);
> -}
> -
> -
> -void ieee80211_wme_unregister(void)
> -{
> - unregister_qdisc(&wme_qdisc_ops);
> + return dev->select_queue == ieee80211_select_queue;
> }
>
> int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> struct sta_info *sta, u16 tid)
> {
> - int i;
> - struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
> - struct ieee80211_sched_data *q =
> - qdisc_priv(txq->qdisc_sleeping);
> DECLARE_MAC_BUF(mac);
> + int i;
>
> /* prepare the filter and save it for the SW queue
> * matching the received HW queue */
> @@ -632,7 +182,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
>
> /* try to get a Qdisc from the pool */
> for (i = local->hw.queues; i < QD_NUM(&local->hw); i++)
> - if (!test_and_set_bit(i, q->qdisc_pool)) {
> + if (!test_and_set_bit(i, local->queue_pool)) {
> ieee80211_stop_queue(local_to_hw(local), i);
> sta->tid_to_tx_q[tid] = i;
>
> @@ -643,9 +193,8 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> #ifdef CONFIG_MAC80211_HT_DEBUG
> if (net_ratelimit())
> printk(KERN_DEBUG "allocated aggregation queue"
> - " %d tid %d addr %s pool=0x%lX\n",
> - i, tid, print_mac(mac, sta->addr),
> - q->qdisc_pool[0]);
> + " %d tid %d addr %s\n",
> + i, tid, print_mac(mac, sta->addr));
> #endif /* CONFIG_MAC80211_HT_DEBUG */
> return 0;
> }
> @@ -657,44 +206,12 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> * the caller needs to hold netdev_get_tx_queue(local->mdev, X)->lock
> */
> void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
> - struct sta_info *sta, u16 tid,
> - u8 requeue)
> + struct sta_info *sta, u16 tid)
> {
> struct ieee80211_hw *hw = &local->hw;
> - struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
> - struct ieee80211_sched_data *q =
> - qdisc_priv(txq->qdisc_sleeping);
> int agg_queue = sta->tid_to_tx_q[tid];
>
> /* return the qdisc to the pool */
> - clear_bit(agg_queue, q->qdisc_pool);
> + clear_bit(agg_queue, local->queue_pool);
> sta->tid_to_tx_q[tid] = QD_NUM(hw);
> -
> - if (requeue)
> - ieee80211_requeue(local, agg_queue);
> - else
> - q->queues[agg_queue]->ops->reset(q->queues[agg_queue]);
> -}
> -
> -void ieee80211_requeue(struct ieee80211_local *local, int queue)
> -{
> - struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
> - struct Qdisc *root_qd = txq->qdisc_sleeping;
> - struct ieee80211_sched_data *q = qdisc_priv(root_qd);
> - struct Qdisc *qdisc = q->queues[queue];
> - struct sk_buff *skb = NULL;
> - u32 len;
> -
> - if (!qdisc || !qdisc->dequeue)
> - return;
> -
> - printk(KERN_DEBUG "requeue: qlen = %d\n", qdisc->q.qlen);
> - for (len = qdisc->q.qlen; len > 0; len--) {
> - skb = qdisc->dequeue(qdisc);
> - root_qd->q.qlen--;
> - /* packet will be classified again and */
> - /* skb->packet_data->queue will be overridden if needed */
> - if (skb)
> - wme_qdiscop_enqueue(skb, root_qd);
> - }
> }
> diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
> index bbdb533..c79be0e 100644
> --- a/net/mac80211/wme.h
> +++ b/net/mac80211/wme.h
> @@ -37,11 +37,7 @@ int ieee80211_qdisc_installed(struct net_device *dev);
> int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> struct sta_info *sta, u16 tid);
> void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
> - struct sta_info *sta, u16 tid,
> - u8 requeue);
> -void ieee80211_requeue(struct ieee80211_local *local, int queue);
> -int ieee80211_wme_register(void);
> -void ieee80211_wme_unregister(void);
> + struct sta_info *sta, u16 tid);
> #else
> static inline void ieee80211_install_qdisc(struct net_device *dev)
> {
> @@ -56,18 +52,7 @@ static inline int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> return -EAGAIN;
> }
> static inline void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
> - struct sta_info *sta, u16 tid,
> - u8 requeue)
> -{
> -}
> -static inline void ieee80211_requeue(struct ieee80211_local *local, int queue)
> -{
> -}
> -static inline int ieee80211_wme_register(void)
> -{
> - return 0;
> -}
> -static inline void ieee80211_wme_unregister(void)
> + struct sta_info *sta, u16 tid)
> {
> }
> #endif /* CONFIG_NET_SCHED */
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue().
[not found] ` <20080703.000521.13130101.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2008-07-03 9:14 ` Johannes Berg
@ 2008-07-03 10:23 ` Johannes Berg
[not found] ` <1215080583.13270.38.camel-YfaajirXv214zXjbi5bjpg@public.gmane.org>
1 sibling, 1 reply; 6+ messages in thread
From: Johannes Berg @ 2008-07-03 10:23 UTC (permalink / raw)
To: David Miller
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
vinay-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8,
krkumar2-xthvdsQ13ZrQT0dZR+AlfA, mchan-dY08KVG/lbpWk0Htik3J/w,
Matheos.Worku-UdXhSnd/wVw, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
Ron Rindjunsky
Here's a little cleanup patch. My kernel is still compiling so I haven't
tested it yet though. Note it removes netif_is_multiqueue(). I think
the first hunk to net/mac80211/main.c is a bugfix for your changes,
while the rest is just cleanups.
Ron, your Intel address is bouncing (550 #5.1.0 Address rejected),
might want to check that out.
As Dave said, his patch breaks requeuing and first I thought that wasn't
important, but I think the point was to put frames we have already
queued for a station into the right aggregation queue so that it can be
aggregated when aggregation is started; and that we don't try to send it
out on an aggregation queue when aggregation is stopped.
johannes
---
include/linux/netdevice.h | 11 -----------
net/mac80211/Kconfig | 10 ----------
net/mac80211/Makefile | 4 ++--
net/mac80211/ieee80211_i.h | 9 ---------
net/mac80211/main.c | 9 ++-------
net/mac80211/util.c | 14 ++------------
net/mac80211/wme.c | 14 +-------------
net/mac80211/wme.h | 22 +---------------------
8 files changed, 8 insertions(+), 85 deletions(-)
--- everything.orig/net/mac80211/ieee80211_i.h 2008-07-03 11:43:40.000000000 +0200
+++ everything/net/mac80211/ieee80211_i.h 2008-07-03 11:50:28.000000000 +0200
@@ -757,15 +757,6 @@ struct ieee80211_local {
#endif
};
-static inline int ieee80211_is_multiqueue(struct ieee80211_local *local)
-{
-#ifdef CONFIG_MAC80211_QOS
- return netif_is_multiqueue(local->mdev);
-#else
- return 0;
-#endif
-}
-
/* this struct represents 802.11n's RA/TID combination */
struct ieee80211_ra_tid {
u8 ra[ETH_ALEN];
--- everything.orig/net/mac80211/util.c 2008-07-03 11:43:53.000000000 +0200
+++ everything/net/mac80211/util.c 2008-07-03 11:51:02.000000000 +0200
@@ -363,12 +363,7 @@ void ieee80211_wake_queue(struct ieee802
if (test_bit(queue, local->queues_pending)) {
tasklet_schedule(&local->tx_pending_tasklet);
} else {
- if (ieee80211_is_multiqueue(local)) {
- netif_wake_subqueue(local->mdev, queue);
- } else {
- WARN_ON(queue != 0);
- netif_wake_queue(local->mdev);
- }
+ netif_wake_subqueue(local->mdev, queue);
}
}
EXPORT_SYMBOL(ieee80211_wake_queue);
@@ -377,12 +372,7 @@ void ieee80211_stop_queue(struct ieee802
{
struct ieee80211_local *local = hw_to_local(hw);
- if (ieee80211_is_multiqueue(local)) {
- netif_stop_subqueue(local->mdev, queue);
- } else {
- WARN_ON(queue != 0);
- netif_stop_queue(local->mdev);
- }
+ netif_stop_subqueue(local->mdev, queue);
}
EXPORT_SYMBOL(ieee80211_stop_queue);
--- everything.orig/net/mac80211/wme.c 2008-07-03 11:43:19.000000000 +0200
+++ everything/net/mac80211/wme.c 2008-07-03 11:54:48.000000000 +0200
@@ -115,8 +115,7 @@ static u16 classify80211(struct sk_buff
}
-static u16 ieee80211_select_queue(struct net_device *dev,
- struct sk_buff *skb)
+u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -157,17 +156,6 @@ static u16 ieee80211_select_queue(struct
return queue;
}
-void ieee80211_install_qdisc(struct net_device *dev)
-{
- dev->select_queue = ieee80211_select_queue;
-}
-
-
-int ieee80211_qdisc_installed(struct net_device *dev)
-{
- return dev->select_queue == ieee80211_select_queue;
-}
-
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
struct sta_info *sta, u16 tid)
{
--- everything.orig/net/mac80211/wme.h 2008-07-03 11:43:09.000000000 +0200
+++ everything/net/mac80211/wme.h 2008-07-03 12:02:29.000000000 +0200
@@ -31,30 +31,10 @@ static inline int WLAN_FC_IS_QOS_DATA(u1
return (fc & 0x8C) == 0x88;
}
-#ifdef CONFIG_MAC80211_QOS
-void ieee80211_install_qdisc(struct net_device *dev);
-int ieee80211_qdisc_installed(struct net_device *dev);
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
struct sta_info *sta, u16 tid);
void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
struct sta_info *sta, u16 tid);
-#else
-static inline void ieee80211_install_qdisc(struct net_device *dev)
-{
-}
-static inline int ieee80211_qdisc_installed(struct net_device *dev)
-{
- return 0;
-}
-static inline int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
- struct sta_info *sta, u16 tid)
-{
- return -EAGAIN;
-}
-static inline void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
- struct sta_info *sta, u16 tid)
-{
-}
-#endif /* CONFIG_NET_SCHED */
+u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb);
#endif /* _WME_H */
--- everything.orig/include/linux/netdevice.h 2008-07-03 11:51:50.000000000 +0200
+++ everything/include/linux/netdevice.h 2008-07-03 11:51:56.000000000 +0200
@@ -1175,17 +1175,6 @@ static inline void netif_wake_subqueue(s
__netif_schedule(txq);
}
-/**
- * netif_is_multiqueue - test if device has multiple transmit queues
- * @dev: network device
- *
- * Check if device has multiple transmit queues
- */
-static inline int netif_is_multiqueue(const struct net_device *dev)
-{
- return (dev->num_tx_queues > 1);
-}
-
/* Use this variant when it is known for sure that it
* is executing from hardware interrupt context or with hardware interrupts
* disabled.
--- everything.orig/net/mac80211/Kconfig 2008-07-03 11:43:31.000000000 +0200
+++ everything/net/mac80211/Kconfig 2008-07-03 11:52:57.000000000 +0200
@@ -11,16 +11,6 @@ config MAC80211
This option enables the hardware independent IEEE 802.11
networking stack.
-config MAC80211_QOS
- def_bool y
- depends on MAC80211
- depends on NET_SCHED
-
-comment "QoS/HT support disabled"
- depends on MAC80211 && !MAC80211_QOS
-comment "QoS/HT support needs CONFIG_NET_SCHED"
- depends on MAC80211 && !NET_SCHED
-
menu "Rate control algorithm selection"
depends on MAC80211 != n
--- everything.orig/net/mac80211/Makefile 2008-07-03 11:52:42.000000000 +0200
+++ everything/net/mac80211/Makefile 2008-07-03 11:52:51.000000000 +0200
@@ -26,10 +26,10 @@ mac80211-y := \
tx.o \
key.o \
util.o \
- event.o
+ event.o \
+ wme.o
mac80211-$(CONFIG_MAC80211_LEDS) += led.o
-mac80211-$(CONFIG_MAC80211_QOS) += wme.o
mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
debugfs.o \
debugfs_sta.o \
--- everything.orig/net/mac80211/main.c 2008-07-03 11:52:13.000000000 +0200
+++ everything/net/mac80211/main.c 2008-07-03 11:56:51.000000000 +0200
@@ -114,7 +114,7 @@ static int ieee80211_master_open(struct
if (res)
return res;
- netif_start_queue(local->mdev);
+ netif_tx_start_all_queues(local->mdev);
return 0;
}
@@ -1667,17 +1667,12 @@ int ieee80211_register_hw(struct ieee802
* We use the number of queues for feature tests (QoS, HT) internally
* so restrict them appropriately.
*/
-#ifdef CONFIG_MAC80211_QOS
if (hw->queues > IEEE80211_MAX_QUEUES)
hw->queues = IEEE80211_MAX_QUEUES;
if (hw->ampdu_queues > IEEE80211_MAX_AMPDU_QUEUES)
hw->ampdu_queues = IEEE80211_MAX_AMPDU_QUEUES;
if (hw->queues < 4)
hw->ampdu_queues = 0;
-#else
- hw->queues = 1;
- hw->ampdu_queues = 0;
-#endif
/* for now, mdev needs sub_if_data :/ */
mdev = alloc_netdev_mq(sizeof(struct ieee80211_sub_if_data),
@@ -1775,7 +1770,7 @@ int ieee80211_register_hw(struct ieee802
goto fail_wep;
}
- ieee80211_install_qdisc(local->mdev);
+ local->mdev->select_queue = ieee80211_select_queue;
/* add one default STA interface */
result = ieee80211_if_add(local->mdev, "wlan%d", NULL,
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue().
2008-07-03 7:05 [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue() David Miller
[not found] ` <20080703.000521.13130101.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
@ 2008-07-03 11:27 ` Tomas Winkler
2008-07-03 12:12 ` Johannes Berg
1 sibling, 1 reply; 6+ messages in thread
From: Tomas Winkler @ 2008-07-03 11:27 UTC (permalink / raw)
To: David Miller
Cc: netdev, vinay, krkumar2, mchan, Matheos.Worku, linux-wireless
On Thu, Jul 3, 2008 at 10:05 AM, David Miller <davem@davemloft.net> wrote:
>
> Unfortunately it temporarily loses some features, such
> as packet dropping (easy to add) and requeueing (harder).
Requeueing is must. This effectively kills HT. We must be able to
requeu packets from the legacy queue into apmdu queue.
Tomas
>
> But it is so much incredibly simpler now.
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
> net/mac80211/ieee80211_i.h | 6 +
> net/mac80211/main.c | 16 +--
> net/mac80211/wme.c | 531 ++------------------------------------------
> net/mac80211/wme.h | 19 +--
> 4 files changed, 34 insertions(+), 538 deletions(-)
>
> diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
> index af352c0..0ecc0c0 100644
> --- a/net/mac80211/ieee80211_i.h
> +++ b/net/mac80211/ieee80211_i.h
> @@ -25,6 +25,7 @@
> #include <linux/etherdevice.h>
> #include <net/wireless.h>
> #include <net/iw_handler.h>
> +#include <net/mac80211.h>
> #include "key.h"
> #include "sta_info.h"
>
> @@ -542,6 +543,9 @@ enum {
> IEEE80211_ADDBA_MSG = 4,
> };
>
> +/* maximum number of hardware queues we support. */
> +#define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
> +
> struct ieee80211_local {
> /* embed the driver visible part.
> * don't cast (use the static inlines below), but we keep
> @@ -550,6 +554,8 @@ struct ieee80211_local {
>
> const struct ieee80211_ops *ops;
>
> + unsigned long queue_pool[BITS_TO_LONGS(QD_MAX_QUEUES)];
> +
> struct net_device *mdev; /* wmaster# - "master" 802.11 device */
> int open_count;
> int monitors, cooked_mntrs;
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
> index c4d36fe..b78b56e 100644
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -684,7 +684,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
> /* No need to requeue the packets in the agg queue, since we
> * held the tx lock: no packet could be enqueued to the newly
> * allocated queue */
> - ieee80211_ht_agg_queue_remove(local, sta, tid, 0);
> + ieee80211_ht_agg_queue_remove(local, sta, tid);
> #ifdef CONFIG_MAC80211_HT_DEBUG
> printk(KERN_DEBUG "BA request denied - HW unavailable for"
> " tid %d\n", tid);
> @@ -693,8 +693,6 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
> goto err_unlock_queue;
> }
>
> - /* Will put all the packets in the new SW queue */
> - ieee80211_requeue(local, ieee802_1d_to_ac[tid]);
> unlock_all_queues_bh(local->mdev);
> spin_unlock_bh(&sta->lock);
>
> @@ -883,7 +881,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid)
> dev_queue = netdev_get_tx_queue(local->mdev, 0);
> spin_lock_bh(&dev_queue->lock);
> /* remove the queue for this aggregation */
> - ieee80211_ht_agg_queue_remove(local, sta, tid, 1);
> + ieee80211_ht_agg_queue_remove(local, sta, tid);
> spin_unlock_bh(&dev_queue->lock);
>
> /* we just requeued the all the frames that were in the removed
> @@ -1900,19 +1898,10 @@ static int __init ieee80211_init(void)
> if (ret)
> goto out;
>
> - ret = ieee80211_wme_register();
> - if (ret) {
> - printk(KERN_DEBUG "ieee80211_init: failed to "
> - "initialize WME (err=%d)\n", ret);
> - goto out_cleanup_pid;
> - }
> -
> ieee80211_debugfs_netdev_init();
>
> return 0;
>
> - out_cleanup_pid:
> - rc80211_pid_exit();
> out:
> return ret;
> }
> @@ -1930,7 +1919,6 @@ static void __exit ieee80211_exit(void)
> if (mesh_allocated)
> ieee80211s_stop();
>
> - ieee80211_wme_unregister();
> ieee80211_debugfs_netdev_exit();
> }
>
> diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
> index 42b1fbf..3bbee5a 100644
> --- a/net/mac80211/wme.c
> +++ b/net/mac80211/wme.c
> @@ -18,8 +18,6 @@
> #include "ieee80211_i.h"
> #include "wme.h"
>
> -/* maximum number of hardware queues we support. */
> -#define QD_MAX_QUEUES (IEEE80211_MAX_AMPDU_QUEUES + IEEE80211_MAX_QUEUES)
> /* current number of hardware queues we support. */
> #define QD_NUM(hw) ((hw)->queues + (hw)->ampdu_queues)
>
> @@ -29,32 +27,14 @@
> */
> const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
>
> -struct ieee80211_sched_data
> -{
> - unsigned long qdisc_pool[BITS_TO_LONGS(QD_MAX_QUEUES)];
> - struct tcf_proto *filter_list;
> - struct Qdisc *queues[QD_MAX_QUEUES];
> - struct sk_buff_head requeued[QD_MAX_QUEUES];
> -};
> -
> static const char llc_ip_hdr[8] = {0xAA, 0xAA, 0x3, 0, 0, 0, 0x08, 0};
>
> /* given a data frame determine the 802.1p/1d tag to use */
> -static inline unsigned classify_1d(struct sk_buff *skb, struct Qdisc *qd)
> +static inline unsigned classify_1d(struct sk_buff *skb, struct net_device *dev)
> {
> struct iphdr *ip;
> - int dscp;
> int offset;
> -
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct tcf_result res = { -1, 0 };
> -
> - /* if there is a user set filter list, call out to that */
> - if (q->filter_list) {
> - tc_classify(skb, q->filter_list, &res);
> - if (res.class != -1)
> - return res.class;
> - }
> + int dscp;
>
> /* skb->priority values from 256->263 are magic values to
> * directly indicate a specific 802.1d priority.
> @@ -99,11 +79,10 @@ static inline int wme_downgrade_ac(struct sk_buff *skb)
> }
>
>
> -/* positive return value indicates which queue to use
> - * negative return value indicates to drop the frame */
> -static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
> +/* positive return value indicates which queue to use */
> +static u16 classify80211(struct sk_buff *skb, struct net_device *dev)
> {
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
>
> if (!ieee80211_is_data(hdr->frame_control)) {
> @@ -123,14 +102,12 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
>
> /* use the data classifier to determine what 802.1d tag the
> * data frame has */
> - skb->priority = classify_1d(skb, qd);
> + skb->priority = classify_1d(skb, dev);
>
> /* in case we are a client verify acm is not set for this ac */
> while (unlikely(local->wmm_acm & BIT(skb->priority))) {
> - if (wme_downgrade_ac(skb)) {
> - /* No AC with lower priority has acm=0, drop packet. */
> - return -1;
> - }
> + if (wme_downgrade_ac(skb))
> + return 0;
> }
>
> /* look up which queue to use for frames with this 1d tag */
> @@ -138,40 +115,17 @@ static int classify80211(struct sk_buff *skb, struct Qdisc *qd)
> }
>
>
> -static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
> +static u16 ieee80211_select_queue(struct net_device *dev,
> + struct sk_buff *skb)
> {
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
> - struct Qdisc *qdisc;
> + struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
> struct sta_info *sta;
> - int err, queue;
> + u16 queue;
> u8 tid;
>
> - if (info->flags & IEEE80211_TX_CTL_REQUEUE) {
> - queue = skb_get_queue_mapping(skb);
> - rcu_read_lock();
> - sta = sta_info_get(local, hdr->addr1);
> - tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
> - if (sta) {
> - int ampdu_queue = sta->tid_to_tx_q[tid];
> - if ((ampdu_queue < QD_NUM(hw)) &&
> - test_bit(ampdu_queue, q->qdisc_pool)) {
> - queue = ampdu_queue;
> - info->flags |= IEEE80211_TX_CTL_AMPDU;
> - } else {
> - info->flags &= ~IEEE80211_TX_CTL_AMPDU;
> - }
> - }
> - rcu_read_unlock();
> - skb_queue_tail(&q->requeued[queue], skb);
> - qd->q.qlen++;
> - return 0;
> - }
> -
> - queue = classify80211(skb, qd);
> + queue = classify80211(skb, dev);
>
> if (unlikely(queue >= local->hw.queues))
> queue = local->hw.queues - 1;
> @@ -193,436 +147,32 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd)
>
> sta = sta_info_get(local, hdr->addr1);
> if (sta) {
> - int ampdu_queue = sta->tid_to_tx_q[tid];
> - if ((ampdu_queue < QD_NUM(hw)) &&
> - test_bit(ampdu_queue, q->qdisc_pool)) {
> - queue = ampdu_queue;
> - info->flags |= IEEE80211_TX_CTL_AMPDU;
> - } else {
> - info->flags &= ~IEEE80211_TX_CTL_AMPDU;
> - }
> + queue = sta->tid_to_tx_q[tid];
> + info->flags |= IEEE80211_TX_CTL_AMPDU;
> }
>
> rcu_read_unlock();
> }
>
> - if (unlikely(queue < 0)) {
> - kfree_skb(skb);
> - err = NET_XMIT_DROP;
> - } else {
> - tid = skb->priority & QOS_CONTROL_TAG1D_MASK;
> - skb_set_queue_mapping(skb, queue);
> - qdisc = q->queues[queue];
> - err = qdisc->enqueue(skb, qdisc);
> - if (err == NET_XMIT_SUCCESS) {
> - qd->q.qlen++;
> - qd->bstats.bytes += skb->len;
> - qd->bstats.packets++;
> - return NET_XMIT_SUCCESS;
> - }
> - }
> - qd->qstats.drops++;
> - return err;
> -}
> -
> -
> -/* TODO: clean up the cases where master_hard_start_xmit
> - * returns non 0 - it shouldn't ever do that. Once done we
> - * can remove this function */
> -static int wme_qdiscop_requeue(struct sk_buff *skb, struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct Qdisc *qdisc;
> - int err;
> -
> - /* we recorded which queue to use earlier! */
> - qdisc = q->queues[skb_get_queue_mapping(skb)];
> -
> - if ((err = qdisc->ops->requeue(skb, qdisc)) == 0) {
> - qd->q.qlen++;
> - return 0;
> - }
> - qd->qstats.drops++;
> - return err;
> -}
> -
> -
> -static struct sk_buff *wme_qdiscop_dequeue(struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct net_device *dev = qdisc_dev(qd);
> - struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - struct sk_buff *skb;
> - struct Qdisc *qdisc;
> - int queue;
> -
> - /* check all the h/w queues in numeric/priority order */
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - /* see if there is room in this hardware queue */
> - if (__netif_subqueue_stopped(local->mdev, queue) ||
> - !test_bit(queue, q->qdisc_pool))
> - continue;
> -
> - /* there is space - try and get a frame */
> - skb = skb_dequeue(&q->requeued[queue]);
> - if (skb) {
> - qd->q.qlen--;
> - return skb;
> - }
> -
> - qdisc = q->queues[queue];
> - skb = qdisc->dequeue(qdisc);
> - if (skb) {
> - qd->q.qlen--;
> - return skb;
> - }
> - }
> - /* returning a NULL here when all the h/w queues are full means we
> - * never need to call netif_stop_queue in the driver */
> - return NULL;
> -}
> -
> -
> -static void wme_qdiscop_reset(struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - int queue;
> -
> - /* QUESTION: should we have some hardware flush functionality here? */
> -
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - skb_queue_purge(&q->requeued[queue]);
> - qdisc_reset(q->queues[queue]);
> - }
> - qd->q.qlen = 0;
> -}
> -
> -
> -static void wme_qdiscop_destroy(struct Qdisc* qd)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - int queue;
> -
> - tcf_destroy_chain(q->filter_list);
> - q->filter_list = NULL;
> -
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - skb_queue_purge(&q->requeued[queue]);
> - qdisc_destroy(q->queues[queue]);
> - q->queues[queue] = &noop_qdisc;
> - }
> -}
> -
> -
> -/* called whenever parameters are updated on existing qdisc */
> -static int wme_qdiscop_tune(struct Qdisc *qd, struct nlattr *opt)
> -{
> - return 0;
> -}
> -
> -
> -/* called during initial creation of qdisc on device */
> -static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct net_device *dev = qdisc_dev(qd);
> - struct ieee80211_local *local;
> - struct ieee80211_hw *hw;
> - int err = 0, i;
> -
> - /* check that device is a mac80211 device */
> - if (!dev->ieee80211_ptr ||
> - dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)
> - return -EINVAL;
> -
> - local = wdev_priv(dev->ieee80211_ptr);
> - hw = &local->hw;
> -
> - /* only allow on master dev */
> - if (dev != local->mdev)
> - return -EINVAL;
> -
> - /* ensure that we are root qdisc */
> - if (qd->parent != TC_H_ROOT)
> - return -EINVAL;
> -
> - if (qd->flags & TCQ_F_INGRESS)
> - return -EINVAL;
> -
> - /* if options were passed in, set them */
> - if (opt)
> - err = wme_qdiscop_tune(qd, opt);
> -
> - /* create child queues */
> - for (i = 0; i < QD_NUM(hw); i++) {
> - skb_queue_head_init(&q->requeued[i]);
> - q->queues[i] = qdisc_create_dflt(qdisc_dev(qd), qd->dev_queue,
> - &pfifo_qdisc_ops,
> - qd->handle);
> - if (!q->queues[i]) {
> - q->queues[i] = &noop_qdisc;
> - printk(KERN_ERR "%s child qdisc %i creation failed\n",
> - dev->name, i);
> - }
> - }
> -
> - /* non-aggregation queues: reserve/mark as used */
> - for (i = 0; i < local->hw.queues; i++)
> - set_bit(i, q->qdisc_pool);
> -
> - return err;
> -}
> -
> -static int wme_qdiscop_dump(struct Qdisc *qd, struct sk_buff *skb)
> -{
> - return -1;
> -}
> -
> -
> -static int wme_classop_graft(struct Qdisc *qd, unsigned long arg,
> - struct Qdisc *new, struct Qdisc **old)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - unsigned long queue = arg - 1;
> -
> - if (queue >= QD_NUM(hw))
> - return -EINVAL;
> -
> - if (!new)
> - new = &noop_qdisc;
> -
> - sch_tree_lock(qd);
> - *old = q->queues[queue];
> - q->queues[queue] = new;
> - qdisc_reset(*old);
> - sch_tree_unlock(qd);
> -
> - return 0;
> -}
> -
> -
> -static struct Qdisc *
> -wme_classop_leaf(struct Qdisc *qd, unsigned long arg)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - unsigned long queue = arg - 1;
> -
> - if (queue >= QD_NUM(hw))
> - return NULL;
> -
> - return q->queues[queue];
> -}
> -
> -
> -static unsigned long wme_classop_get(struct Qdisc *qd, u32 classid)
> -{
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - unsigned long queue = TC_H_MIN(classid);
> -
> - if (queue - 1 >= QD_NUM(hw))
> - return 0;
> -
> return queue;
> }
>
> -
> -static unsigned long wme_classop_bind(struct Qdisc *qd, unsigned long parent,
> - u32 classid)
> -{
> - return wme_classop_get(qd, classid);
> -}
> -
> -
> -static void wme_classop_put(struct Qdisc *q, unsigned long cl)
> -{
> -}
> -
> -
> -static int wme_classop_change(struct Qdisc *qd, u32 handle, u32 parent,
> - struct nlattr **tca, unsigned long *arg)
> -{
> - unsigned long cl = *arg;
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> -
> - if (cl - 1 > QD_NUM(hw))
> - return -ENOENT;
> -
> - /* TODO: put code to program hardware queue parameters here,
> - * to allow programming from tc command line */
> -
> - return 0;
> -}
> -
> -
> -/* we don't support deleting hardware queues
> - * when we add WMM-SA support - TSPECs may be deleted here */
> -static int wme_classop_delete(struct Qdisc *qd, unsigned long cl)
> -{
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> -
> - if (cl - 1 > QD_NUM(hw))
> - return -ENOENT;
> - return 0;
> -}
> -
> -
> -static int wme_classop_dump_class(struct Qdisc *qd, unsigned long cl,
> - struct sk_buff *skb, struct tcmsg *tcm)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> -
> - if (cl - 1 > QD_NUM(hw))
> - return -ENOENT;
> - tcm->tcm_handle = TC_H_MIN(cl);
> - tcm->tcm_parent = qd->handle;
> - tcm->tcm_info = q->queues[cl-1]->handle; /* do we need this? */
> - return 0;
> -}
> -
> -
> -static void wme_classop_walk(struct Qdisc *qd, struct qdisc_walker *arg)
> -{
> - struct ieee80211_local *local = wdev_priv(qdisc_dev(qd)->ieee80211_ptr);
> - struct ieee80211_hw *hw = &local->hw;
> - int queue;
> -
> - if (arg->stop)
> - return;
> -
> - for (queue = 0; queue < QD_NUM(hw); queue++) {
> - if (arg->count < arg->skip) {
> - arg->count++;
> - continue;
> - }
> - /* we should return classids for our internal queues here
> - * as well as the external ones */
> - if (arg->fn(qd, queue+1, arg) < 0) {
> - arg->stop = 1;
> - break;
> - }
> - arg->count++;
> - }
> -}
> -
> -
> -static struct tcf_proto ** wme_classop_find_tcf(struct Qdisc *qd,
> - unsigned long cl)
> -{
> - struct ieee80211_sched_data *q = qdisc_priv(qd);
> -
> - if (cl)
> - return NULL;
> -
> - return &q->filter_list;
> -}
> -
> -
> -/* this qdisc is classful (i.e. has classes, some of which may have leaf qdiscs attached)
> - * - these are the operations on the classes */
> -static const struct Qdisc_class_ops class_ops =
> -{
> - .graft = wme_classop_graft,
> - .leaf = wme_classop_leaf,
> -
> - .get = wme_classop_get,
> - .put = wme_classop_put,
> - .change = wme_classop_change,
> - .delete = wme_classop_delete,
> - .walk = wme_classop_walk,
> -
> - .tcf_chain = wme_classop_find_tcf,
> - .bind_tcf = wme_classop_bind,
> - .unbind_tcf = wme_classop_put,
> -
> - .dump = wme_classop_dump_class,
> -};
> -
> -
> -/* queueing discipline operations */
> -static struct Qdisc_ops wme_qdisc_ops __read_mostly =
> -{
> - .next = NULL,
> - .cl_ops = &class_ops,
> - .id = "ieee80211",
> - .priv_size = sizeof(struct ieee80211_sched_data),
> -
> - .enqueue = wme_qdiscop_enqueue,
> - .dequeue = wme_qdiscop_dequeue,
> - .requeue = wme_qdiscop_requeue,
> - .drop = NULL, /* drop not needed since we are always the root qdisc */
> -
> - .init = wme_qdiscop_init,
> - .reset = wme_qdiscop_reset,
> - .destroy = wme_qdiscop_destroy,
> - .change = wme_qdiscop_tune,
> -
> - .dump = wme_qdiscop_dump,
> -};
> -
> -
> void ieee80211_install_qdisc(struct net_device *dev)
> {
> - struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
> - struct Qdisc *qdisc;
> -
> - qdisc = qdisc_create_dflt(dev, txq,
> - &wme_qdisc_ops, TC_H_ROOT);
> - if (!qdisc) {
> - printk(KERN_ERR "%s: qdisc installation failed\n", dev->name);
> - return;
> - }
> -
> - /* same handle as would be allocated by qdisc_alloc_handle() */
> - qdisc->handle = 0x80010000;
> -
> - qdisc_lock_tree(dev);
> - list_add_tail(&qdisc->list, &txq->qdisc_list);
> - txq->qdisc_sleeping = qdisc;
> - qdisc_unlock_tree(dev);
> + dev->select_queue = ieee80211_select_queue;
> }
>
>
> int ieee80211_qdisc_installed(struct net_device *dev)
> {
> - struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
> -
> - return txq->qdisc_sleeping->ops == &wme_qdisc_ops;
> -}
> -
> -
> -int ieee80211_wme_register(void)
> -{
> - return register_qdisc(&wme_qdisc_ops);
> -}
> -
> -
> -void ieee80211_wme_unregister(void)
> -{
> - unregister_qdisc(&wme_qdisc_ops);
> + return dev->select_queue == ieee80211_select_queue;
> }
>
> int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> struct sta_info *sta, u16 tid)
> {
> - int i;
> - struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
> - struct ieee80211_sched_data *q =
> - qdisc_priv(txq->qdisc_sleeping);
> DECLARE_MAC_BUF(mac);
> + int i;
>
> /* prepare the filter and save it for the SW queue
> * matching the received HW queue */
> @@ -632,7 +182,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
>
> /* try to get a Qdisc from the pool */
> for (i = local->hw.queues; i < QD_NUM(&local->hw); i++)
> - if (!test_and_set_bit(i, q->qdisc_pool)) {
> + if (!test_and_set_bit(i, local->queue_pool)) {
> ieee80211_stop_queue(local_to_hw(local), i);
> sta->tid_to_tx_q[tid] = i;
>
> @@ -643,9 +193,8 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> #ifdef CONFIG_MAC80211_HT_DEBUG
> if (net_ratelimit())
> printk(KERN_DEBUG "allocated aggregation queue"
> - " %d tid %d addr %s pool=0x%lX\n",
> - i, tid, print_mac(mac, sta->addr),
> - q->qdisc_pool[0]);
> + " %d tid %d addr %s\n",
> + i, tid, print_mac(mac, sta->addr));
> #endif /* CONFIG_MAC80211_HT_DEBUG */
> return 0;
> }
> @@ -657,44 +206,12 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> * the caller needs to hold netdev_get_tx_queue(local->mdev, X)->lock
> */
> void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
> - struct sta_info *sta, u16 tid,
> - u8 requeue)
> + struct sta_info *sta, u16 tid)
> {
> struct ieee80211_hw *hw = &local->hw;
> - struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
> - struct ieee80211_sched_data *q =
> - qdisc_priv(txq->qdisc_sleeping);
> int agg_queue = sta->tid_to_tx_q[tid];
>
> /* return the qdisc to the pool */
> - clear_bit(agg_queue, q->qdisc_pool);
> + clear_bit(agg_queue, local->queue_pool);
> sta->tid_to_tx_q[tid] = QD_NUM(hw);
> -
> - if (requeue)
> - ieee80211_requeue(local, agg_queue);
> - else
> - q->queues[agg_queue]->ops->reset(q->queues[agg_queue]);
> -}
> -
> -void ieee80211_requeue(struct ieee80211_local *local, int queue)
> -{
> - struct netdev_queue *txq = netdev_get_tx_queue(local->mdev, 0);
> - struct Qdisc *root_qd = txq->qdisc_sleeping;
> - struct ieee80211_sched_data *q = qdisc_priv(root_qd);
> - struct Qdisc *qdisc = q->queues[queue];
> - struct sk_buff *skb = NULL;
> - u32 len;
> -
> - if (!qdisc || !qdisc->dequeue)
> - return;
> -
> - printk(KERN_DEBUG "requeue: qlen = %d\n", qdisc->q.qlen);
> - for (len = qdisc->q.qlen; len > 0; len--) {
> - skb = qdisc->dequeue(qdisc);
> - root_qd->q.qlen--;
> - /* packet will be classified again and */
> - /* skb->packet_data->queue will be overridden if needed */
> - if (skb)
> - wme_qdiscop_enqueue(skb, root_qd);
> - }
> }
> diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
> index bbdb533..c79be0e 100644
> --- a/net/mac80211/wme.h
> +++ b/net/mac80211/wme.h
> @@ -37,11 +37,7 @@ int ieee80211_qdisc_installed(struct net_device *dev);
> int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> struct sta_info *sta, u16 tid);
> void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
> - struct sta_info *sta, u16 tid,
> - u8 requeue);
> -void ieee80211_requeue(struct ieee80211_local *local, int queue);
> -int ieee80211_wme_register(void);
> -void ieee80211_wme_unregister(void);
> + struct sta_info *sta, u16 tid);
> #else
> static inline void ieee80211_install_qdisc(struct net_device *dev)
> {
> @@ -56,18 +52,7 @@ static inline int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
> return -EAGAIN;
> }
> static inline void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
> - struct sta_info *sta, u16 tid,
> - u8 requeue)
> -{
> -}
> -static inline void ieee80211_requeue(struct ieee80211_local *local, int queue)
> -{
> -}
> -static inline int ieee80211_wme_register(void)
> -{
> - return 0;
> -}
> -static inline void ieee80211_wme_unregister(void)
> + struct sta_info *sta, u16 tid)
> {
> }
> #endif /* CONFIG_NET_SCHED */
> --
> 1.5.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue().
[not found] ` <1215080583.13270.38.camel-YfaajirXv214zXjbi5bjpg@public.gmane.org>
@ 2008-07-03 12:02 ` Johannes Berg
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Berg @ 2008-07-03 12:02 UTC (permalink / raw)
To: David Miller
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
vinay-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8,
krkumar2-xthvdsQ13ZrQT0dZR+AlfA, mchan-dY08KVG/lbpWk0Htik3J/w,
Matheos.Worku-UdXhSnd/wVw, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
Ron Rindjunsky
On Thu, 2008-07-03 at 12:23 +0200, Johannes Berg wrote:
> Here's a little cleanup patch. My kernel is still compiling so I haven't
> tested it yet though.
This is a fixed version of the patch, but mac80211 still hangs and I
haven't been able to figure out why yet. iwlwifi scans fine, but since
that is hardware-assisted scanning we don't actually send packets, so it
looks like it hangs as soon as the first packet is sent out...
johannes
mac8021: Clean up after multiqueue rework
This cleans up mac80211 and removes a lot of now useless things. Also
removes netif_is_multiqueue().
Signed-off-by: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
---
include/linux/netdevice.h | 11 -----------
include/net/mac80211.h | 8 --------
net/mac80211/Kconfig | 10 ----------
net/mac80211/Makefile | 4 ++--
net/mac80211/ieee80211_i.h | 9 ---------
net/mac80211/main.c | 9 ++-------
net/mac80211/util.c | 14 ++------------
net/mac80211/wme.c | 14 +-------------
net/mac80211/wme.h | 22 +---------------------
9 files changed, 8 insertions(+), 93 deletions(-)
--- everything.orig/net/mac80211/ieee80211_i.h 2008-07-03 11:43:40.000000000 +0200
+++ everything/net/mac80211/ieee80211_i.h 2008-07-03 11:50:28.000000000 +0200
@@ -757,15 +757,6 @@ struct ieee80211_local {
#endif
};
-static inline int ieee80211_is_multiqueue(struct ieee80211_local *local)
-{
-#ifdef CONFIG_MAC80211_QOS
- return netif_is_multiqueue(local->mdev);
-#else
- return 0;
-#endif
-}
-
/* this struct represents 802.11n's RA/TID combination */
struct ieee80211_ra_tid {
u8 ra[ETH_ALEN];
--- everything.orig/net/mac80211/util.c 2008-07-03 11:43:53.000000000 +0200
+++ everything/net/mac80211/util.c 2008-07-03 11:51:02.000000000 +0200
@@ -363,12 +363,7 @@ void ieee80211_wake_queue(struct ieee802
if (test_bit(queue, local->queues_pending)) {
tasklet_schedule(&local->tx_pending_tasklet);
} else {
- if (ieee80211_is_multiqueue(local)) {
- netif_wake_subqueue(local->mdev, queue);
- } else {
- WARN_ON(queue != 0);
- netif_wake_queue(local->mdev);
- }
+ netif_wake_subqueue(local->mdev, queue);
}
}
EXPORT_SYMBOL(ieee80211_wake_queue);
@@ -377,12 +372,7 @@ void ieee80211_stop_queue(struct ieee802
{
struct ieee80211_local *local = hw_to_local(hw);
- if (ieee80211_is_multiqueue(local)) {
- netif_stop_subqueue(local->mdev, queue);
- } else {
- WARN_ON(queue != 0);
- netif_stop_queue(local->mdev);
- }
+ netif_stop_subqueue(local->mdev, queue);
}
EXPORT_SYMBOL(ieee80211_stop_queue);
--- everything.orig/net/mac80211/wme.c 2008-07-03 11:43:19.000000000 +0200
+++ everything/net/mac80211/wme.c 2008-07-03 11:54:48.000000000 +0200
@@ -115,8 +115,7 @@ static u16 classify80211(struct sk_buff
}
-static u16 ieee80211_select_queue(struct net_device *dev,
- struct sk_buff *skb)
+u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
@@ -157,17 +156,6 @@ static u16 ieee80211_select_queue(struct
return queue;
}
-void ieee80211_install_qdisc(struct net_device *dev)
-{
- dev->select_queue = ieee80211_select_queue;
-}
-
-
-int ieee80211_qdisc_installed(struct net_device *dev)
-{
- return dev->select_queue == ieee80211_select_queue;
-}
-
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
struct sta_info *sta, u16 tid)
{
--- everything.orig/net/mac80211/wme.h 2008-07-03 11:43:09.000000000 +0200
+++ everything/net/mac80211/wme.h 2008-07-03 12:02:29.000000000 +0200
@@ -31,30 +31,10 @@ static inline int WLAN_FC_IS_QOS_DATA(u1
return (fc & 0x8C) == 0x88;
}
-#ifdef CONFIG_MAC80211_QOS
-void ieee80211_install_qdisc(struct net_device *dev);
-int ieee80211_qdisc_installed(struct net_device *dev);
int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
struct sta_info *sta, u16 tid);
void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
struct sta_info *sta, u16 tid);
-#else
-static inline void ieee80211_install_qdisc(struct net_device *dev)
-{
-}
-static inline int ieee80211_qdisc_installed(struct net_device *dev)
-{
- return 0;
-}
-static inline int ieee80211_ht_agg_queue_add(struct ieee80211_local *local,
- struct sta_info *sta, u16 tid)
-{
- return -EAGAIN;
-}
-static inline void ieee80211_ht_agg_queue_remove(struct ieee80211_local *local,
- struct sta_info *sta, u16 tid)
-{
-}
-#endif /* CONFIG_NET_SCHED */
+u16 ieee80211_select_queue(struct net_device *dev, struct sk_buff *skb);
#endif /* _WME_H */
--- everything.orig/include/linux/netdevice.h 2008-07-03 11:51:50.000000000 +0200
+++ everything/include/linux/netdevice.h 2008-07-03 11:51:56.000000000 +0200
@@ -1175,17 +1175,6 @@ static inline void netif_wake_subqueue(s
__netif_schedule(txq);
}
-/**
- * netif_is_multiqueue - test if device has multiple transmit queues
- * @dev: network device
- *
- * Check if device has multiple transmit queues
- */
-static inline int netif_is_multiqueue(const struct net_device *dev)
-{
- return (dev->num_tx_queues > 1);
-}
-
/* Use this variant when it is known for sure that it
* is executing from hardware interrupt context or with hardware interrupts
* disabled.
--- everything.orig/net/mac80211/Kconfig 2008-07-03 11:43:31.000000000 +0200
+++ everything/net/mac80211/Kconfig 2008-07-03 11:52:57.000000000 +0200
@@ -11,16 +11,6 @@ config MAC80211
This option enables the hardware independent IEEE 802.11
networking stack.
-config MAC80211_QOS
- def_bool y
- depends on MAC80211
- depends on NET_SCHED
-
-comment "QoS/HT support disabled"
- depends on MAC80211 && !MAC80211_QOS
-comment "QoS/HT support needs CONFIG_NET_SCHED"
- depends on MAC80211 && !NET_SCHED
-
menu "Rate control algorithm selection"
depends on MAC80211 != n
--- everything.orig/net/mac80211/Makefile 2008-07-03 11:52:42.000000000 +0200
+++ everything/net/mac80211/Makefile 2008-07-03 11:52:51.000000000 +0200
@@ -26,10 +26,10 @@ mac80211-y := \
tx.o \
key.o \
util.o \
- event.o
+ event.o \
+ wme.o
mac80211-$(CONFIG_MAC80211_LEDS) += led.o
-mac80211-$(CONFIG_MAC80211_QOS) += wme.o
mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
debugfs.o \
debugfs_sta.o \
--- everything.orig/net/mac80211/main.c 2008-07-03 11:52:13.000000000 +0200
+++ everything/net/mac80211/main.c 2008-07-03 11:56:51.000000000 +0200
@@ -114,7 +114,7 @@ static int ieee80211_master_open(struct
if (res)
return res;
- netif_start_queue(local->mdev);
+ netif_tx_start_all_queues(local->mdev);
return 0;
}
@@ -1667,17 +1667,12 @@ int ieee80211_register_hw(struct ieee802
* We use the number of queues for feature tests (QoS, HT) internally
* so restrict them appropriately.
*/
-#ifdef CONFIG_MAC80211_QOS
if (hw->queues > IEEE80211_MAX_QUEUES)
hw->queues = IEEE80211_MAX_QUEUES;
if (hw->ampdu_queues > IEEE80211_MAX_AMPDU_QUEUES)
hw->ampdu_queues = IEEE80211_MAX_AMPDU_QUEUES;
if (hw->queues < 4)
hw->ampdu_queues = 0;
-#else
- hw->queues = 1;
- hw->ampdu_queues = 0;
-#endif
/* for now, mdev needs sub_if_data :/ */
mdev = alloc_netdev_mq(sizeof(struct ieee80211_sub_if_data),
@@ -1775,7 +1770,7 @@ int ieee80211_register_hw(struct ieee802
goto fail_wep;
}
- ieee80211_install_qdisc(local->mdev);
+ local->mdev->select_queue = ieee80211_select_queue;
/* add one default STA interface */
result = ieee80211_if_add(local->mdev, "wlan%d", NULL,
--- everything.orig/include/net/mac80211.h 2008-07-03 13:39:28.000000000 +0200
+++ everything/include/net/mac80211.h 2008-07-03 13:39:44.000000000 +0200
@@ -812,20 +812,12 @@ static inline void SET_IEEE80211_PERM_AD
static inline int ieee80211_num_regular_queues(struct ieee80211_hw *hw)
{
-#ifdef CONFIG_MAC80211_QOS
return hw->queues;
-#else
- return 1;
-#endif
}
static inline int ieee80211_num_queues(struct ieee80211_hw *hw)
{
-#ifdef CONFIG_MAC80211_QOS
return hw->queues + hw->ampdu_queues;
-#else
- return 1;
-#endif
}
static inline struct ieee80211_rate *
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue().
2008-07-03 11:27 ` Tomas Winkler
@ 2008-07-03 12:12 ` Johannes Berg
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Berg @ 2008-07-03 12:12 UTC (permalink / raw)
To: Tomas Winkler
Cc: David Miller, netdev, vinay, krkumar2, mchan, Matheos.Worku,
linux-wireless
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
On Thu, 2008-07-03 at 14:27 +0300, Tomas Winkler wrote:
> On Thu, Jul 3, 2008 at 10:05 AM, David Miller <davem@davemloft.net> wrote:
> >
> > Unfortunately it temporarily loses some features, such
> > as packet dropping (easy to add) and requeueing (harder).
>
> Requeueing is must. This effectively kills HT. We must be able to
> requeu packets from the legacy queue into apmdu queue.
I think the other direction is much more important (and also far
easier), and you could help put it back :)
Right now though, it still just hangs.
johannes
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-07-03 12:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-03 7:05 [PATCH 32/39]: mac80211: Reimplement WME using ->select_queue() David Miller
[not found] ` <20080703.000521.13130101.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2008-07-03 9:14 ` Johannes Berg
2008-07-03 10:23 ` Johannes Berg
[not found] ` <1215080583.13270.38.camel-YfaajirXv214zXjbi5bjpg@public.gmane.org>
2008-07-03 12:02 ` Johannes Berg
2008-07-03 11:27 ` Tomas Winkler
2008-07-03 12:12 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox