From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 09/23] mac80211: move aggregation callback processing
Date: Thu, 10 Jun 2010 10:21:37 +0200 [thread overview]
Message-ID: <20100610082230.387128759@sipsolutions.net> (raw)
In-Reply-To: 20100610082128.641664439@sipsolutions.net
From: Johannes Berg <johannes.berg@intel.com>
This moves the aggregation callback processing
to the per-sdata skb queue and a work function
rather than the tasklet.
Unfortunately, this means that it extends the
pkt_type hack to that skb queue. However, it
will enable making ampdu_action API changes
gradually, my current plan is to get rid of
this again by forcing drivers to only return
from ampdu_action() when everything is done,
thus removing the callbacks completely.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/agg-tx.c | 14 ++++++--------
net/mac80211/ieee80211_i.h | 11 +++++++----
net/mac80211/iface.c | 15 ++++++++++++---
net/mac80211/main.c | 13 -------------
net/mac80211/rx.c | 5 +++++
5 files changed, 30 insertions(+), 28 deletions(-)
--- wireless-testing.orig/net/mac80211/ieee80211_i.h 2010-06-09 17:21:08.000000000 +0200
+++ wireless-testing/net/mac80211/ieee80211_i.h 2010-06-09 17:21:10.000000000 +0200
@@ -564,11 +564,15 @@ ieee80211_sdata_set_mesh_id(struct ieee8
#endif
}
+enum sdata_queue_type {
+ IEEE80211_SDATA_QUEUE_TYPE_FRAME = 0,
+ IEEE80211_SDATA_QUEUE_AGG_START = 1,
+ IEEE80211_SDATA_QUEUE_AGG_STOP = 2,
+};
+
enum {
IEEE80211_RX_MSG = 1,
IEEE80211_TX_STATUS_MSG = 2,
- IEEE80211_DELBA_MSG = 3,
- IEEE80211_ADDBA_MSG = 4,
};
enum queue_stop_reason {
@@ -870,9 +874,8 @@ IEEE80211_DEV_TO_SUB_IF(struct net_devic
return netdev_priv(dev);
}
-/* this struct represents 802.11n's RA/TID combination along with our vif */
+/* this struct represents 802.11n's RA/TID combination */
struct ieee80211_ra_tid {
- struct ieee80211_vif *vif;
u8 ra[ETH_ALEN];
u16 tid;
};
--- wireless-testing.orig/net/mac80211/main.c 2010-06-09 17:20:49.000000000 +0200
+++ wireless-testing/net/mac80211/main.c 2010-06-09 17:21:10.000000000 +0200
@@ -259,7 +259,6 @@ static void ieee80211_tasklet_handler(un
{
struct ieee80211_local *local = (struct ieee80211_local *) data;
struct sk_buff *skb;
- struct ieee80211_ra_tid *ra_tid;
while ((skb = skb_dequeue(&local->skb_queue)) ||
(skb = skb_dequeue(&local->skb_queue_unreliable))) {
@@ -274,18 +273,6 @@ static void ieee80211_tasklet_handler(un
skb->pkt_type = 0;
ieee80211_tx_status(local_to_hw(local), skb);
break;
- case IEEE80211_DELBA_MSG:
- ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
- ieee80211_stop_tx_ba_cb(ra_tid->vif, ra_tid->ra,
- ra_tid->tid);
- dev_kfree_skb(skb);
- break;
- case IEEE80211_ADDBA_MSG:
- ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
- ieee80211_start_tx_ba_cb(ra_tid->vif, ra_tid->ra,
- ra_tid->tid);
- dev_kfree_skb(skb);
- break ;
default:
WARN(1, "mac80211: Packet is of unknown type %d\n",
skb->pkt_type);
--- wireless-testing.orig/net/mac80211/agg-tx.c 2010-06-09 17:21:05.000000000 +0200
+++ wireless-testing/net/mac80211/agg-tx.c 2010-06-09 17:21:10.000000000 +0200
@@ -502,11 +502,10 @@ void ieee80211_start_tx_ba_cb_irqsafe(st
ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
memcpy(&ra_tid->ra, ra, ETH_ALEN);
ra_tid->tid = tid;
- ra_tid->vif = vif;
- skb->pkt_type = IEEE80211_ADDBA_MSG;
- skb_queue_tail(&local->skb_queue, skb);
- tasklet_schedule(&local->tasklet);
+ skb->pkt_type = IEEE80211_SDATA_QUEUE_AGG_START;
+ skb_queue_tail(&sdata->skb_queue, skb);
+ ieee80211_queue_work(&local->hw, &sdata->work);
}
EXPORT_SYMBOL(ieee80211_start_tx_ba_cb_irqsafe);
@@ -637,11 +636,10 @@ void ieee80211_stop_tx_ba_cb_irqsafe(str
ra_tid = (struct ieee80211_ra_tid *) &skb->cb;
memcpy(&ra_tid->ra, ra, ETH_ALEN);
ra_tid->tid = tid;
- ra_tid->vif = vif;
- skb->pkt_type = IEEE80211_DELBA_MSG;
- skb_queue_tail(&local->skb_queue, skb);
- tasklet_schedule(&local->tasklet);
+ skb->pkt_type = IEEE80211_SDATA_QUEUE_AGG_STOP;
+ skb_queue_tail(&sdata->skb_queue, skb);
+ ieee80211_queue_work(&local->hw, &sdata->work);
}
EXPORT_SYMBOL(ieee80211_stop_tx_ba_cb_irqsafe);
--- wireless-testing.orig/net/mac80211/rx.c 2010-06-09 17:21:10.000000000 +0200
+++ wireless-testing/net/mac80211/rx.c 2010-06-09 17:21:10.000000000 +0200
@@ -741,6 +741,7 @@ static void ieee80211_rx_reorder_ampdu(s
sc = le16_to_cpu(hdr->seq_ctrl);
if (sc & IEEE80211_SCTL_FRAG) {
spin_unlock(&sta->lock);
+ skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
skb_queue_tail(&rx->sdata->skb_queue, skb);
ieee80211_queue_work(&local->hw, &rx->sdata->work);
return;
@@ -1969,6 +1970,7 @@ ieee80211_rx_h_action(struct ieee80211_r
goto invalid;
}
+ rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
skb_queue_tail(&sdata->skb_queue, rx->skb);
ieee80211_queue_work(&local->hw, &sdata->work);
return RX_QUEUED;
@@ -2001,6 +2003,7 @@ ieee80211_rx_h_action(struct ieee80211_r
if (memcmp(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN))
break;
+ rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
skb_queue_tail(&sdata->skb_queue, rx->skb);
ieee80211_queue_work(&local->hw, &sdata->work);
return RX_QUEUED;
@@ -2023,6 +2026,7 @@ ieee80211_rx_h_action(struct ieee80211_r
case WLAN_CATEGORY_MESH_PATH_SEL:
if (!ieee80211_vif_is_mesh(&sdata->vif))
break;
+ rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
skb_queue_tail(&sdata->skb_queue, rx->skb);
ieee80211_queue_work(&local->hw, &sdata->work);
return RX_QUEUED;
@@ -2128,6 +2132,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
}
/* queue up frame and kick off work to process it */
+ rx->skb->pkt_type = IEEE80211_SDATA_QUEUE_TYPE_FRAME;
skb_queue_tail(&sdata->skb_queue, rx->skb);
ieee80211_queue_work(&rx->local->hw, &sdata->work);
--- wireless-testing.orig/net/mac80211/iface.c 2010-06-09 17:21:10.000000000 +0200
+++ wireless-testing/net/mac80211/iface.c 2010-06-09 17:21:10.000000000 +0200
@@ -482,7 +482,7 @@ static int ieee80211_stop(struct net_dev
}
/* fall through */
default:
- cancel_work_sync(&sdata->work);
+ flush_work(&sdata->work);
/*
* When we get here, the interface is marked down.
* Call synchronize_rcu() to wait for the RX path
@@ -708,6 +708,7 @@ static void ieee80211_iface_work(struct
struct ieee80211_local *local = sdata->local;
struct sk_buff *skb;
struct sta_info *sta;
+ struct ieee80211_ra_tid *ra_tid;
if (!ieee80211_sdata_running(sdata))
return;
@@ -727,8 +728,16 @@ static void ieee80211_iface_work(struct
while ((skb = skb_dequeue(&sdata->skb_queue))) {
struct ieee80211_mgmt *mgmt = (void *)skb->data;
- if (ieee80211_is_action(mgmt->frame_control) &&
- mgmt->u.action.category == WLAN_CATEGORY_BACK) {
+ if (skb->pkt_type == IEEE80211_SDATA_QUEUE_AGG_START) {
+ ra_tid = (void *)&skb->cb;
+ ieee80211_start_tx_ba_cb(&sdata->vif, ra_tid->ra,
+ ra_tid->tid);
+ } else if (skb->pkt_type == IEEE80211_SDATA_QUEUE_AGG_STOP) {
+ ra_tid = (void *)&skb->cb;
+ ieee80211_stop_tx_ba_cb(&sdata->vif, ra_tid->ra,
+ ra_tid->tid);
+ } else if (ieee80211_is_action(mgmt->frame_control) &&
+ mgmt->u.action.category == WLAN_CATEGORY_BACK) {
int len = skb->len;
rcu_read_lock();
next prev parent reply other threads:[~2010-06-10 8:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-10 8:21 [PATCH 00/23] aggregation locking rework Johannes Berg
2010-06-10 8:21 ` [PATCH 01/23] mac80211: simplify station/aggregation code Johannes Berg
2010-06-10 8:21 ` [PATCH 02/23] mac80211: use common skb queue Johannes Berg
2010-06-10 8:21 ` [PATCH 03/23] mac80211: use common work struct Johannes Berg
2010-06-10 8:21 ` [PATCH 04/23] mac80211: use common work function Johannes Berg
2010-06-10 8:21 ` [PATCH 05/23] mac80211: common work skb freeing Johannes Berg
2010-06-10 8:21 ` [PATCH 06/23] mac80211: pull mgmt frame rx into rx handler Johannes Berg
2010-06-10 8:21 ` [PATCH 07/23] mac80211: always process blockack action from workqueue Johannes Berg
2010-06-10 8:21 ` [PATCH 08/23] mac80211: move blockack stop due to fragmentation Johannes Berg
2010-06-10 8:21 ` Johannes Berg [this message]
2010-06-10 8:21 ` [PATCH 10/23] mac80211: use RCU for RX aggregation Johannes Berg
2010-06-10 8:21 ` [PATCH 11/23] mac80211: use RCU for TX aggregation Johannes Berg
2010-06-10 8:21 ` [PATCH 12/23] mac80211: remove non-irqsafe aggregation callbacks Johannes Berg
2010-06-10 8:21 ` [PATCH 13/23] mac80211: refcount aggregation queue stop Johannes Berg
2010-06-10 8:21 ` [PATCH 14/23] mac80211: make TX aggregation start/stop request async Johannes Berg
2010-06-10 8:21 ` [PATCH 15/23] mac80211: move BA session work Johannes Berg
2010-06-10 8:21 ` [PATCH 16/23] mac80211: defer RX agg session teardown to work Johannes Berg
2010-06-10 8:21 ` [PATCH 17/23] mac80211: fix RX aggregation timer Johannes Berg
2010-06-10 8:21 ` [PATCH 18/23] mac80211: change RX aggregation locking Johannes Berg
2010-06-10 8:21 ` [PATCH 19/23] mac80211: defer TX agg session teardown to work Johannes Berg
2010-06-10 8:21 ` [PATCH 20/23] mac80211: change TX aggregation locking Johannes Berg
2010-06-10 8:21 ` [PATCH 21/23] mac80211: allow drivers to sleep in ampdu_action Johannes Berg
2010-06-10 8:21 ` [PATCH 22/23] mac80211: update aggregation documentation Johannes Berg
2010-06-10 8:21 ` [PATCH 23/23] mac80211: fix mgmt frame accounting Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100610082230.387128759@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).